configure: updated to 0bd9b2c3f5b7

dequis · Jun 30, 2015 · 4f7f03c · 4f7f03c
1 parent b374f88
commit 4f7f03c
Show file tree

Hide file tree

Showing 3 changed files with 34 additions and 12 deletions.
diff --git a/ChangeLog b/ChangeLog
@@ -1,3 +1,7 @@
+purple-facebook-0bd9b2c3f5b7 (2015-06-30):
+  - Do not error on icon retrieval failtures
+  - Only show "Initiate Chat" with buddies
+
 purple-facebook-602a1c64670a (2015-06-27):
   - Fixed disabled contacts causing JSON parse errors
   - Fixed truncated HTTP responses

diff --git a/configure.ac b/configure.ac
@@ -15,7 +15,7 @@
 
 AC_INIT(
     [purple-facebook],
-    [602a1c64670a],
+    [0bd9b2c3f5b7],
     [https://github.com/jgeboski/purple-facebook/issues],
     [purple-facebook],
     [https://github.com/jgeboski/purple-facebook],

diff --git a/patches/02-plugin.patch b/patches/02-plugin.patch
@@ -1,7 +1,25 @@
-diff -r 3ee1b27dacc4 libpurple/protocols/facebook/facebook.c
---- a/libpurple/protocols/facebook/facebook.c	Sat Jun 27 00:56:13 2015 -0400
-+++ b/libpurple/protocols/facebook/facebook.c	Sat Jun 27 01:17:25 2015 -0400
-@@ -540,7 +540,8 @@
+diff -r 0bd9b2c3f5b7 libpurple/protocols/facebook/facebook.c
+--- a/libpurple/protocols/facebook/facebook.c	Tue Jun 30 14:45:32 2015 -0400
++++ b/libpurple/protocols/facebook/facebook.c	Tue Jun 30 15:09:39 2015 -0400
+@@ -390,7 +390,7 @@
+ 	GSList *select = NULL;
+ 	PurpleConnection *gc;
+
+-	if (G_OBJECT_TYPE(node) != PURPLE_TYPE_BUDDY) {
++	if (!PURPLE_BLIST_NODE_IS_BUDDY(node)) {
+ 		return;
+ 	}
+
+@@ -530,7 +530,7 @@
+ 	PurpleConnection *gc;
+ 	PurpleMenuAction *act;
+
+-	if (G_OBJECT_TYPE(node) != PURPLE_TYPE_BUDDY) {
++	if (!PURPLE_BLIST_NODE_IS_BUDDY(node)) {
+ 		return NULL;
+ 	}
+
+@@ -547,7 +547,8 @@
  }
 
  static gint
@@ -11,7 +29,7 @@ diff -r 3ee1b27dacc4 libpurple/protocols/facebook/facebook.c
  {
  	const gchar *name;
  	const gchar *text;
-@@ -551,10 +552,10 @@
+@@ -558,10 +559,10 @@
  	fata = purple_connection_get_protocol_data(gc);
  	api = fb_data_get_api(fata);
 
@@ -24,7 +42,7 @@ diff -r 3ee1b27dacc4 libpurple/protocols/facebook/facebook.c
  	fb_api_message(api, uid, FALSE, text);
  	return 1;
  }
-@@ -628,7 +629,8 @@
+@@ -635,7 +636,8 @@
  }
 
  static gint
@@ -34,7 +52,7 @@ diff -r 3ee1b27dacc4 libpurple/protocols/facebook/facebook.c
  {
  	const gchar *name;
  	const gchar *text;
-@@ -646,13 +648,13 @@
+@@ -653,13 +655,13 @@
  	name = purple_conversation_get_name(PURPLE_CONVERSATION(chat));
  	tid = FB_ID_FROM_STR(name);
 
@@ -51,7 +69,7 @@ diff -r 3ee1b27dacc4 libpurple/protocols/facebook/facebook.c
  	                        time(NULL));
  	return 0;
  }
-@@ -732,111 +734,71 @@
+@@ -739,111 +741,71 @@
  	g_object_unref(list);
  }
 
@@ -222,9 +240,9 @@ diff -r 3ee1b27dacc4 libpurple/protocols/facebook/facebook.c
  }
 -
 -PURPLE_PLUGIN_INIT(facebook, plugin_query, plugin_load, plugin_unload);
-diff -r 3ee1b27dacc4 libpurple/protocols/facebook/facebook.h
---- a/libpurple/protocols/facebook/facebook.h	Sat Jun 27 00:56:13 2015 -0400
-+++ b/libpurple/protocols/facebook/facebook.h	Sat Jun 27 01:17:25 2015 -0400
+diff -r 0bd9b2c3f5b7 libpurple/protocols/facebook/facebook.h
+--- a/libpurple/protocols/facebook/facebook.h	Tue Jun 30 14:45:32 2015 -0400
++++ b/libpurple/protocols/facebook/facebook.h	Tue Jun 30 15:09:39 2015 -0400
 @@ -25,29 +25,4 @@
  #include "glibcompat.h"
  #include "protocol.h"