[SCM] mate-panel Debian package branch, master, updated. debian/1.8.1+dfsg1-1-4-gac628a3

[Mike Gabriel]

Gitweb-URL: http://git.debian.org/?p=pkg-mate/mate-panel.git;a=commitdiff;h=41dd519

The following commit has been merged in the master branch:
commit 41dd5197d8831ad7730c07bd842c2e995e55735d
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date:   Thu Oct 23 12:24:58 2014 +0200

    debian/patches: Add 0001_update-marco-wm-name.patch. Adapt to WM name change in marco v1.8.2.
---
 debian/patches/0001_update-marco-wm-name.patch | 26 ++++++++++++++++++++++++++
 debian/patches/series                          |  1 +
 2 files changed, 27 insertions(+)

diff --git a/debian/patches/0001_update-marco-wm-name.patch b/debian/patches/0001_update-marco-wm-name.patch
new file mode 100644
index 0000000..f0bfc78
--- /dev/null
+++ b/debian/patches/0001_update-marco-wm-name.patch
@@ -0,0 +1,26 @@
+From 75e3f6c2143ac68829c7e699ea555b91ee4021d0 Mon Sep 17 00:00:00 2001
+From: Nathan Torchia <nemasu at gmail.com>
+Date: Fri, 3 Oct 2014 10:24:21 +0900
+Subject: [PATCH] Update Marco WM name as per Marco commit
+
+Closes https://github.com/mate-desktop/mate-panel/pull/240
+
+ cbf24f5d78719b930fc0cd6c0c80e00e9d62c95a
+---
+ applets/wncklet/workspace-switcher.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/applets/wncklet/workspace-switcher.c b/applets/wncklet/workspace-switcher.c
+index bf6e365..4a568bd 100644
+--- a/applets/wncklet/workspace-switcher.c
++++ b/applets/wncklet/workspace-switcher.c
+@@ -144,7 +144,7 @@ static void window_manager_changed(WnckScreen* screen, PagerData* pager)
+ 
+ 	if (!wm_name)
+ 		pager->wm = PAGER_WM_UNKNOWN;
+-	else if (strcmp(wm_name, "Marco") == 0)
++	else if (strcmp(wm_name, "Metacity (Marco)") == 0)
+ 		pager->wm = PAGER_WM_MARCO;
+ 	else if (strcmp(wm_name, "Compiz") == 0)
+ 		pager->wm = PAGER_WM_COMPIZ;
+
diff --git a/debian/patches/series b/debian/patches/series
index 83b110e..f4d0db9 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1,2 @@
+0001_update-marco-wm-name.patch
 2001_omit-gfdl-licensed-help-files.patch

-- 
mate-panel Debian package