File canceled_logout_notify.diff of Package kdelibs3

--- arts/knotify/knotify.cpp.sav	2007-01-26 15:11:54.000000000 +0100
+++ arts/knotify/knotify.cpp	2007-01-26 15:44:07.000000000 +0100
@@ -344,13 +344,13 @@ void KNotify::notify(const QString &even
     }
 
     QString commandline;
+    KConfig *eventsFile = NULL;
+    KConfig *configFile = NULL;
 
     // check for valid events
     if ( !event.isEmpty() ) {
 
         // get config file
-        KConfig *eventsFile;
-        KConfig *configFile;
         if ( d->events.contains( fromApp ) ) {
             eventsFile = d->events[fromApp];
         } else {
@@ -426,7 +426,7 @@ void KNotify::notify(const QString &even
         notifyByTaskbar( checkWinId( fromApp, winId ));
 
     if ( present & KNotifyClient::PassivePopup )
-        notifyByPassivePopup( text, fromApp, checkWinId( fromApp, winId ));
+        notifyByPassivePopup( text, fromApp, eventsFile, checkWinId( fromApp, winId ));
     else if ( present & KNotifyClient::Messagebox )
         notifyByMessagebox( text, level, checkWinId( fromApp, winId ));
 
@@ -588,11 +588,12 @@ bool KNotify::notifyByMessagebox(const Q
 
 bool KNotify::notifyByPassivePopup( const QString &text,
                                     const QString &appName,
+                                    KConfig* eventsFile,
                                     WId senderWinId )
 {
     KIconLoader iconLoader( appName );
-    if ( d->events.find( appName ) != d->events.end() ) {
-        KConfigGroup config( d->events[ appName ], "!Global!" );
+    if ( eventsFile != NULL ) {
+        KConfigGroup config( eventsFile, "!Global!" );
         QString iconName = config.readEntry( "IconName", appName );
         QPixmap icon = iconLoader.loadIcon( iconName, KIcon::Small );
         QString title = config.readEntry( "Comment", appName );
--- arts/knotify/knotify.h.sav	2006-12-06 16:52:47.000000000 +0100
+++ arts/knotify/knotify.h	2007-01-26 15:44:16.000000000 +0100
@@ -26,6 +26,7 @@
 
 class KNotifyPrivate;
 class KProcess;
+class KConfig;
 
 class KNotify : public QObject, public DCOPObject
 {
@@ -74,7 +75,7 @@ private:
 	bool notifyByLogfile(const QString &text, const QString &file);
 	bool notifyByStderr(const QString &text);
 	bool notifyByPassivePopup(const QString &text, const QString &appName,
-                                  WId winId );
+                                  KConfig* eventsFile, WId winId );
 	bool notifyByExecute(const QString &command,
                              const QString& event,
                              const QString& fromApp,
--- kdecore/eventsrc.sav	2006-12-06 16:52:43.000000000 +0100
+++ kdecore/eventsrc	2007-01-26 15:46:38.000000000 +0100
@@ -1,6 +1,5 @@
 [!Global!]
-# go = The K-icon from kicker
-IconName=go
+IconName=kmenu
 Comment=KDE System Notifications
 Comment[af]=KDE Stelsel Inkennistelling
 Comment[ar]=تنبيهات كيدي
@@ -1655,6 +1654,12 @@ Comment[zh_TW]=KDE 正在結束
 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