[Pkg-e-commits] [SCM] D-Bus integration for EFL based applications branch, new-svn-snapshot, updated. debian/0.5.0.050+svn20081126-1-193-g70af8e8
Albin Tonnerre
albin.tonnerre at gmail.com
Mon Aug 3 16:59:44 UTC 2009
The following commit has been merged in the new-svn-snapshot branch:
commit 1f22a5a759bf6e9802fb9ab0b78dda8c09475d7a
Author: Albin Tonnerre <albin.tonnerre at gmail.com>
Date: Sun Aug 2 19:35:27 2009 +0200
Import upstream release 0.5.0.062
diff --git a/configure b/configure
index e8898d1..9c4e3ec 100755
--- a/configure
+++ b/configure
@@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.61 for e_dbus 0.5.0.061.
+# Generated by GNU Autoconf 2.61 for e_dbus 0.5.0.062.
#
# Report bugs to <enlightenment-devel at lists.sourceforge.net>.
#
@@ -723,8 +723,8 @@ SHELL=${CONFIG_SHELL-/bin/sh}
# Identity of this package.
PACKAGE_NAME='e_dbus'
PACKAGE_TARNAME='e_dbus'
-PACKAGE_VERSION='0.5.0.061'
-PACKAGE_STRING='e_dbus 0.5.0.061'
+PACKAGE_VERSION='0.5.0.062'
+PACKAGE_STRING='e_dbus 0.5.0.062'
PACKAGE_BUGREPORT='enlightenment-devel at lists.sourceforge.net'
ac_unique_file="configure.ac"
@@ -1412,7 +1412,7 @@ if test "$ac_init_help" = "long"; then
# Omit some internal or obsolete options to make the list less imposing.
# This message is too long to be a string in the A/UX 3.1 sh.
cat <<_ACEOF
-\`configure' configures e_dbus 0.5.0.061 to adapt to many kinds of systems.
+\`configure' configures e_dbus 0.5.0.062 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1482,7 +1482,7 @@ fi
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of e_dbus 0.5.0.061:";;
+ short | recursive ) echo "Configuration of e_dbus 0.5.0.062:";;
esac
cat <<\_ACEOF
@@ -1595,7 +1595,7 @@ fi
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-e_dbus configure 0.5.0.061
+e_dbus configure 0.5.0.062
generated by GNU Autoconf 2.61
Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
@@ -1609,7 +1609,7 @@ cat >config.log <<_ACEOF
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
-It was created by e_dbus $as_me 0.5.0.061, which was
+It was created by e_dbus $as_me 0.5.0.062, which was
generated by GNU Autoconf 2.61. Invocation command line was
$ $0 $@
@@ -2385,7 +2385,7 @@ fi
# Define the identity of the package.
PACKAGE='e_dbus'
- VERSION='0.5.0.061'
+ VERSION='0.5.0.062'
cat >>confdefs.h <<_ACEOF
@@ -10974,7 +10974,7 @@ VMIN=`echo $PACKAGE_VERSION | awk -F. '{printf("%s", $2);}'`
VMIC=`echo $PACKAGE_VERSION | awk -F. '{printf("%s", $3);}'`
SNAP=`echo $PACKAGE_VERSION | awk -F. '{printf("%s", $4);}'`
version_info=`expr $VMAJ + $VMIN`":$VMIC:$VMIN"
-release="ver-svn-02"
+release="ver-svn-03"
econnman_release_info="-release $release"
edbus_release_info="-release $release"
ehal_release_info="-release $release"
@@ -12057,7 +12057,7 @@ exec 6>&1
# report actual input values of CONFIG_FILES etc. instead of their
# values after options handling.
ac_log="
-This file was extended by e_dbus $as_me 0.5.0.061, which was
+This file was extended by e_dbus $as_me 0.5.0.062, which was
generated by GNU Autoconf 2.61. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -12110,7 +12110,7 @@ Report bugs to <bug-autoconf at gnu.org>."
_ACEOF
cat >>$CONFIG_STATUS <<_ACEOF
ac_cs_version="\\
-e_dbus config.status 0.5.0.061
+e_dbus config.status 0.5.0.062
configured by $0, generated by GNU Autoconf 2.61,
with options \\"`echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\"
diff --git a/configure.ac b/configure.ac
index 90e9da2..40be5b2 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,7 +1,7 @@
# get rid of that stupid cache mechanism
rm -f config.cache
-AC_INIT([e_dbus], [0.5.0.061], [enlightenment-devel at lists.sourceforge.net])
+AC_INIT([e_dbus], [0.5.0.062], [enlightenment-devel at lists.sourceforge.net])
AC_PREREQ([2.52])
AC_CONFIG_SRCDIR([configure.ac])
AC_CANONICAL_BUILD
@@ -23,7 +23,7 @@ VMIN=`echo $PACKAGE_VERSION | awk -F. '{printf("%s", $2);}'`
VMIC=`echo $PACKAGE_VERSION | awk -F. '{printf("%s", $3);}'`
SNAP=`echo $PACKAGE_VERSION | awk -F. '{printf("%s", $4);}'`
version_info=`expr $VMAJ + $VMIN`":$VMIC:$VMIN"
-release="ver-svn-02"
+release="ver-svn-03"
econnman_release_info="-release $release"
edbus_release_info="-release $release"
ehal_release_info="-release $release"
diff --git a/src/lib/dbus/e_dbus_signal.c b/src/lib/dbus/e_dbus_signal.c
index e635f8b..3d85cd4 100644
--- a/src/lib/dbus/e_dbus_signal.c
+++ b/src/lib/dbus/e_dbus_signal.c
@@ -29,8 +29,7 @@ static void cb_signal_dispatcher(E_DBus_Connection *conn, DBusMessage *msg);
static void
e_dbus_signal_handler_free(E_DBus_Signal_Handler *sh)
{
- if(sh->sender)
- free(sh->sender);
+ if (sh->sender) free(sh->sender);
free(sh);
}
@@ -59,11 +58,12 @@ cb_name_owner(void *data, DBusMessage *msg, DBusError *err)
if (dbus_error_is_set(err))
goto error;
- if (!unique_name)
- goto error;
+// if (!unique_name)
+// goto error;
- free(sh->sender);
- sh->sender = strdup(unique_name);
+ if (sh->sender) free(sh->sender);
+ sh->sender = NULL;
+ if (unique_name) sh->sender = strdup(unique_name);
return;
@@ -177,10 +177,10 @@ e_dbus_signal_handler_add(E_DBus_Connection *conn, const char *sender, const cha
SET_STRING(member);
#undef SET_STRING
- if(sender)
- sh->sender = strdup(sender);
- else
- sh->sender = NULL;
+ if (sender)
+ sh->sender = strdup(sender);
+ else
+ sh->sender = NULL;
sh->cb_signal = cb_signal;
sh->data = data;
--
D-Bus integration for EFL based applications
More information about the Pkg-e-commits
mailing list