gajim: merge from trunk

20 Jun 2011

--- a/.hgtags	Thu Aug 26 16:56:46 2010 +0200
+++ b/.hgtags	Mon Jun 20 23:03:06 2011 +0200
@@ -3,3 +3,4 @@
 604c5de0dfe72dfa76b3014c410a50daae381cbe gajim-0.12
 7752eadd1f8c31a3dc282c15d87767a7ba1bd217 gajim-0.12-alpha1
 a0ec82dc6b7c10708e23f5ec30bab75d596b6fc6 gajim-0.12-beta1
+91ceabbf74309d7bbd79b43552b89768842b4e8a gajim-0.14.1
diff -r 0c8aedd47e68 -r adbea99d8a4c ChangeLog
--- a/ChangeLog	Thu Aug 26 16:56:46 2010 +0200
+++ b/ChangeLog	Mon Jun 20 23:03:06 2011 +0200
@@ -1,4 +1,12 @@
-Gajim 0.14 (XX)
+Gajim 0.14.1 (26 October 2010)
+
+  * Fix changing account name
+  * Fix sending XHTML
+  * Fix GnomeKayring usage
+  * Fix some GPG bugs
+  * Minor bugfixes
+
+Gajim 0.14 (02 September 2010)
* Jingle audio / video chat
   * Improve Startup time
diff -r 0c8aedd47e68 -r adbea99d8a4c README.html
--- a/README.html	Thu Aug 26 16:56:46 2010 +0200
+++ b/README.html	Mon Jun 20 23:03:06 2011 +0200
@@ -16,11 +16,8 @@
 <ul>
 <li>python2.5 or higher</li>
 <li>pygtk2.16 or higher</li>
-<li>pysqlite2 (if you have python 2.5, you already have this)</li>
 </ul>
-<p><strong>Note to packagers</strong> Gajim is a GTK+ app that loves GNOME. You can do 'make' so you don't require gnomepythonextras (aka gnome-python-desktop) which is gnome dep, but you will miss gnomekeyring integration.</p>
-
 <h2>Optional Runtime Requirements</h2>
 <ul>
 <li><a href="http://pyopenssl.sourceforge.net/">PyOpenSSL</a> (python-pyopenssl package in Debian) (>=0.9) for <em>secure</em> SSL/TLS. Python's default SSL is insecure, so this package is highly recommended!</li>
@@ -29,7 +26,8 @@
 <li>For zeroconf (bonjour), the "enable link-local messaging" checkbox, you need dbus-glib, python-avahi</li>
 <li>dnsutils (or whatever package provides the nslookup binary) for SRV support</li>
 <li>gtkspell and aspell-LANG where lang is your locale eg. en, fr etc</li>
-<li>gnome-python-desktop (for GnomeKeyring support)</li>
+<li>gnome-python-desktop (for GnomeKeyring support as password storage)</li>
+<li>kwalletcli (for support of KDE Wallet as password storage)</li>
 <li>notification-daemon or notify-python (and D-Bus) to get cooler popups</li>
 <li>D-Bus running to have gajim-remote working. Some distributions split dbus-x11, which is needed for dbus to work with Gajim. Version >= 0.80 is required.</li>
 <li>python-dbus bindings (>=0.81)</li>
@@ -40,8 +38,6 @@
<h2>Compile-time Requirements</h2>
 <ul>
-<li>python-dev</li>
-<li>python-gtk2-dev</li>
 <li>intltool (>= 0.40.1)</li>
 </ul>
@@ -52,15 +48,10 @@
 <li>tar jxvf gajim-version.tar.bz2</li>
 <li>cd gajim</li>
 <li>./configure</li>
-<li>make (builds all modules)</li>
+<li>make (builds translations)</li>
 <li>su -c make install</li>
 </ol>
-<p>To specify what modules to build do:</p>
-<pre>
-    make help
-</pre>
-
 <p>To specify where to install do:</p>
 <pre>
     ./configure --prefix=custom_path
@@ -68,7 +59,7 @@
<h2>Running Gajim</h2>
 <p>Just do <em>gajim</em> or you can run Gajim from your GNOME/Xfce/KDE/whatever menus.<br/><br/>
-or if you didn't 'make install' you can also run from gajim folder with<em>./launch.sh</em></p>
+or if you use hg version and you didn't 'make install' you can also run from gajim folder with<em>./launch.sh</em></p>
 <hr />
 <h3>Note for hg users</h3>
 <p>You will need GNU autotools in order to install Gajim from svn. This includes:</p>
@@ -120,7 +111,7 @@
 <br/>
 <br/>
 <br/>
-(C) 2003-2010<br/>
+(C) 2003-2011<br/>
 The Gajim Team<br/>
 http://gajim.org<br/>
 <br/>
