/pidgin/main: e05ac5e585d0: Finch: fix glib warnings

[Tomasz Wasilczyk]

Changeset: e05ac5e585d0fd2d53247efc2b7927e404161137
Author:	 Tomasz Wasilczyk <twasilczyk at pidgin.im>
Date:	 2014-04-26 15:04 +0200
Branch:	 default
URL: https://hg.pidgin.im/pidgin/main/rev/e05ac5e585d0

Description:

Finch: fix glib warnings

diffstat:

 finch/gntblist.c       |  8 ++++----
 finch/libgnt/gntmain.c |  2 ++
 2 files changed, 6 insertions(+), 4 deletions(-)

diffs (33 lines):

diff --git a/finch/gntblist.c b/finch/gntblist.c
--- a/finch/gntblist.c
+++ b/finch/gntblist.c
@@ -2371,12 +2371,12 @@ blist_node_compare_status(PurpleBlistNod
 	if (G_OBJECT_TYPE(n1) != G_OBJECT_TYPE(n2))
 		return blist_node_compare_position(n1, n2);
 
-	if (PURPLE_IS_CONTACT(n1) || PURPLE_IS_BUDDY(n1)) {
+	if (PURPLE_IS_CONTACT(n1))
 		n1 = PURPLE_BLIST_NODE(purple_contact_get_priority_buddy(PURPLE_CONTACT(n1)));
+	if (PURPLE_IS_CONTACT(n2))
 		n2 = PURPLE_BLIST_NODE(purple_contact_get_priority_buddy(PURPLE_CONTACT(n2)));
-	}
-
-	if (PURPLE_IS_BUDDY(n1)) {
+
+	if (PURPLE_IS_BUDDY(n1) && PURPLE_IS_BUDDY(n2)) {
 		ret = purple_buddy_presence_compare(
 			PURPLE_BUDDY_PRESENCE(purple_buddy_get_presence(PURPLE_BUDDY(n1))),
 			PURPLE_BUDDY_PRESENCE(purple_buddy_get_presence(PURPLE_BUDDY(n2))));
diff --git a/finch/libgnt/gntmain.c b/finch/libgnt/gntmain.c
--- a/finch/libgnt/gntmain.c
+++ b/finch/libgnt/gntmain.c
@@ -466,7 +466,9 @@ setup_io()
 
 	g_io_channel_unref(channel);
 
+#if 0
 	gnt_warning("setting up IO (%d)", channel_read_callback);
+#endif
 }
 
 static gboolean