Migration with svn revision 66792

Merge remote branch 'origin/upstream'

diff --git a/ChangeLog b/ChangeLog
index 2547062..5535262 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -41,6 +41,14 @@
 
         * Fix case where fd handler could be added twice for dbus fd
         
-2011-12-02 Carsten Haitzler (The Rasterman)
+2011-12-02  Carsten Haitzler (The Rasterman)
 
-        1.1.0 release
+        * 1.1.0 release
+
+2011-12-02  Mike Blumenkrantz
+
+        * Fixed use of dbus_message_iter_open_container in enotify to prevent crashing when sending an image
+
+2011-12-10  Mike Blumenkrantz
+
+        * Fixed use of eina_log in enotify-daemon

diff --git a/NEWS b/NEWS
index 6b76c29..9527ab1 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,12 @@
+E_dbus 1.2.0
+
+Changes since E_dbus 1.1.0:
+---------------------------
+
+Improvements:
+   enotify: Fixed use of dbus_message_iter_open_container to prevent crashing when sending an image
+
+
 E_dbus 1.1.0
 
 Changes since E_dbus 1.0.0:

diff --git a/configure.ac b/configure.ac
index 8f617a2..5e3c6c0 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -3,7 +3,7 @@
 m4_define([v_maj], [1])
 m4_define([v_min], [1])
 m4_define([v_mic], [99])
