diff options
| author | Marcel Dijkstra <[email protected]> | 2012-05-23 02:33:19 +0200 |
|---|---|---|
| committer | Marcel Dijkstra <[email protected]> | 2012-05-23 02:33:19 +0200 |
| commit | 13d41840ccb39bebe44b52653ba8d59b0c4985a0 (patch) | |
| tree | 913ab19cfa015a5ec63ff66c37a6d67696c347d1 /mate-panel/panel-menu-bar.c | |
| parent | d3b927a321242e36abdb1e4acc488cde7899800e (diff) | |
| parent | 9af851f0c4f0296eb5654233b9fc251e9377c8b9 (diff) | |
| download | mate-panel-13d41840ccb39bebe44b52653ba8d59b0c4985a0.tar.bz2 mate-panel-13d41840ccb39bebe44b52653ba8d59b0c4985a0.tar.xz | |
Merge remote-tracking branch 'upstream/master' into slave
Diffstat (limited to 'mate-panel/panel-menu-bar.c')
| -rw-r--r-- | mate-panel/panel-menu-bar.c | 2 |
1 files changed, 1 insertions, 1 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); } |