VERSION: updated to 6a0a79182ebc6a0a79182ebc

3 files changed, 30 insertions, 17 deletions

diff --git a/ChangeLog b/ChangeLog
index 0552beb..5be19fa 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,16 @@
+purple-facebook-6a0a79182ebc (2015-08-27):
+  - Added check to autoconf for glib-genmarshal
+  - Added missing g_get_real_time() compat function
+  - Added option to autoconf for extra compiler warnings
+  - Depend on and link to gobject-2.0
+  - Fixed deleted XMAs being fatal
+  - Fixed improper handling of queue errors
+  - Fixed possible NULL string comparison
+  - Fixed the contact query not fetching non-users
+  - Fixed the debian dependencies
+  - Implemented group chat topic change events
+  - Minor code refactoring
+
 purple-facebook-5727ffb502c7 (2015-08-21):
   - Added missing g_get_real_time() compat function
   - Display images and stickers in-line
diff --git a/VERSION b/VERSION
index d0d565a..6a3d9e4 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-39b8f418563c
+6a0a79182ebc
diff --git a/patches/02-plugin.patch b/patches/02-plugin.patch
index 4060086..400a60c 100644
--- a/patches/02-plugin.patch
+++ b/patches/02-plugin.patch
@@ -1,7 +1,7 @@
-diff -r 5727ffb502c7 libpurple/protocols/facebook/facebook.c
---- a/libpurple/protocols/facebook/facebook.c	Fri Aug 21 01:18:30 2015 -0400
-+++ b/libpurple/protocols/facebook/facebook.c	Fri Aug 21 11:51:33 2015 -0400
-@@ -436,7 +436,7 @@
+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
+@@ -446,7 +446,7 @@
  	id = purple_image_store_add_weak(pimg);
  
  	g_free(msg->text);
@@ -10,7 +10,7 @@ diff -r 5727ffb502c7 libpurple/protocols/facebook/facebook.c
  	                            PURPLE_IMAGE_STORE_PROTOCOL
  	                            "%u\">", id);
  	msg->flags |= FB_API_MESSAGE_FLAG_DONE;
-@@ -815,7 +815,7 @@
+@@ -825,7 +825,7 @@
  	GSList *select = NULL;
  	PurpleConnection *gc;
  
@@ -19,7 +19,7 @@ diff -r 5727ffb502c7 libpurple/protocols/facebook/facebook.c
  		return;
  	}
  
-@@ -1008,7 +1008,7 @@
+@@ -1018,7 +1018,7 @@
  	PurpleConnection *gc;
  	PurpleMenuAction *act;
  
@@ -28,7 +28,7 @@ diff -r 5727ffb502c7 libpurple/protocols/facebook/facebook.c
  		return NULL;
  	}
  
-@@ -1056,7 +1056,8 @@
+@@ -1066,7 +1066,8 @@
  }
  
  static gint
@@ -38,7 +38,7 @@ diff -r 5727ffb502c7 libpurple/protocols/facebook/facebook.c
  {
  	const gchar *name;
  	const gchar *text;
-@@ -1065,6 +1066,8 @@
+@@ -1075,6 +1076,8 @@
  	FbId uid;
  	gchar *sext;
  
@@ -47,7 +47,7 @@ diff -r 5727ffb502c7 libpurple/protocols/facebook/facebook.c
  	fata = purple_connection_get_protocol_data(gc);
  	api = fb_data_get_api(fata);
  
-@@ -1203,7 +1206,8 @@
+@@ -1213,7 +1216,8 @@
  }
  
  static gint
@@ -57,7 +57,7 @@ diff -r 5727ffb502c7 libpurple/protocols/facebook/facebook.c
  {
  	const gchar *name;
  	const gchar *text;
-@@ -1214,6 +1218,8 @@
+@@ -1224,6 +1228,8 @@
  	PurpleAccount *acct;
  	PurpleChatConversation *chat;
  
@@ -66,7 +66,7 @@ diff -r 5727ffb502c7 libpurple/protocols/facebook/facebook.c
  	acct = purple_connection_get_account(gc);
  	fata = purple_connection_get_protocol_data(gc);
  	api = fb_data_get_api(fata);
-@@ -1387,99 +1393,6 @@
+@@ -1392,99 +1398,6 @@
  }
  
  static void
@@ -166,7 +166,7 @@ diff -r 5727ffb502c7 libpurple/protocols/facebook/facebook.c
  fb_cmds_register(void)
  {
  	PurpleCmdId id;
-@@ -1491,13 +1404,13 @@
+@@ -1496,13 +1409,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 5727ffb502c7 libpurple/protocols/facebook/facebook.c
  				 _("leave: Leave the chat"),
  				 NULL);
  	fb_cmds = g_slist_prepend(fb_cmds, GUINT_TO_POINTER(id));
-@@ -1516,43 +1429,102 @@
+@@ -1521,43 +1434,102 @@
  	g_slist_free_full(fb_cmds, fb_cmds_unregister_free);
  }
  
@@ -315,9 +315,9 @@ diff -r 5727ffb502c7 libpurple/protocols/facebook/facebook.c
 +	inited = TRUE;
 +	return purple_plugin_register(plugin);
 +}
-diff -r 5727ffb502c7 libpurple/protocols/facebook/facebook.h
---- a/libpurple/protocols/facebook/facebook.h	Fri Aug 21 01:18:30 2015 -0400
-+++ b/libpurple/protocols/facebook/facebook.h	Fri Aug 21 11:51:33 2015 -0400
+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 @@
  #ifndef _FACEBOOK_H_
  #define _FACEBOOK_H_