adium: a64b3ed8: pidgin-facebookchat 711
evands at pidgin.im
evands at pidgin.im
Thu Dec 3 21:40:32 EST 2009
-----------------------------------------------------------------
Revision: a64b3ed8ac6c82ec1217bddd04603cc0338c8494
Ancestor: ed0a2a35c7e22519df27c50069c22b03e01c027a
Author: evands at pidgin.im
Date: 2009-12-04T02:42:44
Branch: im.pidgin.adium
URL: http://d.pidgin.im/viewmtn/revision/info/a64b3ed8ac6c82ec1217bddd04603cc0338c8494
Modified files:
libpurple/protocols/facebook/facebook.nsi
libpurple/protocols/facebook/fb_friendlist.c
libpurple/protocols/facebook/libfacebook.c
libpurple/protocols/facebook/libfacebook.h
libpurple/protocols/facebook/pidgin-facebookchat.rc
ChangeLog:
pidgin-facebookchat 711
-------------- next part --------------
============================================================
--- libpurple/protocols/facebook/facebook.nsi 2d26d15fcc8564d3937e7c44b527ffe28fe06c76
+++ libpurple/protocols/facebook/facebook.nsi 909394612268d37159a9853b011b2d14d25bceca
@@ -6,7 +6,7 @@ SetCompress off
; todo: SetBrandingImage
; HM NIS Edit Wizard helper defines
!define PRODUCT_NAME "pidgin-facebookchat"
-!define PRODUCT_VERSION "1.63"
+!define PRODUCT_VERSION "1.64"
!define PRODUCT_PUBLISHER "Eion Robb"
!define PRODUCT_WEB_SITE "http://pidgin-facebookchat.googlecode.com/"
!define PRODUCT_UNINST_KEY "Software\Microsoft\Windows\CurrentVersion\Uninstall\${PRODUCT_NAME}"
============================================================
--- libpurple/protocols/facebook/fb_friendlist.c 66a6aeac0aba11a6919cf7a0a09db77e79a80d56
+++ libpurple/protocols/facebook/fb_friendlist.c 008d6195eb30a403d41c4755c98c5402de4fac31
@@ -455,8 +455,9 @@ GList *fb_get_buddies_friend_list (Faceb
group_name = purple_group_get_name(purple_buddy_get_group(
(PurpleBuddy *)cur->data));
-
- g_hash_table_insert(cur_groups, g_utf8_strdown(group_name, -1), cur->data);
+ group_name = purple_normalize_nocase(NULL, group_name);
+
+ g_hash_table_insert(cur_groups, g_strdup(group_name), cur->data);
}
g_slist_free(buddies);
@@ -483,9 +484,9 @@ GList *fb_get_buddies_friend_list (Faceb
for (cur_buddy = final_buddies; cur_buddy != NULL;
cur_buddy = cur_buddy->next)
{
- g_hash_table_remove(cur_groups, purple_normalize_nocase(NULL,
- purple_group_get_name(purple_buddy_get_group(
- (PurpleBuddy *)cur_buddy->data))));
+ const gchar *group_name = purple_group_get_name(purple_buddy_get_group(
+ (PurpleBuddy *)cur_buddy->data));
+ g_hash_table_remove(cur_groups, purple_normalize_nocase(NULL, group_name));
}
// Delete remaining buddies to maintain sync state with server.
============================================================
--- libpurple/protocols/facebook/libfacebook.c d028106d5c81dae7840e3864ef302e444d75dfad
+++ libpurple/protocols/facebook/libfacebook.c fa11c84086db93bf96b87de14a10d37ddc540995
@@ -402,7 +402,6 @@ static void fb_close(PurpleConnection *p
static void fb_close(PurpleConnection *pc)
{
FacebookAccount *fba;
- gchar *postdata;
GSList *buddies;
purple_debug_info("facebook", "disconnecting account\n");
@@ -427,39 +426,6 @@ static void fb_close(PurpleConnection *p
buddies = g_slist_delete_link(buddies, buddies);
}
- /* Tell Facebook that we've logged out. */
- /*
- * TODO
- * This doesn't actually work because the request is non-blocking
- * and we're in the process of logging out. So we start making a
- * connection but then libpurple immediately cancels the attempt
- * and frees everything.
- *
- * There are two ways to fix this:
- * 1. We could make this request, but not pass in fba or reference
- * any other data. The request could complete normally even
- * after this account has logged out, since it really doesn't
- * need access to the PurpleConnection or the FacebookAccount.
- *
- * 2. The close prpl callback could be changed in libpurple so that
- * protocol plugins can have a chance to make network requests
- * and do other long cleanup operations. So the call to
- * prpl->close() would become asynchronous. It tells the
- * protocol plugin to begin the shutdown sequence, and the
- * protocol plugin tells the core when it's finished.
- */
- if (fba->post_form_id)
- postdata = g_strdup_printf(
- "visibility=false&post_form_id=%s&"
- "fb_dtsg=%s&post_form_id_source=AsyncRequest&"
- "__a=1",
- fba->post_form_id, fba->dtsg);
- else
- postdata = g_strdup("visibility=false");
- fb_post_or_get(fba, FB_METHOD_POST, NULL, "/ajax/chat/settings.php",
- postdata, NULL, NULL, FALSE);
- g_free(postdata);
-
if (fba->friend_request_timer) {
purple_timeout_remove(fba->friend_request_timer);
}
============================================================
--- libpurple/protocols/facebook/libfacebook.h ecc7ed12a73d0f53b3cdcc6239f5d390d62513f8
+++ libpurple/protocols/facebook/libfacebook.h f4be461d1adef3dd6cec62c050ba9e9f3953f3cf
@@ -21,7 +21,7 @@
#ifndef LIBFACEBOOK_H
#define LIBFACEBOOK_H
-#define FACEBOOK_PLUGIN_VERSION "1.63"
+#define FACEBOOK_PLUGIN_VERSION "1.64"
#define FACEBOOK_PLUGIN_ID "prpl-bigbrownchunx-facebookim"
#define FACEBOOK_CAPTCHA_SITE "6LezHAAAAAAAADqVjseQ3ctG3ocfQs2Elo1FTa_a"
============================================================
--- libpurple/protocols/facebook/pidgin-facebookchat.rc dfd4e8afb9ec755404c6cca891395691a0e05340
+++ libpurple/protocols/facebook/pidgin-facebookchat.rc 7315a1099a7e1134eee2f5d9079b10f38583caeb
@@ -1,7 +1,7 @@ 1 VERSIONINFO
1 VERSIONINFO
-FILEVERSION 1,63,0,0
-PRODUCTVERSION 1,63,0,0
+FILEVERSION 1,64,0,0
+PRODUCTVERSION 1,64,0,0
FILEOS 0x40004 // VOS_NT_WINDOWS32
FILETYPE 0x2 // VFT_DLL
{
@@ -12,8 +12,8 @@ BLOCK "StringFileInfo"
VALUE "CompanyName", "Eion Robb\0"
VALUE "FileDescription", "Facebook Chat plugin for Pidgin\0"
VALUE "ProductName", "pidgin-facebookchat\0"
- VALUE "FileVersion", "1.63\0"
- VALUE "ProductVersion", "1.63\0"
+ VALUE "FileVersion", "1.64\0"
+ VALUE "ProductVersion", "1.64\0"
VALUE "InternalName", "pidgin-facebookchat\0"
VALUE "OriginalFilename", "libfacebook.dll\0"
VALUE "Comments", "http://pidgin-facebookchat.googlecode.com/\0"
More information about the Commits
mailing list