Merged default branch with plugin-system branch. Not all elements are fully

functional. This should be considered as sync commit.

AUTHORS

@@ -1,15 +1,16 @@
 CURRENT DEVELOPERS:
 
-Yann Leboulanger (asterix AT lagaule.org)
 Nikos Kouremenos (kourem AT gmail.com)
-Travis Shirk (travis AT pobox.com)
+Yann Leboulanger (asterix AT lagaule.org)
-Stephan Erb (steve-e AT h3c.de)
 Julien Pivotto (roidelapluie AT gmail.com)
 Jonathan Schleifer (js-gajim AT webkeks.org)
+Travis Shirk (travis AT pobox.com)
+Brendan Taylor (whateley AT gmail.com)
+Jean-Marie Traissard (jim AT lapin.org)
 
 PAST DEVELOPERS:
 
-Jean-Marie Traissard (jim AT lapin.org)
 Stefan Bethge (stefan AT lanpartei.de)
-Dimitur Kirov (dkirov AT gmail.com)
+Stephan Erb (steve-e AT h3c.de)
 Vincent Hanquez (tab AT snarc.org)
+Dimitur Kirov (dkirov AT gmail.com)

ChangeLog

@@ -1,7 +1,101 @@
-Gajim 0.XX.X (svn)
+Gajim 0.12.1 (21 December 2008)
 
