From a658db27825aea175cb748dc5d8d424b0b9d4043 Mon Sep 17 00:00:00 2001 From: Mike Blumenkrantz Date: Tue, 18 Dec 2012 09:30:35 +0000 Subject: [PATCH] use e_util_strcmp, set current gadcon style menu item to disabled, only use default style as menu item if current style not set ticket #2023 SVN revision: 81226 --- src/bin/e_gadcon.c | 18 ++++++++---------- 1 file changed, 8 insertions(+), 10 deletions(-) diff --git a/src/bin/e_gadcon.c b/src/bin/e_gadcon.c index 97ffc6c95..70a172565 100644 --- a/src/bin/e_gadcon.c +++ b/src/bin/e_gadcon.c @@ -1760,13 +1760,12 @@ e_gadcon_client_util_menu_items_append(E_Gadcon_Client *gcc, E_Menu *menu_gadget e_util_menu_item_theme_icon_set(mi, "enlightenment/plain"); e_menu_item_radio_group_set(mi, 1); e_menu_item_radio_set(mi, 1); - if ((gcc->style) && - (!strcmp(gcc->style, E_GADCON_CLIENT_STYLE_PLAIN))) + if (!e_util_strcmp(gcc->style, E_GADCON_CLIENT_STYLE_PLAIN)) e_menu_item_toggle_set(mi, 1); - else if ((gcc->client_class->default_style) && - (!strcmp(gcc->client_class->default_style, - E_GADCON_CLIENT_STYLE_PLAIN))) + else if ((!gcc->style) && + (!e_util_strcmp(gcc->client_class->default_style, E_GADCON_CLIENT_STYLE_PLAIN))) e_menu_item_toggle_set(mi, 1); + e_menu_item_disabled_set(mi, mi->toggle); e_menu_item_callback_set(mi, _e_gadcon_client_cb_menu_style_plain, gcc); mi = e_menu_item_new(mo); @@ -1774,13 +1773,12 @@ e_gadcon_client_util_menu_items_append(E_Gadcon_Client *gcc, E_Menu *menu_gadget e_util_menu_item_theme_icon_set(mi, "enlightenment/inset"); e_menu_item_radio_group_set(mi, 1); e_menu_item_radio_set(mi, 1); - if ((gcc->style) && - (!strcmp(gcc->style, E_GADCON_CLIENT_STYLE_INSET))) + if (!e_util_strcmp(gcc->style, E_GADCON_CLIENT_STYLE_INSET)) e_menu_item_toggle_set(mi, 1); - else if ((gcc->client_class->default_style) && - (!strcmp(gcc->client_class->default_style, - E_GADCON_CLIENT_STYLE_INSET))) + else if ((!gcc->style) && + (!e_util_strcmp(gcc->client_class->default_style, E_GADCON_CLIENT_STYLE_INSET))) e_menu_item_toggle_set(mi, 1); + e_menu_item_disabled_set(mi, mi->toggle); e_menu_item_callback_set(mi, _e_gadcon_client_cb_menu_style_inset, gcc); mi = e_menu_item_new(menu_gadget);