diff options
| author | Steve Zesch <[email protected]> | 2012-05-10 12:59:42 -0700 |
|---|---|---|
| committer | Steve Zesch <[email protected]> | 2012-05-10 12:59:42 -0700 |
| commit | 69769af51fe3f072bfd2612a27afc095eb67384f (patch) | |
| tree | d6763f371a423ce34a333b457c66ef69019fa219 /mate-panel/panel-menu-button.c | |
| parent | 9639e4e9ccdbf44e8a4a29a57c23cc7c4cf05253 (diff) | |
| parent | 4cd113800b89a73dfa77ed4081811055a4cbe23e (diff) | |
| download | mate-panel-69769af51fe3f072bfd2612a27afc095eb67384f.tar.bz2 mate-panel-69769af51fe3f072bfd2612a27afc095eb67384f.tar.xz | |
Merge pull request #18 from benpicco/upstream
pull in upstream changes & fixes
Diffstat (limited to 'mate-panel/panel-menu-button.c')
| -rw-r--r-- | mate-panel/panel-menu-button.c | 5 |
1 files changed, 3 insertions, 2 deletions
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); |