diff --git a/ChangeLog b/ChangeLog index 9cea195b7..d3679a949 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,4 +1,47 @@ -Gajim 0.13 (XX November 2009) +Gajim 0.14 (XX) + + * Jingle audio / video chat + * Improve Startup time + * Copy emoticons, LaTeX expressions when they are selected + * Fix status icon transparency by using gtk.statusicon + * Groupchat auto-rejoin + * geolocation (with geoclue) + * use XDG standards + * SCRAM-SHA-1 and SASL EXTERNAL authentication + * MUC captcha + * Lots of refactoring + +Gajim 0.13.4 (02 April 2010) + + * Add japanese translation + * Fix some TLS connection + * Don't raise a lot of "DB Error" dialog + * Fix contact synchronisation + * Minor fixes + +Gajim 0.13.3 (23 February 2010) + + * Fix facebook xmpp server connection + * Fix copy / paste with Ctrl+C on non-latin keyboard + * Fix sending PEP information when connecting + * Fix parsing HTML messages that have ascii markup + +Gajim 0.13.2 (14 January 2010) + + * Fix some translations + * Fix string comparison according to locales + * Fix resizing of groupchat occupant treeview + * Fix some gnomekeyring glitches + * better SRV usage with libasyncns + * copy emoticons when we copy / paste in conversations + +Gajim 0.13.1 (28 November 2009) + + * Fix a bug when no account exists and bonjour is not available + * Fix a bug when opening advanced option in MUC + * Fix a bug when using non-BOSH proxies + +Gajim 0.13 (24 November 2009) * Improve gtkspell (fix memleak) * BOSH connection @@ -44,7 +87,7 @@ Gajim 0.12.2 (07 June 2009) * Improve error messages handling * Totem support for played music * 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 * Network manager 0.7 support * Move logs file under windows to $APPDATA/gajim diff --git a/Makefile.am b/Makefile.am index 4e70251bd..14ddf443d 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1,4 +1,4 @@ -SUBDIRS = src data po icons +SUBDIRS = src data plugins po icons ACLOCAL_AMFLAGS = -I m4 diff --git a/README.html b/README.html index f9454b46a..c7395c94b 100644 --- a/README.html +++ b/README.html @@ -63,7 +63,7 @@

To specify where to install do:

-    su -c make PREFIX=custom_path install
+    ./configure --prefix=custom_path
 

Running Gajim

@@ -98,7 +98,8 @@ or if you didn't 'make install' you can also run from gajim folder with./lau If you want to remove it from custom directory provide it as:

-    make PREFIX=custom_path uninstall
+    ./configure --prefix=custom_path
+    make uninstall
 

Miscellaneous

