[mate-panel] 06/06: debian/patches: Remove obsolete patches 0001_update-marco-wm-name.patch and 0002_avoid-dereferencing-NULL-pointer.patch.

[Martin Wimpress]

This is an automated email from the git hooks/post-receive script.

flexiondotorg-guest pushed a commit to branch master
in repository mate-panel.

commit 734e41fd803b31685440ad3d723f2afaa9eaa95c
Author: Martin Wimpress <code at flexion.org>
Date:   Mon Nov 9 19:59:30 2015 +0000

    debian/patches: Remove obsolete patches 0001_update-marco-wm-name.patch and 0002_avoid-dereferencing-NULL-pointer.patch.
---
 debian/patches/0001_update-marco-wm-name.patch     | 23 ----------------------
 .../0002_avoid-dereferencing-NULL-pointer.patch    | 23 ----------------------
 2 files changed, 46 deletions(-)

diff --git a/debian/patches/0001_update-marco-wm-name.patch b/debian/patches/0001_update-marco-wm-name.patch
deleted file mode 100644
index b990ecb..0000000
--- a/debian/patches/0001_update-marco-wm-name.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-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(-)
-
---- a/applets/wncklet/workspace-switcher.c
-+++ b/applets/wncklet/workspace-switcher.c
-@@ -143,7 +143,7 @@
- 
- 	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/0002_avoid-dereferencing-NULL-pointer.patch b/debian/patches/0002_avoid-dereferencing-NULL-pointer.patch
deleted file mode 100644
index b56f932..0000000
--- a/debian/patches/0002_avoid-dereferencing-NULL-pointer.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-From 728faccf9ad9e6f6eff796c0d7f9f95a34e1885d Mon Sep 17 00:00:00 2001
-From: monsta <monsta at inbox.ru>
-Date: Thu, 5 Mar 2015 17:56:43 +0300
-Subject: [PATCH] fix logic a bit - avoid dereferencing NULL pointer
-
----
- mate-panel/libpanel-util/panel-list.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/mate-panel/libpanel-util/panel-list.c b/mate-panel/libpanel-util/panel-list.c
-index 154153c..3c0a9ee 100644
---- a/mate-panel/libpanel-util/panel-list.c
-+++ b/mate-panel/libpanel-util/panel-list.c
-@@ -166,7 +166,7 @@ panel_g_list_resort_item (GList        *list,
- 
- 	dl = g_list_find (list, data);
- 
--	if (dl != NULL)
-+	if (dl == NULL)
- 		return list;
- 
- 	while (dl->next &&
-

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-mate/mate-panel.git