Revert gadcon menu change.

SVN revision: 32936

src/e_mod_main.c

@@ -53,6 +53,7 @@ struct _Moon_Timer
 };
 
 static void          _button_cb_mouse_down(void *data, Evas *e, Evas_Object *obj, void *event_info); 
+static void          _menu_cb_post(void *data, E_Menu *m);
 static void          _moon_inst_cb_menu_configure(void *data, E_Menu *m, E_Menu_Item *mi);
 
 static void          _moon_timer_init();
@@ -233,13 +234,15 @@ _button_cb_mouse_down(void *data, Evas *e, Evas_Object *obj, void *event_info)
 
    inst = data;
    ev = event_info;
-   if ((ev->button == 3) && (!inst->gcc->menu))
+   if ((ev->button == 3) && (!moon_config->menu))
      {
 	E_Menu *mn;
 	E_Menu_Item *mi;
 	int cx, cy, cw, ch;
 
 	mn = e_menu_new();
+	e_menu_post_deactivate_callback_set(mn, _menu_cb_post, inst);
+	moon_config->menu = mn;
 	
 	mi = e_menu_item_new(mn); e_menu_item_label_set(mi, D_("Configuration"));
 	e_util_menu_item_edje_icon_set(mi, "enlightenment/configuration");
@@ -257,12 +260,21 @@ _button_cb_mouse_down(void *data, Evas *e, Evas_Object *obj, void *event_info)
      }
 }
 
+static void
+_menu_cb_post(void *data, E_Menu *m)
+{
+   if (!moon_config->menu) return;
+   e_object_del(E_OBJECT(moon_config->menu));
+   moon_config->menu = NULL;
+}
+
 static void
 _moon_inst_cb_menu_configure(void *data, E_Menu *m, E_Menu_Item *mi)
 {
    Evas_Object *o;
 
    o = data;
+   if (!moon_config->menu) return;
    if (moon_config->config_dialog) return;
    moon_config_dialog_show(o);
 }

src/e_mod_main.h

@@ -25,6 +25,7 @@ struct _Config
    Evas_List *faces;
 
    E_Config_Dialog *config_dialog;
+   E_Menu          *menu;
 };
 
 EAPI extern E_Module_Api e_modapi;