diff --git a/autogen.sh b/autogen.sh index 7e2f228e8..9d1f65b4b 100755 --- a/autogen.sh +++ b/autogen.sh @@ -1,4 +1,12 @@ #!/usr/bin/env bash + gajimversion="0.13.90.1" + if [ -d ".hg" ]; then + hgversion="-$(hexdump -n6 -e'6/1 "%02x"' .hg/dirstate)" + else + hgversion="" + fi + echo "define([AC_PACKAGE_VERSION], [${gajimversion}${hgversion}])" > m4/hgversion.m4 + AM_ARGS="--add-missing --gnu --copy" CONF_ARGS="" if test x`uname -s 2>/dev/null` = 'xDarwin' -a -f /Library/Frameworks/GTK+.framework/Versions/Current/env; then diff --git a/configure.ac b/configure.ac index d5fcf0c68..0dfcb4fb9 100644 --- a/configure.ac +++ b/configure.ac @@ -1,5 +1,5 @@ AC_INIT([Gajim - A Jabber Instant Messager], - [0.13.10.2-dev],[http://trac.gajim.org/],[gajim]) + ["version-set-in-hgversion"],[http://trac.gajim.org/],[gajim]) AC_PREREQ([2.59]) AC_CONFIG_HEADER(config.h) @@ -65,14 +65,17 @@ AC_ARG_ENABLE(site-packages, instead of DATADIR/gajim/src.])] , AC_SUBST([gajim_srcdir], [\${pkgpythondir}]) +AC_SUBST([gajim_pluginsdir], [\${pkgpythondir}]) , AC_SUBST([gajim_srcdir], [\${datadir}/\${PACKAGE}/src]) +AC_SUBST([gajim_pluginsdir], [\${datadir}/\${PACKAGE}/plugins]) ) AS_AC_EXPAND(GAJIM_SRCDIR, "${gajim_srcdir}") AS_AC_EXPAND(PKGDATADIR, "${datadir}/${PACKAGE}") AS_AC_EXPAND(DOCDIR, "${docdir}") AS_AC_EXPAND(LOCALEDIR, "${localedir}") +AS_AC_EXPAND(GAJIM_PLUGINSDIR, "${gajim_pluginsdir}") AC_SUBST(VERSION) AC_SUBST(PACKAGE) @@ -94,6 +97,7 @@ AC_CONFIG_FILES([ scripts/gajim-remote:scripts/gajim.in scripts/gajim-history-manager:scripts/gajim.in po/Makefile.in + plugins/Makefile ]) AC_OUTPUT echo " @@ -101,6 +105,7 @@ echo " Installation: Prefix ........... ${prefix} Python modules ... ${GAJIM_SRCDIR} + Plugins .. ....... ${GAJIM_PLUGINSDIR} Documentation .... ${DOCDIR} Others ........... ${PKGDATADIR} *****************************" diff --git a/data/Makefile.am b/data/Makefile.am index 4d7e118e5..827882796 100644 --- a/data/Makefile.am +++ b/data/Makefile.am @@ -14,7 +14,7 @@ sounds_DATA = $(srcdir)/sounds/*.wav otherdir = $(pkgdatadir)/data/other other_DATA = other/servers.xml other/cacerts.pem -man_MANS = gajim.1 gajim-remote.1 +man_MANS = gajim.1 gajim-remote.1 gajim-history-manager.1 EXTRA_DIST = $(desktop_in_files) \ diff --git a/data/gajim-history-manager.1 b/data/gajim-history-manager.1 new file mode 100644 index 000000000..5500b9f86 --- /dev/null +++ b/data/gajim-history-manager.1 @@ -0,0 +1,21 @@ +.\" 20050901 +.TH "Gajim-history-manager" "1" "September 01, 2005" "Gajim dev team" "" +.SH "NAME" +Gajim-history-manager \- Tool to manage gajim logs +.SH "SYNOPSIS" +.B gajim-history-manager [\-c config-path] [\-h] +.SH "DESCRIPTION" +.B Gajim-history-manager +is a tool to manage (do some cleanup) log file of Gajim jabber client. +.PP +.SH "OPTIONS" +.TP +\fB\-c\fR, \fB\-\-config-path\fR path +Path where logs.db is located. ~/.gajim by default. +.TP +\fB\-h\fR, \fB\-\-help\fR +Print this help. +.SH "FEEDBACK" +You can report bugs or feature requests in http://trac.gajim.org or in the mailing list: http://lists.gajim.org/cgi\-bin/listinfo/gajim\-devel. You can also find us in our room gajim@conference.gajim.org +.SH "AUTHORS" +Written by Yann Le Boulanger , Nikos Kouremenos and Dimitur Kirov . diff --git a/data/gui/account_creation_wizard_window.ui b/data/gui/account_creation_wizard_window.ui index c6a3ec35a..7be526ec7 100644 --- a/data/gui/account_creation_wizard_window.ui +++ b/data/gui/account_creation_wizard_window.ui @@ -217,7 +217,7 @@ to the Jabber network. True 0 - @ + @ 2 diff --git a/data/gui/adhoc_commands_window.ui b/data/gui/adhoc_commands_window.ui index 4901df232..0f0819dd5 100644 --- a/data/gui/adhoc_commands_window.ui +++ b/data/gui/adhoc_commands_window.ui @@ -422,6 +422,21 @@ 3 + + + F_inish + True + True + True + True + + + + False + False + 4 + + gtk-close @@ -435,7 +450,7 @@ False False - 4 + 5 diff --git a/data/gui/advanced_menuitem_menu.ui b/data/gui/advanced_menuitem_menu.ui index f9ac23da2..1c1869400 100644 --- a/data/gui/advanced_menuitem_menu.ui +++ b/data/gui/advanced_menuitem_menu.ui @@ -9,6 +9,13 @@ True + + + True + Edit Archi_ving Preferences + True + + Edit _Privacy Lists... diff --git a/data/gui/archiving_preferences_window.ui b/data/gui/archiving_preferences_window.ui new file mode 100644 index 000000000..0c8db71e1 --- /dev/null +++ b/data/gui/archiving_preferences_window.ui @@ -0,0 +1,312 @@ + + + + + + + + + + + + No + + + Yes + + + + + + + + + + + Prefer + + + Concede + + + Forbid + + + + + + + + + + + Prefer + + + Concede + + + Forbid + + + + + + + + + + + Prefer + + + Concede + + + Forbid + + + + + 12 + + + + True + vertical + + + True + 4 + 2 + + + True + <i>Method Manual</i> + True + + + 3 + 4 + + + + + True + <i>Method Local</i> + True + + + 2 + 3 + + + + + True + <i>Method Auto</i> + True + + + 1 + 2 + + + + + True + liststore4 + + + + + 0 + + + + + 1 + 2 + 3 + 4 + + + + + True + liststore3 + + + + + 0 + + + + + 1 + 2 + 2 + 3 + + + + + True + liststore2 + + + + + 0 + + + + + 1 + 2 + 1 + 2 + + + + + True + Auto + + + + + True + liststore1 + + + + + 0 + + + + + 1 + 2 + + + + + False + 0 + + + + + True + vertical + + + True + True + automatic + automatic + + + True + True + + + + + + 0 + + + + + True + spread + + + gtk-add + True + True + True + True + + + + False + False + 0 + + + + + gtk-remove + True + True + True + True + + + + False + False + 1 + + + + + gtk-edit + True + True + True + True + + + + False + False + 2 + + + + + False + 1 + + + + + 1 + + + + + True + end + + + gtk-close + True + True + True + False + True + + + + False + False + 0 + + + + + False + 2 + + + + + + diff --git a/data/gui/chat_control.ui b/data/gui/chat_control.ui index de3208afb..6a4fcd9b8 100644 --- a/data/gui/chat_control.ui +++ b/data/gui/chat_control.ui @@ -8,170 +8,111 @@ vertical 1 - + True + vertical - + True - vertical + 3 + 3 - +