[gentoo-commits] gentoo-x86 commit in net-libs/telepathy-glib/files: telepathy-glib-0.7.33-nobuildtest.patch telepathy-glib-0.7.33-fix-test.patch

[gentoo-commits] gentoo-x86 commit in net-libs/telepathy-glib/files: telepathy-glib-0.7.33-nobuildtest.patch telepathy-glib-0.7.33-fix-test.patch

[Pacho Ramos (pacho)]

pacho       10/09/29 11:29:53

  Removed:              telepathy-glib-0.7.33-nobuildtest.patch
                        telepathy-glib-0.7.33-fix-test.patch
  Log:
  Version bump with bugfixes and some new features, remove old.
  (Portage version: 2.1.8.3/cvs/Linux x86_64)

[gentoo-commits] gentoo-x86 commit in net-libs/telepathy-glib/files: telepathy-glib-0.7.33-nobuildtest.patch telepathy-glib-0.7.33-fix-test.patch

[Gilles Dartiguelongue (eva)]

eva         09/08/05 23:12:14

  Added:                telepathy-glib-0.7.33-nobuildtest.patch
                        telepathy-glib-0.7.33-fix-test.patch
  Log:
  Version bump. Update to latest telepathy-spec, bug fixes. Clean up old revisions.
  (Portage version: 2.2_rc33/cvs/Linux x86_64)

Revision  Changes    Path
1.1                  net-libs/telepathy-glib/files/telepathy-glib-0.7.33-nobuildtest.patch

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-libs/telepathy-glib/files/telepathy-glib-0.7.33-nobuildtest.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-libs/telepathy-glib/files/telepathy-glib-0.7.33-nobuildtest.patch?rev=1.1&content-type=text/plain

Index: telepathy-glib-0.7.33-nobuildtest.patch
===================================================================
From c6d18bd6e7b7f578cc97fe38f40e917af2f9270a Mon Sep 17 00:00:00 2001
From: Gilles Dartiguelongue <eva@gentoo.org>
Date: Thu, 6 Aug 2009 00:25:18 +0200
Subject: [PATCH] Compile test programs only when needed

---
 tests/Makefile.am      |    4 ++--
 tests/dbus/Makefile.am |    4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/tests/Makefile.am b/tests/Makefile.am
index 900c281..e65c01d 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -4,7 +4,7 @@ SUBDIRS = \
     dbus \
     tools
 
-noinst_PROGRAMS = \
+check_PROGRAMS = \
     test-asv \
     test-availability-cmp \
     test-heap \
@@ -12,7 +12,7 @@ noinst_PROGRAMS = \
     test-intset \
     test-util
 
-TESTS = $(noinst_PROGRAMS) \
+TESTS = $(check_PROGRAMS) \
     all-errors-documented.py
 
 TESTS_ENVIRONMENT = \
diff --git a/tests/dbus/Makefile.am b/tests/dbus/Makefile.am
index 442ddd1..1baeb3d 100644
--- a/tests/dbus/Makefile.am
+++ b/tests/dbus/Makefile.am
@@ -1,6 +1,6 @@
 include $(top_srcdir)/tools/shave.mk
 
-noinst_PROGRAMS = \
+check_PROGRAMS = \
     test-account \
     test-account-manager \
     test-call-cancellation \
@@ -39,7 +39,7 @@ noinst_PROGRAMS = \
     test-text-respawn \
     test-unsupported-interface
 
-TESTS = $(noinst_PROGRAMS)
+TESTS = $(check_PROGRAMS)
 
 LDADD = \
     $(top_builddir)/telepathy-glib/libtelepathy-glib.la \
-- 
1.6.3.3




1.1                  net-libs/telepathy-glib/files/telepathy-glib-0.7.33-fix-test.patch

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-libs/telepathy-glib/files/telepathy-glib-0.7.33-fix-test.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-libs/telepathy-glib/files/telepathy-glib-0.7.33-fix-test.patch?rev=1.1&content-type=text/plain

Index: telepathy-glib-0.7.33-fix-test.patch
===================================================================
From 082f6e61b611efd35fbbd437e5741729244773ca Mon Sep 17 00:00:00 2001
From: Gilles Dartiguelongue <eva@gentoo.org>
Date: Thu, 6 Aug 2009 01:00:05 +0200
Subject: [PATCH] Do not unref dbus message if it is NULL.

---
 telepathy-glib/dbus.c |   12 ++++++++----
 1 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/telepathy-glib/dbus.c b/telepathy-glib/dbus.c
index 60c9e37..28fba99 100644
--- a/telepathy-glib/dbus.c
+++ b/telepathy-glib/dbus.c
@@ -1014,7 +1014,8 @@ _tp_dbus_daemon_get_name_owner (TpDBusDaemon *self,
   reply = dbus_connection_send_with_reply_and_block (dbc, message,
       timeout_ms, &dbus_error);
 
-  dbus_message_unref (message);
+  if (message)
+    dbus_message_unref (message);
 
   if (reply == NULL)
     {
@@ -1026,7 +1027,8 @@ _tp_dbus_daemon_get_name_owner (TpDBusDaemon *self,
           "%s: %s", dbus_error.name, dbus_error.message);
 
       dbus_error_free (&dbus_error);
-      dbus_message_unref (reply);
+      if (reply)
+        dbus_message_unref (reply);
       return FALSE;
     }
 
@@ -1038,14 +1040,16 @@ _tp_dbus_daemon_get_name_owner (TpDBusDaemon *self,
           "%s: %s", dbus_error.name, dbus_error.message);
 
       dbus_error_free (&dbus_error);
-      dbus_message_unref (reply);
+      if (reply)
+        dbus_message_unref (reply);
       return FALSE;
     }
 
   if (unique_name != NULL)
     *unique_name = g_strdup (name_in_reply);
 
-  dbus_message_unref (reply);
+  if (reply)
+    dbus_message_unref (reply);
 
   return TRUE;
 }
-- 
1.6.3.3