Rebase to new development version
* Removed add-hook-post-message-in-timestamp
(and update-changelog-v21)
* Api shift:
dev:13, 20, 21, 22, 23, 24 -> dev:14, 25, 26, 27, 28
* UNFINISHED extend-caps
--- a/add-hook-post-message-in-timestamp Wed Apr 07 17:28:19 2010 +0300
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,44 +0,0 @@
-diff -r 1dbcaf012048 mcabber/doc/HOWTO_modules.txt
---- a/mcabber/doc/HOWTO_modules.txt Wed Apr 07 11:18:17 2010 +0300
-+++ b/mcabber/doc/HOWTO_modules.txt Wed Apr 07 11:19:10 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
- attention (only implemented for MUC currently)
-+ * timestamp - real date for messages with delayed delivery, eg MUC
-+ room history.
- - hook-message-out (HOOK_MESSAGE_OUT) with parameters
- * jid - recipient of the outgoing message
- * message - message body, converted to locale charset
-diff -r 1dbcaf012048 mcabber/mcabber/api.h
---- a/mcabber/mcabber/api.h Wed Apr 07 11:18:17 2010 +0300
-+++ b/mcabber/mcabber/api.h Wed Apr 07 11:19:10 2010 +0300
-@@ -3,7 +3,7 @@
-
- #include <mcabber/config.h> // For MCABBER_BRANCH
-
--#define MCABBER_API_VERSION 20
-+#define MCABBER_API_VERSION 21
- #define MCABBER_API_MIN 20
-
- #define MCABBER_BRANCH_EXPERIMENTAL 1
-diff -r 1dbcaf012048 mcabber/mcabber/hooks.c
---- a/mcabber/mcabber/hooks.c Wed Apr 07 11:18:17 2010 +0300
-+++ b/mcabber/mcabber/hooks.c Wed Apr 07 11:19:10 2010 +0300
-@@ -369,12 +369,16 @@
-
- #ifdef MODULES_ENABLE
- {
-+ char timestamp_str[20];
-+ if (timestamp)
-+ to_iso8601(timestamp_str, timestamp);
- hk_arg_t args[] = {
- { "jid", bjid },
- { "resource", resname },
- { "message", wmsg },
- { "groupchat", is_groupchat ? "true" : "false" },
- { "attention", attention ? "true" : "false" },
-+ { "timestamp", timestamp ? timestamp_str : NULL },
- { NULL, NULL },
- };
- hk_run_handlers(HOOK_POST_MESSAGE_IN, args);
--- a/cmd-del-id Wed Apr 07 17:28:19 2010 +0300
+++ b/cmd-del-id Sun Apr 11 20:53:04 2010 +0300
@@ -1,20 +1,20 @@
-diff -r 1da6df9f3c2b mcabber/mcabber/api.h
---- a/mcabber/mcabber/api.h Wed Apr 07 17:21:17 2010 +0300
-+++ b/mcabber/mcabber/api.h Wed Apr 07 17:24:57 2010 +0300
+diff -r 5b22a5d41894 mcabber/mcabber/api.h
+--- a/mcabber/mcabber/api.h Sun Apr 11 20:46:03 2010 +0300
++++ b/mcabber/mcabber/api.h Sun Apr 11 20:48:09 2010 +0300
@@ -3,8 +3,8 @@
#include <mcabber/config.h> // For MCABBER_BRANCH
--#define MCABBER_API_VERSION 22
--#define MCABBER_API_MIN 20
-+#define MCABBER_API_VERSION 23
-+#define MCABBER_API_MIN 23
+-#define MCABBER_API_VERSION 26
+-#define MCABBER_API_MIN 25
++#define MCABBER_API_VERSION 27
++#define MCABBER_API_MIN 27
#define MCABBER_BRANCH_EXPERIMENTAL 1
-diff -r 1da6df9f3c2b mcabber/mcabber/commands.c
---- a/mcabber/mcabber/commands.c Wed Apr 07 17:21:17 2010 +0300
-+++ b/mcabber/mcabber/commands.c Wed Apr 07 17:24:57 2010 +0300
+diff -r 5b22a5d41894 mcabber/mcabber/commands.c
+--- a/mcabber/mcabber/commands.c Sun Apr 11 20:46:03 2010 +0300
++++ b/mcabber/mcabber/commands.c Sun Apr 11 20:48:09 2010 +0300
@@ -99,27 +99,26 @@
#ifdef MODULES_ENABLE
#include "modules.h"
@@ -57,9 +57,9 @@
}
// cmd_init()
-diff -r 1da6df9f3c2b mcabber/mcabber/commands.h
---- a/mcabber/mcabber/commands.h Wed Apr 07 17:21:17 2010 +0300
-+++ b/mcabber/mcabber/commands.h Wed Apr 07 17:24:57 2010 +0300
+diff -r 5b22a5d41894 mcabber/mcabber/commands.h
+--- a/mcabber/mcabber/commands.h Sun Apr 11 20:46:03 2010 +0300
++++ b/mcabber/mcabber/commands.h Sun Apr 11 20:48:09 2010 +0300
@@ -20,8 +20,9 @@
int process_command(const char *line, guint iscmd);
char *expandalias(const char *line);
@@ -72,9 +72,9 @@
#endif
void cmd_room_whois(gpointer bud, char *nick_locale, guint interactive);
-diff -r 1da6df9f3c2b mcabber/modules/beep/beep.c
---- a/mcabber/modules/beep/beep.c Wed Apr 07 17:21:17 2010 +0300
-+++ b/mcabber/modules/beep/beep.c Wed Apr 07 17:24:57 2010 +0300
+diff -r 5b22a5d41894 mcabber/modules/beep/beep.c
+--- a/mcabber/modules/beep/beep.c Sun Apr 11 20:46:03 2010 +0300
++++ b/mcabber/modules/beep/beep.c Sun Apr 11 20:48:09 2010 +0300
@@ -46,8 +46,9 @@
.next = NULL,
};
--- a/cmd-dynamic-restriction-list Wed Apr 07 17:28:19 2010 +0300
+++ b/cmd-dynamic-restriction-list Sun Apr 11 20:53:04 2010 +0300
@@ -1,18 +1,18 @@
-diff -r 9c09cf20d737 mcabber/mcabber/api.h
---- a/mcabber/mcabber/api.h Wed Apr 07 17:25:05 2010 +0300
-+++ b/mcabber/mcabber/api.h Wed Apr 07 17:26:32 2010 +0300
+diff -r e03029f93159 mcabber/mcabber/api.h
+--- a/mcabber/mcabber/api.h Sun Apr 11 20:48:26 2010 +0300
++++ b/mcabber/mcabber/api.h Sun Apr 11 20:48:54 2010 +0300
@@ -3,7 +3,7 @@
#include <mcabber/config.h> // For MCABBER_BRANCH
--#define MCABBER_API_VERSION 23
-+#define MCABBER_API_VERSION 24
- #define MCABBER_API_MIN 23
+-#define MCABBER_API_VERSION 27
++#define MCABBER_API_VERSION 28
+ #define MCABBER_API_MIN 27
#define MCABBER_BRANCH_EXPERIMENTAL 1
-diff -r 9c09cf20d737 mcabber/mcabber/commands.c
---- a/mcabber/mcabber/commands.c Wed Apr 07 17:25:05 2010 +0300
-+++ b/mcabber/mcabber/commands.c Wed Apr 07 17:26:32 2010 +0300
+diff -r e03029f93159 mcabber/mcabber/commands.c
+--- a/mcabber/mcabber/commands.c Sun Apr 11 20:48:26 2010 +0300
++++ b/mcabber/mcabber/commands.c Sun Apr 11 20:48:54 2010 +0300
@@ -95,6 +95,7 @@
// Global variable for the commands list
@@ -81,9 +81,9 @@
// Status category
compl_add_category_word(COMPL_STATUS, "online");
compl_add_category_word(COMPL_STATUS, "avail");
-diff -r 9c09cf20d737 mcabber/mcabber/commands.h
---- a/mcabber/mcabber/commands.h Wed Apr 07 17:25:05 2010 +0300
-+++ b/mcabber/mcabber/commands.h Wed Apr 07 17:26:32 2010 +0300
+diff -r e03029f93159 mcabber/mcabber/commands.h
+--- a/mcabber/mcabber/commands.h Sun Apr 11 20:48:26 2010 +0300
++++ b/mcabber/mcabber/commands.h Sun Apr 11 20:48:54 2010 +0300
@@ -23,7 +23,9 @@
gpointer cmd_del(gpointer id);
gpointer cmd_add(const char *name, const char *help, guint flags1, guint flags2,
@@ -94,9 +94,9 @@
void cmd_room_whois(gpointer bud, char *nick_locale, guint interactive);
void cmd_room_leave(gpointer bud, char *arg);
-diff -r 9c09cf20d737 mcabber/mcabber/settings.c
---- a/mcabber/mcabber/settings.c Wed Apr 07 17:25:05 2010 +0300
-+++ b/mcabber/mcabber/settings.c Wed Apr 07 17:26:32 2010 +0300
+diff -r e03029f93159 mcabber/mcabber/settings.c
+--- a/mcabber/mcabber/settings.c Sun Apr 11 20:48:26 2010 +0300
++++ b/mcabber/mcabber/settings.c Sun Apr 11 20:48:54 2010 +0300
@@ -185,44 +185,27 @@
// We only allow assignments line, except for commands "pgp", "source",
--- a/direct-invite Wed Apr 07 17:28:19 2010 +0300
+++ b/direct-invite Sun Apr 11 20:53:04 2010 +0300
@@ -1,18 +1,18 @@
-diff -r 77d5e804c383 mcabber/mcabber/api.h
---- a/mcabber/mcabber/api.h Wed Apr 07 11:20:23 2010 +0300
-+++ b/mcabber/mcabber/api.h Wed Apr 07 11:20:54 2010 +0300
+diff -r f0f61224776a mcabber/mcabber/api.h
+--- a/mcabber/mcabber/api.h Sun Apr 11 20:44:48 2010 +0300
++++ b/mcabber/mcabber/api.h Sun Apr 11 20:45:20 2010 +0300
@@ -3,7 +3,7 @@
#include <mcabber/config.h> // For MCABBER_BRANCH
--#define MCABBER_API_VERSION 21
-+#define MCABBER_API_VERSION 22
- #define MCABBER_API_MIN 20
+-#define MCABBER_API_VERSION 25
++#define MCABBER_API_VERSION 26
+ #define MCABBER_API_MIN 25
#define MCABBER_BRANCH_EXPERIMENTAL 1
-diff -r 77d5e804c383 mcabber/mcabber/xmpp.c
---- a/mcabber/mcabber/xmpp.c Wed Apr 07 11:20:23 2010 +0300
-+++ b/mcabber/mcabber/xmpp.c Wed Apr 07 11:20:54 2010 +0300
+diff -r f0f61224776a mcabber/mcabber/xmpp.c
+--- a/mcabber/mcabber/xmpp.c Sun Apr 11 20:44:48 2010 +0300
++++ b/mcabber/mcabber/xmpp.c Sun Apr 11 20:45:20 2010 +0300
@@ -1294,6 +1294,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 77d5e804c383 mcabber/mcabber/xmpp_defines.h
---- a/mcabber/mcabber/xmpp_defines.h Wed Apr 07 11:20:23 2010 +0300
-+++ b/mcabber/mcabber/xmpp_defines.h Wed Apr 07 11:20:54 2010 +0300
+diff -r f0f61224776a mcabber/mcabber/xmpp_defines.h
+--- a/mcabber/mcabber/xmpp_defines.h Sun Apr 11 20:44:48 2010 +0300
++++ b/mcabber/mcabber/xmpp_defines.h Sun Apr 11 20:45:20 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 77d5e804c383 mcabber/mcabber/xmpp_helper.c
---- a/mcabber/mcabber/xmpp_helper.c Wed Apr 07 11:20:23 2010 +0300
-+++ b/mcabber/mcabber/xmpp_helper.c Wed Apr 07 11:20:54 2010 +0300
+diff -r f0f61224776a mcabber/mcabber/xmpp_helper.c
+--- a/mcabber/mcabber/xmpp_helper.c Sun Apr 11 20:44:48 2010 +0300
++++ b/mcabber/mcabber/xmpp_helper.c Sun Apr 11 20:45:20 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 77d5e804c383 mcabber/mcabber/xmpp_muc.c
---- a/mcabber/mcabber/xmpp_muc.c Wed Apr 07 11:20:23 2010 +0300
-+++ b/mcabber/mcabber/xmpp_muc.c Wed Apr 07 11:20:54 2010 +0300
+diff -r f0f61224776a mcabber/mcabber/xmpp_muc.c
+--- a/mcabber/mcabber/xmpp_muc.c Sun Apr 11 20:44:48 2010 +0300
++++ b/mcabber/mcabber/xmpp_muc.c Sun Apr 11 20:45:20 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 77d5e804c383 mcabber/mcabber/xmpp_muc.h
---- a/mcabber/mcabber/xmpp_muc.h Wed Apr 07 11:20:23 2010 +0300
-+++ b/mcabber/mcabber/xmpp_muc.h Wed Apr 07 11:20:54 2010 +0300
+diff -r f0f61224776a mcabber/mcabber/xmpp_muc.h
+--- a/mcabber/mcabber/xmpp_muc.h Sun Apr 11 20:44:48 2010 +0300
++++ b/mcabber/mcabber/xmpp_muc.h Sun Apr 11 20:45:20 2010 +0300
@@ -6,10 +6,14 @@
char *from;
char *passwd;
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/extend-caps Sun Apr 11 20:53:04 2010 +0300
@@ -0,0 +1,89 @@
+diff -r 285fafde95ea mcabber/mcabber/caps.c
+--- a/mcabber/mcabber/caps.c Wed Apr 07 17:27:11 2010 +0300
++++ b/mcabber/mcabber/caps.c Thu Apr 08 00:07:15 2010 +0300
+@@ -22,9 +22,14 @@
+ #include <glib.h>
+
+ typedef struct {
+- char *category;
+- char *name;
+- char *type;
++ gchar *name;
++ gchar *type;
++ gchar *category;
++ gchar *lang;
++} identity;
++
++typedef struct {
++ GSList *identities;
+ GHashTable *features;
+ } caps;
+
+@@ -33,9 +38,15 @@
+ void caps_destroy(gpointer data)
+ {
+ caps *c = data;
+- g_free(c->category);
+- g_free(c->name);
+- g_free(c->type);
++ GSList *iel;
++ for (iel = c -> identities; iel; iel = iel -> next) {
++ identity *i = iel -> data;
++ g_free (i -> name);
++ g_free (i -> type);
++ g_free (i -> category);
++ g_free (i -> lang);
++ g_free (i);
++ }
+ g_hash_table_destroy(c->features);
+ g_free(c);
+ }
+@@ -72,7 +83,8 @@
+ void caps_set_identity(char *hash,
+ const char *category,
+ const char *name,
+- const char *type)
++ const char *type,
++ const char *lang)
+ {
+ caps *c;
+ if (!hash || !category || !type)
+@@ -80,9 +92,12 @@
+
+ c = g_hash_table_lookup(caps_cache, hash);
+ if (c) {
+- c->category = g_strdup(category);
+- c->name = g_strdup(name);
+- c->type = g_strdup(type);
++ i = g_new(identity);
++ i->category = g_strdup(category);
++ i->name = g_strdup(name);
++ i->type = g_strdup(type);
++ i -> lang = g_strdup (lang);
++ c -> identities = g_slist_append (c -> identities, i); // XXX sorted
+ }
+ }
+
+diff -r 285fafde95ea mcabber/mcabber/caps.h
+--- a/mcabber/mcabber/caps.h Wed Apr 07 17:27:11 2010 +0300
++++ b/mcabber/mcabber/caps.h Thu Apr 08 00:07:15 2010 +0300
+@@ -3,6 +3,19 @@
+
+ #include <glib.h>
+
++typedef struct {
++ gchar *name;
++ gchar *type;
++ gchar *category;
++ gchar *language;
++} caps_identity_t;
++
++typedef struct {
++ gchar *jid;
++ gchar *name;
++ gchar *node;
++} caps_item_t;
++
+ void caps_init(void);
+ void caps_free(void);
+ void caps_add(char *hash);
--- a/modularize-extcmd Wed Apr 07 17:28:19 2010 +0300
+++ b/modularize-extcmd Sun Apr 11 20:53:04 2010 +0300
@@ -1,6 +1,6 @@
-diff -r dd931e80115e mcabber/configure.ac
---- a/mcabber/configure.ac Fri Apr 02 10:47:27 2010 +0300
-+++ b/mcabber/configure.ac Fri Apr 02 10:49:28 2010 +0300
+diff -r 76a0b8b7f1e6 mcabber/configure.ac
+--- a/mcabber/configure.ac Sun Apr 11 20:32:20 2010 +0300
++++ b/mcabber/configure.ac Sun Apr 11 20:44:40 2010 +0300
@@ -283,6 +283,7 @@
modules/beep/Makefile
modules/xttitle/Makefile
@@ -9,9 +9,9 @@
doc/Makefile
doc/guide/Makefile
doc/help/Makefile
-diff -r dd931e80115e mcabber/mcabber/Makefile.am
---- a/mcabber/mcabber/Makefile.am Fri Apr 02 10:47:27 2010 +0300
-+++ b/mcabber/mcabber/Makefile.am Fri Apr 02 10:49:28 2010 +0300
+diff -r 76a0b8b7f1e6 mcabber/mcabber/Makefile.am
+--- a/mcabber/mcabber/Makefile.am Sun Apr 11 20:32:20 2010 +0300
++++ b/mcabber/mcabber/Makefile.am Sun Apr 11 20:44:40 2010 +0300
@@ -7,7 +7,7 @@
xmpp.c xmpp.h xmpp_helper.c xmpp_helper.h xmpp_defines.h \
xmpp_iq.c xmpp_iq.h xmpp_iqrequest.c xmpp_iqrequest.h \
@@ -30,9 +30,9 @@
endif
#SUBDIRS =
-diff -r dd931e80115e mcabber/mcabber/hooks.c
---- a/mcabber/mcabber/hooks.c Fri Apr 02 10:47:27 2010 +0300
-+++ b/mcabber/mcabber/hooks.c Fri Apr 02 10:49:28 2010 +0300
+diff -r 76a0b8b7f1e6 mcabber/mcabber/hooks.c
+--- a/mcabber/mcabber/hooks.c Sun Apr 11 20:32:20 2010 +0300
++++ b/mcabber/mcabber/hooks.c Sun Apr 11 20:44:40 2010 +0300
@@ -36,7 +36,10 @@
#include "utf8.h"
#include "commands.h"
@@ -55,7 +55,7 @@
int message_flags = 0;
guint rtype = ROSTER_TYPE_USER;
char *wmsg = NULL, *bmsg = NULL, *mmsg = NULL;
-@@ -385,6 +390,7 @@
+@@ -391,6 +396,7 @@
}
#endif
@@ -63,7 +63,7 @@
if (settings_opt_get_int("events_ignore_active_window") &&
current_buddy && scr_get_chatmode()) {
gpointer bud = BUDDATA(current_buddy);
-@@ -403,6 +409,7 @@
+@@ -409,6 +415,7 @@
hk_ext_cmd(bjid, EXT_CMD_TYPE_MESSAGE,
is_groupchat ? EXT_CMD_INFO_GROUPCHAT : EXT_CMD_INFO_RECEIVED,
wmsg);
@@ -71,7 +71,7 @@
// Beep, if enabled:
// - if it's a private message
-@@ -479,8 +486,10 @@
+@@ -485,8 +492,10 @@
}
#endif
@@ -82,7 +82,7 @@
g_free(bmsg);
g_free(mmsg);
-@@ -566,9 +575,11 @@
+@@ -572,9 +581,11 @@
}
#endif
@@ -94,7 +94,7 @@
}
void hk_mystatuschange(time_t timestamp, enum imstatus old_status,
-@@ -692,11 +703,13 @@
+@@ -698,11 +709,13 @@
prev_muc_unread = muc_unread;
prev_muc_attention = muc_attention;
@@ -108,9 +108,9 @@
}
/* vim: set expandtab cindent cinoptions=>2\:2(0 sw=2 ts=2: For Vim users... */
-diff -r dd931e80115e mcabber/mcabber/main.c
---- a/mcabber/mcabber/main.c Fri Apr 02 10:47:27 2010 +0300
-+++ b/mcabber/mcabber/main.c Fri Apr 02 10:49:28 2010 +0300
+diff -r 76a0b8b7f1e6 mcabber/mcabber/main.c
+--- a/mcabber/mcabber/main.c Sun Apr 11 20:32:20 2010 +0300
++++ b/mcabber/mcabber/main.c Sun Apr 11 20:44:40 2010 +0300
@@ -45,7 +45,10 @@
#include "xmpp.h"
#include "help.h"
@@ -135,15 +135,15 @@
optstring = settings_opt_get("roster_display_filter");
if (optstring)
-diff -r dd931e80115e mcabber/modules/Makefile.am
---- a/mcabber/modules/Makefile.am Fri Apr 02 10:47:27 2010 +0300
-+++ b/mcabber/modules/Makefile.am Fri Apr 02 10:49:28 2010 +0300
+diff -r 76a0b8b7f1e6 mcabber/modules/Makefile.am
+--- a/mcabber/modules/Makefile.am Sun Apr 11 20:32:20 2010 +0300
++++ b/mcabber/modules/Makefile.am Sun Apr 11 20:44:40 2010 +0300
@@ -1,1 +1,1 @@
-SUBDIRS = beep xttitle fifo
+SUBDIRS = beep xttitle fifo eventcmd
-diff -r dd931e80115e mcabber/modules/eventcmd/Makefile.am
+diff -r 76a0b8b7f1e6 mcabber/modules/eventcmd/Makefile.am
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
-+++ b/mcabber/modules/eventcmd/Makefile.am Fri Apr 02 10:49:28 2010 +0300
++++ b/mcabber/modules/eventcmd/Makefile.am Sun Apr 11 20:44:40 2010 +0300
@@ -0,0 +1,12 @@
+
+if INSTALL_HEADERS
@@ -157,9 +157,9 @@
+ $(ENCHANT_CFLAGS)
+endif
+
-diff -r dd931e80115e mcabber/modules/eventcmd/eventcmd.c
+diff -r 76a0b8b7f1e6 mcabber/modules/eventcmd/eventcmd.c
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
-+++ b/mcabber/modules/eventcmd/eventcmd.c Fri Apr 02 10:49:28 2010 +0300
++++ b/mcabber/modules/eventcmd/eventcmd.c Sun Apr 11 20:44:40 2010 +0300
@@ -0,0 +1,221 @@
+
+/* Copyright 2009 Myhailo Danylenko
@@ -232,7 +232,7 @@
+ bjid = arg->value;
+ else if (!strcmp(arg->name, "groupchat"))
+ is_groupchat = strcmp(arg->value, "true") ? FALSE : TRUE;
-+ else if (!strcmp(arg->name, "timestamp") && arg->value)
++ else if (!strcmp(arg->name, "delayed") && *(arg->value))
+ timestamp = TRUE;
+ else if (!strcmp(arg->name, "message"))
+ wmsg = arg->value;
--- a/series Wed Apr 07 17:28:19 2010 +0300
+++ b/series Sun Apr 11 20:53:04 2010 +0300
@@ -3,16 +3,15 @@
fifo-use-guard
modularize-fifo
separate-extcmd
-add-hook-post-message-in-timestamp
-update-changelog-v21
modularize-extcmd
guard-xmpp-password
guardize-colors
roster-state-colors
direct-invite
-update-changelog-v22
+update-changelog-v26
muc-multiple-statuses
cmd-del-id
-update-changelog-v23
+update-changelog-v27
cmd-dynamic-restriction-list
-update-changelog-v24
+update-changelog-v28
+extend-caps
--- a/switch-to-experimental Wed Apr 07 17:28:19 2010 +0300
+++ b/switch-to-experimental Sun Apr 11 20:53:04 2010 +0300
@@ -1,11 +1,12 @@
-diff -r b85585d02cd9 mcabber/ChangeLog.api
---- a/mcabber/ChangeLog.api Mon Apr 05 23:25:45 2010 +0200
-+++ b/mcabber/ChangeLog.api Wed Apr 07 11:17:54 2010 +0300
-@@ -1,3 +1,12 @@
-+experimental (20)
+diff -r a416dfca67d7 mcabber/ChangeLog.api
+--- a/mcabber/ChangeLog.api Sun Apr 11 20:15:54 2010 +0300
++++ b/mcabber/ChangeLog.api Sun Apr 11 20:32:15 2010 +0300
+@@ -1,3 +1,13 @@
++
++experimental (25)
+
+ * Change branch to "experimental".
-+ * Api as defined by dev:13
++ * Api as defined by dev:14
+ * Add MCABBER_BRANCH_EXPERIMENTAL define to api.h
+ * MQ Patch: switch-to-experimental
+
@@ -13,10 +14,10 @@
+
dev (13)
- * Rename jep00{22,85} to xep00{22,85}
-diff -r b85585d02cd9 mcabber/configure.ac
---- a/mcabber/configure.ac Mon Apr 05 23:25:45 2010 +0200
-+++ b/mcabber/configure.ac Wed Apr 07 11:17:54 2010 +0300
+ * Stable api 0.10.0:1
+diff -r a416dfca67d7 mcabber/configure.ac
+--- a/mcabber/configure.ac Sun Apr 11 20:15:54 2010 +0300
++++ b/mcabber/configure.ac Sun Apr 11 20:32:15 2010 +0300
@@ -272,7 +272,7 @@
AM_CONDITIONAL([INSTALL_HEADERS], [test x$enable_modules != xno])
@@ -26,17 +27,17 @@
AC_DEFINE([MCABBER_VERSION], "AC_PACKAGE_VERSION", [Mcabber version string])
# We need _GNU_SOURCE for strptime() and strcasestr()
-diff -r b85585d02cd9 mcabber/mcabber/api.h
---- a/mcabber/mcabber/api.h Mon Apr 05 23:25:45 2010 +0200
-+++ b/mcabber/mcabber/api.h Wed Apr 07 11:17:54 2010 +0300
+diff -r a416dfca67d7 mcabber/mcabber/api.h
+--- a/mcabber/mcabber/api.h Sun Apr 11 20:15:54 2010 +0300
++++ b/mcabber/mcabber/api.h Sun Apr 11 20:32:15 2010 +0300
@@ -3,8 +3,10 @@
#include <mcabber/config.h> // For MCABBER_BRANCH
--#define MCABBER_API_VERSION 13
+-#define MCABBER_API_VERSION 14
-#define MCABBER_API_MIN 13
-+#define MCABBER_API_VERSION 20
-+#define MCABBER_API_MIN 20
++#define MCABBER_API_VERSION 25
++#define MCABBER_API_MIN 25
+
+#define MCABBER_BRANCH_EXPERIMENTAL 1
--- a/update-changelog-v21 Wed Apr 07 17:28:19 2010 +0300
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,15 +0,0 @@
-diff -r 92ea8e70b291 mcabber/ChangeLog.api
---- a/mcabber/ChangeLog.api Wed Apr 07 11:19:11 2010 +0300
-+++ b/mcabber/ChangeLog.api Wed Apr 07 11:20:11 2010 +0300
-@@ -1,3 +1,11 @@
-+
-+experimental (21)
-+
-+ * Add "timestamp" argument to hook-message-in
-+ * MQ Patch: add-hook-post-message-in-timestamp
-+
-+ -- Myhailo Danylenko, 2010-04-01
-+
- experimental (20)
-
- * Change branch to "experimental".
--- a/update-changelog-v22 Wed Apr 07 17:28:19 2010 +0300
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,14 +0,0 @@
-diff -r 2cbfa9906636 mcabber/ChangeLog.api
---- a/mcabber/ChangeLog.api Wed Apr 07 11:20:54 2010 +0300
-+++ b/mcabber/ChangeLog.api Wed Apr 07 11:22:00 2010 +0300
-@@ -1,3 +1,10 @@
-+
-+experimental (22)
-+
-+ * Add NS_X_CONFERENCE (direct invitation)
-+ * MQ Patch: direct-invite
-+
-+ -- Myhailo Danylenko, 2010-04-04
-
- experimental (21)
-
--- a/update-changelog-v23 Wed Apr 07 17:28:19 2010 +0300
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,16 +0,0 @@
-diff -r a97050e73e58 mcabber/ChangeLog.api
---- a/mcabber/ChangeLog.api Wed Apr 07 11:22:53 2010 +0300
-+++ b/mcabber/ChangeLog.api Wed Apr 07 11:23:24 2010 +0300
-@@ -1,3 +1,12 @@
-+
-+experimental (23)
-+
-+ * cmd_add now returns gpointer id
-+ * cmd_del accepts gpointer id instead of command name
-+ * Min API version 23
-+ * MQ Patch: cmd-del-id
-+
-+ -- Myhailo Danylenko, 2010-04-05
-
- experimental (22)
-
--- a/update-changelog-v24 Wed Apr 07 17:28:19 2010 +0300
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,14 +0,0 @@
-diff -r e0e63ade0eb5 mcabber/ChangeLog.api
---- a/mcabber/ChangeLog.api Wed Apr 07 11:23:46 2010 +0300
-+++ b/mcabber/ChangeLog.api Wed Apr 07 11:24:28 2010 +0300
-@@ -1,3 +1,10 @@
-+
-+experimental (24)
-+
-+ * Add cmd_set_safe() and cmd_is_safe()
-+ * MQ Patch: cmd-dynamic-restriction-list
-+
-+ -- Myhailo Danylenko, 2010-04-06
-
- experimental (23)
-
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/update-changelog-v26 Sun Apr 11 20:53:04 2010 +0300
@@ -0,0 +1,14 @@
+diff -r 865b5409cad3 mcabber/ChangeLog.api
+--- a/mcabber/ChangeLog.api Sun Apr 11 20:45:20 2010 +0300
++++ b/mcabber/ChangeLog.api Sun Apr 11 20:46:01 2010 +0300
+@@ -1,3 +1,10 @@
++
++experimental (26)
++
++ * Add NS_X_CONFERENCE (direct invitation)
++ * MQ Patch: direct-invite
++
++ -- Myhailo Danylenko, 2010-04-04
+
+ experimental (25)
+
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/update-changelog-v27 Sun Apr 11 20:53:04 2010 +0300
@@ -0,0 +1,16 @@
+diff -r 02e84352285c mcabber/ChangeLog.api
+--- a/mcabber/ChangeLog.api Sun Apr 11 20:48:09 2010 +0300
++++ b/mcabber/ChangeLog.api Sun Apr 11 20:48:26 2010 +0300
+@@ -1,3 +1,12 @@
++
++experimental (27)
++
++ * cmd_add now returns gpointer id
++ * cmd_del accepts gpointer id instead of command name
++ * Min API version 27
++ * MQ Patch: cmd-del-id
++
++ -- Myhailo Danylenko, 2010-04-05
+
+ experimental (26)
+
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/update-changelog-v28 Sun Apr 11 20:53:04 2010 +0300
@@ -0,0 +1,14 @@
+diff -r 3b724a5d07c5 mcabber/ChangeLog.api
+--- a/mcabber/ChangeLog.api Sun Apr 11 20:48:54 2010 +0300
++++ b/mcabber/ChangeLog.api Sun Apr 11 20:49:36 2010 +0300
+@@ -1,3 +1,10 @@
++
++experimental (28)
++
++ * Add cmd_set_safe() and cmd_is_safe()
++ * MQ Patch: cmd-dynamic-restriction-list
++
++ -- Myhailo Danylenko, 2010-04-06
+
+ experimental (27)
+