-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_rev], m4_esyscmd([(svnversion "${SVN_REPO_PATH:-.}" | grep -v '\(export\|Unversioned directory\)' || 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])

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

diff --git a/src/bin/e_dbus_bluez_test.c b/src/bin/e_dbus_bluez_test.c
index 3db5199..d2f479e 100644 (file)
--- a/src/bin/e_dbus_bluez_test.c
+++ b/src/bin/e_dbus_bluez_test.c
@@ -2,12 +2,14 @@
 #include "config.h"
 #endif
 
-#include "E_Bluez.h"
+#include <stdlib.h>
 #include <stdio.h>
 #include <string.h>
 #include <ctype.h>
 #include <errno.h>
 
+#include "E_Bluez.h"
+
 typedef struct _E_Msgbus_Data E_Msgbus_Data;
 
 struct _E_Msgbus_Data {

diff --git a/src/bin/e_dbus_connman0_7x_test.c b/src/bin/e_dbus_connman0_7x_test.c
index 971a114..e84d4e3 100644 (file)
--- a/src/bin/e_dbus_connman0_7x_test.c
+++ b/src/bin/e_dbus_connman0_7x_test.c
@@ -2,13 +2,15 @@
 #include "config.h"
 #endif
 
-#define E_CONNMAN_I_KNOW_THIS_API_IS_SUBJECT_TO_CHANGE 1
-#include "connman0_7x/E_Connman.h"
+#include <stdlib.h>
 #include <stdio.h>
 #include <string.h>
 #include <ctype.h>
 #include <errno.h>
 
+#define E_CONNMAN_I_KNOW_THIS_API_IS_SUBJECT_TO_CHANGE 1
+#include "connman0_7x/E_Connman.h"
+
 static void
 _method_success_check(void *data, __UNUSED__ DBusMessage *msg, DBusError *error)
 {

diff --git a/src/bin/e_dbus_ofono_test.c b/src/bin/e_dbus_ofono_test.c
index 5c8df22..f6e22af 100644 (file)
--- a/src/bin/e_dbus_ofono_test.c
+++ b/src/bin/e_dbus_ofono_test.c
@@ -2,12 +2,14 @@
 #include "config.h"
 #endif
 
-#include "E_Ofono.h"
+#include <stdlib.h>
 #include <stdio.h>
 #include <string.h>
 #include <ctype.h>
 #include <errno.h>
 
+#include "E_Ofono.h"
+
 static void
 _method_success_check(void *data, DBusMessage *msg __UNUSED__, DBusError *error)
 {

diff --git a/src/bin/e_dbus_ukit_test.c b/src/bin/e_dbus_ukit_test.c
index a4b93e9..1755444 100644 (file)
--- a/src/bin/e_dbus_ukit_test.c
+++ b/src/bin/e_dbus_ukit_test.c
@@ -2,10 +2,13 @@
 #include "config.h"
 #endif
 
+#include <stdlib.h>
+#include <stdio.h>
+
+#include <Ecore.h>
+
 #include <E_Ukit.h>
 #include <E_DBus.h>
-#include <Ecore.h>
-#include <stdio.h>
 
 static E_DBus_Connection *econ = NULL;
 

diff --git a/src/bin/notify-send.c b/src/bin/notify-send.c
index 0602ca0..4c89430 100644 (file)
--- a/src/bin/notify-send.c
+++ b/src/bin/notify-send.c
@@ -4,9 +4,11 @@
 
 #include <stdio.h>
 #include <string.h>
+#include <stdlib.h>
 #include <limits.h>
 #include <errno.h>
 #include <getopt.h>
+#include <sysexits.h>
 
 #include <Ecore.h>
 #include <E_Notify.h>

diff --git a/src/bin/notify.c b/src/bin/notify.c
index b5b52b9..375c632 100644 (file)
--- a/src/bin/notify.c
+++ b/src/bin/notify.c
@@ -2,6 +2,7 @@
 #include "config.h"
 #endif
 
+#include <stdlib.h>
 #include <stdio.h>
 
 #include <Evas.h>

diff --git a/src/lib/bluez/e_bluez_element.c b/src/lib/bluez/e_bluez_element.c
index 9578761..bafb45b 100644 (file)
--- a/src/lib/bluez/e_bluez_element.c
+++ b/src/lib/bluez/e_bluez_element.c
@@ -1,4 +1,5 @@
 #include "e_bluez_private.h"
+#include <stdlib.h>
 #include <string.h>
 #include <errno.h>
 

diff --git a/src/lib/connman0_7x/E_Connman.h b/src/lib/connman0_7x/E_Connman.h
index 060ea1a..06e879a 100644 (file)
--- a/src/lib/connman0_7x/E_Connman.h
+++ b/src/lib/connman0_7x/E_Connman.h
@@ -156,6 +156,8 @@ EAPI Eina_Bool              e_connman_service_login_required_get(const E_Connman
 
 EAPI Eina_Bool              e_connman_service_roaming_get(const E_Connman_Element *service, Eina_Bool *roaming) EINA_ARG_NONNULL(1, 2) EINA_WARN_UNUSED_RESULT;
 EAPI Eina_Bool              e_connman_service_nameservers_get(const E_Connman_Element *service, unsigned int *count, const char ***nameserver) EINA_ARG_NONNULL(1, 2, 3) EINA_WARN_UNUSED_RESULT;
+EAPI Eina_Bool              e_connman_service_nameservers_configuration_get(const E_Connman_Element *service, unsigned int *count, const char ***nameservers) EINA_ARG_NONNULL(1, 2, 3) EINA_WARN_UNUSED_RESULT;
+EAPI Eina_Bool              e_connman_service_nameservers_configuration_set(E_Connman_Element *service, unsigned int count, const char **nameservers, E_DBus_Method_Return_Cb cb, const void *data)  EINA_ARG_NONNULL(1, 2, 3, 4, 5) EINA_WARN_UNUSED_RESULT;
 EAPI Eina_Bool              e_connman_service_domains_get(const E_Connman_Element *service, unsigned int *count, const char ***domains) EINA_ARG_NONNULL(1, 2, 3) EINA_WARN_UNUSED_RESULT;
 
 EAPI Eina_Bool              e_connman_service_ipv4_method_get(const E_Connman_Element *service, const char **method) EINA_ARG_NONNULL(1, 2) EINA_WARN_UNUSED_RESULT;

diff --git a/src/lib/connman0_7x/e_connman_element.c b/src/lib/connman0_7x/e_connman_element.c
index 4a5f7c0..605f61f 100644 (file)
--- a/src/lib/connman0_7x/e_connman_element.c
+++ b/src/lib/connman0_7x/e_connman_element.c
@@ -1,4 +1,5 @@
 #include "e_connman_private.h"
+#include <stdlib.h>
 #include <string.h>
 #include <errno.h>
 

diff --git a/src/lib/dbus/E_DBus.h b/src/lib/dbus/E_DBus.h
index 32920fa..6d790f5 100644 (file)
--- a/src/lib/dbus/E_DBus.h
+++ b/src/lib/dbus/E_DBus.h
@@ -52,8 +52,8 @@
  *
  * EDbus is a wrapper around the
  * <a href="http://www.freedesktop.org/wiki/Software/dbus">dbus</a>
- * library, which is a message bus system. It also implement a set of
- * specifications using dbus as interprocess comunication.
+ * library, which is a message bus system. It also implements a set of
+ * specifications using dbus as interprocess communication.
  *
  * @section edbus_modules_sec Modules
  *

diff --git a/src/lib/dbus/e_dbus.c b/src/lib/dbus/e_dbus.c
index bc1db98..68ff810 100644 (file)
--- a/src/lib/dbus/e_dbus.c
+++ b/src/lib/dbus/e_dbus.c
@@ -2,6 +2,7 @@
 #include "config.h"
 #endif
 
+#include <stdlib.h>
 #include <stdio.h>
 #include <string.h>
 #include <stdbool.h>

diff --git a/src/lib/dbus/e_dbus_message.c b/src/lib/dbus/e_dbus_message.c
index 53b4277..ff24c1f 100644 (file)
--- a/src/lib/dbus/e_dbus_message.c
+++ b/src/lib/dbus/e_dbus_message.c
@@ -2,6 +2,9 @@
 #include "config.h"
 #endif
 
+#include <stdio.h>
+#include <stdlib.h>
+
 #include "e_dbus_private.h"
 
 typedef struct E_DBus_Pending_Call_Data E_DBus_Pending_Call_Data;

diff --git a/src/lib/dbus/e_dbus_object.c b/src/lib/dbus/e_dbus_object.c
index bb3befd..209749b 100644 (file)
--- a/src/lib/dbus/e_dbus_object.c
+++ b/src/lib/dbus/e_dbus_object.c
@@ -2,6 +2,7 @@
 #include "config.h"
 #endif
 
+#include <stdlib.h>
 #include <string.h>
 
 #include "e_dbus_private.h"

diff --git a/src/lib/dbus/e_dbus_signal.c b/src/lib/dbus/e_dbus_signal.c
index 8d2fd61..7ccb9da 100644 (file)
--- a/src/lib/dbus/e_dbus_signal.c
+++ b/src/lib/dbus/e_dbus_signal.c
@@ -3,6 +3,7 @@
 #endif
 
 #include <string.h>
+#include <stdlib.h>
 
 #include "e_dbus_private.h"
 

diff --git a/src/lib/dbus/e_dbus_util.c b/src/lib/dbus/e_dbus_util.c
index d32a5fb..75c0fe7 100644 (file)
--- a/src/lib/dbus/e_dbus_util.c
+++ b/src/lib/dbus/e_dbus_util.c
@@ -2,6 +2,8 @@
 #include "config.h"
 #endif
 
+#include <stdlib.h>
+
 #include "e_dbus_private.h"
 
 EAPI E_DBus_Callback *

diff --git a/src/lib/hal/e_hal_device.c b/src/lib/hal/e_hal_device.c
index a70bbc4..79604e6 100644 (file)
--- a/src/lib/hal/e_hal_device.c
+++ b/src/lib/hal/e_hal_device.c
@@ -1,3 +1,5 @@
+#include <stdlib.h>
+
 #include <E_Hal.h>
 #include "e_hal_private.h"
 

diff --git a/src/lib/hal/e_hal_manager.c b/src/lib/hal/e_hal_manager.c
index e640be0..c22fb8b 100644 (file)
--- a/src/lib/hal/e_hal_manager.c
+++ b/src/lib/hal/e_hal_manager.c
@@ -1,3 +1,5 @@
+#include <stdlib.h>
+
 #include "E_Hal.h"
 #include "e_hal_private.h"
 

diff --git a/src/lib/hal/e_hal_util.c b/src/lib/hal/e_hal_util.c
index 9bdfa98..b66f35b 100644 (file)
--- a/src/lib/hal/e_hal_util.c
+++ b/src/lib/hal/e_hal_util.c
@@ -1,3 +1,5 @@
+#include <stdlib.h>
+
 #include <E_Hal.h>
 #include <string.h>
 #include "e_hal_private.h"

diff --git a/src/lib/notification/daemon.c b/src/lib/notification/daemon.c
index 8db6889..be01e5e 100644 (file)
--- a/src/lib/notification/daemon.c
+++ b/src/lib/notification/daemon.c
@@ -5,6 +5,8 @@
 #include "E_Notify.h"
 #include "E_Notification_Daemon.h"
 #include "e_notify_private.h"
+
+#include <stdlib.h>
 #include <string.h>
 
 static int init_count = 0;
@@ -91,6 +93,7 @@ e_notification_daemon_add(const char *name, const char *vendor)
 {
    E_Notification_Daemon *ndaemon;
 
+   loginit();
    ndaemon = calloc(1, sizeof(E_Notification_Daemon));
    if (ndaemon)
      e_notification_daemon_bus_init(ndaemon);

diff --git a/src/lib/notification/e_notify_private.h b/src/lib/notification/e_notify_private.h
index dfff1bc..8a29e7c 100644 (file)
--- a/src/lib/notification/e_notify_private.h
+++ b/src/lib/notification/e_notify_private.h
@@ -41,7 +41,7 @@ void e_notify_unmarshal_notify_actions(E_Notification *n, DBusMessageIter *iter)
 void e_notify_unmarshal_notify_hints(E_Notification *n, DBusMessageIter *iter);
 void e_notify_marshal_hint_image(DBusMessageIter *iter, E_Notification_Image *img);
 E_Notification_Image * e_notify_unmarshal_hint_image(DBusMessageIter *iter);
-
+void loginit(void);
 extern int _e_dbus_notify_log_dom;
 
 #ifndef E_DBUS_COLOR_DEFAULT

diff --git a/src/lib/notification/marshal.c b/src/lib/notification/marshal.c
index 44e3066..ec4fbbd 100644 (file)
--- a/src/lib/notification/marshal.c
+++ b/src/lib/notification/marshal.c
@@ -2,6 +2,7 @@
 #include "config.h"
 #endif
 
+#include <stdlib.h>
 #include <string.h>
 
 #include "E_Notify.h"

diff --git a/src/lib/notification/notification.c b/src/lib/notification/notification.c
index f4d0862..a56d2c5 100644 (file)
--- a/src/lib/notification/notification.c
+++ b/src/lib/notification/notification.c
@@ -12,7 +12,7 @@ static E_Notification_Action *e_notification_action_new(const char *id,
 
 int _e_dbus_notify_log_dom = -1;
 
-static void
+void
 loginit(void)
 {
    if (_e_dbus_notify_log_dom == -1)

diff --git a/src/lib/ofono/e_ofono_element.c b/src/lib/ofono/e_ofono_element.c
index 6bc63db..69f2bbc 100644 (file)
--- a/src/lib/ofono/e_ofono_element.c
+++ b/src/lib/ofono/e_ofono_element.c
@@ -1,4 +1,5 @@
 #include "e_ofono_private.h"
+#include <stdlib.h>
 #include <string.h>
 #include <errno.h>
 

diff --git a/src/lib/ukit/e_ukit_private_util.c b/src/lib/ukit/e_ukit_private_util.c
index 7c0ddc9..510235e 100644 (file)
--- a/src/lib/ukit/e_ukit_private_util.c
+++ b/src/lib/ukit/e_ukit_private_util.c
@@ -2,6 +2,8 @@
 #include "config.h"
 #endif
 
+#include <stdlib.h>
+
 #include <E_Ukit.h>
 #include "e_ukit_private.h"