VERSION: updated to 50bb40c4224550bb40c42245

2 files changed, 19 insertions, 31 deletions

diff --git a/patches/02-plugin.patch b/patches/02-plugin.patch
index 400a60c..90569aa 100644
--- a/patches/02-plugin.patch
+++ b/patches/02-plugin.patch
@@ -1,6 +1,6 @@
-diff -r 6a0a79182ebc libpurple/protocols/facebook/facebook.c
---- a/libpurple/protocols/facebook/facebook.c	Wed Aug 26 19:48:29 2015 -0400
-+++ b/libpurple/protocols/facebook/facebook.c	Thu Aug 27 17:32:07 2015 -0400
+diff -r 50bb40c42245 libpurple/protocols/facebook/facebook.c
+--- a/libpurple/protocols/facebook/facebook.c	Mon Dec 21 21:34:55 2015 -0500
++++ b/libpurple/protocols/facebook/facebook.c	Mon Dec 21 22:02:55 2015 -0500
 @@ -446,7 +446,7 @@
  	id = purple_image_store_add_weak(pimg);
  
@@ -19,7 +19,7 @@ diff -r 6a0a79182ebc libpurple/protocols/facebook/facebook.c
  		return;
  	}
  
-@@ -1018,7 +1018,7 @@
+@@ -1011,7 +1011,7 @@
  	PurpleConnection *gc;
  	PurpleMenuAction *act;
  
@@ -28,7 +28,7 @@ diff -r 6a0a79182ebc libpurple/protocols/facebook/facebook.c
  		return NULL;
  	}
  
-@@ -1066,7 +1066,8 @@
+@@ -1059,7 +1059,8 @@
  }
  
  static gint
@@ -38,7 +38,7 @@ diff -r 6a0a79182ebc libpurple/protocols/facebook/facebook.c
  {
  	const gchar *name;
  	const gchar *text;
-@@ -1075,6 +1076,8 @@
+@@ -1068,6 +1069,8 @@
  	FbId uid;
  	gchar *sext;
  
@@ -47,7 +47,7 @@ diff -r 6a0a79182ebc libpurple/protocols/facebook/facebook.c
  	fata = purple_connection_get_protocol_data(gc);
  	api = fb_data_get_api(fata);
  
-@@ -1213,7 +1216,8 @@
+@@ -1206,7 +1209,8 @@
  }
  
  static gint
@@ -57,7 +57,7 @@ diff -r 6a0a79182ebc libpurple/protocols/facebook/facebook.c
  {
  	const gchar *name;
  	const gchar *text;
-@@ -1224,6 +1228,8 @@
+@@ -1217,6 +1221,8 @@
  	PurpleAccount *acct;
  	PurpleChatConversation *chat;
  
@@ -66,7 +66,7 @@ diff -r 6a0a79182ebc libpurple/protocols/facebook/facebook.c
  	acct = purple_connection_get_account(gc);
  	fata = purple_connection_get_protocol_data(gc);
  	api = fb_data_get_api(fata);
-@@ -1392,99 +1398,6 @@
+@@ -1385,99 +1391,6 @@
  }
  
  static void
@@ -166,7 +166,7 @@ diff -r 6a0a79182ebc libpurple/protocols/facebook/facebook.c
  fb_cmds_register(void)
  {
  	PurpleCmdId id;
-@@ -1496,13 +1409,13 @@
+@@ -1489,13 +1402,13 @@
  	g_return_if_fail(fb_cmds == NULL);
  
  	id = purple_cmd_register("kick", "s", PURPLE_CMD_P_PROTOCOL, cflags,
@@ -182,7 +182,7 @@ diff -r 6a0a79182ebc libpurple/protocols/facebook/facebook.c
  				 _("leave: Leave the chat"),
  				 NULL);
  	fb_cmds = g_slist_prepend(fb_cmds, GUINT_TO_POINTER(id));
-@@ -1521,43 +1434,102 @@
+@@ -1514,43 +1427,102 @@
  	g_slist_free_full(fb_cmds, fb_cmds_unregister_free);
  }
  
@@ -315,10 +315,10 @@ diff -r 6a0a79182ebc libpurple/protocols/facebook/facebook.c
 +	inited = TRUE;
 +	return purple_plugin_register(plugin);
 +}
-diff -r 6a0a79182ebc libpurple/protocols/facebook/facebook.h
---- a/libpurple/protocols/facebook/facebook.h	Wed Aug 26 19:48:29 2015 -0400
-+++ b/libpurple/protocols/facebook/facebook.h	Thu Aug 27 17:32:07 2015 -0400
-@@ -22,24 +22,8 @@
+diff -r 50bb40c42245 libpurple/protocols/facebook/facebook.h
+--- a/libpurple/protocols/facebook/facebook.h	Mon Dec 21 21:34:55 2015 -0500
++++ b/libpurple/protocols/facebook/facebook.h	Mon Dec 21 22:02:55 2015 -0500
+@@ -22,24 +22,7 @@
  #ifndef _FACEBOOK_H_
  #define _FACEBOOK_H_
  
@@ -332,18 +332,18 @@ diff -r 6a0a79182ebc libpurple/protocols/facebook/facebook.h
 - */
 -
  #include <glib.h>
- 
+-#include <gmodule.h>
+-
 -#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))
--
+ 
  /**
   * FB_PROTOCOL_ID:
-  *
-@@ -47,37 +31,4 @@
+@@ -48,37 +31,4 @@
   */
  #define FB_PROTOCOL_ID  "prpl-facebook"
  
diff --git a/patches/03-http-leaks.patch b/patches/03-http-leaks.patch
deleted file mode 100644
index d3a6dfd..0000000
--- a/patches/03-http-leaks.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -r 5727ffb502c7 libpurple/http.c
---- a/libpurple/http.c	Fri Aug 21 01:18:30 2015 -0400
-+++ b/libpurple/http.c	Fri Aug 21 11:00:14 2015 -0400
-@@ -2460,6 +2460,8 @@
- 	purple_http_cookie_jar_unref(request->cookie_jar);
- 	purple_http_keepalive_pool_unref(request->keepalive_pool);
- 	g_free(request->url);
-+	g_free(request->method);
-+	g_free(request->contents);
- 	g_free(request);
- }
-