Attachment 606977 Details for Bug 681256 – Patch file for pidgin bug 13298 adapted for el6

[patch] Patch file for pidgin bug 13298 adapted for el6

pidgin-2.7.9-msn-add-buddy.patch (text/plain), 2.77 KB, created by Trevor Hemsley on 2012-08-25 01:58:58 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Trevor Hemsley

Created: 2012-08-25 01:58:58 UTC

Size: 2.77 KB

patch

obsolete

>--- libpurple/protocols/msn/msn.c.orig	2010-12-20 02:05:46.000000000 +0000
>+++ libpurple/protocols/msn/msn.c	2012-08-24 23:59:26.832817067 +0000
>@@ -1751,38 +1751,33 @@
>                   MsnUser *user)
> {
> 	char *group;
>+	MsnUserList *userlist;
>+	MsnUser *user2;
> 
> 	g_return_if_fail(user != NULL);
> 
>-	group = msn_user_remove_pending_group(user);
>-
>-	if (network != MSN_NETWORK_UNKNOWN) {
>-		MsnUserList *userlist = session->userlist;
>-		MsnUser *user2 = msn_userlist_find_user(userlist, who);
>-		if (user2 != NULL) {
>-			/* User already in userlist, so just update it. */
>-			msn_user_unref(user);
>-			user = user2;
>-		} else {
>-			msn_userlist_add_user(userlist, user);
>-		}
>-
>-		msn_user_set_network(user, network);
>-		msn_userlist_add_buddy(userlist, who, group);
>+	if (network == MSN_NETWORK_UNKNOWN) {
>+		purple_debug_error("msn", "Network in FQY response was unknown.  "
>+				"Assuming %s is a passport user and adding anyway.\n", who);
>+		network = MSN_NETWORK_PASSPORT;
> 	}
>-	else
>-	{
>-		PurpleBuddy * buddy = purple_find_buddy(session->account, who);
>-		gchar *buf;
>-		buf = g_strdup_printf(_("Unable to add the buddy %s because the username is invalid.  Usernames must be valid email addresses."), who);
>-		if (!purple_conv_present_error(who, session->account, buf))
>-			purple_notify_error(purple_account_get_connection(session->account), NULL, _("Unable to Add"), buf);
>-		g_free(buf);
> 
>-		/* Remove from local list */
>-		purple_blist_remove_buddy(buddy);
>+	group = msn_user_remove_pending_group(user);
>+
>+	userlist = session->userlist;
>+	user2 = msn_userlist_find_user(userlist, who);
>+	if (user2 != NULL) {
>+		/* User already in userlist, so just update it. */
>+		msn_user_unref(user);
>+		user = user2;
>+	} else {
>+		msn_userlist_add_user(userlist, user);
> 		msn_user_unref(user);
> 	}
>+
>+	msn_user_set_network(user, network);
>+	msn_userlist_add_buddy(userlist, who, group);
>+
> 	g_free(group);
> }
> 
>@@ -1819,7 +1814,10 @@
> 
> 	/* XXX - Would group ever be NULL here?  I don't think so...
> 	 * shx: Yes it should; MSN handles non-grouped buddies, and this is only
>-	 * internal. */
>+	 * internal.
>+	 * KingAnt: But PurpleBuddys must always exist inside PurpleGroups, so
>+	 * won't group always be non-NULL here?
>+	 */
> 	user = msn_userlist_find_user(userlist, who);
> 	if ((user != NULL) && (user->networkid != MSN_NETWORK_UNKNOWN)) {
> 		/* We already know this buddy and their network. This function knows
>@@ -1838,6 +1836,8 @@
> 		fqy = g_strdup_printf("<ml><d n=\"%s\"><c n=\"%s\"/></d></ml>",
> 		                      tokens[1],
> 		                      tokens[0]);
>+		/* TODO: I think user will leak if we disconnect before receiving
>+		         a response to this FQY request */
> 		msn_notification_send_fqy(session, fqy, strlen(fqy),
> 		                          (MsnFqyCb)add_pending_buddy, user);
> 		g_free(fqy);

Actions: View | Diff

Attachments on bug 681256: 606977 | 606978