VERSION: updated to f80258f7ce6ff80258f7ce6f

4 files changed, 52 insertions, 16 deletions

diff --git a/ChangeLog b/ChangeLog
index 4caa337..52a1b2e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+purple-facebook-f80258f7ce6f (2015-07-26):
+  - Added debian support
+  - Added NULL Away state for compatibility
+  - Fixed double free with MQTT SSL errors
+  - Fixed logic error with error detection
+  - Fixed out of tree updating with update.sh
+  - Implemented marking threads as read
+  - Open new group chats with incoming messages
+
 purple-facebook-565fbae05259 (2015-07-18):
   - Dropped required glib version to 2.20.0
   - Fixed libpurple check within autoconf
diff --git a/VERSION b/VERSION
index fbf61e0..4524a09 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-565fbae05259
+f80258f7ce6f
diff --git a/include/purple-compat.h b/include/purple-compat.h
index f636920..b0ee419 100644
--- a/include/purple-compat.h
+++ b/include/purple-compat.h
@@ -18,6 +18,7 @@
 #ifndef _PURPLE_COMPAT_H_
 #define _PURPLE_COMPAT_H_
 
+#include "accountopt.h"
 #include "connection.h"
 #include "debug.h"
 #include "notify.h"
diff --git a/patches/02-plugin.patch b/patches/02-plugin.patch
index f9034d8..d9bd0cd 100644
--- a/patches/02-plugin.patch
+++ b/patches/02-plugin.patch
@@ -1,7 +1,7 @@
-diff -r 565fbae05259 libpurple/protocols/facebook/facebook.c
---- a/libpurple/protocols/facebook/facebook.c	Sat Jul 18 20:24:08 2015 -0400
-+++ b/libpurple/protocols/facebook/facebook.c	Sat Jul 18 20:28:07 2015 -0400
-@@ -413,7 +413,7 @@
+diff -r f80258f7ce6f libpurple/protocols/facebook/facebook.c
+--- a/libpurple/protocols/facebook/facebook.c	Sun Jul 26 16:51:03 2015 -0400
++++ b/libpurple/protocols/facebook/facebook.c	Sun Jul 26 21:11:03 2015 -0400
+@@ -440,7 +440,7 @@
  	GSList *select = NULL;
  	PurpleConnection *gc;
  
@@ -10,7 +10,7 @@ diff -r 565fbae05259 libpurple/protocols/facebook/facebook.c
  		return;
  	}
  
-@@ -554,7 +554,7 @@
+@@ -586,7 +586,7 @@
  	PurpleConnection *gc;
  	PurpleMenuAction *act;
  
@@ -19,7 +19,7 @@ diff -r 565fbae05259 libpurple/protocols/facebook/facebook.c
  		return NULL;
  	}
  
-@@ -577,7 +577,8 @@
+@@ -609,7 +609,8 @@
  }
  
  static gint
@@ -29,7 +29,7 @@ diff -r 565fbae05259 libpurple/protocols/facebook/facebook.c
  {
  	const gchar *name;
  	const gchar *text;
-@@ -589,10 +590,10 @@
+@@ -621,10 +622,10 @@
  	fata = purple_connection_get_protocol_data(gc);
  	api = fb_data_get_api(fata);
  
@@ -42,7 +42,7 @@ diff -r 565fbae05259 libpurple/protocols/facebook/facebook.c
  	sext = purple_markup_strip_html(text);
  	fb_api_message(api, uid, FALSE, sext);
  	g_free(sext);
-@@ -714,7 +715,8 @@
+@@ -746,7 +747,8 @@
  }
  
  static gint
@@ -52,7 +52,7 @@ diff -r 565fbae05259 libpurple/protocols/facebook/facebook.c
  {
  	const gchar *name;
  	const gchar *text;
-@@ -733,15 +735,15 @@
+@@ -765,15 +767,15 @@
  	name = purple_conversation_get_name(PURPLE_CONVERSATION(chat));
  	tid = FB_ID_FROM_STR(name);
  
@@ -71,15 +71,28 @@ diff -r 565fbae05259 libpurple/protocols/facebook/facebook.c
  	                        time(NULL));
  	return 0;
  }