diff -r 0c8aedd47e68 -r adbea99d8a4c autogen.sh
--- a/autogen.sh	Thu Aug 26 16:56:46 2010 +0200
+++ b/autogen.sh	Mon Jun 20 23:03:06 2011 +0200
@@ -1,5 +1,5 @@
 #!/usr/bin/env bash
-  gajimversion="0.13.90.1"
+  gajimversion="0.14.0.1"
   if [ -d ".hg" ]; then
     node=$(hg  tip --template "{node}")
     hgversion="-${node:0:12}"
@@ -8,7 +8,7 @@
   fi
   echo "define([AC_PACKAGE_VERSION], [${gajimversion}${hgversion}])" > m4/hgversion.m4
-  AM_ARGS="--add-missing --gnu --copy"
+  AM_ARGS="--add-missing --gnu --copy -Wno-portability"
   CONF_ARGS=""
   if test x`uname -s 2>/dev/null` = 'xDarwin' -a -f /Library/Frameworks/GTK+.framework/Versions/Current/env; then
     . /Library/Frameworks/GTK+.framework/Versions/Current/env
@@ -20,7 +20,7 @@
   && for p in `ls data/gui/*.ui`; do echo "[type: gettext/glade]$p" >> \
   po/POTFILES.in; done \
   && ls -1 data/gajim.desktop.in.in \
