[mate-panel] 01/02: debian/patches: Add 1001_fix_menubar_launching_for_mozo.diff

[Martin Wimpress]

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

flexiondotorg-guest pushed a commit to branch ubuntu/artful
in repository mate-panel.

commit 291d1b5b278bec43ccbbd3d0731c54baac326064
Author: Martin Wimpress <martin.wimpress at ubuntu.com>
Date:   Sat Jun 10 15:29:37 2017 +0100

    debian/patches: Add 1001_fix_menubar_launching_for_mozo.diff
---
 .../1001_fix_menubar_launching_for_mozo.diff       | 55 ++++++++++++++++++++++
 debian/patches/series                              |  1 +
 2 files changed, 56 insertions(+)

diff --git a/debian/patches/1001_fix_menubar_launching_for_mozo.diff b/debian/patches/1001_fix_menubar_launching_for_mozo.diff
new file mode 100644
index 0000000..a251cd0
--- /dev/null
+++ b/debian/patches/1001_fix_menubar_launching_for_mozo.diff
@@ -0,0 +1,55 @@
+diff --git a/mate-panel/panel-menu-bar.c b/mate-panel/panel-menu-bar.c
+index fc13165..eefd2ec 100644
+--- a/mate-panel/panel-menu-bar.c
++++ b/mate-panel/panel-menu-bar.c
+@@ -404,15 +404,10 @@ void panel_menu_bar_invoke_menu(PanelMenuBar* menubar, const char* callback_name
+ 	}
+ 	else if (!strcmp(callback_name, "edit"))
+ 	{
+-		GError* error = NULL;
+-
+-		panel_launch_desktop_file_with_fallback("menulibre.desktop", "menulibre", screen, &error);
+-
+-		if (error)
+-		{
+-			g_error_free(error);
++		if (panel_is_program_in_path("menulibre"))
++			panel_launch_desktop_file_with_fallback("menulibre.desktop", "menulibre", screen, NULL);
++		else
+ 			panel_launch_desktop_file_with_fallback("mozo.desktop", "mozo", screen, NULL);
+-		}
+ 	}
+ }
+ 
+diff --git a/mate-panel/panel-menu-button.c b/mate-panel/panel-menu-button.c
+index 3fd7003..74cf0df 100644
+--- a/mate-panel/panel-menu-button.c
++++ b/mate-panel/panel-menu-button.c
+@@ -989,18 +989,15 @@ panel_menu_button_invoke_menu (PanelMenuButton *button,
+ 		panel_show_help (screen, "mate-user-guide", "gospanel-37", NULL);
+ 
+ 	} else if (!strcmp (callback_name, "edit")) {
+-                GError *error = NULL;
+-
+-		panel_launch_desktop_file_with_fallback ("menulibre.desktop",
+-							 "menulibre",
+-							 screen, &error);
+-		if (error) {
+-			g_error_free (error);
+-			panel_launch_desktop_file_with_fallback (
+-						"mozo.desktop",
+-						"mozo",
+-						screen, NULL);
+-		}
++
++		if (panel_is_program_in_path ("menulibre"))
++			panel_launch_desktop_file_with_fallback ("menulibre.desktop",
++								 "menulibre",
++								 screen, NULL);
++		else
++			panel_launch_desktop_file_with_fallback ("mozo.desktop",
++								 "mozo",
++								 screen, NULL);
+ 	}
+ }
+ 
diff --git a/debian/patches/series b/debian/patches/series
index 747316b..ab74db0 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1,2 @@
 1000_prevent_menubar_destruction_when_enabling_global_menus.patch
+1001_fix_menubar_launching_for_mozo.diff

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