VERSION: updated to 9e3520d6ec499e3520d6ec49

7 files changed, 45 insertions, 29 deletions

diff --git a/ChangeLog b/ChangeLog
index 65ccf35..750ecef 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+purple-facebook-9e3520d6ec49 (2015-08-05):
+  - Cleaned up the libpurple includes
+  - Fixed non-friends being added as buddies
+  - Fixed propagation of MQTT SSL errors
+  - Implemented handling of message attachments
+  - Merged the local glibcompat.h into libpurple
+  - Refactored error propagation
+  - Refactored the parsing of JSON values
+
 purple-facebook-27833e4fcb1f (2015-07-30):
   - Added additional tooltip pairs
   - Fixed Makefile.mingw not removing marshal sources
diff --git a/MANIFEST_PIDGIN b/MANIFEST_PIDGIN
index 84b2880..391033b 100644
--- a/MANIFEST_PIDGIN
+++ b/MANIFEST_PIDGIN
@@ -10,7 +10,6 @@ libpurple/protocols/facebook/data.c
 libpurple/protocols/facebook/data.h
 libpurple/protocols/facebook/facebook.c
 libpurple/protocols/facebook/facebook.h
-libpurple/protocols/facebook/glibcompat.h
 libpurple/protocols/facebook/http.c
 libpurple/protocols/facebook/http.h
 libpurple/protocols/facebook/id.h
diff --git a/MANIFEST_VOIDS b/MANIFEST_VOIDS
index 153131a..429ab3b 100644
--- a/MANIFEST_VOIDS
+++ b/MANIFEST_VOIDS
@@ -1,3 +1,10 @@
+include/blistnode.h
+include/blistnodetypes.h
+include/buddylist.h
+include/conversations.h
+include/conversationtypes.h
+include/message.h
 include/plugins.h
+include/presence.h
 include/protocol.h
 include/protocols.h
diff --git a/VERSION b/VERSION
index 6465c12..304adbf 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-27833e4fcb1f
+9e3520d6ec49
diff --git a/configure.ac b/configure.ac
index 1a98b61..7effb9f 100644
--- a/configure.ac
+++ b/configure.ac
@@ -79,7 +79,8 @@ AS_IF(
     )]
 )
 
-PLUGIN_CFLAGS="-I`pwd`/$srcdir/include -I`pwd`/$srcdir/pidgin"
+PLUGIN_CFLAGS="-I`pwd`/$srcdir/include -I`pwd`/$srcdir/pidgin "
+PLUGIN_CFLAGS="${PLUGIN_CFLAGS} -I`pwd`/$srcdir/pidgin/libpurple"
 PLUGIN_CFLAGS="$PLUGIN_CFLAGS -DPURPLE_PLUGINS -include purple-compat.h"
 AC_SUBST([PLUGIN_CFLAGS])
 
diff --git a/patches/01-makefile.patch b/patches/01-makefile.patch
index 42cf13f..851b106 100644
--- a/patches/01-makefile.patch
+++ b/patches/01-makefile.patch
@@ -1,7 +1,7 @@
-diff -r 5abaecb5a83d libpurple/protocols/facebook/Makefile.am
---- a/libpurple/protocols/facebook/Makefile.am	Thu Jun 18 00:45:16 2015 -0400
-+++ b/libpurple/protocols/facebook/Makefile.am	Fri Jun 19 07:20:43 2015 -0400
-@@ -24,7 +24,12 @@
+diff -r 9e3520d6ec49 libpurple/protocols/facebook/Makefile.am
+--- a/libpurple/protocols/facebook/Makefile.am	Wed Aug 05 17:57:33 2015 -0400
++++ b/libpurple/protocols/facebook/Makefile.am	Wed Aug 05 19:22:43 2015 -0400
+@@ -23,7 +23,12 @@
  	thrift.c \
  	thrift.h \
  	util.c \
@@ -15,7 +15,7 @@ diff -r 5abaecb5a83d libpurple/protocols/facebook/Makefile.am
  
  CLEANFILES = \
  	marshal.c \
-@@ -58,10 +63,9 @@
+@@ -57,10 +62,9 @@
  endif
  
  AM_CPPFLAGS = \
@@ -28,9 +28,9 @@ diff -r 5abaecb5a83d libpurple/protocols/facebook/Makefile.am
 -	$(GPLUGIN_CFLAGS) \
 +	$(PLUGIN_CFLAGS) \
  	$(DEBUG_CFLAGS)
-diff -r 5abaecb5a83d libpurple/protocols/facebook/Makefile.mingw
---- a/libpurple/protocols/facebook/Makefile.mingw	Thu Jun 18 00:45:16 2015 -0400
-+++ b/libpurple/protocols/facebook/Makefile.mingw	Fri Jun 19 07:20:43 2015 -0400
+diff -r 9e3520d6ec49 libpurple/protocols/facebook/Makefile.mingw
+--- a/libpurple/protocols/facebook/Makefile.mingw	Wed Aug 05 17:57:33 2015 -0400
++++ b/libpurple/protocols/facebook/Makefile.mingw	Wed Aug 05 19:22:43 2015 -0400
 @@ -50,7 +50,9 @@
  			json.c \
  			mqtt.c \
diff --git a/patches/02-plugin.patch b/patches/02-plugin.patch
index 66bfc01..6cb3424 100644
--- a/patches/02-plugin.patch
+++ b/patches/02-plugin.patch
@@ -1,7 +1,7 @@
-diff -r 27833e4fcb1f libpurple/protocols/facebook/facebook.c
---- a/libpurple/protocols/facebook/facebook.c	Thu Jul 30 17:55:30 2015 -0400
-+++ b/libpurple/protocols/facebook/facebook.c	Thu Jul 30 22:29:35 2015 -0400
-@@ -437,7 +437,7 @@
+diff -r 9e3520d6ec49 libpurple/protocols/facebook/facebook.c
+--- a/libpurple/protocols/facebook/facebook.c	Wed Aug 05 17:57:33 2015 -0400
++++ b/libpurple/protocols/facebook/facebook.c	Wed Aug 05 19:21:33 2015 -0400
+@@ -461,7 +461,7 @@
  	GSList *select = NULL;
  	PurpleConnection *gc;
  
@@ -10,7 +10,7 @@ diff -r 27833e4fcb1f libpurple/protocols/facebook/facebook.c
  		return;
  	}
  
-@@ -604,7 +604,7 @@
+@@ -628,7 +628,7 @@
  	PurpleConnection *gc;
  	PurpleMenuAction *act;
  
@@ -19,7 +19,7 @@ diff -r 27833e4fcb1f libpurple/protocols/facebook/facebook.c
  		return NULL;
  	}
  
-@@ -627,7 +627,8 @@
+@@ -651,7 +651,8 @@
  }
  
  static gint
@@ -29,7 +29,7 @@ diff -r 27833e4fcb1f libpurple/protocols/facebook/facebook.c
  {
  	const gchar *name;
  	const gchar *text;
-@@ -639,10 +640,10 @@
+@@ -663,10 +664,10 @@
  	fata = purple_connection_get_protocol_data(gc);
  	api = fb_data_get_api(fata);
  
@@ -42,7 +42,7 @@ diff -r 27833e4fcb1f libpurple/protocols/facebook/facebook.c
  	sext = purple_markup_strip_html(text);
  	fb_api_message(api, uid, FALSE, sext);
  	g_free(sext);
-@@ -764,7 +765,8 @@
+@@ -788,7 +789,8 @@
  }
  
  static gint
@@ -52,7 +52,7 @@ diff -r 27833e4fcb1f libpurple/protocols/facebook/facebook.c
  {
  	const gchar *name;
  	const gchar *text;
-@@ -783,15 +785,15 @@
+@@ -807,15 +809,15 @@
  	name = purple_conversation_get_name(PURPLE_CONVERSATION(chat));
  	tid = FB_ID_FROM_STR(name);
  
@@ -71,7 +71,7 @@ diff -r 27833e4fcb1f libpurple/protocols/facebook/facebook.c
  	                        time(NULL));
  	return 0;
  }
-@@ -945,99 +947,6 @@
+@@ -969,99 +971,6 @@
  }
  
  static void
@@ -171,7 +171,7 @@ diff -r 27833e4fcb1f libpurple/protocols/facebook/facebook.c
  fb_cmds_register(void)
  {
  	PurpleCmdId id;
-@@ -1049,13 +958,13 @@
+@@ -1073,13 +982,13 @@
  	g_return_if_fail(fb_cmds == NULL);
  
  	id = purple_cmd_register("kick", "s", PURPLE_CMD_P_PROTOCOL, cflags,
@@ -187,7 +187,7 @@ diff -r 27833e4fcb1f libpurple/protocols/facebook/facebook.c
  				 _("leave: Leave the chat"),
  				 NULL);
  	fb_cmds = g_slist_prepend(fb_cmds, GUINT_TO_POINTER(id));
-@@ -1074,43 +983,92 @@
+@@ -1098,43 +1007,92 @@
  	g_slist_free_full(fb_cmds, fb_cmds_unregister_free);
  }
  
@@ -310,12 +310,12 @@ diff -r 27833e4fcb1f libpurple/protocols/facebook/facebook.c
 +	inited = TRUE;
 +	return purple_plugin_register(plugin);
 +}
-diff -r 27833e4fcb1f libpurple/protocols/facebook/facebook.h
---- a/libpurple/protocols/facebook/facebook.h	Thu Jul 30 17:55:30 2015 -0400
-+++ b/libpurple/protocols/facebook/facebook.h	Thu Jul 30 22:29:35 2015 -0400
-@@ -25,29 +25,4 @@
- #include "glibcompat.h"
- #include "protocol.h"
+diff -r 9e3520d6ec49 libpurple/protocols/facebook/facebook.h
+--- a/libpurple/protocols/facebook/facebook.h	Wed Aug 05 17:57:33 2015 -0400
++++ b/libpurple/protocols/facebook/facebook.h	Wed Aug 05 19:21:33 2015 -0400
+@@ -24,29 +24,4 @@
+ 
+ #include <glib.h>
  
 -#define FACEBOOK_TYPE_PROTOCOL             (facebook_protocol_get_type())
 -#define FACEBOOK_PROTOCOL(obj)             (G_TYPE_CHECK_INSTANCE_CAST((obj), FACEBOOK_TYPE_PROTOCOL, FacebookProtocol))