--- a/add-cmake Sun Jul 17 23:05:54 2011 +0300
+++ b/add-cmake Sun Jul 17 23:27:33 2011 +0300
@@ -1,9 +1,9 @@
# HG changeset patch
-# Parent 94a0c8396f959cdf99264b4c4d4007150e872b9f
+# Parent c5a9cf6a95df7f8d38fb06c6af53cd383490ff71
-diff -r 94a0c8396f95 mcabber/CMakeLists.txt
+diff -r c5a9cf6a95df mcabber/CMakeLists.txt
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
-+++ b/mcabber/CMakeLists.txt Thu Jun 23 23:45:20 2011 +0300
++++ b/mcabber/CMakeLists.txt Sun Jul 17 23:26:36 2011 +0300
@@ -0,0 +1,196 @@
+## Copyright 2010 Myhailo Danylenko
+# This file is part of mcabber.
@@ -201,9 +201,9 @@
+
+## The End ## vim: se ts=4 sw=4: ##
+
-diff -r 94a0c8396f95 mcabber/configure.ac
---- a/mcabber/configure.ac Wed Jun 08 02:47:31 2011 +0000
-+++ b/mcabber/configure.ac Thu Jun 23 23:45:20 2011 +0300
+diff -r c5a9cf6a95df mcabber/configure.ac
+--- a/mcabber/configure.ac Sun Jul 17 23:26:34 2011 +0300
++++ b/mcabber/configure.ac Sun Jul 17 23:26:36 2011 +0300
@@ -36,9 +36,8 @@
# Checks for header files.
--- a/extend-caps Sun Jul 17 23:05:54 2011 +0300
+++ b/extend-caps Sun Jul 17 23:27:33 2011 +0300
@@ -1,6 +1,6 @@
-diff -r 47cb061121c5 mcabber/mcabber/caps.c
---- a/mcabber/mcabber/caps.c Wed Apr 27 02:20:40 2011 +0300
-+++ b/mcabber/mcabber/caps.c Wed Apr 27 12:40:36 2011 +0300
+diff -r 081e82d851cd mcabber/mcabber/caps.c
+--- a/mcabber/mcabber/caps.c Sun Jul 17 23:26:33 2011 +0300
++++ b/mcabber/mcabber/caps.c Sun Jul 17 23:26:34 2011 +0300
@@ -22,9 +22,14 @@
#include <glib.h>
@@ -94,9 +94,9 @@
features = g_hash_table_get_values(c->features);
features = g_list_sort(features, _strcmp_sort);
-diff -r 47cb061121c5 mcabber/mcabber/caps.h
---- a/mcabber/mcabber/caps.h Wed Apr 27 02:20:40 2011 +0300
-+++ b/mcabber/mcabber/caps.h Wed Apr 27 12:40:36 2011 +0300
+diff -r 081e82d851cd mcabber/mcabber/caps.h
+--- a/mcabber/mcabber/caps.h Sun Jul 17 23:26:33 2011 +0300
++++ b/mcabber/mcabber/caps.h Sun Jul 17 23:26:34 2011 +0300
@@ -3,6 +3,19 @@
#include <glib.h>
@@ -127,9 +127,9 @@
void caps_add_feature(char *hash, const char *feature);
int caps_has_feature(char *hash, char *feature);
void caps_foreach_feature(const char *hash, GFunc func, gpointer user_data);
-diff -r 47cb061121c5 mcabber/mcabber/xmpp.c
---- a/mcabber/mcabber/xmpp.c Wed Apr 27 02:20:40 2011 +0300
-+++ b/mcabber/mcabber/xmpp.c Wed Apr 27 12:40:36 2011 +0300
+diff -r 081e82d851cd mcabber/mcabber/xmpp.c
+--- a/mcabber/mcabber/xmpp.c Sun Jul 17 23:26:33 2011 +0300
++++ b/mcabber/mcabber/xmpp.c Sun Jul 17 23:26:34 2011 +0300
@@ -1342,7 +1342,8 @@
if (info)
caps_set_identity(ver, lm_message_node_get_attribute(info, "category"),
@@ -140,10 +140,10 @@
info = lm_message_node_get_child(query, "feature");
while (info) {
if (!g_strcmp0(info->name, "feature"))
-diff -r 47cb061121c5 mcabber/mcabber/xmpp_helper.c
---- a/mcabber/mcabber/xmpp_helper.c Wed Apr 27 02:20:40 2011 +0300
-+++ b/mcabber/mcabber/xmpp_helper.c Wed Apr 27 12:40:36 2011 +0300
-@@ -222,7 +222,7 @@
+diff -r 081e82d851cd mcabber/mcabber/xmpp_helper.c
+--- a/mcabber/mcabber/xmpp_helper.c Sun Jul 17 23:26:33 2011 +0300
++++ b/mcabber/mcabber/xmpp_helper.c Sun Jul 17 23:26:34 2011 +0300
+@@ -228,7 +228,7 @@
return ver_notavail;
caps_add("");
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/fix-gcc-warnings Sun Jul 17 23:27:33 2011 +0300
@@ -0,0 +1,54 @@
+# HG changeset patch
+# Parent 3be9c130c27b80f1f6a71535f52e2035b4d606c0
+
+diff -r 3be9c130c27b mcabber/mcabber/xmpp.c
+--- a/mcabber/mcabber/xmpp.c Sun Jul 17 23:26:26 2011 +0300
++++ b/mcabber/mcabber/xmpp.c Sun Jul 17 23:26:28 2011 +0300
+@@ -315,8 +315,10 @@
+ #endif
+ #if defined XEP0022 || defined XEP0085
+ LmMessageNode *event;
++ struct xep0085 *xep85 = NULL;
++#if defined XEP0022
+ guint use_xep85 = 0;
+- struct xep0085 *xep85 = NULL;
++#endif
+ #endif
+ gchar *enc = NULL;
+
+@@ -448,8 +450,10 @@
+ lm_message_node_set_attribute(event, "xmlns", NS_CHATSTATES);
+ if (xep85->support == CHATSTATES_SUPPORT_UNKNOWN)
+ xep85->support = CHATSTATES_SUPPORT_PROBED;
++#ifdef XEP0022
+ else
+ use_xep85 = 1;
++#endif
+ xep85->last_state_sent = ROSTER_EVENT_ACTIVE;
+ }
+ #endif
+@@ -959,7 +963,6 @@
+ {
+ #if defined XEP0022 || defined XEP0085
+ LmMessageNode *state_ns = NULL;
+- const char *body;
+ char *rname, *bjid;
+ GSList *sl_buddy;
+ guint events;
+@@ -1011,8 +1014,6 @@
+ return;
+ }
+
+- body = lm_message_node_get_child_value(node, "body");
+-
+ if (which_xep == XEP_85) { /* XEP-0085 */
+ xep85->support = CHATSTATES_SUPPORT_OK;
+
+@@ -1030,6 +1031,7 @@
+ events = xep85->last_state_rcvd;
+ } else { /* XEP-0022 */
+ #ifdef XEP0022
++ const char *body = lm_message_node_get_child_value(node, "body");
+ const char *msgid;
+ xep22->support = CHATSTATES_SUPPORT_OK;
+ xep22->last_state_rcvd = ROSTER_EVENT_NONE;
--- a/fix-receipts Sun Jul 17 23:05:54 2011 +0300
+++ b/fix-receipts Sun Jul 17 23:27:33 2011 +0300
@@ -1,9 +1,9 @@
# HG changeset patch
-# Parent 18f757abb3ead106adc6d4ccaa16cdf9b6faf86a
+# Parent 7f7c6b87f1b1f4e63bb4083f3c5feb3ec0d740f0
-diff -r 18f757abb3ea mcabber/mcabber/hbuf.c
---- a/mcabber/mcabber/hbuf.c Wed Jun 08 02:47:30 2011 +0000
-+++ b/mcabber/mcabber/hbuf.c Sun Jul 17 23:05:20 2011 +0300
+diff -r 7f7c6b87f1b1 mcabber/mcabber/hbuf.c
+--- a/mcabber/mcabber/hbuf.c Sat Apr 16 09:25:21 2011 +0200
++++ b/mcabber/mcabber/hbuf.c Sun Jul 17 23:26:26 2011 +0300
@@ -525,7 +525,7 @@
// hbuf_remove_receipt(hbuf, xep184)
// Remove the Receipt Flag for the message with the given xep184 id
@@ -23,9 +23,9 @@
blk->prefix.xep184 = NULL;
blk->prefix.flags ^= HBB_PREFIX_RECEIPT;
return TRUE;
-diff -r 18f757abb3ea mcabber/mcabber/hbuf.h
---- a/mcabber/mcabber/hbuf.h Wed Jun 08 02:47:30 2011 +0000
-+++ b/mcabber/mcabber/hbuf.h Sun Jul 17 23:05:20 2011 +0300
+diff -r 7f7c6b87f1b1 mcabber/mcabber/hbuf.h
+--- a/mcabber/mcabber/hbuf.h Sat Apr 16 09:25:21 2011 +0200
++++ b/mcabber/mcabber/hbuf.h Sun Jul 17 23:26:26 2011 +0300
@@ -50,7 +50,7 @@
GList *hbuf_jump_date(GList *hbuf, time_t t);
GList *hbuf_jump_percent(GList *hbuf, int pc);
@@ -35,10 +35,10 @@
void hbuf_set_readmark(GList *hbuf, gboolean action);
void hbuf_remove_trailing_readmark(GList *hbuf);
-diff -r 18f757abb3ea mcabber/mcabber/screen.c
---- a/mcabber/mcabber/screen.c Wed Jun 08 02:47:30 2011 +0000
-+++ b/mcabber/mcabber/screen.c Sun Jul 17 23:05:20 2011 +0300
-@@ -2220,7 +2220,7 @@
+diff -r 7f7c6b87f1b1 mcabber/mcabber/screen.c
+--- a/mcabber/mcabber/screen.c Sat Apr 16 09:25:21 2011 +0200
++++ b/mcabber/mcabber/screen.c Sun Jul 17 23:26:26 2011 +0300
+@@ -2214,7 +2214,7 @@
scr_show_window(jidto, FALSE);
}
@@ -47,9 +47,9 @@
{
winbuf *win_entry = scr_search_window(bjid, FALSE);
if (win_entry) {
-diff -r 18f757abb3ea mcabber/mcabber/screen.h
---- a/mcabber/mcabber/screen.h Wed Jun 08 02:47:30 2011 +0000
-+++ b/mcabber/mcabber/screen.h Sun Jul 17 23:05:20 2011 +0300
+diff -r 7f7c6b87f1b1 mcabber/mcabber/screen.h
+--- a/mcabber/mcabber/screen.h Sat Apr 16 09:25:21 2011 +0200
++++ b/mcabber/mcabber/screen.h Sun Jul 17 23:26:26 2011 +0300
@@ -108,7 +108,7 @@
void scr_update_main_status(int forceupdate);
void scr_update_chat_status(int forceupdate);
@@ -59,10 +59,10 @@
void scr_show_buddy_window(void);
int scr_buddy_buffer_exists(const char *jid);
void scr_update_buddy_window(void);
-diff -r 18f757abb3ea mcabber/mcabber/xmpp.c
---- a/mcabber/mcabber/xmpp.c Wed Jun 08 02:47:30 2011 +0000
-+++ b/mcabber/mcabber/xmpp.c Sun Jul 17 23:05:20 2011 +0300
-@@ -300,15 +300,6 @@
+diff -r 7f7c6b87f1b1 mcabber/mcabber/xmpp.c
+--- a/mcabber/mcabber/xmpp.c Sat Apr 16 09:25:21 2011 +0200
++++ b/mcabber/mcabber/xmpp.c Sun Jul 17 23:26:26 2011 +0300
+@@ -295,15 +295,6 @@
g_slist_free(resources);
}
@@ -78,7 +78,7 @@
// xmpp_send_msg(jid, text, type, subject,
// otrinject, *encrypted, type_overwrite)
// When encrypted is not NULL, the function set *encrypted to 1 if the
-@@ -435,7 +426,8 @@
+@@ -430,7 +421,8 @@
lm_message_node_set_attribute
(lm_message_node_add_child(x->node, "request", NULL),
"xmlns", NS_RECEIPTS);
@@ -88,7 +88,7 @@
}
#if defined XEP0022 || defined XEP0085
-@@ -499,11 +491,7 @@
+@@ -494,11 +486,7 @@
if (mystatus != invisible)
#endif
update_last_use();
@@ -101,7 +101,7 @@
lm_message_unref(x);
}
-@@ -1302,6 +1290,16 @@
+@@ -1298,6 +1286,16 @@
lm_message_unref(rcvd);
}
@@ -118,9 +118,9 @@
if (from) {
x = lm_message_node_find_xmlns(m->node, NS_MUC_USER);
if (x && !strcmp(x->name, "x"))
-diff -r 18f757abb3ea mcabber/mcabber/xmpp_helper.c
---- a/mcabber/mcabber/xmpp_helper.c Wed Jun 08 02:47:30 2011 +0000
-+++ b/mcabber/mcabber/xmpp_helper.c Sun Jul 17 23:05:20 2011 +0300
+diff -r 7f7c6b87f1b1 mcabber/mcabber/xmpp_helper.c
+--- a/mcabber/mcabber/xmpp_helper.c Sat Apr 16 09:25:21 2011 +0200
++++ b/mcabber/mcabber/xmpp_helper.c Sun Jul 17 23:26:26 2011 +0300
@@ -72,7 +72,6 @@
{0, NULL, NULL, NULL, NULL}
};
@@ -143,9 +143,9 @@
const gchar* lm_message_node_get_child_value(LmMessageNode *node,
const gchar *child)
{
-diff -r 18f757abb3ea mcabber/mcabber/xmpp_helper.h
---- a/mcabber/mcabber/xmpp_helper.h Wed Jun 08 02:47:30 2011 +0000
-+++ b/mcabber/mcabber/xmpp_helper.h Sun Jul 17 23:05:20 2011 +0300
+diff -r 7f7c6b87f1b1 mcabber/mcabber/xmpp_helper.h
+--- a/mcabber/mcabber/xmpp_helper.h Sat Apr 16 09:25:21 2011 +0200
++++ b/mcabber/mcabber/xmpp_helper.h Sun Jul 17 23:26:26 2011 +0300
@@ -29,6 +29,8 @@
void xmpp_del_feature (const char *xmlns);
#endif
--- a/guard-xmpp-password Sun Jul 17 23:05:54 2011 +0300
+++ b/guard-xmpp-password Sun Jul 17 23:27:33 2011 +0300
@@ -1,7 +1,7 @@
-diff -r 0142406a60e3 mcabber/mcabber/commands.c
---- a/mcabber/mcabber/commands.c Sun Mar 27 19:13:23 2011 +0200
-+++ b/mcabber/mcabber/commands.c Sun Mar 27 19:13:27 2011 +0200
-@@ -2193,10 +2193,8 @@
+diff -r 430cdecabdf2 mcabber/mcabber/commands.c
+--- a/mcabber/mcabber/commands.c Sun Jul 17 23:26:31 2011 +0300
++++ b/mcabber/mcabber/commands.c Sun Jul 17 23:26:32 2011 +0300
+@@ -2194,10 +2194,8 @@
static void list_option_cb(char *k, char *v, void *f)
{
@@ -14,10 +14,10 @@
}
static void do_set(char *arg)
-diff -r 0142406a60e3 mcabber/mcabber/main.c
---- a/mcabber/mcabber/main.c Sun Mar 27 19:13:23 2011 +0200
-+++ b/mcabber/mcabber/main.c Sun Mar 27 19:13:27 2011 +0200
-@@ -380,6 +380,7 @@
+diff -r 430cdecabdf2 mcabber/mcabber/main.c
+--- a/mcabber/mcabber/main.c Sun Jul 17 23:26:31 2011 +0300
++++ b/mcabber/mcabber/main.c Sun Jul 17 23:26:32 2011 +0300
+@@ -381,6 +381,7 @@
scr_init_locale_charset();
ut_init_debug();
help_init();
@@ -25,7 +25,7 @@
/* Parsing config file... */
ret = cfg_read_file(configFile, TRUE);
-@@ -416,8 +417,9 @@
+@@ -417,8 +418,9 @@
/* If no password is stored, we ask for it before entering
ncurses mode -- unless the username is unknown. */
@@ -36,9 +36,9 @@
settings_set(SETTINGS_TYPE_OPTION, "password", pwd);
g_free(pwd);
}
-diff -r 0142406a60e3 mcabber/mcabber/xmpp.c
---- a/mcabber/mcabber/xmpp.c Sun Mar 27 19:13:23 2011 +0200
-+++ b/mcabber/mcabber/xmpp.c Sun Mar 27 19:13:27 2011 +0200
+diff -r 430cdecabdf2 mcabber/mcabber/xmpp.c
+--- a/mcabber/mcabber/xmpp.c Sun Jul 17 23:26:31 2011 +0300
++++ b/mcabber/mcabber/xmpp.c Sun Jul 17 23:26:32 2011 +0300
@@ -23,6 +23,8 @@
*/
#include <stdlib.h>
@@ -58,7 +58,7 @@
char imstatus2char[imstatus_size+1] = {
'_', 'o', 'f', 'd', 'n', 'a', 'i', '\0'
};
-@@ -893,16 +898,15 @@
+@@ -887,16 +892,15 @@
GError *error = NULL;
if (success) {
@@ -77,7 +77,7 @@
connection_auth_cb, NULL, FALSE, &error)) {
scr_LogPrint(LPRINT_LOGNORM, "Failed to authenticate: %s",
error->message);
-@@ -1697,13 +1701,37 @@
+@@ -1699,13 +1703,37 @@
}
}
@@ -116,7 +116,7 @@
char *dynresource = NULL;
char fpr[16];
const char *proxy_host;
-@@ -1720,7 +1748,6 @@
+@@ -1722,7 +1750,6 @@
servername = settings_opt_get("server");
userjid = settings_opt_get("jid");
@@ -124,7 +124,7 @@
resource = settings_opt_get("resource");
proxy_host = settings_opt_get("proxy_host");
ssl_fpr = settings_opt_get("ssl_fingerprint");
-@@ -1729,7 +1756,7 @@
+@@ -1731,7 +1758,7 @@
scr_LogPrint(LPRINT_LOGNORM, "Your JID has not been specified!");
return -1;
}
@@ -133,9 +133,9 @@
scr_LogPrint(LPRINT_LOGNORM, "Your password has not been specified!");
return -1;
}
-diff -r 0142406a60e3 mcabber/mcabber/xmpp.h
---- a/mcabber/mcabber/xmpp.h Sun Mar 27 19:13:23 2011 +0200
-+++ b/mcabber/mcabber/xmpp.h Sun Mar 27 19:13:27 2011 +0200
+diff -r 430cdecabdf2 mcabber/mcabber/xmpp.h
+--- a/mcabber/mcabber/xmpp.h Sun Jul 17 23:26:31 2011 +0300
++++ b/mcabber/mcabber/xmpp.h Sun Jul 17 23:26:32 2011 +0300
@@ -33,7 +33,9 @@
extern LmConnection* lconnection;
--- a/modularize-extcmd Sun Jul 17 23:05:54 2011 +0300
+++ b/modularize-extcmd Sun Jul 17 23:27:33 2011 +0300
@@ -1,6 +1,6 @@
-diff -r e93314dc3fb8 mcabber/configure.ac
---- a/mcabber/configure.ac Sun Mar 27 19:11:54 2011 +0200
-+++ b/mcabber/configure.ac Sun Mar 27 19:13:23 2011 +0200
+diff -r fb4288983f04 mcabber/configure.ac
+--- a/mcabber/configure.ac Sun Jul 17 23:26:30 2011 +0300
++++ b/mcabber/configure.ac Sun Jul 17 23:26:31 2011 +0300
@@ -283,6 +283,7 @@
modules/beep/Makefile
modules/xttitle/Makefile
@@ -9,9 +9,9 @@
modules/urlregex/Makefile
doc/Makefile
doc/guide/Makefile
-diff -r e93314dc3fb8 mcabber/mcabber/Makefile.am
---- a/mcabber/mcabber/Makefile.am Sun Mar 27 19:11:54 2011 +0200
-+++ b/mcabber/mcabber/Makefile.am Sun Mar 27 19:13:23 2011 +0200
+diff -r fb4288983f04 mcabber/mcabber/Makefile.am
+--- a/mcabber/mcabber/Makefile.am Sun Jul 17 23:26:30 2011 +0300
++++ b/mcabber/mcabber/Makefile.am Sun Jul 17 23:26:31 2011 +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 e93314dc3fb8 mcabber/mcabber/hooks.c
---- a/mcabber/mcabber/hooks.c Sun Mar 27 19:11:54 2011 +0200
-+++ b/mcabber/mcabber/hooks.c Sun Mar 27 19:13:23 2011 +0200
+diff -r fb4288983f04 mcabber/mcabber/hooks.c
+--- a/mcabber/mcabber/hooks.c Sun Jul 17 23:26:30 2011 +0300
++++ b/mcabber/mcabber/hooks.c Sun Jul 17 23:26:31 2011 +0300
@@ -36,7 +36,10 @@
#include "utf8.h"
#include "commands.h"
@@ -108,9 +108,9 @@
}
// hk_presence_subscription_request(jid, message)
-diff -r e93314dc3fb8 mcabber/mcabber/main.c
---- a/mcabber/mcabber/main.c Sun Mar 27 19:11:54 2011 +0200
-+++ b/mcabber/mcabber/main.c Sun Mar 27 19:13:23 2011 +0200
+diff -r fb4288983f04 mcabber/mcabber/main.c
+--- a/mcabber/mcabber/main.c Sun Jul 17 23:26:30 2011 +0300
++++ b/mcabber/mcabber/main.c Sun Jul 17 23:26:31 2011 +0300
@@ -44,7 +44,10 @@
#include "xmpp.h"
#include "help.h"
@@ -123,7 +123,7 @@
#ifndef MODULES_ENABLE
# include "fifo.h"
-@@ -442,9 +445,11 @@
+@@ -443,9 +446,11 @@
}
#endif
@@ -135,15 +135,15 @@
optstring = settings_opt_get("roster_display_filter");
if (optstring)
-diff -r e93314dc3fb8 mcabber/modules/Makefile.am
---- a/mcabber/modules/Makefile.am Sun Mar 27 19:11:54 2011 +0200
-+++ b/mcabber/modules/Makefile.am Sun Mar 27 19:13:23 2011 +0200
+diff -r fb4288983f04 mcabber/modules/Makefile.am
+--- a/mcabber/modules/Makefile.am Sun Jul 17 23:26:30 2011 +0300
++++ b/mcabber/modules/Makefile.am Sun Jul 17 23:26:31 2011 +0300
@@ -1,1 +1,1 @@
-SUBDIRS = beep xttitle fifo urlregex
+SUBDIRS = beep xttitle fifo eventcmd urlregex
-diff -r e93314dc3fb8 mcabber/modules/eventcmd/Makefile.am
+diff -r fb4288983f04 mcabber/modules/eventcmd/Makefile.am
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
-+++ b/mcabber/modules/eventcmd/Makefile.am Sun Mar 27 19:13:23 2011 +0200
++++ b/mcabber/modules/eventcmd/Makefile.am Sun Jul 17 23:26:31 2011 +0300
@@ -0,0 +1,12 @@
+
+if INSTALL_HEADERS
@@ -157,9 +157,9 @@
+ $(ENCHANT_CFLAGS)
+endif
+
-diff -r e93314dc3fb8 mcabber/modules/eventcmd/eventcmd.c
+diff -r fb4288983f04 mcabber/modules/eventcmd/eventcmd.c
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
-+++ b/mcabber/modules/eventcmd/eventcmd.c Sun Mar 27 19:13:23 2011 +0200
++++ b/mcabber/modules/eventcmd/eventcmd.c Sun Jul 17 23:26:31 2011 +0300
@@ -0,0 +1,221 @@
+
+/* Copyright 2009 Myhailo Danylenko
--- a/roster-state-colors Sun Jul 17 23:05:54 2011 +0300
+++ b/roster-state-colors Sun Jul 17 23:27:33 2011 +0300
@@ -1,6 +1,6 @@
-diff -r 0df1f1107cbc mcabber/contrib/themes/light.txt
---- a/mcabber/contrib/themes/light.txt Sun Mar 27 19:13:27 2011 +0200
-+++ b/mcabber/contrib/themes/light.txt Sun Mar 27 19:15:06 2011 +0200
+diff -r 9f0f992101ce mcabber/contrib/themes/light.txt
+--- a/mcabber/contrib/themes/light.txt Sun Jul 17 23:26:32 2011 +0300
++++ b/mcabber/contrib/themes/light.txt Sun Jul 17 23:26:33 2011 +0300
@@ -13,6 +13,5 @@
set color_bgrostersel = green
set color_rostersel = yellow
@@ -8,9 +8,9 @@
-set color_rosternewmsg = red
# vim:set ft=conf:
-diff -r 0df1f1107cbc mcabber/contrib/themes/light2.txt
---- a/mcabber/contrib/themes/light2.txt Sun Mar 27 19:13:27 2011 +0200
-+++ b/mcabber/contrib/themes/light2.txt Sun Mar 27 19:15:06 2011 +0200
+diff -r 9f0f992101ce mcabber/contrib/themes/light2.txt
+--- a/mcabber/contrib/themes/light2.txt Sun Jul 17 23:26:32 2011 +0300
++++ b/mcabber/contrib/themes/light2.txt Sun Jul 17 23:26:33 2011 +0300
@@ -13,6 +13,5 @@
set color_bgrostersel = black
set color_rostersel = brightgreen
@@ -18,9 +18,9 @@
-set color_rosternewmsg = red
# vim:set ft=conf:
-diff -r 0df1f1107cbc mcabber/contrib/themes/oliver.txt
---- a/mcabber/contrib/themes/oliver.txt Sun Mar 27 19:13:27 2011 +0200
-+++ b/mcabber/contrib/themes/oliver.txt Sun Mar 27 19:15:06 2011 +0200
+diff -r 9f0f992101ce mcabber/contrib/themes/oliver.txt
+--- a/mcabber/contrib/themes/oliver.txt Sun Jul 17 23:26:32 2011 +0300
++++ b/mcabber/contrib/themes/oliver.txt Sun Jul 17 23:26:33 2011 +0300
@@ -13,6 +13,5 @@
set color_bgrostersel = yellow
set color_rostersel = blue
@@ -28,9 +28,9 @@
-set color_rosternewmsg = red
# vim:set ft=conf:
-diff -r 0df1f1107cbc mcabber/doc/help/en/hlp_color.txt
---- a/mcabber/doc/help/en/hlp_color.txt Sun Mar 27 19:13:27 2011 +0200
-+++ b/mcabber/doc/help/en/hlp_color.txt Sun Mar 27 19:15:06 2011 +0200
+diff -r 9f0f992101ce mcabber/doc/help/en/hlp_color.txt
+--- a/mcabber/doc/help/en/hlp_color.txt Sun Jul 17 23:26:32 2011 +0300
++++ b/mcabber/doc/help/en/hlp_color.txt Sun Jul 17 23:26:33 2011 +0300
@@ -11,6 +11,7 @@
Set a color rule (or overwrite, if it already exists). The status is string containing all statuses the roster item can have for the rule to match, or * if any status is OK. Wildcard is the file-matching wildcard that will be applied to JID. Color is the wanted color.
If color is -, the rule is removed.
@@ -39,9 +39,9 @@
/color mucnick nick (color|-)
Marks the nick to be colored by given color. If a MUC has colored nicks, this one will be used. If color is -, the color is marked as chosen automatically, which means it will not be used in 'preset' coloring mode, but will stay the same in 'on' coloring mode.
/color muc (jid|.|*) [on|preset|off|-]
-diff -r 0df1f1107cbc mcabber/doc/help/uk/hlp_color.txt
---- a/mcabber/doc/help/uk/hlp_color.txt Sun Mar 27 19:13:27 2011 +0200
-+++ b/mcabber/doc/help/uk/hlp_color.txt Sun Mar 27 19:15:06 2011 +0200
+diff -r 9f0f992101ce mcabber/doc/help/uk/hlp_color.txt
+--- a/mcabber/doc/help/uk/hlp_color.txt Sun Jul 17 23:26:32 2011 +0300
++++ b/mcabber/doc/help/uk/hlp_color.txt Sun Jul 17 23:26:33 2011 +0300
@@ -11,6 +11,7 @@
Додає нове чи змінює існуюче правило кольору. "Статус" складений з літер статусу, до яких докладається це правило (наприклад "n_d?"). Зірочка ("*") відповідає будь-якому статусу. "Маска" подібна до файлової маски й докладається до jid. Правило встановлює колір контактів, що йому відповідають.
Щоб вилучити правило, вкажіть колір "-".
@@ -50,9 +50,9 @@
/color muc (jid|.|*) [on|preset|off|-]
Встановлює режим забарвлення прізвиськ у чаті. Якщо замість jid вказано * режим докладається до всіх чатів, для яких не визначено особистого правила (з вказанням jid).
У режимі on забарвлюються усі прізвиська, у режимі preset - лише ті, для яких колір встановлено командою /color mucnick, а режим off вимикає забарвлення прізвиськ. Режим - прибирає з вказаних jid особисті режими забарвлення. Тоді до них докладається глобальний. Глобальний режим прибрати не можна.
-diff -r 0df1f1107cbc mcabber/mcabber/screen.c
---- a/mcabber/mcabber/screen.c Sun Mar 27 19:13:27 2011 +0200
-+++ b/mcabber/mcabber/screen.c Sun Mar 27 19:15:06 2011 +0200
+diff -r 9f0f992101ce mcabber/mcabber/screen.c
+--- a/mcabber/mcabber/screen.c Sun Jul 17 23:26:32 2011 +0300
++++ b/mcabber/mcabber/screen.c Sun Jul 17 23:26:33 2011 +0300
@@ -434,7 +434,7 @@
"roster",
"rostersel",
@@ -158,9 +158,9 @@
if (isgrp) {
if (ishid) {
int group_count = 0;
-diff -r 0df1f1107cbc mcabber/mcabber/screen.h
---- a/mcabber/mcabber/screen.h Sun Mar 27 19:13:27 2011 +0200
-+++ b/mcabber/mcabber/screen.h Sun Mar 27 19:15:06 2011 +0200
+diff -r 9f0f992101ce mcabber/mcabber/screen.h
+--- a/mcabber/mcabber/screen.h Sun Jul 17 23:26:32 2011 +0300
++++ b/mcabber/mcabber/screen.h Sun Jul 17 23:26:33 2011 +0300
@@ -46,7 +46,7 @@
COLOR_ROSTER,
COLOR_ROSTERSEL,
@@ -170,9 +170,9 @@
COLOR_INFO,
COLOR_MSGIN,
COLOR_READMARK,
-diff -r 0df1f1107cbc mcabber/mcabberrc.example
---- a/mcabber/mcabberrc.example Sun Mar 27 19:13:27 2011 +0200
-+++ b/mcabber/mcabberrc.example Sun Mar 27 19:15:06 2011 +0200
+diff -r 9f0f992101ce mcabber/mcabberrc.example
+--- a/mcabber/mcabberrc.example Sun Jul 17 23:26:32 2011 +0300
++++ b/mcabber/mcabberrc.example Sun Jul 17 23:26:33 2011 +0300
@@ -385,7 +385,6 @@
# bgrostersel: background color of the selected roster item
# rostersel: text color of the selected roster item
--- a/separate-extcmd Sun Jul 17 23:05:54 2011 +0300
+++ b/separate-extcmd Sun Jul 17 23:27:33 2011 +0300
@@ -1,6 +1,6 @@
-diff -r 8f175821433d mcabber/mcabber/Makefile.am
---- a/mcabber/mcabber/Makefile.am Sun Mar 27 19:11:49 2011 +0200
-+++ b/mcabber/mcabber/Makefile.am Sun Mar 27 19:11:53 2011 +0200
+diff -r c37a4b51663b mcabber/mcabber/Makefile.am
+--- a/mcabber/mcabber/Makefile.am Sun Jul 17 23:26:29 2011 +0300
++++ b/mcabber/mcabber/Makefile.am Sun Jul 17 23:26:30 2011 +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 \
@@ -18,9 +18,9 @@
$(top_srcdir)/include/config.h
if OTR
-diff -r 8f175821433d mcabber/mcabber/extcmd.c
+diff -r c37a4b51663b mcabber/mcabber/extcmd.c
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
-+++ b/mcabber/mcabber/extcmd.c Sun Mar 27 19:11:53 2011 +0200
++++ b/mcabber/mcabber/extcmd.c Sun Jul 17 23:26:30 2011 +0300
@@ -0,0 +1,121 @@
+/*
+ * extcmd.c -- External event handler command
@@ -143,9 +143,9 @@
+}
+
+/* vim: set expandtab cindent cinoptions=>2\:2(0: For Vim users... */
-diff -r 8f175821433d mcabber/mcabber/extcmd.h
+diff -r c37a4b51663b mcabber/mcabber/extcmd.h
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
-+++ b/mcabber/mcabber/extcmd.h Sun Mar 27 19:11:53 2011 +0200
++++ b/mcabber/mcabber/extcmd.h Sun Jul 17 23:26:30 2011 +0300
@@ -0,0 +1,15 @@
+#ifndef __MCABBER_EXTCMD_H__
+#define __MCABBER_EXTCMD_H__ 1
@@ -162,9 +162,9 @@
+void hk_ext_cmd(const char *bjid, const char *type, const char *info, const char *data);
+
+#endif
-diff -r 8f175821433d mcabber/mcabber/hooks.c
---- a/mcabber/mcabber/hooks.c Sun Mar 27 19:11:49 2011 +0200
-+++ b/mcabber/mcabber/hooks.c Sun Mar 27 19:11:53 2011 +0200
+diff -r c37a4b51663b mcabber/mcabber/hooks.c
+--- a/mcabber/mcabber/hooks.c Sun Jul 17 23:26:29 2011 +0300
++++ b/mcabber/mcabber/hooks.c Sun Jul 17 23:26:30 2011 +0300
@@ -24,6 +24,7 @@
#include <string.h>
#include <sys/types.h>
@@ -431,9 +431,9 @@
-}
-
/* vim: set expandtab cindent cinoptions=>2\:2(0 sw=2 ts=2: For Vim users... */
-diff -r 8f175821433d mcabber/mcabber/hooks.h
---- a/mcabber/mcabber/hooks.h Sun Mar 27 19:11:49 2011 +0200
-+++ b/mcabber/mcabber/hooks.h Sun Mar 27 19:11:53 2011 +0200
+diff -r c37a4b51663b mcabber/mcabber/hooks.h
+--- a/mcabber/mcabber/hooks.h Sun Jul 17 23:26:29 2011 +0300
++++ b/mcabber/mcabber/hooks.h Sun Jul 17 23:26:30 2011 +0300
@@ -66,9 +66,6 @@
guint hk_subscription(LmMessageSubType mstype, const gchar *bjid,
const gchar *msg);
@@ -444,9 +444,9 @@
#endif /* __MCABBER_HOOKS_H__ */
/* vim: set expandtab cindent cinoptions=>2\:2(0 sw=2 ts=2: For Vim users... */
-diff -r 8f175821433d mcabber/mcabber/main.c
---- a/mcabber/mcabber/main.c Sun Mar 27 19:11:49 2011 +0200
-+++ b/mcabber/mcabber/main.c Sun Mar 27 19:11:53 2011 +0200
+diff -r c37a4b51663b mcabber/mcabber/main.c
+--- a/mcabber/mcabber/main.c Sun Jul 17 23:26:29 2011 +0300
++++ b/mcabber/mcabber/main.c Sun Jul 17 23:26:30 2011 +0300
@@ -44,6 +44,7 @@
#include "xmpp.h"
#include "help.h"
--- a/series Sun Jul 17 23:05:54 2011 +0300
+++ b/series Sun Jul 17 23:27:33 2011 +0300
@@ -1,8 +1,9 @@
+fix-receipts
+fix-gcc-warnings
switch-to-experimental
separate-extcmd
modularize-extcmd
guard-xmpp-password
roster-state-colors
-fix-receipts
extend-caps
add-cmake
--- a/switch-to-experimental Sun Jul 17 23:05:54 2011 +0300
+++ b/switch-to-experimental Sun Jul 17 23:27:33 2011 +0300
@@ -1,6 +1,6 @@
-diff -r 5dc408aacb14 mcabber/ChangeLog.api
---- a/mcabber/ChangeLog.api Sun Mar 27 20:30:35 2011 +0200
-+++ b/mcabber/ChangeLog.api Sun Mar 27 22:14:23 2011 +0200
+diff -r 62ebcecd524e mcabber/ChangeLog.api
+--- a/mcabber/ChangeLog.api Sun Jul 17 23:26:28 2011 +0300
++++ b/mcabber/ChangeLog.api Sun Jul 17 23:26:29 2011 +0300
@@ -1,3 +1,12 @@
+experimental (34)
+
@@ -14,9 +14,9 @@
dev (20)
* Add cmd_set_safe() and cmd_is_safe()
-diff -r 5dc408aacb14 mcabber/configure.ac
---- a/mcabber/configure.ac Sun Mar 27 20:30:35 2011 +0200
-+++ b/mcabber/configure.ac Sun Mar 27 22:14:23 2011 +0200
+diff -r 62ebcecd524e mcabber/configure.ac
+--- a/mcabber/configure.ac Sun Jul 17 23:26:28 2011 +0300
++++ b/mcabber/configure.ac Sun Jul 17 23:26:29 2011 +0300
@@ -272,7 +272,7 @@
AM_CONDITIONAL([INSTALL_HEADERS], [test x$enable_modules != xno])
@@ -26,9 +26,9 @@
AC_DEFINE([MCABBER_VERSION], "AC_PACKAGE_VERSION", [Mcabber version string])
# We need _GNU_SOURCE for strptime() and strcasestr()
-diff -r 5dc408aacb14 mcabber/mcabber/api.h
---- a/mcabber/mcabber/api.h Sun Mar 27 20:30:35 2011 +0200
-+++ b/mcabber/mcabber/api.h Sun Mar 27 22:14:23 2011 +0200
+diff -r 62ebcecd524e mcabber/mcabber/api.h
+--- a/mcabber/mcabber/api.h Sun Jul 17 23:26:28 2011 +0300
++++ b/mcabber/mcabber/api.h Sun Jul 17 23:26:29 2011 +0300
@@ -3,10 +3,10 @@
#include <mcabber/config.h> // For MCABBER_BRANCH