projects
/
quassel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Make disabling the tray icon animation work again
[quassel.git]
/
src
/
qtui
/
mainwin.cpp
diff --git
a/src/qtui/mainwin.cpp
b/src/qtui/mainwin.cpp
index
c6d4051
..
79f20aa
100644
(file)
--- a/
src/qtui/mainwin.cpp
+++ b/
src/qtui/mainwin.cpp
@@
-85,9
+85,6
@@
#include "verticaldock.h"
#ifndef HAVE_KDE
#include "verticaldock.h"
#ifndef HAVE_KDE
-# ifdef HAVE_DBUS
-# include "desktopnotificationbackend.h"
-# endif
# ifdef HAVE_PHONON
# include "phononnotificationbackend.h"
# endif
# ifdef HAVE_PHONON
# include "phononnotificationbackend.h"
# endif
@@
-192,17
+189,15
@@
void MainWin::init() {
setupHotList();
#ifndef HAVE_KDE
setupHotList();
#ifndef HAVE_KDE
- QtUi::registerNotificationBackend(new TaskbarNotificationBackend(this));
-# ifndef QT_NO_SYSTEMTRAYICON
- QtUi::registerNotificationBackend(new SystrayNotificationBackend(this));
-# endif
# ifdef HAVE_PHONON
QtUi::registerNotificationBackend(new PhononNotificationBackend(this));
# endif
# ifdef HAVE_PHONON
QtUi::registerNotificationBackend(new PhononNotificationBackend(this));
# endif
-# if
def HAVE_DBUS
- QtUi::registerNotificationBackend(new
Desktop
NotificationBackend(this));
+# if
ndef QT_NO_SYSTEMTRAYICON
+ QtUi::registerNotificationBackend(new
Systray
NotificationBackend(this));
# endif
# endif
+ QtUi::registerNotificationBackend(new TaskbarNotificationBackend(this));
+
#else /* HAVE_KDE */
QtUi::registerNotificationBackend(new KNotificationBackend(this));
#endif /* HAVE_KDE */
#else /* HAVE_KDE */
QtUi::registerNotificationBackend(new KNotificationBackend(this));
#endif /* HAVE_KDE */