summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSebastien Bacher <[email protected]>2009-07-10 14:24:56 +0200
committerBenjamin Valentin <[email protected]>2012-03-26 23:59:59 +0200
commit4cd113800b89a73dfa77ed4081811055a4cbe23e (patch)
tree9d48c791a9a8644acd1ca09fab9acfcb37369ce7
parent8c25e1bdd328a8712735c0b00cf4aede7993da1d (diff)
downloadmate-panel-4cd113800b89a73dfa77ed4081811055a4cbe23e.tar.bz2
mate-panel-4cd113800b89a73dfa77ed4081811055a4cbe23e.tar.xz
lockdown locks the menu editor entry too
Bug: http://bugzilla.gnome.org/show_bug.cgi?id=499148 Bug-Ubuntu: https://bugs.launchpad.net/bugs/4712
-rw-r--r--mate-panel/panel-menu-bar.c2
-rw-r--r--mate-panel/panel-menu-button.c5
2 files changed, 4 insertions, 3 deletions
diff --git a/mate-panel/panel-menu-bar.c b/mate-panel/panel-menu-bar.c
index 05e26850..1a2d3ac6 100644
--- a/mate-panel/panel-menu-bar.c
+++ b/mate-panel/panel-menu-bar.c
@@ -288,7 +288,7 @@ static void panel_menu_bar_load(PanelWidget* panel, gboolean locked, int positio
mate_panel_applet_add_callback(menubar->priv->info, "help", GTK_STOCK_HELP, _("_Help"), NULL);
/* Menu editors */
- if (panel_is_program_in_path("mozo") || panel_is_program_in_path("matemenu-simple-editor"))
+ if (!panel_lockdown_get_locked_down () && (panel_is_program_in_path("mozo") || panel_is_program_in_path("matemenu-simple-editor")))
{
mate_panel_applet_add_callback (menubar->priv->info, "edit", NULL, _("_Edit Menus"), NULL);
}
diff --git a/mate-panel/panel-menu-button.c b/mate-panel/panel-menu-button.c
index e37c736d..6a08291a 100644
--- a/mate-panel/panel-menu-button.c
+++ b/mate-panel/panel-menu-button.c
@@ -664,8 +664,9 @@ panel_menu_button_load (const char *menu_path,
mate_panel_applet_add_callback (info, "help", GTK_STOCK_HELP, _("_Help"), NULL);
- if (panel_is_program_in_path ("mozo") ||
- panel_is_program_in_path ("matemenu-simple-editor"))
+ if (!panel_lockdown_get_locked_down () &&
+ (panel_is_program_in_path ("mozo") ||
+ panel_is_program_in_path ("matemenu-simple-editor")))
mate_panel_applet_add_callback (info, "edit", NULL,
_("_Edit Menus"), NULL);