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

List:       kde-commits
Subject:    kdepim/korganizer
From:       Till Adam <adam () kde ! org>
Date:       2005-04-24 19:57:15
Message-ID: 20050424195715.4150062B () office ! kde ! org
[Download RAW message or body]

CVS commit by tilladam: 

Make sure that we only listen to the configChanged signal that is intended
for us, not the one for the kontact plugin. Avoids multiple reloads after
hitting ok/apply in the config dialog.


  M +3 -2      calendarview.cpp   1.333
  M +1 -1      calendarview.h   1.163
  M +1 -1      kodialogmanager.cpp   1.62


--- kdepim/korganizer/calendarview.cpp  #1.332:1.333
@@ -270,5 +270,5 @@ CalendarView::CalendarView( QWidget *par
 
   // We should think about seperating startup settings and configuration change.
-  updateConfig();
+  updateConfig( "korganizer" );
 
   connect( QApplication::clipboard(), SIGNAL( dataChanged() ),
@@ -611,6 +611,7 @@ void CalendarView::goPrevious()
 }
 
-void CalendarView::updateConfig()
+void CalendarView::updateConfig( const QCString& receiver)
 {
+  if ( receiver != "korganizer" ) return;
   kdDebug(5850) << "CalendarView::updateConfig()" << endl;
 

--- kdepim/korganizer/calendarview.h  #1.162:1.163
@@ -223,5 +223,5 @@ class KDE_EXPORT CalendarView : public K
     /** options dialog made a changed to the configuration. we catch this
      *  and notify all widgets which need to update their configuration. */
-    void updateConfig();
+    void updateConfig( const QCString& );
     /** Calendar configuration was changed, so refresh categories list
     */

--- kdepim/korganizer/kodialogmanager.cpp  #1.61:1.62
@@ -125,5 +125,5 @@ void KODialogManager::showOptionsDialog(
     mOptionsDialog = new KCMultiDialog( mMainView, "KorganizerPreferences" );
     connect( mOptionsDialog, SIGNAL( configCommitted( const QCString & ) ),
-             mMainView, SLOT( updateConfig() ) );
+             mMainView, SLOT( updateConfig( const QCString& ) ) );
 #if 0
     connect( mOptionsDialog, SIGNAL( applyClicked() ),


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