[Pkg-cli-apps-commits] [SCM] smuxi branch, master, updated. debian/0.8-8-9-g7373915
Mirco Bauer
meebey at meebey.net
Tue Jan 3 08:28:27 UTC 2012
The following commit has been merged in the master branch:
commit 9ce149839af3883888096a3943368fb6e660625e
Author: Mirco Bauer <meebey at meebey.net>
Date: Tue Jan 3 08:42:26 2012 +0100
Dropped patches that are already applied upstream
diff --git a/debian/patches/disable_notifications_on_error.patch b/debian/patches/disable_notifications_on_error.patch
deleted file mode 100644
index 0fd5ec7..0000000
--- a/debian/patches/disable_notifications_on_error.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-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/dont_sign_Twitterizer2.patch b/debian/patches/dont_sign_Twitterizer2.patch
deleted file mode 100644
index 8e0f3c0..0000000
--- a/debian/patches/dont_sign_Twitterizer2.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-From: Mirco Bauer <meebey at meebey.net>
-Date: Sat, 9 Apr 2011 19:57:59 +0000 (+0200)
-Subject: Don't sign the assembly
-X-Git-Url: http://git.qnetp.net/?p=twitterizer.git;a=commitdiff_plain;h=55c0ad812d0b00cca17734523539c87556c83a85
-
-Don't sign the assembly
----
-
-diff --git a/lib/Twitterizer/Twitterizer2/Twitterizer2.csproj b/Twitterizer2/Twitterizer2.csproj
-index c87d4d3..abc55f7 100644
---- a/lib/Twitterizer/Twitterizer2/Twitterizer2.csproj
-+++ b/lib/Twitterizer/Twitterizer2/Twitterizer2.csproj
-@@ -12,7 +12,6 @@
- <AssemblyName>Twitterizer2</AssemblyName>
- <TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
- <FileAlignment>512</FileAlignment>
-- <SignAssembly>true</SignAssembly>
- <AssemblyOriginatorKeyFile>Twitterizer2.snk</AssemblyOriginatorKeyFile>
- <FileUpgradeFlags>
- </FileUpgradeFlags>
diff --git a/debian/patches/fix_IndicateManager.Init_crash.patch b/debian/patches/fix_IndicateManager.Init_crash.patch
deleted file mode 100644
index 2195fe6..0000000
--- a/debian/patches/fix_IndicateManager.Init_crash.patch
+++ /dev/null
@@ -1,69 +0,0 @@
-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/fix_Notification.Close_crash.patch b/debian/patches/fix_Notification.Close_crash.patch
deleted file mode 100644
index fd3692f..0000000
--- a/debian/patches/fix_Notification.Close_crash.patch
+++ /dev/null
@@ -1,42 +0,0 @@
-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/fix_NotifyManager.Init_crash.patch b/debian/patches/fix_NotifyManager.Init_crash.patch
deleted file mode 100644
index 17b5565..0000000
--- a/debian/patches/fix_NotifyManager.Init_crash.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-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()
diff --git a/debian/patches/mono_2.10_compile_fix.patch b/debian/patches/mono_2.10_compile_fix.patch
deleted file mode 100644
index e5730d5..0000000
--- a/debian/patches/mono_2.10_compile_fix.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-From: Mirco Bauer <meebey at meebey.net>
-Date: Sat, 9 Apr 2011 20:02:56 +0000 (+0200)
-Subject: Mono 2.10 compile fix
-X-Git-Url: http://git.qnetp.net/?p=twitterizer.git;a=commitdiff_plain;h=745d44696b1200de12cf2de4ebec3097ccd4d544
-
-Mono 2.10 compile fix
----
-
-diff --git a/lib/Twitterizer/Twitterizer2/Methods/User/TwitterUserCollection.cs b/Twitterizer2/Methods/User/TwitterUserCollection.cs
-index 522bccf..d73cfef 100644
---- a/lib/Twitterizer/Twitterizer2/Methods/User/TwitterUserCollection.cs
-+++ b/lib/Twitterizer/Twitterizer2/Methods/User/TwitterUserCollection.cs
-@@ -59,7 +59,7 @@ namespace Twitterizer
- /// Gets or sets information about the user's rate usage.
- /// </summary>
- /// <value>The rate limiting object.</value>
-- public new RateLimiting RateLimiting { get; internal set; }
-+ public new RateLimiting RateLimiting { get; set; }
-
- /// <summary>
- /// Gets or sets the paged command.
diff --git a/debian/patches/series b/debian/patches/series
index e97b4cd..51775fd 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,9 +1,3 @@
-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
build_Newtonsoft.Json_with_default_compiler.patch
build_Twitterizer2_with_default_compiler.patch
debian_default_settings.patch
diff --git a/debian/patches/ubuntu.series b/debian/patches/ubuntu.series
index 8e9a550..7ea5cbb 100644
--- a/debian/patches/ubuntu.series
+++ b/debian/patches/ubuntu.series
@@ -1,9 +1,3 @@
-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
build_Newtonsoft.Json_with_default_compiler.patch
build_Twitterizer2_with_default_compiler.patch
ubuntu_default_settings.patch
--
smuxi
More information about the Pkg-cli-apps-commits
mailing list