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-button.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-button.c')
-rw-r--r-- | mate-panel/panel-menu-button.c | 13 |
1 files changed, 10 insertions, 3 deletions
diff --git a/mate-panel/panel-menu-button.c b/mate-panel/panel-menu-button.c index e37c736d..091c3993 100644 --- a/mate-panel/panel-menu-button.c +++ b/mate-panel/panel-menu-button.c @@ -636,6 +636,7 @@ panel_menu_button_load (const char *menu_path, gboolean locked, int position, gboolean exactpos, + gboolean has_arrow, const char *id) { PanelMenuButton *button; @@ -649,7 +650,7 @@ panel_menu_button_load (const char *menu_path, "tooltip", tooltip, "use-menu-path", use_menu_path, "use-custom-icon", use_custom_icon, - "has-arrow", TRUE, + "has-arrow", has_arrow, NULL); info = mate_panel_applet_register (GTK_WIDGET (button), NULL, NULL, @@ -664,8 +665,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); @@ -877,6 +879,7 @@ panel_menu_button_load_from_mateconf (PanelWidget *panel, char *tooltip; gboolean use_menu_path; gboolean use_custom_icon; + gboolean has_arrow; client = panel_mateconf_get_client (); @@ -895,6 +898,9 @@ panel_menu_button_load_from_mateconf (PanelWidget *panel, key = panel_mateconf_full_key (PANEL_MATECONF_OBJECTS, id, "use_custom_icon"); use_custom_icon = mateconf_client_get_bool (client, key, NULL); + key = panel_mateconf_full_key (PANEL_MATECONF_OBJECTS, id, "has_arrow"); + has_arrow = mateconf_client_get_bool (client, key, NULL); + panel_menu_button_load (menu_path, use_menu_path, custom_icon, @@ -904,6 +910,7 @@ panel_menu_button_load_from_mateconf (PanelWidget *panel, locked, position, exactpos, + has_arrow, id); g_free (menu_path); |