CVS commit by tokoe: 

'Hide' the New actions from inside the Kontact plugins.


  M +4 -0      plugins/kaddressbook/kaddressbook_plugin.cpp   1.32
  M +1 -0      plugins/kmail/.cvsignore   1.3
  M +4 -0      plugins/kmail/kmail_plugin.cpp   1.24
  M +7 -0      plugins/korganizer/korganizerplugin.cpp   1.11
  M +7 -0      plugins/korganizer/todoplugin.cpp   1.10
  M +0 -1      src/mainwindow.cpp   1.89


--- kdepim/kontact/plugins/kaddressbook/kaddressbook_plugin.cpp  #1.31:1.32
@@ -64,4 +64,8 @@ KParts::Part* KAddressbookPlugin::create
   if ( !part ) return 0;
 
+  KAction *action = part->actionCollection()->action( "file_new_contact" );
+  if ( action )
+    part->actionCollection()->take( action );
+
   // 1) Register with dcop as "kaddressbook"  [maybe the part should do this]
   // 2) Create the stub that allows us to talk to the part

--- kdepim/kontact/plugins/kmail/.cvsignore  #1.2:1.3
@@ -4,2 +4,3 @@
 *_stub.cpp
 *_stub.h
+*_skel.cpp

--- kdepim/kontact/plugins/kmail/kmail_plugin.cpp  #1.23:1.24
@@ -87,4 +87,8 @@ KParts::Part* KMailPlugin::createPart()
   if ( !part ) return 0;
 
+  KAction *action = part->actionCollection()->action( "new_message" );
+  if ( action )
+    part->actionCollection()->take( action );
+
   mStub = new KMailIface_stub( dcopClient(), "kmail", "KMailIface" );
   return part;

--- kdepim/kontact/plugins/korganizer/korganizerplugin.cpp  #1.10:1.11
@@ -73,4 +73,11 @@ KParts::Part *KOrganizerPlugin::createPa
   KParts::Part *part = loadPart();
 
+  if ( !part )
+    return 0;
+
+  KAction *action = part->actionCollection()->action( "new_event" );
+  if ( action )
+    part->actionCollection()->take( action );
+
   dcopClient(); // ensure that we register to DCOP as "korganizer"
   mIface = new KCalendarIface_stub( dcopClient(), "kontact", "CalendarIface" );

--- kdepim/kontact/plugins/korganizer/todoplugin.cpp  #1.9:1.10
@@ -70,4 +70,11 @@ KParts::Part *TodoPlugin::createPart()
   KParts::Part *part = loadPart();
 
+  if ( !part )
+    return 0;
+
+  KAction *action = part->actionCollection()->action( "new_todo" );
+  if ( action )
+    part->actionCollection()->take( action );
+
   dcopClient(); // ensure that we register to DCOP as "korganizer"
   mIface = new KCalendarIface_stub( dcopClient(), "kontact", "CalendarIface" );

--- kdepim/kontact/src/mainwindow.cpp  #1.88:1.89
@@ -438,5 +438,4 @@ void MainWindow::selectPlugin( Kontact::
     setCaption( i18n("Plugin dependent window title" ,"%1 - Kontact").arg( plugin->title() ) );
     if ( action ) {
-      // ##FIXME: Doesn't work for some reason..
       mNewActions->setIconSet( action->iconSet() );
       mNewActions->setText( action->text() );