From: <sa...@us...> - 2006-08-29 01:49:36
|
Revision: 17074 Author: sadrul Date: 2006-08-28 18:49:30 -0700 (Mon, 28 Aug 2006) ViewCVS: http://svn.sourceforge.net/gaim/?rev=17074&view=rev Log Message: ----------- Patch #1548271: "Get Info fix for MSN" "'Get Info' currently fails for MSN buddies. This patch fixes that, and possibly plugs a small leak." and "rlaager: sadrul: I don't care to both with reviewing 1548271. I trust you know what you're doing. You can just commit that one. ;)" So you know who to blame if things don't work ;) Modified Paths: -------------- trunk/libgaim/protocols/msn/msn.c Modified: trunk/libgaim/protocols/msn/msn.c =================================================================== --- trunk/libgaim/protocols/msn/msn.c 2006-08-29 01:00:18 UTC (rev 17073) +++ trunk/libgaim/protocols/msn/msn.c 2006-08-29 01:49:30 UTC (rev 17074) @@ -1420,7 +1420,7 @@ #define MSN_GOT_INFO_GET_FIELD(a, b) \ found = gaim_markup_extract_info_field(stripped, stripped_len, s, \ - "\n" a "\t", 0, "\n", 0, "Undisclosed", b, 0, NULL, NULL); \ + "\n" a ":", 0, "\n", 0, "Undisclosed", b, 0, NULL, NULL); \ if (found) \ sect_info = TRUE; @@ -1469,6 +1469,8 @@ gaim_notify_userinfo(info_data->gc, info_data->name, buf, NULL, NULL); g_free(tooltip_text); + g_free(info_data->name); + g_free(info_data); return; } @@ -1599,6 +1601,7 @@ personal = g_strdup_printf(_("<br><b>Personal</b><br>%s"), s->str); s = g_string_truncate(s, 0); sect_info = FALSE; + has_info = TRUE; } /* Business */ This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ev...@us...> - 2006-09-10 21:16:24
|
Revision: 17228 http://svn.sourceforge.net/gaim/?rev=17228&view=rev Author: evands Date: 2006-09-10 14:16:20 -0700 (Sun, 10 Sep 2006) Log Message: ----------- MSN Get Info always crashes for me in dnsquery.c on the second time it's done. The crash location likes to move around, so it's probably a memory stomper, but we're not sure yet. In any case, MSN was since [17060] not displaying User Info in most (all?) situations because it was treating the connection as invalid if error_message == NULL, when that should be (error_message != NULL). This doesn't change the crash, but the first attempt does display info now. Modified Paths: -------------- trunk/libgaim/protocols/msn/msn.c Modified: trunk/libgaim/protocols/msn/msn.c =================================================================== --- trunk/libgaim/protocols/msn/msn.c 2006-09-10 20:46:47 UTC (rev 17227) +++ trunk/libgaim/protocols/msn/msn.c 2006-09-10 21:16:20 UTC (rev 17228) @@ -1856,8 +1856,8 @@ char *tooltip_text = info2_data->tooltip_text; /* Make sure the connection is still valid if we got here by fetching a photo url */ - if (error_message == NULL || url_text != NULL || - g_list_find(gaim_connections_get_all(), info_data->gc) == NULL) + if (url_text && (error_message != NULL || + g_list_find(gaim_connections_get_all(), info_data->gc) == NULL)) { gaim_debug_warning("msn", "invalid connection. ignoring buddy photo info.\n"); g_free(stripped); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <sea...@us...> - 2006-09-12 23:49:30
|
Revision: 17264 http://svn.sourceforge.net/gaim/?rev=17264&view=rev Author: seanegan Date: 2006-09-12 16:49:26 -0700 (Tue, 12 Sep 2006) Log Message: ----------- Thanks, Stu Modified Paths: -------------- trunk/libgaim/protocols/msn/msn.c Modified: trunk/libgaim/protocols/msn/msn.c =================================================================== --- trunk/libgaim/protocols/msn/msn.c 2006-09-12 21:57:15 UTC (rev 17263) +++ trunk/libgaim/protocols/msn/msn.c 2006-09-12 23:49:26 UTC (rev 17264) @@ -881,14 +881,6 @@ return MSN_TYPING_SEND_TIMEOUT; } -static int -msn_send_raw(GaimConnection *gc, const char *buf, int len) -{ - MsnServConn *servconn = (MsnServConn*)gc->proto_data; - return msn_servconn_write(servconn, buf, len); -} - - static void msn_set_status(GaimAccount *account, GaimStatus *status) { @@ -2020,7 +2012,7 @@ msn_new_xfer, /* new_xfer */ NULL, /* offline_message */ NULL, /* whiteboard_prpl_ops */ - msn_send_raw, /* send_raw */ + NULL, /* send_raw */ }; static GaimPluginInfo info = This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <nos...@us...> - 2006-12-07 14:10:50
|
Revision: 17916 http://svn.sourceforge.net/gaim/?rev=17916&view=rev Author: nosnilmot Date: 2006-12-07 06:08:45 -0800 (Thu, 07 Dec 2006) Log Message: ----------- MSN only does PNG Modified Paths: -------------- trunk/libgaim/protocols/msn/msn.c Modified: trunk/libgaim/protocols/msn/msn.c =================================================================== --- trunk/libgaim/protocols/msn/msn.c 2006-12-07 08:23:18 UTC (rev 17915) +++ trunk/libgaim/protocols/msn/msn.c 2006-12-07 14:08:45 UTC (rev 17916) @@ -1955,7 +1955,7 @@ OPT_PROTO_MAIL_CHECK, NULL, /* user_splits */ NULL, /* protocol_options */ - {"png,gif,jpeg", 0, 0, 96, 96, GAIM_ICON_SCALE_SEND}, /* icon_spec */ + {"png", 0, 0, 96, 96, GAIM_ICON_SCALE_SEND}, /* icon_spec */ msn_list_icon, /* list_icon */ msn_list_emblems, /* list_emblems */ msn_status_text, /* status_text */ This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |