Add start of notification support.

SVN revision: 51629

4 files changed, 31 insertions, 3 deletions

diff --git a/src/modules/illume-indicator/Makefile.am b/src/modules/illume-indicator/Makefile.am
index 67aa728aa5..4fec1f5a3e 100644
--- a/src/modules/illume-indicator/Makefile.am
+++ b/src/modules/illume-indicator/Makefile.am
@@ -24,7 +24,7 @@ INCLUDES               = -I. \
                          -I$(top_srcdir)/src/bin \
                          -I$(top_srcdir)/src/lib \
                          -I$(top_srcdir)/src/modules \
-                         @e_cflags@
+                         @e_cflags@ @ENOTIFY_CFLAGS@
 
 pkgdir                 = $(libdir)/enlightenment/modules/$(MODULE)/$(MODULE_ARCH)
 pkg_LTLIBRARIES        = module.la
@@ -37,7 +37,7 @@ module_la_SOURCES      = \
                        e_mod_main.c \
                        e_mod_main.h
 
-module_la_LIBADD       = @e_libs@ @dlopen_libs@
+module_la_LIBADD       = @e_libs@ @ENOTIFY_LIBS@ @dlopen_libs@
 module_la_LDFLAGS      = -module -avoid-version
 module_la_DEPENDENCIES = $(top_builddir)/config.h
 
diff --git a/src/modules/illume-indicator/e_mod_ind_win.c b/src/modules/illume-indicator/e_mod_ind_win.c
index 9b406bfb1b..c3c964e0c8 100644
--- a/src/modules/illume-indicator/e_mod_ind_win.c
+++ b/src/modules/illume-indicator/e_mod_ind_win.c
@@ -189,7 +189,8 @@ _e_mod_ind_win_cb_win_prop(void *data, int type __UNUSED__, void *event)
    ev = event;
 
    if (!(iwin = data)) return ECORE_CALLBACK_PASS_ON;
-   if (ev->win != iwin->win->container->manager->root) return ECORE_CALLBACK_PASS_ON;
+   if (ev->win != iwin->win->container->manager->root) 
+     return ECORE_CALLBACK_PASS_ON;
    if (ev->atom != ATM_ENLIGHTENMENT_SCALE) return ECORE_CALLBACK_PASS_ON;
 
    /* set minimum size of this window */
diff --git a/src/modules/illume-indicator/e_mod_main.c b/src/modules/illume-indicator/e_mod_main.c
index 4e45e6e264..8b6731df90 100644
--- a/src/modules/illume-indicator/e_mod_main.c
+++ b/src/modules/illume-indicator/e_mod_main.c
@@ -32,6 +32,21 @@ e_modapi_init(E_Module *m)
         return NULL;
      }
 
+#ifdef HAVE_ENOTIFY
+   /* init notification subsystem */
+   if (!e_notification_init()) 
+     {
+        /* shutdown config */
+        il_ind_config_shutdown();
+
+        /* clear module directory variable */
+        if (_ind_mod_dir) eina_stringshare_del(_ind_mod_dir);
+        _ind_mod_dir = NULL;
+
+        return NULL;
+     }
+#endif
+
    /* loop through the managers (root windows) */
    EINA_LIST_FOREACH(e_manager_list(), ml, man) 
      {
@@ -44,6 +59,9 @@ e_modapi_init(E_Module *m)
              E_Zone *zone;
              Eina_List *zl;
 
+             /* TODO: Make this configurable so illume2 can be run
+              * on just one zone/screen/etc */
+
              /* for each zone, create an indicator window */
              EINA_LIST_FOREACH(con->zones, zl, zone) 
                {
@@ -72,6 +90,11 @@ e_modapi_shutdown(E_Module *m __UNUSED__)
    ecore_x_e_illume_indicator_geometry_set(ecore_x_window_root_first_get(), 
                                            0, 0, 0, 0);
 
+#ifdef HAVE_ENOTIFY
+   /* shutdown notification subsystem */
+   e_notification_shutdown();
+#endif
+
    /* shutdown config */
    il_ind_config_shutdown();
 
diff --git a/src/modules/illume-indicator/e_mod_main.h b/src/modules/illume-indicator/e_mod_main.h
index 9591f0c1fe..72aad6728e 100644
--- a/src/modules/illume-indicator/e_mod_main.h
+++ b/src/modules/illume-indicator/e_mod_main.h
@@ -1,6 +1,10 @@
 #ifndef E_MOD_MAIN_H
 # define E_MOD_MAIN_H
 
+# ifdef HAVE_ENOTIFY
+#  include <E_Notify.h>
+# endif
+
 EAPI extern E_Module_Api e_modapi;
 
 EAPI void *e_modapi_init(E_Module *m);