diff --git a/ChangeLog b/ChangeLog index 92bd1113..64979f20 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +purple-facebook-7201f07fe8f7 (2015-08-19): + - Display the thread URL for videos + - Fixed memory leak with contact parsing + - Fixed URL comparisons being overly strict + - Lots of code refactoring + - Removed debugging support from Travis CI + purple-facebook-dd1528f03f59 (2015-08-15): - Added GTK-Doc for the internal APIs - Fixed HTTP error checks being skipped diff --git a/VERSION b/VERSION index dcb7550d..62a98168 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -dd1528f03f59 +7201f07fe8f7 diff --git a/patches/02-plugin.patch b/patches/02-plugin.patch index 029213ea..e428cd5d 100644 --- a/patches/02-plugin.patch +++ b/patches/02-plugin.patch @@ -1,7 +1,7 @@ -diff -r dd1528f03f59 libpurple/protocols/facebook/facebook.c ---- a/libpurple/protocols/facebook/facebook.c Sat Aug 15 21:21:10 2015 -0400 -+++ b/libpurple/protocols/facebook/facebook.c Sat Aug 15 21:31:10 2015 -0400 -@@ -761,7 +761,7 @@ +diff -r 7201f07fe8f7 libpurple/protocols/facebook/facebook.c +--- a/libpurple/protocols/facebook/facebook.c Tue Aug 18 19:58:40 2015 -0400 ++++ b/libpurple/protocols/facebook/facebook.c Tue Aug 18 23:57:23 2015 -0400 +@@ -756,7 +756,7 @@ GSList *select = NULL; PurpleConnection *gc; @@ -10,7 +10,7 @@ diff -r dd1528f03f59 libpurple/protocols/facebook/facebook.c return; } -@@ -955,7 +955,7 @@ +@@ -949,7 +949,7 @@ PurpleConnection *gc; PurpleMenuAction *act; @@ -19,7 +19,7 @@ diff -r dd1528f03f59 libpurple/protocols/facebook/facebook.c return NULL; } -@@ -1003,7 +1003,8 @@ +@@ -997,7 +997,8 @@ } static gint @@ -29,7 +29,7 @@ diff -r dd1528f03f59 libpurple/protocols/facebook/facebook.c { const gchar *name; const gchar *text; -@@ -1012,6 +1013,8 @@ +@@ -1006,6 +1007,8 @@ FbId uid; gchar *sext; @@ -38,7 +38,7 @@ diff -r dd1528f03f59 libpurple/protocols/facebook/facebook.c fata = purple_connection_get_protocol_data(gc); api = fb_data_get_api(fata); -@@ -1150,7 +1153,8 @@ +@@ -1144,7 +1147,8 @@ } static gint @@ -48,7 +48,7 @@ diff -r dd1528f03f59 libpurple/protocols/facebook/facebook.c { const gchar *name; const gchar *text; -@@ -1161,6 +1165,8 @@ +@@ -1155,6 +1159,8 @@ PurpleAccount *acct; PurpleChatConversation *chat; @@ -57,7 +57,7 @@ diff -r dd1528f03f59 libpurple/protocols/facebook/facebook.c acct = purple_connection_get_account(gc); fata = purple_connection_get_protocol_data(gc); api = fb_data_get_api(fata); -@@ -1334,107 +1340,6 @@ +@@ -1328,99 +1334,6 @@ } static void @@ -132,12 +132,6 @@ diff -r dd1528f03f59 libpurple/protocols/facebook/facebook.c -} - -static void --facebook_protocol_privacy_iface_init(PurpleProtocolPrivacyIface *iface) --{ -- --} -- --static void -facebook_protocol_roomlist_iface_init(PurpleProtocolRoomlistIface *iface) -{ - iface->get_list = fb_roomlist_get_list; @@ -155,8 +149,6 @@ diff -r dd1528f03f59 libpurple/protocols/facebook/facebook.c - facebook_protocol_im_iface_init) - PURPLE_IMPLEMENT_INTERFACE_STATIC(PURPLE_TYPE_PROTOCOL_CHAT_IFACE, - facebook_protocol_chat_iface_init) -- PURPLE_IMPLEMENT_INTERFACE_STATIC(PURPLE_TYPE_PROTOCOL_PRIVACY_IFACE, -- facebook_protocol_privacy_iface_init) - PURPLE_IMPLEMENT_INTERFACE_STATIC(PURPLE_TYPE_PROTOCOL_ROOMLIST_IFACE, - facebook_protocol_roomlist_iface_init) -); @@ -165,7 +157,7 @@ diff -r dd1528f03f59 libpurple/protocols/facebook/facebook.c fb_cmds_register(void) { PurpleCmdId id; -@@ -1446,13 +1351,13 @@ +@@ -1432,13 +1345,13 @@ g_return_if_fail(fb_cmds == NULL); id = purple_cmd_register("kick", "s", PURPLE_CMD_P_PROTOCOL, cflags, @@ -181,7 +173,7 @@ diff -r dd1528f03f59 libpurple/protocols/facebook/facebook.c _("leave: Leave the chat"), NULL); fb_cmds = g_slist_prepend(fb_cmds, GUINT_TO_POINTER(id)); -@@ -1471,43 +1376,102 @@ +@@ -1457,43 +1370,102 @@ g_slist_free_full(fb_cmds, fb_cmds_unregister_free); } @@ -314,9 +306,9 @@ diff -r dd1528f03f59 libpurple/protocols/facebook/facebook.c + inited = TRUE; + return purple_plugin_register(plugin); +} -diff -r dd1528f03f59 libpurple/protocols/facebook/facebook.h ---- a/libpurple/protocols/facebook/facebook.h Sat Aug 15 21:21:10 2015 -0400 -+++ b/libpurple/protocols/facebook/facebook.h Sat Aug 15 21:31:10 2015 -0400 +diff -r 7201f07fe8f7 libpurple/protocols/facebook/facebook.h +--- a/libpurple/protocols/facebook/facebook.h Tue Aug 18 19:58:40 2015 -0400 ++++ b/libpurple/protocols/facebook/facebook.h Tue Aug 18 23:57:23 2015 -0400 @@ -22,24 +22,8 @@ #ifndef _FACEBOOK_H_ #define _FACEBOOK_H_ @@ -332,12 +324,12 @@ diff -r dd1528f03f59 libpurple/protocols/facebook/facebook.h - #include --#define FACEBOOK_TYPE_PROTOCOL (facebook_protocol_get_type()) --#define FACEBOOK_PROTOCOL(obj) (G_TYPE_CHECK_INSTANCE_CAST((obj), FACEBOOK_TYPE_PROTOCOL, FacebookProtocol)) --#define FACEBOOK_PROTOCOL_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST((klass), FACEBOOK_TYPE_PROTOCOL, FacebookProtocolClass)) --#define FACEBOOK_IS_PROTOCOL(obj) (G_TYPE_CHECK_INSTANCE_TYPE((obj), FACEBOOK_TYPE_PROTOCOL)) +-#define FACEBOOK_TYPE_PROTOCOL (facebook_protocol_get_type()) +-#define FACEBOOK_PROTOCOL(obj) (G_TYPE_CHECK_INSTANCE_CAST((obj), FACEBOOK_TYPE_PROTOCOL, FacebookProtocol)) +-#define FACEBOOK_PROTOCOL_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST((klass), FACEBOOK_TYPE_PROTOCOL, FacebookProtocolClass)) +-#define FACEBOOK_IS_PROTOCOL(obj) (G_TYPE_CHECK_INSTANCE_TYPE((obj), FACEBOOK_TYPE_PROTOCOL)) -#define FACEBOOK_IS_PROTOCOL_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE((klass), FACEBOOK_TYPE_PROTOCOL)) --#define FACEBOOK_PROTOCOL_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS((obj), FACEBOOK_TYPE_PROTOCOL, FacebookProtocolClass)) +-#define FACEBOOK_PROTOCOL_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS((obj), FACEBOOK_TYPE_PROTOCOL, FacebookProtocolClass)) - /** * FB_PROTOCOL_ID: