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

List:       kde-commits
Subject:    branches/KDE/4.5/kdepim/kalarm
From:       David Jarvie <djarvie () kde ! org>
Date:       2010-11-01 0:44:38
Message-ID: 20101101004438.90857AC89B () svn ! kde ! org
[Download RAW message or body]

SVN commit 1191728 by djarvie:

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


 M  +2 -1      Changelog  
 M  +10 -8     kalarmapp.cpp  


--- branches/KDE/4.5/kdepim/kalarm/Changelog #1191727:1191728
@@ -1,9 +1,10 @@
 KAlarm Change Log
 
-=== Version 2.5.4 --- 19 October 2010 ===
+=== Version 2.5.4 --- 1 November 2010 ===
 - Fix crash when Try button is clicked while creating new display alarm.
 - Fix crash on KAlarm exit.
 - Fix possible crash when enabling individual alarms.
+- Fix KAlarm showing in system tray at login when configured not to show in tray.
 - Allow pre- & post-alarm actions for alarms whose text is generated by a command.
 
 === Version 2.5.3 --- 2 October 2010 ===
--- branches/KDE/4.5/kdepim/kalarm/kalarmapp.cpp #1191727:1191728
@@ -302,14 +302,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:
 			{
@@ -436,6 +428,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]