changeset c394704d2ea3 in /home/hg/repos/gajim
author: Yann Leboulanger asterix@lagaule.org branches: details:http://hg.gajim.org/gajim?cmd=changeset;node=c394704d2ea3 description: merge GTK3 branch in default
diffstat:
README.html | 7 +- build.bat | 3 + data/Makefile.am | 4 +- data/gui/account_context_menu.ui | 4 +- data/gui/account_creation_wizard_window.ui | 269 +- data/gui/accounts_window.ui | 124 +- data/gui/add_new_contact_window.ui | 103 +- data/gui/advanced_configuration_window.ui | 1 + data/gui/blocked_contacts_window.ui | 43 +- data/gui/change_status_message_dialog.ui | 164 +- data/gui/chat_control.ui | 1378 +- data/gui/chat_to_muc_window.ui | 45 +- data/gui/dubbleinput_dialog.ui | 114 +- data/gui/edit_groups_dialog.ui | 85 +- data/gui/esession_info_window.ui | 144 +- data/gui/filetransfers.ui | 96 +- data/gui/gajim_themes_window.ui | 54 +- data/gui/groupchat_control.ui | 103 +- data/gui/history_manager.ui | 44 +- data/gui/history_window.ui | 85 +- data/gui/input_dialog.ui | 115 +- data/gui/input_text_dialog.ui | 116 +- data/gui/join_groupchat_window.ui | 134 +- data/gui/manage_bookmarks_window.ui | 24 +- data/gui/manage_pep_services_window.ui | 34 +- data/gui/manage_proxies_window.ui | 33 +- data/gui/manage_sounds_window.ui | 1 + data/gui/message_window.ui | 51 +- data/gui/plugins_window.ui | 177 +- data/gui/preferences_window.ui | 663 +- data/gui/profile_window.ui | 2 +- data/gui/remove_account_window.ui | 43 +- data/gui/roster_window.ui | 286 +- data/gui/search_window.ui | 133 +- data/gui/service_discovery_window.ui | 153 +- data/gui/service_registration_window.ui | 86 +- data/gui/systray_context_menu.ui | 6 +- data/gui/vcard_information_window.ui | 2 + data/gui/xml_console_window.ui | 132 +- data/other/cacerts.pem | 6240 ++++++++----- data/other/dh4096.pem | 21 + gajim.nsi | 8 + icons/hicolor/16x16/status/gajim-muc_separator.png | Bin launch.sh | 2 +- plugins/acronyms_expander/__init__.py | 2 +- plugins/acronyms_expander/acronyms | 69 + plugins/acronyms_expander/acronyms.py | 69 - plugins/acronyms_expander/acronyms_expander.py | 10 +- plugins/dbus_plugin/plugin.py | 6 +- po/he.po | 8868 +++++++++++-------- po/ru.po | 6140 ++++++------- setup_win32.py | 4 +- src/adhoc_commands.py | 33 +- src/advanced_configuration_window.py | 93 +- src/atom_window.py | 28 +- src/cell_renderer_image.py | 93 +- src/chat_control.py | 623 +- src/command_system/dispatcher.py | 11 +- src/command_system/framework.py | 24 +- src/command_system/implementation/custom.py | 2 +- src/command_system/implementation/execute.py | 12 +- src/command_system/implementation/middleware.py | 11 +- src/command_system/implementation/standard.py | 10 +- src/command_system/mapping.py | 31 +- src/command_system/tools.py | 13 +- src/common/atom.py | 6 +- src/common/caps_cache.py | 11 +- src/common/check_X509.py | 2 +- src/common/check_paths.py | 100 +- src/common/commands.py | 28 +- src/common/config.py | 27 +- src/common/configpaths.py | 75 +- src/common/connection.py | 79 +- src/common/connection_handlers.py | 49 +- src/common/connection_handlers_events.py | 153 +- src/common/contacts.py | 19 +- src/common/crypto.py | 49 +- src/common/dataforms.py | 12 +- src/common/dbus_support.py | 18 +- src/common/defs.py | 4 +- src/common/exceptions.py | 12 + src/common/file_props.py | 2 +- src/common/gajim.py | 34 +- src/common/ged.py | 6 +- src/common/gnupg.py | 2 +- src/common/gpg.py | 35 +- src/common/helpers.py | 145 +- src/common/i18n.py | 16 +- src/common/idle.py | 6 +- src/common/jingle.py | 27 +- src/common/jingle_content.py | 27 +- src/common/jingle_ft.py | 52 +- src/common/jingle_ftstates.py | 4 +- src/common/jingle_rtp.py | 68 +- src/common/jingle_session.py | 17 +- src/common/jingle_transport.py | 87 +- src/common/jingle_xtls.py | 119 +- src/common/kwalletbinding.py | 4 +- src/common/logger.py | 77 +- src/common/logging_helpers.py | 12 +- src/common/message_archiving.py | 2 +- src/common/multimedia_helpers.py | 2 +- src/common/nec.py | 2 +- src/common/optparser.py | 32 +- src/common/passwords.py | 126 +- src/common/pep.py | 43 +- src/common/protocol/bytestream.py | 73 +- src/common/proxy65_manager.py | 18 +- src/common/pubsub.py | 14 +- src/common/resolver.py | 49 +- src/common/rst_xhtml_generator.py | 18 +- src/common/sleepy.py | 3 +- src/common/socks5.py | 169 +- src/common/stanza_session.py | 10 +- src/common/zeroconf/client_zeroconf.py | 49 +- src/common/zeroconf/connection_zeroconf.py | 13 +- src/common/zeroconf/roster_zeroconf.py | 12 - src/common/zeroconf/zeroconf_avahi.py | 23 +- src/common/zeroconf/zeroconf_bonjour.py | 10 +- src/config.py | 627 +- src/conversation_textview.py | 331 +- src/dataforms_widget.py | 125 +- src/dialogs.py | 816 +- src/disco.py | 443 +- src/features_window.py | 37 +- src/filetransfers_window.py | 219 +- src/gajim-remote.py | 33 +- src/gajim.py | 160 +- src/gajim_themes_window.py | 47 +- src/groupchat_control.py | 288 +- src/groups.py | 2 +- src/gtkexcepthook.py | 35 +- src/gtkgui_helpers.py | 289 +- src/gtkspell.py | 12 +- src/gui_interface.py | 241 +- src/gui_menu_builder.py | 248 +- src/history_manager.py | 127 +- src/history_window.py | 187 +- src/htmltextview.py | 298 +- src/ipython_view.py | 60 +- src/message_control.py | 4 +- src/message_textview.py | 176 +- src/message_window.py | 205 +- src/music_track_listener.py | 16 +- src/negotiation.py | 2 +- src/network_manager_listener.py | 8 +- src/notify.py | 44 +- src/plugins/__init__.py | 4 +- src/plugins/gui.py | 83 +- src/plugins/helpers.py | 2 +- src/plugins/plugin.py | 37 +- src/plugins/pluginmanager.py | 112 +- src/plugins/plugins_i18n.py | 2 +- src/profile_window.py | 71 +- src/remote_control.py | 52 +- src/roster_window.py | 1126 +- src/search_window.py | 36 +- src/session.py | 17 +- src/statusicon.py | 76 +- src/tooltips.py | 319 +- src/vcard.py | 89 +- test/integration/test_resolver.py | 2 +- test/integration/test_roster.py | 4 +- test/lib/data.py | 90 +- test/lib/mock.py | 2 +- test/runtests.py | 10 +- test/unit/test_jingle.py | 82 +- test/unit/test_socks5.py | 107 +- 168 files changed, 19765 insertions(+), 17174 deletions(-)
diffs (truncated from 69047 to 300 lines):
diff -r 77d4c5bf1993 -r c394704d2ea3 README.html --- a/README.html Wed Jan 29 16:22:17 2014 +0100 +++ b/README.html Sun Mar 23 20:03:03 2014 +0100 @@ -14,8 +14,9 @@
<h2>Runtime Requirements</h2> <ul> -<li>python2.5 or higher</li> -<li>pygtk2.22 or higher</li> +<li>python2.7 or higher</li> +<li>python-gi</li> +<li>gir1.2-gtk-3.0</li> <li>python-nbxmpp</li> </ul>
@@ -28,7 +29,7 @@ <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 as password storage)</li> +<li>gir1.2-gnomekeyring-1.0 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> diff -r 77d4c5bf1993 -r c394704d2ea3 build.bat --- a/build.bat Wed Jan 29 16:22:17 2014 +0100 +++ b/build.bat Sun Mar 23 20:03:03 2014 +0100 @@ -22,6 +22,9 @@ copy ..\LIBEAY32.dll bin copy ..\SSLEAY32.dll bin
+REM for snarl plugin +xcopy ..\win32com bin\win32com /e /i + mkdir bin\gtk cd ../src/gtk hg archive ....\gajim_built\bin\gtk diff -r 77d4c5bf1993 -r c394704d2ea3 data/Makefile.am --- a/data/Makefile.am Wed Jan 29 16:22:17 2014 +0100 +++ b/data/Makefile.am Sun Mar 23 20:03:03 2014 +0100 @@ -12,7 +12,9 @@ sounds_DATA = $(srcdir)/sounds/*.wav
otherdir = $(pkgdatadir)/data/other -other_DATA = other/servers.xml other/cacerts.pem +other_DATA = other/servers.xml other/dh4096.pem +# other/cacert.pem is used only on Windows. On Unix platforms +# use CA certificates installed in /etc/ssl/certs
man_MANS = gajim.1 gajim-remote.1 gajim-history-manager.1
diff -r 77d4c5bf1993 -r c394704d2ea3 data/gui/account_context_menu.ui --- a/data/gui/account_context_menu.ui Wed Jan 29 16:22:17 2014 +0100 +++ b/data/gui/account_context_menu.ui Sun Mar 23 20:03:03 2014 +0100 @@ -40,7 +40,7 @@ </child> <child> <object class="GtkImageMenuItem" id="join_group_chat_menuitem"> - <property name="label" translatable="yes">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> @@ -93,7 +93,7 @@ </child> <child> <object class="GtkImageMenuItem" id="edit_account_menuitem"> - <property name="label" translatable="yes">_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 77d4c5bf1993 -r c394704d2ea3 data/gui/account_creation_wizard_window.ui --- a/data/gui/account_creation_wizard_window.ui Wed Jan 29 16:22:17 2014 +0100 +++ b/data/gui/account_creation_wizard_window.ui Sun Mar 23 20:03:03 2014 +0100 @@ -1,31 +1,54 @@ -<?xml version="1.0"?> +<?xml version="1.0" encoding="UTF-8"?> <interface> - <requires lib="gtk+" version="2.16"/> - <!-- interface-naming-policy toplevel-contextual --> + <!-- interface-requires gtk+ 3.0 --> + <object class="GtkImage" id="image2"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="stock">gtk-preferences</property> + </object> + <object class="GtkImage" id="image3"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="stock">gtk-apply</property> + </object> + <object class="GtkListStore" id="liststore1"> + <columns> + <!-- column-name item --> + <column type="gchararray"/> + </columns> + <data> + <row> + <col id="0" translatable="yes">None</col> + </row> + </data> + </object> <object class="GtkWindow" id="account_creation_wizard_window"> + <property name="can_focus">False</property> <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"/> + <signal name="destroy" handler="on_wizard_window_destroy" swapped="no"/> <child> <object class="GtkVBox" id="vbox77"> <property name="visible">True</property> - <property name="orientation">vertical</property> + <property name="can_focus">False</property> <property name="spacing">6</property> <child> <object class="GtkNotebook" id="notebook"> <property name="visible">True</property> + <property name="can_focus">False</property> <property name="show_tabs">False</property> <property name="show_border">False</property> <child> <object class="GtkVBox" id="vbox78"> <property name="visible">True</property> - <property name="orientation">vertical</property> + <property name="can_focus">False</property> <property name="spacing">12</property> <child> <object class="GtkLabel" id="label256"> <property name="visible">True</property> + <property name="can_focus">False</property> <property name="xalign">0</property> <property name="label" translatable="yes">You need to have an account in order to connect to the Jabber network.</property> @@ -39,18 +62,20 @@ <child> <object class="GtkFrame" id="frame33"> <property name="visible">True</property> + <property name="can_focus">False</property> <property name="label_xalign">0</property> <property name="shadow_type">none</property> <child> <object class="GtkAlignment" id="alignment68"> <property name="visible">True</property> + <property name="can_focus">False</property> <property name="top_padding">5</property> <property name="left_padding">12</property> <child> <object class="GtkVBox" id="vbox83"> <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="GtkRadioButton" id="use_existing_account_radiobutton"> @@ -59,6 +84,7 @@ <property name="can_focus">True</property> <property name="receives_default">False</property> <property name="use_underline">True</property> + <property name="xalign">0</property> <property name="draw_indicator">True</property> </object> <packing> @@ -74,6 +100,7 @@ <property name="can_focus">True</property> <property name="receives_default">False</property> <property name="use_underline">True</property> + <property name="xalign">0</property> <property name="draw_indicator">True</property> <property name="group">use_existing_account_radiobutton</property> </object> @@ -90,6 +117,7 @@ <child type="label"> <object class="GtkLabel" id="label269"> <property name="visible">True</property> + <property name="can_focus">False</property> <property name="label" translatable="yes"><b>Please choose one of the options below:</b></property> <property name="use_markup">True</property> </object> @@ -106,6 +134,7 @@ <child type="tab"> <object class="GtkLabel" id="label259"> <property name="visible">True</property> + <property name="can_focus">False</property> </object> <packing> <property name="tab_fill">False</property> @@ -114,12 +143,13 @@ <child> <object class="GtkVBox" id="register_vbox"> <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">12</property> <child> <object class="GtkLabel" id="label270"> <property name="visible">True</property> + <property name="can_focus">False</property> <property name="xalign">0</property> <property name="label" translatable="yes"><b>Please fill in the data for your existing account</b></property> <property name="use_markup">True</property> @@ -133,25 +163,30 @@ <child> <object class="GtkTable" id="table27"> <property name="visible">True</property> + <property name="can_focus">False</property> <property name="n_rows">3</property> <property name="n_columns">4</property> <property name="column_spacing">12</property> <property name="row_spacing">6</property> <child> + <placeholder/> + </child> + <child> <object class="GtkEntry" id="username_entry"> <property name="visible">True</property> <property name="can_focus">True</property> - <signal name="key_press_event" handler="on_username_entry_key_press_event"/> + <signal name="key-press-event" handler="on_username_entry_key_press_event" swapped="no"/> </object> <packing> <property name="left_attach">1</property> <property name="right_attach">2</property> - <property name="y_options"></property> + <property name="y_options"/> </packing> </child> <child> <object class="GtkLabel" id="label263"> <property name="visible">True</property> + <property name="can_focus">False</property> <property name="xalign">0</property> <property name="label" translatable="yes">_Password:</property> <property name="use_underline">True</property> @@ -161,7 +196,7 @@ <property name="top_attach">2</property> <property name="bottom_attach">3</property> <property name="x_options">GTK_FILL</property> - <property name="y_options"></property> + <property name="y_options"/> </packing> </child> <child> @@ -173,9 +208,10 @@ <property name="tooltip_text" translatable="yes">If checked, Gajim will remember the password for this account</property> <property name="use_underline">True</property> <property name="focus_on_click">False</property> + <property name="xalign">0.5</property> <property name="active">True</property> <property name="draw_indicator">True</property> - <signal name="toggled" handler="on_save_password_checkbutton_toggled"/> + <signal name="toggled" handler="on_save_password_checkbutton_toggled" swapped="no"/> </object> <packing> <property name="left_attach">2</property> @@ -183,7 +219,7 @@ <property name="top_attach">2</property> <property name="bottom_attach">3</property> <property name="x_options">GTK_FILL</property> - <property name="y_options"></property> + <property name="y_options"/> </packing> </child> <child> @@ -198,12 +234,13 @@ <property name="right_attach">2</property> <property name="top_attach">2</property> <property name="bottom_attach">3</property> - <property name="y_options"></property> + <property name="y_options"/> </packing> </child> <child> <object class="GtkLabel" id="label262"> <property name="visible">True</property> + <property name="can_focus">False</property> <property name="xalign">0</property> <property name="label" translatable="yes">_Jabber ID:</property> <property name="use_underline">True</property> @@ -211,30 +248,20 @@ </object> <packing> <property name="x_options">GTK_FILL</property> - <property name="y_options"></property> + <property name="y_options"/> </packing> </child> <child> <object class="GtkLabel" id="label1"> <property name="visible">True</property> + <property name="can_focus">False</property> <property name="xalign">0</property> <property name="label">@</property> </object> <packing> <property name="left_attach">2</property>