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

List:       kde-commits
Subject:    branches/KDE/3.5
From:       Luboš Luňák <l.lunak () kde ! org>
Date:       2007-03-06 15:11:48
Message-ID: 1173193908.081315.29246.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 640017 by lunakl:

A notification about logout canceled by some application ... usually
one of those broken ones like Skype (r627435 from trunk).



 M  +2 -1      kdebase/ksmserver/shutdown.cpp  
 M  +6 -0      kdelibs/kdecore/eventsrc  


--- branches/KDE/3.5/kdebase/ksmserver/shutdown.cpp #640016:640017
@@ -345,7 +345,8 @@
 
 void KSMServer::cancelShutdown( KSMClient* c )
 {
-    kdWarning( 1218 ) << "Client " << c->program() << " (" << c->clientId() << ") \
canceled shutdown." << endl; +    kdDebug( 1218 ) << "Client " << c->program() << " \
(" << c->clientId() << ") canceled shutdown." << endl; +    KNotifyClient::event( 0, \
"cancellogout", i18n( "Logout canceled by '%1'" ).arg( c->program()));  \
clientInteracting = 0;  for ( KSMClient* c = clients.first(); c; c = clients.next() ) \
{  SmsShutdownCancelled( c->connection() );
--- branches/KDE/3.5/kdelibs/kdecore/eventsrc #640016:640017
@@ -1720,6 +1720,12 @@
 default_presentation=1
 default_sound=KDE_Logout_3.ogg
 
+[cancellogout]
+Name=Logout canceled
+Comment=KDE logout was canceled
+default_presentation=16
+default_sound=
+
 [printerror]
 Name=Print error
 Name[af]=Druk fout


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