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

List:       kde-commits
Subject:    kdenetwork/kopete/kopete
From:       Olivier Goffart <ogoffart () kde ! org>
Date:       2005-02-08 10:31:18
Message-ID: 20050208103118.AF5181BBBC () office ! kde ! org
[Download RAW message or body]

CVS commit by ogoffart: 

Fix broken signal/slot connection

Fix a jump on unitialized variable valgrind told me.
(the autohide stuff need to be initialized before the window is shown because they \
are used in showEvent)


  M +6 -4      kopetewindow.cpp   1.225


--- kdenetwork/kopete/kopete/kopetewindow.cpp  #1.224:1.225
@@ -5,5 +5,5 @@
     Copyright (c) 2001-2002 by Stefan Gehn            <metz AT gehn.net>
     Copyright (c) 2002-2003 by Martijn Klingens       <klingens@kde.org>
-    Copyright (c) 2002-2005 by Olivier Goffart        <ogoffart@tiscalinet.be>
+    Copyright (c) 2002-2005 by Olivier Goffart        <ogoffart at kde.org>
 
     Kopete    (c) 2002-2005 by the Kopete developers  <kopete-devel@kde.org>
@@ -208,5 +208,4 @@ void KopeteWindow::initActions()
         new KWidgetAction( searchLabel, i18n( "Search:" ), 0, 0, 0, \
actionCollection(), "quicksearch_label" );  quickSearch->setAutoSized( true );
-        connect( searchLabel, SIGNAL( activated() ), searchBar, SLOT( setFocus() ) \
);  // quick search bar - clear button
         KAction *resetQuickSearch = new KAction( i18n( "Reset Quick Search" ),
@@ -297,4 +296,9 @@ void KopeteWindow::loadOptions()
 
         KopetePrefs *p = KopetePrefs::prefs();
+
+        m_autoHide = p->contactListAutoHide();
+        m_autoHideTimeout = p->contactListAutoHideTimeout();
+
+        
         QString tmp = config->readEntry("State", "Shown");
         if ( tmp == "Minimized" && p->showTray())
@@ -311,6 +315,4 @@ void KopeteWindow::loadOptions()
         menubarAction->setChecked( !menuBar()->isHidden() );
         statusbarAction->setChecked( !statusBar()->isHidden() );
-        m_autoHide = p->contactListAutoHide();
-        m_autoHideTimeout = p->contactListAutoHideTimeout();
 }
 


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