Rebase to newer mcabber api
* Api versions shift:
dev:12, 12, 13, 14 -> dev:13, 15, 16, 17
--- a/add-hook-post-message-in-timestamp Fri Apr 02 10:55:37 2010 +0300
+++ b/add-hook-post-message-in-timestamp Sun Apr 04 01:33:42 2010 +0300
@@ -1,6 +1,6 @@
-diff -r 09901bac45fb mcabber/doc/HOWTO_modules.txt
---- a/mcabber/doc/HOWTO_modules.txt Fri Apr 02 10:41:43 2010 +0300
-+++ b/mcabber/doc/HOWTO_modules.txt Fri Apr 02 10:46:49 2010 +0300
+diff -r 8ffda344eced mcabber/doc/HOWTO_modules.txt
+--- a/mcabber/doc/HOWTO_modules.txt Sun Apr 04 01:22:45 2010 +0300
++++ b/mcabber/doc/HOWTO_modules.txt Sun Apr 04 01:23:31 2010 +0300
@@ -206,6 +206,8 @@
* attention - In a MUC message, true if you've been highlighted
In a regular message, true if the sender has requested your
@@ -10,21 +10,21 @@
- hook-message-out (HOOK_MESSAGE_OUT) with parameters
* jid - recipient of the outgoing message
* message - message body, converted to locale charset
-diff -r 09901bac45fb mcabber/mcabber/api.h
---- a/mcabber/mcabber/api.h Fri Apr 02 10:41:43 2010 +0300
-+++ b/mcabber/mcabber/api.h Fri Apr 02 10:46:49 2010 +0300
+diff -r 8ffda344eced mcabber/mcabber/api.h
+--- a/mcabber/mcabber/api.h Sun Apr 04 01:22:45 2010 +0300
++++ b/mcabber/mcabber/api.h Sun Apr 04 01:23:31 2010 +0300
@@ -3,7 +3,7 @@
#include <mcabber/config.h> // For MCABBER_BRANCH
--#define MCABBER_API_VERSION 12
-+#define MCABBER_API_VERSION 13
- #define MCABBER_API_MIN 12
+-#define MCABBER_API_VERSION 15
++#define MCABBER_API_VERSION 16
+ #define MCABBER_API_MIN 15
extern const gchar *mcabber_branch;
-diff -r 09901bac45fb mcabber/mcabber/hooks.c
---- a/mcabber/mcabber/hooks.c Fri Apr 02 10:41:43 2010 +0300
-+++ b/mcabber/mcabber/hooks.c Fri Apr 02 10:46:49 2010 +0300
+diff -r 8ffda344eced mcabber/mcabber/hooks.c
+--- a/mcabber/mcabber/hooks.c Sun Apr 04 01:22:45 2010 +0300
++++ b/mcabber/mcabber/hooks.c Sun Apr 04 01:23:31 2010 +0300
@@ -369,12 +369,16 @@
#ifdef MODULES_ENABLE
--- a/direct-invite Fri Apr 02 10:55:37 2010 +0300
+++ b/direct-invite Sun Apr 04 01:33:42 2010 +0300
@@ -1,18 +1,18 @@
-diff -r c8ac1dfbb0cf mcabber/mcabber/api.h
---- a/mcabber/mcabber/api.h Fri Apr 02 10:49:32 2010 +0300
-+++ b/mcabber/mcabber/api.h Fri Apr 02 10:50:28 2010 +0300
+diff -r a2666915df22 mcabber/mcabber/api.h
+--- a/mcabber/mcabber/api.h Sun Apr 04 01:29:29 2010 +0300
++++ b/mcabber/mcabber/api.h Sun Apr 04 01:30:35 2010 +0300
@@ -3,7 +3,7 @@
#include <mcabber/config.h> // For MCABBER_BRANCH
--#define MCABBER_API_VERSION 13
-+#define MCABBER_API_VERSION 14
- #define MCABBER_API_MIN 12
+-#define MCABBER_API_VERSION 16
++#define MCABBER_API_VERSION 17
+ #define MCABBER_API_MIN 15
extern const gchar *mcabber_branch;
-diff -r c8ac1dfbb0cf mcabber/mcabber/xmpp.c
---- a/mcabber/mcabber/xmpp.c Fri Apr 02 10:49:32 2010 +0300
-+++ b/mcabber/mcabber/xmpp.c Fri Apr 02 10:50:28 2010 +0300
+diff -r a2666915df22 mcabber/mcabber/xmpp.c
+--- a/mcabber/mcabber/xmpp.c Sun Apr 04 01:29:29 2010 +0300
++++ b/mcabber/mcabber/xmpp.c Sun Apr 04 01:30:35 2010 +0300
@@ -1290,6 +1290,18 @@
"http://jabber.org/protocol/muc#user");
if (x && !strcmp(x->name, "x"))
@@ -32,9 +32,9 @@
}
return LM_HANDLER_RESULT_REMOVE_MESSAGE;
-diff -r c8ac1dfbb0cf mcabber/mcabber/xmpp_defines.h
---- a/mcabber/mcabber/xmpp_defines.h Fri Apr 02 10:49:32 2010 +0300
-+++ b/mcabber/mcabber/xmpp_defines.h Fri Apr 02 10:50:28 2010 +0300
+diff -r a2666915df22 mcabber/mcabber/xmpp_defines.h
+--- a/mcabber/mcabber/xmpp_defines.h Sun Apr 04 01:29:29 2010 +0300
++++ b/mcabber/mcabber/xmpp_defines.h Sun Apr 04 01:30:35 2010 +0300
@@ -27,6 +27,8 @@
#define NS_BROWSE "jabber:iq:browse"
#define NS_EVENT "jabber:x:event"
@@ -44,9 +44,9 @@
#define NS_SIGNED "jabber:x:signed"
#define NS_ENCRYPTED "jabber:x:encrypted"
#define NS_GATEWAY "jabber:iq:gateway"
-diff -r c8ac1dfbb0cf mcabber/mcabber/xmpp_helper.c
---- a/mcabber/mcabber/xmpp_helper.c Fri Apr 02 10:49:32 2010 +0300
-+++ b/mcabber/mcabber/xmpp_helper.c Fri Apr 02 10:50:28 2010 +0300
+diff -r a2666915df22 mcabber/mcabber/xmpp_helper.c
+--- a/mcabber/mcabber/xmpp_helper.c Sun Apr 04 01:29:29 2010 +0300
++++ b/mcabber/mcabber/xmpp_helper.c Sun Apr 04 01:30:35 2010 +0300
@@ -232,6 +232,7 @@
caps_add_feature("", NS_PING);
caps_add_feature("", NS_COMMANDS);
@@ -55,9 +55,9 @@
if (!settings_opt_get_int("iq_last_disable") &&
(!settings_opt_get_int("iq_last_disable_when_notavail") ||
status != notavail))
-diff -r c8ac1dfbb0cf mcabber/mcabber/xmpp_muc.c
---- a/mcabber/mcabber/xmpp_muc.c Fri Apr 02 10:49:32 2010 +0300
-+++ b/mcabber/mcabber/xmpp_muc.c Fri Apr 02 10:50:28 2010 +0300
+diff -r a2666915df22 mcabber/mcabber/xmpp_muc.c
+--- a/mcabber/mcabber/xmpp_muc.c Sun Apr 04 01:29:29 2010 +0300
++++ b/mcabber/mcabber/xmpp_muc.c Sun Apr 04 01:30:35 2010 +0300
@@ -39,6 +39,8 @@
extern enum imstatus mystatus;
extern gchar *mystatusmsg;
@@ -161,9 +161,9 @@
}
// TODO
// handle status code = 100 ( not anonymous )
-diff -r c8ac1dfbb0cf mcabber/mcabber/xmpp_muc.h
---- a/mcabber/mcabber/xmpp_muc.h Fri Apr 02 10:49:32 2010 +0300
-+++ b/mcabber/mcabber/xmpp_muc.h Fri Apr 02 10:50:28 2010 +0300
+diff -r a2666915df22 mcabber/mcabber/xmpp_muc.h
+--- a/mcabber/mcabber/xmpp_muc.h Sun Apr 04 01:29:29 2010 +0300
++++ b/mcabber/mcabber/xmpp_muc.h Sun Apr 04 01:30:35 2010 +0300
@@ -6,10 +6,14 @@
char *from;
char *passwd;
--- a/series Fri Apr 02 10:55:37 2010 +0300
+++ b/series Sun Apr 04 01:33:42 2010 +0300
@@ -3,11 +3,11 @@
modularize-fifo
separate-extcmd
add-hook-post-message-in-timestamp
-update-changelog-v13
+update-changelog-v16
modularize-extcmd
guard-xmpp-password
guardize-colors
roster-state-colors
direct-invite
-update-changelog-v14
+update-changelog-v17
muc-multiple-statuses
--- a/switch-to-experimental Fri Apr 02 10:55:37 2010 +0300
+++ b/switch-to-experimental Sun Apr 04 01:33:42 2010 +0300
@@ -1,23 +1,22 @@
-diff -r 2e133fc0e3d9 mcabber/ChangeLog.api
---- a/mcabber/ChangeLog.api Sun Mar 28 23:40:10 2010 +0200
-+++ b/mcabber/ChangeLog.api Thu Apr 01 23:28:43 2010 +0300
-@@ -1,3 +1,12 @@
-+
-+experimental (12)
+diff -r fdb2f88b908b mcabber/ChangeLog.api
+--- a/mcabber/ChangeLog.api Sun Apr 04 00:15:53 2010 +0200
++++ b/mcabber/ChangeLog.api Sun Apr 04 01:22:16 2010 +0300
+@@ -1,3 +1,11 @@
++experimental (15)
+
+ * Change branch to "experimental".
-+ * Api as defined by dev:12
++ * Api as defined by dev:13
+ * MQ Patch: switch-to-experimental
+
+ -- Myhailo Danylenko, 2010-04-01
+
- dev (12)
+ dev (13)
- * Add scr_getlogwinheight()
-diff -r 2e133fc0e3d9 mcabber/configure.ac
---- a/mcabber/configure.ac Sun Mar 28 23:40:10 2010 +0200
-+++ b/mcabber/configure.ac Thu Apr 01 23:28:43 2010 +0300
-@@ -264,7 +264,7 @@
+ * Rename jep00{22,85} to xep00{22,85}
+diff -r fdb2f88b908b mcabber/configure.ac
+--- a/mcabber/configure.ac Sun Apr 04 00:15:53 2010 +0200
++++ b/mcabber/configure.ac Sun Apr 04 01:22:16 2010 +0300
+@@ -272,7 +272,7 @@
AM_CONDITIONAL([INSTALL_HEADERS], [test x$enable_modules != xno])
# Prepare some config.h variables
@@ -26,15 +25,17 @@
AC_DEFINE([MCABBER_VERSION], "AC_PACKAGE_VERSION", [Mcabber version string])
# We need _GNU_SOURCE for strptime() and strcasestr()
-diff -r 2e133fc0e3d9 mcabber/mcabber/api.h
---- a/mcabber/mcabber/api.h Sun Mar 28 23:40:10 2010 +0200
-+++ b/mcabber/mcabber/api.h Thu Apr 01 23:28:43 2010 +0300
-@@ -4,7 +4,7 @@
+diff -r fdb2f88b908b mcabber/mcabber/api.h
+--- a/mcabber/mcabber/api.h Sun Apr 04 00:15:53 2010 +0200
++++ b/mcabber/mcabber/api.h Sun Apr 04 01:22:16 2010 +0300
+@@ -3,8 +3,8 @@
+
#include <mcabber/config.h> // For MCABBER_BRANCH
- #define MCABBER_API_VERSION 12
--#define MCABBER_API_MIN 11
-+#define MCABBER_API_MIN 12
+-#define MCABBER_API_VERSION 13
+-#define MCABBER_API_MIN 13
++#define MCABBER_API_VERSION 15
++#define MCABBER_API_MIN 15
extern const gchar *mcabber_branch;
extern const guint mcabber_api_version;
--- a/update-changelog-v13 Fri Apr 02 10:55:37 2010 +0300
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,12 +0,0 @@
-diff -r 422b477167b9 mcabber/ChangeLog.api
---- a/mcabber/ChangeLog.api Fri Apr 02 01:50:48 2010 +0300
-+++ b/mcabber/ChangeLog.api Fri Apr 02 01:52:13 2010 +0300
-@@ -1,3 +1,8 @@
-+
-+experimental (13)
-+
-+ * Add "timestamp" argument to hook-message-in
-+ * MQ Patch: add-hook-post-message-in-timestamp
-
- experimental (12)
-
--- a/update-changelog-v14 Fri Apr 02 10:55:37 2010 +0300
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,12 +0,0 @@
-diff -r 52ef9f713809 mcabber/ChangeLog.api
---- a/mcabber/ChangeLog.api Fri Apr 02 10:50:28 2010 +0300
-+++ b/mcabber/ChangeLog.api Fri Apr 02 10:50:52 2010 +0300
-@@ -1,3 +1,8 @@
-+
-+experimental (14)
-+
-+ * Add NS_X_CONFERENCE (direct invitation)
-+ * MQ Patch: direct-invite
-
- experimental (13)
-
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/update-changelog-v16 Sun Apr 04 01:33:42 2010 +0300
@@ -0,0 +1,15 @@
+diff -r 8ea30cd6a77d mcabber/ChangeLog.api
+--- a/mcabber/ChangeLog.api Sun Apr 04 01:23:31 2010 +0300
++++ b/mcabber/ChangeLog.api Sun Apr 04 01:25:16 2010 +0300
+@@ -1,3 +1,11 @@
++
++experimental (16)
++
++ * Add "timestamp" argument to hook-message-in
++ * MQ Patch: add-hook-post-message-in-timestamp
++
++ -- Myhailo Danylenko, 2010-04-01
++
+ experimental (15)
+
+ * Change branch to "experimental".
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/update-changelog-v17 Sun Apr 04 01:33:42 2010 +0300
@@ -0,0 +1,12 @@
+diff -r 2a017b057aaa mcabber/ChangeLog.api
+--- a/mcabber/ChangeLog.api Sun Apr 04 01:30:35 2010 +0300
++++ b/mcabber/ChangeLog.api Sun Apr 04 01:31:06 2010 +0300
+@@ -1,3 +1,8 @@
++
++experimental (17)
++
++ * Add NS_X_CONFERENCE (direct invitation)
++ * MQ Patch: direct-invite
+
+ experimental (16)
+