[Pkg-cli-apps-commits] [SCM] smuxi branch, master, updated. debian/0.8-8-1-g614bfa4

[Mirco Bauer]

The following commit has been merged in the master branch:
commit 614bfa448c496c2de39bae0ea0f3a0f4a4886bc8
Author: Mirco Bauer <meebey at meebey.net>
Date:   Sat Aug 6 14:13:33 2011 +0200

    Moved disabling notifications on error into a separate patch
    
    Git-Dch: Ignore

diff --git a/debian/patches/disable_notifications_on_error.patch b/debian/patches/disable_notifications_on_error.patch
new file mode 100644
index 0000000..0fd5ec7
--- /dev/null
+++ b/debian/patches/disable_notifications_on_error.patch
@@ -0,0 +1,38 @@
+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/fix_NotifyManager.Init_crash.patch b/debian/patches/fix_NotifyManager.Init_crash.patch
index c2dbb3b..17b5565 100644
--- a/debian/patches/fix_NotifyManager.Init_crash.patch
+++ b/debian/patches/fix_NotifyManager.Init_crash.patch
@@ -23,41 +23,3 @@ index 4861ce6..f88580c 100644
          }
          
          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 7483b35..e97b4cd 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,5 +1,6 @@
 fix_Notification.Close_crash.patch
 fix_NotifyManager.Init_crash.patch
+disable_notifications_on_error.patch
 fix_IndicateManager.Init_crash.patch
 mono_2.10_compile_fix.patch
 dont_sign_Twitterizer2.patch
diff --git a/debian/patches/ubuntu.series b/debian/patches/ubuntu.series
index 682d904..8e9a550 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
+disable_notifications_on_error.patch
 fix_IndicateManager.Init_crash.patch
 mono_2.10_compile_fix.patch
 dont_sign_Twitterizer2.patch

-- 
smuxi