changeset 93f6e8ddbc2a in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=93f6e8ddbc2a description: merge from trunk
diffstat: ChangeLog | 3 +- README.html | 7 +- autogen.sh | 10 +- configure.ac | 4 +- data/gui/accounts_window.ui | 2 +- data/gui/advanced_configuration_window.ui | 58 +- data/gui/chat_control.ui | 2 +- data/gui/groupchat_control.ui | 2 +- data/gui/roster_window.ui | 2 +- data/sounds/attention.wav | Bin debian/README.Debian | 2 +- debian/changelog | 4 +- debian/control | 8 +- debian/copyright | 2 +- gajim.nsi | 138 +- plugins/dbus_plugin/plugin.py | 2 +- plugins/snarl_notifications/PySnarl.py | 772 ----- plugins/snarl_notifications/__init__.py | 1 - plugins/snarl_notifications/manifest.ini | 11 - plugins/snarl_notifications/plugin.py | 71 - po/POTFILES.skip | 3 - po/fr.po | 3623 +++++++++++++----------- po/ja.po | 3652 +++++++++++++----------- po/ru.po | 2264 ++++++++------- po/uk.po | 2600 +++++++++------- setup_win32.py | 2 +- src/adhoc_commands.py | 6 +- src/advanced_configuration_window.py | 57 +- src/atom_window.py | 2 +- src/cell_renderer_image.py | 2 +- src/chat_control.py | 197 +- src/command_system/implementation/standard.py | 24 +- src/common/atom.py | 2 +- src/common/caps_cache.py | 2 +- src/common/check_X509.py | 178 + src/common/check_paths.py | 2 +- src/common/commands.py | 20 +- src/common/config.py | 117 +- src/common/configpaths.py | 2 +- src/common/connection.py | 89 +- src/common/connection_handlers.py | 12 +- src/common/connection_handlers_events.py | 60 +- src/common/contacts.py | 2 +- src/common/dataforms.py | 2 +- src/common/dbus_support.py | 2 +- src/common/defs.py | 7 +- src/common/demandimport.py | 30 +- src/common/dh.py | 2 +- src/common/events.py | 4 +- src/common/exceptions.py | 2 +- src/common/fuzzyclock.py | 2 +- src/common/gajim.py | 12 +- src/common/ged.py | 6 + src/common/gnupg.py | 2 +- src/common/gpg.py | 2 +- src/common/helpers.py | 10 +- src/common/i18n.py | 2 +- src/common/jingle.py | 2 +- src/common/jingle_rtp.py | 79 +- src/common/jingle_transport.py | 32 +- src/common/latex.py | 19 +- src/common/location_listener.py | 2 +- src/common/logger.py | 51 +- src/common/optparser.py | 5 +- src/common/passwords.py | 4 +- src/common/pep.py | 2 +- src/common/protocol/bytestream.py | 2 +- src/common/proxy65_manager.py | 2 +- src/common/pubsub.py | 2 +- src/common/rst_xhtml_generator.py | 2 +- src/common/sleepy.py | 2 +- src/common/socks5.py | 2 +- src/common/stanza_session.py | 4 +- src/common/xmpp/auth_nb.py | 13 +- src/common/xmpp/client_nb.py | 1 + src/common/xmpp/protocol.py | 1 + src/common/xmpp/smacks.py | 2 + src/common/xmpp/stringprepare.py | 2 +- src/common/xmpp/tls_nb.py | 2 - src/common/zeroconf/client_zeroconf.py | 12 +- src/common/zeroconf/connection_zeroconf.py | 11 +- src/config.py | 25 +- src/conversation_textview.py | 8 +- src/dataforms_widget.py | 2 +- src/dialogs.py | 45 +- src/disco.py | 2 +- src/features_window.py | 21 +- src/filetransfers_window.py | 2 +- src/gajim-remote.py | 2 +- src/gajim.py | 14 +- src/gajim_themes_window.py | 2 +- src/groupchat_control.py | 12 +- src/groups.py | 2 +- src/gtkexcepthook.py | 2 +- src/gtkgui_helpers.py | 2 +- src/gui_interface.py | 17 +- src/gui_menu_builder.py | 7 +- src/history_manager.py | 2 +- src/history_window.py | 2 +- src/htmltextview.py | 2 +- src/ipython_view.py | 176 +- src/message_control.py | 2 +- src/message_textview.py | 2 +- src/message_window.py | 3 +- src/music_track_listener.py | 2 +- src/negotiation.py | 2 +- src/network_manager_listener.py | 2 +- src/notify.py | 33 +- src/plugins/pluginmanager.py | 5 +- src/profile_window.py | 2 +- src/remote_control.py | 4 +- src/roster_window.py | 315 +- src/search_window.py | 2 +- src/session.py | 6 +- src/statusicon.py | 2 +- src/tooltips.py | 7 +- src/upower_listener.py | 2 +- src/vcard.py | 14 +- 118 files changed, 8019 insertions(+), 7093 deletions(-) diffs (truncated from 33805 to 300 lines): diff -r 17e362df3348 -r 93f6e8ddbc2a ChangeLog --- a/ChangeLog Sat Apr 07 23:12:15 2012 -0400 +++ b/ChangeLog Thu Apr 12 22:07:30 2012 +0200 @@ -1,4 +1,4 @@ -Gajim 0.15 (XX XX 2011) +Gajim 0.15 (18 March 2012) * Plugin system * Whiteboard (via a plugin) @@ -9,6 +9,7 @@ * Roster filtrering * UPower support * GPG support for windows + * Spell checking support for windows Gajim 0.14.4 (22 July 2011) diff -r 17e362df3348 -r 93f6e8ddbc2a README.html --- a/README.html Sat Apr 07 23:12:15 2012 -0400 +++ b/README.html Thu Apr 12 22:07:30 2012 +0200 @@ -15,12 +15,13 @@ <h2>Runtime Requirements</h2> <ul> <li>python2.5 or higher</li> -<li>pygtk2.16 or higher</li> +<li>pygtk2.22 or higher</li> </ul> <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> +<li><a href="http://pyopenssl.sourceforge.net/";>PyOpenSSL</a> (python-pyopenssl package in Debian) (>=0.12) for <em>secure</em> SSL/TLS. Python's default SSL is insecure, so this package is highly recommended!</li> +<li>python-pyasn1 to check SSL/TLS certificate</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> @@ -111,7 +112,7 @@ <br/> <br/> <br/> -(C) 2003-2011<br/> +(C) 2003-2012<br/> The Gajim Team<br/> http://gajim.org<br/> <br/> diff -r 17e362df3348 -r 93f6e8ddbc2a autogen.sh --- a/autogen.sh Sat Apr 07 23:12:15 2012 -0400 +++ b/autogen.sh Thu Apr 12 22:07:30 2012 +0200 @@ -1,5 +1,5 @@ #!/usr/bin/env bash - gajimversion="0.15-beta2" + gajimversion="0.15" if [ -d ".hg" ]; then node=$(hg tip --template "{node}") hgversion="-${node:0:12}" @@ -20,8 +20,12 @@ && 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 src/plugins/*.py| grep -v ipython_view.py >> \ - po/POTFILES.in || exit 1 + src/*.py src/common/*.py src/command_system/implementation/*.py src/common/zeroconf/*.py src/plugins/*.py | grep -v ipython_view.py >> \ + po/POTFILES.in \ + && echo -e "data/gajim.desktop.in\nsrc/ipython_view.py" > po/POTFILES.skip || exit 1 + if [ $(find plugins/ -name '*.py' | wc -l) -gt 0 ];then + ls -1 plugins/*/*.py plugins/*/*.ui >> po/POTFILES.skip + fi if test -z `which pkg-config 2>/dev/null`;then echo "***Error: pkg-config not found***" echo "See README.html for build requirements." diff -r 17e362df3348 -r 93f6e8ddbc2a configure.ac --- a/configure.ac Sat Apr 07 23:12:15 2012 -0400 +++ b/configure.ac Thu Apr 12 22:07:30 2012 +0200 @@ -47,11 +47,11 @@ 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}") diff -r 17e362df3348 -r 93f6e8ddbc2a data/gui/accounts_window.ui --- a/data/gui/accounts_window.ui Sat Apr 07 23:12:15 2012 -0400 +++ b/data/gui/accounts_window.ui Thu Apr 12 22:07:30 2012 +0200 @@ -308,7 +308,7 @@ <property name="homogeneous">True</property> <child> <object class="GtkButton" id="synchronise_contacts_button1"> - <property name="label" translatable="yes">Synchronise contacts</property> + <property name="label" translatable="yes">Synchronize contacts</property> <property name="visible">True</property> <property name="can_focus">True</property> <property name="receives_default">False</property> diff -r 17e362df3348 -r 93f6e8ddbc2a data/gui/advanced_configuration_window.ui --- a/data/gui/advanced_configuration_window.ui Sat Apr 07 23:12:15 2012 -0400 +++ b/data/gui/advanced_configuration_window.ui Thu Apr 12 22:07:30 2012 +0200 @@ -1,24 +1,25 @@ -<?xml version="1.0"?> +<?xml version="1.0" encoding="UTF-8"?> <interface> <requires lib="gtk+" version="2.16"/> - <!-- interface-naming-policy toplevel-contextual --> <object class="GtkWindow" id="advanced_configuration_window"> + <property name="can_focus">False</property> <property name="border_width">6</property> <property name="title" translatable="yes">Advanced Configuration Editor</property> <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"/> + <signal name="destroy" handler="on_advanced_configuration_window_destroy" swapped="no"/> <child> <object class="GtkVBox" id="vbox70"> <property name="visible">True</property> + <property name="can_focus">False</property> <property name="border_width">6</property> - <property name="orientation">vertical</property> <property name="spacing">6</property> <child> <object class="GtkTable" id="table26"> <property name="visible">True</property> + <property name="can_focus">False</property> <property name="n_rows">2</property> <property name="n_columns">2</property> <property name="column_spacing">12</property> @@ -26,6 +27,7 @@ <child> <object class="GtkLabel" id="label248"> <property name="visible">True</property> + <property name="can_focus">False</property> <property name="xalign">0</property> <property name="label" translatable="yes">Filter:</property> </object> @@ -38,7 +40,7 @@ <object class="GtkEntry" id="advanced_entry"> <property name="visible">True</property> <property name="can_focus">True</property> - <signal name="changed" handler="on_advanced_entry_changed"/> + <signal name="changed" handler="on_advanced_entry_changed" swapped="no"/> </object> <packing> <property name="left_attach">1</property> @@ -51,14 +53,16 @@ <property name="visible">True</property> <property name="can_focus">True</property> <property name="hscrollbar_policy">never</property> - <property name="vscrollbar_policy">automatic</property> <property name="shadow_type">in</property> <child> <object class="GtkTreeView" id="advanced_treeview"> <property name="visible">True</property> <property name="can_focus">True</property> <property name="rules_hint">True</property> - <signal name="row_activated" handler="on_advanced_treeview_row_activated"/> + <signal name="row-activated" handler="on_advanced_treeview_row_activated" swapped="no"/> + <child internal-child="selection"> + <object class="GtkTreeSelection" id="treeview-selection1"/> + </child> </object> </child> </object> @@ -71,23 +75,28 @@ </child> </object> <packing> + <property name="expand">True</property> + <property name="fill">True</property> <property name="position">0</property> </packing> </child> <child> <object class="GtkFrame" id="frame36"> <property name="visible">True</property> + <property name="can_focus">False</property> <property name="border_width">3</property> <property name="label_xalign">0</property> <property name="shadow_type">none</property> <child> <object class="GtkAlignment" id="alignment90"> <property name="visible">True</property> + <property name="can_focus">False</property> <property name="border_width">6</property> <property name="left_padding">12</property> <child> <object class="GtkLabel" id="advanced_desc_label"> <property name="visible">True</property> + <property name="can_focus">False</property> <property name="xalign">0</property> <property name="wrap">True</property> </object> @@ -97,6 +106,7 @@ <child type="label"> <object class="GtkLabel" id="label357"> <property name="visible">True</property> + <property name="can_focus">False</property> <property name="label" translatable="yes"><b>Description</b></property> <property name="use_markup">True</property> </object> @@ -104,11 +114,13 @@ </object> <packing> <property name="expand">False</property> + <property name="fill">True</property> <property name="position">1</property> </packing> </child> <child> <object class="GtkLabel" id="restart_label"> + <property name="can_focus">False</property> <property name="xalign">0</property> <property name="label" translatable="yes"><b>NOTE:</b> You should restart Gajim for some settings to take effect</property> <property name="use_markup">True</property> @@ -123,27 +135,50 @@ <child> <object class="GtkHButtonBox" id="hbuttonbox18"> <property name="visible">True</property> + <property name="can_focus">False</property> <property name="spacing">6</property> <property name="layout_style">end</property> <child> + <object class="GtkButton" id="reset_button"> + <property name="label" translatable="yes">_Reset to default</property> + <property name="use_action_appearance">False</property> + <property name="visible">True</property> + <property name="sensitive">False</property> + <property name="can_focus">True</property> + <property name="receives_default">True</property> + <property name="use_action_appearance">False</property> + <property name="image">image1</property> + <property name="use_underline">True</property> + <signal name="clicked" handler="on_reset_button_clicked" swapped="no"/> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">0</property> + </packing> + </child> + <child> <object class="GtkButton" id="advanced_close_button"> <property name="label">gtk-close</property> + <property name="use_action_appearance">False</property> <property name="visible">True</property> <property name="can_focus">True</property> <property name="can_default">True</property> <property name="receives_default">False</property> + <property name="use_action_appearance">False</property> <property name="use_stock">True</property> - <signal name="clicked" handler="on_advanced_close_button_clicked"/> + <signal name="clicked" handler="on_advanced_close_button_clicked" swapped="no"/> </object> <packing> <property name="expand">False</property> <property name="fill">False</property> - <property name="position">0</property> + <property name="position">1</property> </packing> </child> </object> <packing> <property name="expand">False</property> + <property name="fill">True</property> <property name="padding">6</property> <property name="position">3</property> </packing> @@ -151,4 +186,9 @@ </object> </child> </object> + <object class="GtkImage" id="image1"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="stock">gtk-undo</property> + </object> </interface> diff -r 17e362df3348 -r 93f6e8ddbc2a data/gui/chat_control.ui --- a/data/gui/chat_control.ui Sat Apr 07 23:12:15 2012 -0400 +++ b/data/gui/chat_control.ui Thu Apr 12 22:07:30 2012 +0200 @@ -60,7 +60,7 @@ <object class="GtkLabel" id="banner_label"> <property name="visible">True</property> <property name="xalign">0</property> - <property name="label" translatable="yes">label</property> + <property name="label">label</property> <property name="use_markup">True</property> <property name="selectable">True</property> <signal name="populate_popup" handler="on_banner_label_populate_popup"/> diff -r 17e362df3348 -r 93f6e8ddbc2a data/gui/groupchat_control.ui --- a/data/gui/groupchat_control.ui Sat Apr 07 23:12:15 2012 -0400 +++ b/data/gui/groupchat_control.ui Thu Apr 12 22:07:30 2012 +0200 @@ -54,7 +54,7 @@ <object class="GtkLabel" id="banner_label"> <property name="visible">True</property> _______________________________________________ Commits mailing list [email protected] http://lists.gajim.org/cgi-bin/listinfo/commits
