/pidgin/main: 59583b8ffa59: Remove unnecessary version check.

Mark Doliner mark at kingant.net
Wed Jan 23 02:13:48 EST 2013


Changeset: 59583b8ffa59fdd3966145529549393dde85d372
Author:	 Mark Doliner <mark at kingant.net>
Date:	 2013-01-22 23:00 -0800
Branch:	 default
URL: http://hg.pidgin.im/pidgin/main/rev/59583b8ffa59

Description:

Remove unnecessary version check.

I think we don't need to check version compatibility here because we're
breaking backward compatibility, so there's no way this build of Pidgin
would be used with libpurple < 3, right?

diffstat:

 pidgin/gtkconv.c |  24 ++++++++++--------------
 1 files changed, 10 insertions(+), 14 deletions(-)

diffs (34 lines):

diff --git a/pidgin/gtkconv.c b/pidgin/gtkconv.c
--- a/pidgin/gtkconv.c
+++ b/pidgin/gtkconv.c
@@ -3316,20 +3316,16 @@ populate_menu_with_options(GtkWidget *me
 
 		buddy = purple_find_buddy(account, purple_conversation_get_name(conv));
 
-		/* gotta remain bug-compatible :( libpurple < 2.0.2 didn't handle
-		 * removing "isolated" buddy nodes well */
-		if (purple_version_check(2, 0, 2) == NULL) {
-			if ((buddy == NULL) && (gtkconv->webview != NULL)) {
-				buddy = g_object_get_data(G_OBJECT(gtkconv->webview), "transient_buddy");
-			}
-
-			if ((buddy == NULL) && (gtkconv->webview != NULL)) {
-				buddy = purple_buddy_new(account, purple_conversation_get_name(conv), NULL);
-				purple_blist_node_set_flags((PurpleBlistNode *)buddy,
-						PURPLE_BLIST_NODE_FLAG_NO_SAVE);
-				g_object_set_data_full(G_OBJECT(gtkconv->webview), "transient_buddy",
-						buddy, (GDestroyNotify)purple_buddy_destroy);
-			}
+		if ((buddy == NULL) && (gtkconv->webview != NULL)) {
+			buddy = g_object_get_data(G_OBJECT(gtkconv->webview), "transient_buddy");
+		}
+
+		if ((buddy == NULL) && (gtkconv->webview != NULL)) {
+			buddy = purple_buddy_new(account, purple_conversation_get_name(conv), NULL);
+			purple_blist_node_set_flags((PurpleBlistNode *)buddy,
+					PURPLE_BLIST_NODE_FLAG_NO_SAVE);
+			g_object_set_data_full(G_OBJECT(gtkconv->webview), "transient_buddy",
+					buddy, (GDestroyNotify)purple_buddy_destroy);
 		}
 	}
 



More information about the Commits mailing list