openSUSE Build Service

Overview Repositories Revisions Requests Users Attributes Meta

File r897380.diff of Package kdepim4

Subject: kalarm: fix click on system tray icon not showing main window 
From: wstephenson@suse.de
Bug: 
Patch-upstream: 897380
--- kalarm/Changelog	(revision 897379)
+++ kalarm/Changelog	(revision 897380)
@@ -1,9 +1,11 @@
 KAlarm Change Log
 
-=== Version 2.0.7 --- 14 December 2008 ===
+=== Version 2.0.7 --- 15 December 2008 ===
 - Fix crash if KAlarm is activated again while restoring from previous session.
 - Fix kalarmautostart crash on logout while kalarmautostart is still running.
 - Fix failure to update alarms in KOrganizer when Kontact is running.
+- Fix click on system tray icon not showing main window if 'Show in system tray'
+  configuration setting deselected.
 - Fix toolbar configuration being lost after quitting KAlarm.
 
 === Version 2.0.6 (KDE 4.1.3) --- 22 October 2008 ===
--- kalarm/kalarmapp.cpp	(revision 897379)
+++ kalarm/kalarmapp.cpp	(revision 897380)
@@ -1036,7 +1036,7 @@ bool KAlarmApp::displayTrayIcon(bool sho
 		{
 			if (!KSystemTrayIcon::isSystemTrayAvailable())
 				return false;
-			if (!MainWindow::count()  &&  wantShowInSystemTray())
+			if (!MainWindow::count())
 			{
 				creating = true;    // prevent main window constructor from creating an additional tray icon
 				parent = MainWindow::create();
Index: kalarm/Changelog
===================================================================
Index: kalarm/kalarmapp.cpp
===================================================================

Places

File r897380.diff of Package kdepim4

Places