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

List:       kde-commits
Subject:    [Konversation] fee9799: 3.1.x compatibility
From:       Dario Abatianni <eisfuchs () tigress ! com>
Date:       2010-07-01 13:27:35
Message-ID: 20100701132735.93451BB565B () projects ! kde ! org
[Download RAW message or body]

commit fee9799be6e2d0da1be0416951d4335197724a31
Author: Dario Abatianni <eisfuchs@tigress.com>
Date:   Fri Jul 2 20:37:32 2004 +0000

    3.1.x compatibility
    
    svn path=/trunk/kdeextragear-2/konversation/; revision=325415

diff --git a/konversation/konversationmainwindow.cpp \
b/konversation/konversationmainwindow.cpp index a55f2b6..64c22bf 100644
--- a/konversation/konversationmainwindow.cpp
+++ b/konversation/konversationmainwindow.cpp
@@ -154,11 +154,13 @@ KonversationMainWindow::KonversationMainWindow() : \
KMainWindow()  connect(this, SIGNAL(startNotification(QWidget*)), tray, \
SLOT(startNotification(QWidget*)));  connect(this, \
SIGNAL(endNotification(QWidget*)), tray, SLOT(endNotification(QWidget*)));  \
connect(tray, SIGNAL(quitSelected()), this, SLOT(quitProgram())); +#if \
KDE_VERSION >= KDE_MAKE_VERSION(3, 2, 0)  KPopupMenu *trayMenu = \
tray->contextMenu();  #ifdef USE_KNOTIFY
   configureNotificationsAction->plug(trayMenu);
 #endif
   preferencesAction->plug(trayMenu);
+#endif
 
   // decide whether to show the tray icon or not
   updateTrayIcon();
@@ -371,7 +373,7 @@ void KonversationMainWindow::openChannelList()
                                          "enough, it is possible that your \
                client will be "
                                          "disconnected by the server."), \
                i18n("Channel List Warning"),
                                          KStdGuiItem::cont(), \
                "ChannelListWarning");
-      
+
       if(ret == KMessageBox::Continue) {
         frontServer->addChannelListPanel();
       }


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