changeset adbea99d8a4c in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=adbea99d8a4c description: merge from trunk
diffstat: .hgtags | 1 + ChangeLog | 10 +- README.html | 19 +- autogen.sh | 8 +- configure.ac | 20 +- data/gui/account_creation_wizard_window.ui | 1 + data/gui/accounts_window.ui | 3 + data/gui/add_new_contact_window.ui | 2 + data/gui/adhoc_commands_window.ui | 1 + data/gui/advanced_configuration_window.ui | 1 + data/gui/advanced_notifications_window.ui | 951 - data/gui/archiving_preferences_window.ui | 9 +- data/gui/blocked_contacts_window.ui | 1 + data/gui/chat_control.ui | 1071 +- data/gui/chat_to_muc_window.ui | 1 + data/gui/data_form_window.ui | 7 +- data/gui/edit_groups_dialog.ui | 2 +- data/gui/features_window.ui | 1 + data/gui/filetransfers.ui | 5 +- data/gui/gajim_themes_window.ui | 4 +- data/gui/gc_control_popup_menu.ui | 13 + data/gui/gc_occupants_menu.ui | 13 + data/gui/groupchat_control.ui | 787 +- data/gui/groups_post_window.ui | 1 + data/gui/history_manager.ui | 4 +- data/gui/item_archiving_preferences_window.ui | 5 +- data/gui/join_groupchat_window.ui | 4 + data/gui/manage_bookmarks_window.ui | 24 +- data/gui/manage_pep_services_window.ui | 1 + data/gui/manage_proxies_window.ui | 5 +- data/gui/manage_sounds_window.ui | 1 + data/gui/message_window.ui | 2 - data/gui/plugins_window.ui | 80 +- data/gui/preferences_window.ui | 109 +- data/gui/privacy_list_window.ui | 9 +- data/gui/privacy_lists_window.ui | 3 +- data/gui/profile_window.ui | 1 + data/gui/remove_account_window.ui | 1 + data/gui/roster_item_exchange_window.ui | 1 + data/gui/roster_window.ui | 47 +- data/gui/search_window.ui | 1 + data/gui/service_discovery_window.ui | 1 + data/gui/service_registration_window.ui | 1 + data/gui/subscription_request_window.ui | 2 + data/gui/synchronise_select_account_dialog.ui | 2 +- data/gui/synchronise_select_contacts_dialog.ui | 2 +- data/gui/vcard_information_window.ui | 8 +- data/gui/zeroconf_information_window.ui | 1 + data/iconsets/dcraven/32x32/chat.png | 0 data/iconsets/dcraven/32x32/dnd.png | 0 data/iconsets/dcraven/32x32/error.png | 0 data/iconsets/dcraven/32x32/not_in_roster.png | 0 data/iconsets/dcraven/32x32/offline.png | 0 data/iconsets/dcraven/32x32/online.png | 0 data/other/cacerts.pem | 23 + data/other/servers.xml | 482 +- debian/README.Debian | 3 + debian/changelog | 24 +- debian/control | 11 +- debian/copyright | 3 +- debian/dirs | 8 - debian/patches/00_debian-copying.diff | 21 + debian/patches/00_debian-copying.patch | 20 - debian/patches/01_configure-ac.diff | 33 + debian/patches/series | 2 + debian/rules | 28 +- gajim.nsi | 55 +- icons/hicolor/48x48/actions/gajim-warning.png | 0 launch.sh | 5 +- m4/python.m4 | 4 +- plugins/Makefile.am | 11 +- plugins/acronyms_expander.py | 102 - plugins/acronyms_expander/__init__.py | 1 + plugins/acronyms_expander/acronyms_expander.py | 96 + plugins/acronyms_expander/manifest.ini | 9 + plugins/banner_tweaks/manifest.ini | 10 + plugins/banner_tweaks/plugin.py | 16 +- plugins/dbus_plugin/manifest.ini | 10 + plugins/dbus_plugin/plugin.py | 28 +- plugins/events_dump/manifest.ini | 8 + plugins/events_dump/plugin.py | 6 - plugins/ftp_manager/__init__.py | 1 + plugins/ftp_manager/config_dialog.ui | 281 + plugins/ftp_manager/ftp_manager.py | 460 + plugins/ftp_manager/manifest.ini | 7 + plugins/google_translation/manifest.ini | 8 + plugins/google_translation/plugin.py | 76 +- plugins/length_notifier/length_notifier.py | 6 - plugins/length_notifier/manifest.ini | 9 + plugins/new_events_example/manifest.ini | 11 + plugins/new_events_example/plugin.py | 63 +- plugins/roster_buttons/manifest.ini | 10 + plugins/roster_buttons/plugin.py | 6 - plugins/snarl_notifications/manifest.ini | 11 + plugins/snarl_notifications/plugin.py | 31 +- plugins/triggers/__init__.py | 1 + plugins/triggers/config_dialog.ui | 900 + plugins/triggers/manifest.ini | 7 + plugins/triggers/triggers.py | 637 + plugins/whiteboard/__init__.py | 1 + plugins/whiteboard/brush_tool.png | 0 plugins/whiteboard/line_tool.png | 0 plugins/whiteboard/manifest.ini | 7 + plugins/whiteboard/oval_tool.png | 0 plugins/whiteboard/plugin.py | 477 + plugins/whiteboard/whiteboard.png | 0 plugins/whiteboard/whiteboard_widget.py | 419 + plugins/whiteboard/whiteboard_widget.ui | 192 + po/be.po | 3053 +++-- po/[email protected] | 3056 +++-- po/bg.po | 3066 +++-- po/br.po | 3054 +++-- po/cs.po | 4838 +++---- po/da.po | 3041 +++-- po/de.po | 3079 +++-- po/el.po | 3070 +++-- po/en_GB.po | 3107 +++-- po/eo.po | 3122 +++-- po/es.po | 3077 +++-- po/eu.po | 3063 +++-- po/fr.po | 5246 ++++----- po/gl.po | 3066 +++-- po/hr.po | 3134 +++-- po/hu.po | 10012 ++++++++++++++++++ po/it.po | 3048 +++-- po/ja.po | 3030 ++-- po/kk.po | 3695 ++++-- po/lt.po | 3018 ++-- po/nb.po | 3066 +++-- po/nl.po | 3095 +++-- po/no.po | 3066 +++-- po/pl.po | 4301 ++++--- po/pt.po | 3097 +++-- po/pt_BR.po | 3071 +++-- po/ru.po | 4110 ++++--- po/sk.po | 3060 +++-- po/sr.po | 3162 +++-- po/[email protected] | 3123 +++-- po/sv.po | 3077 +++-- po/uk.po | 5928 ++++++---- po/zh_CN.po | 8944 +++++++-------- po/zh_TW.po | 9686 +++++++++++++++++ setup_win32.py | 51 +- src/chat_control.py | 465 +- src/command_system/implementation/middleware.py | 4 +- src/common/GnuPG.py | 241 - src/common/GnuPGInterface.py | 673 - src/common/caps_cache.py | 42 +- src/common/check_paths.py | 31 +- src/common/config.py | 43 +- src/common/configpaths.py | 2 +- src/common/connection.py | 554 +- src/common/connection_handlers.py | 1957 +-- src/common/connection_handlers_events.py | 2071 +++ src/common/dataforms.py | 4 +- src/common/defs.py | 7 +- src/common/demandimport.py | 145 + src/common/exceptions.py | 12 + src/common/gajim.py | 43 +- src/common/ged.py | 33 +- src/common/gnupg.py | 973 + src/common/gpg.py | 130 + src/common/helpers.py | 151 +- src/common/jingle.py | 38 +- src/common/jingle_rtp.py | 9 +- src/common/jingle_session.py | 49 +- src/common/latex.py | 25 +- src/common/logger.py | 28 + src/common/logging_helpers.py | 5 +- src/common/message_archiving.py | 93 +- src/common/multimedia_helpers.py | 57 +- src/common/nec.py | 79 +- src/common/optparser.py | 13 +- src/common/passwords.py | 3 +- src/common/pep.py | 35 +- src/common/protocol/bytestream.py | 77 +- src/common/protocol/caps.py | 89 +- src/common/pubsub.py | 45 +- src/common/resolver.py | 4 +- src/common/sleepy.py | 1 + src/common/stanza_session.py | 6 +- src/common/xmpp/bosh.py | 9 +- src/common/xmpp/client_nb.py | 5 + src/common/xmpp/dispatcher_nb.py | 1 + src/common/xmpp/features_nb.py | 9 +- src/common/xmpp/idlequeue.py | 13 +- src/common/xmpp/protocol.py | 368 +- src/common/xmpp/tls_nb.py | 10 +- src/common/xmpp/transports_nb.py | 6 +- src/common/zeroconf/connection_handlers_zeroconf.py | 79 +- src/common/zeroconf/connection_zeroconf.py | 141 +- src/common/zeroconf/roster_zeroconf.py | 2 + src/common/zeroconf/zeroconf_avahi.py | 11 +- src/config.py | 363 +- src/conversation_textview.py | 84 +- src/dataforms_widget.py | 28 +- src/dialogs.py | 1305 +- src/disco.py | 122 +- src/features_window.py | 34 +- src/filetransfers_window.py | 20 +- src/gajim-remote-plugin.py | 548 - src/gajim-remote.py | 7 +- src/gajim.py | 55 +- src/groupchat_control.py | 641 +- src/gtkgui_helpers.py | 54 +- src/gui_interface.py | 1950 +-- src/gui_menu_builder.py | 15 +- src/history_manager.py | 271 +- src/history_window.py | 11 +- src/htmltextview.py | 346 +- src/ipython_view.py | 6 + src/message_control.py | 43 +- src/message_textview.py | 15 +- src/message_window.py | 50 +- src/notify.py | 142 +- src/plugins/gui.py | 108 +- src/plugins/helpers.py | 17 +- src/plugins/plugin.py | 11 +- src/plugins/pluginmanager.py | 344 +- src/profile_window.py | 42 +- src/remote_control.py | 107 +- src/roster_window.py | 790 +- src/search_window.py | 46 +- src/secrets.py | 2 +- src/session.py | 310 +- src/statusicon.py | 52 +- src/vcard.py | 22 + test/integration/test_roster.py | 5 +- test/integration/test_xmpp_client_nb.py | 2 +- test/lib/__init__.py | 3 + test/lib/gajim_mocks.py | 4 +- test/runtests.py | 26 +- test/unit/test_gui_interface.py | 59 - 233 files changed, 95473 insertions(+), 63077 deletions(-) diffs (truncated from 302701 to 300 lines): diff -r 0c8aedd47e68 -r adbea99d8a4c .hgtags --- 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> _______________________________________________ Commits mailing list [email protected] http://lists.gajim.org/cgi-bin/listinfo/commits
