[Telepathy-commits] [telepathy-glib/master] Make group_mixin_change_members accept message=NULL

[Will Thompson]

Also, tweak the test to check this.
---
 telepathy-glib/group-mixin.c |    2 +-
 tests/dbus/group-mixin.c     |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/telepathy-glib/group-mixin.c b/telepathy-glib/group-mixin.c
index 3d61d81..65f5907 100644
--- a/telepathy-glib/group-mixin.c
+++ b/telepathy-glib/group-mixin.c
@@ -1693,7 +1693,7 @@ tp_group_mixin_change_members (GObject *obj,
       g_hash_table_insert (details, "change-reason", detail);
     }
 
-  if (message[0] != '\0')
+  if (message != NULL && message[0] != '\0')
     {
       detail = tp_g_value_slice_new (G_TYPE_STRING);
       g_value_set_string (detail, message);
diff --git a/tests/dbus/group-mixin.c b/tests/dbus/group-mixin.c
index e79f0c2..53871a1 100644
--- a/tests/dbus/group-mixin.c
+++ b/tests/dbus/group-mixin.c
@@ -398,7 +398,7 @@ in_the_desert (void)
     tp_intset_add (add, camel);
     expect_signals ("", camel, TP_CHANNEL_GROUP_CHANGE_REASON_NONE,
         camel_added);
-    tp_group_mixin_change_members ((GObject *) service_chan, "", add, NULL,
+    tp_group_mixin_change_members ((GObject *) service_chan, NULL, add, NULL,
         NULL, NULL, camel, TP_CHANNEL_GROUP_CHANGE_REASON_NONE);
     wait_for_outstanding_signals ();
     MYASSERT (!outstanding_signals (),
-- 
1.5.6.5