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

List:       kde-commits
Subject:    branches/KDE/4.4/kdepim/kalarm
From:       David Jarvie <djarvie () kde ! org>
Date:       2010-11-01 0:43:59
Message-ID: 20101101004359.B1EECAC89B () svn ! kde ! org
[Download RAW message or body]

SVN commit 1191727 by djarvie:

Bug 255673: Fix KAlarm showing in system tray at login when configured not to show in tray.


 M  +3 -0      Changelog  
 M  +1 -1      kalarm.h  
 M  +11 -9     kalarmapp.cpp  


--- branches/KDE/4.4/kdepim/kalarm/Changelog #1191726:1191727
@@ -1,5 +1,8 @@
 KAlarm Change Log
 
+=== Version 2.4.10 --- 1 Nov 2010 ===
+- Fix KAlarm showing in system tray at login when configured not to show in tray.
+
 === Version 2.4.9 (KDEPIM 4.4.7) --- 19 October 2010 ===
 - Fix crash if alarm triggers while its deletion confirmation prompt is visible.
 - Fix crash when Try button is clicked while creating new display alarm.
--- branches/KDE/4.4/kdepim/kalarm/kalarm.h #1191726:1191727
@@ -23,7 +23,7 @@
 
 #undef QT3_SUPPORT
 
-#define KALARM_VERSION "2.4.9"
+#define KALARM_VERSION "2.4.10"
 #define KALARM_NAME "KAlarm"
 #define KALARM_DBUS_SERVICE  "org.kde.kalarm"  // D-Bus service name of KAlarm application
 
--- branches/KDE/4.4/kdepim/kalarm/kalarmapp.cpp #1191726:1191727
@@ -1,7 +1,7 @@
 /*
  *  kalarmapp.cpp  -  the KAlarm application object
  *  Program:  kalarm
- *  Copyright  © 2001-2009 by David Jarvie <djarvie@kde.org>
+ *  Copyright  © 2001-2010 by David Jarvie <djarvie@kde.org>
  *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
@@ -285,14 +285,6 @@
 		CommandOptions::Command command = options.command();
 		switch (command)
 		{
-			case CommandOptions::TRAY:
-				// Display only the system tray icon
-				if (!KSystemTrayIcon::isSystemTrayAvailable()
-				||  !initCheck()   // open the calendar, start processing execution queue
-				||  !displayTrayIcon(true))
-					exitCode = 1;
-				break;
-
 			case CommandOptions::TRIGGER_EVENT:
 			case CommandOptions::CANCEL_EVENT:
 			{
@@ -419,6 +411,16 @@
 					exitCode = 1;
 				break;
 
+			case CommandOptions::TRAY:
+				// Display only the system tray icon
+				if (Preferences::showInSystemTray()  &&  KSystemTrayIcon::isSystemTrayAvailable())
+				{
+					if (!initCheck()   // open the calendar, start processing execution queue
+					||  !displayTrayIcon(true))
+						exitCode = 1;
+					break;
+				}
+				// fall throudh to NONE
 			case CommandOptions::NONE:
 				// No arguments - run interactively & display the main window
 #ifndef NDEBUG
[prev in list] [next in list] [prev in thread] [next in thread]