diff --git a/AUTHORS b/AUTHORS
index 29f8040f0..3fc67833e 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -1,11 +1,12 @@
CURRENT DEVELOPERS:
Yann Le Boulanger (asterix AT lagaule.org)
+Nikos Kouremenos (kourem AT gmail.com)
Dimitur Kirov (dkirov AT gmail.com)
Travis Shirk (travis AT pobox.com)
Jean-Marie Traissard (jim AT lapin.org)
+Stefan Bethge (stefan AT lanpartei.de)
PAST DEVELOPERS:
Vincent Hanquez (tab AT snarc.org)
-Nikos Kouremenos (kourem AT gmail.com)
diff --git a/Changelog b/ChangeLog
similarity index 69%
rename from Changelog
rename to ChangeLog
index 7856b930b..96cf04df1 100644
--- a/Changelog
+++ b/ChangeLog
@@ -1,14 +1,53 @@
+Gajim 0.11 (XX October 2006)
+ * New build system, using GNU autotools. See README.html
+ * Support for link-local messaging via Zeroconf using Avahi (XEP-0174)
+ * Automatically connect and disconnect to accounts according to network availability (if Network Manager is present)
+ * GNOME Keyring Support (if GNOME keyring is available, manage passwords and save them in an encrypted file).
+ * Introducing View Menu (GNOME HIG)
+ * Ability to now hide the Transports group
+ * Support for notify-python. So if notification-daemon is not available, we still can show cool popups
+ * Connection lost is now a non-intrusive popup
+ * Try to get contact desired nick when we add him to roster aka User Nickname (XEP-0172)
+ * Support for Privacy Lists (XEP-0016)
+ * Better design of User Profile window, with a progress bar
+ * New Add User dialog, with possibility to register to transport directly from it
+ * Completion for "Start Chat" input dialog
+ * Ability to have a different spellchecking language in each chat window. (#2383 and #746)
+ * Forbid to run multiple instances (but you can use differents profiles)
+ * Ability to save avatar with right click on avatar in chat banner
+ * Annotations (XEP-0145)
+ * XHTML Support
+ * Rhythmbox song change notification
+ * Ability to operate on more than one contact at once in roster (#1514)
+ * Send single message to a whole group
+ * Delete a whole group
+ * Gajim now remembers if GPG encyption was enabled per contact
+ * Priority can be changed automatically when we change status
+ * Fuzzyclock support
+ * Mute sounds from systray menu
+ * Add possibility to start a chat or see contact's infos from subscription request window
+ * Use GnomeKeyring to store passwords if possible
+ * Use different colors for each participant in groupchats
+ * Ability to show only Join/Leave in groupchats instead of all status changes
+ * New possibilities to insert nickname of a participant in groupchat conversations: Tab in an empty line now cycles through nicks, maj+right click->inserts nickname, maj+click on name in gc-roster, /names command to show all users presence
+ * Fixed bugs when removing or renaming an account with tabs open (#2369 and #2370)
+ * New translations: Croatian, Esperanto
+
+ * FIXME : Ad-Hoc for 0.11 ?
+ * FIXME : does that work ? not tested : Metacontacts across accounts (#1596)
+ * Gajim now requires Python 2.4 to run
+
Gajim 0.10.1 (06 June 2006)
- * freeze and lost contacts in roster (#1953)
- * popup menus are correctly placed
- * high CPU usage on FreeBSD (#1963)
- * nickname can contain '|' (#1913)
- * update pl, cs, fr translations
- * don't play sound, when no event is shown (#1970)
- * set gajim icon for history manager
+ * Freeze and lost contacts in roster (#1953)
+ * Popup menus are correctly placed
+ * High CPU usage on FreeBSD (#1963)
+ * Nickname can contain '|' (#1913)
+ * Update pl, cs, fr translations
+ * Don't play sound when no event is shown (#1970)
+ * Set gajim icon for history manager
* gajim.desktop is generated with translation (#834)
- * preventing several TBs and annoyances (r6273, r6275, r6279, r6301,
+ * Preventing several TBs and annoyances (r6273, r6275, r6279, r6301,
r6308, r6311, r6323, r6326, r6327, r6335, r6342, r6346, r6348)
Gajim 0.10 (01 May 2006)
diff --git a/INSTALL b/INSTALL
new file mode 100644
index 000000000..23e5f25d0
--- /dev/null
+++ b/INSTALL
@@ -0,0 +1,236 @@
+Installation Instructions
+*************************
+
+Copyright (C) 1994, 1995, 1996, 1999, 2000, 2001, 2002, 2004, 2005 Free
+Software Foundation, Inc.
+
+This file is free documentation; the Free Software Foundation gives
+unlimited permission to copy, distribute and modify it.
+
+Basic Installation
+==================
+
+These are generic installation instructions.
+
+ The `configure' shell script attempts to guess correct values for
+various system-dependent variables used during compilation. It uses
+those values to create a `Makefile' in each directory of the package.
+It may also create one or more `.h' files containing system-dependent
+definitions. Finally, it creates a shell script `config.status' that
+you can run in the future to recreate the current configuration, and a
+file `config.log' containing compiler output (useful mainly for
+debugging `configure').
+
+ It can also use an optional file (typically called `config.cache'
+and enabled with `--cache-file=config.cache' or simply `-C') that saves
+the results of its tests to speed up reconfiguring. (Caching is
+disabled by default to prevent problems with accidental use of stale
+cache files.)
+
+ If you need to do unusual things to compile the package, please try
+to figure out how `configure' could check whether to do them, and mail
+diffs or instructions to the address given in the `README' so they can
+be considered for the next release. If you are using the cache, and at
+some point `config.cache' contains results you don't want to keep, you
+may remove or edit it.
+
+ The file `configure.ac' (or `configure.in') is used to create
+`configure' by a program called `autoconf'. You only need
+`configure.ac' if you want to change it or regenerate `configure' using
+a newer version of `autoconf'.
+
+The simplest way to compile this package is:
+
+ 1. `cd' to the directory containing the package's source code and type
+ `./configure' to configure the package for your system. If you're
+ using `csh' on an old version of System V, you might need to type
+ `sh ./configure' instead to prevent `csh' from trying to execute
+ `configure' itself.
+
+ Running `configure' takes awhile. While running, it prints some
+ messages telling which features it is checking for.
+
+ 2. Type `make' to compile the package.
+
+ 3. Optionally, type `make check' to run any self-tests that come with
+ the package.
+
+ 4. Type `make install' to install the programs and any data files and
+ documentation.
+
+ 5. You can remove the program binaries and object files from the
+ source code directory by typing `make clean'. To also remove the
+ files that `configure' created (so you can compile the package for
+ a different kind of computer), type `make distclean'. There is
+ also a `make maintainer-clean' target, but that is intended mainly
+ for the package's developers. If you use it, you may have to get
+ all sorts of other programs in order to regenerate files that came
+ with the distribution.
+
+Compilers and Options
+=====================
+
+Some systems require unusual options for compilation or linking that the
+`configure' script does not know about. Run `./configure --help' for
+details on some of the pertinent environment variables.
+
+ You can give `configure' initial values for configuration parameters
+by setting variables in the command line or in the environment. Here
+is an example:
+
+ ./configure CC=c89 CFLAGS=-O2 LIBS=-lposix
+
+ *Note Defining Variables::, for more details.
+
+Compiling For Multiple Architectures
+====================================
+
+You can compile the package for more than one kind of computer at the
+same time, by placing the object files for each architecture in their
+own directory. To do this, you must use a version of `make' that
+supports the `VPATH' variable, such as GNU `make'. `cd' to the
+directory where you want the object files and executables to go and run
+the `configure' script. `configure' automatically checks for the
+source code in the directory that `configure' is in and in `..'.
+
+ If you have to use a `make' that does not support the `VPATH'
+variable, you have to compile the package for one architecture at a
+time in the source code directory. After you have installed the
+package for one architecture, use `make distclean' before reconfiguring
+for another architecture.
+
+Installation Names
+==================
+
+By default, `make install' installs the package's commands under
+`/usr/local/bin', include files under `/usr/local/include', etc. You
+can specify an installation prefix other than `/usr/local' by giving
+`configure' the option `--prefix=PREFIX'.
+
+ You can specify separate installation prefixes for
+architecture-specific files and architecture-independent files. If you
+pass the option `--exec-prefix=PREFIX' to `configure', the package uses
+PREFIX as the prefix for installing programs and libraries.
+Documentation and other data files still use the regular prefix.
+
+ In addition, if you use an unusual directory layout you can give
+options like `--bindir=DIR' to specify different values for particular
+kinds of files. Run `configure --help' for a list of the directories
+you can set and what kinds of files go in them.
+
+ If the package supports it, you can cause programs to be installed
+with an extra prefix or suffix on their names by giving `configure' the
+option `--program-prefix=PREFIX' or `--program-suffix=SUFFIX'.
+
+Optional Features
+=================
+
+Some packages pay attention to `--enable-FEATURE' options to
+`configure', where FEATURE indicates an optional part of the package.
+They may also pay attention to `--with-PACKAGE' options, where PACKAGE
+is something like `gnu-as' or `x' (for the X Window System). The
+`README' should mention any `--enable-' and `--with-' options that the
+package recognizes.
+
+ For packages that use the X Window System, `configure' can usually
+find the X include and library files automatically, but if it doesn't,
+you can use the `configure' options `--x-includes=DIR' and
+`--x-libraries=DIR' to specify their locations.
+
+Specifying the System Type
+==========================
+
+There may be some features `configure' cannot figure out automatically,
+but needs to determine by the type of machine the package will run on.
+Usually, assuming the package is built to be run on the _same_
+architectures, `configure' can figure that out, but if it prints a
+message saying it cannot guess the machine type, give it the
+`--build=TYPE' option. TYPE can either be a short name for the system
+type, such as `sun4', or a canonical name which has the form:
+
+ CPU-COMPANY-SYSTEM
+
+where SYSTEM can have one of these forms:
+
+ OS KERNEL-OS
+
+ See the file `config.sub' for the possible values of each field. If
+`config.sub' isn't included in this package, then this package doesn't
+need to know the machine type.
+
+ If you are _building_ compiler tools for cross-compiling, you should
+use the option `--target=TYPE' to select the type of system they will
+produce code for.
+
+ If you want to _use_ a cross compiler, that generates code for a
+platform different from the build platform, you should specify the
+"host" platform (i.e., that on which the generated programs will
+eventually be run) with `--host=TYPE'.
+
+Sharing Defaults
+================
+
+If you want to set default values for `configure' scripts to share, you
+can create a site shell script called `config.site' that gives default
+values for variables like `CC', `cache_file', and `prefix'.
+`configure' looks for `PREFIX/share/config.site' if it exists, then
+`PREFIX/etc/config.site' if it exists. Or, you can set the
+`CONFIG_SITE' environment variable to the location of the site script.
+A warning: not all `configure' scripts look for a site script.
+
+Defining Variables
+==================
+
+Variables not defined in a site shell script can be set in the
+environment passed to `configure'. However, some packages may run
+configure again during the build, and the customized values of these
+variables may be lost. In order to avoid this problem, you should set
+them in the `configure' command line, using `VAR=value'. For example:
+
+ ./configure CC=/usr/local2/bin/gcc
+
+causes the specified `gcc' to be used as the C compiler (unless it is
+overridden in the site shell script). Here is a another example:
+
+ /bin/bash ./configure CONFIG_SHELL=/bin/bash
+
+Here the `CONFIG_SHELL=/bin/bash' operand causes subsequent
+configuration-related scripts to be executed by `/bin/bash'.
+
+`configure' Invocation
+======================
+
+`configure' recognizes the following options to control how it operates.
+
+`--help'
+`-h'
+ Print a summary of the options to `configure', and exit.
+
+`--version'
+`-V'
+ Print the version of Autoconf used to generate the `configure'
+ script, and exit.
+
+`--cache-file=FILE'
+ Enable the cache: use and save the results of the tests in FILE,
+ traditionally `config.cache'. FILE defaults to `/dev/null' to
+ disable caching.
+
+`--config-cache'
+`-C'
+ Alias for `--cache-file=config.cache'.
+
+`--quiet'
+`--silent'
+`-q'
+ Do not print messages saying which checks are being made. To
+ suppress all normal output, redirect it to `/dev/null' (any error
+ messages will still be shown).
+
+`--srcdir=DIR'
+ Look for the package's source code in directory DIR. Usually
+ `configure' can determine that directory automatically.
+
+`configure' also accepts some other, not widely useful, options. Run
+`configure --help' for more details.
+
diff --git a/Makefile b/Makefile
deleted file mode 100644
index 45d58fa35..000000000
--- a/Makefile
+++ /dev/null
@@ -1,165 +0,0 @@
-VERSION ?= 0.10
-
-GAJIM_AP = 0 # do we build Autopackage?
-
-MODULES = src src/common po
-PREFIX = /usr/local
-PYTHON = python
-DESTDIR =
-OPTFLAGS =
-export OPTFLAGS
-LIBDIR = /lib
-export LIBDIR
-MANDIR = $(DESTDIR)$(PREFIX)/share/man
-
-FIND = find . \( -name '*.glade' -o -name '*.py' -o -name '*.xpm' -o -name '*.gif' -o -name '*.png' -o -name '*.wav' -o -name '*.xml' \)
-
-FILES = `$(FIND)`
-DIRS = `$(FIND) -exec dirname {} \; | sort -u`
-FIND_PO = find ./po \( -name '*.mo' \)
-FILES_PO = `$(FIND_PO) | sed -e 's/^\.\/po/\./g'`
-DIRS_PO = `$(FIND_PO) -exec dirname {} \; | sort -u | sed -e 's/^\.\/po/\./g'`
-FIND_LIB = find . -name '*.so'
-FILES_LIB = `$(FIND_LIB)`
-
-SCRIPTS = \
- scripts/gajim \
- scripts/gajim-remote \
-
-all: translation trayicon gtkspell idle gajim.desktop
-
-translation:
- ${MAKE} -C po all
-
-trayicon:
- ${MAKE} -C src trayicon.so;
-
-gtkspell:
- ${MAKE} -C src gtkspell.so;
-
-idle:
- ${MAKE} -C src/common all;
-
-distclean: clean
- -rm ./tags
-
-clean:
- find . -name '*.pyc' -exec rm {} \;
- find . -name '*.pyo' -exec rm {} \;
- ${MAKE} -C po clean
- rm -f gajim.desktop
- $(foreach sdir, $(MODULES), ${MAKE} -C $(sdir) clean;)
-dist:
- rm -rf gajim-$(VERSION)
- mkdir gajim-$(VERSION)
- cp -r data src po gajim-$(VERSION)/
- cp AUTHORS gajim.1 gajim-remote.1 gajim.desktop.in COPYING THANKS Makefile Changelog README launch.sh gajim-$(VERSION)
- mkdir gajim-$(VERSION)/scripts
- for s in $(SCRIPTS) ; do \
- cp $$s gajim-$(VERSION)/scripts/; \
- done
- find gajim-$(VERSION) -name '.svn' -type d | xargs rm -rf
- find gajim-$(VERSION) -name '*.pyc' -exec rm {} \;
- find gajim-$(VERSION) -name '*.pyo' -exec rm {} \;
- find gajim-$(VERSION) -name '.*' -exec rm {} \;
- @echo tarring gajim-$(VERSION) ...
- @tar czf gajim-$(VERSION).tar.gz gajim-$(VERSION)/
- @tar cjf gajim-$(VERSION).tar.bz2 gajim-$(VERSION)/
- rm -rf gajim-$(VERSION)
-
-install:
- # Remove the old po folder if it exists
- if [ -d $(DESTDIR)$(PREFIX)/share/gajim/po ] ; then \
- rm -rf $(DESTDIR)$(PREFIX)/share/gajim/po; \
- fi
- for d in $(DIRS) ; do \
- if [ ! -d $(DESTDIR)$(PREFIX)/share/gajim/$$d ] ; then \
- mkdir -p "$(DESTDIR)$(PREFIX)/share/gajim/$$d"; \
- fi; \
- done
- for f in $(FILES) ; do \
- DST=`dirname "$$f"`; \
- cp "$$f" "$(DESTDIR)$(PREFIX)/share/gajim/$$DST/"; \
- done
- rm "$(DESTDIR)$(PREFIX)/share/gajim/src/systraywin32.py"
- for d in $(DIRS_PO) ; do \
- if [ ! -d $(DESTDIR)$(PREFIX)/share/locale/$$d ] ; then \
- mkdir -p "$(DESTDIR)$(PREFIX)/share/locale/$$d"; \
- fi; \
- done
- if [[ -n $$(find po -name *.mo) ]]; then \
- ${MAKE} -C po install PREFIX=$(PREFIX) ; \
- fi
- cp COPYING "$(DESTDIR)$(PREFIX)/share/gajim/";
- cp THANKS "$(DESTDIR)$(PREFIX)/share/gajim/";
- cp AUTHORS "$(DESTDIR)$(PREFIX)/share/gajim/";
- mkdir -p "$(DESTDIR)$(PREFIX)/share/pixmaps";
- cp data/pixmaps/gajim.png "$(DESTDIR)$(PREFIX)/share/pixmaps/";
- cp data/pixmaps/gajim_about.png "$(DESTDIR)$(PREFIX)/share/pixmaps/";
- mkdir -p "$(DESTDIR)$(PREFIX)/share/applications";
- if [ -f gajim.desktop ]; then \
- cp gajim.desktop "$(DESTDIR)$(PREFIX)/share/applications/"; \
- fi;
- mkdir -p "$(MANDIR)/man1";
- cp gajim.1 "$(MANDIR)/man1";
- cp gajim-remote.1 "$(MANDIR)/man1";
- mkdir -p "$(DESTDIR)$(PREFIX)$(LIBDIR)/gajim";
- for f in $(FILES_LIB) ; do \
- cp "$$f" "$(DESTDIR)$(PREFIX)$(LIBDIR)/gajim/"; \
- done
- mkdir -p "$(DESTDIR)$(PREFIX)/bin";
- for s in $(SCRIPTS) ; do \
- BASE=`basename "$$s"`; \
- if [ $(GAJIM_AP) -ne 0 ] ; then \
- F=`cat "$$s" | sed -e 's!LIB!$(LIBDIR)!g' -e 's!PYTHON_EXEC!$(PYTHON)!g'`; \
- else \
- F=`cat "$$s" | sed -e 's!PREFIX!$(PREFIX)!g' -e 's!LIB!$(LIBDIR)!g' -e 's!PYTHON_EXEC!$(PYTHON)!g'`; \
- fi; \
- echo "$$F" > "$(DESTDIR)$(PREFIX)/bin/$$BASE"; \
- chmod +x "$(DESTDIR)$(PREFIX)/bin/$$BASE"; \
- done
-
-gajim.desktop: gajim.desktop.in
- intltool-merge -d po gajim.desktop.in gajim.desktop
-
-#
-# show make params we accept
-#
-help:
- @echo Usage:
- @echo make - builds all modules
- @echo make clean - delete built modules and object files
- @echo make distclean - clean plus deletion of all other non-repository files
- @echo make install - install binaries into the official directories
- @echo make uninstall - uninstall binaries from the official directories
- @echo make help - prints this help
- @echo
- @echo make trayicon - makes only trayicon module
- @echo make idle - makes only idle detection module
- @echo make translation - makes only translation \(mo files\)
- @echo make gtkspell - makes only gtkspell detection module
- @echo make tags - makes 'tags' file for use with ctags
- @echo
-
-#
-# uninstall application from official directories
-#
-uninstall:
- rm -rf "$(DESTDIR)$(PREFIX)/share/gajim" # the main files are here
- rm -rf "$(DESTDIR)$(PREFIX)/lib/gajim" # the .so files are here
- rm -f "$(DESTDIR)$(PREFIX)/bin/gajim" # the bash script
- rm -f "$(DESTDIR)$(PREFIX)/bin/gajim-remote" # remote-control script
- rm -f "$(MANDIR)/man1/gajim.1" # the man page
- rm -f "$(MANDIR)/man1/gajim-remote.1" # the man page
- rm -f "$(DESTDIR)$(PREFIX)/share/pixmaps/gajim.png" # the icon
- rm -f "$(DESTDIR)$(PREFIX)/share/pixmaps/gajim_about.png" # the icon
- rm -f "$(DESTDIR)$(PREFIX)/share/applications/gajim.desktop" #the desktop
- find "$(DESTDIR)$(PREFIX)/share/locale" -name 'gajim.mo' -exec rm {} \; #the .mo files
- @echo done uninstalling
-
-tags:
- -rm tags
- exuberant-ctags -R
-
-.PHONY: all translation trayicon gtkspell idle clean dist distclean install help\
- uninstall tags
diff --git a/Makefile.am b/Makefile.am
new file mode 100644
index 000000000..bf680095b
--- /dev/null
+++ b/Makefile.am
@@ -0,0 +1,45 @@
+SUBDIRS = src data po
+
+ACLOCAL_AMFLAGS = -I m4
+
+bin_SCRIPTS = scripts/gajim
+
+
+docfilesdir = $(docdir)
+docfiles_DATA = README \
+ README.html \
+ ChangeLog \
+ COPYING \
+ THANKS \
+ AUTHORS
+
+EXTRA_DIST = \
+ $(docfiles_DATA) \
+ autogen.sh \
+ intltool-extract.in \
+ intltool-merge.in \
+ intltool-update.in \
+ scripts/gajim.in
+
+DISTCLEANFILES = \
+ intltool-extract \
+ intltool-merge \
+ intltool-update \
+ scripts/gajim
+
+MAINTAINERCLEANFILES = \
+ configure \
+ Makefile.in \
+ intltool-extract.in \
+ intltool-update.in \
+ intltool-merge.in \
+ ltmain.sh \
+ missing \
+ mkinstalldirs \
+ install-sh \
+ compile \
+ depcomp \
+ config.guess \
+ config.sub \
+ aclocal.m4 \
+ libtool
diff --git a/NEWS b/NEWS
new file mode 100644
index 000000000..e69de29bb
diff --git a/README b/README
index 9f11c8552..87b9af82a 100644
--- a/README
+++ b/README
@@ -1,87 +1 @@
-Welcome and thanks for trying out Gajim.
-
-=RUNTIME REQUIREMENTS=
-python2.4 (python2.3 should work too)
-pygtk2.6 or higher
-python-libglade
-pysqlite2 (aka. python-pysqlite2)
-
-some distros 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
-
-=COMPILE-TIME REQUIREMENTS=
-python-dev
-python-gtk2-dev
-libgtk2.0-dev # aka. gtk2-devel
-libxss-dev # for idle detection module (Some distributions (f.e. Debian) split xscreensaver)
-libgtkspell-dev # for gtkspell module
-intltool
-
-NOTE:
-if you still have problems compiling, you may want to try removing the gtk1 series of the above dependencies
-
-Optionally:
-dnsutils (or whatever package provides the nslookup binary) for SRV support; if you don't know what that is, you don't need it
-gtkspell and aspell-LANG where lang is your locale eg. en, fr etc
-GnomePythonExtras 2.10 or above so you can avoid compiling trayicon and gtkspell
-notification-daemon (and D-Bus) to get cooler popups
-D-Bus to have gajim-remote working
-
-NOTE TO PACKAGERS:
-Gajim is a GTK+ app and not a gnome one. Just do 'make' so you don't require gnomepythonextras
-which is gnome dep
-
-=INSTALLATION PROCEDURE=
-tar jxvf gajim-version.tar.bz2
-cd gajim
-make # builds all modules
-su -c make install
-
-To specify what modules to build do:
-make help
-
-To specify where to install do:
-su -c make PREFIX=custom_path install
-
-=RUNNING GAJIM=
-gajim
-
-or if you didn't 'make install' you can also run from gajim folder with
-./launch.sh
-
-Last but not least, you can run Gajim from your GNOME/XFCE/KDE/whatever menus.
-
-=UNINSTALLATION PROCEDURE=
-su -c make uninstall
-this will try to remove Gajim from the default directories.
-If you want to remove it from custom directory provide it as:
-make PREFIX=custom_path uninstall
-
-=MISCELLANEOUS=
-XML & Debugging:
-If you want to see the xml stanzas and/or help us debugging
-you're advised to enable verbose via advanced configuration window.
-If you don't want to make this permanent, execute gajim with --verbose
-everytime you want to have verbose output.
-
-Cannot join room with password:
-please read the FAQ for the reply on this issue
-
-=FAQ/Wiki=
-FAQ can be found at http://trac.gajim.org/wiki/GajimFaq
-Wiki can be found at http://trac.gajim.org/wiki
-
-
-That is all, enjoy!
-
-(C) 2003-2005
-The Gajim Team
-http://gajim.org
-
-
-PS.
-we use original art and parts of sounds and other art from Psi, Gossip,
-Gnomebaker, Gaim and some icons from various gnome-icons
-(mostly Dropline Etiquette) we found at art.gnome.org
-If you think we're violating a license please inform us
+see README.html
diff --git a/README.html b/README.html
new file mode 100644
index 000000000..7a4558119
--- /dev/null
+++ b/README.html
@@ -0,0 +1,152 @@
+
+
+
+ Gajim - Read Me
+
+
+
+Gajim Read Me
+
+
+Welcome to Gajim and thank you for trying out our client.
+
+
+Runtime Requirements
+
+- python2.4 or higher
+- pygtk2.6 or higher
+- python-libglade
+- pysqlite2 (if you have python 2.5, you already have this)
+
+
+
+Note to packagers
+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.
+
+
+Optional Runtime Requirements
+
+- dnsutils (or whatever package provides the nslookup binary) for SRV support; if you don't know what that is, you don't need it
+- gtkspell and aspell-LANG where lang is your locale eg. en, fr etc
+- GnomePythonExtras 2.10 or above (aka gnome-python-desktop) so you can avoid compiling trayicon and gtkspell
+- gnome-python-desktop (for GnomeKeyring support)
+- notification-daemon or notify-python (and D-Bus) to get cooler popups
+- D-Bus running to have gajim-remote working
+- python-dbus bindings
+
+
+
+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.
+
+
+Compile-time Requirements
+
+- python-dev
+- python-gtk2-dev
+- libgtk2.0-dev aka. gtk2-devel
+- libxss-dev (for idle detection module; some distributions such as Debian split xscreensaver)
+- libgtkspell-dev (for the gtkspell module)
+- intltool
+
+
+
+NOTE:
+If you still have problems compiling, you may want to try removing the gtk1 series of the above dependencies.
+
+
+Installation Procedure
+
+- tar jxvf gajim-version.tar.bz2
+- cd gajim
+- ./configure
+- make (builds all modules)
+- su -c make install
+
+
+
+To specify what modules to build do:
+make help
+
+
+
+To specify where to install do:
+su -c make PREFIX=custom_path install
+
+
+Running Gajim
+
+Just do gajim or you can run Gajim from your GNOME/XFCE/KDE/whatever menus.
+
+or if you didn't 'make install' you can also run from gajim folder with
+./launch.sh
+
+Note for svn users
+You will need GNU autotools in order to install Gajim from svn. This includes:
+
+- automake >= 1.8
+- autoconf >= 2.59
+- libtool
+- intltool-0.35.0
+- pkgconfig >= 0.19
+
+
+steps to compile gajim:
+
+ $ sh autogen.sh
+ $ ./configure
+ $ make
+
+Alternatively, if you don't want to install all these packages, you can get a nightly snapshot from here and procede as usual:
+
+ $ ./configure
+ $ make
+
+Uninstallation Procedure
+
+su -c make uninstall
+this will try to remove Gajim from the default directories.
+If you want to remove it from custom directory provide it as:
+make PREFIX=custom_path uninstall
+
+
+Miscellaneous
+XML & Debugging
+
+If you want to see the xml stanzas and/or help us debugging
+you're advised to enable verbose via advanced configuration window.
+If you don't want to make this permanent, execute gajim with --verbose
+everytime you want to have verbose output.
+
+
+FAQ/Wiki
+
+FAQ can be found at http://trac.gajim.org/wiki/GajimFaq
+Wiki can be found at http://trac.gajim.org/wiki
+
+
+
+
+That is all, enjoy!
+
+
+
+
+
+
+(C) 2003-2006
+The Gajim Team
+http://gajim.org
+
+
+
+PS.
+We use original art and parts of sounds and other art from Psi, Gossip,
+Gnomebaker, Gaim and some icons from various gnome-icons
+(mostly Dropline Etiquette) we found at art.gnome.org
+If you think we're violating a license please inform us. Thank you.
+
+
diff --git a/THANKS b/THANKS
index 46f6ccaad..938108b36 100644
--- a/THANKS
+++ b/THANKS
@@ -22,6 +22,7 @@ Ivo Anjo
Julien Pivotto
Juraj Michalek
Luis Peralta
+Michael Scherer
Michele Campeotto
Mike Albon
Miguel Fonseca
diff --git a/autogen.sh b/autogen.sh
new file mode 100755
index 000000000..dbf2cc812
--- /dev/null
+++ b/autogen.sh
@@ -0,0 +1,18 @@
+#!/usr/bin/env bash
+ echo "[encoding: UTF-8]" > po/POTFILES.in \
+ && ls -1 -U data/gajim.desktop.in.in data/glade/*.glade \
+ src/*py src/common/*py src/common/zeroconf/*.py >> \
+ po/POTFILES.in || exit 1
+ if test -z `which pkg-config 2>/dev/null`;then
+ echo "***Error: pkg-config not found***"
+ echo "See README.html for build requirements."
+ exit 1
+ fi
+ set -x
+ intltoolize --force --automake \
+ && aclocal -I ./m4 \
+ && libtoolize --copy --force --automake \
+ && autoheader \
+ && autoconf \
+ && automake --add-missing --gnu --copy \
+ && ./configure $@
diff --git a/config.h.in b/config.h.in
new file mode 100644
index 000000000..ffb64246e
--- /dev/null
+++ b/config.h.in
@@ -0,0 +1,91 @@
+/* config.h.in. Generated from configure.ac by autoheader. */
+
+/* always defined to indicate that i18n is enabled */
+#undef ENABLE_NLS
+
+/* Gettext package */
+#undef GETTEXT_PACKAGE
+
+/* Define to 1 if you have the `bind_textdomain_codeset' function. */
+#undef HAVE_BIND_TEXTDOMAIN_CODESET
+
+/* Define to 1 if you have the `dcgettext' function. */
+#undef HAVE_DCGETTEXT
+
+/* Define to 1 if you have the header file. */
+#undef HAVE_DLFCN_H
+
+/* Define if the GNU gettext() function is already present or preinstalled. */
+#undef HAVE_GETTEXT
+
+/* Define to 1 if you have the header file. */
+#undef HAVE_INTTYPES_H
+
+/* Define if your file defines LC_MESSAGES. */
+#undef HAVE_LC_MESSAGES
+
+/* Define to 1 if you have the header file. */
+#undef HAVE_LIBINTL_H
+
+/* Define to 1 if you have the `X11' library (-lX11). */
+#undef HAVE_LIBX11
+
+/* Define to 1 if you have the `Xext' library (-lXext). */
+#undef HAVE_LIBXEXT
+
+/* Define to 1 if you have the `Xss' library (-lXss). */
+#undef HAVE_LIBXSS
+
+/* Define to 1 if you have the header file. */
+#undef HAVE_LOCALE_H
+
+/* Define to 1 if you have the header file. */
+#undef HAVE_MEMORY_H
+
+/* Define to 1 if you have the header file. */
+#undef HAVE_STDINT_H
+
+/* Define to 1 if you have the header file. */
+#undef HAVE_STDLIB_H
+
+/* Define to 1 if you have the header file. */
+#undef HAVE_STRINGS_H
+
+/* Define to 1 if you have the header file. */
+#undef HAVE_STRING_H
+
+/* Define to 1 if you have the header file. */
+#undef HAVE_SYS_STAT_H
+
+/* Define to 1 if you have the header file. */
+#undef HAVE_SYS_TYPES_H
+
+/* Define to 1 if you have the header file. */
+#undef HAVE_UNISTD_H
+
+/* Name of package */
+#undef PACKAGE
+
+/* Define to the address where bug reports for this package should be sent. */
+#undef PACKAGE_BUGREPORT
+
+/* Define to the full name of this package. */
+#undef PACKAGE_NAME
+
+/* Define to the full name and version of this package. */
+#undef PACKAGE_STRING
+
+/* Define to the one symbol short name of this package. */
+#undef PACKAGE_TARNAME
+
+/* Define to the version of this package. */
+#undef PACKAGE_VERSION
+
+/* Define to 1 if you have the ANSI C header files. */
+#undef STDC_HEADERS
+
+/* Version number of package */
+#undef VERSION
+
+/* Define to empty if `const' does not conform to ANSI C. */
+#undef const
diff --git a/configure.ac b/configure.ac
new file mode 100644
index 000000000..2addead41
--- /dev/null
+++ b/configure.ac
@@ -0,0 +1,173 @@
+AC_INIT([Gajim - A Jabber Instant Messager],
+ [0.10.1.6],[http://trac.gajim.org/],[gajim])
+AC_PREREQ([2.59])
+AM_INIT_AUTOMAKE([1.8])
+AC_CONFIG_HEADER(config.h)
+AC_CONFIG_MACRO_DIR([m4])
+AM_MAINTAINER_MODE
+
+IT_PROG_INTLTOOL([0.35.0])
+PKG_PROG_PKG_CONFIG([0.19])
+
+AM_DISABLE_STATIC
+AC_ENABLE_SHARED(yes)
+AC_ENABLE_STATIC(no)
+
+AC_ISC_POSIX
+AC_PROG_CC
+AC_PROG_INSTALL
+AC_PROG_MAKE_SET
+AC_PROG_LIBTOOL
+AC_C_CONST
+AC_CHECK_HEADERS([libintl.h])
+AC_PATH_X
+
+
+GETTEXT_PACKAGE=gajim
+AC_SUBST([GETTEXT_PACKAGE])
+AC_DEFINE_UNQUOTED([GETTEXT_PACKAGE],["$GETTEXT_PACKAGE"], [Gettext package])
+AM_GLIB_GNU_GETTEXT
+AM_NLS
+
+
+dnl ****
+dnl pygtk and gtk+
+dnl ****
+PKG_CHECK_MODULES([PYGTK], [gtk+-2.0 >= 2.6.0 pygtk-2.0 >= 2.6.0])
+AC_SUBST(PYGTK_CFLAGS)
+AC_SUBST(PYGTK_LIBS)
+PYGTK_DEFS=`$PKG_CONFIG --variable=defsdir pygtk-2.0`
+AC_SUBST(PYGTK_DEFS)
+
+dnl *****
+dnl dbus
+dnl *****
+AC_ARG_ENABLE([remote],
+ [ --disable-remote enable remote control via DBus [default auto]],
+ enable_remote=$enableval, enable_remote=auto)
+
+if test "x$enable_remote" = "xauto"; then
+ PKG_CHECK_EXISTS([dbus-1],enable_remote=yes,enable_remote=no)
+fi
+
+if test "x$enable_remote" = "xyes";then
+ PKG_CHECK_MODULES([DBUS], [dbus-1 >= 0.60 dbus-glib-1 >= 0.60])
+ AC_SUBST(DBUS_CFLAGS)
+ AC_SUBST(DBUS_LIBS)
+ have_remote=true
+else
+ have_remote=false
+fi
+AM_CONDITIONAL(BUILD_REMOTE_CONTROL, $have_remote)
+
+dnl ****
+dnl gtkspell
+dnl ****
+AC_ARG_ENABLE(gtkspell,
+ [ --disable-gtkspell build spell checking support [default auto]],
+ enable_gtkspell=$enableval, enable_gtkspell=auto)
+
+if test "x$enable_gtkspell" = "xauto";then
+ PKG_CHECK_EXISTS([gtkspell-2.0], [enable_gtkspell=yes], [enable_gtkspell=no])
+fi
+if test "x$enable_gtkspell" = "xyes";then
+ PKG_CHECK_MODULES([GTKSPELL], [gtkspell-2.0])
+ AC_SUBST(GTKSPELL_CFLAGS)
+ AC_SUBST(GTKSPELL_LIBS)
+ have_gtkspell=true
+else
+ have_gtkspell=false
+fi
+AM_CONDITIONAL(BUILD_GTKSPELL, $have_gtkspell)
+
+
+dnl ****
+dnl xscreensaver
+dnl ****
+AC_ARG_ENABLE([idle],
+ [ --disable-idle build idle module [default auto]],
+ enable_idle=$enableval, enable_idle=yes)
+
+if test "x$enable_idle" = "xyes";then
+ PKG_CHECK_EXISTS([xscrnsaver], [have_xscrnsaver=yes], [have_xscrnsaver=no])
+
+ if test "x$have_xscrnsaver" = "xyes";then
+ PKG_CHECK_MODULES([XSCRNSAVER], xscrnsaver)
+ AC_SUBST(XSCRNSAVER_LIBS)
+ have_idle=true
+ else
+ # Checks for libraries.
+ LIBS=-L$x_libraries
+ AC_CHECK_LIB([X11], [XOpenDisplay])
+ AC_CHECK_LIB([Xext], [XMissingExtension])
+ AC_CHECK_LIB([Xss], [XScreenSaverAllocInfo])
+ XSCRNSAVER_LIBS="$LIBS"
+ AC_SUBST([XSCRNSAVER_LIBS])
+ if test "x$XSCRNSAVER_LIBS" = "x";then
+ have_idle=false
+ else
+ have_idle=true
+ fi
+ fi
+else
+ have_idle=false
+fi
+AM_CONDITIONAL(BUILD_IDLE, $have_idle)
+
+AM_PATH_PYTHON([2.4])
+if test "x$PYTHON" = "x:"; then
+ AC_MSG_ERROR([Python not found])
+fi
+
+dnl ****
+dnl tray icon
+dnl ****
+AC_ARG_ENABLE(trayicon,
+ [ --disable-trayicon 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}"
+AC_SUBST(ACLOCAL_AMFLAGS)
+
+AM_CHECK_PYTHON_HEADERS(,[AC_MSG_ERROR(could not find Python headers)])
+AC_SUBST([PYTHON_INCLUDES])
+
+AS_AC_EXPAND(DATADIR, "${datadir}")
+
+AS_AC_EXPAND(LIBDIR, ${libdir})
+
+AS_AC_EXPAND(DOCDIR, "${docdir}")
+
+AC_SUBST(VERSION)
+AC_SUBST(PACKAGE)
+AC_SUBST(DATADIR)
+AC_SUBST(LIBDIR)
+AS_AC_EXPAND(DATADIR, "${DATADIR}")
+AC_SUBST(DOCDIR)
+AS_AC_EXPAND(DOCDIR, "${DOCDIR}")
+
+AC_CONFIG_FILES([
+ Makefile
+ data/Makefile
+ data/glade/Makefile
+ data/emoticons/Makefile
+ data/pixmaps/Makefile
+ data/iconsets/Makefile
+ data/gajim.desktop.in
+ data/defs.py
+ src/Makefile
+ src/common/Makefile
+ scripts/gajim
+ po/Makefile.in
+])
+AC_OUTPUT
+echo "
+*****************************
+ Build features:
+ spell check ...... ${have_gtkspell}
+ idle module ...... ${have_idle}
+ remote control ... ${have_remote}
+ trayicon ......... ${have_trayicon}
+*****************************"
diff --git a/data/Makefile.am b/data/Makefile.am
new file mode 100644
index 000000000..9b6abc349
--- /dev/null
+++ b/data/Makefile.am
@@ -0,0 +1,32 @@
+SUBDIRS = glade emoticons pixmaps iconsets
+@INTLTOOL_DESKTOP_RULE@
+
+desktopdir = $(datadir)/applications
+desktop_in_files = gajim.desktop.in.in
+desktop_DATA = $(desktop_in_files:.desktop.in.in=.desktop)
+
+installdefsdir = $(pkgdatadir)/src/common
+installdefs_DATA = defs.py
+
+soundsdir = $(pkgdatadir)/data/sounds
+sounds_DATA = $(srcdir)/sounds/*.wav
+
+otherdir = $(pkgdatadir)/data/other
+other_DATA = other/servers.xml
+
+man_MANS = gajim.1 gajim-remote.1
+
+
+EXTRA_DIST = $(desktop_in_files) \
+ $(sounds_DATA) \
+ $(other_DATA) \
+ $(man_MANS) \
+ defs.py.in
+
+
+DISTCLEANFILES = $(desktop_DATA) \
+ $(installdefs_DATA)
+
+CLEANFILES = gajim.desktop
+
+MAINTAINERCLEANFILES = Makefile.in
diff --git a/data/defs.py.in b/data/defs.py.in
new file mode 100644
index 000000000..55af93a75
--- /dev/null
+++ b/data/defs.py.in
@@ -0,0 +1,7 @@
+# this file is automatically generate by configure
+# do not edit it!
+docdir = "@DOCDIR@"
+
+datadir = "@DATADIR@"
+
+version = "@VERSION@"
diff --git a/data/emoticons/Makefile.am b/data/emoticons/Makefile.am
new file mode 100644
index 000000000..c3feaf585
--- /dev/null
+++ b/data/emoticons/Makefile.am
@@ -0,0 +1,38 @@
+emoticonsdir = $(pkgdatadir)/data/emoticons
+
+emoticons_DATA =
+
+EMOTICONS_DIRS = **
+
+EMOTICONS_FILES = **/{*.png,*.gif,emoticons.py}
+
+
+install-data-local:
+ @for d in $(EMOTICONS_DIRS);do \
+ if test -d $$d;then \
+ echo " $(mkinstalldirs) $(DESTDIR)$(pkgdatadir)/data/emoticons/$$d"; \
+ $(mkinstalldirs) $(DESTDIR)$(pkgdatadir)/data/emoticons/$$d || exit 1; \
+ fi; \
+ done; \
+ for f in $(EMOTICONS_FILES);do \
+ if test -f $$f; then \
+ echo " $(INSTALL_DATA) $$f $(DESTDIR)$(pkgdatadir)/data/emoticons/$$f"; \
+ $(INSTALL_DATA) $$f $(DESTDIR)$(pkgdatadir)/data/emoticons/$$f || exit 1; \
+ fi; \
+ done;
+
+dist-hook:
+ @for d in $(EMOTICONS_DIRS);do \
+ if test -d $$d;then \
+ echo " $(mkdir_p) $(distdir)/$$d"; \
+ $(mkdir_p) $(distdir)/$$d || exit 1; \
+ fi; \
+ done; \
+ for f in $(EMOTICONS_FILES);do \
+ if test -f $$f; then \
+ echo " cp -pR $(srcdir)/$$f $(distdir)/$$f"; \
+ cp -pR $(srcdir)/$$f $(distdir)/$$f || exit 1; \
+ fi; \
+ done;
+
+MAINTAINERCLEANFILES = Makefile.in
diff --git a/gajim-remote.1 b/data/gajim-remote.1
similarity index 100%
rename from gajim-remote.1
rename to data/gajim-remote.1
diff --git a/gajim.1 b/data/gajim.1
similarity index 100%
rename from gajim.1
rename to data/gajim.1
diff --git a/gajim.desktop.in b/data/gajim.desktop.in.in
similarity index 93%
rename from gajim.desktop.in
rename to data/gajim.desktop.in.in
index 957abc264..55b50e3ec 100644
--- a/gajim.desktop.in
+++ b/data/gajim.desktop.in.in
@@ -3,7 +3,7 @@ Categories=Network;InstantMessaging;Application;GTK;GNOME;
_Name=Gajim Instant Messenger
_GenericName=Jabber IM Client
_Comment=A GTK+ Jabber client
-Version=0.9.4
+Version=@VERSION@
Encoding=UTF-8
Exec=gajim
Icon=gajim.png
diff --git a/data/glade/Makefile.am b/data/glade/Makefile.am
new file mode 100644
index 000000000..a8b810da5
--- /dev/null
+++ b/data/glade/Makefile.am
@@ -0,0 +1,8 @@
+
+gladedir = $(pkgdatadir)/data/glade
+glade_DATA = $(srcdir)/*.glade
+EXTRA_DIST = $(glade_DATA)
+
+DISTCLEANFILES = *.h
+
+MAINTAINERCLEANFILES = Makefile.in
diff --git a/data/glade/account_modification_window.glade b/data/glade/account_modification_window.glade
index c2a4150cd..9f7ee26cf 100644
--- a/data/glade/account_modification_window.glade
+++ b/data/glade/account_modification_window.glade
@@ -2,6 +2,7 @@
+
12
Account Modification
@@ -16,6 +17,7 @@
GDK_WINDOW_TYPE_HINT_NORMAL
GDK_GRAVITY_NORTH_WEST
True
+ False
@@ -331,6 +333,30 @@
+
+
+ True
+ Priority will change automatically according to your status.
+ True
+ _Adjust to status
+ True
+ GTK_RELIEF_NORMAL
+ True
+ False
+ False
+ True
+
+
+
+ 1
+ 2
+ 3
+ 4
+ fill
+
+
+
+
True
@@ -345,11 +371,11 @@
5 0 127 1 5 5
- 1
- 2
+ 2
+ 3
3
4
- shrink|fill
+ fill
@@ -1197,4 +1223,5 @@
+
diff --git a/data/glade/accounts_window.glade b/data/glade/accounts_window.glade
index 3ac6f9e7b..39b637bae 100644
--- a/data/glade/accounts_window.glade
+++ b/data/glade/accounts_window.glade
@@ -2,6 +2,7 @@
+
12
Accounts
@@ -64,7 +65,7 @@
True
If you have 2 or more accounts and it is checked, Gajim will list all contacts as if you had one account
True
- _Merge accounts
+ Mer_ge accounts
True
GTK_RELIEF_NORMAL
True
@@ -80,6 +81,38 @@
+
+
+ True
+
+
+ 0
+ False
+ True
+
+
+
+
+
+ True
+ If checked, all local contacts that use a Bonjour compatible chat client (like iChat, Trillian or Gaim) will be shown in roster. You don't need to be connected to a jabber server for it to work.
+This is only available if python-avahi is installed and avahi-daemon is running.
+ True
+ _Enable link-local messaging
+ True
+ GTK_RELIEF_NORMAL
+ True
+ False
+ False
+ True
+
+
+ 0
+ False
+ False
+
+
+
True
@@ -267,4 +300,5 @@
+
diff --git a/data/glade/add_new_contact_window.glade b/data/glade/add_new_contact_window.glade
index cf41eca13..dd220be82 100644
--- a/data/glade/add_new_contact_window.glade
+++ b/data/glade/add_new_contact_window.glade
@@ -180,7 +180,7 @@
6
True
- 4
+ 3
2
False
6
@@ -331,28 +331,6 @@
fill
-
-
-
- True
- True
- A_llow this contact to view my status
- True
- GTK_RELIEF_NORMAL
- True
- True
- False
- True
-
-
- 1
- 2
- 3
- 4
- fill
-
-
-
0
@@ -361,6 +339,25 @@
+
+
+ True
+ True
+ A_llow this contact to view my status
+ True
+ GTK_RELIEF_NORMAL
+ True
+ True
+ False
+ True
+
+
+ 0
+ False
+ False
+
+
+
6
diff --git a/data/glade/advanced_notifications_window.glade b/data/glade/advanced_notifications_window.glade
index 5daab3488..58f9ca2b5 100644
--- a/data/glade/advanced_notifications_window.glade
+++ b/data/glade/advanced_notifications_window.glade
@@ -387,7 +387,7 @@ everybody
True
- when I'm
+ when I'm in
False
True
GTK_JUSTIFY_LEFT
@@ -419,7 +419,7 @@ everybody
True
True
- All Status
+ All statuses
True
GTK_RELIEF_NORMAL
True
@@ -439,7 +439,7 @@ everybody
True
True
- Some special(s) status...
+ One or more special statuses...
True
GTK_RELIEF_NORMAL
True
@@ -1185,7 +1185,7 @@ everybody
True
True
- _Activate Windows manager UrgencyHint to make chat taskbar to flash
+ _Activate window manager's UrgencyHint to make chat window in taskbar flash
True
GTK_RELIEF_NORMAL
True
diff --git a/data/glade/gajim_themes_window.glade b/data/glade/gajim_themes_window.glade
index 44d7e381c..e64f4402c 100644
--- a/data/glade/gajim_themes_window.glade
+++ b/data/glade/gajim_themes_window.glade
@@ -122,10 +122,10 @@
True
- Account
-Group
-Contact
-Banner
+ Account row
+Group row
+Contact row
+Chat Banner
False
True
@@ -554,52 +554,6 @@ Banner
-
-
- True
- Active
- False
- False
- GTK_JUSTIFY_LEFT
- False
- False
- 0
- 0.5
- 0
- 0
- PANGO_ELLIPSIZE_NONE
- -1
- False
- 0
-
-
- 0
- 1
- 1
- 2
- fill
-
-
-
-
-
-
- True
- True
- False
- True
-
-
-
- 1
- 2
- 1
- 2
- fill
-
-
-
-
True
diff --git a/data/glade/join_groupchat_window.glade b/data/glade/join_groupchat_window.glade
index e6960a86a..618dff121 100644
--- a/data/glade/join_groupchat_window.glade
+++ b/data/glade/join_groupchat_window.glade
@@ -17,6 +17,7 @@
GDK_WINDOW_TYPE_HINT_NORMAL
GDK_GRAVITY_NORTH_WEST
True
+ False
@@ -29,58 +30,14 @@
True
- 5
+ 4
2
False
6
12
-
- True
- True
- True
- False
- 0
-
- True
- *
- True
-
-
- 1
- 2
- 4
- 5
-
-
-
-
-
-
- True
- True
- True
- True
- 0
-
- True
- *
- True
-
-
-
-
- 1
- 2
- 3
- 4
-
-
-
-
-
-
+
True
True
True
@@ -91,7 +48,6 @@
True
*
True
-
@@ -125,62 +81,6 @@
-
-
- True
- Password:
- False
- False
- GTK_JUSTIFY_LEFT
- False
- False
- 0
- 0.5
- 0
- 0
- PANGO_ELLIPSIZE_NONE
- -1
- False
- 0
-
-
- 0
- 1
- 4
- 5
- fill
-
-
-
-
-
-
- True
- Server:
- False
- False
- GTK_JUSTIFY_LEFT
- False
- False
- 0
- 0.5
- 0
- 0
- PANGO_ELLIPSIZE_NONE
- -1
- False
- 0
-
-
- 0
- 1
- 3
- 4
- fill
-
-
-
-
True
@@ -281,6 +181,55 @@
fill
+
+
+
+ True
+ Password:
+ False
+ False
+ GTK_JUSTIFY_LEFT
+ False
+ False
+ 0
+ 0.5
+ 0
+ 0
+ PANGO_ELLIPSIZE_NONE
+ -1
+ False
+ 0
+
+
+ 0
+ 1
+ 3
+ 4
+ fill
+
+
+
+
+
+
+ True
+ True
+ True
+ False
+ 0
+
+ True
+ *
+ True
+
+
+ 1
+ 2
+ 3
+ 4
+
+
+
0
diff --git a/data/glade/message_window.glade b/data/glade/message_window.glade
index ecd51204d..d4678bfd3 100644
--- a/data/glade/message_window.glade
+++ b/data/glade/message_window.glade
@@ -374,7 +374,7 @@ Status message
True
- gtk-preferences
+ gtk-execute
4
0.5
0.5
@@ -916,7 +916,7 @@ topic
True
- gtk-preferences
+ gtk-execute
4
0.5
0.5
diff --git a/data/glade/popup_notification_window.glade b/data/glade/popup_notification_window.glade
index b837f7fe5..309b338a5 100644
--- a/data/glade/popup_notification_window.glade
+++ b/data/glade/popup_notification_window.glade
@@ -19,6 +19,7 @@
GDK_WINDOW_TYPE_HINT_NORMAL
GDK_GRAVITY_SOUTH_EAST
True
+ False
@@ -71,7 +72,7 @@
False
True
GTK_JUSTIFY_LEFT
- False
+ True
False
0.5
0.5
@@ -85,7 +86,7 @@
0
False
- False
+ True
@@ -117,7 +118,7 @@
0
- True
+ False
True
@@ -137,7 +138,7 @@
0.5
0
0
- PANGO_ELLIPSIZE_END
+ PANGO_ELLIPSIZE_NONE
-1
False
0
diff --git a/data/glade/preferences_window.glade b/data/glade/preferences_window.glade
index f5aceb5ff..23a0ba9e1 100644
--- a/data/glade/preferences_window.glade
+++ b/data/glade/preferences_window.glade
@@ -296,6 +296,7 @@
True
+ Configure color and font of the interface
True
Ma_nage...
True
@@ -493,6 +494,27 @@ Per type
+
+
+ True
+ Some messages may include rich content (formatting, colors etc). If checked, Gajim will just display the raw message text.
+ True
+ Ignore rich content in incoming messages
+ True
+ GTK_RELIEF_NORMAL
+ True
+ False
+ False
+ True
+
+
+
+ 0
+ False
+ False
+
+
+
True
@@ -819,7 +841,7 @@ Per type
0.5
0
0
- before_time_entry
+ scrolledwindow25
PANGO_ELLIPSIZE_NONE
-1
False
@@ -848,7 +870,7 @@ Per type
0.5
0
0
- after_nickname_entry
+ scrolledwindow28
PANGO_ELLIPSIZE_NONE
-1
False
@@ -900,7 +922,6 @@ Per type
True
True
- Επιλογή μιας γραμματοσειράς
True
True
False
@@ -952,7 +973,6 @@ Per type
True
True
False
- Επιλογή χρώματος
True
@@ -971,7 +991,6 @@ Per type
True
True
False
- Επιλογή χρώματος
True
@@ -998,7 +1017,7 @@ Per type
0.5
0
0
- after_time_entry
+ scrolledwindow26
PANGO_ELLIPSIZE_NONE
-1
False
@@ -1027,7 +1046,7 @@ Per type
0.5
0
0
- before_nickname_entry
+ scrolledwindow27
PANGO_ELLIPSIZE_NONE
-1
False
@@ -1043,54 +1062,6 @@ Per type
-
-
- 39
- True
- True
- True
- True
- 0
-
- True
- *
- False
-
-
-
- 3
- 4
- 0
- 1
-
-
-
-
-
-
-
- 40
- True
- True
- True
- True
- 0
-
- True
- *
- False
-
-
-
- 3
- 4
- 1
- 2
-
-
-
-
-
True
@@ -1099,7 +1070,6 @@ Per type
True
True
False
- Επιλογή χρώματος
True
@@ -1118,7 +1088,6 @@ Per type
True
True
False
- Επιλογή χρώματος
True
@@ -1132,54 +1101,6 @@ Per type
-
-
- 40
- True
- True
- True
- True
- 0
-
- True
- *
- False
-
-
-
- 1
- 2
- 1
- 2
-
-
-
-
-
-
-
- 40
- True
- True
- True
- True
- 0
-
- True
- *
- False
-
-
-
- 1
- 2
- 0
- 1
-
-
-
-
-
True
@@ -1298,6 +1219,170 @@ Per type
fill
+
+
+
+ 30
+ True
+ True
+ GTK_POLICY_NEVER
+ GTK_POLICY_AUTOMATIC
+ GTK_SHADOW_IN
+ GTK_CORNER_TOP_LEFT
+
+
+
+ True
+ True
+ True
+ False
+ True
+ GTK_JUSTIFY_LEFT
+ GTK_WRAP_CHAR
+ True
+ 0
+ 0
+ 0
+ 0
+ 0
+ 0
+
+
+
+
+
+
+ 3
+ 4
+ 0
+ 1
+ fill
+
+
+
+
+
+
+ 30
+ True
+ True
+ GTK_POLICY_NEVER
+ GTK_POLICY_AUTOMATIC
+ GTK_SHADOW_IN
+ GTK_CORNER_TOP_LEFT
+
+
+
+ True
+ True
+ True
+ False
+ True
+ GTK_JUSTIFY_LEFT
+ GTK_WRAP_CHAR
+ True
+ 0
+ 0
+ 0
+ 0
+ 0
+ 0
+
+
+
+
+
+
+ 3
+ 4
+ 1
+ 2
+ fill
+
+
+
+
+
+
+ 30
+ True
+ True
+ GTK_POLICY_NEVER
+ GTK_POLICY_AUTOMATIC
+ GTK_SHADOW_IN
+ GTK_CORNER_TOP_LEFT
+
+
+
+ True
+ True
+ True
+ False
+ True
+ GTK_JUSTIFY_LEFT
+ GTK_WRAP_CHAR
+ True
+ 0
+ 0
+ 0
+ 0
+ 0
+ 0
+
+
+
+
+
+
+ 1
+ 2
+ 1
+ 2
+ fill
+
+
+
+
+
+
+ 30
+ True
+ True
+ GTK_POLICY_NEVER
+ GTK_POLICY_AUTOMATIC
+ GTK_SHADOW_IN
+ GTK_CORNER_TOP_LEFT
+
+
+
+ True
+ True
+ True
+ False
+ True
+ GTK_JUSTIFY_LEFT
+ GTK_WRAP_CHAR
+ True
+ 0
+ 0
+ 0
+ 0
+ 0
+ 0
+
+
+
+
+
+
+ 1
+ 2
+ 0
+ 1
+ fill
+
+
+
0
@@ -2543,6 +2628,27 @@ Disabled
+
+
+ True
+ Works for Rhythmbox and Muine players. For more players, please visit http://trac.gajim.org/wiki/GajimAndMusicPlayer
+ True
+ Set status message to reflect currently playing _music track
+ True
+ GTK_RELIEF_NORMAL
+ True
+ False
+ False
+ True
+
+
+
+ 0
+ False
+ False
+
+
+
True
@@ -2897,6 +3003,7 @@ Disabled
Autodetect on every Gajim startup
Always use GNOME default applications
Always use KDE default applications
+Always use XFCE4 default applications
Custom
False
True
diff --git a/data/glade/privacy_list_edit_window.glade b/data/glade/privacy_list_window.glade
similarity index 95%
rename from data/glade/privacy_list_edit_window.glade
rename to data/glade/privacy_list_window.glade
index 1f14d6b71..8c82a1e51 100644
--- a/data/glade/privacy_list_edit_window.glade
+++ b/data/glade/privacy_list_window.glade
@@ -725,50 +725,28 @@ to
-
+
+ 6
True
- True
+ GTK_BUTTONBOX_END
0
-
- 5
- True
- True
- gtk-refresh
- True
- GTK_RELIEF_NORMAL
- True
-
-
-
- 0
- False
- False
-
-
-
-
-
- 5
+
True
+ True
True
gtk-close
True
GTK_RELIEF_NORMAL
True
-
+
-
- 0
- False
- False
-
0
- False
+ True
True
diff --git a/data/glade/privacy_lists_first_window.glade b/data/glade/privacy_lists_first_window.glade
deleted file mode 100644
index 7a7470123..000000000
--- a/data/glade/privacy_lists_first_window.glade
+++ /dev/null
@@ -1,255 +0,0 @@
-
-
-
-
-
-
- 12
- True
- window1
- GTK_WINDOW_TOPLEVEL
- GTK_WIN_POS_NONE
- False
- True
- False
- True
- False
- False
- GDK_WINDOW_TYPE_HINT_NORMAL
- GDK_GRAVITY_NORTH_WEST
- True
- False
-
-
-
-
- True
- False
- 0
-
-
-
- True
- Server-based Privacy Lists
- False
- False
- GTK_JUSTIFY_LEFT
- False
- False
- 0.5
- 0.5
- 0
- 5
- PANGO_ELLIPSIZE_NONE
- -1
- False
- 0
-
-
- 0
- False
- False
-
-
-
-
-
- 4
- True
-
- False
- True
-
-
- 0
- True
- True
-
-
-
-
-
- True
- True
- 0
-
-
-
- 5
- True
- True
- gtk-delete
- True
- GTK_RELIEF_NORMAL
- True
-
-
-
- 0
- False
- False
-
-
-
-
-
- 5
- True
- True
- gtk-open
- True
- GTK_RELIEF_NORMAL
- True
-
-
-
- 0
- False
- False
-
-
-
-
- 0
- True
- True
-
-
-
-
-
- True
-
-
- 5
- True
- True
-
-
-
-
-
- True
- Create your own Privacy Lists
- False
- False
- GTK_JUSTIFY_LEFT
- False
- False
- 0.5
- 0.5
- 0
- 5
- PANGO_ELLIPSIZE_NONE
- -1
- False
- 0
-
-
- 0
- False
- False
-
-
-
-
-
- True
- True
- True
- True
- 0
-
- True
- ●
- False
-
-
- 4
- False
- False
-
-
-
-
-
- 5
- True
- True
- gtk-new
- True
- GTK_RELIEF_NORMAL
- True
-
-
-
- 0
- False
- False
-
-
-
-
-
- True
-
-
- 5
- True
- True
-
-
-
-
-
- True
- True
- 0
-
-
-
- 5
- True
- True
- gtk-refresh
- True
- GTK_RELIEF_NORMAL
- True
-
-
-
- 0
- False
- False
-
-
-
-
-
- 5
- True
- True
- gtk-close
- True
- GTK_RELIEF_NORMAL
- True
-
-
-
- 0
- False
- False
-
-
-
-
- 0
- True
- True
-
-
-
-
-
-
-
diff --git a/data/glade/privacy_lists_window.glade b/data/glade/privacy_lists_window.glade
new file mode 100644
index 000000000..1513ce317
--- /dev/null
+++ b/data/glade/privacy_lists_window.glade
@@ -0,0 +1,213 @@
+
+
+
+
+
+
+ 12
+ True
+ window1
+ GTK_WINDOW_TOPLEVEL
+ GTK_WIN_POS_NONE
+ False
+ True
+ False
+ True
+ False
+ False
+ GDK_WINDOW_TYPE_HINT_NORMAL
+ GDK_GRAVITY_NORTH_WEST
+ True
+ False
+
+
+
+
+ True
+ False
+ 6
+
+
+
+ True
+ False
+ 12
+
+
+
+ True
+ Privacy Lists:
+ False
+ False
+ GTK_JUSTIFY_LEFT
+ False
+ False
+ 0
+ 0.5
+ 0
+ 0
+ PANGO_ELLIPSIZE_NONE
+ -1
+ False
+ 0
+
+
+ 0
+ False
+ False
+
+
+
+
+
+ True
+
+ False
+ True
+
+
+ 0
+ True
+ True
+
+
+
+
+ 0
+ False
+ True
+
+
+
+
+
+ True
+ False
+ 6
+
+
+
+ True
+ GTK_BUTTONBOX_SPREAD
+ 0
+
+
+
+ 5
+ True
+ True
+ gtk-delete
+ True
+ GTK_RELIEF_NORMAL
+ True
+
+
+
+
+
+
+ 5
+ True
+ True
+ gtk-edit
+ True
+ GTK_RELIEF_NORMAL
+ True
+
+
+
+
+
+ 0
+ False
+ False
+
+
+
+
+
+ True
+ False
+ 0
+
+
+
+ True
+ True
+ True
+ True
+ 0
+
+ True
+ ●
+ False
+
+
+ 0
+ True
+ True
+
+
+
+
+
+ 5
+ True
+ True
+ gtk-new
+ True
+ GTK_RELIEF_NORMAL
+ True
+
+
+
+ 0
+ False
+ False
+
+
+
+
+ 0
+ False
+ False
+
+
+
+
+ 0
+ True
+ True
+
+
+
+
+
+ True
+ GTK_BUTTONBOX_END
+ 0
+
+
+
+ 5
+ True
+ True
+ gtk-close
+ True
+ GTK_RELIEF_NORMAL
+ True
+
+
+
+
+
+ 0
+ True
+ True
+
+
+
+
+
+
+
diff --git a/data/glade/profile_window.glade b/data/glade/profile_window.glade
index aeaaa8518..d73b252c0 100644
--- a/data/glade/profile_window.glade
+++ b/data/glade/profile_window.glade
@@ -4,7 +4,6 @@
- 12
Personal Information
GTK_WINDOW_TOPLEVEL
GTK_WIN_POS_NONE
@@ -29,6 +28,7 @@
+ 6
True
True
True
@@ -92,7 +92,7 @@
True
True
- False
+ True
0
@@ -928,7 +928,7 @@
True
- Format: YYYY-MM-DD
+ Format: YYYY-MM-DD
True
False
@@ -1016,7 +1016,7 @@
- 0
+ 1
4
6
7
@@ -1024,6 +1024,34 @@
expand
+
+
+
+ True
+ Avatar:
+ False
+ False
+ GTK_JUSTIFY_LEFT
+ False
+ False
+ 0
+ 0.5
+ 0
+ 0
+ PANGO_ELLIPSIZE_NONE
+ -1
+ False
+ 0
+
+
+ 0
+ 1
+ 6
+ 7
+ fill
+
+
+
False
@@ -1800,159 +1828,201 @@
-
+
+ 6
True
- GTK_BUTTONBOX_END
- 12
+ False
+ 0
-
+
True
- True
- True
- GTK_RELIEF_NORMAL
- True
-
-
-
-
- True
- 0
- 0
- 0
- 0
- 0
- 0
- 0
- 0
-
-
-
- True
- False
- 2
-
-
-
- True
- gtk-go-up
- 4
- 0
- 0
- 0
- 0
-
-
- 0
- False
- False
-
-
-
-
-
- True
- _Publish
- True
- False
- GTK_JUSTIFY_LEFT
- False
- False
- 0
- 0.5
- 0
- 0
- PANGO_ELLIPSIZE_NONE
- -1
- False
- 0
-
-
- 0
- False
- False
-
-
-
-
-
-
+ GTK_PROGRESS_LEFT_TO_RIGHT
+ 0
+ 0.10000000149
+ PANGO_ELLIPSIZE_NONE
+
+ 0
+ False
+ False
+
-
+
True
- True
- True
- GTK_RELIEF_NORMAL
- True
-
+ GTK_BUTTONBOX_END
+ 12
-
+
True
- 0
- 0
- 0
- 0
- 0
- 0
- 0
- 0
+ True
+ True
+ GTK_RELIEF_NORMAL
+ True
+
-
+
True
- False
- 2
+ 0
+ 0
+ 0
+ 0
+ 0
+ 0
+ 0
+ 0
-
+
True
- gtk-go-down
- 4
- 0
- 0
- 0
- 0
-
-
- 0
- False
- False
-
-
+ False
+ 2
-
-
- True
- _Retrieve
- True
- False
- GTK_JUSTIFY_LEFT
- False
- False
- 0
- 0.5
- 0
- 0
- PANGO_ELLIPSIZE_NONE
- -1
- False
- 0
+
+
+ True
+ gtk-go-up
+ 4
+ 0
+ 0
+ 0
+ 0
+
+
+ 0
+ False
+ False
+
+
+
+
+
+ True
+ _Publish
+ True
+ False
+ GTK_JUSTIFY_LEFT
+ False
+ False
+ 0
+ 0.5
+ 0
+ 0
+ PANGO_ELLIPSIZE_NONE
+ -1
+ False
+ 0
+
+
+ 0
+ False
+ False
+
+
-
- 0
- False
- False
-
+
+
+
+ True
+ True
+ True
+ GTK_RELIEF_NORMAL
+ True
+
+
+
+
+ True
+ 0
+ 0
+ 0
+ 0
+ 0
+ 0
+ 0
+ 0
+
+
+
+ True
+ False
+ 2
+
+
+
+ True
+ gtk-go-down
+ 4
+ 0
+ 0
+ 0
+ 0
+
+
+ 0
+ False
+ False
+
+
+
+
+
+ True
+ _Retrieve
+ True
+ False
+ GTK_JUSTIFY_LEFT
+ False
+ False
+ 0
+ 0.5
+ 0
+ 0
+ PANGO_ELLIPSIZE_NONE
+ -1
+ False
+ 0
+
+
+ 0
+ False
+ False
+
+
+
+
+
+
+
+
+
+
+
+ True
+ True
+ True
+ gtk-close
+ True
+ GTK_RELIEF_NORMAL
+ True
+
+
+
+
+ 0
+ True
+ True
+
@@ -1961,6 +2031,18 @@
True
+
+
+
+ True
+ False
+
+
+ 0
+ False
+ False
+
+
diff --git a/data/glade/roster_window.glade b/data/glade/roster_window.glade
index fb37f4a29..23c7edaa3 100644
--- a/data/glade/roster_window.glade
+++ b/data/glade/roster_window.glade
@@ -10,7 +10,7 @@
GTK_WINDOW_TOPLEVEL
GTK_WIN_POS_NONE
False
- 150
+ 200
400
True
False
@@ -21,6 +21,7 @@
GDK_WINDOW_TYPE_HINT_NORMAL
GDK_GRAVITY_NORTH_WEST
True
+ False
@@ -35,6 +36,8 @@