E SVN: watchwolf IN trunk/E-MODULES-EXTRA/exalt-client: . src

[Enlightenment S. <no-...@en...>]

Log:
  
  Move the module in "Extensions" instead of "Advanced"
  
  fix a bug when the module was shutdown but the timer still enable
  
  
  
  
Author:       watchwolf
Date:         2009-08-10 11:14:58 -0700 (Mon, 10 Aug 2009)
New Revision: 41670

Modified:
  trunk/E-MODULES-EXTRA/exalt-client/configure.ac trunk/E-MODULES-EXTRA/exalt-client/src/e_mod_main.c trunk/E-MODULES-EXTRA/exalt-client/src/e_mod_main.h 

Modified: trunk/E-MODULES-EXTRA/exalt-client/configure.ac
===================================================================
--- trunk/E-MODULES-EXTRA/exalt-client/configure.ac	2009-08-10 18:13:46 UTC (rev 41669)
+++ trunk/E-MODULES-EXTRA/exalt-client/configure.ac	2009-08-10 18:14:58 UTC (rev 41670)
@@ -68,6 +68,24 @@
     AC_DEFINE_UNQUOTED(ELIVE, "${elive}", [Use the special Elive extension])
 fi
 
+AC_ARG_ENABLE([shave],
+              [  --disable-shave                  Use shave output cleaner when building.],
+              [ case "${enableval}" in
+               yes)    enable_shave=yes;;
+               no)    enable_shave=no;;
+               *)    AC_MSG_ERROR([bad value ${enableval} for --disable-shave]);;
+               esac],
+               [enable_shave=yes])
+
+if test x$enable_shave = xyes; then
+    SHAVE_INIT([./])
+fi
+
+AC_CONFIG_FILES([
+    shave
+    shave-libtool
+])
+
 AC_OUTPUT([
 Makefile
 src/Makefile

Modified: trunk/E-MODULES-EXTRA/exalt-client/src/e_mod_main.c
===================================================================
--- trunk/E-MODULES-EXTRA/exalt-client/src/e_mod_main.c	2009-08-10 18:13:46 UTC (rev 41669)
+++ trunk/E-MODULES-EXTRA/exalt-client/src/e_mod_main.c	2009-08-10 18:14:58 UTC (rev 41670)
@@ -62,10 +62,10 @@
     /* Display this Modules config info in the main Config Panel */
 
     /* starts with a category */
-    e_configure_registry_category_add("advanced", 80, "Advanced",
-            NULL, "preferences-advanced");
+    e_configure_registry_category_add("extensions", 80, "Extensions",
+            NULL, "preferences-extensions");
     /* add right-side item */
-    e_configure_registry_item_add("advanced/exalt", 110, "exalt",
+    e_configure_registry_item_add("extensions/exalt", 110, "exalt",
             NULL, buf, e_int_config_exalt_module);
 
     /* Define EET Data Storage */
@@ -216,6 +216,7 @@
     {
         exalt_dbus_notify_set(inst->conn,notify_cb,inst);
         exalt_dbus_scan_notify_set(inst->conn,notify_scan_cb,inst);
+        inst->timer_test_service = NULL;
         return 0;
     }
     else
@@ -269,7 +270,7 @@
     {
         //exalt service doesn't exists
         //launch a timer to re-test
-        Ecore_Timer *timer = ecore_timer_add(5,timer_test_service_cb,inst);
+        inst->timer_test_service = ecore_timer_add(5,timer_test_service_cb,inst);
     }
     else
     {
@@ -323,6 +324,9 @@
     if (!(inst = gcc->data)) return;
     instances = eina_list_remove(instances, inst);
 
+    if(inst->timer_test_service)
+        ecore_timer_del(inst->timer_test_service);
+
     /* kill popup menu */
     if (inst->menu)
     {
@@ -347,7 +351,7 @@
 
     exalt_dbus_free(&(inst->conn));
     exalt_dbus_shutdown();
-    //e_notification_shutdown();
+    e_notification_shutdown();
 
     E_FREE(inst);
 }

Modified: trunk/E-MODULES-EXTRA/exalt-client/src/e_mod_main.h
===================================================================
--- trunk/E-MODULES-EXTRA/exalt-client/src/e_mod_main.h	2009-08-10 18:13:46 UTC (rev 41669)
+++ trunk/E-MODULES-EXTRA/exalt-client/src/e_mod_main.h	2009-08-10 18:14:58 UTC (rev 41670)
@@ -265,6 +265,8 @@
 
     Exalt_DBus_Conn *conn;
 
+    Ecore_Timer *timer_test_service;
+
     /* popup anyone ? */
     E_Menu *menu;
     E_Menu *sub_menu;