/soc/2013/ankitkv/gobjectification: e846113d7f87: Some more fixes

[Ankit Vani]

Changeset: e846113d7f87b940c2e03f7887e701ff67f8f9e6
Author:	 Ankit Vani <a at nevitus.org>
Date:	 2013-09-15 10:44 +0530
Branch:	 soc.2013.gobjectification.plugins
URL: https://hg.pidgin.im/soc/2013/ankitkv/gobjectification/rev/e846113d7f87

Description:

Some more fixes

diffstat:

 libpurple/plugins/idle.c       |  2 +-
 libpurple/plugins/log_reader.c |  6 ------
 libpurple/server.c             |  1 +
 3 files changed, 2 insertions(+), 7 deletions(-)

diffs (53 lines):

diff --git a/libpurple/plugins/idle.c b/libpurple/plugins/idle.c
--- a/libpurple/plugins/idle.c
+++ b/libpurple/plugins/idle.c
@@ -56,7 +56,7 @@ idleable_filter(PurpleAccount *account)
 	protocol = purple_protocols_find(purple_account_get_protocol_id(account));
 	g_return_val_if_fail(protocol != NULL, FALSE);
 
-	return PURPLE_PROTOCOL_IMPLEMENTS(protocol, set_idle);
+	return PURPLE_PROTOCOL_IMPLEMENTS(protocol, SERVER_IFACE, set_idle);
 }
 
 static void
diff --git a/libpurple/plugins/log_reader.c b/libpurple/plugins/log_reader.c
--- a/libpurple/plugins/log_reader.c
+++ b/libpurple/plugins/log_reader.c
@@ -87,8 +87,6 @@ static GList *adium_logger_list(PurpleLo
 		return NULL;
 
 	protocol = PURPLE_PLUGIN_PROTOCOL_INFO(plugin);
-	if (!PURPLE_PROTOCOL_IMPLEMENTS(protocol, list_icon))
-		return NULL;
 
 	protocol_name = g_ascii_strup(purple_protocol_class_list_icon(protocol, account, NULL), -1);
 
@@ -1231,8 +1229,6 @@ static GList *trillian_logger_list(Purpl
 		return NULL;
 
 	protocol = PURPLE_PLUGIN_PROTOCOL_INFO(plugin);
-	if (!PURPLE_PROTOCOL_IMPLEMENTS(protocoL, list_icon))
-		return NULL;
 
 	protocol_name = g_ascii_strup(purple_protocol_class_list_icon(protocol, account, NULL), -1);
 
@@ -1791,8 +1787,6 @@ static GList *qip_logger_list(PurpleLogT
 		return NULL;
 
 	protocol = PURPLE_PLUGIN_PROTOCOL_INFO(plugin);
-	if (!PURPLE_PROTOCOL_IMPLEMENTS(protocol, list_icon))
-		return NULL;
 
 	username = g_strdup(purple_normalize(account, purple_account_get_username(account)));
 	filename = g_strdup_printf("%s.txt", purple_normalize(account, sn));
diff --git a/libpurple/server.c b/libpurple/server.c
--- a/libpurple/server.c
+++ b/libpurple/server.c
@@ -127,6 +127,7 @@ int serv_send_im(PurpleConnection *gc, c
 	protocol = purple_connection_get_protocol(gc);
 
 	g_return_val_if_fail(protocol != NULL, val);
+	g_return_val_if_fail(PURPLE_PROTOCOL_HAS_IM_IFACE(protocol), val);
 
 	account  = purple_connection_get_account(gc);
 	presence = purple_account_get_presence(account);