summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorHannes Janetzek <hannes.janetzek@gmail.com>2011-03-17 17:24:53 +0000
committerHannes Janetzek <hannes.janetzek@gmail.com>2011-03-17 17:24:53 +0000
commita30e4492337d913972dfb498db9af84ab75d07b6 (patch)
treec49f2e65dfbd605a26badca73a32525635dda0f2
parentc3f42c41b9920ab1273204072327d0ef2b843c86 (diff)
e-modules: update do e_gadcon_util_cliet_menu_append api changes. allowing to have settings menu in toplevel again
SVN revision: 57828
-rw-r--r--src/e_mod_main.c19
1 files changed, 8 insertions, 11 deletions
diff --git a/src/e_mod_main.c b/src/e_mod_main.c
index 0aee347..54659e1 100644
--- a/src/e_mod_main.c
+++ b/src/e_mod_main.c
@@ -233,26 +233,23 @@ _empris_cb_mouse_down (void *data, Evas * e, Evas_Object * obj,
233 ev = event_info; 233 ev = event_info;
234 if ((ev->button == 3) && (!empris_config->menu)) 234 if ((ev->button == 3) && (!empris_config->menu))
235 { 235 {
236 E_Menu *mn, *mg; 236 E_Menu *m;
237 E_Menu_Item *mi; 237 E_Menu_Item *mi;
238 int x, y, w, h; 238 int x, y, w, h;
239 239
240 mn = e_menu_new (); 240 m = e_menu_new ();
241 mg = e_menu_new ();
242 e_menu_post_deactivate_callback_set (mn, _empris_menu_cb_post, inst);
243 empris_config->menu = mn;
244 241
245 mi = e_menu_item_new (mn); 242 m = e_gadcon_client_util_menu_items_append (inst->gcc, m, 0);
243 e_menu_post_deactivate_callback_set (m, _empris_menu_cb_post, inst);
244 empris_config->menu = m;
245
246 mi = e_menu_item_new_relative(m, NULL);
246 e_menu_item_label_set (mi, D_ ("Configuration")); 247 e_menu_item_label_set (mi, D_ ("Configuration"));
247 e_util_menu_item_theme_icon_set(mi, "preferences-system"); 248 e_util_menu_item_theme_icon_set(mi, "preferences-system");
248 e_menu_item_callback_set (mi, _empris_menu_cb_configure, inst); 249 e_menu_item_callback_set (mi, _empris_menu_cb_configure, inst);
249 250
250 mi = e_menu_item_new (mn);
251 e_menu_item_separator_set (mi, 1);
252
253 e_gadcon_client_util_menu_items_append (inst->gcc, mn,mg, 0);
254 e_gadcon_canvas_zone_geometry_get (inst->gcc->gadcon, &x, &y, &w, &h); 251 e_gadcon_canvas_zone_geometry_get (inst->gcc->gadcon, &x, &y, &w, &h);
255 e_menu_activate_mouse (mn, 252 e_menu_activate_mouse (m,
256 e_util_zone_current_get (e_manager_current_get 253 e_util_zone_current_get (e_manager_current_get
257 ()), x + ev->output.x, 254 ()), x + ev->output.x,
258 y + ev->output.y, 1, 1, 255 y + ev->output.y, 1, 1,