[Pkg-cli-apps-commits] [SCM] smuxi branch, master, updated. debian/0.8-2-3-g40838c4

[Mirco Bauer]

The following commit has been merged in the master branch:
commit c98b8581ba17c127df3e99254e9a427382ac75ee
Author: Mirco Bauer <meebey at meebey.net>
Date:   Sun Mar 20 16:26:43 2011 +0100

    Fixed crash when disposing desktop notifications. (closes: #616984)

diff --git a/debian/patches/fix_Notification.Close_crash.patch b/debian/patches/fix_Notification.Close_crash.patch
new file mode 100644
index 0000000..fd3692f
--- /dev/null
+++ b/debian/patches/fix_Notification.Close_crash.patch
@@ -0,0 +1,42 @@
+Index: git/src/Frontend-GNOME/NotifyManager.cs
+===================================================================
+--- git.orig/src/Frontend-GNOME/NotifyManager.cs	2011-03-20 15:54:58.000000000 +0100
++++ git/src/Frontend-GNOME/NotifyManager.cs	2011-03-20 16:00:32.000000000 +0100
+@@ -290,6 +290,10 @@
+ 
+         void DisposeNotification(ChatView chatView)
+         {
++            if (chatView == null) {
++                return;
++            }
++
+             Notification notification;
+             if (!Notifications.TryGetValue(chatView, out notification)) {
+                 return;
+@@ -299,7 +303,25 @@
+                          chatView.Name);
+ #endif
+ 
+-            notification.Close();
++            try {
++                // don't try to close already closed notifications (timeout)
++                if (notification.Id == 0) {
++#if LOG4NET
++                    Logger.Debug("DisposeNotification(): notification already " +
++                                 "closed for: " + chatView.Name);
++#endif
++                    return;
++                }
++
++                notification.Close();
++            } catch (Exception ex) {
++#if LOG4NET
++                Logger.Error("DisposeNotification(): " +
++                             "notification.Close() thew exception", ex);
++#endif
++            } finally {
++                Notifications.Remove(chatView);
++            }
+         }
+ 
+         private static string _(string msg)
diff --git a/debian/patches/series b/debian/patches/series
index 9b2cd9b..1d2af7d 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1,2 @@
+fix_Notification.Close_crash.patch
 debian_default_settings.patch

-- 
smuxi