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

List:       kde-commits
Subject:    KDE_3_3_BRANCH: kdenetwork/kopete/kopete/chatwindow
From:       Matt Rogers <matt () matt ! rogers ! name>
Date:       2004-10-20 1:01:22
Message-ID: 20041020010122.1EBAE16BB7 () office ! kde ! org
[Download RAW message or body]

CVS commit by mattr: 

Backport the fixes for 59080 and 89911. Should be in KDE 3.3.2
BUG: 89911
CCBUG: 59080


  M +0 -1      chatview.cpp   1.155.2.2
  M +1 -1      kopetechatwindow.cpp   1.82.2.3


--- kdenetwork/kopete/kopete/chatwindow/chatview.cpp  #1.155.2.1:1.155.2.2
@@ -217,5 +217,4 @@ ChatView::ChatView( KopeteMessageManager
                 mgr->protocol()->richTextCapabilities() );
         connect( editpart, SIGNAL( toggleToolbar(bool)), this, SLOT(slotToggleRtfToolbar(bool)) );
-        connect( this, SIGNAL( windowCreated()), editpart, SLOT(checkToolbarEnabled()) );
 
         m_edit = static_cast<KTextEdit*>( editpart->widget() );

--- kdenetwork/kopete/kopete/chatwindow/kopetechatwindow.cpp  #1.82.2.2:1.82.2.3
@@ -847,5 +847,5 @@ void KopeteChatWindow::setActiveView( QW
         guiFactory()->addClient(view->msgManager());
         createGUI( view->part() );
-        readOptions();
+        
         if( m_activeView )
                 m_activeView->setActive( false );


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