[Pkg-cli-apps-commits] [SCM] smuxi branch, quantal, updated. debian/0.8.10-1-17-g3036e58

[Mirco Bauer]

The following commit has been merged in the quantal branch:
commit 83da5cf80a6eef02dbca430d5ab08ee21632eed8
Author: Mirco Bauer <meebey at meebey.net>
Date:   Mon Oct 15 21:59:31 2012 +0200

    Applied upstream's disable_hiding_main_window patch
    
    Workaround serious issue that made it impossible to restore the main window after it was closed which led to a new Smuxi instance

diff --git a/debian/patches/disable_hiding_main_window.patch b/debian/patches/disable_hiding_main_window.patch
new file mode 100644
index 0000000..dd9273d
--- /dev/null
+++ b/debian/patches/disable_hiding_main_window.patch
@@ -0,0 +1,38 @@
+commit 9dbf925a55f4c4802c8527c35a201d258a70eb9f (HEAD, refs/remotes/origin/stable, refs/heads/stable)
+Author: Mirco Bauer <meebey at meebey.net>
+Date:   Mon Oct 15 21:35:21 2012 +0200
+
+    [Frontend-GNOME] Disable forced NotificationAreaIconMode.Closed mode for Ubuntu's Messaging Menu
+    
+    As of Ubuntu 12.10's libmessaging-menu, Smuxi can no longer restore a
+    hidden (closed) main window from messaging menu, as it relies on
+    single-instance behavior/support of the application [0]. The messaging menu
+    simply launches the application desktop file and expects that the application
+    detects the already running instance and restores a hidden/closed main window.
+    
+    As of now Smuxi does not support single-instance as IPC on Mono and Linux
+    simply sucks.
+    
+    Here the path that leads to clone wars:
+     * You start Smuxi from launcher
+     * You close the Smuxi window with the "X" button -> launcher no longer believes Smuxi is still running
+     * libmessaging-menu no longer allows to bring Smuxi back (as it did with libindicate)
+     * launcher and messaging menu will both now start new instances when you activate Smuxi
+     * You close Smuxi's main window again with the "X" button
+     * You activate Smuxi from the messaging menu or launcher -> you spawn another clone
+    
+     [0]: https://bugs.launchpad.net/indicator-messages/+bug/1065732/comments/1
+
+diff --git a/src/Frontend-GNOME/IndicateManager.cs b/src/Frontend-GNOME/IndicateManager.cs
+index 56b6237..491f0d1 100644
+--- a/src/Frontend-GNOME/IndicateManager.cs
++++ b/src/Frontend-GNOME/IndicateManager.cs
+@@ -147,8 +147,6 @@ namespace Smuxi.Frontend.Gnome
+ 
+                 Server.Show();
+                 IsEnabled = true;
+-                // hide the main window instead of closing it
+-                MainWindow.NotificationAreaIconMode = NotificationAreaIconMode.Closed;
+             } else {
+                 // non-persistent in menu using the blacklist as per
+                 // specification:
diff --git a/debian/patches/ubuntu.series b/debian/patches/ubuntu.series
index 21225a5..c964fb1 100644
--- a/debian/patches/ubuntu.series
+++ b/debian/patches/ubuntu.series
@@ -3,3 +3,4 @@ build_Twitterizer2_with_default_compiler.patch
 build_db4o_with_default_compiler.patch
 build_jabber-net_with_default_compiler.patch
 ubuntu_default_settings.patch
+disable_hiding_main_window.patch

-- 
smuxi