Drop accepted, add guide to seaprate-build
* remove fix-api-h and fix-xttitle-include - accepted upstream
* rename fix-separate-build to enable-separate-build, change description
* enable-separate-build can now build guide separately
* refresh
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/enable-separate-build.diff Tue Nov 27 01:57:06 2012 +0200
@@ -0,0 +1,139 @@
+# HG changeset patch
+# Parent e87ced7d1059b787b075da79c3ae0b6477bfccca
+Enable building from separate directory
+
+diff -r e87ced7d1059 mcabber/doc/guide/Makefile.am
+--- a/mcabber/doc/guide/Makefile.am Mon Nov 26 11:55:22 2012 +0100
++++ b/mcabber/doc/guide/Makefile.am Tue Nov 27 01:54:18 2012 +0200
+@@ -1,8 +1,11 @@
++
+ guide:
+- pdflatex guide
+- bibtex guide
+- pdflatex guide
+- pdflatex guide
++ cd $(srcdir) && \
++ pdflatex -output-directory=$(abs_top_builddir)/doc/guide guide
++ BIBINPUTS=$(srcdir) bibtex guide
++ cd $(srcdir) && \
++ pdflatex -output-directory=$(abs_top_builddir)/doc/guide guide && \
++ pdflatex -output-directory=$(abs_top_builddir)/doc/guide guide
+
+ clean-guide:
+ rm -f *.aux *.blg *.dvi *.toc *.out *.bbl *.log *.pdf
+diff -r e87ced7d1059 mcabber/hgcset.sh
+--- a/mcabber/hgcset.sh Mon Nov 26 11:55:22 2012 +0100
++++ b/mcabber/hgcset.sh Tue Nov 27 01:54:18 2012 +0200
+@@ -1,19 +1,24 @@
+ #! /bin/sh
+
+-if [ ! -f logprint.h ]; then
+- echo "You are not in the mcabber directory" >&2
++srcdir="$1"
++builddir="$2"
++
++if [ ! -f "$srcdir/logprint.h" ]; then
++ echo "Unable to find mcabber sources!" >&2
+ exit 1
+ fi
+
++cd "$srcdir"
++
+ if which hg > /dev/null 2>&1; then
+ cs=$(hg id 2> /dev/null | cut -d' ' -f1)
+ if test $? -eq 0; then
+ if [ x"$cs" != x ]; then
+- grep -q "$cs" hgcset.h > /dev/null 2>&1 || \
+- echo "#define HGCSET \"$cs\"" > hgcset.h
++ grep -q "$cs" "$builddir/hgcset.h" > /dev/null 2>&1 || \
++ echo "#define HGCSET \"$cs\"" > "$builddir/hgcset.h"
+ exit 0
+ fi
+ fi
+ fi
+
+-echo > hgcset.h
++echo > "$builddir/hgcset.h"
+diff -r e87ced7d1059 mcabber/mcabber/Makefile.am
+--- a/mcabber/mcabber/Makefile.am Mon Nov 26 11:55:22 2012 +0100
++++ b/mcabber/mcabber/Makefile.am Tue Nov 27 01:54:18 2012 +0200
+@@ -16,7 +16,8 @@
+ LDADD = $(GLIB_LIBS) $(LOUDMOUTH_LIBS) $(GPGME_LIBS) $(LIBOTR_LIBS) \
+ $(ENCHANT_LIBS) $(LIBIDN_LIBS)
+
+-AM_CPPFLAGS = -I$(top_srcdir) $(GLIB_CFLAGS) $(LOUDMOUTH_CFLAGS) \
++AM_CPPFLAGS = -I$(top_builddir) -I$(top_srcdir) \
++ $(GLIB_CFLAGS) $(LOUDMOUTH_CFLAGS) \
+ $(GPGME_CFLAGS) $(LIBOTR_CFLAGS) \
+ $(ENCHANT_CFLAGS) $(LIBIDN_CFLAGS)
+
+@@ -26,7 +27,7 @@
+ BUILT_SOURCES = hgcset.h
+
+ hgcset.h:
+- ../hgcset.sh
++ $(top_srcdir)/hgcset.sh "$(top_srcdir)/mcabber" "$(top_builddir)/mcabber"
+
+ .PHONY: hgcset.h
+ endif
+@@ -42,7 +43,7 @@
+ xmpp_iq.h xmpp_iqrequest.h \
+ xmpp_muc.h xmpp_s10n.h \
+ caps.h fifo.h help.h modules.h api.h \
+- $(top_srcdir)/include/config.h
++ $(top_builddir)/include/config.h
+
+ if OTR
+ mcabberinclude_HEADERS += otr.h nohtml.h
+diff -r e87ced7d1059 mcabber/modules/beep/Makefile.am
+--- a/mcabber/modules/beep/Makefile.am Mon Nov 26 11:55:22 2012 +0100
++++ b/mcabber/modules/beep/Makefile.am Tue Nov 27 01:54:18 2012 +0200
+@@ -6,7 +6,8 @@
+ libbeep_la_LDFLAGS = -module -avoid-version -shared
+
+ LDADD = $(GLIB_LIBS)
+-AM_CPPFLAGS = -I$(top_srcdir) $(GLIB_CFLAGS) $(LOUDMOUTH_CFLAGS) \
++AM_CPPFLAGS = -I$(top_srcdir) -I$(top_builddir) \
++ $(GLIB_CFLAGS) $(LOUDMOUTH_CFLAGS) \
+ $(GPGME_CFLAGS) $(LIBOTR_CFLAGS) \
+ $(ENCHANT_CFLAGS)
+
+diff -r e87ced7d1059 mcabber/modules/fifo/Makefile.am
+--- a/mcabber/modules/fifo/Makefile.am Mon Nov 26 11:55:22 2012 +0100
++++ b/mcabber/modules/fifo/Makefile.am Tue Nov 27 01:54:18 2012 +0200
+@@ -5,7 +5,8 @@
+ libfifo_la_LDFLAGS = -module -avoid-version -shared
+
+ LDADD = $(GLIB_LIBS)
+-AM_CPPFLAGS = -I$(top_srcdir) $(GLIB_CFLAGS) $(LOUDMOUTH_CFLAGS) \
++AM_CPPFLAGS = -I$(top_srcdir) -I$(top_builddir) \
++ $(GLIB_CFLAGS) $(LOUDMOUTH_CFLAGS) \
+ $(GPGME_CFLAGS) $(LIBOTR_CFLAGS) \
+ $(ENCHANT_CFLAGS)
+ endif
+diff -r e87ced7d1059 mcabber/modules/urlregex/Makefile.am
+--- a/mcabber/modules/urlregex/Makefile.am Mon Nov 26 11:55:22 2012 +0100
++++ b/mcabber/modules/urlregex/Makefile.am Tue Nov 27 01:54:18 2012 +0200
+@@ -6,7 +6,8 @@
+ liburlregex_la_LDFLAGS = -module -avoid-version -shared
+
+ LDADD = $(GLIB_LIBS)
+-AM_CPPFLAGS = -I$(top_srcdir) $(GLIB_CFLAGS) $(LOUDMOUTH_CFLAGS) \
++AM_CPPFLAGS = -I$(top_srcdir) -I$(top_builddir) \
++ $(GLIB_CFLAGS) $(LOUDMOUTH_CFLAGS) \
+ $(GPGME_CFLAGS) $(LIBOTR_CFLAGS) \
+ $(ENCHANT_CFLAGS)
+
+diff -r e87ced7d1059 mcabber/modules/xttitle/Makefile.am
+--- a/mcabber/modules/xttitle/Makefile.am Mon Nov 26 11:55:22 2012 +0100
++++ b/mcabber/modules/xttitle/Makefile.am Tue Nov 27 01:54:18 2012 +0200
+@@ -6,7 +6,8 @@
+ libxttitle_la_LDFLAGS = -module -avoid-version -shared
+
+ LDADD = $(GLIB_LIBS)
+-AM_CPPFLAGS = -I$(top_srcdir) $(GLIB_CFLAGS) $(LOUDMOUTH_CFLAGS) \
++AM_CPPFLAGS = -I$(top_srcdir) -I$(top_builddir) \
++ $(GLIB_CFLAGS) $(LOUDMOUTH_CFLAGS) \
+ $(GPGME_CFLAGS) $(LIBOTR_CFLAGS) $(ENCHANT_CFLAGS)
+
+ endif
--- a/fix-api-h.diff Thu Nov 22 00:59:19 2012 +0200
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,15 +0,0 @@
-# HG changeset patch
-# Parent f8958ab545ac1af3e3fbc3b3b025de66fd1ffa51
-api.h should include glib header
-
-diff -r f8958ab545ac -r c6fafa6e6be9 mcabber/mcabber/api.h
---- a/mcabber/mcabber/api.h Mon Oct 15 19:53:02 2012 +0200
-+++ b/mcabber/mcabber/api.h Thu Oct 18 21:48:25 2012 +0300
-@@ -1,6 +1,7 @@
- #ifndef __MCABBER_API_H__
- #define __MCABBER_API_H__ 1
-
-+#include <glib.h>
- #include <mcabber/config.h> // For MCABBER_BRANCH
-
- #define MCABBER_API_VERSION 23
--- a/fix-separate-build.diff Thu Nov 22 00:59:19 2012 +0200
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,120 +0,0 @@
-# HG changeset patch
-# Parent 1466c4a807787958dcb35e478de1e812999d97c9
-Fix building from separate directory
-
-diff -r 1466c4a80778 mcabber/hgcset.sh
---- a/mcabber/hgcset.sh Thu Nov 22 00:50:00 2012 +0200
-+++ b/mcabber/hgcset.sh Thu Nov 22 00:52:30 2012 +0200
-@@ -1,19 +1,24 @@
- #! /bin/sh
-
--if [ ! -f logprint.h ]; then
-- echo "You are not in the mcabber directory" >&2
-+srcdir="$1"
-+builddir="$2"
-+
-+if [ ! -f "$srcdir/logprint.h" ]; then
-+ echo "Unable to find mcabber sources!" >&2
- exit 1
- fi
-
-+cd "$srcdir"
-+
- if which hg > /dev/null 2>&1; then
- cs=$(hg id 2> /dev/null | cut -d' ' -f1)
- if test $? -eq 0; then
- if [ x"$cs" != x ]; then
-- grep -q "$cs" hgcset.h > /dev/null 2>&1 || \
-- echo "#define HGCSET \"$cs\"" > hgcset.h
-+ grep -q "$cs" "$builddir/hgcset.h" > /dev/null 2>&1 || \
-+ echo "#define HGCSET \"$cs\"" > "$builddir/hgcset.h"
- exit 0
- fi
- fi
- fi
-
--echo > hgcset.h
-+echo > "$builddir/hgcset.h"
-diff -r 1466c4a80778 mcabber/mcabber/Makefile.am
---- a/mcabber/mcabber/Makefile.am Thu Nov 22 00:50:00 2012 +0200
-+++ b/mcabber/mcabber/Makefile.am Thu Nov 22 00:52:30 2012 +0200
-@@ -16,7 +16,8 @@
- LDADD = $(GLIB_LIBS) $(LOUDMOUTH_LIBS) $(GPGME_LIBS) $(LIBOTR_LIBS) \
- $(ENCHANT_LIBS) $(LIBIDN_LIBS)
-
--AM_CPPFLAGS = -I$(top_srcdir) $(GLIB_CFLAGS) $(LOUDMOUTH_CFLAGS) \
-+AM_CPPFLAGS = -I$(top_builddir) -I$(top_srcdir) \
-+ $(GLIB_CFLAGS) $(LOUDMOUTH_CFLAGS) \
- $(GPGME_CFLAGS) $(LIBOTR_CFLAGS) \
- $(ENCHANT_CFLAGS) $(LIBIDN_CFLAGS)
-
-@@ -26,7 +27,7 @@
- BUILT_SOURCES = hgcset.h
-
- hgcset.h:
-- ../hgcset.sh
-+ $(top_srcdir)/hgcset.sh "$(top_srcdir)/mcabber" "$(top_builddir)/mcabber"
-
- .PHONY: hgcset.h
- endif
-@@ -42,7 +43,7 @@
- xmpp_iq.h xmpp_iqrequest.h \
- xmpp_muc.h xmpp_s10n.h \
- caps.h fifo.h help.h modules.h api.h \
-- $(top_srcdir)/include/config.h
-+ $(top_builddir)/include/config.h
-
- if OTR
- mcabberinclude_HEADERS += otr.h nohtml.h
-diff -r 1466c4a80778 mcabber/modules/beep/Makefile.am
---- a/mcabber/modules/beep/Makefile.am Thu Nov 22 00:50:00 2012 +0200
-+++ b/mcabber/modules/beep/Makefile.am Thu Nov 22 00:52:30 2012 +0200
-@@ -6,7 +6,8 @@
- libbeep_la_LDFLAGS = -module -avoid-version -shared
-
- LDADD = $(GLIB_LIBS)
--AM_CPPFLAGS = -I$(top_srcdir) $(GLIB_CFLAGS) $(LOUDMOUTH_CFLAGS) \
-+AM_CPPFLAGS = -I$(top_srcdir) -I$(top_builddir) \
-+ $(GLIB_CFLAGS) $(LOUDMOUTH_CFLAGS) \
- $(GPGME_CFLAGS) $(LIBOTR_CFLAGS) \
- $(ENCHANT_CFLAGS)
-
-diff -r 1466c4a80778 mcabber/modules/fifo/Makefile.am
---- a/mcabber/modules/fifo/Makefile.am Thu Nov 22 00:50:00 2012 +0200
-+++ b/mcabber/modules/fifo/Makefile.am Thu Nov 22 00:52:30 2012 +0200
-@@ -5,7 +5,8 @@
- libfifo_la_LDFLAGS = -module -avoid-version -shared
-
- LDADD = $(GLIB_LIBS)
--AM_CPPFLAGS = -I$(top_srcdir) $(GLIB_CFLAGS) $(LOUDMOUTH_CFLAGS) \
-+AM_CPPFLAGS = -I$(top_srcdir) -I$(top_builddir) \
-+ $(GLIB_CFLAGS) $(LOUDMOUTH_CFLAGS) \
- $(GPGME_CFLAGS) $(LIBOTR_CFLAGS) \
- $(ENCHANT_CFLAGS)
- endif
-diff -r 1466c4a80778 mcabber/modules/urlregex/Makefile.am
---- a/mcabber/modules/urlregex/Makefile.am Thu Nov 22 00:50:00 2012 +0200
-+++ b/mcabber/modules/urlregex/Makefile.am Thu Nov 22 00:52:30 2012 +0200
-@@ -6,7 +6,8 @@
- liburlregex_la_LDFLAGS = -module -avoid-version -shared
-
- LDADD = $(GLIB_LIBS)
--AM_CPPFLAGS = -I$(top_srcdir) $(GLIB_CFLAGS) $(LOUDMOUTH_CFLAGS) \
-+AM_CPPFLAGS = -I$(top_srcdir) -I$(top_builddir) \
-+ $(GLIB_CFLAGS) $(LOUDMOUTH_CFLAGS) \
- $(GPGME_CFLAGS) $(LIBOTR_CFLAGS) \
- $(ENCHANT_CFLAGS)
-
-diff -r 1466c4a80778 mcabber/modules/xttitle/Makefile.am
---- a/mcabber/modules/xttitle/Makefile.am Thu Nov 22 00:50:00 2012 +0200
-+++ b/mcabber/modules/xttitle/Makefile.am Thu Nov 22 00:52:30 2012 +0200
-@@ -6,7 +6,8 @@
- libxttitle_la_LDFLAGS = -module -avoid-version -shared
-
- LDADD = $(GLIB_LIBS)
--AM_CPPFLAGS = -I$(top_srcdir) $(GLIB_CFLAGS) $(LOUDMOUTH_CFLAGS) \
-+AM_CPPFLAGS = -I$(top_srcdir) -I$(top_builddir) \
-+ $(GLIB_CFLAGS) $(LOUDMOUTH_CFLAGS) \
- $(GPGME_CFLAGS) $(LIBOTR_CFLAGS) $(ENCHANT_CFLAGS)
-
- endif
--- a/fix-xttitle-include.diff Thu Nov 22 00:59:19 2012 +0200
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,15 +0,0 @@
-# HG changeset patch
-# Parent 037bef2ecc6dbe0f76b16fe33849ee48106fa178
-Add missing stdio.h to xttitle.c
-
-diff -r 037bef2ecc6d -r 3590e778e26e mcabber/modules/xttitle/xttitle.c
---- a/mcabber/modules/xttitle/xttitle.c Thu Nov 22 00:52:30 2012 +0200
-+++ b/mcabber/modules/xttitle/xttitle.c Thu Nov 22 00:58:23 2012 +0200
-@@ -20,6 +20,7 @@
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-
-+#include <stdio.h>
- #include <stdlib.h>
- #include <mcabber/modules.h>
- #include <mcabber/settings.h>
--- a/roster-state-colors.diff Thu Nov 22 00:59:19 2012 +0200
+++ b/roster-state-colors.diff Tue Nov 27 01:57:06 2012 +0200
@@ -1,38 +1,41 @@
Change roster item colors on chatstate change
-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 @@
+diff -r 1c4b2c41f849 mcabber/contrib/themes/light.txt
+--- a/mcabber/contrib/themes/light.txt Mon Nov 26 19:33:15 2012 +0200
++++ b/mcabber/contrib/themes/light.txt Mon Nov 26 19:33:24 2012 +0200
+@@ -14,7 +14,6 @@
set color_bgrostersel = green
set color_rostersel = yellow
set color_rosterselmsg = red
-set color_rosternewmsg = red
+ set color_readmark = red
# vim:set ft=conf:
-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 @@
+diff -r 1c4b2c41f849 mcabber/contrib/themes/light2.txt
+--- a/mcabber/contrib/themes/light2.txt Mon Nov 26 19:33:15 2012 +0200
++++ b/mcabber/contrib/themes/light2.txt Mon Nov 26 19:33:24 2012 +0200
+@@ -14,7 +14,6 @@
set color_bgrostersel = black
set color_rostersel = brightgreen
set color_rosterselmsg = red
-set color_rosternewmsg = red
+ set color_readmark = red
# vim:set ft=conf:
-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 @@
+diff -r 1c4b2c41f849 mcabber/contrib/themes/oliver.txt
+--- a/mcabber/contrib/themes/oliver.txt Mon Nov 26 19:33:15 2012 +0200
++++ b/mcabber/contrib/themes/oliver.txt Mon Nov 26 19:33:24 2012 +0200
+@@ -14,7 +14,6 @@
set color_bgrostersel = yellow
set color_rostersel = blue
set color_rosterselmsg = red
-set color_rosternewmsg = red
+ set color_readmark = red
# vim:set ft=conf:
-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
+diff -r 1c4b2c41f849 mcabber/doc/help/en/hlp_color.txt
+--- a/mcabber/doc/help/en/hlp_color.txt Mon Nov 26 19:33:15 2012 +0200
++++ b/mcabber/doc/help/en/hlp_color.txt Mon Nov 26 19:33:24 2012 +0200
@@ -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.
@@ -41,9 +44,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 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
+diff -r 1c4b2c41f849 mcabber/doc/help/uk/hlp_color.txt
+--- a/mcabber/doc/help/uk/hlp_color.txt Mon Nov 26 19:33:15 2012 +0200
++++ b/mcabber/doc/help/uk/hlp_color.txt Mon Nov 26 19:33:24 2012 +0200
@@ -11,6 +11,7 @@
Додає нове чи змінює існуюче правило кольору. "Статус" складений з літер статусу, до яких докладається це правило (наприклад "n_d?"). Зірочка ("*") відповідає будь-якому статусу. "Маска" подібна до файлової маски й докладається до jid. Правило встановлює колір контактів, що йому відповідають.
Щоб вилучити правило, вкажіть колір "-".
@@ -52,10 +55,10 @@
/color muc (jid|.|*) [on|preset|off|-]
Встановлює режим забарвлення прізвиськ у чаті. Якщо замість jid вказано * режим докладається до всіх чатів, для яких не визначено особистого правила (з вказанням jid).
У режимі on забарвлюються усі прізвиська, у режимі preset - лише ті, для яких колір встановлено командою /color mucnick, а режим off вимикає забарвлення прізвиськ. Режим - прибирає з вказаних jid особисті режими забарвлення. Тоді до них докладається глобальний. Глобальний режим прибрати не можна.
-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 @@
+diff -r 1c4b2c41f849 mcabber/mcabber/screen.c
+--- a/mcabber/mcabber/screen.c Mon Nov 26 19:33:15 2012 +0200
++++ b/mcabber/mcabber/screen.c Mon Nov 26 19:33:24 2012 +0200
+@@ -436,7 +436,7 @@
"roster",
"rostersel",
"rosterselmsg",
@@ -64,7 +67,7 @@
"info",
"msgin",
"readmark",
-@@ -504,10 +504,6 @@
+@@ -509,10 +509,6 @@
init_pair(i+1, ((color) ? find_color(color) : COLOR_RED),
find_color(backselected));
break;
@@ -75,7 +78,7 @@
case COLOR_INFO:
init_pair(i+1, ((color) ? find_color(color) : COLOR_WHITE),
find_color(background));
-@@ -805,6 +801,21 @@
+@@ -811,6 +807,21 @@
settings_set_guard("color_rosterselmsg", scr_color_guard);
settings_set_guard("color_rosternewmsg", scr_color_guard);
@@ -97,7 +100,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()
-@@ -2071,6 +2082,10 @@
+@@ -2078,6 +2089,10 @@
// for unfolded groups.
if (ismsg && (!isgrp || ishid)) {
pending = '#';
@@ -108,7 +111,7 @@
}
if (ismuc) {
-@@ -2094,24 +2109,22 @@
+@@ -2101,24 +2116,22 @@
for (n = 0; n < maxx; n++)
waddch(rosterWnd, ' ');
} else {
@@ -146,7 +149,7 @@
}
if (Roster_Width > prefix_length)
-@@ -2119,13 +2132,6 @@
+@@ -2126,13 +2139,6 @@
else
name[0] = 0;
@@ -160,10 +163,10 @@
if (isgrp) {
if (ishid) {
int group_count = 0;
-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 @@
+diff -r 1c4b2c41f849 mcabber/mcabber/screen.h
+--- a/mcabber/mcabber/screen.h Mon Nov 26 19:33:15 2012 +0200
++++ b/mcabber/mcabber/screen.h Mon Nov 26 19:33:24 2012 +0200
+@@ -47,7 +47,7 @@
COLOR_ROSTER,
COLOR_ROSTERSEL,
COLOR_ROSTERSELNMSG,
@@ -172,10 +175,10 @@
COLOR_INFO,
COLOR_MSGIN,
COLOR_READMARK,
-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 @@
+diff -r 1c4b2c41f849 mcabber/mcabberrc.example
+--- a/mcabber/mcabberrc.example Mon Nov 26 19:33:15 2012 +0200
++++ b/mcabber/mcabberrc.example Mon Nov 26 19:33:24 2012 +0200
+@@ -399,7 +399,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
@@ -183,7 +186,7 @@
#
#set color_background = black
#set color_general = white
-@@ -409,15 +408,24 @@
+@@ -414,15 +413,24 @@
#set color_bgrostersel = cyan
#set color_rostersel = blue
#set color_rosterselmsg = red
--- a/series Thu Nov 22 00:59:19 2012 +0200
+++ b/series Tue Nov 27 01:57:06 2012 +0200
@@ -1,6 +1,4 @@
-fix-api-h.diff
-fix-separate-build.diff
-fix-xttitle-include.diff
+enable-separate-build.diff
completion-sorting.diff
fix-date-fill.diff
switch-to-experimental.diff