diff options
| author | Ankit Vani <a@nevitus.org> | 2013-10-01 03:24:42 +0530 |
|---|---|---|
| committer | Ankit Vani <a@nevitus.org> | 2013-10-01 03:24:42 +0530 |
| commit | 42acacb15f979b478a11b3a7afe410320e97aaaf (patch) | |
| tree | 488339dfddbf00f013ceafaef3803a8e205b4ded /libpurple/roomlist.c | |
| parent | 47ac209c080dcf5fcd1f2062f1b022040962a727 (diff) | |
| parent | 33ff80b0f0cec2ba077bee07e09f3ca747ab793b (diff) | |
| download | pidgin-42acacb15f979b478a11b3a7afe410320e97aaaf.tar.gz | |
Merged soc.2013.gobjectification branch
Diffstat (limited to 'libpurple/roomlist.c')
| -rw-r--r-- | libpurple/roomlist.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/libpurple/roomlist.c b/libpurple/roomlist.c index dbb10cf9a3..063124197b 100644 --- a/libpurple/roomlist.c +++ b/libpurple/roomlist.c @@ -157,7 +157,7 @@ PurpleRoomlist *purple_roomlist_get_list(PurpleConnection *gc) { PurpleProtocol *protocol = NULL; - g_return_val_if_fail(gc != NULL, NULL); + g_return_val_if_fail(PURPLE_IS_CONNECTION(gc), NULL); g_return_val_if_fail(PURPLE_CONNECTION_IS_CONNECTED(gc), NULL); protocol = purple_connection_get_protocol(gc); @@ -178,7 +178,7 @@ void purple_roomlist_cancel_get_list(PurpleRoomlist *list) gc = purple_account_get_connection(priv->account); - g_return_if_fail(gc != NULL); + g_return_if_fail(PURPLE_IS_CONNECTION(gc)); if(gc) protocol = purple_connection_get_protocol(gc); @@ -198,7 +198,7 @@ void purple_roomlist_expand_category(PurpleRoomlist *list, PurpleRoomlistRoom *c g_return_if_fail(category->type & PURPLE_ROOMLIST_ROOMTYPE_CATEGORY); gc = purple_account_get_connection(priv->account); - g_return_if_fail(gc != NULL); + g_return_if_fail(PURPLE_IS_CONNECTION(gc)); if(gc) protocol = purple_connection_get_protocol(gc); @@ -236,14 +236,14 @@ void purple_roomlist_set_protocol_data(PurpleRoomlist *list, gpointer proto_data gpointer purple_roomlist_get_ui_data(PurpleRoomlist *list) { - g_return_val_if_fail(list != NULL, NULL); + g_return_val_if_fail(PURPLE_IS_ROOMLIST(list), NULL); return list->ui_data; } void purple_roomlist_set_ui_data(PurpleRoomlist *list, gpointer ui_data) { - g_return_if_fail(list != NULL); + g_return_if_fail(PURPLE_IS_ROOMLIST(list)); list->ui_data = ui_data; } @@ -422,7 +422,7 @@ PurpleRoomlist *purple_roomlist_new(PurpleAccount *account) PurpleRoomlist *list; PurpleProtocol *protocol; - g_return_val_if_fail(account != NULL, NULL); + g_return_val_if_fail(PURPLE_IS_ACCOUNT(account), NULL); protocol = purple_protocols_find(purple_account_get_protocol_id(account)); |