/soc/2013/ankitkv/gobjectification: 4917dfcfe669: Refactored pid...

[Ankit Vani]

Changeset: 4917dfcfe6691432ab723a1326cde25638be5efb
Author:	 Ankit Vani <a at nevitus.org>
Date:	 2013-07-21 02:24 +0530
Branch:	 soc.2013.gobjectification
URL: https://hg.pidgin.im/soc/2013/ankitkv/gobjectification/rev/4917dfcfe669

Description:

Refactored pidgin to use the GObject PurplePresence API

diffstat:

 pidgin/gtkblist.c |  6 +++---
 pidgin/gtkconv.c  |  6 +++---
 2 files changed, 6 insertions(+), 6 deletions(-)

diffs (39 lines):

diff --git a/pidgin/gtkblist.c b/pidgin/gtkblist.c
--- a/pidgin/gtkblist.c
+++ b/pidgin/gtkblist.c
@@ -7993,9 +7993,9 @@ static void sort_method_status(PurpleBLi
 			 ? purple_contact_get_alias(purple_buddy_get_contact(this_buddy))
 			 : NULL));
 
-		presence_cmp = purple_presence_compare(
-			purple_buddy_get_presence(my_buddy),
-			this_buddy ? purple_buddy_get_presence(this_buddy) : NULL);
+		presence_cmp = purple_buddy_presence_compare(
+			PURPLE_BUDDY_PRESENCE(purple_buddy_get_presence(my_buddy)),
+			this_buddy ? PURPLE_BUDDY_PRESENCE(purple_buddy_get_presence(this_buddy)) : NULL);
 
 		if (this_buddy == NULL ||
 			(presence_cmp < 0 ||
diff --git a/pidgin/gtkconv.c b/pidgin/gtkconv.c
--- a/pidgin/gtkconv.c
+++ b/pidgin/gtkconv.c
@@ -3995,8 +3995,8 @@ compare_buddy_presence(PurplePresence *p
 	/* This is necessary because multiple PurpleBuddy's don't share the same
 	 * PurplePresence anymore.
 	 */
-	PurpleBuddy *b1 = purple_buddy_presence_get_buddy(p1);
-	PurpleBuddy *b2 = purple_buddy_presence_get_buddy(p2);
+	PurpleBuddy *b1 = purple_buddy_presence_get_buddy(PURPLE_BUDDY_PRESENCE(p1));
+	PurpleBuddy *b2 = purple_buddy_presence_get_buddy(PURPLE_BUDDY_PRESENCE(p2));
 	if (purple_buddy_get_account(b1) == purple_buddy_get_account(b2) &&
 			strcmp(purple_buddy_get_name(b1), purple_buddy_get_name(b2)) == 0)
 		return FALSE;
@@ -4074,7 +4074,7 @@ generate_send_to_items(PidginWindow *win
 				 * since we did a g_list_prepend() earlier. */
 				for (iter = g_list_last(list); iter != NULL; iter = iter->prev) {
 					PurplePresence *pre = iter->data;
-					PurpleBuddy *buddy = purple_buddy_presence_get_buddy(pre);
+					PurpleBuddy *buddy = purple_buddy_presence_get_buddy(PURPLE_BUDDY_PRESENCE(pre));
 					create_sendto_item(menu, sg, &group, buddy,
 							purple_buddy_get_account(buddy), purple_buddy_get_name(buddy));
 				}