Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/dequis/purple-facebook.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorjgeboski <jgeboski@gmail.com>2015-06-24 05:14:09 +0300
committerjgeboski <jgeboski@gmail.com>2015-06-24 05:36:15 +0300
commitd968984dddae26f640ba2b361bc0dff6737a9055 (patch)
tree29f646f68708e76a7c8803eafb10f073572c8e8a
parentca4b793003b6f980ed7180ff3bf713c7946412ba (diff)
update: updated to 5e83f57d97f35e83f57d97f3
-rw-r--r--configure.ac2
-rw-r--r--include/purple-compat.h1
-rw-r--r--patches/02-plugin.patch22
-rwxr-xr-xupdate.sh2
4 files changed, 14 insertions, 13 deletions
diff --git a/configure.ac b/configure.ac
index 2f8bdc3..72092e1 100644
--- a/configure.ac
+++ b/configure.ac
@@ -15,7 +15,7 @@
AC_INIT(
[purple-facebook],
- [0.1.0],
+ [5e83f57d97f3],
[https://github.com/jgeboski/purple-facebook/issues],
[purple-facebook],
[https://github.com/jgeboski/purple-facebook],
diff --git a/include/purple-compat.h b/include/purple-compat.h
index 795dbbd..363ec31 100644
--- a/include/purple-compat.h
+++ b/include/purple-compat.h
@@ -48,6 +48,7 @@
#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_set_topic purple_conv_chat_set_topic
+#define purple_protocol_got_user_status purple_prpl_got_user_status
#define purple_proxy_info_get_proxy_type purple_proxy_info_get_type
#define purple_request_cpar_from_connection(c) NULL
#define purple_roomlist_get_account(l) ((l)->account)
diff --git a/patches/02-plugin.patch b/patches/02-plugin.patch
index 8580c48..6b6b85d 100644
--- a/patches/02-plugin.patch
+++ b/patches/02-plugin.patch
@@ -1,7 +1,7 @@
-diff -r 5abaecb5a83d libpurple/protocols/facebook/facebook.c
---- a/libpurple/protocols/facebook/facebook.c Thu Jun 18 00:45:16 2015 -0400
-+++ b/libpurple/protocols/facebook/facebook.c Thu Jun 18 02:15:21 2015 -0400
-@@ -548,7 +548,8 @@
+diff -r 5e83f57d97f3 libpurple/protocols/facebook/facebook.c
+--- a/libpurple/protocols/facebook/facebook.c Tue Jun 23 22:07:59 2015 -0400
++++ b/libpurple/protocols/facebook/facebook.c Tue Jun 23 22:30:36 2015 -0400
+@@ -539,7 +539,8 @@
}
static gint
@@ -11,7 +11,7 @@ diff -r 5abaecb5a83d libpurple/protocols/facebook/facebook.c
{
const gchar *name;
const gchar *text;
-@@ -559,10 +560,10 @@
+@@ -550,10 +551,10 @@
fata = purple_connection_get_protocol_data(gc);
api = fb_data_get_api(fata);
@@ -24,7 +24,7 @@ diff -r 5abaecb5a83d libpurple/protocols/facebook/facebook.c
fb_api_message(api, uid, FALSE, text);
return 1;
}
-@@ -636,7 +637,8 @@
+@@ -627,7 +628,8 @@
}
static gint
@@ -34,7 +34,7 @@ diff -r 5abaecb5a83d libpurple/protocols/facebook/facebook.c
{
const gchar *name;
const gchar *text;
-@@ -654,13 +656,13 @@
+@@ -645,13 +647,13 @@
name = purple_conversation_get_name(PURPLE_CONVERSATION(chat));
tid = FB_ID_FROM_STR(name);
@@ -51,7 +51,7 @@ diff -r 5abaecb5a83d libpurple/protocols/facebook/facebook.c
time(NULL));
return 0;
}
-@@ -740,111 +742,71 @@
+@@ -731,111 +733,71 @@
g_object_unref(list);
}
@@ -222,9 +222,9 @@ diff -r 5abaecb5a83d libpurple/protocols/facebook/facebook.c
}
-
-PURPLE_PLUGIN_INIT(facebook, plugin_query, plugin_load, plugin_unload);
-diff -r 5abaecb5a83d libpurple/protocols/facebook/facebook.h
---- a/libpurple/protocols/facebook/facebook.h Thu Jun 18 00:45:16 2015 -0400
-+++ b/libpurple/protocols/facebook/facebook.h Thu Jun 18 02:15:21 2015 -0400
+diff -r 5e83f57d97f3 libpurple/protocols/facebook/facebook.h
+--- a/libpurple/protocols/facebook/facebook.h Tue Jun 23 22:07:59 2015 -0400
++++ b/libpurple/protocols/facebook/facebook.h Tue Jun 23 22:30:36 2015 -0400
@@ -25,29 +25,4 @@
#include "glibcompat.h"
#include "protocol.h"
diff --git a/update.sh b/update.sh
index b971461..d8b02ca 100755
--- a/update.sh
+++ b/update.sh
@@ -1,7 +1,7 @@
#!/bin/sh
URL="https://hg.pidgin.im/soc/2015/jgeboski/facebook"
-REV="5abaecb5a83d"
+REV="5e83f57d97f3"
HG=$(type -p hg || exit 1)
test -z "$srcdir" && srcdir=$(dirname "$0")