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
commit8a4eae2b9857dbb645c8a3ae68ed71777186d0c8 (patch)
tree46fbd117a23816265cb38ff4c3fab722a6c612f9
parent1d2f71486fe3c88cdf56b2ab3f96d1916b85ea77 (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.c18
1 files changed, 8 insertions, 10 deletions
diff --git a/src/e_mod_main.c b/src/e_mod_main.c
index 2c83e12..89aff6f 100644
--- a/src/e_mod_main.c
+++ b/src/e_mod_main.c
@@ -153,24 +153,22 @@ _mem_cb_mouse_down (void *data, Evas * e, Evas_Object * obj, void *event_info)
153 ev = event_info; 153 ev = event_info;
154 if ((ev->button == 3) && (!mem_config->menu)) 154 if ((ev->button == 3) && (!mem_config->menu))
155 { 155 {
156 E_Menu *ma, *mg; 156 E_Menu *m;
157 E_Menu_Item *mi; 157 E_Menu_Item *mi;
158 int x, y, w, h; 158 int x, y, w, h;
159 159
160 ma = e_menu_new (); 160 m = e_menu_new ();
161 e_menu_post_deactivate_callback_set (ma, _mem_menu_cb_post, inst); 161 mi = e_menu_item_new (m);
162 mem_config->menu = ma;
163
164 mg = e_menu_new ();
165
166 mi = e_menu_item_new (mg);
167 e_menu_item_label_set (mi, D_ ("Settings")); 162 e_menu_item_label_set (mi, D_ ("Settings"));
168 e_util_menu_item_theme_icon_set(mi, "preferences-system"); 163 e_util_menu_item_theme_icon_set(mi, "preferences-system");
169 e_menu_item_callback_set (mi, _mem_menu_cb_configure, inst); 164 e_menu_item_callback_set (mi, _mem_menu_cb_configure, inst);
170 165
171 e_gadcon_client_util_menu_items_append (inst->gcc, ma, mg, 0); 166 m = e_gadcon_client_util_menu_items_append (inst->gcc, m, 0);
167 e_menu_post_deactivate_callback_set (m, _mem_menu_cb_post, inst);
168 mem_config->menu = m;
169
172 e_gadcon_canvas_zone_geometry_get (inst->gcc->gadcon, &x, &y, &w, &h); 170 e_gadcon_canvas_zone_geometry_get (inst->gcc->gadcon, &x, &y, &w, &h);
173 e_menu_activate_mouse (ma, 171 e_menu_activate_mouse (m,
174 e_util_zone_current_get (e_manager_current_get 172 e_util_zone_current_get (e_manager_current_get
175 ()), x + ev->output.x, 173 ()), x + ev->output.x,
176 y + ev->output.y, 1, 1, 174 y + ev->output.y, 1, 1,