pidgin/plugins/convcolors.c

branch
soc.2013.gobjectification
changeset 34660
68c776e3436e
parent 33683
bf243e3394a7
child 35037
bcf94ea5b8e5
child 36755
4826ec4c6ac5
--- a/pidgin/plugins/convcolors.c	Thu Jun 27 23:00:47 2013 +0530
+++ b/pidgin/plugins/convcolors.c	Fri Jun 28 01:42:32 2013 +0530
@@ -113,10 +113,8 @@
 	g_snprintf(tmp, sizeof(tmp), "%s/enabled", formats[i].prefix);
 
 	if (!purple_prefs_get_bool(tmp) ||
-			(purple_conversation_get_type(conv) == PURPLE_CONV_TYPE_IM &&
-			!purple_prefs_get_bool(PREF_IMS)) ||
-			(purple_conversation_get_type(conv) == PURPLE_CONV_TYPE_CHAT &&
-			!purple_prefs_get_bool(PREF_CHATS)))
+			(PURPLE_IS_IM_CONVERSATION(conv) && !purple_prefs_get_bool(PREF_IMS)) ||
+			(PURPLE_IS_CHAT_CONVERSATION(conv) && !purple_prefs_get_bool(PREF_CHATS)))
 		return FALSE;
 
 	g_snprintf(tmp, sizeof(tmp), "%s/color", formats[i].prefix);

mercurial