-@@ -895,85 +897,6 @@
+@@ -927,98 +929,6 @@
  }
  
  static void
 -facebook_protocol_init(PurpleProtocol *protocol)
 -{
+-	GList *opts = NULL;
+-	PurpleAccountOption *opt;
+-
 -	protocol->id      = "prpl-facebook";
 -	protocol->name    = "Facebook";
 -	protocol->options = OPT_PROTO_CHAT_TOPIC;
+-
+-	opt = purple_account_option_bool_new(_("Mark messages as read"),
+-	                                     "mark-read", TRUE);
+-	opts = g_list_prepend(opts, opt);
+-
+-	opt = purple_account_option_bool_new(_("Open new group chats with "
+-	                                       "incoming messages"),
+-	                                     "group-chat-open", TRUE);
+-	opts = g_list_prepend(opts, opt);
+-	protocol->account_options = g_list_reverse(opts);
 -}
 -
 -static void
@@ -157,7 +170,7 @@ diff -r 565fbae05259 libpurple/protocols/facebook/facebook.c
  fb_cmds_register(void)
  {
  	PurpleCmdId id;
-@@ -985,13 +908,13 @@
+@@ -1030,13 +940,13 @@
  	g_return_if_fail(fb_cmds == NULL);
  
  	id = purple_cmd_register("kick", "s", PURPLE_CMD_P_PROTOCOL, cflags,
@@ -173,7 +186,7 @@ diff -r 565fbae05259 libpurple/protocols/facebook/facebook.c
  				 _("leave: Leave the chat"),
  				 NULL);
  	fb_cmds = g_slist_prepend(fb_cmds, GUINT_TO_POINTER(id));
-@@ -1010,43 +933,78 @@
+@@ -1055,43 +965,91 @@
  	g_slist_free_full(fb_cmds, fb_cmds_unregister_free);
  }
  
@@ -231,6 +244,9 @@ diff -r 565fbae05259 libpurple/protocols/facebook/facebook.c
 +G_MODULE_EXPORT gboolean
 +purple_init_plugin(PurplePlugin *plugin)
 +{
++	GList *opts = NULL;
++	PurpleAccountOption *opt;
++
 +	static gboolean inited = FALSE;
 +	static PurplePluginInfo info;
 +	static PurplePluginProtocolInfo pinfo;
@@ -279,12 +295,22 @@ diff -r 565fbae05259 libpurple/protocols/facebook/facebook.c
 +	pinfo.offline_message    = fb_client_offline_message;
 +	pinfo.struct_size        = sizeof pinfo;
 +
++	opt = purple_account_option_bool_new(_("Mark messages as read"),
++	                                     "mark-read", TRUE);
++	opts = g_list_prepend(opts, opt);
++
++	opt = purple_account_option_bool_new(_("Open new group chats with "
++	                                       "incoming messages"),
++	                                     "group-chat-open", TRUE);
++	opts = g_list_prepend(opts, opt);
++	pinfo.protocol_options = g_list_reverse(opts);
++
 +	inited = TRUE;
 +	return purple_plugin_register(plugin);
 +}
-diff -r 565fbae05259 libpurple/protocols/facebook/facebook.h
---- a/libpurple/protocols/facebook/facebook.h	Sat Jul 18 20:24:08 2015 -0400
-+++ b/libpurple/protocols/facebook/facebook.h	Sat Jul 18 20:28:07 2015 -0400
+diff -r f80258f7ce6f libpurple/protocols/facebook/facebook.h
+--- a/libpurple/protocols/facebook/facebook.h	Sun Jul 26 16:51:03 2015 -0400
++++ b/libpurple/protocols/facebook/facebook.h	Sun Jul 26 21:11:03 2015 -0400
 @@ -25,29 +25,4 @@
  #include "glibcompat.h"
  #include "protocol.h"