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
commitb8c7cf601e09283dfd7238c56fd74e6ea297aecb (patch)
tree92b5387ae53d80ecafcee6df72eee7b9a4b3e28a
parent95a4ff895b1356bcca05a375f4b93bd75491de9a (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_net.c16
1 files changed, 6 insertions, 10 deletions
diff --git a/src/e_mod_net.c b/src/e_mod_net.c
index 4663eb8..f50978a 100644
--- a/src/e_mod_net.c
+++ b/src/e_mod_net.c
@@ -153,25 +153,21 @@ _net_cb_mouse_down(void *data, Evas *evas, Evas_Object *obj, void *event)
153 e_gadcon_popup_toggle_pinned(inst->popup); 153 e_gadcon_popup_toggle_pinned(inst->popup);
154 else if ((ev->button == 3) && (!net_cfg->menu)) 154 else if ((ev->button == 3) && (!net_cfg->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; 158 int x, y;
159 159
160 ma = e_menu_new(); 160 m = e_menu_new();
161 e_menu_post_deactivate_callback_set(ma, _cb_post, inst); 161 mi = e_menu_item_new(m);
162 net_cfg->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, _cb_configure, inst); 164 e_menu_item_callback_set(mi, _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
172 e_gadcon_canvas_zone_geometry_get(inst->gcc->gadcon, &x, &y, 168 e_gadcon_canvas_zone_geometry_get(inst->gcc->gadcon, &x, &y,
173 NULL, NULL); 169 NULL, NULL);
174 e_menu_activate_mouse(ma, 170 e_menu_activate_mouse(m,
175 e_util_zone_current_get(e_manager_current_get()), 171 e_util_zone_current_get(e_manager_current_get()),
176 x + ev->output.x, y + ev->output.y, 1, 1, 172 x + ev->output.x, y + ev->output.y, 1, 1,
177 E_MENU_POP_DIRECTION_DOWN, ev->timestamp); 173 E_MENU_POP_DIRECTION_DOWN, ev->timestamp);