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

[Mirco Bauer]

The following commit has been merged in the master branch:
commit 9290dca134a4df3b4fdf947a47f8af9184c34566
Author: Mirco Bauer <meebey at meebey.net>
Date:   Fri Aug 5 22:00:30 2011 +0200

    Fix startup crash in smuxi-frontend-gnome when no notification daemon is available (closes: #636348)

diff --git a/debian/patches/fix_NotifyManager.Init_crash.patch b/debian/patches/fix_NotifyManager.Init_crash.patch
new file mode 100644
index 0000000..c2dbb3b
--- /dev/null
+++ b/debian/patches/fix_NotifyManager.Init_crash.patch
@@ -0,0 +1,63 @@
+commit 89fdfbaacaaee09effc7648f24e9b18e5676be9b
+Author: Mirco Bauer <meebey at meebey.net>
+Date:   Mon Feb 7 17:41:37 2011 +0100
+
+    Guard NotifyManager.Init() method for D-Bus issues. (closes: #561)
+
+diff --git a/src/Frontend-GNOME/NotifyManager.cs b/src/Frontend-GNOME/NotifyManager.cs
+index 4861ce6..f88580c 100644
+--- a/src/Frontend-GNOME/NotifyManager.cs
++++ b/src/Frontend-GNOME/NotifyManager.cs
+@@ -88,7 +88,13 @@ namespace Smuxi.Frontend.Gnome
+                 <ChatView,
+                  MessageTextViewMessageHighlightedEventHandler>();
+ 
+-            Init();
++            try {
++                Init();
++            } catch (Exception ex) {
++#if LOG4NET
++                Logger.Error("NotifyManager(): initialization failed: ", ex);
++#endif
++            }
+         }
+         
+         public void Dispose()
+commit 3b9f8b94251dd256659135da73b52b1652e74e65
+Author: Mirco Bauer <meebey at meebey.net>
+Date:   Tue Feb 8 01:07:19 2011 +0100
+
+    When NotifyManager.Init() fails don't enable notifications
+
+diff --git a/src/Frontend-GNOME/NotifyManager.cs b/src/Frontend-GNOME/NotifyManager.cs
+index f88580c..7e1005b 100644
+--- a/src/Frontend-GNOME/NotifyManager.cs
++++ b/src/Frontend-GNOME/NotifyManager.cs
+@@ -43,6 +43,7 @@ namespace Smuxi.Frontend.Gnome
+         MainWindow MainWindow { get; set; }
+         ChatViewManager ChatViewManager { get; set; }
+         Dictionary<ChatView, MessageTextViewMessageHighlightedEventHandler> HighlightEventHandlers { get; set; }
++        bool IsInitialized { get; set; }
+         bool IsEnabled { get; set; }
+ 
+         static NotifyManager()
+@@ -110,6 +111,10 @@ namespace Smuxi.Frontend.Gnome
+                 throw new ArgumentNullException("userConfig");
+             }
+ 
++            if (!IsInitialized) {
++                return;
++            }
++
+             IsEnabled = (bool) userConfig["Interface/Notification/PopupsEnabled"];
+         }
+ 
+@@ -161,6 +166,8 @@ namespace Smuxi.Frontend.Gnome
+ 
+             ChatViewManager.ChatAdded   += OnChatViewManagerChatAdded;
+             ChatViewManager.ChatRemoved += OnChatViewManagerChatRemoved;
++
++            IsInitialized = true;
+         }
+ 
+         void OnChatViewManagerChatAdded(object sender, ChatViewManagerChatAddedEventArgs e)
diff --git a/debian/patches/series b/debian/patches/series
index 61924b6..45b84ed 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,4 +1,5 @@
 fix_Notification.Close_crash.patch
+fix_NotifyManager.Init_crash.patch
 mono_2.10_compile_fix.patch
 dont_sign_Twitterizer2.patch
 build_Newtonsoft.Json_with_default_compiler.patch
diff --git a/debian/patches/ubuntu.series b/debian/patches/ubuntu.series
index 67593aa..bff3c8c 100644
--- a/debian/patches/ubuntu.series
+++ b/debian/patches/ubuntu.series
@@ -1,4 +1,5 @@
 fix_Notification.Close_crash.patch
+fix_NotifyManager.Init_crash.patch
 mono_2.10_compile_fix.patch
 dont_sign_Twitterizer2.patch
 build_Newtonsoft.Json_with_default_compiler.patch

-- 
smuxi