Skip to content

Commit

Permalink
VERSION: updated to 4098e875ebcb
Browse files Browse the repository at this point in the history
  • Loading branch information
jgeboski committed Jul 13, 2015
1 parent 8166c11 commit a35015f
Show file tree
Hide file tree
Showing 3 changed files with 21 additions and 14 deletions.
4 changes: 4 additions & 0 deletions ChangeLog
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
purple-facebook-4098e875ebcb (2015-07-12):
- Added HTTP debug messages
- Allow offline messages to buddies

purple-facebook-dc35ba3e7fac (2015-07-12):
- Added Travis CI support
- Escape and unescape HTML within messages
Expand Down
2 changes: 1 addition & 1 deletion VERSION
Original file line number Diff line number Diff line change
@@ -1 +1 @@
dc35ba3e7fac
4098e875ebcb
29 changes: 16 additions & 13 deletions patches/02-plugin.patch
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
diff -r dc35ba3e7fac libpurple/protocols/facebook/facebook.c
--- a/libpurple/protocols/facebook/facebook.c Sat Jul 11 14:45:46 2015 -0400
+++ b/libpurple/protocols/facebook/facebook.c Sun Jul 12 01:48:46 2015 -0400
diff -r 4098e875ebcb libpurple/protocols/facebook/facebook.c
--- a/libpurple/protocols/facebook/facebook.c Sun Jul 12 23:10:49 2015 -0400
+++ b/libpurple/protocols/facebook/facebook.c Sun Jul 12 23:18:57 2015 -0400
@@ -408,7 +408,7 @@
GSList *select = NULL;
PurpleConnection *gc;
Expand All @@ -19,7 +19,7 @@ diff -r dc35ba3e7fac libpurple/protocols/facebook/facebook.c
return NULL;
}

@@ -566,7 +566,8 @@
@@ -572,7 +572,8 @@
}

static gint
Expand All @@ -29,7 +29,7 @@ diff -r dc35ba3e7fac libpurple/protocols/facebook/facebook.c
{
const gchar *name;
const gchar *text;
@@ -578,10 +579,10 @@
@@ -584,10 +585,10 @@
fata = purple_connection_get_protocol_data(gc);
api = fb_data_get_api(fata);

Expand All @@ -42,7 +42,7 @@ diff -r dc35ba3e7fac libpurple/protocols/facebook/facebook.c
sext = purple_markup_strip_html(text);
fb_api_message(api, uid, FALSE, sext);
g_free(sext);
@@ -703,7 +704,8 @@
@@ -709,7 +710,8 @@
}

static gint
Expand All @@ -52,7 +52,7 @@ diff -r dc35ba3e7fac libpurple/protocols/facebook/facebook.c
{
const gchar *name;
const gchar *text;
@@ -722,15 +724,15 @@
@@ -728,15 +730,15 @@
name = purple_conversation_get_name(PURPLE_CONVERSATION(chat));
tid = FB_ID_FROM_STR(name);

Expand All @@ -71,7 +71,7 @@ diff -r dc35ba3e7fac libpurple/protocols/facebook/facebook.c
time(NULL));
return 0;
}
@@ -884,84 +886,6 @@
@@ -890,85 +892,6 @@
}

static void
Expand All @@ -95,6 +95,7 @@ diff -r dc35ba3e7fac libpurple/protocols/facebook/facebook.c
-facebook_protocol_client_iface_init(PurpleProtocolClientIface *iface)
-{
- iface->blist_node_menu = fb_client_blist_node_menu;
- iface->offline_message = fb_client_offline_message;
-}
-
-static void
Expand Down Expand Up @@ -156,7 +157,7 @@ diff -r dc35ba3e7fac libpurple/protocols/facebook/facebook.c
fb_cmds_register(void)
{
PurpleCmdId id;
@@ -973,13 +897,13 @@
@@ -980,13 +903,13 @@
g_return_if_fail(fb_cmds == NULL);

id = purple_cmd_register("kick", "s", PURPLE_CMD_P_PROTOCOL, cflags,
Expand All @@ -172,7 +173,7 @@ diff -r dc35ba3e7fac libpurple/protocols/facebook/facebook.c
_("leave: Leave the chat"),
NULL);
fb_cmds = g_slist_prepend(fb_cmds, GUINT_TO_POINTER(id));
@@ -998,43 +922,76 @@
@@ -1005,43 +928,78 @@
g_slist_free_full(fb_cmds, fb_cmds_unregister_free);
}

Expand Down Expand Up @@ -275,13 +276,15 @@ diff -r dc35ba3e7fac libpurple/protocols/facebook/facebook.c
+ pinfo.set_chat_topic = fb_chat_set_topic;
+ pinfo.roomlist_get_list = fb_roomlist_get_list;
+ pinfo.roomlist_cancel = fb_roomlist_cancel;
+ pinfo.offline_message = fb_client_offline_message;
+ pinfo.struct_size = sizeof pinfo;
+
+ inited = TRUE;
+ return purple_plugin_register(plugin);
+}
diff -r dc35ba3e7fac libpurple/protocols/facebook/facebook.h
--- a/libpurple/protocols/facebook/facebook.h Sat Jul 11 14:45:46 2015 -0400
+++ b/libpurple/protocols/facebook/facebook.h Sun Jul 12 01:48:46 2015 -0400
diff -r 4098e875ebcb libpurple/protocols/facebook/facebook.h
--- a/libpurple/protocols/facebook/facebook.h Sun Jul 12 23:10:49 2015 -0400
+++ b/libpurple/protocols/facebook/facebook.h Sun Jul 12 23:18:57 2015 -0400
@@ -25,29 +25,4 @@
#include "glibcompat.h"
#include "protocol.h"
Expand Down

0 comments on commit a35015f

Please sign in to comment.