| 1 |
eva 09/08/05 23:12:14 |
| 2 |
|
| 3 |
Added: telepathy-glib-0.7.33-nobuildtest.patch |
| 4 |
telepathy-glib-0.7.33-fix-test.patch |
| 5 |
Log: |
| 6 |
Version bump. Update to latest telepathy-spec, bug fixes. Clean up old revisions. |
| 7 |
(Portage version: 2.2_rc33/cvs/Linux x86_64) |
| 8 |
|
| 9 |
Revision Changes Path |
| 10 |
1.1 net-libs/telepathy-glib/files/telepathy-glib-0.7.33-nobuildtest.patch |
| 11 |
|
| 12 |
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 |
| 13 |
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 |
| 14 |
|
| 15 |
Index: telepathy-glib-0.7.33-nobuildtest.patch |
| 16 |
=================================================================== |
| 17 |
From c6d18bd6e7b7f578cc97fe38f40e917af2f9270a Mon Sep 17 00:00:00 2001 |
| 18 |
From: Gilles Dartiguelongue <eva@g.o> |
| 19 |
Date: Thu, 6 Aug 2009 00:25:18 +0200 |
| 20 |
Subject: [PATCH] Compile test programs only when needed |
| 21 |
|
| 22 |
--- |
| 23 |
tests/Makefile.am | 4 ++-- |
| 24 |
tests/dbus/Makefile.am | 4 ++-- |
| 25 |
2 files changed, 4 insertions(+), 4 deletions(-) |
| 26 |
|
| 27 |
diff --git a/tests/Makefile.am b/tests/Makefile.am |
| 28 |
index 900c281..e65c01d 100644 |
| 29 |
--- a/tests/Makefile.am |
| 30 |
+++ b/tests/Makefile.am |
| 31 |
@@ -4,7 +4,7 @@ SUBDIRS = \ |
| 32 |
dbus \ |
| 33 |
tools |
| 34 |
|
| 35 |
-noinst_PROGRAMS = \ |
| 36 |
+check_PROGRAMS = \ |
| 37 |
test-asv \ |
| 38 |
test-availability-cmp \ |
| 39 |
test-heap \ |
| 40 |
@@ -12,7 +12,7 @@ noinst_PROGRAMS = \ |
| 41 |
test-intset \ |
| 42 |
test-util |
| 43 |
|
| 44 |
-TESTS = $(noinst_PROGRAMS) \ |
| 45 |
+TESTS = $(check_PROGRAMS) \ |
| 46 |
all-errors-documented.py |
| 47 |
|
| 48 |
TESTS_ENVIRONMENT = \ |
| 49 |
diff --git a/tests/dbus/Makefile.am b/tests/dbus/Makefile.am |
| 50 |
index 442ddd1..1baeb3d 100644 |
| 51 |
--- a/tests/dbus/Makefile.am |
| 52 |
+++ b/tests/dbus/Makefile.am |
| 53 |
@@ -1,6 +1,6 @@ |
| 54 |
include $(top_srcdir)/tools/shave.mk |
| 55 |
|
| 56 |
-noinst_PROGRAMS = \ |
| 57 |
+check_PROGRAMS = \ |
| 58 |
test-account \ |
| 59 |
test-account-manager \ |
| 60 |
test-call-cancellation \ |
| 61 |
@@ -39,7 +39,7 @@ noinst_PROGRAMS = \ |
| 62 |
test-text-respawn \ |
| 63 |
test-unsupported-interface |
| 64 |
|
| 65 |
-TESTS = $(noinst_PROGRAMS) |
| 66 |
+TESTS = $(check_PROGRAMS) |
| 67 |
|
| 68 |
LDADD = \ |
| 69 |
$(top_builddir)/telepathy-glib/libtelepathy-glib.la \ |
| 70 |
-- |
| 71 |
1.6.3.3 |
| 72 |
|
| 73 |
|
| 74 |
|
| 75 |
|
| 76 |
1.1 net-libs/telepathy-glib/files/telepathy-glib-0.7.33-fix-test.patch |
| 77 |
|
| 78 |
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 |
| 79 |
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 |
| 80 |
|
| 81 |
Index: telepathy-glib-0.7.33-fix-test.patch |
| 82 |
=================================================================== |
| 83 |
From 082f6e61b611efd35fbbd437e5741729244773ca Mon Sep 17 00:00:00 2001 |
| 84 |
From: Gilles Dartiguelongue <eva@g.o> |
| 85 |
Date: Thu, 6 Aug 2009 01:00:05 +0200 |
| 86 |
Subject: [PATCH] Do not unref dbus message if it is NULL. |
| 87 |
|
| 88 |
--- |
| 89 |
telepathy-glib/dbus.c | 12 ++++++++---- |
| 90 |
1 files changed, 8 insertions(+), 4 deletions(-) |
| 91 |
|
| 92 |
diff --git a/telepathy-glib/dbus.c b/telepathy-glib/dbus.c |
| 93 |
index 60c9e37..28fba99 100644 |
| 94 |
--- a/telepathy-glib/dbus.c |
| 95 |
+++ b/telepathy-glib/dbus.c |
| 96 |
@@ -1014,7 +1014,8 @@ _tp_dbus_daemon_get_name_owner (TpDBusDaemon *self, |
| 97 |
reply = dbus_connection_send_with_reply_and_block (dbc, message, |
| 98 |
timeout_ms, &dbus_error); |
| 99 |
|
| 100 |
- dbus_message_unref (message); |
| 101 |
+ if (message) |
| 102 |
+ dbus_message_unref (message); |
| 103 |
|
| 104 |
if (reply == NULL) |
| 105 |
{ |
| 106 |
@@ -1026,7 +1027,8 @@ _tp_dbus_daemon_get_name_owner (TpDBusDaemon *self, |
| 107 |
"%s: %s", dbus_error.name, dbus_error.message); |
| 108 |
|
| 109 |
dbus_error_free (&dbus_error); |
| 110 |
- dbus_message_unref (reply); |
| 111 |
+ if (reply) |
| 112 |
+ dbus_message_unref (reply); |
| 113 |
return FALSE; |
| 114 |
} |
| 115 |
|
| 116 |
@@ -1038,14 +1040,16 @@ _tp_dbus_daemon_get_name_owner (TpDBusDaemon *self, |
| 117 |
"%s: %s", dbus_error.name, dbus_error.message); |
| 118 |
|
| 119 |
dbus_error_free (&dbus_error); |
| 120 |
- dbus_message_unref (reply); |
| 121 |
+ if (reply) |
| 122 |
+ dbus_message_unref (reply); |
| 123 |
return FALSE; |
| 124 |
} |
| 125 |
|
| 126 |
if (unique_name != NULL) |
| 127 |
*unique_name = g_strdup (name_in_reply); |
| 128 |
|
| 129 |
- dbus_message_unref (reply); |
| 130 |
+ if (reply) |
| 131 |
+ dbus_message_unref (reply); |
| 132 |
|
| 133 |
return TRUE; |
| 134 |
} |
| 135 |
-- |
| 136 |
1.6.3.3 |
Archives