--- a/add-cmake Tue May 01 02:07:34 2012 +0300
+++ b/add-cmake Tue May 01 02:09:34 2012 +0300
@@ -1,9 +1,9 @@
# HG changeset patch
-# Parent c5a9cf6a95df7f8d38fb06c6af53cd383490ff71
+# Parent 56b136a36dbc14a9c173f78350b00a73734b20cb
-diff -r c5a9cf6a95df mcabber/CMakeLists.txt
+diff -r 56b136a36dbc mcabber/CMakeLists.txt
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
-+++ b/mcabber/CMakeLists.txt Sun Jul 17 23:26:36 2011 +0300
++++ b/mcabber/CMakeLists.txt Mon Apr 30 23:39:07 2012 +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 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
+diff -r 56b136a36dbc mcabber/configure.ac
+--- a/mcabber/configure.ac Mon Apr 30 23:38:36 2012 +0300
++++ b/mcabber/configure.ac Mon Apr 30 23:39:07 2012 +0300
@@ -36,9 +36,8 @@
# Checks for header files.
--- a/extend-caps Tue May 01 02:07:34 2012 +0300
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,154 +0,0 @@
-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>
-
- 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);
-+ identity *i = g_new(identity, 1);
-+ i->category = g_strdup(category);
-+ i->name = g_strdup(name);
-+ i->type = g_strdup(type);
-+ i->lang = g_strdup(lang);
-+ c->identities = g_slist_insert_sorted (c->identities, i, (GCompareFunc)g_strcmp0);
- }
- }
-
-@@ -137,7 +152,6 @@
- // Generates the sha1 hash for the special capability "" and returns it
- const char *caps_generate(void)
- {
-- char *identity;
- GList *features;
- GChecksum *sha1;
- guint8 digest[20];
-@@ -148,10 +162,17 @@
-
- g_hash_table_steal(caps_cache, "");
- sha1 = g_checksum_new(G_CHECKSUM_SHA1);
-- identity = g_strdup_printf("%s/%s//%s<", c->category, c->type,
-- c->name ? c->name : "");
-- g_checksum_update(sha1, (guchar*)identity, -1);
-- g_free(identity);
-+ {
-+ GSList *iel = c->identities;
-+ for (iel = c->identities; iel; iel = iel->next) {
-+ identity *i = iel->data;
-+ char *i_str = g_strdup_printf("%s/%s/%s/%s<", i->category, i->type,
-+ i->lang ? i->lang : "",
-+ i->name ? i->name : "");
-+ g_checksum_update(sha1, (guchar *)i_str, -1);
-+ g_free(i_str);
-+ }
-+ }
-
- features = g_hash_table_get_values(c->features);
- features = g_list_sort(features, _strcmp_sort);
-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>
-
-+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);
-@@ -10,7 +23,8 @@
- void caps_set_identity(char *hash,
- const char *category,
- const char *name,
-- const char *type);
-+ const char *type,
-+ const char *lang);
- 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 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"),
- lm_message_node_get_attribute(info, "name"),
-- lm_message_node_get_attribute(info, "type"));
-+ lm_message_node_get_attribute(info, "type"),
-+ lm_message_node_get_attribute(info, "lang"));
- info = lm_message_node_get_child(query, "feature");
- while (info) {
- if (!g_strcmp0(info->name, "feature"))
-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("");
-- caps_set_identity("", "client", PACKAGE_STRING, "pc");
-+ caps_set_identity("", "client", PACKAGE_STRING, "pc", NULL);
- caps_add_feature("", NS_DISCO_INFO);
- caps_add_feature("", NS_MUC);
- // advertise ChatStates only if they aren't disabled
--- a/fix-gcc-warnings Tue May 01 02:07:34 2012 +0300
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,54 +0,0 @@
-# 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 Tue May 01 02:07:34 2012 +0300
+++ b/fix-receipts Tue May 01 02:09:34 2012 +0300
@@ -1,9 +1,9 @@
# HG changeset patch
-# Parent 7f7c6b87f1b1f4e63bb4083f3c5feb3ec0d740f0
+# Parent 99db5d4ed047b3dbe54727c1df311531f611f31f
-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
+diff -r 99db5d4ed047 mcabber/mcabber/hbuf.c
+--- a/mcabber/mcabber/hbuf.c Thu Mar 01 20:18:00 2012 +0100
++++ b/mcabber/mcabber/hbuf.c Mon Apr 30 23:10:28 2012 +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 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
+diff -r 99db5d4ed047 mcabber/mcabber/hbuf.h
+--- a/mcabber/mcabber/hbuf.h Thu Mar 01 20:18:00 2012 +0100
++++ b/mcabber/mcabber/hbuf.h Mon Apr 30 23:10:28 2012 +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 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 @@
+diff -r 99db5d4ed047 mcabber/mcabber/screen.c
+--- a/mcabber/mcabber/screen.c Thu Mar 01 20:18:00 2012 +0100
++++ b/mcabber/mcabber/screen.c Mon Apr 30 23:10:28 2012 +0300
+@@ -2239,7 +2239,7 @@
scr_show_window(jidto, FALSE);
}
@@ -47,9 +47,9 @@
{
winbuf *win_entry = scr_search_window(bjid, FALSE);
if (win_entry) {
-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
+diff -r 99db5d4ed047 mcabber/mcabber/screen.h
+--- a/mcabber/mcabber/screen.h Thu Mar 01 20:18:00 2012 +0100
++++ b/mcabber/mcabber/screen.h Mon Apr 30 23:10:28 2012 +0300
@@ -108,7 +108,7 @@
void scr_update_main_status(int forceupdate);
void scr_update_chat_status(int forceupdate);
@@ -59,9 +59,9 @@
void scr_show_buddy_window(void);
int scr_buddy_buffer_exists(const char *jid);
void scr_update_buddy_window(void);
-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
+diff -r 99db5d4ed047 mcabber/mcabber/xmpp.c
+--- a/mcabber/mcabber/xmpp.c Thu Mar 01 20:18:00 2012 +0100
++++ b/mcabber/mcabber/xmpp.c Mon Apr 30 23:10:28 2012 +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
-@@ -430,7 +421,8 @@
+@@ -432,7 +423,8 @@
lm_message_node_set_attribute
(lm_message_node_add_child(x->node, "request", NULL),
"xmlns", NS_RECEIPTS);
@@ -86,9 +86,9 @@
+ *xep184 = lm_get_uid ();
+ lm_message_node_set_attribute (x->node, "id", (const gchar *)*xep184);
}
+ g_free(barejid);
- #if defined XEP0022 || defined XEP0085
-@@ -494,11 +486,7 @@
+@@ -499,11 +491,7 @@
if (mystatus != invisible)
#endif
update_last_use();
@@ -101,7 +101,7 @@
lm_message_unref(x);
}
-@@ -1298,6 +1286,16 @@
+@@ -1305,6 +1293,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 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
+diff -r 99db5d4ed047 mcabber/mcabber/xmpp_helper.c
+--- a/mcabber/mcabber/xmpp_helper.c Thu Mar 01 20:18:00 2012 +0100
++++ b/mcabber/mcabber/xmpp_helper.c Mon Apr 30 23:10:28 2012 +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 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
+diff -r 99db5d4ed047 mcabber/mcabber/xmpp_helper.h
+--- a/mcabber/mcabber/xmpp_helper.h Thu Mar 01 20:18:00 2012 +0100
++++ b/mcabber/mcabber/xmpp_helper.h Mon Apr 30 23:10:28 2012 +0300
@@ -29,6 +29,8 @@
void xmpp_del_feature (const char *xmlns);
#endif
--- a/guard-xmpp-password Tue May 01 02:07:34 2012 +0300
+++ b/guard-xmpp-password Tue May 01 02:09:34 2012 +0300
@@ -1,7 +1,7 @@
-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 @@
+diff -r c290165bc534 mcabber/mcabber/commands.c
+--- a/mcabber/mcabber/commands.c Mon Apr 30 23:37:25 2012 +0300
++++ b/mcabber/mcabber/commands.c Mon Apr 30 23:38:20 2012 +0300
+@@ -2272,10 +2272,8 @@
static void list_option_cb(char *k, char *v, void *f)
{
@@ -14,9 +14,9 @@
}
static void do_set(char *arg)
-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
+diff -r c290165bc534 mcabber/mcabber/main.c
+--- a/mcabber/mcabber/main.c Mon Apr 30 23:37:25 2012 +0300
++++ b/mcabber/mcabber/main.c Mon Apr 30 23:38:20 2012 +0300
@@ -381,6 +381,7 @@
scr_init_locale_charset();
ut_init_debug();
@@ -36,9 +36,9 @@
settings_set(SETTINGS_TYPE_OPTION, "password", pwd);
g_free(pwd);
}
-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
+diff -r c290165bc534 mcabber/mcabber/xmpp.c
+--- a/mcabber/mcabber/xmpp.c Mon Apr 30 23:37:25 2012 +0300
++++ b/mcabber/mcabber/xmpp.c Mon Apr 30 23:38:20 2012 +0300
@@ -23,6 +23,8 @@
*/
#include <stdlib.h>
@@ -58,7 +58,7 @@
char imstatus2char[imstatus_size+1] = {
'_', 'o', 'f', 'd', 'n', 'a', 'i', '\0'
};
-@@ -887,16 +892,15 @@
+@@ -892,16 +897,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);
-@@ -1699,13 +1703,37 @@
+@@ -1780,13 +1784,37 @@
}
}
@@ -116,7 +116,7 @@
char *dynresource = NULL;
char fpr[16];
const char *proxy_host;
-@@ -1722,7 +1750,6 @@
+@@ -1803,7 +1831,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");
-@@ -1731,7 +1758,7 @@
+@@ -1812,7 +1839,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 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
+diff -r c290165bc534 mcabber/mcabber/xmpp.h
+--- a/mcabber/mcabber/xmpp.h Mon Apr 30 23:37:25 2012 +0300
++++ b/mcabber/mcabber/xmpp.h Mon Apr 30 23:38:20 2012 +0300
@@ -33,7 +33,9 @@
extern LmConnection* lconnection;
--- a/modularize-extcmd Tue May 01 02:07:34 2012 +0300
+++ b/modularize-extcmd Tue May 01 02:09:34 2012 +0300
@@ -1,6 +1,6 @@
-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
+diff -r 27d19b6bc194 mcabber/configure.ac
+--- a/mcabber/configure.ac Mon Apr 30 23:36:55 2012 +0300
++++ b/mcabber/configure.ac Mon Apr 30 23:37:25 2012 +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 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
+diff -r 27d19b6bc194 mcabber/mcabber/Makefile.am
+--- a/mcabber/mcabber/Makefile.am Mon Apr 30 23:36:55 2012 +0300
++++ b/mcabber/mcabber/Makefile.am Mon Apr 30 23:37:25 2012 +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 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
+diff -r 27d19b6bc194 mcabber/mcabber/hooks.c
+--- a/mcabber/mcabber/hooks.c Mon Apr 30 23:36:55 2012 +0300
++++ b/mcabber/mcabber/hooks.c Mon Apr 30 23:37:25 2012 +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;
-@@ -394,6 +399,7 @@
+@@ -397,6 +402,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);
-@@ -412,6 +418,7 @@
+@@ -415,6 +421,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
-@@ -488,8 +495,10 @@
+@@ -491,8 +498,10 @@
}
#endif
@@ -82,7 +82,7 @@
g_free(bmsg);
g_free(mmsg);
-@@ -575,9 +584,11 @@
+@@ -578,9 +587,11 @@
}
#endif
@@ -94,7 +94,7 @@
}
void hk_mystatuschange(time_t timestamp, enum imstatus old_status,
-@@ -701,11 +712,13 @@
+@@ -704,11 +715,13 @@
prev_muc_unread = muc_unread;
prev_muc_attention = muc_attention;
@@ -108,9 +108,9 @@
}
// hk_presence_subscription_request(jid, message)
-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
+diff -r 27d19b6bc194 mcabber/mcabber/main.c
+--- a/mcabber/mcabber/main.c Mon Apr 30 23:36:55 2012 +0300
++++ b/mcabber/mcabber/main.c Mon Apr 30 23:37:25 2012 +0300
@@ -44,7 +44,10 @@
#include "xmpp.h"
#include "help.h"
@@ -135,15 +135,15 @@
optstring = settings_opt_get("roster_display_filter");
if (optstring)
-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
+diff -r 27d19b6bc194 mcabber/modules/Makefile.am
+--- a/mcabber/modules/Makefile.am Mon Apr 30 23:36:55 2012 +0300
++++ b/mcabber/modules/Makefile.am Mon Apr 30 23:37:25 2012 +0300
@@ -1,1 +1,1 @@
-SUBDIRS = beep xttitle fifo urlregex
+SUBDIRS = beep xttitle fifo eventcmd urlregex
-diff -r fb4288983f04 mcabber/modules/eventcmd/Makefile.am
+diff -r 27d19b6bc194 mcabber/modules/eventcmd/Makefile.am
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
-+++ b/mcabber/modules/eventcmd/Makefile.am Sun Jul 17 23:26:31 2011 +0300
++++ b/mcabber/modules/eventcmd/Makefile.am Mon Apr 30 23:37:25 2012 +0300
@@ -0,0 +1,12 @@
+
+if INSTALL_HEADERS
@@ -157,9 +157,9 @@
+ $(ENCHANT_CFLAGS)
+endif
+
-diff -r fb4288983f04 mcabber/modules/eventcmd/eventcmd.c
+diff -r 27d19b6bc194 mcabber/modules/eventcmd/eventcmd.c
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
-+++ b/mcabber/modules/eventcmd/eventcmd.c Sun Jul 17 23:26:31 2011 +0300
++++ b/mcabber/modules/eventcmd/eventcmd.c Mon Apr 30 23:37:25 2012 +0300
@@ -0,0 +1,221 @@
+
+/* Copyright 2009 Myhailo Danylenko
--- a/roster-state-colors Tue May 01 02:07:34 2012 +0300
+++ b/roster-state-colors Tue May 01 02:09:34 2012 +0300
@@ -1,6 +1,6 @@
-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
+diff -r 7222f7b386cb mcabber/contrib/themes/light.txt
+--- a/mcabber/contrib/themes/light.txt Mon Apr 30 23:38:20 2012 +0300
++++ b/mcabber/contrib/themes/light.txt Mon Apr 30 23:38:36 2012 +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 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
+diff -r 7222f7b386cb mcabber/contrib/themes/light2.txt
+--- a/mcabber/contrib/themes/light2.txt Mon Apr 30 23:38:20 2012 +0300
++++ b/mcabber/contrib/themes/light2.txt Mon Apr 30 23:38:36 2012 +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 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
+diff -r 7222f7b386cb mcabber/contrib/themes/oliver.txt
+--- a/mcabber/contrib/themes/oliver.txt Mon Apr 30 23:38:20 2012 +0300
++++ b/mcabber/contrib/themes/oliver.txt Mon Apr 30 23:38:36 2012 +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 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
+diff -r 7222f7b386cb mcabber/doc/help/en/hlp_color.txt
+--- a/mcabber/doc/help/en/hlp_color.txt Mon Apr 30 23:38:20 2012 +0300
++++ b/mcabber/doc/help/en/hlp_color.txt Mon Apr 30 23:38:36 2012 +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 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
+diff -r 7222f7b386cb mcabber/doc/help/uk/hlp_color.txt
+--- a/mcabber/doc/help/uk/hlp_color.txt Mon Apr 30 23:38:20 2012 +0300
++++ b/mcabber/doc/help/uk/hlp_color.txt Mon Apr 30 23:38:36 2012 +0300
@@ -11,6 +11,7 @@
Додає нове чи змінює існуюче правило кольору. "Статус" складений з літер статусу, до яких докладається це правило (наприклад "n_d?"). Зірочка ("*") відповідає будь-якому статусу. "Маска" подібна до файлової маски й докладається до jid. Правило встановлює колір контактів, що йому відповідають.
Щоб вилучити правило, вкажіть колір "-".
@@ -50,10 +50,10 @@
/color muc (jid|.|*) [on|preset|off|-]
Встановлює режим забарвлення прізвиськ у чаті. Якщо замість jid вказано * режим докладається до всіх чатів, для яких не визначено особистого правила (з вказанням jid).
У режимі on забарвлюються усі прізвиська, у режимі preset - лише ті, для яких колір встановлено командою /color mucnick, а режим off вимикає забарвлення прізвиськ. Режим - прибирає з вказаних jid особисті режими забарвлення. Тоді до них докладається глобальний. Глобальний режим прибрати не можна.
-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 @@
+diff -r 7222f7b386cb mcabber/mcabber/screen.c
+--- a/mcabber/mcabber/screen.c Mon Apr 30 23:38:20 2012 +0300
++++ b/mcabber/mcabber/screen.c Mon Apr 30 23:38:36 2012 +0300
+@@ -435,7 +435,7 @@
"roster",
"rostersel",
"rosterselmsg",
@@ -62,7 +62,7 @@
"info",
"msgin",
"readmark",
-@@ -503,10 +503,6 @@
+@@ -504,10 +504,6 @@
init_pair(i+1, ((color) ? find_color(color) : COLOR_RED),
find_color(backselected));
break;
@@ -73,7 +73,7 @@
case COLOR_INFO:
init_pair(i+1, ((color) ? find_color(color) : COLOR_WHITE),
find_color(background));
-@@ -804,6 +800,21 @@
+@@ -805,6 +801,21 @@
settings_set_guard("color_rosterselmsg", scr_color_guard);
settings_set_guard("color_rosternewmsg", scr_color_guard);
@@ -95,7 +95,7 @@
getmaxyx(stdscr, maxY, maxX);
Log_Win_Height = DEFAULT_LOG_WIN_HEIGHT;
// Note scr_draw_main_window() should be called early after scr_init_curses()
-@@ -2046,6 +2057,10 @@
+@@ -2071,6 +2082,10 @@
// for unfolded groups.
if (ismsg && (!isgrp || ishid)) {
pending = '#';
@@ -106,7 +106,7 @@
}
if (ismuc) {
-@@ -2069,24 +2084,22 @@
+@@ -2094,24 +2109,22 @@
for (n = 0; n < maxx; n++)
waddch(rosterWnd, ' ');
} else {
@@ -143,8 +143,8 @@
+ wattrset(rosterWnd, color);
}
- if (Roster_Width > 7)
-@@ -2094,13 +2107,6 @@
+ if (Roster_Width > prefix_length)
+@@ -2119,13 +2132,6 @@
else
name[0] = 0;
@@ -158,9 +158,9 @@
if (isgrp) {
if (ishid) {
int group_count = 0;
-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
+diff -r 7222f7b386cb mcabber/mcabber/screen.h
+--- a/mcabber/mcabber/screen.h Mon Apr 30 23:38:20 2012 +0300
++++ b/mcabber/mcabber/screen.h Mon Apr 30 23:38:36 2012 +0300
@@ -46,7 +46,7 @@
COLOR_ROSTER,
COLOR_ROSTERSEL,
@@ -170,10 +170,10 @@
COLOR_INFO,
COLOR_MSGIN,
COLOR_READMARK,
-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 @@
+diff -r 7222f7b386cb mcabber/mcabberrc.example
+--- a/mcabber/mcabberrc.example Mon Apr 30 23:38:20 2012 +0300
++++ b/mcabber/mcabberrc.example Mon Apr 30 23:38:36 2012 +0300
+@@ -395,7 +395,6 @@
# bgrostersel: background color of the selected roster item
# rostersel: text color of the selected roster item
# rosterselmsg:text color of the selected roster item, if there is a new msg
@@ -181,7 +181,7 @@
#
#set color_background = black
#set color_general = white
-@@ -399,15 +398,24 @@
+@@ -409,15 +408,24 @@
#set color_bgrostersel = cyan
#set color_rostersel = blue
#set color_rosterselmsg = red
--- a/separate-extcmd Tue May 01 02:07:34 2012 +0300
+++ b/separate-extcmd Tue May 01 02:09:34 2012 +0300
@@ -1,6 +1,6 @@
-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
+diff -r 64da54766f99 mcabber/mcabber/Makefile.am
+--- a/mcabber/mcabber/Makefile.am Mon Apr 30 23:36:31 2012 +0300
++++ b/mcabber/mcabber/Makefile.am Mon Apr 30 23:36:55 2012 +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 c37a4b51663b mcabber/mcabber/extcmd.c
+diff -r 64da54766f99 mcabber/mcabber/extcmd.c
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
-+++ b/mcabber/mcabber/extcmd.c Sun Jul 17 23:26:30 2011 +0300
++++ b/mcabber/mcabber/extcmd.c Mon Apr 30 23:36:55 2012 +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 c37a4b51663b mcabber/mcabber/extcmd.h
+diff -r 64da54766f99 mcabber/mcabber/extcmd.h
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
-+++ b/mcabber/mcabber/extcmd.h Sun Jul 17 23:26:30 2011 +0300
++++ b/mcabber/mcabber/extcmd.h Mon Apr 30 23:36:55 2012 +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 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
+diff -r 64da54766f99 mcabber/mcabber/hooks.c
+--- a/mcabber/mcabber/hooks.c Mon Apr 30 23:36:31 2012 +0300
++++ b/mcabber/mcabber/hooks.c Mon Apr 30 23:36:55 2012 +0300
@@ -24,6 +24,7 @@
#include <string.h>
#include <sys/types.h>
@@ -198,7 +198,7 @@
gboolean attention = FALSE, mucprivmsg = FALSE;
gboolean error_msg_subtype = (type == LM_MESSAGE_SUB_TYPE_ERROR);
#ifdef MODULES_ENABLE
-@@ -370,19 +369,6 @@
+@@ -373,19 +372,6 @@
(!is_room || (is_groupchat && log_muc_conf && !timestamp)))
hlog_write_message(bjid, timestamp, 0, wmsg);
@@ -218,7 +218,7 @@
// Display the sender in the log window
if ((!is_groupchat) && !(message_flags & HBB_PREFIX_ERR) &&
settings_opt_get_int("log_display_sender")) {
-@@ -408,12 +394,24 @@
+@@ -411,12 +397,24 @@
}
#endif
@@ -244,7 +244,7 @@
// Beep, if enabled:
// - if it's a private message
-@@ -491,7 +489,7 @@
+@@ -494,7 +492,7 @@
#endif
// External command
@@ -253,7 +253,7 @@
g_free(bmsg);
g_free(mmsg);
-@@ -506,10 +504,7 @@
+@@ -509,10 +507,7 @@
char *bn;
char *logsmsg;
const char *rn = (resname ? resname : "");
@@ -265,7 +265,7 @@
oldstat = roster_getstatus(bjid, resname);
-@@ -561,27 +556,28 @@
+@@ -564,27 +559,28 @@
scr_draw_roster();
hlog_write_status(bjid, timestamp, status, status_msg);
@@ -298,7 +298,7 @@
}
void hk_mystatuschange(time_t timestamp, enum imstatus old_status,
-@@ -708,7 +704,7 @@
+@@ -711,7 +707,7 @@
/* Call external command */
str_unread = g_strdup_printf("%u %u %u %u", unread_count, attention_count,
muc_unread, muc_attention);
@@ -307,7 +307,7 @@
g_free(str_unread);
}
-@@ -748,123 +744,4 @@
+@@ -751,123 +747,4 @@
return 0;
}
@@ -431,9 +431,9 @@
-}
-
/* vim: set expandtab cindent cinoptions=>2\:2(0 sw=2 ts=2: For Vim users... */
-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
+diff -r 64da54766f99 mcabber/mcabber/hooks.h
+--- a/mcabber/mcabber/hooks.h Mon Apr 30 23:36:31 2012 +0300
++++ b/mcabber/mcabber/hooks.h Mon Apr 30 23:36:55 2012 +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 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
+diff -r 64da54766f99 mcabber/mcabber/main.c
+--- a/mcabber/mcabber/main.c Mon Apr 30 23:36:31 2012 +0300
++++ b/mcabber/mcabber/main.c Mon Apr 30 23:36:55 2012 +0300
@@ -44,6 +44,7 @@
#include "xmpp.h"
#include "help.h"
--- a/series Tue May 01 02:07:34 2012 +0300
+++ b/series Tue May 01 02:09:34 2012 +0300
@@ -1,9 +1,7 @@
fix-receipts
-fix-gcc-warnings
switch-to-experimental
separate-extcmd
modularize-extcmd
guard-xmpp-password
roster-state-colors
-extend-caps
add-cmake
--- a/switch-to-experimental Tue May 01 02:07:34 2012 +0300
+++ b/switch-to-experimental Tue May 01 02:09:34 2012 +0300
@@ -1,22 +1,36 @@
-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)
+diff -r bd387d7410d0 mcabber/ChangeLog.api
+--- a/mcabber/ChangeLog.api Mon Apr 30 23:21:22 2012 +0300
++++ b/mcabber/ChangeLog.api Mon Apr 30 23:36:31 2012 +0300
+@@ -1,3 +1,13 @@
++
++experimental (35)
+
+ * Change branch to "experimental".
-+ * Api as defined by dev:20
++ * Api as defined by dev:23
+ * Add MCABBER_BRANCH_EXPERIMENTAL define to api.h
+ * MQ Patch: switch-to-experimental
+
-+ -- Myhailo Danylenko, 2010-04-01
++ -- Myhailo Danylenko, 2012-04-30
++
+ dev (23)
+ * Changeset 8dc418af3e72
+ Add buddy_(get|set)activeresource() functions
+@@ -16,6 +26,12 @@
+
+ -- Hermitifier, 2011-10-03
+
++experimental (34)
++
++ * Api as defined by dev:20
++
++ -- Myhailo Danylenko, 2011-06-01
+
dev (20)
* Add cmd_set_safe() and cmd_is_safe()
-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
+diff -r bd387d7410d0 mcabber/configure.ac
+--- a/mcabber/configure.ac Mon Apr 30 23:21:22 2012 +0300
++++ b/mcabber/configure.ac Mon Apr 30 23:36:31 2012 +0300
@@ -272,7 +272,7 @@
AM_CONDITIONAL([INSTALL_HEADERS], [test x$enable_modules != xno])
@@ -26,17 +40,17 @@
AC_DEFINE([MCABBER_VERSION], "AC_PACKAGE_VERSION", [Mcabber version string])
# We need _GNU_SOURCE for strptime() and strcasestr()
-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
+diff -r bd387d7410d0 mcabber/mcabber/api.h
+--- a/mcabber/mcabber/api.h Mon Apr 30 23:21:22 2012 +0300
++++ b/mcabber/mcabber/api.h Mon Apr 30 23:36:31 2012 +0300
@@ -3,10 +3,10 @@
#include <mcabber/config.h> // For MCABBER_BRANCH
--#define MCABBER_API_VERSION 20
--#define MCABBER_API_MIN 19
-+#define MCABBER_API_VERSION 34
-+#define MCABBER_API_MIN 34
+-#define MCABBER_API_VERSION 23
+-#define MCABBER_API_MIN 21
++#define MCABBER_API_VERSION 35
++#define MCABBER_API_MIN 35
-#define MCABBER_BRANCH_DEV 1
+#define MCABBER_BRANCH_EXPERIMENTAL 1