Enlightenment CVS committal
Author : devilhorns
Project : e17
Module : apps/e
Dir : e17/apps/e/src/bin
Modified Files:
e_gadcon.c
Log Message:
Efm modules don't support Plain/Inset, so no need for the menu entry there.
===================================================================
RCS file: /cvs/e/e17/apps/e/src/bin/e_gadcon.c,v
retrieving revision 1.86
retrieving revision 1.87
diff -u -3 -r1.86 -r1.87
--- e_gadcon.c 11 Nov 2007 17:44:29 -0000 1.86
+++ e_gadcon.c 12 Nov 2007 01:59:50 -0000 1.87
@@ -1231,35 +1231,34 @@
E_OBJECT_CHECK(gcc);
E_OBJECT_TYPE_CHECK(gcc, E_GADCON_CLIENT_TYPE);
-
- mn = e_menu_new();
-
- mi = e_menu_item_new(mn);
- e_menu_item_label_set(mi, _("Plain"));
- e_util_menu_item_edje_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)))
- e_menu_item_toggle_set(mi, 1);
- e_menu_item_callback_set(mi, _e_gadcon_client_cb_menu_style_plain, gcc);
-
- mi = e_menu_item_new(mn);
- e_menu_item_label_set(mi, _("Inset"));
- e_util_menu_item_edje_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_INSET)))
- e_menu_item_toggle_set(mi, 1);
- e_menu_item_callback_set(mi, _e_gadcon_client_cb_menu_style_inset, gcc);
-
- /***/
-
- mi = e_menu_item_new(menu);
- e_menu_item_label_set(mi, _("Appearance"));
- e_util_menu_item_edje_icon_set(mi, "enlightenment/appearance");
- e_menu_item_submenu_set(mi, mn);
- e_object_del(E_OBJECT(mn));
-
+
+ if (!gcc->gadcon->toolbar)
+ {
+ mn = e_menu_new();
+ mi = e_menu_item_new(mn);
+ e_menu_item_label_set(mi, _("Plain"));
+ e_util_menu_item_edje_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)))
+ e_menu_item_toggle_set(mi, 1);
+ e_menu_item_callback_set(mi, _e_gadcon_client_cb_menu_style_plain, gcc);
+
+ mi = e_menu_item_new(mn);
+ e_menu_item_label_set(mi, _("Inset"));
+ e_util_menu_item_edje_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_INSET)))
+ e_menu_item_toggle_set(mi, 1);
+ e_menu_item_callback_set(mi, _e_gadcon_client_cb_menu_style_inset, gcc);
+
+ mi = e_menu_item_new(menu);
+ e_menu_item_label_set(mi, _("Appearance"));
+ e_util_menu_item_edje_icon_set(mi, "enlightenment/appearance");
+ e_menu_item_submenu_set(mi, mn);
+ e_object_del(E_OBJECT(mn));
+ }
mi = e_menu_item_new(menu);
e_menu_item_label_set(mi, _("Automatically scroll contents"));
e_util_menu_item_edje_icon_set(mi, "enlightenment/autoscroll");
-------------------------------------------------------------------------
This SF.net email is sponsored by: Splunk Inc.
Still grepping through log files to find problems? Stop.
Now Search log events and configuration files using AJAX and a browser.
Download your FREE copy of Splunk now >> http://get.splunk.com/
_______________________________________________
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
