VERSION: updated to 27833e4fcb1f

dequis · Jul 31, 2015 · 5a1bce8 · 5a1bce8
1 parent f2de077
commit 5a1bce8
Show file tree

Hide file tree

Showing 4 changed files with 23 additions and 16 deletions.
diff --git a/ChangeLog b/ChangeLog
@@ -1,3 +1,7 @@
+purple-facebook-27833e4fcb1f (2015-07-30):
+  - Added additional tooltip pairs
+  - Fixed Makefile.mingw not removing marshal sources
+
 purple-facebook-7c454f51b56b (2015-07-27):
   - Handle authentication errors
 

diff --git a/VERSION b/VERSION
@@ -1 +1 @@
-7c454f51b56b
+27833e4fcb1f
diff --git a/include/purple-compat.h b/include/purple-compat.h
@@ -52,6 +52,7 @@
 #define purple_blist_get_default_group()        NULL
 #define purple_blist_find_buddies               purple_find_buddies
 #define purple_blist_find_buddy                 purple_find_buddy
+#define purple_buddy_set_server_alias           purple_blist_server_alias_buddy
 #define purple_chat_conversation_add_user       purple_conv_chat_add_user
 #define purple_chat_conversation_get_id         purple_conv_chat_get_id
 #define purple_chat_conversation_has_user       purple_conv_chat_find_user

diff --git a/patches/02-plugin.patch b/patches/02-plugin.patch
@@ -1,7 +1,7 @@
-diff -r 7c454f51b56b libpurple/protocols/facebook/facebook.c
---- a/libpurple/protocols/facebook/facebook.c	Mon Jul 27 16:43:41 2015 -0400
-+++ b/libpurple/protocols/facebook/facebook.c	Mon Jul 27 16:49:51 2015 -0400
-@@ -439,7 +439,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 @@
  	GSList *select = NULL;
  	PurpleConnection *gc;
 
@@ -10,7 +10,7 @@ diff -r 7c454f51b56b libpurple/protocols/facebook/facebook.c
  		return;
  	}
 
-@@ -585,7 +585,7 @@
+@@ -604,7 +604,7 @@
  	PurpleConnection *gc;
  	PurpleMenuAction *act;
 
@@ -19,7 +19,7 @@ diff -r 7c454f51b56b libpurple/protocols/facebook/facebook.c
  		return NULL;
  	}
 
-@@ -608,7 +608,8 @@
+@@ -627,7 +627,8 @@
  }
 
  static gint
@@ -29,7 +29,7 @@ diff -r 7c454f51b56b libpurple/protocols/facebook/facebook.c
  {
  	const gchar *name;
  	const gchar *text;
-@@ -620,10 +621,10 @@
+@@ -639,10 +640,10 @@
  	fata = purple_connection_get_protocol_data(gc);
  	api = fb_data_get_api(fata);
 
@@ -42,7 +42,7 @@ diff -r 7c454f51b56b libpurple/protocols/facebook/facebook.c
  	sext = purple_markup_strip_html(text);
  	fb_api_message(api, uid, FALSE, sext);
  	g_free(sext);
-@@ -745,7 +746,8 @@
+@@ -764,7 +765,8 @@
  }
 
  static gint
@@ -52,7 +52,7 @@ diff -r 7c454f51b56b libpurple/protocols/facebook/facebook.c
  {
  	const gchar *name;
  	const gchar *text;
-@@ -764,15 +766,15 @@
+@@ -783,15 +785,15 @@
  	name = purple_conversation_get_name(PURPLE_CONVERSATION(chat));
  	tid = FB_ID_FROM_STR(name);
 
@@ -71,7 +71,7 @@ diff -r 7c454f51b56b libpurple/protocols/facebook/facebook.c
  	                        time(NULL));
  	return 0;
  }
-@@ -926,98 +928,6 @@
+@@ -945,99 +947,6 @@
  }
 
  static void
@@ -107,6 +107,7 @@ diff -r 7c454f51b56b libpurple/protocols/facebook/facebook.c
 -static void
 -facebook_protocol_client_iface_init(PurpleProtocolClientIface *iface)
 -{
+-	iface->tooltip_text    = fb_client_tooltip_text;
 -	iface->blist_node_menu = fb_client_blist_node_menu;
 -	iface->offline_message = fb_client_offline_message;
 -}
@@ -170,7 +171,7 @@ diff -r 7c454f51b56b libpurple/protocols/facebook/facebook.c
  fb_cmds_register(void)
  {
  	PurpleCmdId id;
-@@ -1029,13 +939,13 @@
+@@ -1049,13 +958,13 @@
  	g_return_if_fail(fb_cmds == NULL);
 
  	id = purple_cmd_register("kick", "s", PURPLE_CMD_P_PROTOCOL, cflags,
@@ -186,7 +187,7 @@ diff -r 7c454f51b56b libpurple/protocols/facebook/facebook.c
  				 _("leave: Leave the chat"),
  				 NULL);
  	fb_cmds = g_slist_prepend(fb_cmds, GUINT_TO_POINTER(id));
-@@ -1054,43 +964,91 @@
+@@ -1074,43 +983,92 @@
  	g_slist_free_full(fb_cmds, fb_cmds_unregister_free);
  }
 
@@ -277,6 +278,7 @@ diff -r 7c454f51b56b libpurple/protocols/facebook/facebook.c
 +
 +	pinfo.options            = OPT_PROTO_CHAT_TOPIC;
 +	pinfo.list_icon          = fb_list_icon;
++	pinfo.tooltip_text       = fb_client_tooltip_text;
 +	pinfo.status_types       = fb_status_types;
 +	pinfo.blist_node_menu    = fb_client_blist_node_menu;
 +	pinfo.chat_info          = fb_chat_info;
@@ -308,9 +310,9 @@ diff -r 7c454f51b56b libpurple/protocols/facebook/facebook.c
 +	inited = TRUE;
 +	return purple_plugin_register(plugin);
 +}
-diff -r 7c454f51b56b libpurple/protocols/facebook/facebook.h
---- a/libpurple/protocols/facebook/facebook.h	Mon Jul 27 16:43:41 2015 -0400
-+++ b/libpurple/protocols/facebook/facebook.h	Mon Jul 27 16:49:51 2015 -0400
+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"