changeset af67a464c402 in /home/hg/repos/gajim
details:http://hg.gajim.org/gajim?cmd=changeset;node=af67a464c402 description: merge with trunk
diffstat:
AUTHORS | 10 +- README.html | 9 +- README.transifex | 11 + autogen.sh | 4 +- data/gui/account_context_menu.ui | 16 +- data/gui/accounts_window.ui | 66 +- data/gui/adhoc_commands_window.ui | 24 +- data/gui/advanced_menuitem_menu.ui | 4 +- data/gui/blocked_contacts_window.ui | 2 +- data/gui/chat_context_menu.ui | 14 +- data/gui/chat_control.ui | 1369 +- data/gui/chat_to_muc_window.ui | 3 - data/gui/filetransfers.ui | 6 +- data/gui/gc_control_popup_menu.ui | 14 +- data/gui/gc_occupants_menu.ui | 12 +- data/gui/groupchat_control.ui | 182 +- data/gui/history_manager.ui | 2 +- data/gui/input_dialog.ui | 1 + data/gui/join_groupchat_window.ui | 80 +- data/gui/manage_bookmarks_window.ui | 3 +- data/gui/message_window.ui | 3 +- data/gui/popup_notification_window.ui | 4 +- data/gui/preferences_window.ui | 48 +- data/gui/profile_window.ui | 1 + data/gui/roster_window.ui | 43 +- data/gui/service_discovery_window.ui | 10 +- data/gui/subscription_request_popup_menu.ui | 2 +- data/gui/systray_context_menu.ui | 10 +- data/gui/xml_console_window.ui | 4 +- data/gui/zeroconf_context_menu.ui | 4 +- debian/changelog | 23 + debian/control | 6 +- debian/copyright | 6 +- debian/pycompat | 1 - debian/pyversions | 2 +- debian/rules | 5 +- debian/watch | 8 + icons/hicolor/16x16/status/audio-mic-volume-high.png | 0 icons/hicolor/16x16/status/audio-mic-volume-low.png | 0 icons/hicolor/16x16/status/audio-mic-volume-medium.png | 0 icons/hicolor/16x16/status/audio-mic-volume-muted.png | 0 po/LINGUAS | 2 + po/be.po | 5002 +++--- po/be@latin.po | 5014 +++--- po/bg.po | 5041 +++--- po/br.po | 4946 +++--- po/cs.po | 6955 +++++---- po/da.po | 5027 +++--- po/de.po | 7503 ++++++---- po/el.po | 4991 +++--- po/en_GB.po | 5071 +++--- po/eo.po | 5006 +++--- po/es.po | 4950 +++--- po/eu.po | 5016 +++--- po/fr.po | 6997 ++++----- po/gl.po | 4920 +++--- po/hr.po | 5037 +++--- po/it.po | 5008 +++--- po/ja.po | 10374 +++++++++++++++ po/kk.po | 9846 ++++++++++++++ po/lt.po | 4906 +++--- po/nb.po | 5050 +++--- po/nl.po | 8431 ++++++----- po/no.po | 5050 +++--- po/pl.po | 7328 ++++++---- po/pt.po | 4961 +++--- po/pt_BR.po | 4627 +++--- po/ru.po | 7198 +++++----- po/sk.po | 6088 ++++---- po/sr.po | 5027 +++--- po/sr@Latn.po | 5032 +++--- po/sv.po | 5076 +++--- po/tr.po | 9439 +++++++++++++ po/uk.po | 6986 ++++----- po/zh_CN.po | 4987 +++--- scripts/dev/run-pylint.py | 2 +- setup_win32.py | 2 +- src/adhoc_commands.py | 100 +- src/advanced_configuration_window.py | 4 +- src/atom_window.py | 46 +- src/cell_renderer_image.py | 2 +- src/chat_control.py | 230 +- src/command_system/__init__.py | 8 +- src/command_system/dispatching.py | 9 +- src/command_system/errors.py | 13 +- src/command_system/framework.py | 192 +- src/command_system/implementation/__init__.py | 7 +- src/command_system/implementation/custom.py | 40 +- src/command_system/implementation/hosts.py | 18 +- src/command_system/implementation/middleware.py | 56 +- src/command_system/implementation/standard.py | 99 +- src/command_system/mapping.py | 206 +- src/common/GnuPG.py | 3 +- src/common/GnuPGInterface.py | 2 +- src/common/atom.py | 2 +- src/common/caps_cache.py | 2 +- src/common/check_paths.py | 14 +- src/common/commands.py | 41 +- src/common/config.py | 10 +- src/common/configpaths.py | 4 +- src/common/connection.py | 291 +- src/common/connection_handlers.py | 287 +- src/common/contacts.py | 9 +- src/common/dataforms.py | 87 +- src/common/dbus_support.py | 9 +- src/common/defs.py | 4 +- src/common/dh.py | 2 +- src/common/events.py | 2 +- src/common/exceptions.py | 2 +- src/common/fuzzyclock.py | 2 +- src/common/gajim.py | 12 +- src/common/helpers.py | 19 +- src/common/i18n.py | 36 +- src/common/jingle.py | 54 +- src/common/jingle_content.py | 5 + src/common/jingle_rtp.py | 105 +- src/common/jingle_session.py | 109 +- src/common/latex.py | 2 +- src/common/location_listener.py | 71 +- src/common/logger.py | 2 +- src/common/multimedia_helpers.py | 10 +- src/common/optparser.py | 19 +- src/common/passwords.py | 2 +- src/common/pep.py | 4 +- src/common/protocol/bytestream.py | 381 +- src/common/proxy65_manager.py | 7 +- src/common/pubsub.py | 28 +- 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 | 153 +- src/common/xmpp/client_nb.py | 7 +- src/common/xmpp/dispatcher_nb.py | 4 - src/common/xmpp/idlequeue.py | 2 +- src/common/xmpp/protocol.py | 7 + src/common/xmpp/roster_nb.py | 8 +- src/common/xmpp/stringprepare.py | 2 +- src/common/xmpp/tls_nb.py | 40 +- src/common/xmpp/transports_nb.py | 11 +- src/common/zeroconf/client_zeroconf.py | 15 +- src/common/zeroconf/connection_handlers_zeroconf.py | 10 +- src/common/zeroconf/connection_zeroconf.py | 13 +- src/common/zeroconf/zeroconf_bonjour.py | 6 +- src/config.py | 291 +- src/conversation_textview.py | 26 +- src/dataforms_widget.py | 30 +- src/dialogs.py | 208 +- src/disco.py | 14 +- src/features_window.py | 5 +- src/filetransfers_window.py | 4 +- src/gajim-remote.py | 4 +- src/gajim.py | 130 +- src/gajim_themes_window.py | 2 +- src/groupchat_control.py | 607 +- src/groups.py | 4 +- src/gtkexcepthook.py | 2 +- src/gtkgui_helpers.py | 92 +- src/gui_interface.py | 1117 +- src/gui_menu_builder.py | 15 +- src/history_manager.py | 2 +- src/history_window.py | 9 +- src/htmltextview.py | 2 +- src/ipython_view.py | 2 +- src/message_control.py | 6 +- src/message_textview.py | 2 +- src/message_window.py | 10 +- src/music_track_listener.py | 2 +- src/negotiation.py | 2 +- src/network_manager_listener.py | 2 +- src/notify.py | 215 +- src/profile_window.py | 20 +- src/remote_control.py | 2 +- src/roster_window.py | 1145 +- src/search_window.py | 2 +- src/session.py | 31 +- src/statusicon.py | 26 +- src/tooltips.py | 112 +- src/vcard.py | 8 +- 179 files changed, 123803 insertions(+), 82213 deletions(-)
diffs (truncated from 369107 to 300 lines):
diff -r e80de54a6600 -r af67a464c402 AUTHORS --- a/AUTHORS Thu Apr 08 01:20:17 2010 +0200 +++ b/AUTHORS Mon Jul 19 19:53:29 2010 +0200 @@ -1,13 +1,8 @@ CURRENT DEVELOPERS:
Alexander Cherniuk (ts33kr AT gmail.com) -Nikos Kouremenos (kourem AT gmail.com) Yann Leboulanger (asterix AT lagaule.org) -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:
@@ -15,3 +10,8 @@ Stephan Erb (steve-e AT h3c.de) Vincent Hanquez (tab AT snarc.org) Dimitur Kirov (dkirov AT gmail.com) +Nikos Kouremenos (kourem AT gmail.com) +Julien Pivotto (roidelapluie AT gmail.com) +Travis Shirk (travis AT pobox.com) +Brendan Taylor (whateley AT gmail.com) +Jean-Marie Traissard (jim AT lapin.org) diff -r e80de54a6600 -r af67a464c402 README.html --- a/README.html Thu Apr 08 01:20:17 2010 +0200 +++ b/README.html Mon Jul 19 19:53:29 2010 +0200 @@ -23,7 +23,7 @@
<h2>Optional Runtime Requirements</h2> <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><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>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> @@ -63,7 +63,7 @@
<p>To specify where to install do:</p> <pre> - su -c make PREFIX=custom_path install + ./configure --prefix=custom_path </pre>
<h2>Running Gajim</h2> @@ -98,7 +98,8 @@ If you want to remove it from custom directory provide it as: </p> <pre> - make PREFIX=custom_path uninstall + ./configure --prefix=custom_path + make uninstall </pre>
<h2>Miscellaneous</h2> @@ -119,7 +120,7 @@ <br/> <br/> <br/> -(C) 2003-200888888888<br/> +(C) 2003-2010<br/> The Gajim Team<br/> http://gajim.org<br/> <br/> diff -r e80de54a6600 -r af67a464c402 README.transifex --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/README.transifex Mon Jul 19 19:53:29 2010 +0200 @@ -0,0 +1,11 @@ +Transifex.net Token Verification +================================= + +The list of tokens bellow guarantee the respective users to be able to enable +submission on components using the following repository url: + +ssh://hg.gajim.org/gajim + +Tokens: + +JzQjKFEfvEhybB3vKxvsNYfusnpxWth3 / asterix diff -r e80de54a6600 -r af67a464c402 autogen.sh --- a/autogen.sh Thu Apr 08 01:20:17 2010 +0200 +++ b/autogen.sh Mon Jul 19 19:53:29 2010 +0200 @@ -8,7 +8,9 @@ fi
echo "[encoding: UTF-8]" > po/POTFILES.in \ - && ls -1 data/gajim.desktop.in.in data/gui/*.ui \ + && 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 >> \ po/POTFILES.in || exit 1 if test -z `which pkg-config 2>/dev/null`;then diff -r e80de54a6600 -r af67a464c402 data/gui/account_context_menu.ui --- a/data/gui/account_context_menu.ui Thu Apr 08 01:20:17 2010 +0200 +++ b/data/gui/account_context_menu.ui Mon Jul 19 19:53:29 2010 +0200 @@ -5,7 +5,7 @@ <object class="GtkMenu" id="account_context_menu"> <child> <object class="GtkImageMenuItem" id="status_menuitem"> - <property name="label">_Status</property> + <property name="label" translatable="yes">_Status</property> <property name="visible">True</property> <property name="use_underline">True</property> <property name="image">image1</property> @@ -14,7 +14,7 @@ </child> <child> <object class="GtkImageMenuItem" id="pep_menuitem"> - <property name="label">_Personal Events</property> + <property name="label" translatable="yes">_Personal Events</property> <property name="visible">True</property> <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property> <property name="use_underline">True</property> @@ -30,7 +30,7 @@ </child> <child> <object class="GtkImageMenuItem" id="start_chat_menuitem"> - <property name="label">_Start Chat...</property> + <property name="label" translatable="yes">_Start Chat...</property> <property name="visible">True</property> <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property> <property name="use_underline">True</property> @@ -40,7 +40,7 @@ </child> <child> <object class="GtkImageMenuItem" id="join_group_chat_menuitem"> - <property name="label">Join _Group Chat...</property> + <property name="label" translatable="yes">Join _Group Chat...</property> <property name="visible">True</property> <property name="use_underline">True</property> <property name="image">image4</property> @@ -54,7 +54,7 @@ </child> <child> <object class="GtkImageMenuItem" id="add_contact_menuitem"> - <property name="label">_Add Contact...</property> + <property name="label" translatable="yes">_Add Contact...</property> <property name="visible">True</property> <property name="use_underline">True</property> <property name="image">image5</property> @@ -63,7 +63,7 @@ </child> <child> <object class="GtkImageMenuItem" id="service_discovery_menuitem"> - <property name="label">_Discover Services</property> + <property name="label" translatable="yes">_Discover Services</property> <property name="visible">True</property> <property name="use_underline">True</property> <property name="image">image6</property> @@ -72,7 +72,7 @@ </child> <child> <object class="GtkImageMenuItem" id="execute_command_menuitem"> - <property name="label">_Execute Command...</property> + <property name="label" translatable="yes">_Execute Command...</property> <property name="visible">True</property> <property name="use_underline">True</property> <property name="image">image7</property> @@ -93,7 +93,7 @@ </child> <child> <object class="GtkImageMenuItem" id="edit_account_menuitem"> - <property name="label">_Modify Account</property> + <property name="label" translatable="yes">_Modify Account</property> <property name="visible">True</property> <property name="use_underline">True</property> <property name="image">image8</property> diff -r e80de54a6600 -r af67a464c402 data/gui/accounts_window.ui --- a/data/gui/accounts_window.ui Thu Apr 08 01:20:17 2010 +0200 +++ b/data/gui/accounts_window.ui Mon Jul 19 19:53:29 2010 +0200 @@ -4,7 +4,7 @@ <!-- interface-naming-policy toplevel-contextual --> <object class="GtkListStore" id="liststore1"> <columns> - <!-- column-name item text --> + <!-- column-name item --> <column type="gchararray"/> </columns> <data> @@ -203,7 +203,7 @@ <object class="GtkTable" id="table1"> <property name="visible">True</property> <property name="border_width">6</property> - <property name="n_rows">5</property> + <property name="n_rows">6</property> <property name="n_columns">3</property> <property name="column_spacing">6</property> <property name="row_spacing">6</property> @@ -445,6 +445,68 @@ <property name="y_options"></property> </packing> </child> + <child> + <object class="GtkExpander" id="expander2"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <child> + <object class="GtkHBox" id="hbox2"> + <property name="visible">True</property> + <property name="spacing">6</property> + <child> + <object class="GtkLabel" id="label28"> + <property name="visible">True</property> + <property name="xalign">0</property> + <property name="label" translatable="yes">_Client Cert File:</property> + <property name="use_underline">True</property> + <property name="mnemonic_widget">cert_entry1</property> + </object> + <packing> + <property name="expand">False</property> + <property name="position">0</property> + </packing> + </child> + <child> + <object class="GtkEntry" id="cert_entry1"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="tooltip_text" translatable="yes">The path to the client certificate and key in PKCS#12 format</property> + <property name="invisible_char">●</property> + </object> + <packing> + <property name="position">1</property> + </packing> + </child> + <child> + <object class="GtkButton" id="browse_for_client_cert_button"> + <property name="label" translatable="yes">Browse...</property> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="receives_default">True</property> + <property name="tooltip_text" translatable="yes">Choose Client Cert</property> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">False</property> + <property name="position">2</property> + </packing> + </child> + </object> + </child> + <child type="label"> + <object class="GtkLabel" id="label2"> + <property name="visible">True</property> + <property name="label" translatable="yes">Client certificate</property> + </object> + </child> + </object> + <packing> + <property name="right_attach">3</property> + <property name="top_attach">5</property> + <property name="bottom_attach">6</property> + <property name="y_options">GTK_FILL</property> + </packing> + </child> </object> </child> <child type="tab"> diff -r e80de54a6600 -r af67a464c402 data/gui/adhoc_commands_window.ui --- a/data/gui/adhoc_commands_window.ui Thu Apr 08 01:20:17 2010 +0200 +++ b/data/gui/adhoc_commands_window.ui Mon Jul 19 19:53:29 2010 +0200 @@ -359,6 +359,22 @@ <property name="spacing">12</property> <property name="layout_style">end</property> <child> + <object class="GtkButton" id="restart_button"> + <property name="label">gtk-goto-first</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_stock">True</property> + <signal name="clicked" handler="on_restart_button_clicked"/> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">False</property> + <property name="position">0</property> + </packing> + </child> + <child> <object class="GtkButton" id="back_button"> <property name="label">gtk-go-back</property> <property name="visible">True</property> @@ -371,7 +387,7 @@ <packing> <property name="expand">False</property> <property name="fill">False</property> - <property name="position">0</property> + <property name="position">1</property> </packing> </child> <child> @@ -387,7 +403,7 @@ <packing> <property name="expand">False</property> <property name="fill">False</property> - <property name="position">1</property>
-
Yann Leboulanger