diff options
author | Xavier Claessens <xclaesse@src.gnome.org> | 2008-04-23 22:30:31 +0800 |
---|---|---|
committer | Xavier Claessens <xclaesse@src.gnome.org> | 2008-04-23 22:30:31 +0800 |
commit | bd4555c42f16315bc813d2d690a41878569ce609 (patch) | |
tree | 67418004bfa6dd4cc46ca3696507c2c9602b037f /libempathy | |
parent | 149c8a6d3f8ad9cea140fa7ae95b600c8e6e73a6 (diff) | |
download | gsoc2013-empathy-bd4555c42f16315bc813d2d690a41878569ce609.tar gsoc2013-empathy-bd4555c42f16315bc813d2d690a41878569ce609.tar.gz gsoc2013-empathy-bd4555c42f16315bc813d2d690a41878569ce609.tar.bz2 gsoc2013-empathy-bd4555c42f16315bc813d2d690a41878569ce609.tar.lz gsoc2013-empathy-bd4555c42f16315bc813d2d690a41878569ce609.tar.xz gsoc2013-empathy-bd4555c42f16315bc813d2d690a41878569ce609.tar.zst gsoc2013-empathy-bd4555c42f16315bc813d2d690a41878569ce609.zip |
Fix some warnings with roomlist
svn path=/trunk/; revision=1034
Diffstat (limited to 'libempathy')
-rw-r--r-- | libempathy/empathy-tp-roomlist.c | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/libempathy/empathy-tp-roomlist.c b/libempathy/empathy-tp-roomlist.c index 26db75dd0..4193685dc 100644 --- a/libempathy/empathy-tp-roomlist.c +++ b/libempathy/empathy-tp-roomlist.c @@ -344,20 +344,23 @@ empathy_tp_roomlist_init (EmpathyTpRoomlist *list) EmpathyTpRoomlist * empathy_tp_roomlist_new (McAccount *account) { - MissionControl *mc; - TpConnection *connection; + EmpathyTpRoomlist *list; + MissionControl *mc; + TpConnection *connection; g_return_val_if_fail (MC_IS_ACCOUNT (account), NULL); mc = empathy_mission_control_new (); connection = mission_control_get_tpconnection (mc, account, NULL); - return g_object_new (EMPATHY_TYPE_TP_ROOMLIST, + list = g_object_new (EMPATHY_TYPE_TP_ROOMLIST, "connection", connection, NULL); g_object_unref (mc); g_object_unref (connection); + + return list; } gboolean @@ -376,6 +379,7 @@ empathy_tp_roomlist_start (EmpathyTpRoomlist *list) EmpathyTpRoomlistPriv *priv = GET_PRIV (list); g_return_if_fail (EMPATHY_IS_TP_ROOMLIST (list)); + g_return_if_fail (TP_IS_CHANNEL (priv->channel)); tp_cli_channel_type_room_list_call_list_rooms (priv->channel, -1, NULL, NULL, NULL, @@ -388,6 +392,7 @@ empathy_tp_roomlist_stop (EmpathyTpRoomlist *list) EmpathyTpRoomlistPriv *priv = GET_PRIV (list); g_return_if_fail (EMPATHY_IS_TP_ROOMLIST (list)); + g_return_if_fail (TP_IS_CHANNEL (priv->channel)); tp_cli_channel_type_room_list_call_stop_listing (priv->channel, -1, NULL, NULL, NULL, |