[Rollback]

diff --git a/ChangeLog b/ChangeLog
index ed3c9f5..e69de29 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,8 +0,0 @@
-2011-01-29  Carsten Haitzler (The Rasterman)
-
-        1.0.0 release
-
-2011-02-25  Cedric BAIL
-
-       * Fix build with DSO.
-

diff --git a/autogen.sh b/autogen.sh
index 743d752..11b419b 100755 (executable)
--- a/autogen.sh
+++ b/autogen.sh
@@ -1,11 +1,14 @@
-#!/bin/sh
+#! /bin/sh
+
+rm -rf autom4te.cache
+rm -f aclocal.m4 ltmain.sh
 
 echo "Running aclocal..." ; aclocal $ACLOCAL_FLAGS -I m4 || exit 1
-echo "Running autoheader..." ; autoheader || exit 1
-echo "Running autoconf..." ; autoconf || exit 1
-echo "Running libtoolize..." ; (libtoolize --copy --automake || glibtoolize --automake) || exit 1
-echo "Running automake..." ; automake --add-missing --copy --gnu || exit 1
+echo "Running autoheader..."; autoheader || exit 1
+echo "Running libtoolize..."; (libtoolize --copy --automake || glibtoolize --automake) || exit 1
+echo "Running automake..."; automake --gnu --add-missing --copy || exit 1
+echo "Running autoconf..."; autoconf || exit 1
 
-if [ -z "$NOCONFIGURE" ]; then
-       ./configure -C "$@"
+if [ -z "$NOCONFIGURE" ] ; then
+  ./configure "$@"
 fi

diff --git a/configure.ac b/configure.ac
index 9f05131..37485e9 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -2,11 +2,11 @@
 ##--##--##--##--##--##--##--##--##--##--##--##--##--##--##--##--##
 m4_define([v_maj], [1])
 m4_define([v_min], [0])
-m4_define([v_mic], [999])
-m4_define([v_rev], m4_esyscmd([(svnversion "${SVN_REPO_PATH:-.}" | grep -v export || echo 0) | awk -F : '{printf("%s\n", $1);}' | tr -d ' :MSP\n']))
+m4_define([v_mic], [0])
+m4_define([v_rev], m4_esyscmd([(svnversion "${SVN_REPO_PATH:-.}" | grep -v exported || echo 0) | awk -F : '{printf("%s\n", $1);}' | tr -d ' :MSP\n']))
 m4_if(v_rev, [0], [m4_define([v_rev], m4_esyscmd([git log 2> /dev/null | (grep -m1 git-svn-id || echo 0) | sed -e 's/.*@\([0-9]*\).*/\1/' | tr -d '\n']))])
 ##--   When released, remove the dnl on the below line
-dnl m4_undefine([v_rev])
+m4_undefine([v_rev])
 ##--   When doing snapshots - change soname. remove dnl on below line
 dnl m4_define([relname], [ver-pre-svn-07])
 dnl m4_define([v_rel], [-release relname])
@@ -19,7 +19,7 @@ m4_define([lt_age], v_min)
 ##--##--##--##--##--##--##--##--##--##--##--##--##--##--##--##--##
 ##--##--##--##--##--##--##--##--##--##--##--##--##--##--##--##--##
 
-AC_INIT([e_dbus], [v_ver], [enlightenment-devel@lists.sourceforge.net])
+AC_INIT([e_dbus], [v_ver.beta3], [enlightenment-devel@lists.sourceforge.net])
 AC_PREREQ([2.52])
 AC_CONFIG_SRCDIR([configure.ac])
 AC_CONFIG_MACRO_DIR([m4])
@@ -236,7 +236,7 @@ fi
 
 if test "x${have_edbus_notify_send}" = "xyes" ; then
    PKG_CHECK_MODULES([EDBUS_NOTIFY_SEND],
-      [ecore >= 1.0.0 evas >= 1.0.0 eina >= 1.0.0 dbus-1 >= 0.62],
+      [ecore >= 1.0.0 evas >= 1.0.0 dbus-1 >= 0.62],
       [have_edbus_notify_send="yes"],
       [have_edbus_notify_send="no"])
 fi

