summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlberto Mardegan <mardy@users.sourceforge.net>2007-06-14 13:42:36 +0000
committerAlberto Mardegan <mardy@users.sourceforge.net>2007-06-14 13:42:36 +0000
commit2f26d2da37935763b9d37575aadf361d2882afec (patch)
treedbc45b8f6f3d4d7a9badec669566a44b67c8b674
parent4ee4b03a1e00a98e971b4ca2491d6f026691b1c9 (diff)
Check for the group interface, before using it.
git-svn-id: https://mission-control.svn.sourceforge.net/svnroot/mission-control/trunk@56 d91c8aed-3f2b-0410-a83d-924a1c20a0ba
-rw-r--r--ChangeLog5
-rw-r--r--doc/reference/libmissioncontrol/tmpl/mc-account-monitor.sgml9
-rw-r--r--src/mcd-channel.c4
3 files changed, 18 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index d83a0bd4..7e2ff0dc 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2007-06-14 Alberto Mardegan <alberto.mardegan@nokia.com>
+
+ * src/mcd-channel.c:
+ Check for the group interface, before using it.
+
2007-06-08 Alberto Mardegan <alberto.mardegan@nokia.com>
* libmissioncontrol/mc-account-monitor.c:
diff --git a/doc/reference/libmissioncontrol/tmpl/mc-account-monitor.sgml b/doc/reference/libmissioncontrol/tmpl/mc-account-monitor.sgml
index f398a5ab..e12f37c6 100644
--- a/doc/reference/libmissioncontrol/tmpl/mc-account-monitor.sgml
+++ b/doc/reference/libmissioncontrol/tmpl/mc-account-monitor.sgml
@@ -63,6 +63,15 @@ The #McAccountMonitor is an object that raises signals when some changes have be
@mcaccountmonitor: the object which received the signal.
@arg1:
+<!-- ##### SIGNAL McAccountMonitor::param-changed ##### -->
+<para>
+
+</para>
+
+@mcaccountmonitor: the object which received the signal.
+@arg1:
+@arg2:
+
<!-- ##### FUNCTION mc_account_monitor_new ##### -->
<para>
diff --git a/src/mcd-channel.c b/src/mcd-channel.c
index 3c62ad3b..a73e5747 100644
--- a/src/mcd-channel.c
+++ b/src/mcd-channel.c
@@ -742,6 +742,8 @@ mcd_channel_get_members (McdChannel *channel)
/* get a group proxy from the channel */
group_proxy = tp_chan_get_interface (priv->tp_chan,
TELEPATHY_CHAN_IFACE_GROUP_QUARK);
+ if (!group_proxy)
+ goto err_missing_interface;
tp_chan_iface_group_get_members (DBUS_G_PROXY (group_proxy),
&contact_handles, &error);
@@ -789,6 +791,8 @@ mcd_channel_get_members (McdChannel *channel)
{
g_array_free (contact_handles, TRUE);
}
+err_missing_interface:
+ ;
}
g_object_unref (connection);