Summary: | Action merging merges actions into kmail | ||
---|---|---|---|
Product: | [Applications] akregator | Reporter: | Frank Osterfeld <osterfeld> |
Component: | kontact plugin | Assignee: | kdepim bugs <kdepim-bugs> |
Status: | RESOLVED FIXED | ||
Severity: | normal | ||
Priority: | NOR | ||
Version: | cvs | ||
Target Milestone: | --- | ||
Platform: | Unlisted Binaries | ||
OS: | Linux | ||
Latest Commit: | Version Fixed In: |
Description
Frank Osterfeld
2004-12-17 18:12:30 UTC
CVS commit by osterfeld: Don't break kontact. Remove nested part actions when deselecting akregator plugin. BUG: 95346 M +14 -1 akregator_part.cpp 1.122 M +2 -0 akregator_part.h 1.52 --- kdepim/akregator/src/akregator_part.cpp #1.121:1.122 @@ -685,4 +685,17 @@ void aKregatorPart::showOptions() } +void aKregatorPart::partActivateEvent(KParts::PartActivateEvent* event) +{ + if (factory() && m_mergedPart) + { + if (event->activated()) + factory()->addClient(m_mergedPart); + else + factory()->removeClient(m_mergedPart); + } + + KPIM::Part::partActivateEvent(event); +} + KParts::Part *aKregatorPart::hitTest(QWidget *widget, const QPoint &globalPos) { --- kdepim/akregator/src/akregator_part.h #1.51:1.52 @@ -167,4 +167,6 @@ namespace Akregator virtual KParts::Part *hitTest(QWidget *widget, const QPoint &globalPos); + /** reimplemented to load/unload the merged parts on selection/deselection */ + virtual void partActivateEvent(KParts::PartActivateEvent* event); public slots: /** |