merge from default branch

This commit is contained in:
Yann Leboulanger 2010-01-19 16:37:14 +01:00
commit 3a76966c14
293 changed files with 78720 additions and 73814 deletions

View file

@ -2,13 +2,9 @@ syntax: glob
*.orig *.orig
*.gmo *.gmo
*.in *.in
*.la
*.lo
*.m4 *.m4
*.pyc *.pyc
*.pyo *.pyo
*.o
*.Plo
*~ *~
autom4te.cache autom4te.cache
data/defs.py data/defs.py
@ -23,6 +19,4 @@ Makefile
syntax: regexp syntax: regexp
^config\.* ^config\.*
^config\/ ^config\/
^src\/\.libs
^src\/trayicon.c
^scripts\/gajim.* ^scripts\/gajim.*

View file

@ -1,5 +1,6 @@
CURRENT DEVELOPERS: CURRENT DEVELOPERS:
Alexander Cherniuk (ts33kr AT gmail.com)
Nikos Kouremenos (kourem AT gmail.com) Nikos Kouremenos (kourem AT gmail.com)
Yann Leboulanger (asterix AT lagaule.org) Yann Leboulanger (asterix AT lagaule.org)
Julien Pivotto (roidelapluie AT gmail.com) Julien Pivotto (roidelapluie AT gmail.com)

View file

@ -44,7 +44,7 @@ Gajim 0.12.2 (07 June 2009)
* Improve error messages handling * Improve error messages handling
* Totem support for played music * Totem support for played music
* Fix SSL with some servers * Fix SSL with some servers
* Handle XFCE notification-daemon * Handle Xfce notification-daemon
* Restore old behaviour of click on systray: left click to open events * Restore old behaviour of click on systray: left click to open events
* Network manager 0.7 support * Network manager 0.7 support
* Move logs file under windows to $APPDATA/gajim * Move logs file under windows to $APPDATA/gajim

View file

@ -1,4 +1,4 @@
SUBDIRS = src data po SUBDIRS = src data po icons
ACLOCAL_AMFLAGS = -I m4 ACLOCAL_AMFLAGS = -I m4
@ -50,7 +50,6 @@ MAINTAINERCLEANFILES = \
aclocal.m4 \ aclocal.m4 \
libtool \ libtool \
po/POTFILES.in \ po/POTFILES.in \
src/trayicon_la-eggtrayicon.loT \
m4/intltool.m4 m4/intltool.m4
MAINTAINERCLEANDIRS = \ MAINTAINERCLEANDIRS = \

View file

@ -4,27 +4,23 @@
<html xmlns="http://www.w3.org/1999/xhtml" lang="en" xml:lang="en"> <html xmlns="http://www.w3.org/1999/xhtml" lang="en" xml:lang="en">
<head> <head>
<title>Gajim - Read Me</title> <title>Gajim - Read Me</title>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
</head> </head>
<body> <body>
<h1>Gajim Read Me</h1> <h1>Gajim Read Me</h1>
<p> <p>Welcome to Gajim and thank you for trying out our client.</p>
Welcome to Gajim and thank you for trying out our client.
</p>
<h2>Runtime Requirements</h2> <h2>Runtime Requirements</h2>
<ul> <ul>
<li>python2.5 or higher</li> <li>python2.5 or higher</li>
<li>pygtk2.12 or higher</li> <li>pygtk2.16 or higher</li>
<li>python-libglade</li> <li>python-libglade</li>
<li>pysqlite2 (if you have python 2.5, you already have this)</li> <li>pysqlite2 (if you have python 2.5, you already have this)</li>
</ul> </ul>
<p> <p><strong>Note to packagers</strong> Gajim is a GTK+ app that loves GNOME. You can do 'make' so you don't require gnomepythonextras (aka gnome-python-desktop) which is gnome dep, but you will miss gnomekeyring integration.</p>
<strong>Note to packagers</strong>
Gajim is a GTK+ app that loves GNOME. You can do 'make' so you don't require gnomepythonextras (aka gnome-python-desktop) which is gnome dep, but you will miss gnomekeyring integration.
</p>
<h2>Optional Runtime Requirements</h2> <h2>Optional Runtime Requirements</h2>
<ul> <ul>
@ -34,34 +30,23 @@ Gajim is a GTK+ app that loves GNOME. You can do 'make' so you don't require gno
<li>For zeroconf (bonjour), the "enable link-local messaging" checkbox, you need dbus-glib, python-avahi</li> <li>For zeroconf (bonjour), the "enable link-local messaging" checkbox, you need dbus-glib, python-avahi</li>
<li>dnsutils (or whatever package provides the nslookup binary) for SRV support</li> <li>dnsutils (or whatever package provides the nslookup binary) for SRV support</li>
<li>gtkspell and aspell-LANG where lang is your locale eg. en, fr etc</li> <li>gtkspell and aspell-LANG where lang is your locale eg. en, fr etc</li>
<li>GnomePythonExtras 2.10 or above (aka gnome-python-desktop) so you can avoid compiling trayicon and gtkspell</li>
<li>gnome-python-desktop (for GnomeKeyring support)</li> <li>gnome-python-desktop (for GnomeKeyring support)</li>
<li>notification-daemon or notify-python (and D-Bus) to get cooler popups</li> <li>notification-daemon or notify-python (and D-Bus) to get cooler popups</li>
<li>D-Bus running to have gajim-remote working. Some distributions split dbus-x11, which is needed for dbus to work with Gajim. Version >= 0.80 is required.</li> <li>D-Bus running to have gajim-remote working. Some distributions split dbus-x11, which is needed for dbus to work with Gajim. Version >= 0.80 is required.</li>
<li>python-dbus bindings (>=0.80)</li> <li>python-dbus bindings (>=0.81)</li>
<li>python-sexy to have clickable URLs in chat windows</li>
<li>python-kerberos to use GSSAPI authentification. Note: version1.1 or higher is required</li> <li>python-kerberos to use GSSAPI authentification. Note: version1.1 or higher is required</li>
</ul> </ul>
<p> <p>Some distributions also split too much python standard library. I know SUSE does. In such distros you also need python-xml the xml lib that *comes* with python and not pyxml or whatever.</p>
Some distributions also split too much python standard library.
I know SUSE does. In such distros you also need python-xml
the xml lib that *comes* with python and not pyxml or whatever.
</p>
<h2>Compile-time Requirements</h2> <h2>Compile-time Requirements</h2>
<ul> <ul>
<li>python-dev</li> <li>python-dev</li>
<li>python-gtk2-dev</li> <li>python-gtk2-dev</li>
<li>libgtk2.0-dev aka. gtk2-devel</li>
<li>libgtkspell-dev (for the gtkspell module)</li>
<li>intltool (>= 0.40.1)</li> <li>intltool (>= 0.40.1)</li>
</ul> </ul>
<p> <p><strong>NOTE:</strong> If you still have problems compiling, you may want to try removing the gtk1 series of the above dependencies.</p>
<strong>NOTE:</strong>
If you still have problems compiling, you may want to try removing the gtk1 series of the above dependencies.
</p>
<h2>Installation Procedure</h2> <h2>Installation Procedure</h2>
<ol> <ol>
@ -72,25 +57,22 @@ If you still have problems compiling, you may want to try removing the gtk1 seri
<li>su -c make install</li> <li>su -c make install</li>
</ol> </ol>
<p> <p>To specify what modules to build do:</p>
To specify what modules to build do: <pre>
make help make help
</p> </pre>
<p> <p>To specify where to install do:</p>
To specify where to install do: <pre>
su -c make PREFIX=custom_path install su -c make PREFIX=custom_path install
</p> </pre>
<h2>Running Gajim</h2> <h2>Running Gajim</h2>
<p> <p>Just do <em>gajim</em> or you can run Gajim from your GNOME/Xfce/KDE/whatever menus.<br/><br/>
Just do <em>gajim</em> or you can run Gajim from your GNOME/XFCE/KDE/whatever menus.<br/><br/> or if you didn't 'make install' you can also run from gajim folder with<em>./launch.sh</em></p>
or if you didn't 'make install' you can also run from gajim folder with
<em>./launch.sh</em></p>
<hr /> <hr />
<h3>Note for svn users</h3> <h3>Note for hg users</h3>
You will need GNU autotools in order to install Gajim from svn. This includes: <p>You will need GNU autotools in order to install Gajim from svn. This includes:</p>
<ul> <ul>
<li>automake &gt;= 1.8 </li> <li>automake &gt;= 1.8 </li>
<li>autoconf &gt;= 2.59 </li> <li>autoconf &gt;= 2.59 </li>
@ -98,45 +80,41 @@ You will need GNU autotools in order to install Gajim from svn. This includes:
<li>intltool-0.40.1 </li> <li>intltool-0.40.1 </li>
<li>pkgconfig &gt;= 0.19</li> <li>pkgconfig &gt;= 0.19</li>
</ul> </ul>
</p> <p>steps to compile gajim:</p>
steps to compile gajim:
<pre> <pre>
$ sh autogen.sh $ sh autogen.sh
$ ./configure $ ./configure
$ make $ make
</pre> </pre>
Alternatively, if you don't want to install all these packages, you can get a nightly snapshot from <a href="http://www.gajim.org/downloads/snap/">here</a> and procede as usual: <p>Alternatively, if you don't want to install all these packages, you can get a nightly snapshot from <a href="http://www.gajim.org/downloads/snap/">here</a> and procede as usual:</p>
<pre> <pre>
$ ./configure $ ./configure
$ make $ make
</pre> </pre>
<h2>Uninstallation Procedure</h2> <h2>Uninstallation Procedure</h2>
<p> <pre>
su -c make uninstall<br/> su -c make uninstall
this will try to remove Gajim from the default directories. </pre>
If you want to remove it from custom directory provide it as:<br/> <p>this will try to remove Gajim from the default directories.
make PREFIX=custom_path uninstall If you want to remove it from custom directory provide it as:
</p> </p>
<pre>
make PREFIX=custom_path uninstall
</pre>
<h2>Miscellaneous</h2> <h2>Miscellaneous</h2>
<h3>XML &amp; Debugging</h3> <h3>XML &amp; Debugging</h3>
<p> <p>If you want to see the xml stanzas and/or help us debugging
If you want to see the xml stanzas and/or help us debugging
you're advised to enable verbose via advanced configuration window. you're advised to enable verbose via advanced configuration window.
If you don't want to make this permanent, execute gajim with --verbose If you don't want to make this permanent, execute gajim with --verbose
everytime you want to have verbose output. everytime you want to have verbose output.</p>
</p>
<h3>FAQ/Wiki</h3> <h3>FAQ/Wiki</h3>
<p> <p>FAQ can be found at <a href="http://trac.gajim.org/wiki/GajimFaq">http://trac.gajim.org/wiki/GajimFaq</a><br/>
FAQ can be found at <a href="http://trac.gajim.org/wiki/GajimFaq">http://trac.gajim.org/wiki/GajimFaq</a><br/> Wiki can be found at <a href="http://trac.gajim.org/wiki">http://trac.gajim.org/wiki</a></p>
Wiki can be found at <a href="http://trac.gajim.org/wiki">http://trac.gajim.org/wiki</a>
</p>
<p> <p>That is all, <strong>enjoy!</strong></p>
That is all, <strong>enjoy!</strong>
</p>
<p> <p>
<br/> <br/>
@ -152,6 +130,5 @@ PS.
We use original art and parts of sounds and other art from Psi, Gossip, We use original art and parts of sounds and other art from Psi, Gossip,
Gnomebaker, Gaim and some icons from various gnome-icons Gnomebaker, Gaim and some icons from various gnome-icons
(mostly Dropline Etiquette) we found at art.gnome.org (mostly Dropline Etiquette) we found at art.gnome.org
If you think we're violating a license please inform us. Thank you. If you think we're violating a license please inform us. Thank you.</p>
</p>
</body></html> </body></html>

View file

@ -1,10 +1,10 @@
Anders Ström Anders Ström
Christophe Got Christophe Got
Dennis Craven Dennis Craven
Dmitry Korzhevin
Guillaume Morin Guillaume Morin
Gvorcek Spajreh Gvorcek Spajreh
Josef Vybíral Josef Vybíral
Membris Khan Membris Khan
Rederick Asher Rederick Asher
Jakub Szypulka Jakub Szypulka

View file