-  src/*py src/common/*py src/common/zeroconf/*.py | grep -v ipython_view.py >> \
+  src/*py src/common/*py src/common/zeroconf/*.py src/plugins/*.py| grep -v ipython_view.py >> \
   po/POTFILES.in || exit 1
   if test -z `which pkg-config 2>/dev/null`;then
     echo "***Error: pkg-config not found***"
@@ -36,6 +36,6 @@
   && aclocal -I ./m4 \
   && $LIBTOOLIZE --copy --force --automake \
   && autoheader \
-  && autoconf  \
+  && autoconf \
   && automake ${AM_ARGS} \
   && ./configure ${CONF_ARGS} $@
diff -r 0c8aedd47e68 -r adbea99d8a4c configure.ac
--- a/configure.ac	Thu Aug 26 16:56:46 2010 +0200
+++ b/configure.ac	Mon Jun 20 23:03:06 2011 +0200
@@ -9,9 +9,6 @@
 AM_INIT_AUTOMAKE([1.8])
 AM_MAINTAINER_MODE
-dnl Make Objective-C work with automake
-AM_CONDITIONAL([am__fastdepOBJC], false)
-
 IT_PROG_INTLTOOL([0.35.0])
 PKG_PROG_PKG_CONFIG([0.19])
@@ -36,25 +33,10 @@
 AM_NLS
-dnl ****
-dnl pygtk and gtk+
-dnl ****
-PKG_CHECK_MODULES([PYGTK], [gtk+-2.0 >= 2.16.0 pygtk-2.0 >= 2.16.0])
-AC_SUBST(PYGTK_CFLAGS)
-AC_SUBST(PYGTK_LIBS)
-PYGTK_DEFS=`$PKG_CONFIG --variable=defsdir pygtk-2.0`
-AC_SUBST(PYGTK_DEFS)
-
-AM_PATH_PYTHON([2.5])
-if test "x$PYTHON" = "x:"; then
-	AC_MSG_ERROR([Python not found])
-fi
-
 ACLOCAL_AMFLAGS="${ACLOCAL_FLAGS}"
 AC_SUBST(ACLOCAL_AMFLAGS)
-AM_CHECK_PYTHON_HEADERS(,[AC_MSG_ERROR(could not find Python headers)])
-AC_SUBST([PYTHON_INCLUDES])
+AM_PATH_PYTHON([2.5])
dnl ****
 dnl enable installation in python-2.x/site-packages/gajim
diff -r 0c8aedd47e68 -r adbea99d8a4c data/gui/account_creation_wizard_window.ui
--- a/data/gui/account_creation_wizard_window.ui	Thu Aug 26 16:56:46 2010 +0200
+++ b/data/gui/account_creation_wizard_window.ui	Mon Jun 20 23:03:06 2011 +0200
@@ -6,6 +6,7 @@
     <property name="border_width">12</property>
     <property name="title" translatable="yes">Gajim: Account Creation Wizard</property>
     <property name="resizable">False</property>
+    <property name="type_hint">dialog</property>
     <signal name="destroy" handler="on_wizard_window_destroy"/>
     <child>
       <object class="GtkVBox" id="vbox77">
diff -r 0c8aedd47e68 -r adbea99d8a4c data/gui/accounts_window.ui
--- a/data/gui/accounts_window.ui	Thu Aug 26 16:56:46 2010 +0200
+++ b/data/gui/accounts_window.ui	Mon Jun 20 23:03:06 2011 +0200
@@ -18,6 +18,7 @@
     <property name="border_width">12</property>
     <property name="title" translatable="yes">Accounts</property>
     <property name="default_width">800</property>
+    <property name="type_hint">dialog</property>
     <signal name="destroy" handler="on_accounts_window_destroy"/>
     <signal name="key_press_event" handler="on_accounts_window_key_press_event"/>
     <child>
@@ -484,6 +485,7 @@
                                         <property name="can_focus">True</property>
                                         <property name="receives_default">True</property>
                                         <property name="tooltip_text" translatable="yes">Choose Client Cert</property>
+                                        <signal name="clicked" handler="on_browse_for_client_cert_button_clicked"/>
                                       </object>
                                       <packing>
                                         <property name="expand">False</property>
@@ -719,6 +721,7 @@
                                 </child>
                               </object>
                               <packing>
+                                <property name="expand">False</property>
                                 <property name="position">0</property>
                               </packing>
                             </child>
diff -r 0c8aedd47e68 -r adbea99d8a4c data/gui/add_new_contact_window.ui
--- a/data/gui/add_new_contact_window.ui	Thu Aug 26 16:56:46 2010 +0200
+++ b/data/gui/add_new_contact_window.ui	Mon Jun 20 23:03:06 2011 +0200
@@ -6,6 +6,7 @@
     <property name="border_width">6</property>
     <property name="title" translatable="yes">Add New Contact</property>
     <property name="resizable">False</property>
+    <property name="type_hint">dialog</property>
     <signal name="destroy" handler="on_add_new_contact_window_destroy"/>
     <signal name="key_press_event" handler="on_add_new_contact_window_key_press_event"/>
     <child>
@@ -100,6 +101,7 @@
                 <property name="visible">True</property>
                 <property name="no_show_all">True</property>
                 <property name="model">liststore2</property>
+                <signal name="changed" handler="on_protocol_jid_combobox_changed"/>
                 <child>
                   <object class="GtkCellRendererText" id="cellrenderertext2"/>
                   <attributes>
diff -r 0c8aedd47e68 -r adbea99d8a4c data/gui/adhoc_commands_window.ui
--- a/data/gui/adhoc_commands_window.ui	Thu Aug 26 16:56:46 2010 +0200
+++ b/data/gui/adhoc_commands_window.ui	Mon Jun 20 23:03:06 2011 +0200
@@ -6,6 +6,7 @@
     <property name="visible">True</property>
     <property name="border_width">6</property>
     <property name="title" translatable="yes">Ad-hoc Commands - Gajim</property>
+    <property name="type_hint">dialog</property>
     <signal name="destroy" handler="on_adhoc_commands_window_destroy"/>
     <child>
       <object class="GtkVBox" id="vbox1">
diff -r 0c8aedd47e68 -r adbea99d8a4c data/gui/advanced_configuration_window.ui
--- a/data/gui/advanced_configuration_window.ui	Thu Aug 26 16:56:46 2010 +0200
+++ b/data/gui/advanced_configuration_window.ui	Mon Jun 20 23:03:06 2011 +0200
@@ -8,6 +8,7 @@
     <property name="role">ace</property>
     <property name="default_width">650</property>
     <property name="default_height">540</property>
+    <property name="type_hint">dialog</property>
     <signal name="destroy" handler="on_advanced_configuration_window_destroy"/>
     <child>
       <object class="GtkVBox" id="vbox70">
diff -r 0c8aedd47e68 -r adbea99d8a4c data/gui/advanced_notifications_window.ui
--- a/data/gui/advanced_notifications_window.ui	Thu Aug 26 16:56:46 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,951 +0,0 @@
-<?xml version="1.0"?>
-<interface>
-  <requires lib="gtk+" version="2.16"/>
-  <!-- interface-naming-policy toplevel-contextual -->
-  <object class="GtkListStore" id="liststore1">
-    <columns>
-      <!-- column-name item text -->
-      <column type="gchararray"/>
-    </columns>
-    <data>
-      <row>
-        <col id="0" translatable="yes">contact(s)</col>
-      </row>
-      <row>
-        <col id="0" translatable="yes">group(s)</col>
-      </row>
-      <row>
-        <col id="0" translatable="yes">everybody</col>
-      </row>
-    </data>
-  </object>
-  <object class="GtkListStore" id="liststore2">
-    <columns>
-      <!-- column-name item text -->
-      <column type="gchararray"/>
-    </columns>
-    <data>
-      <row>
-        <col id="0" translatable="yes">Receive a Message</col>
-      </row>
-      <row>
-        <col id="0" translatable="yes">Contact Disconnected </col>
-      </row>
-      <row>
-        <col id="0" translatable="yes">Contact Change Status </col>
-      </row>
-      <row>
-        <col id="0" translatable="yes">Group Chat Message Highlight </col>
-      </row>
-      <row>
-        <col id="0" translatable="yes">Group Chat Message Received </col>
-      </row>
-      <row>
-        <col id="0" translatable="yes">File Transfer Request </col>
-      </row>
-      <row>
-        <col id="0" translatable="yes">File Transfer Started </col>

    

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

gajim: merge from trunk