VERSION: updated to 50bb40c42245

ChangeLog

@@ -1,3 +1,14 @@
+purple-facebook-50bb40c42245 (2015-12-21):
+  - Bumped the required GLib version to 2.28
+  - Fixed groupchat self messages
+  - Fixed JSON parsing with older json-glib versions
+  - Fixed memory leak with HTTP requests
+  - Fixed non-friend contacts showing as buddies
+  - Implemented better HTTP connection handling (addresses many bugs)
+  - Migrated from Jenkins to Travis
+  - Migrated to GIO for ZLib inflation and deflation
+  - Minor code refactoring
+
 purple-facebook-6a0a79182ebc (2015-08-27):
   - Added check to autoconf for glib-genmarshal
   - Added missing g_get_real_time() compat function

VERSION

@@ -1 +1 @@
-6a0a79182ebc
+50bb40c42245

configure.ac

@@ -88,10 +88,9 @@ AC_ARG_WITH(
 )
 AM_CONDITIONAL([WITH_SSL_CERTS], [test "x$WITH_SSL_CERTS" == "xyes"])
 
-PKG_CHECK_MODULES([GLIB], [glib-2.0 >= 2.20.0 gobject-2.0])
+PKG_CHECK_MODULES([GLIB], [glib-2.0 >= 2.28.0 gio-2.0 gobject-2.0])
 PKG_CHECK_MODULES([JSON], [json-glib-1.0 >= 0.14.0])
 PKG_CHECK_MODULES([PURPLE], [purple <  3])
-PKG_CHECK_MODULES([ZLIB], [zlib])
 
 PKG_CHECK_VAR([GLIB_GENMARSHAL], [glib-2.0], [glib_genmarshal])
 AS_IF(

debian/control

@@ -3,14 +3,14 @@ Maintainer: jgeboski <[email protected]>
 Section: misc
 Priority: optional
 Standards-Version: 3.9.6
-Build-Depends: debhelper (>= 9), dh-autoreconf, libglib2.0-dev (>= 2.20), libjson-glib-dev (>= 0.14), libpurple-dev, zlib1g-dev
+Build-Depends: debhelper (>= 9), dh-autoreconf, libglib2.0-dev (>= 2.20), libjson-glib-dev (>= 0.14), libpurple-dev
 Homepage: https://github.com/jgeboski/purple-facebook
 
 Package: purple-facebook
 Architecture: any
 Section: misc
 Priority: optional
-Depends: ${shlibs:Depends}, ${misc:Depends}, libpurple0, libglib2.0-0 (>= 2.20), libjson-glib-1.0-0 (>= 0.14), zlib1g
+Depends: ${shlibs:Depends}, ${misc:Depends}, libpurple0, libglib2.0-0 (>= 2.20), libjson-glib-1.0-0 (>= 0.14)
 Homepage: https://github.com/jgeboski/purple-facebook
 Description: Facebook protocol plugin for libpurple
  Purple Facebook implements the Facebook Messenger protocol into

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"