@ -1,5 +1,5 @@
AC_INIT([Gajim - A Jabber Instant Messager], AC_INIT([Gajim - A Jabber Instant Messager],
[0.13.0.1-dev],[http://trac.gajim.org/],[gajim]) [0.13.10.1-dev],[http://trac.gajim.org/],[gajim])
AC_PREREQ([2.59]) AC_PREREQ([2.59])
AC_CONFIG_HEADER(config.h) AC_CONFIG_HEADER(config.h)
@ -39,7 +39,7 @@ AM_NLS
dnl **** dnl ****
dnl pygtk and gtk+ dnl pygtk and gtk+
dnl **** dnl ****
PKG_CHECK_MODULES([PYGTK], [gtk+-2.0 >= 2.12.0 pygtk-2.0 >= 2.12.0]) PKG_CHECK_MODULES([PYGTK], [gtk+-2.0 >= 2.16.0 pygtk-2.0 >= 2.16.0])
AC_SUBST(PYGTK_CFLAGS) AC_SUBST(PYGTK_CFLAGS)
AC_SUBST(PYGTK_LIBS) AC_SUBST(PYGTK_LIBS)
PYGTK_DEFS=`$PKG_CONFIG --variable=defsdir pygtk-2.0` PYGTK_DEFS=`$PKG_CONFIG --variable=defsdir pygtk-2.0`
@ -50,23 +50,27 @@ if test "x$PYTHON" = "x:"; then
AC_MSG_ERROR([Python not found]) AC_MSG_ERROR([Python not found])
fi fi
dnl ****
dnl tray icon
dnl ****
AC_ARG_ENABLE(trayicon,
[ --disable-trayicon do not build trayicon module [default yes]],
enable_trayicon=$enableval, enable_trayicon=yes)
test "x$enable_trayicon" = "xyes" && have_trayicon=true || have_trayicon=false
AM_CONDITIONAL(BUILD_TRAYICON, $have_trayicon)
ACLOCAL_AMFLAGS="\${ACLOCAL_FLAGS}" ACLOCAL_AMFLAGS="\${ACLOCAL_FLAGS}"
AC_SUBST(ACLOCAL_AMFLAGS) AC_SUBST(ACLOCAL_AMFLAGS)
AM_CHECK_PYTHON_HEADERS(,[AC_MSG_ERROR(could not find Python headers)]) AM_CHECK_PYTHON_HEADERS(,[AC_MSG_ERROR(could not find Python headers)])
AC_SUBST([PYTHON_INCLUDES]) AC_SUBST([PYTHON_INCLUDES])
AS_AC_EXPAND(DATADIR, "${datadir}") dnl ****
AS_AC_EXPAND(LIBDIR, "${libdir}") dnl enable installation in python-2.x/site-packages/gajim
dnl ****
AC_ARG_ENABLE(site-packages,
[AS_HELP_STRING([--enable-site-packages],
[install gajim sources in PYTHONDIR/site-packages/gajim
instead of DATADIR/gajim/src.])]
,
AC_SUBST([gajim_srcdir], [\${pkgpythondir}])
,
AC_SUBST([gajim_srcdir], [\${datadir}/\${PACKAGE}/src])
)
AS_AC_EXPAND(GAJIM_SRCDIR, "${gajim_srcdir}")
AS_AC_EXPAND(PKGDATADIR, "${datadir}/${PACKAGE}")
AS_AC_EXPAND(DOCDIR, "${docdir}") AS_AC_EXPAND(DOCDIR, "${docdir}")
AS_AC_EXPAND(LOCALEDIR, "${localedir}") AS_AC_EXPAND(LOCALEDIR, "${localedir}")
@ -82,6 +86,7 @@ AC_CONFIG_FILES([
data/iconsets/Makefile data/iconsets/Makefile
data/moods/Makefile data/moods/Makefile
data/activities/Makefile data/activities/Makefile
icons/Makefile
data/gajim.desktop.in data/gajim.desktop.in
data/defs.py data/defs.py
src/Makefile src/Makefile
@ -93,6 +98,10 @@ AC_CONFIG_FILES([
AC_OUTPUT AC_OUTPUT
echo " echo "
***************************** *****************************
Build features: Installation:
trayicon ......... ${have_trayicon} Prefix ........... ${prefix}
Python modules ... ${GAJIM_SRCDIR}
Documentation .... ${DOCDIR}
Others ........... ${PKGDATADIR}
*****************************" *****************************"

View file

@ -5,7 +5,7 @@ desktopdir = $(datadir)/applications
desktop_in_files = gajim.desktop.in.in desktop_in_files = gajim.desktop.in.in
desktop_DATA = $(desktop_in_files:.desktop.in.in=.desktop) desktop_DATA = $(desktop_in_files:.desktop.in.in=.desktop)
installdefsdir = $(pkgdatadir)/src/common installdefsdir = $(gajim_srcdir)/common
installdefs_DATA = defs.py installdefs_DATA = defs.py
soundsdir = $(pkgdatadir)/data/sounds soundsdir = $(pkgdatadir)/data/sounds

View file

@ -1,38 +1,4 @@
activitiesdir = $(pkgdatadir)/data/activities activitiesdir = $(pkgdatadir)/data/activities
nobase_dist_activities_DATA = $(srcdir)/*/*/*
activities_DATA =
ACTIVITIES_DIRS = **/**
ACTIVITIES_FILES = **/**/{*.png,*.gif}
install-data-local:
@for d in $$(cd $(srcdir); echo $(ACTIVITIES_DIRS));do \
if test -d $(srcdir)/$$d;then \
echo " $(mkinstalldirs) $(DESTDIR)$(pkgdatadir)/data/activities/$$d"; \
$(mkinstalldirs) $(DESTDIR)$(pkgdatadir)/data/activities/$$d || exit 1; \
fi; \
done; \
for f in $$(cd $(srcdir); echo $(ACTIVITIES_FILES));do \
if test -f $(srcdir)/$$f; then \
echo " $(INSTALL_DATA) $(srcdir)/$$f $(DESTDIR)$(pkgdatadir)/data/activities/$$f"; \
$(INSTALL_DATA) $(srcdir)/$$f $(DESTDIR)$(pkgdatadir)/data/activities/$$f || exit 1; \
fi; \
done;
dist-hook:
@for d in $$(cd $(srcdir); echo $(ACTIVITIES_DIRS));do \
if test -d $(srcdir)/$$d;then \
echo " $(mkdir_p) $(distdir)/$$d"; \
$(mkdir_p) $(distdir)/$$d || exit 1; \
fi; \
done; \
for f in $$(cd $(srcdir); echo $(ACTIVITIES_FILES));do \
if test -f $(srcdir)/$$f; then \
echo " cp -pR $(srcdir)/$$f $(distdir)/$$f"; \
cp -pR $(srcdir)/$$f $(distdir)/$$f || exit 1; \
fi; \
done;
MAINTAINERCLEANFILES = Makefile.in MAINTAINERCLEANFILES = Makefile.in

View file

@ -2,7 +2,7 @@
# do not edit it! # do not edit it!
docdir = "@DOCDIR@" docdir = "@DOCDIR@"
datadir = "@DATADIR@" basedir = "@PKGDATADIR@"
version = "@VERSION@" version = "@VERSION@"

View file

@ -1,38 +1,7 @@
emoticonsdir = $(pkgdatadir)/data/emoticons emoticonsdir = $(pkgdatadir)/data/emoticons
nobase_dist_emoticons_DATA = \
emoticons_DATA = $(srcdir)/*/*.png \
$(srcdir)/*/*.gif \
EMOTICONS_DIRS = ** $(srcdir)/*/emoticons.py
EMOTICONS_FILES = **/{*.png,*.gif,emoticons.py}
install-data-local:
@for d in $$(cd $(srcdir); echo $(EMOTICONS_DIRS));do \
if test -d $(srcdir)/$$d;then \
echo " $(mkinstalldirs) $(DESTDIR)$(pkgdatadir)/data/emoticons/$$d"; \
$(mkinstalldirs) $(DESTDIR)$(pkgdatadir)/data/emoticons/$$d || exit 1; \
fi; \
done; \
for f in $$(cd $(srcdir); echo $(EMOTICONS_FILES));do \
if test -f $(srcdir)/$$f; then \
echo " $(INSTALL_DATA) $(srcdir)/$$f $(DESTDIR)$(pkgdatadir)/data/emoticons/$$f"; \
$(INSTALL_DATA) $(srcdir)/$$f $(DESTDIR)$(pkgdatadir)/data/emoticons/$$f || exit 1; \
fi; \
done;
dist-hook:
@for d in $$(cd $(srcdir); echo $(EMOTICONS_DIRS));do \
if test -d $(srcdir)/$$d;then \
echo " $(mkdir_p) $(distdir)/$$d"; \
$(mkdir_p) $(distdir)/$$d || exit 1; \
fi; \
done; \
for f in $$(cd $(srcdir); echo $(EMOTICONS_FILES));do \
if test -f $(srcdir)/$$f; then \
echo " cp -pR $(srcdir)/$$f $(distdir)/$$f"; \
cp -pR $(srcdir)/$$f $(distdir)/$$f || exit 1; \
fi; \
done;
MAINTAINERCLEANFILES = Makefile.in MAINTAINERCLEANFILES = Makefile.in

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.4 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.5 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.3 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.3 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.1 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.3 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.3 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.5 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.3 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.2 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.2 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.3 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.4 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.2 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.3 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.2 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.3 KiB

View file

@ -0,0 +1,52 @@
# coding=utf-8
emoticons = {
'angel.png': ['O:-)', 'o:-)', '0:-)'],
'curl-lip.png': [':-)', ':)', '=)'],
'sarcastic.png': [';D', ';-D'],
'sad.png': [':-(', ':(', '=('],
'wink.png': [';-)', ';)'],
'tongue.png': [':-P', ':P', ':-p', ':p'],
'glasses-cool': ['8-)', 'B-)', '(H)'],
'laugh.png': [':-D', ':D'],
'embarrassed.png': [':-[', ':['],
'shout.png': ['=-O', ':-O', ':O'],
'kiss.png': [':-{}', ':-*', ':*', '(K)'],
'crying.png': [":'-(", ":'(", ';-(', ';(', ";'-("],
'shut-mouth': [':-X'],
'hypnotized.png': ['%)', '%-)'],
'freaked-out.png': [':o'],
'thinking.png': [':-|', ':|'],
'arrogant.png': [':-/', ':/', ':-\\', ':\\', ':-S', ':S'],
'devil.png': [':->', ']:->', '>:-)', '>:)', '(6)'],
'musical-note.png': ['[:-}'],
'sick.png': [':-!'],
'giggle.png': ['*JOKINGLY*'],
'cute.png': ['*KISSED*'],
'sleepy.png': ['*TIRED*'],
'terror.png': ['*STOP*'],
'handshake.png': ['*KISSING*'],
'rose.png': ['@}->--', '(F)'],
'good.png': ['(Y)', '*THUMBS UP*'],
'beer.png': ['(B)', '*DRINK*'],
'love.png': ['<3', '(L)', '*IN LOVE*'],
'bomb.png': ['@='],
'question.png': ['*HELP*'],
'cowboy.png': ['\m/'],
'fingers-crossed.png': ['*OK*'],
'alien.png': ['*WASSUP*'],
'disapointed.png': ['*SORRY*'],
'clap.png': ['*BRAVO*'],
'rotfl.png': ['*ROFL*'],
'dont-know.png': ['*PARDON*'],
'confused.png': ['*NO*'],
'silly.png': ['*CRAZY*'],
'doh.png': ['*DONT_KNOW*'],
'party.png': ['*DANCE*'],
'dance.png': ['*YAHOO*'],
'victory.png': ['*HI*'],
'go-away.png': ['*BYE*'],
'smirk.png': ['*YES*'],
'pissed-off.png': ['*WALL*'],
'mail.png': ['*WRITE*', '(E)'],
'tremble.png': ['*SCRATCH*'],
}

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.3 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.2 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.3 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.3 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.3 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1,011 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.4 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.3 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.3 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.2 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 881 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 941 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.5 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.3 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.5 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.3 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.3 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.2 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.3 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.3 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.3 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.2 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.4 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.2 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.2 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.3 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.2 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.3 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.4 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.2 KiB

View file

@ -1,6 +1,6 @@
<?xml version="1.0"?> <?xml version="1.0"?>
<glade-interface> <glade-interface>
<!-- interface-requires gtk+ 2.14 --> <!-- interface-requires gtk+ 2.16 -->
<!-- interface-naming-policy toplevel-contextual --> <!-- interface-naming-policy toplevel-contextual -->
<widget class="GtkWindow" id="message_window"> <widget class="GtkWindow" id="message_window">
<property name="default_width">480</property> <property name="default_width">480</property>
@ -18,7 +18,15 @@
<widget class="GtkVBox" id="chat_child_vbox"> <widget class="GtkVBox" id="chat_child_vbox">
<property name="can_focus">True</property> <property name="can_focus">True</property>
<property name="border_width">3</property> <property name="border_width">3</property>
<property name="orientation">vertical</property>
<property name="spacing">1</property> <property name="spacing">1</property>
<child>
<widget class="GtkHBox" id="hbox3">
<property name="visible">True</property>
<child>
<widget class="GtkVBox" id="vbox2">
<property name="visible">True</property>
<property name="orientation">vertical</property>
<child> <child>
<widget class="GtkAlignment" id="alignment"> <widget class="GtkAlignment" id="alignment">
<property name="visible">True</property> <property name="visible">True</property>
@ -48,6 +56,7 @@
<property name="visible">True</property> <property name="visible">True</property>
<property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property> <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
<property name="border_width">5</property> <property name="border_width">5</property>
<property name="orientation">vertical</property>
<child> <child>
<widget class="GtkLabel" id="banner_name_label"> <widget class="GtkLabel" id="banner_name_label">
<property name="visible">True</property> <property name="visible">True</property>
@ -60,7 +69,17 @@
</packing> </packing>
</child> </child>
<child> <child>
<placeholder/> <widget class="GtkLabel" id="banner_label">
<property name="visible">True</property>
<property name="xalign">0</property>
<property name="label" translatable="yes">label</property>
<property name="use_markup">True</property>
<property name="selectable">True</property>
<signal name="populate_popup" handler="on_banner_label_populate_popup"/>
</widget>
<packing>
<property name="position">1</property>
</packing>
</child> </child>
</widget> </widget>
<packing> <packing>
@ -94,13 +113,31 @@
<child> <child>
<widget class="GtkImage" id="tune_image"> <widget class="GtkImage" id="tune_image">
<property name="no_show_all">True</property> <property name="no_show_all">True</property>
<property name="pixbuf">../emoticons/static/music.png</property> <property name="stock">None</property>
<property name="icon-size">1</property> <property name="icon-size">1</property>
</widget> </widget>
<packing> <packing>
<property name="position">2</property> <property name="position">2</property>
</packing> </packing>
</child> </child>
<child>
<widget class="GtkEventBox" id="location_eventbox">
<property name="visible">True</property>
<property name="visible_window">False</property>
<child>
<widget class="GtkImage" id="location_image">
<property name="no_show_all">True</property>
<property name="stock">None</property>
<property name="icon-size">1</property>
</widget>
</child>
</widget>
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
<property name="position">3</property>
</packing>
</child>
<child> <child>
<widget class="GtkImage" id="audio_banner_image"> <widget class="GtkImage" id="audio_banner_image">
<property name="visible">True</property> <property name="visible">True</property>
@ -108,7 +145,7 @@
<property name="icon-size">1</property> <property name="icon-size">1</property>
</widget> </widget>
<packing> <packing>
<property name="position">3</property> <property name="position">4</property>
</packing> </packing>
</child> </child>
<child> <child>
@ -118,7 +155,7 @@
<property name="icon-size">1</property> <property name="icon-size">1</property>
</widget> </widget>
<packing> <packing>
<property name="position">4</property> <property name="position">5</property>
</packing> </packing>
</child> </child>
<child> <child>
@ -130,7 +167,7 @@
</child> </child>
</widget> </widget>
<packing> <packing>
<property name="position">5</property> <property name="position">6</property>
</packing> </packing>
</child> </child>
</widget> </widget>
@ -171,6 +208,7 @@
<child> <child>
<widget class="GtkVBox" id="vbox106"> <widget class="GtkVBox" id="vbox106">
<property name="visible">True</property> <property name="visible">True</property>
<property name="orientation">vertical</property>
<child> <child>
<widget class="GtkScrolledWindow" id="conversation_scrolledwindow"> <widget class="GtkScrolledWindow" id="conversation_scrolledwindow">
<property name="height_request">60</property> <property name="height_request">60</property>
@ -193,8 +231,8 @@
<property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property> <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
<child> <child>
<widget class="GtkButton" id="authentication_button"> <widget class="GtkButton" id="authentication_button">
<property name="can_focus">False</property> <property name="can_focus">True</property>
<property name="receives_default">False</property> <property name="receives_default">True</property>
<property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property> <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
<property name="no_show_all">True</property> <property name="no_show_all">True</property>
<property name="relief">none</property> <property name="relief">none</property>
@ -245,9 +283,10 @@
<child> <child>
<widget class="GtkButton" id="emoticons_button"> <widget class="GtkButton" id="emoticons_button">
<property name="visible">True</property> <property name="visible">True</property>
<property name="can_focus">False</property> <property name="can_focus">True</property>
<property name="receives_default">False</property> <property name="receives_default">True</property>
<property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property> <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
<property name="has_tooltip">True</property>
<property name="tooltip" translatable="yes">Show a list of emoticons (Alt+M)</property> <property name="tooltip" translatable="yes">Show a list of emoticons (Alt+M)</property>
<property name="relief">none</property> <property name="relief">none</property>
<property name="focus_on_click">False</property> <property name="focus_on_click">False</property>
@ -268,9 +307,10 @@
<child> <child>
<widget class="GtkButton" id="formattings_button"> <widget class="GtkButton" id="formattings_button">
<property name="visible">True</property> <property name="visible">True</property>
<property name="can_focus">False</property> <property name="can_focus">True</property>
<property name="receives_default">False</property> <property name="receives_default">True</property>
<property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property> <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
<property name="has_tooltip">True</property>
<property name="tooltip" translatable="yes">Show a list of formattings</property> <property name="tooltip" translatable="yes">Show a list of formattings</property>
<property name="relief">none</property> <property name="relief">none</property>
<property name="focus_on_click">False</property> <property name="focus_on_click">False</property>
@ -291,6 +331,7 @@
<widget class="GtkVSeparator" id="vseparator1"> <widget class="GtkVSeparator" id="vseparator1">
<property name="visible">True</property> <property name="visible">True</property>
<property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property> <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
<property name="orientation">vertical</property>
</widget> </widget>
<packing> <packing>
<property name="expand">False</property> <property name="expand">False</property>
@ -303,6 +344,7 @@
<property name="receives_default">True</property> <property name="receives_default">True</property>
<property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property> <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
<property name="no_show_all">True</property> <property name="no_show_all">True</property>
<property name="has_tooltip">True</property>
<property name="tooltip" translatable="yes">Add this contact to roster (Ctrl+D)</property> <property name="tooltip" translatable="yes">Add this contact to roster (Ctrl+D)</property>
<property name="relief">none</property> <property name="relief">none</property>
<child> <child>
@ -323,9 +365,10 @@
<child> <child>
<widget class="GtkButton" id="send_file_button"> <widget class="GtkButton" id="send_file_button">
<property name="visible">True</property> <property name="visible">True</property>
<property name="can_focus">False</property> <property name="can_focus">True</property>
<property name="receives_default">False</property> <property name="receives_default">True</property>
<property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property> <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
<property name="has_tooltip">True</property>
<property name="tooltip" translatable="yes">Send a file (Ctrl+F)</property> <property name="tooltip" translatable="yes">Send a file (Ctrl+F)</property>
<property name="relief">none</property> <property name="relief">none</property>
<property name="focus_on_click">False</property> <property name="focus_on_click">False</property>
@ -346,6 +389,7 @@
<widget class="GtkToggleButton" id="audio_togglebutton"> <widget class="GtkToggleButton" id="audio_togglebutton">
<property name="can_focus">True</property> <property name="can_focus">True</property>
<property name="receives_default">True</property> <property name="receives_default">True</property>
<property name="has_tooltip">True</property>
<property name="tooltip" translatable="yes">Toggle audio session</property> <property name="tooltip" translatable="yes">Toggle audio session</property>
<property name="relief">none</property> <property name="relief">none</property>
<child> <child>
@ -365,6 +409,7 @@
<widget class="GtkToggleButton" id="video_togglebutton"> <widget class="GtkToggleButton" id="video_togglebutton">
<property name="can_focus">True</property> <property name="can_focus">True</property>
<property name="receives_default">True</property> <property name="receives_default">True</property>
<property name="has_tooltip">True</property>
<property name="tooltip" translatable="yes">Toggle video session</property> <property name="tooltip" translatable="yes">Toggle video session</property>
<property name="relief">none</property> <property name="relief">none</property>
<child> <child>
@ -383,9 +428,10 @@
<child> <child>
<widget class="GtkButton" id="convert_to_gc_button"> <widget class="GtkButton" id="convert_to_gc_button">
<property name="visible">True</property> <property name="visible">True</property>
<property name="can_focus">False</property> <property name="can_focus">True</property>
<property name="receives_default">False</property> <property name="receives_default">True</property>
<property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property> <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
<property name="has_tooltip">True</property>
<property name="tooltip" translatable="yes">Invite contacts to the conversation (Ctrl+G)</property> <property name="tooltip" translatable="yes">Invite contacts to the conversation (Ctrl+G)</property>
<property name="relief">none</property> <property name="relief">none</property>
<property name="focus_on_click">False</property> <property name="focus_on_click">False</property>
@ -406,9 +452,10 @@
<child> <child>
<widget class="GtkButton" id="contact_information_button"> <widget class="GtkButton" id="contact_information_button">
<property name="visible">True</property> <property name="visible">True</property>
<property name="can_focus">False</property> <property name="can_focus">True</property>
<property name="receives_default">False</property> <property name="receives_default">True</property>
<property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property> <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
<property name="has_tooltip">True</property>
<property name="tooltip" translatable="yes">Show the contact's profile (Ctrl+I)</property> <property name="tooltip" translatable="yes">Show the contact's profile (Ctrl+I)</property>
<property name="relief">none</property> <property name="relief">none</property>
<property name="focus_on_click">False</property> <property name="focus_on_click">False</property>
@ -429,9 +476,10 @@
<child> <child>
<widget class="GtkButton" id="history_button"> <widget class="GtkButton" id="history_button">
<property name="visible">True</property> <property name="visible">True</property>
<property name="can_focus">False</property> <property name="can_focus">True</property>
<property name="receives_default">False</property> <property name="receives_default">True</property>
<property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property> <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
<property name="has_tooltip">True</property>
<property name="tooltip" translatable="yes">Browse the chat history (Ctrl+H)</property> <property name="tooltip" translatable="yes">Browse the chat history (Ctrl+H)</property>
<property name="relief">none</property> <property name="relief">none</property>
<property name="focus_on_click">False</property> <property name="focus_on_click">False</property>
@ -453,6 +501,7 @@
<widget class="GtkVSeparator" id="vseparator3"> <widget class="GtkVSeparator" id="vseparator3">
<property name="visible">True</property> <property name="visible">True</property>
<property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property> <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
<property name="orientation">vertical</property>
</widget> </widget>
<packing> <packing>
<property name="expand">False</property> <property name="expand">False</property>
@ -462,9 +511,10 @@
<child> <child>
<widget class="GtkButton" id="message_window_actions_button"> <widget class="GtkButton" id="message_window_actions_button">
<property name="visible">True</property> <property name="visible">True</property>
<property name="can_focus">False</property> <property name="can_focus">True</property>
<property name="receives_default">False</property> <property name="receives_default">True</property>
<property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property> <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
<property name="has_tooltip">True</property>
<property name="tooltip" translatable="yes">Show a menu of advanced functions (Alt+D)</property> <property name="tooltip" translatable="yes">Show a menu of advanced functions (Alt+D)</property>
<property name="relief">none</property> <property name="relief">none</property>
<property name="focus_on_click">False</property> <property name="focus_on_click">False</property>
@ -498,7 +548,7 @@
<widget class="GtkButton" id="send_button"> <widget class="GtkButton" id="send_button">
<property name="visible">True</property> <property name="visible">True</property>
<property name="can_focus">True</property> <property name="can_focus">True</property>
<property name="receives_default">False</property> <property name="receives_default">True</property>
<child> <child>
<widget class="GtkAlignment" id="alignment102"> <widget class="GtkAlignment" id="alignment102">
<property name="visible">True</property> <property name="visible">True</property>
@ -548,6 +598,257 @@
</packing> </packing>
</child> </child>
</widget> </widget>
<packing>
<property name="position">0</property>
</packing>
</child>
<child>
<widget class="GtkVBox" id="audio_vbox">
<property name="no_show_all">True</property>
<property name="orientation">vertical</property>
<property name="spacing">6</property>
<child>
<widget class="GtkLabel" id="label3">
<property name="visible">True</property>
</widget>
<packing>
<property name="position">0</property>
</packing>
</child>
<child>
<widget class="GtkTable" id="table1">
<property name="visible">True</property>
<property name="n_rows">4</property>
<property name="n_columns">3</property>
<property name="column_spacing">6</property>
<property name="row_spacing">6</property>
<child>
<widget class="GtkButton" id="1_button">
<property name="label" translatable="yes">1</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
</widget>
</child>
<child>
<widget class="GtkButton" id="2_button">
<property name="label" translatable="yes">2</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
</widget>
<packing>
<property name="left_attach">1</property>
<property name="right_attach">2</property>
</packing>
</child>
<child>
<widget class="GtkButton" id="3_button">
<property name="label" translatable="yes">3</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
</widget>
<packing>
<property name="left_attach">2</property>
<property name="right_attach">3</property>
</packing>
</child>
<child>
<widget class="GtkButton" id="4_button">
<property name="label" translatable="yes">4</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
</widget>
<packing>
<property name="top_attach">1</property>
<property name="bottom_attach">2</property>
</packing>
</child>
<child>
<widget class="GtkButton" id="5_button">
<property name="label" translatable="yes">5</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
</widget>
<packing>
<property name="left_attach">1</property>
<property name="right_attach">2</property>
<property name="top_attach">1</property>
<property name="bottom_attach">2</property>
</packing>
</child>
<child>
<widget class="GtkButton" id="6_button">
<property name="label" translatable="yes">6</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
</widget>
<packing>
<property name="left_attach">2</property>
<property name="right_attach">3</property>
<property name="top_attach">1</property>
<property name="bottom_attach">2</property>
</packing>
</child>
<child>
<widget class="GtkButton" id="7_button">
<property name="label" translatable="yes">7</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
</widget>
<packing>
<property name="top_attach">2</property>
<property name="bottom_attach">3</property>
</packing>
</child>
<child>
<widget class="GtkButton" id="8_button">
<property name="label" translatable="yes">8</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
</widget>
<packing>
<property name="left_attach">1</property>
<property name="right_attach">2</property>
<property name="top_attach">2</property>
<property name="bottom_attach">3</property>
</packing>
</child>
<child>
<widget class="GtkButton" id="9_button">
<property name="label" translatable="yes">9</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
</widget>
<packing>
<property name="left_attach">2</property>
<property name="right_attach">3</property>
<property name="top_attach">2</property>
<property name="bottom_attach">3</property>
</packing>
</child>
<child>
<widget class="GtkButton" id="*_button">
<property name="label" translatable="yes">*</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
</widget>
<packing>
<property name="top_attach">3</property>
<property name="bottom_attach">4</property>
</packing>
</child>
<child>
<widget class="GtkButton" id="0_button">
<property name="label" translatable="yes">0</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
</widget>
<packing>
<property name="left_attach">1</property>
<property name="right_attach">2</property>
<property name="top_attach">3</property>
<property name="bottom_attach">4</property>
</packing>
</child>
<child>
<widget class="GtkButton" id="#_button">
<property name="label" translatable="yes">#</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
</widget>
<packing>
<property name="left_attach">2</property>
<property name="right_attach">3</property>
<property name="top_attach">3</property>
<property name="bottom_attach">4</property>
</packing>
</child>
</widget>
<packing>
<property name="expand">False</property>
<property name="position">1</property>
</packing>
</child>
<child>
<widget class="GtkLabel" id="label1">
<property name="visible">True</property>
<property name="xalign">0</property>
<property name="label" translatable="yes">Sound volume:</property>
</widget>
<packing>
<property name="expand">False</property>
<property name="position">2</property>
</packing>
</child>
<child>
<widget class="GtkHScale" id="sound_hscale">
<property name="width_request">110</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="adjustment">0 0 110 1 10 10</property>
<property name="digits">0</property>
<property name="value_pos">bottom</property>
</widget>
<packing>
<property name="expand">False</property>
<property name="position">3</property>
</packing>
</child>
<child>
<widget class="GtkLabel" id="label2">
<property name="visible">True</property>
<property name="xalign">0</property>
<property name="label" translatable="yes">Mic volume:</property>
</widget>
<packing>
<property name="expand">False</property>
<property name="position">4</property>
</packing>
</child>
<child>
<widget class="GtkHScale" id="mic_hscale">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="adjustment">0 0 110 1 10 10</property>
<property name="digits">0</property>
<property name="value_pos">bottom</property>
</widget>
<packing>
<property name="expand">False</property>
<property name="position">5</property>
</packing>
</child>
<child>
<widget class="GtkLabel" id="label4">
<property name="visible">True</property>
</widget>
<packing>
<property name="position">6</property>
</packing>
</child>
</widget>
<packing>
<property name="expand">False</property>
<property name="position">1</property>
</packing>
</child>
</widget>
<packing>
<property name="position">0</property>
</packing>
</child>
</widget>
</child> </child>
<child> <child>
<widget class="GtkEventBox" id="chat_tab_ebox"> <widget class="GtkEventBox" id="chat_tab_ebox">
@ -614,6 +915,7 @@
<widget class="GtkVBox" id="muc_child_vbox"> <widget class="GtkVBox" id="muc_child_vbox">
<property name="can_focus">True</property> <property name="can_focus">True</property>
<property name="border_width">3</property> <property name="border_width">3</property>
<property name="orientation">vertical</property>
<child> <child>
<widget class="GtkAlignment" id="alignment103"> <widget class="GtkAlignment" id="alignment103">
<property name="visible">True</property> <property name="visible">True</property>
@ -643,6 +945,7 @@
<property name="visible">True</property> <property name="visible">True</property>
<property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property> <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
<property name="border_width">5</property> <property name="border_width">5</property>
<property name="orientation">vertical</property>
<child> <child>
<widget class="GtkLabel" id="banner_name_label"> <widget class="GtkLabel" id="banner_name_label">
<property name="visible">True</property> <property name="visible">True</property>
@ -655,7 +958,16 @@
</packing> </packing>
</child> </child>
<child> <child>
<placeholder/> <widget class="GtkLabel" id="banner_label">
<property name="visible">True</property>
<property name="xalign">0</property>
<property name="label" translatable="yes">label</property>
<property name="use_markup">True</property>
<property name="selectable">True</property>
</widget>
<packing>
<property name="position">1</property>
</packing>
</child> </child>
</widget> </widget>
<packing> <packing>
@ -683,10 +995,12 @@
<widget class="GtkVBox" id="vbox108"> <widget class="GtkVBox" id="vbox108">
<property name="width_request">0</property> <property name="width_request">0</property>
<property name="visible">True</property> <property name="visible">True</property>
<property name="orientation">vertical</property>
<property name="spacing">6</property> <property name="spacing">6</property>
<child> <child>
<widget class="GtkVBox" id="vbox109"> <widget class="GtkVBox" id="vbox109">
<property name="visible">True</property> <property name="visible">True</property>
<property name="orientation">vertical</property>
<property name="spacing">6</property> <property name="spacing">6</property>
<child> <child>
<widget class="GtkScrolledWindow" id="conversation_scrolledwindow"> <widget class="GtkScrolledWindow" id="conversation_scrolledwindow">

View file

@ -11,6 +11,7 @@
<child> <child>
<widget class="GtkVBox" id="vbox13"> <widget class="GtkVBox" id="vbox13">
<property name="visible">True</property> <property name="visible">True</property>
<property name="orientation">vertical</property>
<property name="spacing">6</property> <property name="spacing">6</property>
<child> <child>
<widget class="GtkNotebook" id="preferences_notebook"> <widget class="GtkNotebook" id="preferences_notebook">
@ -21,6 +22,7 @@
<widget class="GtkVBox" id="vbox41"> <widget class="GtkVBox" id="vbox41">
<property name="visible">True</property> <property name="visible">True</property>
<property name="border_width">12</property> <property name="border_width">12</property>
<property name="orientation">vertical</property>
<property name="spacing">12</property> <property name="spacing">12</property>
<child> <child>
<widget class="GtkFrame" id="frame1"> <widget class="GtkFrame" id="frame1">
@ -38,6 +40,7 @@
<widget class="GtkVBox" id="vbox1"> <widget class="GtkVBox" id="vbox1">
<property name="visible">True</property> <property name="visible">True</property>
<property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property> <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
<property name="orientation">vertical</property>
<property name="spacing">6</property> <property name="spacing">6</property>
<child> <child>
<widget class="GtkCheckButton" id="show_avatars_in_roster_checkbutton"> <widget class="GtkCheckButton" id="show_avatars_in_roster_checkbutton">
@ -124,6 +127,24 @@
<property name="position">4</property> <property name="position">4</property>
</packing> </packing>
</child> </child>
<child>
<widget class="GtkCheckButton" id="show_location_in_roster_checkbutton">
<property name="label" translatable="yes">Display _location of contacts in roster</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
<property name="has_tooltip">True</property>
<property name="tooltip" translatable="yes">If checked, Gajim will display the location of contacts in the roster window</property>
<property name="use_underline">True</property>
<property name="draw_indicator">True</property>
<signal name="toggled" handler="on_show_location_in_roster_checkbutton_toggled"/>
</widget>
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
<property name="position">5</property>
</packing>
</child>
<child> <child>
<widget class="GtkHBox" id="hbox3"> <widget class="GtkHBox" id="hbox3">
<property name="visible">True</property> <property name="visible">True</property>
@ -169,7 +190,7 @@
</child> </child>
</widget> </widget>
<packing> <packing>
<property name="position">5</property> <property name="position">6</property>
</packing> </packing>
</child> </child>
</widget> </widget>
@ -363,6 +384,7 @@ Detached roster with chat grouped by type</property>
<widget class="GtkVBox" id="vbox42"> <widget class="GtkVBox" id="vbox42">
<property name="visible">True</property> <property name="visible">True</property>
<property name="border_width">12</property> <property name="border_width">12</property>
<property name="orientation">vertical</property>
<property name="spacing">6</property> <property name="spacing">6</property>
<child> <child>
<widget class="GtkFrame" id="frame29"> <widget class="GtkFrame" id="frame29">
@ -377,6 +399,7 @@ Detached roster with chat grouped by type</property>
<child> <child>
<widget class="GtkVBox" id="vbox67"> <widget class="GtkVBox" id="vbox67">
<property name="visible">True</property> <property name="visible">True</property>
<property name="orientation">vertical</property>
<property name="spacing">6</property> <property name="spacing">6</property>
<child> <child>
<widget class="GtkHBox" id="hbox1"> <widget class="GtkHBox" id="hbox1">
@ -475,6 +498,7 @@ Show only in roster</property>
<child> <child>
<widget class="GtkVBox" id="vbox_gmail"> <widget class="GtkVBox" id="vbox_gmail">
<property name="visible">True</property> <property name="visible">True</property>
<property name="orientation">vertical</property>
<property name="spacing">6</property> <property name="spacing">6</property>
<child> <child>
<widget class="GtkCheckButton" id="notify_gmail_checkbutton"> <widget class="GtkCheckButton" id="notify_gmail_checkbutton">
@ -626,6 +650,7 @@ Always</property>
<child> <child>
<widget class="GtkVBox" id="vbox3"> <widget class="GtkVBox" id="vbox3">
<property name="visible">True</property> <property name="visible">True</property>
<property name="orientation">vertical</property>
<property name="spacing">6</property> <property name="spacing">6</property>
<child> <child>
<widget class="GtkHBox" id="hbox4"> <widget class="GtkHBox" id="hbox4">
@ -721,6 +746,7 @@ Always</property>
<widget class="GtkVBox" id="vbox11"> <widget class="GtkVBox" id="vbox11">
<property name="visible">True</property> <property name="visible">True</property>
<property name="border_width">12</property> <property name="border_width">12</property>
<property name="orientation">vertical</property>
<property name="spacing">12</property> <property name="spacing">12</property>
<child> <child>
<widget class="GtkFrame" id="frame13"> <widget class="GtkFrame" id="frame13">
@ -848,6 +874,7 @@ Disabled</property>
<widget class="GtkVBox" id="status_vbox"> <widget class="GtkVBox" id="status_vbox">
<property name="visible">True</property> <property name="visible">True</property>
<property name="border_width">12</property> <property name="border_width">12</property>
<property name="orientation">vertical</property>
<property name="spacing">12</property> <property name="spacing">12</property>
<child> <child>
<widget class="GtkFrame" id="frame81"> <widget class="GtkFrame" id="frame81">
@ -1044,6 +1071,7 @@ $T will be replaced by auto-not-available timeout</property>
<widget class="GtkVBox" id="vbox2"> <widget class="GtkVBox" id="vbox2">
<property name="visible">True</property> <property name="visible">True</property>
<property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property> <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
<property name="orientation">vertical</property>
<property name="spacing">6</property> <property name="spacing">6</property>
<child> <child>
<widget class="GtkHBox" id="hbox2934"> <widget class="GtkHBox" id="hbox2934">
@ -1293,6 +1321,7 @@ $T will be replaced by auto-not-available timeout</property>
<widget class="GtkVBox" id="vbox58"> <widget class="GtkVBox" id="vbox58">
<property name="visible">True</property> <property name="visible">True</property>
<property name="border_width">12</property> <property name="border_width">12</property>
<property name="orientation">vertical</property>
<property name="spacing">12</property> <property name="spacing">12</property>
<child> <child>
<widget class="GtkFrame" id="frame9"> <widget class="GtkFrame" id="frame9">
@ -1685,7 +1714,7 @@ $T will be replaced by auto-not-available timeout</property>
</packing> </packing>
</child> </child>
<child> <child>
<widget class="GtkHBox" id="hbox7"> <widget class="GtkHBox" id="hbox8">
<property name="visible">True</property> <property name="visible">True</property>
<child> <child>
<widget class="GtkCheckButton" id="incoming_msg_checkbutton"> <widget class="GtkCheckButton" id="incoming_msg_checkbutton">
@ -1725,7 +1754,7 @@ $T will be replaced by auto-not-available timeout</property>
</packing> </packing>
</child> </child>
<child> <child>
<widget class="GtkHBox" id="hbox8"> <widget class="GtkHBox" id="hbox9">
<property name="visible">True</property> <property name="visible">True</property>
<child> <child>
<widget class="GtkCheckButton" id="outgoing_msg_checkbutton"> <widget class="GtkCheckButton" id="outgoing_msg_checkbutton">
@ -1765,7 +1794,7 @@ $T will be replaced by auto-not-available timeout</property>
</packing> </packing>
</child> </child>
<child> <child>
<widget class="GtkHBox" id="hbox9"> <widget class="GtkHBox" id="hbox10">
<property name="visible">True</property> <property name="visible">True</property>
<child> <child>
<placeholder/> <placeholder/>
@ -1794,7 +1823,7 @@ $T will be replaced by auto-not-available timeout</property>
</packing> </packing>
</child> </child>
<child> <child>
<widget class="GtkHBox" id="hbox10"> <widget class="GtkHBox" id="hbox11">
<property name="visible">True</property> <property name="visible">True</property>
<child> <child>
<placeholder/> <placeholder/>
@ -1825,7 +1854,7 @@ $T will be replaced by auto-not-available timeout</property>
</packing> </packing>
</child> </child>
<child> <child>
<widget class="GtkHBox" id="hbox11"> <widget class="GtkHBox" id="hbox12">
<property name="visible">True</property> <property name="visible">True</property>
<child> <child>
<placeholder/> <placeholder/>
@ -1854,7 +1883,7 @@ $T will be replaced by auto-not-available timeout</property>
</packing> </packing>
</child> </child>
<child> <child>
<widget class="GtkHBox" id="hbox12"> <widget class="GtkHBox" id="hbox13">
<property name="visible">True</property> <property name="visible">True</property>
<child> <child>
<placeholder/> <placeholder/>
@ -1921,10 +1950,278 @@ $T will be replaced by auto-not-available timeout</property>
<property name="type">tab</property> <property name="type">tab</property>
</packing> </packing>
</child> </child>
<child>
<widget class="GtkVBox" id="vbox4">
<property name="visible">True</property>
<property name="border_width">12</property>
<property name="orientation">vertical</property>
<property name="spacing">12</property>
<child>
<widget class="GtkFrame" id="audio_frame">
<property name="visible">True</property>
<property name="label_xalign">0</property>
<property name="shadow_type">none</property>
<child>
<widget class="GtkAlignment" id="alignment6">
<property name="visible">True</property>
<property name="left_padding">12</property>
<child>
<widget class="GtkTable" id="table6">
<property name="visible">True</property>
<property name="n_rows">2</property>
<property name="n_columns">2</property>
<property name="column_spacing">6</property>
<property name="row_spacing">6</property>
<child>
<widget class="GtkComboBox" id="audio_input_combobox">
<property name="visible">True</property>
<signal name="changed" handler="on_audio_input_combobox_changed"/>
</widget>
<packing>
<property name="left_attach">1</property>
<property name="right_attach">2</property>
</packing>
</child>
<child>
<widget class="GtkComboBox" id="audio_output_combobox">
<property name="visible">True</property>
<signal name="changed" handler="on_audio_output_combobox_changed"/>
</widget>
<packing>
<property name="left_attach">1</property>
<property name="right_attach">2</property>
<property name="top_attach">1</property>
<property name="bottom_attach">2</property>
</packing>
</child>
<child>
<widget class="GtkLabel" id="label18">
<property name="visible">True</property>
<property name="xalign">0</property>
<property name="label" translatable="yes">Audio input device</property>
</widget>
<packing>
<property name="x_options">GTK_FILL</property>
</packing>
</child>
<child>
<widget class="GtkLabel" id="label19">
<property name="visible">True</property>
<property name="xalign">0</property>
<property name="label" translatable="yes">Audio output device</property>
</widget>
<packing>
<property name="top_attach">1</property>
<property name="bottom_attach">2</property>
<property name="x_options">GTK_FILL</property>
</packing>
</child>
</widget>
</child>
</widget>
</child>
<child>
<widget class="GtkLabel" id="label16">
<property name="visible">True</property>
<property name="label" translatable="yes">&lt;b&gt;Audio&lt;/b&gt;</property>
<property name="use_markup">True</property>
</widget>
<packing>
<property name="type">label_item</property>
</packing>
</child>
</widget>
<packing>
<property name="expand">False</property>
<property name="position">0</property>
</packing>
</child>
<child>
<widget class="GtkFrame" id="frame6">
<property name="visible">True</property>
<property name="label_xalign">0</property>
<property name="shadow_type">none</property>
<child>
<widget class="GtkAlignment" id="alignment7">
<property name="visible">True</property>
<property name="left_padding">12</property>
<child>
<widget class="GtkTable" id="table8">
<property name="visible">True</property>
<property name="n_rows">2</property>
<property name="n_columns">2</property>
<property name="column_spacing">6</property>
<property name="row_spacing">6</property>
<child>
<widget class="GtkLabel" id="label20">
<property name="visible">True</property>
<property name="xalign">0</property>
<property name="label" translatable="yes">Video input device</property>
</widget>
<packing>
<property name="x_options">GTK_FILL</property>
</packing>
</child>
<child>
<widget class="GtkLabel" id="label21">
<property name="visible">True</property>
<property name="xalign">0</property>
<property name="label" translatable="yes">Video output device</property>
</widget>
<packing>
<property name="top_attach">1</property>
<property name="bottom_attach">2</property>
<property name="x_options">GTK_FILL</property>
</packing>
</child>
<child>
<widget class="GtkComboBox" id="video_input_combobox">
<property name="visible">True</property>
<signal name="changed" handler="on_video_input_combobox_changed"/>
</widget>
<packing>
<property name="left_attach">1</property>
<property name="right_attach">2</property>
</packing>
</child>
<child>
<widget class="GtkComboBox" id="video_output_combobox">
<property name="visible">True</property>
<signal name="changed" handler="on_video_output_combobox_changed"/>
</widget>
<packing>
<property name="left_attach">1</property>
<property name="right_attach">2</property>
<property name="top_attach">1</property>
<property name="bottom_attach">2</property>
</packing>
</child>
</widget>
</child>
</widget>
</child>
<child>
<widget class="GtkLabel" id="label17">
<property name="visible">True</property>
<property name="label" translatable="yes">&lt;b&gt;Video&lt;/b&gt;</property>
<property name="use_markup">True</property>
</widget>
<packing>
<property name="type">label_item</property>
</packing>
</child>
</widget>
<packing>
<property name="expand">False</property>
<property name="position">1</property>
</packing>
</child>
<child>
<widget class="GtkFrame" id="frame7">
<property name="visible">True</property>
<property name="label_xalign">0</property>
<property name="shadow_type">none</property>
<child>
<widget class="GtkAlignment" id="alignment9">
<property name="visible">True</property>
<property name="left_padding">12</property>
<child>
<widget class="GtkTable" id="table9">
<property name="visible">True</property>
<property name="n_columns">4</property>
<property name="column_spacing">6</property>
<property name="row_spacing">6</property>
<child>
<widget class="GtkLabel" id="label24">
<property name="visible">True</property>
<property name="xalign">0</property>
<property name="label" translatable="yes">STUN server:</property>
</widget>
<packing>
<property name="x_options">GTK_FILL</property>
</packing>
</child>
<child>
<widget class="GtkLabel" id="label25">
<property name="visible">True</property>
<property name="label" translatable="yes">&lt;i&gt;(example: stunserver.org)&lt;/i&gt;</property>
<property name="use_markup">True</property>
</widget>
<packing>
<property name="left_attach">3</property>
<property name="right_attach">4</property>
<property name="x_options">GTK_FILL</property>
</packing>
</child>
<child>
<widget class="GtkEntry" id="stun_server_entry">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="tooltip" translatable="yes">STUN server hostname. If none given, Gajim will try
to discover one from server.</property>
<property name="invisible_char">&#x25CF;</property>
<signal name="changed" handler="stun_server_entry_changed"/>
</widget>
<packing>
<property name="left_attach">2</property>
<property name="right_attach">3</property>
</packing>
</child>
<child>
<widget class="GtkCheckButton" id="stun_checkbutton">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
<property name="draw_indicator">True</property>
<signal name="toggled" handler="on_stun_checkbutton_toggled"/>
</widget>
<packing>
<property name="left_attach">1</property>
<property name="right_attach">2</property>
<property name="x_options">GTK_FILL</property>
</packing>
</child>
</widget>
</child>
</widget>
</child>
<child>
<widget class="GtkLabel" id="label22">
<property name="visible">True</property>
<property name="label" translatable="yes">&lt;b&gt;Connection&lt;/b&gt;</property>
<property name="use_markup">True</property>
</widget>
<packing>
<property name="type">label_item</property>
</packing>
</child>
</widget>
<packing>
<property name="expand">False</property>
<property name="position">2</property>
</packing>
</child>
</widget>
<packing>
<property name="position">5</property>
</packing>
</child>
<child>
<widget class="GtkLabel" id="label15">
<property name="visible">True</property>
<property name="label" translatable="yes">Audio / Video</property>
</widget>
<packing>
<property name="position">5</property>
<property name="tab_fill">False</property>
<property name="type">tab</property>
</packing>
</child>
<child> <child>
<widget class="GtkVBox" id="vbox45"> <widget class="GtkVBox" id="vbox45">
<property name="visible">True</property> <property name="visible">True</property>
<property name="border_width">12</property> <property name="border_width">12</property>
<property name="orientation">vertical</property>
<property name="spacing">12</property> <property name="spacing">12</property>
<child> <child>
<widget class="GtkFrame" id="applications_frame"> <widget class="GtkFrame" id="applications_frame">
@ -1939,6 +2236,7 @@ $T will be replaced by auto-not-available timeout</property>
<child> <child>
<widget class="GtkVBox" id="vbox50"> <widget class="GtkVBox" id="vbox50">
<property name="visible">True</property> <property name="visible">True</property>
<property name="orientation">vertical</property>
<property name="spacing">6</property> <property name="spacing">6</property>
<child> <child>
<widget class="GtkComboBox" id="applications_combobox"> <widget class="GtkComboBox" id="applications_combobox">
@ -2109,7 +2407,7 @@ Custom</property>
<widget class="GtkTable" id="table3"> <widget class="GtkTable" id="table3">
<property name="visible">True</property> <property name="visible">True</property>
<property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property> <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
<property name="n_rows">3</property> <property name="n_rows">4</property>
<property name="column_spacing">6</property> <property name="column_spacing">6</property>
<property name="row_spacing">6</property> <property name="row_spacing">6</property>
<child> <child>
@ -2159,6 +2457,21 @@ Custom</property>
<property name="bottom_attach">3</property> <property name="bottom_attach">3</property>
</packing> </packing>
</child> </child>
<child>
<widget class="GtkCheckButton" id="send_idle_time_checkbutton">
<property name="label" translatable="yes">Allow my _idle time to be sent</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
<property name="use_underline">True</property>
<property name="draw_indicator">True</property>
<signal name="toggled" handler="on_allow_idle_time_checkbutton_toggled"/>
</widget>
<packing>
<property name="top_attach">3</property>
<property name="bottom_attach">4</property>
</packing>
</child>
</widget> </widget>
</child> </child>
</widget> </widget>
@ -2193,6 +2506,7 @@ Custom</property>
<child> <child>
<widget class="GtkVBox" id="vbox66"> <widget class="GtkVBox" id="vbox66">
<property name="visible">True</property> <property name="visible">True</property>
<property name="orientation">vertical</property>
<property name="spacing">6</property> <property name="spacing">6</property>
<child> <child>
<widget class="GtkCheckButton" id="log_show_changes_checkbutton"> <widget class="GtkCheckButton" id="log_show_changes_checkbutton">
@ -2324,7 +2638,7 @@ Custom</property>
</child> </child>
</widget> </widget>
<packing> <packing>
<property name="position">5</property> <property name="position">6</property>
</packing> </packing>
</child> </child>
<child> <child>
@ -2333,7 +2647,7 @@ Custom</property>
<property name="label" translatable="yes">Advanced</property> <property name="label" translatable="yes">Advanced</property>
</widget> </widget>
<packing> <packing>
<property name="position">5</property> <property name="position">6</property>
<property name="tab_fill">False</property> <property name="tab_fill">False</property>
<property name="type">tab</property> <property name="type">tab</property>
</packing> </packing>

View file

@ -1,362 +1,203 @@
<?xml version="1.0" standalone="no"?> <!--*- mode: xml -*--> <?xml version="1.0"?>
<!DOCTYPE glade-interface SYSTEM "http://glade.gnome.org/glade-2.0.dtd">
<glade-interface> <glade-interface>
<!-- interface-requires gtk+ 2.6 -->
<widget class="GtkWindow" id="xml_console_window"> <!-- interface-naming-policy toplevel-contextual -->
<widget class="GtkWindow" id="xml_console_window">
<property name="border_width">12</property> <property name="border_width">12</property>
<property name="title" translatable="yes"></property>
<property name="type">GTK_WINDOW_TOPLEVEL</property>
<property name="window_position">GTK_WIN_POS_NONE</property>
<property name="modal">False</property>
<property name="default_width">550</property> <property name="default_width">550</property>
<property name="default_height">450</property> <property name="default_height">450</property>
<property name="resizable">True</property> <signal name="delete_event" handler="on_xml_console_window_delete_event"/>
<property name="destroy_with_parent">False</property>
<property name="decorated">True</property>
<property name="skip_taskbar_hint">False</property>
<property name="skip_pager_hint">False</property>
<property name="type_hint">GDK_WINDOW_TYPE_HINT_NORMAL</property>
<property name="gravity">GDK_GRAVITY_NORTH_WEST</property>
<property name="focus_on_map">True</property>
<signal name="delete_event" handler="on_xml_console_window_delete_event" last_modification_time="Sat, 06 Aug 2005 00:03:05 GMT"/>
<child> <child>
<widget class="GtkVBox" id="vbox"> <widget class="GtkVBox" id="vbox">
<property name="visible">True</property> <property name="visible">True</property>
<property name="homogeneous">False</property>
<property name="spacing">6</property> <property name="spacing">6</property>
<child> <child>
<widget class="GtkLabel" id="label342"> <widget class="GtkLabel" id="label342">
<property name="visible">True</property> <property name="visible">True</property>
<property name="label" translatable="yes">&lt;b&gt;Jabber Traffic&lt;/b&gt;</property>
<property name="use_underline">False</property>
<property name="use_markup">True</property>
<property name="justify">GTK_JUSTIFY_LEFT</property>
<property name="wrap">False</property>
<property name="selectable">False</property>
<property name="xalign">0</property> <property name="xalign">0</property>
<property name="yalign">0.5</property> <property name="label" translatable="yes">&lt;b&gt;Jabber Traffic&lt;/b&gt;</property>
<property name="xpad">0</property> <property name="use_markup">True</property>
<property name="ypad">0</property>
<property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
<property name="width_chars">-1</property>
<property name="single_line_mode">False</property>
<property name="angle">0</property>
</widget> </widget>
<packing> <packing>
<property name="padding">0</property>
<property name="expand">False</property> <property name="expand">False</property>
<property name="fill">False</property> <property name="fill">False</property>
<property name="position">0</property>
</packing> </packing>
</child> </child>
<child> <child>
<widget class="GtkScrolledWindow" id="scrolledwindow43"> <widget class="GtkScrolledWindow" id="scrolledwindow43">
<property name="visible">True</property> <property name="visible">True</property>
<property name="can_focus">True</property> <property name="can_focus">True</property>
<property name="hscrollbar_policy">GTK_POLICY_AUTOMATIC</property> <property name="hscrollbar_policy">automatic</property>
<property name="vscrollbar_policy">GTK_POLICY_AUTOMATIC</property> <property name="vscrollbar_policy">automatic</property>
<property name="shadow_type">GTK_SHADOW_IN</property> <property name="shadow_type">in</property>
<property name="window_placement">GTK_CORNER_TOP_LEFT</property>
<child> <child>
<widget class="GtkTextView" id="stanzas_log_textview"> <widget class="GtkTextView" id="stanzas_log_textview">
<property name="visible">True</property> <property name="visible">True</property>
<property name="can_focus">True</property> <property name="can_focus">True</property>
<property name="editable">False</property> <property name="editable">False</property>
<property name="overwrite">False</property> <property name="wrap_mode">char</property>
<property name="accepts_tab">True</property>
<property name="justification">GTK_JUSTIFY_LEFT</property>
<property name="wrap_mode">GTK_WRAP_CHAR</property>
<property name="cursor_visible">True</property>
<property name="pixels_above_lines">0</property>
<property name="pixels_below_lines">0</property>
<property name="pixels_inside_wrap">0</property>
<property name="left_margin">0</property>
<property name="right_margin">0</property>
<property name="indent">0</property>
<property name="text" translatable="yes"></property>
</widget> </widget>
</child> </child>
</widget> </widget>
<packing> <packing>
<property name="padding">0</property> <property name="position">1</property>
<property name="expand">True</property>
<property name="fill">True</property>
</packing> </packing>
</child> </child>
<child> <child>
<widget class="GtkHBox" id="hbox2988"> <widget class="GtkHBox" id="hbox2988">
<property name="visible">True</property> <property name="visible">True</property>
<property name="homogeneous">False</property>
<property name="spacing">0</property>
<child> <child>
<widget class="GtkCheckButton" id="enable_checkbutton"> <widget class="GtkCheckButton" id="enable_checkbutton">
<property name="label" translatable="yes" comments="XML Console enable checkbutton">Enable</property>
<property name="visible">True</property> <property name="visible">True</property>
<property name="can_focus">True</property> <property name="can_focus">True</property>
<property name="label" translatable="yes" comments="XML Console enable checkbutton">Enable</property> <property name="receives_default">False</property>
<property name="use_underline">True</property> <property name="use_underline">True</property>
<property name="relief">GTK_RELIEF_NORMAL</property>
<property name="focus_on_click">True</property>
<property name="active">False</property>
<property name="inconsistent">False</property>
<property name="draw_indicator">True</property> <property name="draw_indicator">True</property>
<signal name="toggled" handler="on_enable_checkbutton_toggled" last_modification_time="Sat, 13 Aug 2005 14:36:52 GMT"/> <signal name="toggled" handler="on_enable_checkbutton_toggled"/>
</widget> </widget>
<packing> <packing>
<property name="padding">0</property>
<property name="expand">False</property> <property name="expand">False</property>
<property name="fill">False</property> <property name="fill">False</property>
<property name="position">0</property>
</packing> </packing>
</child> </child>
<child> <child>
<widget class="GtkLabel" id="label351"> <widget class="GtkLabel" id="label351">
<property name="visible">True</property> <property name="visible">True</property>
<property name="label" translatable="yes"></property>
<property name="use_underline">False</property>
<property name="use_markup">False</property>
<property name="justify">GTK_JUSTIFY_LEFT</property>
<property name="wrap">False</property>
<property name="selectable">False</property>
<property name="xalign">0.5</property>
<property name="yalign">0.5</property>
<property name="xpad">0</property>
<property name="ypad">0</property>
<property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
<property name="width_chars">-1</property>
<property name="single_line_mode">False</property>
<property name="angle">0</property>
</widget> </widget>
<packing> <packing>
<property name="padding">0</property> <property name="position">1</property>
<property name="expand">True</property>
<property name="fill">True</property>
</packing> </packing>
</child> </child>
<child> <child>
<widget class="GtkButton" id="clear_button"> <widget class="GtkButton" id="clear_button">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="label">gtk-clear</property> <property name="label">gtk-clear</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
<property name="use_stock">True</property> <property name="use_stock">True</property>
<property name="relief">GTK_RELIEF_NORMAL</property> <signal name="clicked" handler="on_clear_button_clicked"/>
<property name="focus_on_click">True</property>
<signal name="clicked" handler="on_clear_button_clicked" last_modification_time="Sat, 06 Aug 2005 00:20:16 GMT"/>
</widget> </widget>
<packing> <packing>
<property name="padding">0</property>
<property name="expand">False</property> <property name="expand">False</property>
<property name="fill">False</property> <property name="fill">False</property>
<property name="position">2</property>
</packing> </packing>
</child> </child>
</widget> </widget>
<packing> <packing>
<property name="padding">0</property>
<property name="expand">False</property> <property name="expand">False</property>
<property name="fill">False</property> <property name="fill">False</property>
<property name="position">2</property>
</packing> </packing>
</child> </child>
<child> <child>
<widget class="GtkExpander" id="expander"> <widget class="GtkExpander" id="expander1">
<property name="visible">True</property> <property name="visible">True</property>
<property name="can_focus">True</property> <property name="can_focus">True</property>
<property name="expanded">False</property>
<property name="spacing">6</property> <property name="spacing">6</property>
<signal name="activate" handler="on_expander_activate" last_modification_time="Mon, 04 Jul 2005 22:24:33 GMT"/>
<child> <child>
<widget class="GtkVBox" id="input_vbox"> <widget class="GtkVBox" id="input_vbox1">
<property name="visible">True</property> <property name="visible">True</property>
<property name="homogeneous">False</property> <property name="orientation">vertical</property>
<property name="spacing">6</property> <property name="spacing">6</property>
<child> <child>
<widget class="GtkScrolledWindow" id="scrolledwindow42"> <widget class="GtkHBox" id="hbox1">
<property name="visible">True</property>
<child>
<widget class="GtkCheckButton" id="in_stanza_checkbutton">
<property name="label" translatable="yes">Hide IN stanzas</property>
<property name="visible">True</property> <property name="visible">True</property>
<property name="can_focus">True</property> <property name="can_focus">True</property>
<property name="hscrollbar_policy">GTK_POLICY_NEVER</property> <property name="receives_default">False</property>
<property name="vscrollbar_policy">GTK_POLICY_NEVER</property> <property name="draw_indicator">True</property>
<property name="shadow_type">GTK_SHADOW_IN</property> <signal name="toggled" handler="on_in_stanza_checkbutton_toggled"/>
<property name="window_placement">GTK_CORNER_TOP_LEFT</property>
<child>
<widget class="GtkTextView" id="input_textview">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="editable">True</property>
<property name="overwrite">False</property>
<property name="accepts_tab">True</property>
<property name="justification">GTK_JUSTIFY_LEFT</property>
<property name="wrap_mode">GTK_WRAP_CHAR</property>
<property name="cursor_visible">True</property>
<property name="pixels_above_lines">0</property>
<property name="pixels_below_lines">0</property>
<property name="pixels_inside_wrap">0</property>
<property name="left_margin">0</property>
<property name="right_margin">0</property>
<property name="indent">0</property>
<property name="text" translatable="yes"></property>
</widget>
</child>
</widget> </widget>
<packing> <packing>
<property name="padding">0</property> <property name="position">0</property>
<property name="expand">True</property>
<property name="fill">True</property>
</packing> </packing>
</child> </child>
<child> <child>
<widget class="GtkHButtonBox" id="hbuttonbox31"> <widget class="GtkCheckButton" id="out_stanza_checkbutton">
<property name="visible">True</property> <property name="label" translatable="yes">Hide OUT stanzas</property>
<property name="layout_style">GTK_BUTTONBOX_END</property>
<property name="spacing">6</property>
<child>
<widget class="GtkButton" id="iq_button">
<property name="visible">True</property>
<property name="tooltip" translatable="yes" comments="Info/Query make the &quot;IQ&quot; initials. So translate like this 'YourLang/YourLang (Info/Query)'. Thanks (it's a tooltip so width is not a problem)">Info/Query</property>
<property name="can_focus">True</property>
<property name="label" translatable="yes" comments="Info/Query: all(?) jabber xml start with &lt;iq Leaving it _IQ is not a bad idea unless you are sure your lang has this somehow else translated (NOTE: xml still will still say &lt;iq in your language (of course))">_IQ</property>
<property name="use_underline">True</property>
<property name="relief">GTK_RELIEF_NORMAL</property>
<property name="focus_on_click">True</property>
<signal name="clicked" handler="on_iq_button_clicked" last_modification_time="Mon, 04 Jul 2005 19:35:55 GMT"/>
</widget>
</child>
<child>
<widget class="GtkButton" id="presence_button">
<property name="visible">True</property> <property name="visible">True</property>
<property name="can_focus">True</property> <property name="can_focus">True</property>
<property name="label" translatable="yes">_Presence</property> <property name="receives_default">False</property>
<property name="use_underline">True</property> <property name="draw_indicator">True</property>
<property name="relief">GTK_RELIEF_NORMAL</property> <signal name="toggled" handler="on_out_stanza_checkbutton_toggled"/>
<property name="focus_on_click">True</property>
<signal name="clicked" handler="on_presence_button_clicked" last_modification_time="Mon, 04 Jul 2005 19:36:08 GMT"/>
</widget>
</child>
<child>
<widget class="GtkButton" id="message_button">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="label" translatable="yes">_Message</property>
<property name="use_underline">True</property>
<property name="relief">GTK_RELIEF_NORMAL</property>
<property name="focus_on_click">True</property>
<signal name="clicked" handler="on_message_button_clicked" last_modification_time="Mon, 04 Jul 2005 19:36:21 GMT"/>
</widget>
</child>
<child>
<widget class="GtkButton" id="send_button">
<property name="visible">True</property>
<property name="can_default">True</property>
<property name="can_focus">True</property>
<property name="relief">GTK_RELIEF_NORMAL</property>
<property name="focus_on_click">True</property>
<signal name="clicked" handler="on_send_button_clicked" last_modification_time="Mon, 04 Jul 2005 19:36:26 GMT"/>
<child>
<widget class="GtkAlignment" id="alignment80">
<property name="visible">True</property>
<property name="xalign">0.5</property>
<property name="yalign">0.5</property>
<property name="xscale">0</property>
<property name="yscale">0</property>
<property name="top_padding">0</property>
<property name="bottom_padding">0</property>
<property name="left_padding">0</property>
<property name="right_padding">0</property>
<child>
<widget class="GtkHBox" id="hbox2980">
<property name="visible">True</property>
<property name="homogeneous">False</property>
<property name="spacing">2</property>
<child>
<widget class="GtkImage" id="image833">
<property name="visible">True</property>
<property name="stock">gtk-apply</property>
<property name="icon_size">4</property>
<property name="xalign">0.5</property>
<property name="yalign">0.5</property>
<property name="xpad">0</property>
<property name="ypad">0</property>
</widget> </widget>
<packing> <packing>
<property name="padding">0</property> <property name="position">1</property>
<property name="expand">False</property>
<property name="fill">False</property>
</packing> </packing>
</child> </child>
<child> <child>
<widget class="GtkLabel" id="label341"> <widget class="GtkCheckButton" id="presence_stanza_checkbutton">
<property name="label" translatable="yes">Hide Presence stanzas</property>
<property name="visible">True</property> <property name="visible">True</property>
<property name="label" translatable="yes">_Send</property> <property name="can_focus">True</property>
<property name="use_underline">True</property> <property name="receives_default">False</property>
<property name="use_markup">False</property> <property name="draw_indicator">True</property>
<property name="justify">GTK_JUSTIFY_LEFT</property> <signal name="toggled" handler="on_presence_stanza_checkbutton_toggled"/>
<property name="wrap">False</property>
<property name="selectable">False</property>
<property name="xalign">0.5</property>
<property name="yalign">0.5</property>
<property name="xpad">0</property>
<property name="ypad">0</property>
<property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
<property name="width_chars">-1</property>
<property name="single_line_mode">False</property>
<property name="angle">0</property>
</widget> </widget>
<packing> <packing>
<property name="padding">0</property> <property name="position">2</property>
<property name="expand">False</property> </packing>
<property name="fill">False</property> </child>
<child>
<widget class="GtkCheckButton" id="iq_stanza_checkbutton">
<property name="label" translatable="yes">Hide IQ stanzas</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
<property name="draw_indicator">True</property>
<signal name="toggled" handler="on_iq_stanza_checkbutton_toggled"/>
</widget>
<packing>
<property name="position">3</property>
</packing>
</child>
<child>
<widget class="GtkCheckButton" id="message_stanza_checkbutton">
<property name="label" translatable="yes">Hide Message stanzas</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
<property name="draw_indicator">True</property>
<signal name="toggled" handler="on_message_stanza_checkbutton_toggled"/>
</widget>
<packing>
<property name="position">4</property>
</packing>
</child>
</widget>
<packing>
<property name="position">0</property>
</packing>
</child>
<child>
<widget class="GtkHBox" id="hbox2">
<property name="visible">True</property>
<child>
<placeholder/>
</child>
<child>
<placeholder/>
</child>
</widget>
<packing>
<property name="position">1</property>
</packing> </packing>
</child> </child>
</widget> </widget>
</child> </child>
</widget>
</child>
</widget>
</child>
</widget>
<packing>
<property name="padding">0</property>
<property name="expand">False</property>
<property name="fill">False</property>
</packing>
</child>
</widget>
</child>
<child> <child>
<widget class="GtkLabel" id="label343"> <widget class="GtkLabel" id="label2">
<property name="visible">True</property> <property name="visible">True</property>
<property name="label" translatable="yes">&lt;b&gt;XML Input&lt;/b&gt;</property>
<property name="use_underline">False</property>
<property name="use_markup">True</property>
<property name="justify">GTK_JUSTIFY_LEFT</property>
<property name="wrap">False</property>
<property name="selectable">False</property>
<property name="xalign">0</property> <property name="xalign">0</property>
<property name="yalign">0.5</property> <property name="label" translatable="yes">&lt;b&gt;Filter&lt;/b&gt;</property>
<property name="xpad">0</property> <property name="use_markup">True</property>
<property name="ypad">0</property>
<property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
<property name="width_chars">-1</property>
<property name="single_line_mode">False</property>
<property name="angle">0</property>
</widget> </widget>
<packing> <packing>
<property name="type">label_item</property> <property name="type">label_item</property>
@ -364,13 +205,167 @@
</child> </child>
</widget> </widget>
<packing> <packing>
<property name="padding">0</property>
<property name="expand">False</property> <property name="expand">False</property>
<property name="fill">True</property> <property name="position">3</property>
</packing>
</child>
<child>
<widget class="GtkExpander" id="expander">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="spacing">6</property>
<signal name="activate" handler="on_expander_activate"/>
<child>
<widget class="GtkVBox" id="input_vbox">
<property name="visible">True</property>
<property name="spacing">6</property>
<child>
<widget class="GtkScrolledWindow" id="scrolledwindow42">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="hscrollbar_policy">never</property>
<property name="vscrollbar_policy">never</property>
<property name="shadow_type">in</property>
<child>
<widget class="GtkTextView" id="input_textview">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="wrap_mode">char</property>
</widget>
</child>
</widget>
<packing>
<property name="position">0</property>
</packing>
</child>
<child>
<widget class="GtkHButtonBox" id="hbuttonbox31">
<property name="visible">True</property>
<property name="spacing">6</property>
<property name="layout_style">end</property>
<child>
<widget class="GtkButton" id="iq_button">
<property name="label" translatable="yes" comments="Info/Query: all(?) jabber xml start with &lt;iq Leaving it _IQ is not a bad idea unless you are sure your lang has this somehow else translated (NOTE: xml still will still say &lt;iq in your language (of course))">_IQ</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
<property name="tooltip" translatable="yes" comments="Info/Query make the &quot;IQ&quot; initials. So translate like this 'YourLang/YourLang (Info/Query)'. Thanks (it's a tooltip so width is not a problem)">Info/Query</property>
<property name="use_underline">True</property>
<signal name="clicked" handler="on_iq_button_clicked"/>
</widget>
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
<property name="position">0</property>
</packing>
</child>
<child>
<widget class="GtkButton" id="presence_button">
<property name="label" translatable="yes">_Presence</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
<property name="use_underline">True</property>
<signal name="clicked" handler="on_presence_button_clicked"/>
</widget>
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
<property name="position">1</property>
</packing>
</child>
<child>
<widget class="GtkButton" id="message_button">
<property name="label" translatable="yes">_Message</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
<property name="use_underline">True</property>
<signal name="clicked" handler="on_message_button_clicked"/>
</widget>
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
<property name="position">2</property>
</packing>
</child>
<child>
<widget class="GtkButton" id="send_button">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="can_default">True</property>
<property name="receives_default">False</property>
<signal name="clicked" handler="on_send_button_clicked"/>
<child>
<widget class="GtkAlignment" id="alignment80">
<property name="visible">True</property>
<property name="xscale">0</property>
<property name="yscale">0</property>
<child>
<widget class="GtkHBox" id="hbox2980">
<property name="visible">True</property>
<property name="spacing">2</property>
<child>
<widget class="GtkImage" id="image833">
<property name="visible">True</property>
<property name="stock">gtk-apply</property>
</widget>
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
<property name="position">0</property>
</packing>
</child>
<child>
<widget class="GtkLabel" id="label341">
<property name="visible">True</property>
<property name="label" translatable="yes">_Send</property>
<property name="use_underline">True</property>
</widget>
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
<property name="position">1</property>
</packing> </packing>
</child> </child>
</widget> </widget>
</child> </child>
</widget> </widget>
</child>
</widget>
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
<property name="position">3</property>
</packing>
</child>
</widget>
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
<property name="position">1</property>
</packing>
</child>
</widget>
</child>
<child>
<widget class="GtkLabel" id="label343">
<property name="visible">True</property>
<property name="xalign">0</property>
<property name="label" translatable="yes">&lt;b&gt;XML Input&lt;/b&gt;</property>
<property name="use_markup">True</property>
</widget>
<packing>
<property name="type">label_item</property>
</packing>
</child>
</widget>
<packing>
<property name="expand">False</property>
<property name="position">4</property>
</packing>
</child>
</widget>
</child>
</widget>
</glade-interface> </glade-interface>

View file

@ -1,39 +1,10 @@
iconsetdir = $(pkgdatadir)/data/iconsets iconsetdir = $(pkgdatadir)/data/iconsets
nobase_dist_iconset_DATA = \
iconset_DATA = $(srcdir)/*/16x16/* \
$(srcdir)/*/32x32/* \
ICONSET_DIRS = **/{16x16,32x32,48x48} \ $(srcdir)/*/48x48/* \
transports/**/{16x16,32x32,48x48} $(srcdir)/transports/*/16x16/* \
$(srcdir)/transports/*/32x32/* \
ICONSET_FILES = **/{16x16,32x32,48x48}/{*.gif,*.png} \ $(srcdir)/transports/*/48x48/*
transports/**/{16x16,32x32,48x48}/{*.gif,*.png}
install-data-local:
@for d in $$(cd $(srcdir); echo $(ICONSET_DIRS));do \
if test -d $(srcdir)/$$d;then \
echo " $(mkinstalldirs) $(DESTDIR)$(pkgdatadir)/data/iconsets/$$d"; \
$(mkinstalldirs) $(DESTDIR)$(pkgdatadir)/data/iconsets/$$d || exit 1; \
fi; \
done
for f in $$(cd $(srcdir); echo $(ICONSET_FILES));do \
if test -f $(srcdir)/$$f; then \
echo " $(INSTALL_DATA) $(srcdir)/$$f $(DESTDIR)$(pkgdatadir)/data/iconsets/$$f"; \
$(INSTALL_DATA) $(srcdir)/$$f $(DESTDIR)$(pkgdatadir)/data/iconsets/$$f || exit 1; \
fi; \
done;
dist-hook:
@for d in $$(cd $(srcdir); echo $(ICONSET_DIRS));do \
if test -d $(srcdir)/$$d;then \
echo " $(mkdir_p) $(distdir)/$$d"; \
$(mkdir_p) $(distdir)/$$d || exit 1; \
fi; \
done
for f in $$(cd $(srcdir); echo $(ICONSET_FILES));do \
if test -f $(srcdir)/$$f; then \
echo " cp -pR $(srcdir)/$$f $(distdir)/$$f"; \
cp -pR $(srcdir)/$$f $(distdir)/$$f || exit 1; \
fi; \
done;
MAINTAINERCLEANFILES = Makefile.in MAINTAINERCLEANFILES = Makefile.in

Binary file not shown.

Before

Width:  |  Height:  |  Size: 3.7 KiB

View file

@ -1,38 +1,4 @@
moodsdir = $(pkgdatadir)/data/moods moodsdir = $(pkgdatadir)/data/moods
nobase_dist_moods_DATA = $(srcdir)/*/*
moods_DATA =
MOODS_DIRS = **
MOODS_FILES = **/{*.png,*.gif}
install-data-local:
@for d in $$(cd $(srcdir); echo $(MOODS_DIRS));do \
if test -d $(srcdir)/$$d;then \
echo " $(mkinstalldirs) $(DESTDIR)$(pkgdatadir)/data/moods/$$d"; \
$(mkinstalldirs) $(DESTDIR)$(pkgdatadir)/data/moods/$$d || exit 1; \
fi; \
done; \
for f in $$(cd $(srcdir); echo $(MOODS_FILES));do \
if test -f $(srcdir)/$$f; then \
echo " $(INSTALL_DATA) $(srcdir)/$$f $(DESTDIR)$(pkgdatadir)/data/moods/$$f"; \
$(INSTALL_DATA) $(srcdir)/$$f $(DESTDIR)$(pkgdatadir)/data/moods/$$f || exit 1; \
fi; \
done;
dist-hook:
@for d in $$(cd $(srcdir); echo $(MOODS_DIRS));do \
if test -d $(srcdir)/$$d;then \
echo " $(mkdir_p) $(distdir)/$$d"; \
$(mkdir_p) $(distdir)/$$d || exit 1; \
fi; \
done; \
for f in $$(cd $(srcdir); echo $(MOODS_FILES));do \
if test -f $(srcdir)/$$f; then \
echo " cp -pR $(srcdir)/$$f $(distdir)/$$f"; \
cp -pR $(srcdir)/$$f $(distdir)/$$f || exit 1; \
fi; \
done;
MAINTAINERCLEANFILES = Makefile.in MAINTAINERCLEANFILES = Makefile.in

View file

@ -1,19 +1,5 @@
pixmapsdir = $(pkgdatadir)/data/pixmaps pixmapsdir = $(pkgdatadir)/data/pixmaps
pixmaps_DATA = $(srcdir)/*.png \ nobase_dist_pixmaps_DATA = \
gajim.svg \ $(srcdir)/gajim.ico
gajim.ico
pixmapseventsdir = $(pkgdatadir)/data/pixmaps/events
pixmapsevents_DATA = $(srcdir)/events/*.png
pixmapsagentsdir = $(pkgdatadir)/data/pixmaps/agents
pixmapsagents_DATA = $(srcdir)/agents/*.png
EXTRA_DIST = $(pixmaps_DATA) $(pixmapsevents_DATA) $(pixmapsagents_DATA)
gajimpixmapdir = $(datadir)/pixmaps
gajimpixmap_DATA = gajim.png \
gajim.svg \
gajim_about.png
MAINTAINERCLEANFILES = Makefile.in MAINTAINERCLEANFILES = Makefile.in

Binary file not shown.

Binary file not shown.

Before

Width:  |  Height:  |  Size: 594 B

34
debian/changelog vendored
View file

@ -1,3 +1,37 @@
gajim (0.13.1-1) unstable; urgency=low
* New upstream release. Closes: #559905
* Update PyGTK requirement to 2.12.0 minimum
* Fix filetransfer proxies testing, keepalive handling, memory leak.
Closes: #524514
* Better connection. Closes: #547267
* Fix proxy test on startup. Closes: #453910
* Fix sound playing. Closes: #527275
* Update debhelper compatibility level to 7
-- Yann Leboulanger <asterix@lagaule.org> Sun, 29 Nov 2009 01:21:04 +0100
gajim (0.12.5-1) unstable; urgency=low
* New upstream release which fixes file transfer. Closes: #544466
* Fix history manager. Closes: #539109
* Fix custom host / port usage. Closes: #539267
* update python-gnome* dependancies. Closes: #541553
-- Yann Leboulanger <asterix@lagaule.org> Sun, 08 Aug 2009 00:06:15 +0100
gajim (0.12.3-1) unstable; urgency=low
* New upstream release.
* OS info are now caches. Closes: #509675
* keepalive system has been improved. Closes: #521144
* Recommends python-crypto for encryption. Closes: #513892
* update to 3.8.2 Debian Policy
* update to debhelper V6
* added watch file
-- Yann Leboulanger <asterix@lagaule.org> Sun, 24 Jun 2009 20:46:15 +0100
gajim (0.12.1-1) unstable; urgency=low gajim (0.12.1-1) unstable; urgency=low
* New upstream release. * New upstream release.

2
debian/compat vendored
View file

@ -1 +1 @@
4 7

16
debian/control vendored
View file

@ -1,21 +1,21 @@
Source: gajim Source: gajim
Section: net Section: net
Priority: optional Priority: optional
Maintainer: Yann Le Boulanger <asterix@lagaule.org> Maintainer: Yann Leboulanger <asterix@lagaule.org>
Build-Depends: debhelper (>= 5.0.37.2), cdbs (>= 0.4.43), python-support (>= 0.7.1), python-dev, libgtk2.0-dev, python-gtk2-dev, libgtkspell-dev, gettext (>= 0.17-4), libxss-dev, intltool (>= 0.40.1), imagemagick, python-central (>= 0.5), libdbus-1-dev Build-Depends: debhelper (>= 7), cdbs (>= 0.4.43), python-support (>= 0.7.1), python-dev, libgtk2.0-dev, python-gtk2-dev, gettext (>= 0.17-4), intltool (>= 0.40.1), imagemagick, python-central (>= 0.5)
Build-Conflicts: python2.3 Build-Conflicts: python2.3
XS-Python-Version: >= 2.4 XS-Python-Version: >= 2.4
Standards-Version: 3.7.3 Standards-Version: 3.8.3
Homepage: http://www.gajim.org Homepage: http://www.gajim.org
Vcs-Svn: svn://svn.gajim.org/gajim/ Vcs-Hg: http://hg.gajim.org/gajim/
Vcs-Browser: http://trac.gajim.org/browser Vcs-Browser: http://hg.gajim.org/gajim/file
Package: gajim Package: gajim
Architecture: any Architecture: any
XB-Python-Version: ${python:Versions} XB-Python-Version: ${python:Versions}
Depends: python (>= 2.4), python-support (>= 0.7.1), python-glade2 (>= 2.8.0), python-gtk2 (>= 2.12.0), python-pysqlite2 | python (>= 2.5), dnsutils, libc6 Depends: ${misc:Depends}, ${shlibs:Depends}, ${python:Depends}, python-support (>= 0.7.1), python-glade2 (>= 2.12.0), python-gtk2 (>= 2.12.0), dnsutils
Recommends: dbus, python-dbus, notification-daemon, python-gnupginterface, python-openssl Recommends: dbus, python-dbus, notification-daemon, python-gnupginterface, python-openssl, python-crypto
Suggests: python-gnome2, nautilus-sendto, avahi-daemon, python-avahi, network-manager, libgtkspell0, aspell-en, python-gnome2-desktop (>= 2.16.0), gnome-keyring, python-sexy, python-kerberos (>= 1.1) Suggests: python-gconf, python-gnome2, nautilus-sendto, avahi-daemon, python-avahi, network-manager, libgtkspell0, aspell-en, python-gnomekeyring, gnome-keyring, python-kerberos (>= 1.1), texlive-latex-base, dvipng
Description: Jabber client written in PyGTK Description: Jabber client written in PyGTK
Gajim is a Jabber client. It has a tabbed user interface with normal chats, Gajim is a Jabber client. It has a tabbed user interface with normal chats,
group chats, and has many features such as, TLS, GPG, SSL, multiple accounts, group chats, and has many features such as, TLS, GPG, SSL, multiple accounts,

8
debian/copyright vendored
View file

@ -2,12 +2,12 @@ This package was debianized by Yann Leboulanger asterix@lagaule.org on
Wed, 16 Jun 2005 20:00:00 +0100. Wed, 16 Jun 2005 20:00:00 +0100.
It was downloaded from: It was downloaded from:
http://www.gajim.org/downloads/gajim-0.11.0.tar.gz http://www.gajim.org/downloads/
Upstream Authors: Upstream Authors:
- Yann Le Boulanger <asterix@lagaule.org> - Yann Le Boulanger <asterix@lagaule.org>
- Dimitur Kirov <dkirov@gmail.com> - Jean-Marie Traissard <jim@lapin.org>
- Travis Shirk <travis@pobox.com> - Stephan Erb <steve-e@h3c.de>
Copyright: (c) 2003-2009 Gajim Team Copyright: (c) 2003-2009 Gajim Team
@ -22,7 +22,7 @@ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details. GNU General Public License for more details.
You should have received a copy of the GNU General Public License You should have received a copy of the GNU General Public License
along with Debian system; see the file /usr/share/common-licenses/GPL. If not, along with Debian system; see the file /usr/share/common-licenses/GPL-3. If not,
write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
Boston, MA 02110-1301, USA. Boston, MA 02110-1301, USA.

View file

@ -1 +0,0 @@
gajim binary: script-not-executable

View file

@ -1 +1,3 @@
data/gajim.1 data/gajim.1
data/gajim-remote.1
debian/gajim-history-manager.1

1
debian/rules vendored
View file

@ -16,4 +16,3 @@ binary-install/gajim::
rm $(DEB_DESTDIR)/usr/share/gajim/src/common/GnuPGInterface.py* rm $(DEB_DESTDIR)/usr/share/gajim/src/common/GnuPGInterface.py*
dh_pysupport -pgajim dh_pysupport -pgajim
convert $(DEB_DESTDIR)/usr/share/pixmaps/gajim.png -resize 32x32 $(DEB_DESTDIR)/usr/share/pixmaps/gajim.xpm convert $(DEB_DESTDIR)/usr/share/pixmaps/gajim.png -resize 32x32 $(DEB_DESTDIR)/usr/share/pixmaps/gajim.xpm
install -m 0644 debian/gajim.lintian $(DEB_DESTDIR)/usr/share/lintian/overrides/gajim

7
icons/Makefile.am Normal file
View file

@ -0,0 +1,7 @@
iconsdir = $(pkgdatadir)/icons
nobase_dist_icons_DATA = $(srcdir)/*/*/*/*
systemiconsdir = $(datadir)/icons
nobase_dist_systemicons_DATA = $(srcdir)/*/*/*/gajim.*
MAINTAINERCLEANFILES = Makefile.in

View file

Before

Width:  |  Height:  |  Size: 11 KiB

After

Width:  |  Height:  |  Size: 11 KiB

View file

Before

Width:  |  Height:  |  Size: 988 B

After

Width:  |  Height:  |  Size: 988 B

View file

Before

Width:  |  Height:  |  Size: 963 B

After

Width:  |  Height:  |  Size: 963 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.1 KiB

View file

Before

Width:  |  Height:  |  Size: 189 B

After

Width:  |  Height:  |  Size: 189 B

View file

Before

Width:  |  Height:  |  Size: 788 B

After

Width:  |  Height:  |  Size: 788 B

View file

Before

Width:  |  Height:  |  Size: 773 B

After

Width:  |  Height:  |  Size: 773 B

View file

Before

Width:  |  Height:  |  Size: 209 B

After

Width:  |  Height:  |  Size: 209 B

View file

Before

Width:  |  Height:  |  Size: 353 B

After

Width:  |  Height:  |  Size: 353 B

View file

Before

Width:  |  Height:  |  Size: 790 B

After

Width:  |  Height:  |  Size: 790 B

View file

Before

Width:  |  Height:  |  Size: 844 B

After

Width:  |  Height:  |  Size: 844 B

View file

Before

Width:  |  Height:  |  Size: 780 B

After

Width:  |  Height:  |  Size: 780 B

View file

Before

Width:  |  Height:  |  Size: 1.5 KiB

After

Width:  |  Height:  |  Size: 1.5 KiB

View file

Before

Width:  |  Height:  |  Size: 1.7 KiB

After

Width:  |  Height:  |  Size: 1.7 KiB

View file

Before

Width:  |  Height:  |  Size: 994 B

After

Width:  |  Height:  |  Size: 994 B

View file

Before

Width:  |  Height:  |  Size: 874 B

After

Width:  |  Height:  |  Size: 874 B

View file

Before

Width:  |  Height:  |  Size: 1.3 KiB

After

Width:  |  Height:  |  Size: 1.3 KiB

View file

Before

Width:  |  Height:  |  Size: 1 KiB

After

Width:  |  Height:  |  Size: 1 KiB

View file

Before

Width:  |  Height:  |  Size: 1.7 KiB

After

Width:  |  Height:  |  Size: 1.7 KiB

View file

Before

Width:  |  Height:  |  Size: 2 KiB

After

Width:  |  Height:  |  Size: 2 KiB

View file

Before

Width:  |  Height:  |  Size: 2.2 KiB

After

Width:  |  Height:  |  Size: 2.2 KiB

View file

Before

Width:  |  Height:  |  Size: 1.5 KiB

After

Width:  |  Height:  |  Size: 1.5 KiB

Some files were not shown because too many files have changed in this diff Show more