[prev in list] [next in list] [prev in thread] [next in thread]
List: kde-commits
Subject: KDE/kdepim/kalarm
From: David Jarvie <djarvie () kde ! org>
Date: 2010-11-01 0:44:47
Message-ID: 20101101004447.5329DAC89E () svn ! kde ! org
[Download RAW message or body]
SVN commit 1191729 by djarvie:
Bug 255673: Fix KAlarm showing in system tray at login when configured not to show in tray.
M +10 -8 kalarmapp.cpp
--- trunk/KDE/kdepim/kalarm/kalarmapp.cpp #1191728:1191729
@@ -309,14 +309,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:
{
@@ -443,6 +435,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]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic