[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 2c508964fb7679659ed42e4fbf5c87a02f08b79e
Author: Mirco Bauer <meebey at meebey.net>
Date:   Fri Aug 5 22:03:29 2011 +0200

    Fix potential startup crash in smuxi-frontend-gnome when no indicate daemon is available

diff --git a/debian/patches/fix_IndicateManager.Init_crash.patch b/debian/patches/fix_IndicateManager.Init_crash.patch
new file mode 100644
index 0000000..2195fe6
--- /dev/null
+++ b/debian/patches/fix_IndicateManager.Init_crash.patch
@@ -0,0 +1,69 @@
+commit 32ef6782202d860aaa3116d876fb4303ea007482
+Author: Mirco Bauer <meebey at meebey.net>
+Date:   Tue Feb 8 01:05:24 2011 +0100
+
+    Guard IndicateManager.Init() to avoid potential crashes
+
+Index: smuxi/src/Frontend-GNOME/IndicateManager.cs
+===================================================================
+--- smuxi.orig/src/Frontend-GNOME/IndicateManager.cs	2011-05-18 01:56:18.000000000 +0200
++++ smuxi/src/Frontend-GNOME/IndicateManager.cs	2011-08-05 21:51:54.000000000 +0200
+@@ -43,6 +43,8 @@
+         ChatViewManager ChatViewManager { get; set; }
+         Dictionary<ChatView, Indicator> Indicators { get; set; }
+         Dictionary<ChatView, MessageTextViewMessageHighlightedEventHandler> HighlightEventHandlers { get; set; }
++        bool IsInitialized { get; set; }
++        bool IsEnabled { get; set; }
+ 
+         static IndicateManager()
+         {
+@@ -73,7 +75,13 @@
+                 <ChatView,
+                  MessageTextViewMessageHighlightedEventHandler>();
+ 
+-            Init();
++            try {
++                Init();
++            } catch (Exception ex) {
++#if LOG4NET
++                Logger.Error("IndicateManager(): initialization failed: ", ex);
++#endif
++            }
+         }
+         
+         public void Dispose()
+@@ -98,10 +106,16 @@
+                 throw new ArgumentNullException("userConfig");
+             }
+ 
++            if (!IsInitialized) {
++                return;
++            }
++
+             if ((bool) userConfig["Interface/Notification/MessagingMenuEnabled"]) {
+                 Server.Show();
++                IsEnabled = true;
+             } else {
+                 Server.Hide();
++                IsEnabled = false;
+             }
+         }
+ 
+@@ -138,6 +152,8 @@
+ 
+             ChatViewManager.ChatAdded   += OnChatViewManagerChatAdded;
+             ChatViewManager.ChatRemoved += OnChatViewManagerChatRemoved;
++
++            IsInitialized = true;
+         }
+ 
+         void OnMainWindowFocusInEvent(object sender, Gtk.FocusInEventArgs e)
+@@ -200,7 +216,7 @@
+         {
+             Trace.Call(sender, e, chatView);
+ 
+-            if (MainWindow.HasToplevelFocus) {
++            if (MainWindow.HasToplevelFocus || !IsEnabled) {
+                 return;
+             }
+ 
diff --git a/debian/patches/series b/debian/patches/series
index 45b84ed..7483b35 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,5 +1,6 @@
 fix_Notification.Close_crash.patch
 fix_NotifyManager.Init_crash.patch
+fix_IndicateManager.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 bff3c8c..682d904 100644
--- a/debian/patches/ubuntu.series
+++ b/debian/patches/ubuntu.series
@@ -1,5 +1,6 @@
 fix_Notification.Close_crash.patch
 fix_NotifyManager.Init_crash.patch
+fix_IndicateManager.Init_crash.patch
 mono_2.10_compile_fix.patch
 dont_sign_Twitterizer2.patch
 build_Newtonsoft.Json_with_default_compiler.patch

-- 
smuxi