[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    kdepim/kontact/plugins/korganizer
From:       Tobias Koenig <tokoe () kde ! org>
Date:       2003-11-21 18:46:37
[Download RAW message or body]

CVS commit by tokoe: 

Since both plugins use the same part we have to remove both actions.


  M +3 -0      korganizerplugin.cpp   1.12
  M +4 -1      todoplugin.cpp   1.11


--- kdepim/kontact/plugins/korganizer/korganizerplugin.cpp  #1.11:1.12
@@ -79,4 +79,7 @@ KParts::Part *KOrganizerPlugin::createPa
   if ( action )
     part->actionCollection()->take( action );
+  action = part->actionCollection()->action( "new_todo" );
+  if ( action )
+    part->actionCollection()->take( action );
 
   dcopClient(); // ensure that we register to DCOP as "korganizer"

--- kdepim/kontact/plugins/korganizer/todoplugin.cpp  #1.10:1.11
@@ -73,5 +73,8 @@ KParts::Part *TodoPlugin::createPart()
     return 0;
 
-  KAction *action = part->actionCollection()->action( "new_todo" );
+  KAction *action = part->actionCollection()->action( "new_event" );
+  if ( action )
+    part->actionCollection()->take( action );
+  action = part->actionCollection()->action( "new_todo" );
   if ( action )
     part->actionCollection()->take( action );


[prev in list] [next in list] [prev in thread] [next in thread]