e17/pager: always show virtual desktop settings in top-level menu

SVN revision: 58002
This commit is contained in:
Hannes Janetzek 2011-03-22 23:07:30 +00:00
parent 5774e46608
commit 907f739312
1 changed files with 9 additions and 10 deletions

View File

@ -785,16 +785,7 @@ _button_cb_mouse_down(void *data, Evas *e __UNUSED__, Evas_Object *obj __UNUSED_
E_Menu_Item *mi;
int cx, cy;
m = e_menu_new();
if (e_configure_registry_exists("screen/virtual_desktops"))
{
mi = e_menu_item_new(m);
e_menu_item_label_set(mi, _("Virtual Desktops Settings"));
e_util_menu_item_theme_icon_set(mi, "preferences-desktop");
e_menu_item_callback_set(mi, _pager_inst_cb_menu_virtual_desktops_dialog, inst);
}
m = e_menu_new();
mi = e_menu_item_new(m);
e_menu_item_label_set(mi, _("Settings"));
e_util_menu_item_theme_icon_set(mi, "configure");
@ -804,6 +795,14 @@ _button_cb_mouse_down(void *data, Evas *e __UNUSED__, Evas_Object *obj __UNUSED_
e_menu_post_deactivate_callback_set(m, _menu_cb_post, inst);
pager_config->menu = m;
if (e_configure_registry_exists("screen/virtual_desktops"))
{
mi = e_menu_item_new_relative(m, NULL);
e_menu_item_label_set(mi, _("Virtual Desktops Settings"));
e_util_menu_item_theme_icon_set(mi, "preferences-desktop");
e_menu_item_callback_set(mi, _pager_inst_cb_menu_virtual_desktops_dialog, inst);
}
e_gadcon_canvas_zone_geometry_get(inst->gcc->gadcon, &cx, &cy,
NULL, NULL);
e_menu_activate_mouse(m,