-  * Modified the format of emoticons list file, so we can choose the default code (#3696)
+  * Fix filetransfer
+  * Updated german translation
+  * Fix click on notifications when text string is empty
+  * Improve systray popup menu
+
+Gajim 0.12 (17 December 2008)
+
+  * Fix text rendering in notifications
+  * Fix forward unread messages under Windows
+  * Better sessions support
+  * Better auto-away support
+  * Fix banshee support
+  * Quodlibet support
+  * Fix GSSAPI authentification 
+  * Fix IPV4 filetransfer on Windows Vista when IPV6 is used too
+  * Fix caps usage
+  * Fix end to end encryption autonegotiation
+
+Gajim 0.12-beta1 (11 November 2008)
+
+  * SECURITY
+  * Implement Kerberos (GSSAPI) SASL Authentication mechanism
+  * Prevent affiliation spoofing in groupchats
+  * Improve GPG and E2E support
+
+  * GUI
+  * Highlight all valid IANA schemes
+  * Improved E2E, Mood and Activity dialogs
+  * Show number of participants in groupchats
+
+  * Connection
+  * Correctly parse IDNA names in SRV records
+  * Disable proxy resolution (#4299)
+  * Fix handling of namespace invalid XML
+  * Do not freeze on connection failures (#4366, #4107)
+
+  * OTHERS
+  * Do not crash on fluxbox restarts
+  * Update several hotkeys and make them work on non-latin keyboards
+  * Prevent a user from sending invalid XML chars
+  * Do not try to save a file with a too long filename when a nick is long
+  * Implement XEP-0203 (Delayed Delivery)
+  * Improved windows installer
+  * Latex support for windows
+
+Gajim 0.12-alpha1 (12 August 2008)
+
+  * Change licence from GPLv2 to GPLv3
+
+  * SECURITY
+  * Support for End-To-End encryption (XEP-0116)
+  * SSL certificate verification
+  * Improve GPG support (#2390, #2783)
+  * Ability to disable message previews in notify popups
+
+  * GROUP CHATS
+  * Support for sending files over group chats
   * List of bookmarked rooms is now sorted alphabetically
+  * Support for transforming a one-to-one chat into a groupchat
+  * Send invitation by drag-and-dropping a contact from roster
+  * Send messages to conference using gajim-remote
+  * Ability to destroy a room when we are owner, give a reason and alternative room jid
+  * Ability to minimize group chats in roster
+  
+  * USABILITY
+  * Files transfers using drag and drop
+  * Ability to select and interact with status messages in chat windows (using libsexy)
+  * Ability to set a custom avatar for a contact
+  * Better handling of resource collisions
+  * Option to Sign On as a Certain Status (#3314)
+  * Block/Unblock contact directly from roster using privacy lists
+  
+  * GUI
+  * Single window mode
+  * Close change status windows after 15 seconds of inactivity
+  * Simplified "Accounts" dialog
+  * Preferences window redesign
+  * New GUI for chat window
+  * Roster treeview now uses modelfilter (way way much faster)
+
+  * OTHER
+  * Support of PEP (Personal Eventing Protocol) (XEP-0163)
+    * User Mood (XEP-0107)
+    * User Activity (XEP-0108)
+    * User Tune (XEP-0118)
+    * User Nickname (XEP-0172)
+  * Support for Google Talk accounts with non gmail.com domain (+ GMail notifications)
+  * Modified the format of emoticons list file, so we can choose the default code (#3696)
+  * New Remote Controlling Option (XEP-0146): forward unread messages
+  * Support for User Search (XEP-0055)
+  * Support for jabber:x:data in message elements (Part of XEP-0004)
+  * Added a «supported features» window
+  * Latex support (#2796)
+  * Link-local messaging with Windows (#2883)
+  * Ability to send a custom status to a group, a contact or a transport
+  * Support of Message Receipts (XEP-0184)
 
 Gajim 0.11.4 (06 December 2007)
 

Makefile.am

@@ -8,7 +8,7 @@ else
 OPTIONAL_BIN =
 endif
 
-bin_SCRIPTS = scripts/gajim $(OPTIONAL_BIN)
+bin_SCRIPTS = scripts/gajim scripts/gajim-history-manager $(OPTIONAL_BIN)
 
 
 docfilesdir = $(docdir)
@@ -26,15 +26,17 @@ EXTRA_DIST = \
 	intltool-extract.in \
 	intltool-merge.in 	\
 	intltool-update.in	\
-	scripts/gajim.in	\
+	gajim.nsi \
-	scripts/gajim-remote.in
+	setup_win32.py \
+	scripts/gajim.in
 	
 DISTCLEANFILES = 		\
 	intltool-extract 	\
 	intltool-merge 		\
 	intltool-update		\
 	scripts/gajim		\
-	scripts/gajim-remote
+	scripts/gajim-remote	\
+	scripts/gajim-histrory-manager
 
 MAINTAINERCLEANFILES = \
 	configure \

README.html

@@ -15,8 +15,8 @@ Welcome to Gajim and thank you for trying out our client.
 
 <h2>Runtime Requirements</h2>
 <ul>
-<li>python2.4 or higher</li>
+<li>python2.5 or higher</li>
-<li>pygtk2.8 or higher</li>
+<li>pygtk2.12 or higher</li>
 <li>python-libglade</li>
 <li>pysqlite2 (if you have python 2.5, you already have this)</li>
 </ul>
@@ -30,15 +30,17 @@ Gajim is a GTK+ app that loves GNOME. You can do 'make' so you don't require gno
 <ul>
 <li><a href="http://pyopenssl.sourceforge.net/">PyOpenSSL</a> (python-pyopenssl package in Debian) for <em>secure</em> SSL/TLS. Python's default SSL is insecure, so this package is highly recommended!</li>
 <li>python-crypto to enable End to end encryption</li>
+<li>For idle module, libxss library</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; if you don't know what that is, you don't need it</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>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>notification-daemon or notify-python (and D-Bus) to get cooler popups</li>
-<li>D-Bus running to have gajim-remote working</li>
+<li>D-Bus running to have gajim-remote working. Some distributions split dbus-x11, which is needed for dbus to work with Gajim.</li>
 <li>python-dbus bindings</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>
 </ul>
 
 <p>
@@ -52,9 +54,9 @@ the xml lib that *comes* with python and not pyxml or whatever.
 <li>python-dev</li>
 <li>python-gtk2-dev</li>
 <li>libgtk2.0-dev aka. gtk2-devel</li>
-<li>libxss-dev (for idle detection module; some distributions such as Debian split xscreensaver)</li>
 <li>libgtkspell-dev	(for the gtkspell module)</li>
-<li>intltool</li>
+<li>libdbus-1-dev	(for the remote control module)</li>
+<li>intltool (>= 0.40.1)</li>
 </ul>
 
 <p>
@@ -94,7 +96,7 @@ You will need GNU autotools in order to install Gajim from svn. This includes:
 <li>automake &gt;= 1.8 </li>
 <li>autoconf &gt;= 2.59 </li>
 <li>libtool</li>
-<li>intltool-0.35.0 </li>
+<li>intltool-0.40.1 </li>
 <li>pkgconfig &gt;= 0.19</li>
 </ul>
 </p>
@@ -141,7 +143,7 @@ That is all, <strong>enjoy!</strong>
 <br/>
 <br/>
 <br/>
-(C) 2003-2006<br/>
+(C) 2003-200888888888<br/>
 The Gajim Team<br/>
 http://gajim.org<br/>
 <br/>

README.osx

@@ -1,100 +0,0 @@
-Introduction
-------------
-
-This is an alpha release of Gajim for OS/X using native GTK+. It is not finished
-nor is it relatively stable. The native port of GTK+ is alpha and not stable
-yet, though it has proven to be usable for Gajim. Having said that it is usable,
-basic functionality works. See the TODO file for a list of what is and is not
-working.
-
-
-
-Installing
-----------
-
-Install the GTK+ framework into your /Library/Frameworks directory. It can be
-found at http://codepunks.org/gajim.
-NOTE: If you're able to make it work with official GTK release, we are VERY interested !!
-
-Copy the Gajim.app into the /Applications directory or any other directory.
-
-
-Installing language dictionaries
---------------------------------
-
-The codepunks.org build of the GTK+ framework comes with the US English
-dictionary pre-installed. If you wish to install a different dictionary download
-the appropriate dictionary from here:
-
-http://ftp.gnu.org/gnu/aspell/dict/
-
-Then follow these instructions:
-
-source /Library/Frameworks/GTK+.framework/Versions/Current/bin/env
-tar -jxf aspell-<lang>-<version>.tbz2
-cd aspell-<lang>-<version>
-./configure
-make
-make install
-
-
-Compiling Requirements
-----------------------
-These instructions were gathered for building a universal binary on a PPC. The
-steps for building on an i386 should be essentially the same.
-
-Requirements:
-- OS/X 10.4, i386 or ppc
-- Universal MacPython 2.5
-    http://www.pythonmac.org/packages/py25-fat/index.html
-- Latest XCode (2.4.0 or greater)
-- py2app
-    http://svn.pythonmac.org/py2app/py2app/trunk/doc/index.html
-
-Install all of the requirements. Make sure that the universal MacPython is
-installed before py2app. Then ensure that this is the first python in your
-PATH.
-
-    export PATH=/Library/Frameworks/Python.framework/Versions/2.5/bin:$PATH
-
-Then install py2app.
-
-
-Compiling
----------
-
-In the top level run the configure script. If this is source is from subversion
-then run the autogen.sh script. Follow it up with a make:
-
-    ./configure
-        or
-    ./autogen.sh
-    make
-
-Once that is done Gajim can be run from the source tree. You may also create an
-app bundle suitable for use or distribution. To do that run:
-
-    python setup_osx.py build
-
-The Gajim.app bundle is created in the dist directory. This bundle is ready
-for use as is. Copy it to your /Applications directory and you're good to go.
-
-You now have a self contained (almost, requires GTK+.framework still) universal
-native build of Gajim.
-
-Optionally to create a distribution of the Gajim app bundle do:
-
-    python setup_osx.py dist
-
-
-
-Development
------------
-
-It is possible to run Gajim correctly from the app bundle but still use the 
-python code in the source tree. This line must be added to the _run() function 
-in the Gajim.app/Resources/__boot__.py file. It needs to be located just after
-the sys module is imported. Font forget to fix the path to match your
-environment.
-
-sys.path = ["/Users/user/Source/gajim/src"] + sys.path

THANKS.artists

@@ -4,3 +4,4 @@ Dennis Craven
 Guillaume Morin
 Josef Vybíral
 Membris Khan
+Rederick Asher

TODO.pep

@@ -6,8 +6,3 @@ Tune use cases:
 
 Tooltips use cases:
 • Show PEP in GC tooltips
-
-Mood/Activity use cases
-• on connection of an account set them to None
-• on disconnection of an account set them to None
-• on explicit set publish them

autogen.sh

@@ -19,6 +19,8 @@
 
   which glibtoolize >/dev/null 2>&1 && LIBTOOLIZE="glibtoolize" || LIBTOOLIZE="libtoolize"
 
+  mkdir -p config
+
   intltoolize --force --automake \
   && aclocal -I ./m4 \
   && $LIBTOOLIZE --copy --force --automake \

autopackage/default.apspec

@@ -9,7 +9,7 @@ Packager: Filippos Papadopoulos <psybases@gmail.com>
 Summary: Gajim is a Jabber client written in Python.
 URL: http://www.gajim.org/
 License: GNU General Public License, Version 2
-SoftwareVersion: 0.11.1
+SoftwareVersion: 0.12-alpha1
 AutopackageTarget: 1.0
 PackageVersion: 1
 

config.h.in

@@ -1,95 +0,0 @@
-/* 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 <dlfcn.h> 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 <inttypes.h> header file. */
-#undef HAVE_INTTYPES_H
-
-/* Define if your <locale.h> file defines LC_MESSAGES. */
-#undef HAVE_LC_MESSAGES
-
-/* Define to 1 if you have the <libintl.h> 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 <locale.h> header file. */
-#undef HAVE_LOCALE_H
-
-/* Define to 1 if you have the <memory.h> header file. */
-#undef HAVE_MEMORY_H
-
-/* Define to 1 if you have the <stdint.h> header file. */
-#undef HAVE_STDINT_H
-
-/* Define to 1 if you have the <stdlib.h> header file. */
-#undef HAVE_STDLIB_H
-
-/* Define to 1 if you have the <strings.h> header file. */
-#undef HAVE_STRINGS_H
-
-/* Define to 1 if you have the <string.h> header file. */
-#undef HAVE_STRING_H
-
-/* Define to 1 if you have the <sys/stat.h> header file. */
-#undef HAVE_SYS_STAT_H
-
-/* Define to 1 if you have the <sys/types.h> header file. */
-#undef HAVE_SYS_TYPES_H
-
-/* Define to 1 if you have the <unistd.h> header file. */
-#undef HAVE_UNISTD_H
-
-/* Define to the sub-directory in which libtool stores uninstalled libraries.
-   */
-#undef LT_OBJDIR
-
-/* 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

configure.ac

@@ -1,9 +1,12 @@
 AC_INIT([Gajim - A Jabber Instant Messager],
-		[0.11.4.4-svn],[http://trac.gajim.org/],[gajim])
+		[0.12.1.5-svn],[http://trac.gajim.org/],[gajim])
 AC_PREREQ([2.59])
-AM_INIT_AUTOMAKE([1.8])
+
 AC_CONFIG_HEADER(config.h)
+AC_CONFIG_AUX_DIR(config)
 AC_CONFIG_MACRO_DIR([m4])
+
+AM_INIT_AUTOMAKE([1.8])
 AM_MAINTAINER_MODE
 
 dnl Make Objective-C work with automake
@@ -46,7 +49,7 @@ dnl *****
 dnl dbus
 dnl *****
 AC_ARG_ENABLE([remote], 
-  [  --disable-remote        enable remote control via DBus [default auto]],
+  [  --disable-remote        disable remote control via DBus [default auto]],
   enable_remote=$enableval, enable_remote=auto)
 
 if test "x$enable_remote" = "xauto"; then
@@ -63,61 +66,7 @@ else
 fi
 AM_CONDITIONAL(BUILD_REMOTE_CONTROL, $have_remote)
 
-dnl ****
+AM_PATH_PYTHON([2.5])
-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-L";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
@@ -126,7 +75,7 @@ dnl ****
 dnl tray icon
 dnl ****
 AC_ARG_ENABLE(trayicon,
-  [  --disable-trayicon      build trayicon module [default yes]],
+  [  --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)
@@ -135,7 +84,7 @@ dnl ****
 dnl Cocoa
 dnl ****
 AC_ARG_ENABLE([cocoa],
-  [  --disable-cocoa         build cocoa integration [default auto]],
+  [  --disable-cocoa         do not build cocoa integration [default auto]],
   enable_cocoa=$enableval, enable_cocoa=yes)
 
 if test "x$enable_cocoa" = "xyes";then 
@@ -163,7 +112,7 @@ dnl ****
 dnl Carbon
 dnl ****
 AC_ARG_ENABLE([carbon],
-  [  --disable-carbon        build with carbon [default auto]],
+  [  --disable-carbon        do not build with carbon [default auto]],
   enable_carbon=$enableval, enable_carbon=yes)
 
 if test "x$enable_carbon" = "xyes";then 
@@ -180,9 +129,6 @@ if test "x$enable_carbon" = "xyes";then
   if test "x$CARBON_LIBS" != "x";then
 	 AC_SUBST(CARBON_LIBS)
      have_idle_osx=true
-     dnl Disable X11 idle
-     have_idle=false
-     AM_CONDITIONAL(BUILD_IDLE, false)
      dnl Disable custom trayicon
      have_trayicon=gtk+
      AM_CONDITIONAL(BUILD_TRAYICON, false)
@@ -207,18 +153,12 @@ 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(LIBDIR, ${libdir})
-
 AS_AC_EXPAND(DOCDIR, "${docdir}")
+AS_AC_EXPAND(LOCALEDIR, "${localedir}")
 
 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
@@ -227,25 +167,25 @@ AC_CONFIG_FILES([
 	data/emoticons/Makefile
 	data/pixmaps/Makefile
 	data/iconsets/Makefile
+	data/moods/Makefile
+	data/activities/Makefile
 	data/gajim.desktop.in
 	data/defs.py
 	src/Makefile
-	src/common/Makefile
 	src/osx/Makefile
 	src/osx/growl/Makefile
 	src/osx/syncmenu/Makefile
 	scripts/gajim
-	scripts/gajim-remote
+	scripts/gajim-remote:scripts/gajim.in
+	scripts/gajim-history-manager:scripts/gajim.in
 	po/Makefile.in
 ])
 AC_OUTPUT
 echo " 
 ***************************** 
   Build features:
-    spell check ...... ${have_gtkspell}
-    idle module ...... ${have_idle}
     remote control ... ${have_remote}
     trayicon ......... ${have_trayicon}
     idle module OSX .. ${have_idle_osx}
-    cocoa ............ ${have_cocoa}
+    cocoa (OSX)....... ${have_cocoa}
 *****************************"

data/Makefile.am

@@ -1,4 +1,4 @@
-SUBDIRS = glade emoticons pixmaps iconsets 
+SUBDIRS = glade emoticons pixmaps iconsets moods activities
 @INTLTOOL_DESKTOP_RULE@
 
 desktopdir = $(datadir)/applications

data/activities/Makefile.am

@@ -0,0 +1,38 @@
+activitiesdir = $(pkgdatadir)/data/activities
+
+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

data/defs.py.in

@@ -5,3 +5,5 @@ docdir = "@DOCDIR@"
 datadir = "@DATADIR@"
 
 version = "@VERSION@"
+
+localedir = "@LOCALEDIR@"

data/emoticons/animated/emoticons.py

@@ -1,37 +1,37 @@
 # coding=utf-8
 emoticons = {
-	'smile.png': [':)', ':-)', '^_^', '^^'],
+	'smile.png': [':-)', ':)'],
 	'coolglasses.png': ['B-)', '(H)'],
-	'wink.gif': [';)', ';-)'],
+	'wink.gif': [';-)', ';)'],
-	'biggrin.png': [':D', ':-D', ':>', ':->', 'xD'],
+	'biggrin.png': [':-D', ':D'],
-	'unhappy.png': [':(', ':-('],
+	'unhappy.png': [':-(', ':('],
-	'cry.gif': [":'(", ';-(', ';(', ";'-(", ';_;'],
+	'cry.gif': [":'-(", ":'(", ';-(', ';(', ";'-("],
-	'frowning.png': [':/', ':-/', ':S', ':-S'],
+	'frowning.png': [':-/', ':/', ':-\\', ':\\', ':-S', ':S'],
-	'blush.png': [':$', ':-$'],
+	'blush.png': [':-$', ':$'],
-	'angry.png': [':@', ':-@'],
+	'angry.png': [':-@', ':@'],
-	'bat.gif': [':[', ':-['],
+	'bat.gif': [':-[', ':['],
-	'kiss.png': [':*', ':-*', '(K)'],
+	'kiss.png': [':-{}', ':-*', ':*', '(K)'],
-	'stare.png': [':|', ':-|'],
+	'stare.png': [':-|', ':|'],
-	'devil.png': ['>:)', '>:-)', '(6)'],
+	'devil.png': [']:->', '>:-)', '>:)', '(6)'],
-	'tongue.png': [':P', ':-P', ':-þ', ':þ'],
+	'tongue.png': [':-P', ':P', ':-þ', ':þ'],
-	'oh.png': [':O', ':-O', 'O.O', 'O_O'],
+	'oh.png': ['=-O', ':-O', ':O'],
-	'heart.png': ['<3', '(L)'],
+	'heart.png': ['<3', '(L)', '*IN LOVE*'],
 	'pussy.png': ['(@)'],
 	'cuffs.png': ['(%)'],
 	'moon.png': ['(S)'],
 	'lamp.png': ['(I)'],
 	'music.png': ['(8)'],
-	'beer.png': ['(B)'],
+	'beer.png': ['(B)', '*DRINK*'],
 	'brflower.png': ['(W)'],
 	'boy.png': ['(Z)'],
 	'girl.png': ['(X)'],
 	'mail.png': ['(E)'],
 	'thumbdown.png': ['(N)'],
 	'photo.png': ['(P)'],
-	'thumbup.png': ['(Y)'],
+	'thumbup.png': ['(Y)', '*THUMBS UP*'],
 	'hugleft.png': ['(})'],
-	'brheart.png': ['(U)', '</3'],
+	'brheart.png': ['</3', '(U)'],
-	'flower.png': ['(F)'],
+	'flower.png': ['@}->--', '(F)'],
 	'drink.png': ['(D)'],
 	'phone.png': ['(T)'],
 	'coffee.png': ['(C)'],
@@ -46,5 +46,7 @@ emoticons = {
 	'party.gif': ['<:o)'],
 	'sleepy.gif': ['|-)'],
 	'think.gif': ['*-)'],
+	'puke.gif': [':-!'],
 }
 
+# vim: se ts=3:

data/emoticons/static-big/emoticons.py

@@ -1,42 +1,45 @@
 # coding=utf-8
 emoticons = {
-	'smile.png': [':)', ':-)', '^_^', '^^'],
+	'smile.png': [':-)', ':)'],
 	'coolglasses.png': ['8-)', 'B-)', '(H)'],
-	'wink.png': [';)', ';-)'],
+	'wink.png': [';-)', ';)'],
-	'biggrin.png': [':D', ':-D', ':>', ':->', 'xD'],
+	'biggrin.png': [':-D', ':D'],
-	'unhappy.png': [':(', ':-('],
+	'unhappy.png': [':-(', ':('],
-	'cry.png': [":'(", ';-(', ';(', ";'-(", ';_;'],
+	'cry.png': [":'-(", ":'(", ';-(', ';(', ";'-("],
-	'frowning.png': [':/', ':-/', ':S', ':-S'],
+	'frowning.png': [':-/', ':/', ':-\\', ':\\', ':-S', ':S'],
-	'blush.png': [':$', ':-$'],
+	'blush.png': [':-$', ':$'],
-	'angry.png': [':@', ':-@'],
+	'angry.png': [':-@', ':@'],
-	'bat.png': [':[', ':-['],
+	'bat.png': [':-[', ':['],
-	'kiss.png': [':*', ':-*', '(K)'],
+	'kiss.png': [':-{}', ':-*', ':*', '(K)'],
-	'stare.png': [':|', ':-|'],
+	'stare.png': [':-|', ':|'],
-	'devil.png': ['>:)', '>:-)', '(6)'],
+	'devil.png': [']:->', '>:-)', '>:)', '(6)'],
-	'tongue.png': [':P', ':-P', ':-þ', ':þ'],
+	'tongue.png': [':-P', ':P', ':-þ', ':þ'],
-	'oh.png': [':O', ':-O', 'O.O', 'O_O'],
+	'oh.png': ['=-O', ':-O', ':O'],
-	'heart.png': ['<3', '(L)'],
+	'heart.png': ['<3', '(L)', '*IN LOVE*'],
 	'lion.png': [':3', '>:3'],
 	'pussy.png': ['(@)', '=^.^='],
 	'cuffs.png': ['(%)'],
 	'moon.png': ['(S)'],
 	'lamp.png': ['(I)'],
 	'music.png': ['(8)'],
-	'beer.png': ['(B)'],
+	'beer.png': ['(B)', '*DRINK*'],
 	'brflower.png': ['(W)'],
 	'boy.png': ['(Z)'],
 	'girl.png': ['(X)'],
 	'mail.png': ['(E)'],
 	'thumbdown.png': ['(N)'],
 	'photo.png': ['(P)'],
-	'thumbup.png': ['(Y)'],
+	'thumbup.png': ['(Y)', '*THUMBS UP*'],
 	'hugleft.png': ['(})'],
-	'brheart.png': ['(U)', '</3'],
+	'brheart.png': ['</3', '(U)'],
-	'flower.png': ['(F)'],
+	'flower.png': ['@}->--', '(F)'],
 	'drink.png': ['(D)'],
 	'phone.png': ['(T)'],
 	'coffee.png': ['(C)'],
 	'hugright.png': ['({)'],
 	'star.png': ['(*)'],
 	'rainbow.png': ['(R)'],
+	'puke.png': [':-!'],
 }
+
+# vim: se ts=3:

data/emoticons/static/emoticons.py

@@ -1,42 +1,45 @@
 # coding=utf-8
 emoticons = {
-	'smile.png': [':)', ':-)', '^_^', '^^'],
+	'smile.png': [':-)', ':)'],
 	'coolglasses.png': ['8-)', 'B-)', '(H)'],
-	'wink.png': [';)', ';-)'],
+	'wink.png': [';-)', ';)'],
-	'biggrin.png': [':D', ':-D', ':>', ':->', 'xD'],
+	'biggrin.png': [':-D', ':D'],
-	'unhappy.png': [':(', ':-('],
+	'unhappy.png': [':-(', ':('],
-	'cry.png': [":'(", ';-(', ';(', ";'-(", ';_;'],
+	'cry.png': [":'-(", ":'(", ';-(', ';(', ";'-("],
-	'frowning.png': [':/', ':-/', ':S', ':-S'],
+	'frowning.png': [':-/', ':/', ':-\\', ':\\', ':-S', ':S'],
-	'blush.png': [':$', ':-$'],
+	'blush.png': [':-$', ':$'],
-	'angry.png': [':@', ':-@'],
+	'angry.png': [':-@', ':@'],
-	'bat.png': [':[', ':-['],
+	'bat.png': [':-[', ':['],
-	'kiss.png': [':*', ':-*', '(K)'],
+	'kiss.png': [':-{}', ':-*', ':*', '(K)'],
-	'stare.png': [':|', ':-|'],
+	'stare.png': [':-|', ':|'],
-	'devil.png': ['>:)', '>:-)', '(6)'],
+	'devil.png': [']:->', '>:-)', '>:)', '(6)'],
-	'tongue.png': [':P', ':-P', ':-þ', ':þ'],
+	'tongue.png': [':-P', ':P', ':-þ', ':þ'],
-	'oh.png': [':O', ':-O', 'O.O', 'O_O'],
+	'oh.png': ['=-O', ':-O', ':O'],
-	'heart.png': ['<3', '(L)'],
+	'heart.png': ['<3', '(L)', '*IN LOVE*'],
 	'lion.png': [':3', '>:3'],
 	'pussy.png': ['(@)', '=^.^='],
 	'cuffs.png': ['(%)'],
 	'moon.png': ['(S)'],
 	'lamp.png': ['(I)'],
 	'music.png': ['(8)'],
-	'beer.png': ['(B)'],
+	'beer.png': ['(B)', '*DRINK*'],
 	'brflower.png': ['(W)'],
 	'boy.png': ['(Z)'],
 	'girl.png': ['(X)'],
 	'mail.png': ['(E)'],
 	'thumbdown.png': ['(N)'],
 	'photo.png': ['(P)'],
-	'thumbup.png': ['(Y)'],
+	'thumbup.png': ['(Y)', '*THUMBS UP*'],
 	'hugleft.png': ['(})'],
-	'brheart.png': ['(U)', '</3'],
+	'brheart.png': ['</3', '(U)'],
-	'flower.png': ['(F)'],
+	'flower.png': ['@}->--', '(F)'],
 	'drink.png': ['(D)'],
 	'phone.png': ['(T)'],
 	'coffee.png': ['(C)'],
 	'hugright.png': ['({)'],
 	'star.png': ['(*)'],
 	'rainbow.png': ['(R)'],
+	'puke.png': [':-!'],
 }
+
+# vim: se ts=3:

data/glade/account_creation_wizard_window.glade

@@ -35,6 +35,7 @@ to the Jabber network.</property>
                 <child>
                   <widget class="GtkFrame" id="frame33">
                     <property name="visible">True</property>
+                    <property name="label_xalign">0</property>
                     <property name="shadow_type">GTK_SHADOW_NONE</property>
                     <child>
                       <widget class="GtkAlignment" id="alignment68">
@@ -128,22 +129,14 @@ to the Jabber network.</property>
                 <child>
                   <widget class="GtkTable" id="table27">
                     <property name="visible">True</property>
-                    <property name="n_rows">4</property>
+                    <property name="n_rows">2</property>
-                    <property name="n_columns">3</property>
+                    <property name="n_columns">4</property>
                     <property name="column_spacing">12</property>
                     <property name="row_spacing">6</property>
-                    <child>
-                      <placeholder/>
-                    </child>
-                    <child>
-                      <placeholder/>
-                    </child>
                     <child>
                       <widget class="GtkEntry" id="username_entry">
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
-                        <property name="has_focus">True</property>
-                        <signal name="changed" handler="on_username_entry_changed"/>
                         <signal name="key_press_event" handler="on_username_entry_key_press_event"/>
                       </widget>
                       <packing>
@@ -152,38 +145,6 @@ to the Jabber network.</property>
                         <property name="y_options"></property>
                       </packing>
                     </child>
-                    <child>
-                      <widget class="GtkLabel" id="label267">
-                        <property name="visible">True</property>
-                        <property name="xalign">0</property>
-                        <property name="label" translatable="yes">_Server:</property>
-                        <property name="use_underline">True</property>
-                      </widget>
-                      <packing>
-                        <property name="top_attach">1</property>
-                        <property name="bottom_attach">2</property>
-                        <property name="x_options">GTK_FILL</property>
-                        <property name="y_options"></property>
-                      </packing>
-                    </child>
-                    <child>
-                      <widget class="GtkComboBoxEntry" id="server_comboboxentry">
-                        <property name="visible">True</property>
-                        <signal name="changed" handler="on_server_comboboxentry_changed"/>
-                        <child internal-child="entry">
-                          <widget class="GtkEntry" id="comboboxentry-entry1">
-                          </widget>
-                        </child>
-                      </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>
-                        <property name="x_options">GTK_FILL</property>
-                        <property name="y_options">GTK_FILL</property>
-                      </packing>
-                    </child>
                     <child>
                       <widget class="GtkLabel" id="label263">
                         <property name="visible">True</property>
@@ -193,8 +154,8 @@ to the Jabber network.</property>
                         <property name="mnemonic_widget">password_entry</property>
                       </widget>
                       <packing>
-                        <property name="top_attach">2</property>
+                        <property name="top_attach">1</property>
-                        <property name="bottom_attach">3</property>
+                        <property name="bottom_attach">2</property>
                         <property name="x_options">GTK_FILL</property>
                         <property name="y_options"></property>
                       </packing>
@@ -214,9 +175,9 @@ to the Jabber network.</property>
                       </widget>
                       <packing>
                         <property name="left_attach">2</property>
-                        <property name="right_attach">3</property>
+                        <property name="right_attach">4</property>
-                        <property name="top_attach">2</property>
+                        <property name="top_attach">1</property>
-                        <property name="bottom_attach">3</property>
+                        <property name="bottom_attach">2</property>
                         <property name="x_options">GTK_FILL</property>
                         <property name="y_options"></property>
                       </packing>
@@ -231,8 +192,8 @@ to the Jabber network.</property>
                       <packing>
                         <property name="left_attach">1</property>
                         <property name="right_attach">2</property>
-                        <property name="top_attach">2</property>
+                        <property name="top_attach">1</property>
-                        <property name="bottom_attach">3</property>
+                        <property name="bottom_attach">2</property>
                         <property name="y_options"></property>
                       </packing>
                     </child>
@@ -240,7 +201,7 @@ to the Jabber network.</property>
                       <widget class="GtkLabel" id="label262">
                         <property name="visible">True</property>
                         <property name="xalign">0</property>
-                        <property name="label" translatable="yes">_Username:</property>
+                        <property name="label" translatable="yes">_Jabber ID:</property>
                         <property name="use_underline">True</property>
                         <property name="mnemonic_widget">username_entry</property>
                       </widget>
@@ -250,37 +211,35 @@ to the Jabber network.</property>
                       </packing>
                     </child>
                     <child>
-                      <widget class="GtkLabel" id="label258">
+                      <widget class="GtkLabel" id="label1">
                         <property name="visible">True</property>
                         <property name="xalign">0</property>
-                        <property name="label" translatable="yes">Your JID:</property>
+                        <property name="label" translatable="yes">@</property>
                       </widget>
                       <packing>
-                        <property name="top_attach">3</property>
+                        <property name="left_attach">2</property>
-                        <property name="bottom_attach">4</property>
+                        <property name="right_attach">3</property>
-                        <property name="x_options">GTK_FILL</property>
+                        <property name="x_options"></property>
-                        <property name="y_options"></property>
                       </packing>
                     </child>
                     <child>
-                      <widget class="GtkLabel" id="jid_label">
+                      <widget class="GtkComboBoxEntry" id="server_comboboxentry">
                         <property name="visible">True</property>
-                        <property name="can_focus">True</property>
+                        <child internal-child="entry">
-                        <property name="xalign">0</property>
+                          <widget class="GtkEntry" id="comboboxentry-entry1">
-                        <property name="use_markup">True</property>
+                          </widget>
-                        <property name="selectable">True</property>
+                        </child>
                       </widget>
                       <packing>
-                        <property name="left_attach">1</property>
+                        <property name="left_attach">3</property>
-                        <property name="right_attach">3</property>
+                        <property name="right_attach">4</property>
-                        <property name="top_attach">3</property>
-                        <property name="bottom_attach">4</property>
                         <property name="x_options">GTK_FILL</property>
-                        <property name="y_options"></property>
+                        <property name="y_options">GTK_FILL</property>
                       </packing>
                     </child>
                   </widget>
                   <packing>
+                    <property name="expand">False</property>
                     <property name="position">1</property>
                   </packing>
                 </child>
@@ -344,22 +303,6 @@ to the Jabber network.</property>
                         <property name="position">1</property>
                       </packing>
                     </child>
-                    <child>
-                      <widget class="GtkButton" id="server_features_button">
-                        <property name="visible">True</property>
-                        <property name="can_focus">True</property>
-                        <property name="tooltip" translatable="yes">Click to see features (like MSN, ICQ transports) of jabber servers</property>
-                        <property name="label" translatable="yes">Servers Features</property>
-                        <property name="use_underline">True</property>
-                        <property name="response_id">0</property>
-                        <signal name="clicked" handler="on_register_server_features_button_clicked"/>
-                      </widget>
-                      <packing>
-                        <property name="expand">False</property>
-                        <property name="fill">False</property>
-                        <property name="position">2</property>
-                      </packing>
-                    </child>
                   </widget>
                   <packing>
                     <property name="expand">False</property>