shutdown disabled for now.

SVN revision: 20384

diff --git a/src/bin/e_gadcon.c b/src/bin/e_gadcon.c
index 8745b56..73a5b20 100644 (file)
--- a/src/bin/e_gadcon.c
+++ b/src/bin/e_gadcon.c
@@ -326,6 +326,11 @@ e_gadcon_canvas_zone_geometry_get(E_Gadcon *gc, int *x, int *y, int *w, int *h)
    E_OBJECT_TYPE_CHECK_RETURN(gc, E_GADCON_TYPE, 0);
    if (!gc->ecore_evas) return 0;
    ecore_evas_geometry_get(gc->ecore_evas, x, y, w, h);
+   if (gc->zone)
+     {
+       x -= gc->zone->x;
+       y -= gc->zone->y;
+     }
    return 1;
 }
 

diff --git a/src/bin/e_main.c b/src/bin/e_main.c
index eeabdc8..865c5a9 100644 (file)
--- a/src/bin/e_main.c
+++ b/src/bin/e_main.c
@@ -702,12 +702,13 @@ main(int argc, char **argv)
 
    /* Store current selected desktops */
    _e_main_desk_save();
-   
+#if 0   
    /* unroll our stack of shutdown functions with exit code of 0 */
    _e_main_shutdown(0);
    
    e_intl_shutdown();
-      
+#endif
+   
    /* if we were flagged to restart, then  restart. */
    if (restart)
      {

diff --git a/src/modules/start/e_mod_main.c b/src/modules/start/e_mod_main.c
index 4143a01..5e964ff 100644 (file)
--- a/src/modules/start/e_mod_main.c
+++ b/src/modules/start/e_mod_main.c
@@ -112,8 +112,6 @@ _button_cb_mouse_down(void *data, Evas *e, Evas_Object *obj, void *event_info)
        zone = e_gadcon_zone_get(inst->gcc->gadcon);
        if (!zone)
          zone = e_util_zone_current_get(e_manager_current_get());
-       x -= zone->x;
-       y -= zone->y;
        if (!inst->main_menu)
          inst->main_menu = e_int_menus_main_new();
        if (inst->main_menu)
@@ -128,25 +126,15 @@ _button_cb_mouse_down(void *data, Evas *e, Evas_Object *obj, void *event_info)
               {
                case E_GADCON_ORIENT_TOP:
                  dir = E_MENU_POP_DIRECTION_DOWN;
-// these make the menu pop off the panels' edge, not the module's object - not
-// a very generic thing though.
-//               y = cy;
-//               h = ch;
                  break;
                case E_GADCON_ORIENT_BOTTOM:
                  dir = E_MENU_POP_DIRECTION_UP;
-//               y = cy;
-//               h = ch;
                  break;
                case E_GADCON_ORIENT_LEFT:
                  dir = E_MENU_POP_DIRECTION_RIGHT;
-//               x = cx;
-//               w = cw;
                  break;
                case E_GADCON_ORIENT_RIGHT:
                  dir = E_MENU_POP_DIRECTION_LEFT;
-//               x = cx;
-//               w = cw;
                  break;
                default:
                  break;