VERSION: update to 25a255f32eee25a255f32eee

4 files changed, 25 insertions, 15 deletions

diff --git a/ChangeLog b/ChangeLog
index d4722ea..196b611 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+purple-facebook-25a255f32eee (2016-01-18):
+  - Add the local user to the group chat user list
+  - Fixed group chat join messages with incoming messages
+  - Fixed incorrect handling of unknown XMA types
+  - Use locally defined aliases in the group chat list
+  - Use the icon URL as a backup checksum
+
 purple-facebook-ad2ee74b913a (2016-01-07):
   - Added an account option for self messages
   - Attempt to silently reconnect the MQTT stream
diff --git a/VERSION b/VERSION
index a94d4cb..6985a9e 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-ad2ee74b913a
+25a255f32eee
diff --git a/include/purple-compat.h b/include/purple-compat.h
index ee160c8..82c26ab 100644
--- a/include/purple-compat.h
+++ b/include/purple-compat.h
@@ -90,6 +90,9 @@ struct _PurpleMessage
 #define purple_serv_join_chat  serv_join_chat
 #define purple_status_get_status_type  purple_status_get_type
 
+#define purple_chat_conversation_get_users_count(c) \
+    g_list_length(purple_conv_chat_get_users(c))
+
 #define purple_conversations_find_chat(c, i) \
     purple_conversation_get_chat_data( \
         purple_find_chat(c, i) \
diff --git a/patches/03-plugin.patch b/patches/03-plugin.patch
index 9a14ef1..cc51240 100644
--- a/patches/03-plugin.patch
+++ b/patches/03-plugin.patch
@@ -1,6 +1,6 @@
-diff -r ad2ee74b913a libpurple/protocols/facebook/facebook.c
---- a/libpurple/protocols/facebook/facebook.c	Thu Jan 07 14:06:04 2016 -0500
-+++ b/libpurple/protocols/facebook/facebook.c	Thu Jan 07 16:30:08 2016 -0500
+diff -r 25a255f32eee libpurple/protocols/facebook/facebook.c
+--- a/libpurple/protocols/facebook/facebook.c	Sat Jan 16 10:01:23 2016 -0500
++++ b/libpurple/protocols/facebook/facebook.c	Mon Jan 18 09:39:59 2016 -0500
 @@ -446,7 +446,7 @@
  	id = purple_image_store_add_weak(pimg);
  
@@ -10,7 +10,7 @@ diff -r ad2ee74b913a libpurple/protocols/facebook/facebook.c
  	                            PURPLE_IMAGE_STORE_PROTOCOL
  	                            "%u\">", id);
  	msg->flags |= FB_API_MESSAGE_FLAG_DONE;
-@@ -836,7 +836,7 @@
+@@ -864,7 +864,7 @@
  	GSList *select = NULL;
  	PurpleConnection *gc;
  
@@ -19,7 +19,7 @@ diff -r ad2ee74b913a libpurple/protocols/facebook/facebook.c
  		return;
  	}
  
-@@ -1022,7 +1022,7 @@
+@@ -1050,7 +1050,7 @@
  	PurpleConnection *gc;
  	PurpleMenuAction *act;
  
@@ -28,7 +28,7 @@ diff -r ad2ee74b913a libpurple/protocols/facebook/facebook.c
  		return NULL;
  	}
  
-@@ -1070,7 +1070,8 @@
+@@ -1098,7 +1098,8 @@
  }
  
  static gint
@@ -38,7 +38,7 @@ diff -r ad2ee74b913a libpurple/protocols/facebook/facebook.c
  {
  	const gchar *name;
  	const gchar *text;
-@@ -1079,6 +1080,8 @@
+@@ -1107,6 +1108,8 @@
  	FbId uid;
  	gchar *sext;
  
@@ -47,7 +47,7 @@ diff -r ad2ee74b913a libpurple/protocols/facebook/facebook.c
  	fata = purple_connection_get_protocol_data(gc);
  	api = fb_data_get_api(fata);
  
-@@ -1217,7 +1220,8 @@
+@@ -1245,7 +1248,8 @@
  }
  
  static gint
@@ -57,7 +57,7 @@ diff -r ad2ee74b913a libpurple/protocols/facebook/facebook.c
  {
  	const gchar *name;
  	const gchar *text;
-@@ -1228,6 +1232,8 @@
+@@ -1256,6 +1260,8 @@
  	PurpleAccount *acct;
  	PurpleChatConversation *chat;
  
@@ -66,7 +66,7 @@ diff -r ad2ee74b913a libpurple/protocols/facebook/facebook.c
  	acct = purple_connection_get_account(gc);
  	fata = purple_connection_get_protocol_data(gc);
  	api = fb_data_get_api(fata);
-@@ -1396,14 +1402,119 @@
+@@ -1424,14 +1430,119 @@
  }
  
  static void
@@ -190,7 +190,7 @@ diff -r ad2ee74b913a libpurple/protocols/facebook/facebook.c
  
  	opt = purple_account_option_int_new(_("Buddy list sync interval"),
  	                                    "sync-interval", 30);
-@@ -1425,147 +1536,8 @@
+@@ -1453,147 +1564,8 @@
  	                                       "incoming messages"),
  	                                     "group-chat-open", TRUE);
  	opts = g_list_prepend(opts, opt);
@@ -342,9 +342,9 @@ diff -r ad2ee74b913a libpurple/protocols/facebook/facebook.c
 -}
 -
 -PURPLE_PLUGIN_INIT(facebook, plugin_query, plugin_load, plugin_unload);
-diff -r ad2ee74b913a libpurple/protocols/facebook/facebook.h
---- a/libpurple/protocols/facebook/facebook.h	Thu Jan 07 14:06:04 2016 -0500
-+++ b/libpurple/protocols/facebook/facebook.h	Thu Jan 07 16:30:08 2016 -0500
+diff -r 25a255f32eee libpurple/protocols/facebook/facebook.h
+--- a/libpurple/protocols/facebook/facebook.h	Sat Jan 16 10:01:23 2016 -0500
++++ b/libpurple/protocols/facebook/facebook.h	Mon Jan 18 09:39:59 2016 -0500
 @@ -22,24 +22,7 @@
  #ifndef _FACEBOOK_H_
  #define _FACEBOOK_H_