diff --git a/e_dbus.spec.in b/e_dbus.spec.in
index 4dcc08e..354ea68 100644 (file)
--- a/e_dbus.spec.in
+++ b/e_dbus.spec.in
@@ -57,7 +57,7 @@ test "x$RPM_BUILD_ROOT" != "x/" && rm -rf $RPM_BUILD_ROOT
 
 %files devel
 %defattr(-, root, root)
-%{_includedir}/e_dbus-1/*.h
+%{_includedir}/*.h
 %{_libdir}/*.so
 %{_libdir}/*.la
 %{_libdir}/*.a

diff --git a/src/bin/notify-send.c b/src/bin/notify-send.c
index 96c1dec..89be670 100644 (file)
--- a/src/bin/notify-send.c
+++ b/src/bin/notify-send.c
@@ -80,8 +80,6 @@ main(int argc, char **argv)
   int print_id = 0;
   E_Notification *n;
 
-  eina_init();
-  ecore_init();
   e_notification_init();
   n = e_notification_new();
   e_notification_app_name_set(n, "e-notify-send");
@@ -172,8 +170,6 @@ main(int argc, char **argv)
 
   e_notification_unref(n);
   e_notification_shutdown();
-  ecore_shutdown();
-  eina_shutdown();
 
   return EXIT_SUCCESS;
 }

diff --git a/src/lib/dbus/e_dbus.c b/src/lib/dbus/e_dbus.c
index efec884..8cade04 100644 (file)
--- a/src/lib/dbus/e_dbus.c
+++ b/src/lib/dbus/e_dbus.c
@@ -112,7 +112,7 @@ e_dbus_handler_data_free(void *data)
   DBG("e_dbus_handler_data_free");
   if (hd->fd_handler)
   {
-    hd->cd->fd_handlers = eina_list_remove(hd->cd->fd_handlers, hd->fd_handler);
+    hd->cd->fd_handlers = eina_list_remove(hd->cd->fd_handlers, hd->cd->fd_handlers);
     ecore_main_fd_handler_del(hd->fd_handler);
   }
   free(hd);
@@ -340,7 +340,7 @@ cb_watch_del(DBusWatch *watch, void *data __UNUSED__)
 
   if (hd->fd_handler) 
   {
-    hd->cd->fd_handlers = eina_list_remove(hd->cd->fd_handlers, hd->fd_handler);
+    hd->cd->fd_handlers = eina_list_remove(hd->cd->fd_handlers, hd->cd->fd_handlers);
     ecore_main_fd_handler_del(hd->fd_handler);
     hd->fd_handler = NULL;
   }
@@ -604,26 +604,17 @@ e_dbus_init(void)
   
   if (!eina_init())
     {
-      fprintf(stderr,"E-dbus: Enable to initialize eina\n");
+      fprintf(stderr,"E-dbus: Enable to initialize the eina module");
       return --_edbus_init_count;
     }
 
   _e_dbus_log_dom = eina_log_domain_register("e_dbus", E_DBUS_COLOR_DEFAULT);
   if (_e_dbus_log_dom < 0)
     {
-      EINA_LOG_ERR("Unable to create an 'e_dbus' log domain");
+      EINA_LOG_ERR("Enable to create a 'e_dbus' log domain");
       eina_shutdown();
       return --_edbus_init_count;
     }
-  if (!ecore_init())
-    {
-      ERR("E-dbus: Unable to initialize ecore");
-      eina_log_domain_unregister(_e_dbus_log_dom);
-      _e_dbus_log_dom = -1;
-      eina_shutdown();
-      return --_edbus_init_count;
-    }
-
 
   E_DBUS_EVENT_SIGNAL = ecore_event_type_new();
   e_dbus_object_init();
@@ -641,7 +632,6 @@ e_dbus_shutdown(void)
     return _edbus_init_count;
 
   e_dbus_object_shutdown();
-  ecore_shutdown();
   eina_log_domain_unregister(_e_dbus_log_dom);
   _e_dbus_log_dom = -1;
   eina_shutdown();