Commits November 2014

commits@gajim.org

1 participants
63 discussions

gajim: Defer the creation of XTLS until it's first time used.
by Gajim 14 Nov '14

14 Nov '14

changeset 24d7a00c68db in /home/hg/repos/gajim author: Fedor Brunner <fedor.brunner(a)azet.sk> branches: details:http://hg.gajim.org/gajim?cmd=changeset;node=24d7a00c68db description: Defer the creation of XTLS until it's first time used. This will make Gajim start a bit faster and more entropy can be generated for key generation. diffstat: src/common/check_paths.py | 7 ------- src/common/jingle_ft.py | 9 +++++++++ 2 files changed, 9 insertions(+), 7 deletions(-) diffs (53 lines): diff -r 198e8a642c7e -r 24d7a00c68db src/common/check_paths.py --- a/src/common/check_paths.py Tue Apr 15 12:42:09 2014 +0200 +++ b/src/common/check_paths.py Tue Apr 15 14:01:55 2014 +0200 @@ -30,7 +30,6 @@ from common import gajim from common import logger -from common import jingle_xtls # DO NOT MOVE ABOVE OF import gajim import sqlite3 as sqlite @@ -350,12 +349,6 @@ create_path(XTLS_CERTS) if not os.path.exists(LOCAL_XTLS_CERTS): create_path(LOCAL_XTLS_CERTS) - cert_name = os.path.join(LOCAL_XTLS_CERTS, - jingle_xtls.SELF_SIGNED_CERTIFICATE) - if gajim.HAVE_PYOPENSSL and not (os.path.exists(cert_name + '.cert') and \ - os.path.exists(cert_name + '.pkey')): - jingle_xtls.make_certs(cert_name, 'gajim') - def create_path(directory): head, tail = os.path.split(directory) diff -r 198e8a642c7e -r 24d7a00c68db src/common/jingle_ft.py --- a/src/common/jingle_ft.py Tue Apr 15 12:42:09 2014 +0200 +++ b/src/common/jingle_ft.py Tue Apr 15 14:01:55 2014 +0200 @@ -19,9 +19,11 @@ Handles Jingle File Transfer (XEP 0234) """ +import os import hashlib from common import gajim import nbxmpp +from common import configpaths from . import jingle_xtls from common.jingle_content import contents, JingleContent from common.jingle_transport import * @@ -108,6 +110,13 @@ STATE_TRANSPORT_REPLACE : StateTransportReplace(self), STATE_CAND_SENT_AND_RECEIVED : StateCandSentAndRecv(self) } + + if jingle_xtls.PYOPENSSL_PRESENT: + cert_name = os.path.join(configpaths.gajimpaths['MY_CERT'], + jingle_xtls.SELF_SIGNED_CERTIFICATE) + if not (os.path.exists(cert_name + '.cert') + and os.path.exists(cert_name + '.pkey')): + jingle_xtls.make_certs(cert_name, 'gajim') def __state_changed(self, nextstate, args=None): # Executes the next state action and sets the next state

1 0

gajim: fix Host resolver. Fixes #7729, #7750
by Gajim 14 Nov '14

14 Nov '14

changeset 28f7c471eabd in /home/hg/repos/gajim author: Yann Leboulanger <asterix(a)lagaule.org> branches: details:http://hg.gajim.org/gajim?cmd=changeset;node=28f7c471eabd description: fix Host resolver. Fixes #7729, #7750 diffstat: src/common/resolver.py | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diffs (12 lines): diff -r 24d7a00c68db -r 28f7c471eabd src/common/resolver.py --- a/src/common/resolver.py Tue Apr 15 14:01:55 2014 +0200 +++ b/src/common/resolver.py Tue Apr 22 13:11:00 2014 +0200 @@ -331,7 +331,7 @@ domain = ufqdn # For nslookup 9.6 if domain: # add 4 for ' has' after domain name - rest = line[len(domain)+4:].split('=') + rest = line[len(domain)+4:].split('record') if len(rest) != 2: continue answer_type, props_str = rest

1 0

gajim: remove all icons for all menus
by Gajim 11 Nov '14

11 Nov '14

changeset a631e38063b4 in /home/hg/repos/gajim author: Yann Leboulanger <asterix(a)lagaule.org> branches: details:http://hg.gajim.org/gajim?cmd=changeset;node=a631e38063b4 description: remove all icons for all menus diffstat: data/gui/account_context_menu.ui | 111 +---- data/gui/advanced_menuitem_menu.ui | 43 +- data/gui/chat_context_menu.ui | 94 +--- data/gui/contact_context_menu.ui | 305 ++++----------- data/gui/filetransfers.ui | 220 +++++----- data/gui/gc_control_popup_menu.ui | 103 +--- data/gui/gc_occupants_menu.ui | 120 ++---- data/gui/history_manager.ui | 531 +++++++++++++++------------ data/gui/roster_window.ui | 238 +++--------- data/gui/subscription_request_popup_menu.ui | 33 +- data/gui/systray_context_menu.ui | 98 +--- data/gui/zeroconf_context_menu.ui | 32 +- src/chat_control.py | 20 +- src/conversation_textview.py | 7 +- src/groupchat_control.py | 21 - src/gtkgui_helpers.py | 7 +- src/gui_menu_builder.py | 122 +----- src/htmltextview.py | 3 - src/profile_window.py | 5 +- src/roster_window.py | 184 +-------- src/statusicon.py | 19 +- src/vcard.py | 4 +- 22 files changed, 828 insertions(+), 1492 deletions(-) diffs (truncated from 3951 to 300 lines): diff -r 02813e917bf3 -r a631e38063b4 data/gui/account_context_menu.ui --- a/data/gui/account_context_menu.ui Tue Nov 11 15:07:53 2014 +0100 +++ b/data/gui/account_context_menu.ui Tue Nov 11 23:11:15 2014 +0100 @@ -1,87 +1,84 @@ -<?xml version="1.0"?> +<?xml version="1.0" encoding="UTF-8"?> + <interface> - <requires lib="gtk+" version="2.16"/> -  + <requires lib="gtk+" version="3.0"/> <object class="GtkMenu" id="account_context_menu"> + <property name="can_focus">False</property> <child> - <object class="GtkImageMenuItem" id="status_menuitem"> + <object class="GtkMenuItem" id="status_menuitem"> + <property name="visible">True</property> + <property name="can_focus">False</property> <property name="label" translatable="yes">_Status</property> - <property name="visible">True</property> <property name="use_underline">True</property> - <property name="image">image1</property> - <property name="use_stock">False</property> </object> </child> <child> - <object class="GtkImageMenuItem" id="pep_menuitem"> + <object class="GtkMenuItem" id="pep_menuitem"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</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> - <property name="image">image2</property> - <property name="use_stock">False</property> </object> </child> <child> <object class="GtkSeparatorMenuItem" id="separatormenuitem1"> <property name="visible">True</property> + <property name="can_focus">False</property> <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property> </object> </child> <child> - <object class="GtkImageMenuItem" id="start_chat_menuitem"> + <object class="GtkMenuItem" id="start_chat_menuitem"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</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> - <property name="image">image3</property> - <property name="use_stock">False</property> </object> </child> <child> - <object class="GtkImageMenuItem" id="join_group_chat_menuitem"> + <object class="GtkMenuItem" id="join_group_chat_menuitem"> + <property name="visible">True</property> + <property name="can_focus">False</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> - <property name="use_stock">False</property> </object> </child> <child> <object class="GtkSeparatorMenuItem" id="seperator"> <property name="visible">True</property> + <property name="can_focus">False</property> </object> </child> <child> - <object class="GtkImageMenuItem" id="add_contact_menuitem"> + <object class="GtkMenuItem" id="add_contact_menuitem"> + <property name="visible">True</property> + <property name="can_focus">False</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> - <property name="use_stock">False</property> </object> </child> <child> - <object class="GtkImageMenuItem" id="service_discovery_menuitem"> + <object class="GtkMenuItem" id="service_discovery_menuitem"> + <property name="visible">True</property> + <property name="can_focus">False</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> - <property name="use_stock">False</property> </object> </child> <child> - <object class="GtkImageMenuItem" id="execute_command_menuitem"> + <object class="GtkMenuItem" id="execute_command_menuitem"> + <property name="visible">True</property> + <property name="can_focus">False</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> - <property name="use_stock">False</property> </object> </child> <child> <object class="GtkMenuItem" id="open_gmail_inbox_menuitem"> <property name="visible">True</property> + <property name="can_focus">False</property> <property name="label" translatable="yes">_Open Gmail Inbox</property> <property name="use_underline">True</property> </object> @@ -89,56 +86,16 @@ <child> <object class="GtkSeparatorMenuItem" id="seperator1"> <property name="visible">True</property> + <property name="can_focus">False</property> </object> </child> <child> - <object class="GtkImageMenuItem" id="edit_account_menuitem"> + <object class="GtkMenuItem" id="edit_account_menuitem"> + <property name="visible">True</property> + <property name="can_focus">False</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> - <property name="use_stock">False</property> </object> </child> </object> - <object class="GtkImage" id="image1"> - <property name="visible">True</property> - <property name="stock">gtk-network</property> - <property name="icon-size">1</property> - </object> - <object class="GtkImage" id="image2"> - <property name="visible">True</property> - <property name="stock">gtk-home</property> - <property name="icon-size">1</property> - </object> - <object class="GtkImage" id="image3"> - <property name="visible">True</property> - <property name="stock">gtk-jump-to</property> - <property name="icon-size">1</property> - </object> - <object class="GtkImage" id="image4"> - <property name="visible">True</property> - <property name="stock">gtk-connect</property> - <property name="icon-size">1</property> - </object> - <object class="GtkImage" id="image5"> - <property name="visible">True</property> - <property name="stock">gtk-add</property> - <property name="icon-size">1</property> - </object> - <object class="GtkImage" id="image6"> - <property name="visible">True</property> - <property name="stock">gtk-find</property> - <property name="icon-size">1</property> - </object> - <object class="GtkImage" id="image7"> - <property name="visible">True</property> - <property name="stock">gtk-execute</property> - <property name="icon-size">1</property> - </object> - <object class="GtkImage" id="image8"> - <property name="visible">True</property> - <property name="stock">gtk-preferences</property> - <property name="icon-size">1</property> - </object> </interface> diff -r 02813e917bf3 -r a631e38063b4 data/gui/advanced_menuitem_menu.ui --- a/data/gui/advanced_menuitem_menu.ui Tue Nov 11 15:07:53 2014 +0100 +++ b/data/gui/advanced_menuitem_menu.ui Tue Nov 11 23:11:15 2014 +0100 @@ -1,10 +1,12 @@ -<?xml version="1.0"?> +<?xml version="1.0" encoding="UTF-8"?> + <interface> - <requires lib="gtk+" version="2.16"/> -  + <requires lib="gtk+" version="3.0"/> <object class="GtkMenu" id="advanced_menuitem_menu"> + <property name="can_focus">False</property> <child> <object class="GtkMenuItem" id="xml_console_menuitem"> + <property name="can_focus">False</property> <property name="label" translatable="yes">Show _XML Console</property> <property name="use_underline">True</property> </object> @@ -12,41 +14,48 @@ <child> <object class="GtkMenuItem" id="archiving_preferences_menuitem"> <property name="visible">True</property> + <property name="can_focus">False</property> <property name="label" translatable="yes">Edit Archi_ving Preferences</property> <property name="use_underline">True</property> </object> </child> <child> <object class="GtkMenuItem" id="privacy_lists_menuitem"> + <property name="can_focus">False</property> <property name="label" translatable="yes">Edit _Privacy Lists...</property> <property name="use_underline">True</property> </object> </child> <child> - <object class="GtkSeparatorMenuItem" id="separator8"/> + <object class="GtkSeparatorMenuItem" id="separator8"> + <property name="can_focus">False</property> + </object> </child> <child> <object class="GtkMenuItem" id="administrator_menuitem"> + <property name="can_focus">False</property> <property name="label" translatable="yes">_Administrator</property> <property name="use_underline">True</property> <child type="submenu"> <object class="GtkMenu" id="administrator_menuitem_menu"> + <property name="can_focus">False</property> <child> - <object class="GtkImageMenuItem" id="send_server_message_menuitem"> + <object class="GtkMenuItem" id="send_server_message_menuitem"> + <property name="can_focus">False</property> + <property name="tooltip_text" translatable="yes">Sends a message to users currently connected to this server</property> <property name="label" translatable="yes">_Send Server Message...</property> - <property name="tooltip_text" translatable="yes">Sends a message to users currently connected to this server</property> <property name="use_underline">True</property> - <property name="image">image1</property> - <property name="use_stock">False</property> </object> </child> <child> <object class="GtkSeparatorMenuItem" id="separator9"> <property name="visible">True</property> + <property name="can_focus">False</property> </object> </child> <child> <object class="GtkMenuItem" id="set_motd_menuitem"> + <property name="can_focus">False</property> <property name="tooltip_text" translatable="yes">Sets Message of the Day</property> <property name="label" translatable="yes">Set MOTD...</property> <property name="use_underline">True</property> @@ -54,17 +63,17 @@ </child> <child> <object class="GtkMenuItem" id="update_motd_menuitem"> + <property name="can_focus">False</property> <property name="tooltip_text" translatable="yes">Updates Message of the Day</property> <property name="label" translatable="yes">Update MOTD...</property> <property name="use_underline">True</property> </object> </child> <child> - <object class="GtkImageMenuItem" id="delete_motd_menuitem"> + <object class="GtkMenuItem" id="delete_motd_menuitem"> + <property name="can_focus">False</property> + <property name="tooltip_text" translatable="yes">Deletes Message of the Day</property> <property name="label" translatable="yes">Delete MOTD</property> - <property name="tooltip_text" translatable="yes">Deletes Message of the Day</property> - <property name="image">image2</property> - <property name="use_stock">False</property> </object> </child> </object> @@ -72,14 +81,4 @@ </object> </child> </object> - <object class="GtkImage" id="image1"> - <property name="visible">True</property> - <property name="stock">gtk-new</property> - <property name="icon-size">1</property> - </object> - <object class="GtkImage" id="image2"> - <property name="visible">True</property> - <property name="stock">gtk-clear</property> - <property name="icon-size">1</property> - </object> </interface> diff -r 02813e917bf3 -r a631e38063b4 data/gui/chat_context_menu.ui --- a/data/gui/chat_context_menu.ui Tue Nov 11 15:07:53 2014 +0100 +++ b/data/gui/chat_context_menu.ui Tue Nov 11 23:11:15 2014 +0100 @@ -1,111 +1,71 @@ -<?xml version="1.0"?> +<?xml version="1.0" encoding="UTF-8"?> + <interface>

1 0

gajim: enable carbons by default for newly created accounts
by Gajim 11 Nov '14

11 Nov '14

changeset a4e0dc06996f in /home/hg/repos/gajim author: Yann Leboulanger <asterix(a)lagaule.org> branches: gajim_0.16 details:http://hg.gajim.org/gajim?cmd=changeset;node=a4e0dc06996f description: enable carbons by default for newly created accounts diffstat: src/common/config.py | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diffs (12 lines): diff -r 04dca3223c2a -r a4e0dc06996f src/common/config.py --- a/src/common/config.py Tue Nov 11 16:03:26 2014 +0100 +++ b/src/common/config.py Tue Nov 11 16:11:26 2014 +0100 @@ -411,7 +411,7 @@ 'roster_version': [opt_str, ''], 'subscription_request_msg': [opt_str, '', _('Message that is sent to contacts you want to add')], 'last_archiving_time': [opt_str, '1970-01-01T00:00:00Z', _('Last time we syncronized with logs from server.')], - 'enable_message_carbons': [ opt_bool, False, _('If enabled and if server supports this feature, Gajim will receive messages sent and received by other resources.')], + 'enable_message_carbons': [ opt_bool, True, _('If enabled and if server supports this feature, Gajim will receive messages sent and received by other resources.')], 'ft_send_local_ips': [ opt_bool, True, _('If enabled, Gajim will send your local IPs so your contact can connect to your machine to transfer files.')], 'oauth2_refresh_token': [ opt_str, '', _('Latest token for Oauth2 authentication.')], 'oauth2_client_id': [ opt_str, '0000000044077801', _('client_id for Oauth2 authentication.')],

1 0

gajim: Add GUI option for message carbons
by Gajim 11 Nov '14

11 Nov '14

changeset 04dca3223c2a in /home/hg/repos/gajim author: Yann Leboulanger <asterix(a)lagaule.org> branches: gajim_0.16 details:http://hg.gajim.org/gajim?cmd=changeset;node=04dca3223c2a description: Add GUI option for message carbons diffstat: data/gui/accounts_window.ui | 18 +++++++++++++++++- src/config.py | 8 ++++++++ 2 files changed, 25 insertions(+), 1 deletions(-) diffs (60 lines): diff -r 7a0141cf56a7 -r 04dca3223c2a data/gui/accounts_window.ui --- a/data/gui/accounts_window.ui Tue Nov 11 15:32:10 2014 +0100 +++ b/data/gui/accounts_window.ui Tue Nov 11 16:03:26 2014 +0100 @@ -573,6 +573,22 @@ </packing> </child> <child> + <object class="GtkCheckButton" id="carbons_checkbutton1"> + <property name="label" translatable="yes">Receive conversations from other resources (If server supports it)</property> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="receives_default">False</property> + <property name="use_underline">True</property> + <property name="draw_indicator">True</property> + <signal name="toggled" handler="on_carbons_checkbutton_toggled"/> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">False</property> + <property name="position">4</property> + </packing> + </child> + <child> <object class="GtkCheckButton" id="use_ft_proxies_checkbutton1"> <property name="label" translatable="yes">Use file transfer proxies</property> <property name="visible">True</property> @@ -586,7 +602,7 @@ <packing> <property name="expand">False</property> <property name="fill">False</property> - <property name="position">4</property> + <property name="position">5</property> </packing> </child> </object> diff -r 7a0141cf56a7 -r 04dca3223c2a src/config.py --- a/src/config.py Tue Nov 11 15:32:10 2014 +0100 +++ b/src/config.py Tue Nov 11 16:03:26 2014 +0100 @@ -1971,6 +1971,8 @@ self.xml.get_object('sync_with_global_status_checkbutton1').set_active( gajim.config.get_per('accounts', account, 'sync_with_global_status')) + self.xml.get_object('carbons_checkbutton1').set_active( + gajim.config.get_per('accounts', account, 'enable_message_carbons')) self.xml.get_object('use_ft_proxies_checkbutton1').set_active( gajim.config.get_per('accounts', account, 'use_ft_proxies')) @@ -2328,6 +2330,12 @@ account=self.current_account) gajim.interface.roster.update_status_combobox() + def on_carbons_checkbutton_toggled(self, widget): + if self.ignore_events: + return + self.on_checkbutton_toggled(widget, 'enable_message_carbons', + account=self.current_account) + def on_use_ft_proxies_checkbutton1_toggled(self, widget): if self.ignore_events: return

1 0

gajim: add XEP-0313 (MAM) support. Fixes #7364
by Gajim 11 Nov '14

11 Nov '14

changeset 7a0141cf56a7 in /home/hg/repos/gajim author: Yann Leboulanger <asterix(a)lagaule.org> branches: gajim_0.16 details:http://hg.gajim.org/gajim?cmd=changeset;node=7a0141cf56a7 description: add XEP-0313 (MAM) support. Fixes #7364 diffstat: ChangeLog | 6 ++++++ 1 files changed, 6 insertions(+), 0 deletions(-) diffs (13 lines): diff -r 83e8b2dc4e93 -r 7a0141cf56a7 ChangeLog --- a/ChangeLog Tue Nov 11 15:28:24 2014 +0100 +++ b/ChangeLog Tue Nov 11 15:32:10 2014 +0100 @@ -1,3 +1,9 @@ +Gajim 0.16.1 () + + * Fix sending Zeroconf messages + * Make ipython compatible to version >= 1.0 + * Support XEP-0313 MAM + Gajim 0.16 (04 October 2014) * Improve File transfer support by adding Jingle file transfer

1 0

gajim: add XEP-313 (MAM) support
by Gajim 11 Nov '14

11 Nov '14

changeset 83e8b2dc4e93 in /home/hg/repos/gajim author: Yann Leboulanger <asterix(a)lagaule.org> branches: gajim_0.16 details:http://hg.gajim.org/gajim?cmd=changeset;node=83e8b2dc4e93 description: add XEP-313 (MAM) support diffstat: src/chat_control.py | 2 +- src/common/config.py | 1 + src/common/connection.py | 10 + src/common/connection_handlers.py | 93 +++------------- src/common/connection_handlers_events.py | 54 ++++++++++ src/common/logger.py | 12 +- src/common/message_archiving.py | 166 +++++++++++++++++++++++++++++++ src/gui_interface.py | 8 +- 8 files changed, 266 insertions(+), 80 deletions(-) diffs (truncated from 543 to 300 lines): diff -r b5b34a9bcf6e -r 83e8b2dc4e93 src/chat_control.py --- a/src/chat_control.py Sun Nov 09 15:39:26 2014 +0100 +++ b/src/chat_control.py Tue Nov 11 15:28:24 2014 +0100 @@ -2972,7 +2972,7 @@ and gajim.HAVE_PYCRYPTO and self.contact.supports(NS_ESESSION): self.begin_e2e_negotiation() elif (not self.session or not self.session.status) and \ - gajim.connections[self.account].archiving_supported: + gajim.connections[self.account].archiving_136_supported: self.begin_archiving_negotiation() else: self.send_chatstate('active', self.contact) diff -r b5b34a9bcf6e -r 83e8b2dc4e93 src/common/config.py --- a/src/common/config.py Sun Nov 09 15:39:26 2014 +0100 +++ b/src/common/config.py Tue Nov 11 15:28:24 2014 +0100 @@ -316,6 +316,7 @@ 'ignore_incoming_attention': [opt_bool, False, _('If True, Gajim will ignore incoming attention requestd ("wizz").')], 'remember_opened_chat_controls': [ opt_bool, True, _('If enabled, Gajim will reopen chat windows that were opened last time Gajim was closed.')], 'positive_184_ack': [ opt_bool, False, _('If enabled, Gajim will show an icon to show that sent message has been received by your contact')], + 'last_mam_id': [opt_str, '', _('Last MAM id we are syncronized with')], }, {}) __options_per_key = { diff -r b5b34a9bcf6e -r 83e8b2dc4e93 src/common/connection.py --- a/src/common/connection.py Sun Nov 09 15:39:26 2014 +0100 +++ b/src/common/connection.py Tue Nov 11 15:28:24 2014 +0100 @@ -424,6 +424,8 @@ msg_iq.setTag(nbxmpp.NS_ENCRYPTED + ' x').setData(msgenc) if self.carbons_enabled: msg_iq.addChild(name='private', namespace=nbxmpp.NS_CARBONS) + msg_iq.addChild(name='no-permanent-storage', + namespace=nbxmpp.NS_MSG_HINTS) if form_node: msg_iq.addChild(node=form_node) @@ -502,6 +504,10 @@ if self.carbons_enabled: msg_iq.addChild(name='private', namespace=nbxmpp.NS_CARBONS) + msg_iq.addChild(name='no-permanent-storage', + namespace=nbxmpp.NS_MSG_HINTS) + msg_iq.addChild(name='no-copy', + namespace=nbxmpp.NS_MSG_HINTS) if callback: callback(jid, msg, keyID, forward_from, session, original_message, @@ -1959,8 +1965,12 @@ # Remove stored bookmarks accessible to everyone. self.send_pb_purge(our_jid, 'storage:bookmarks') self.send_pb_delete(our_jid, 'storage:bookmarks') + if nbxmpp.NS_MAM in obj.features: + self.archiving_supported = True + self.archiving_313_supported = True if nbxmpp.NS_ARCHIVE in obj.features: self.archiving_supported = True + self.archiving_136_supported = True if nbxmpp.NS_ARCHIVE_AUTO in obj.features: self.archive_auto_supported = True if nbxmpp.NS_ARCHIVE_MANAGE in obj.features: diff -r b5b34a9bcf6e -r 83e8b2dc4e93 src/common/connection_handlers.py --- a/src/common/connection_handlers.py Sun Nov 09 15:39:26 2014 +0100 +++ b/src/common/connection_handlers.py Tue Nov 11 15:28:24 2014 +0100 @@ -54,10 +54,8 @@ from common.protocol.caps import ConnectionCaps from common.protocol.bytestream import ConnectionSocks5Bytestream from common.protocol.bytestream import ConnectionIBBytestream -from common.message_archiving import ConnectionArchive -from common.message_archiving import ARCHIVING_COLLECTIONS_ARRIVED -from common.message_archiving import ARCHIVING_COLLECTION_ARRIVED -from common.message_archiving import ARCHIVING_MODIFICATIONS_ARRIVED +from common.message_archiving import ConnectionArchive136 +from common.message_archiving import ConnectionArchive313 from common.connection_handlers_events import * from common import ged @@ -464,6 +462,7 @@ if id_ not in self.awaiting_answers: return + if self.awaiting_answers[id_][0] == VCARD_PUBLISHED: if iq_obj.getType() == 'result': vcard_iq = self.awaiting_answers[id_][1] @@ -482,6 +481,7 @@ if self.vcard_sha != new_sha and gajim.SHOW_LIST[ self.connected] != 'invisible': if not self.connection or self.connected < 2: + del self.awaiting_answers[id_] return self.vcard_sha = new_sha sshow = helpers.get_xmpp_show(gajim.SHOW_LIST[ @@ -495,6 +495,7 @@ elif iq_obj.getType() == 'error': gajim.nec.push_incoming_event(VcardNotPublishedEvent(None, conn=self)) + del self.awaiting_answers[id_] elif self.awaiting_answers[id_][0] == VCARD_ARRIVED: # If vcard is empty, we send to the interface an empty vcard so that # it knows it arrived @@ -517,10 +518,12 @@ vcard = {'jid': jid, 'resource': resource} gajim.nec.push_incoming_event(VcardReceivedEvent(None, conn=self, vcard_dict=vcard)) + del self.awaiting_answers[id_] elif self.awaiting_answers[id_][0] == AGENT_REMOVED: jid = self.awaiting_answers[id_][1] gajim.nec.push_incoming_event(AgentRemovedEvent(None, conn=self, agent=jid)) + del self.awaiting_answers[id_] elif self.awaiting_answers[id_][0] == METACONTACTS_ARRIVED: if not self.connection: return @@ -531,7 +534,9 @@ if iq_obj.getErrorCode() not in ('403', '406', '404'): self.private_storage_supported = False self.get_roster_delimiter() + del self.awaiting_answers[id_] elif self.awaiting_answers[id_][0] == DELIMITER_ARRIVED: + del self.awaiting_answers[id_] if not self.connection: return if iq_obj.getType() == 'result': @@ -566,7 +571,9 @@ gajim.nec.push_incoming_event(RosterReceivedEvent(None, conn=self)) gobject.timeout_add_seconds(10, self.discover_servers) + del self.awaiting_answers[id_] elif self.awaiting_answers[id_][0] == PRIVACY_ARRIVED: + del self.awaiting_answers[id_] if iq_obj.getType() != 'error': self.privacy_rules_supported = True self.get_privacy_list('block') @@ -595,6 +602,7 @@ # Ask metacontacts before roster self.get_metacontacts() elif self.awaiting_answers[id_][0] == BLOCKING_ARRIVED: + del self.awaiting_answers[id_] if iq_obj.getType() == 'result': list_node = iq_obj.getTag('blocklist') if not list_node: @@ -603,6 +611,7 @@ for i in list_node.iterTags('item'): self.blocked_contacts.append(i.getAttr('jid')) elif self.awaiting_answers[id_][0] == PEP_CONFIG: + del self.awaiting_answers[id_] if iq_obj.getType() == 'error': return if not iq_obj.getTag('pubsub'): @@ -617,71 +626,6 @@ gajim.nec.push_incoming_event(PEPConfigReceivedEvent(None, conn=self, node=node, form=form)) - elif self.awaiting_answers[id_][0] == ARCHIVING_COLLECTIONS_ARRIVED: - # TODO - print 'ARCHIVING_COLLECTIONS_ARRIVED' - - elif self.awaiting_answers[id_][0] == ARCHIVING_COLLECTION_ARRIVED: - def save_if_not_exists(with_, nick, direction, tim, payload): - assert len(payload) == 1, 'got several archiving messages in' +\ - ' the same time %s' % ''.join(payload) - if payload[0].getName() == 'body': - gajim.logger.save_if_not_exists(with_, direction, tim, - msg=payload[0].getData(), nick=nick) - elif payload[0].getName() == 'message': - print 'Not implemented' - chat = iq_obj.getTag('chat') - if chat: - with_ = chat.getAttr('with') - start_ = chat.getAttr('start') - tim = helpers.datetime_tuple(start_) - tim = timegm(tim) - nb = 0 - for element in chat.getChildren(): - try: - secs = int(element.getAttr('secs')) - except TypeError: - secs = 0 - if secs: - tim += secs - nick = element.getAttr('name') - if element.getName() == 'from': - save_if_not_exists(with_, nick, 'from', localtime(tim), - element.getPayload()) - nb += 1 - if element.getName() == 'to': - save_if_not_exists(with_, nick, 'to', localtime(tim), - element.getPayload()) - nb += 1 - set_ = chat.getTag('set') - first = set_.getTag('first') - if first: - try: - index = int(first.getAttr('index')) - except TypeError: - index = 0 - try: - count = int(set_.getTagData('count')) - except TypeError: - count = 0 - if count > index + nb: - # Request the next page - after = element.getTagData('last') - self.request_collection_page(with_, start_, after=after) - - elif self.awaiting_answers[id_][0] == ARCHIVING_MODIFICATIONS_ARRIVED: - modified = iq_obj.getTag('modified') - if modified: - for element in modified.getChildren(): - if element.getName() == 'changed': - with_ = element.getAttr('with') - start_ = element.getAttr('start') - self.request_collection_page(with_, start_) - #elif element.getName() == 'removed': - # do nothing - - del self.awaiting_answers[id_] - def _vCardCB(self, con, vc): """ Called when we receive a vCard Parse the vCard and send it to plugins @@ -1423,13 +1367,14 @@ return sess -class ConnectionHandlers(ConnectionArchive, ConnectionVcard, -ConnectionSocks5Bytestream, ConnectionDisco, ConnectionCommands, -ConnectionPubSub, ConnectionPEP, ConnectionCaps, ConnectionHandlersBase, -ConnectionJingle, ConnectionIBBytestream): +class ConnectionHandlers(ConnectionArchive136, ConnectionArchive313, +ConnectionVcard, ConnectionSocks5Bytestream, ConnectionDisco, +ConnectionCommands, ConnectionPubSub, ConnectionPEP, ConnectionCaps, +ConnectionHandlersBase, ConnectionJingle, ConnectionIBBytestream): def __init__(self): global HAS_IDLE - ConnectionArchive.__init__(self) + ConnectionArchive136.__init__(self) + ConnectionArchive313.__init__(self) ConnectionVcard.__init__(self) ConnectionSocks5Bytestream.__init__(self) ConnectionIBBytestream.__init__(self) diff -r b5b34a9bcf6e -r 83e8b2dc4e93 src/common/connection_handlers_events.py --- a/src/common/connection_handlers_events.py Sun Nov 09 15:39:26 2014 +0100 +++ b/src/common/connection_handlers_events.py Tue Nov 11 15:28:24 2014 +0100 @@ -1089,6 +1089,60 @@ return self.forwarded = True + result = self.stanza.getTag('result', namespace=nbxmpp.NS_MAM) + if result: + forwarded = result.getTag('forwarded', namespace=nbxmpp.NS_FORWARD) + if not forwarded: + return + delay = forwarded.getTag('delay', namespace=nbxmpp.NS_DELAY2) + if not delay: + return + tim = delay.getAttr('stamp') + tim = helpers.datetime_tuple(tim) + tim = localtime(timegm(tim)) + msg_ = forwarded.getTag('message') + to_ = msg_.getAttr('to') + if to_: + gajim.get_jid_without_resource(to_) + else: + to_ = gajim.get_jid_from_account(account) + frm_ = gajim.get_jid_without_resource(msg_.getAttr('from')) + nick = None + msg_txt = msg_.getTagData('body') + if to_ == gajim.get_jid_from_account(account): + with_ = frm_ + direction = 'from' + res = gajim.get_resource_from_jid(msg_.getAttr('from')) + else: + with_ = to_ + direction = 'to' + res = gajim.get_resource_from_jid(msg_.getAttr('to')) + is_pm = gajim.logger.jid_is_room_jid(with_) + if msg_.getAttr('type') == 'groupchat': + if is_pm == False: + log.warn('JID %s is marked as normal contact in database ' + 'but we got a groupchat message from it.') + return + if is_pm == None: + gajim.logger.get_jid_id(with_, 'ROOM') + nick = res + else: + if is_pm == None: + # we don't know this JID, we need to disco it. + server = gajim.get_server_from_jid(with_) + if server not in self.conn.mam_awaiting_disco_result: + self.conn.mam_awaiting_disco_result[server] = [ + [with_, direction, tim, msg_txt, res]] + self.conn.discoverInfo(server) + else: + self.conn.mam_awaiting_disco_result[server].append( + [with_, direction, tim, msg_txt, res]) + return + + gajim.logger.save_if_not_exists(with_, direction, tim, + msg=msg_txt, nick=nick) + return

1 0

gajim: make e2e work with py3
by Gajim 11 Nov '14

11 Nov '14

changeset 02813e917bf3 in /home/hg/repos/gajim author: Yann Leboulanger <asterix(a)lagaule.org> branches: details:http://hg.gajim.org/gajim?cmd=changeset;node=02813e917bf3 description: make e2e work with py3 diffstat: src/common/crypto.py | 13 +++--- src/common/dh.py | 5 +- src/common/stanza_session.py | 84 +++++++++++++++++++++++-------------------- src/secrets.py | 14 +++++- 4 files changed, 64 insertions(+), 52 deletions(-) diffs (truncated from 375 to 300 lines): diff -r 5301bed9a8f8 -r 02813e917bf3 src/common/crypto.py --- a/src/common/crypto.py Sun Nov 09 22:33:32 2014 +0100 +++ b/src/common/crypto.py Tue Nov 11 15:07:53 2014 +0100 @@ -28,9 +28,9 @@ # convert a large integer to a big-endian bitstring def encode_mpi(n): if n >= 256: - return encode_mpi(n / 256) + chr(n % 256) + return encode_mpi(n // 256) + bytes([n % 256]) else: - return chr(n) + return bytes([n]) # convert a large integer to a big-endian bitstring, padded with \x00s to # a multiple of 16 bytes @@ -56,7 +56,7 @@ if len(s) == 0: return 0 else: - return 256 * decode_mpi(s[:-1]) + ord(s[-1]) + return 256 * decode_mpi(s[:-1]) + s[-1] def sha256(string): sh = SHA256() @@ -66,13 +66,13 @@ base28_chr = "acdefghikmopqruvwxy123456789" def sas_28x5(m_a, form_b): - sha = sha256(m_a + form_b + 'Short Authentication String') + sha = sha256(m_a + form_b + b'Short Authentication String') lsb24 = decode_mpi(sha[-3:]) return base28(lsb24) def base28(n): if n >= 28: - return base28(n / 28) + base28_chr[n % 28] + return base28(n // 28) + base28_chr[n % 28] else: return base28_chr[n] @@ -147,6 +147,5 @@ result = (result * square) % mod square = (square * square) % mod - exp /= 2 - + exp //= 2 return result diff -r 5301bed9a8f8 -r 02813e917bf3 src/common/dh.py --- a/src/common/dh.py Sun Nov 09 22:33:32 2014 +0100 +++ b/src/common/dh.py Tue Nov 11 15:07:53 2014 +0100 @@ -224,6 +224,7 @@ if not stripee: return None - return int(stripee.translate(all_ascii, string.whitespace), 16) + return int(stripee.translate(all_ascii).translate(str.maketrans("", "", + string.whitespace)), 16) -primes = map(hex_to_decimal, hex_primes) +primes = list(map(hex_to_decimal, hex_primes)) diff -r 5301bed9a8f8 -r 02813e917bf3 src/common/stanza_session.py --- a/src/common/stanza_session.py Sun Nov 09 22:33:32 2014 +0100 +++ b/src/common/stanza_session.py Tue Nov 11 15:07:53 2014 +0100 @@ -410,21 +410,21 @@ c = stanza.NT.c c.setNamespace('http://www.xmpp.org/extensions/xep-0200.html#ns') - c.NT.data = base64.b64encode(m_final) + c.NT.data = base64.b64encode(m_final).decode('utf-8') # FIXME check for rekey request, handle <key/> elements - m_content = ''.join(map(str, c.getChildren())) + m_content = (''.join(map(str, c.getChildren()))).encode('utf-8') c.NT.mac = base64.b64encode(self.hmac(self.km_s, m_content + \ - crypto.encode_mpi(old_en_counter))) + crypto.encode_mpi(old_en_counter))).decode('utf-8') msgtxt = '[This is part of an encrypted session. ' \ 'If you see this message, something went wrong.]' lang = os.getenv('LANG') if lang is not None and lang != 'en': # we're not english msgtxt = _('[This is part of an encrypted session. ' - 'If you see this message, something went wrong.]') + ' (' + \ - msgtxt + ')' + 'If you see this message, something went wrong.]') + ' (' + \ + msgtxt + ')' stanza.setBody(msgtxt) return stanza @@ -436,14 +436,14 @@ return HMAC(key, content, self.hash_alg).digest() def generate_initiator_keys(self, k): - return (self.hmac(k, 'Initiator Cipher Key'), - self.hmac(k, 'Initiator MAC Key'), - self.hmac(k, 'Initiator SIGMA Key')) + return (self.hmac(k, b'Initiator Cipher Key'), + self.hmac(k, b'Initiator MAC Key'), + self.hmac(k, b'Initiator SIGMA Key')) def generate_responder_keys(self, k): - return (self.hmac(k, 'Responder Cipher Key'), - self.hmac(k, 'Responder MAC Key'), - self.hmac(k, 'Responder SIGMA Key')) + return (self.hmac(k, b'Responder Cipher Key'), + self.hmac(k, b'Responder MAC Key'), + self.hmac(k, b'Responder SIGMA Key')) def compress(self, plaintext): if self.compression is None: @@ -473,6 +473,7 @@ # contents of <c>, minus <mac>, minus whitespace macable = ''.join(str(x) for x in c.getChildren() if x.getName() != 'mac') + macable = macable.encode('utf-8') received_mac = base64.b64decode(c.getTagData('mac')) calculated_mac = self.hmac(self.km_o, macable + \ @@ -483,7 +484,7 @@ m_final = base64.b64decode(c.getTagData('data')) m_compressed = self.decrypt(m_final) - plaintext = self.decompress(m_compressed) + plaintext = self.decompress(m_compressed).decode('utf-8') try: parsed = nbxmpp.Node(node='<node>' + plaintext + '</node>') @@ -536,7 +537,7 @@ if i_o == 'a' and self.sas_algs == 'sas28x5': # we don't need to calculate this if there's a verified retained secret # (but we do anyways) - self.sas = crypto.sas_28x5(m_o, self.form_s) + self.sas = crypto.sas_28x5(m_o, self.form_s.encode('utf-8')) if self.negotiated['recv_pubkey']: plaintext = self.decrypt(id_o) @@ -564,18 +565,18 @@ signature = (crypto.decode_mpi(base64.b64decode(enc_sig)), ) else: mac_o = self.decrypt(id_o) - pubkey_o = '' + pubkey_o = b'' c7l_form = self.c7lize_mac_id(form) content = self.n_s + self.n_o + crypto.encode_mpi(dh_i) + pubkey_o if sigmai: - self.form_o = c7l_form + self.form_o = c7l_form.encode('utf-8') content += self.form_o else: - form_o2 = c7l_form - content += self.form_o + form_o2 + form_o2 = c7l_form.encode('utf-8') + content += self.form_o.encode('utf-8') + form_o2 mac_o_calculated = self.hmac(self.ks_o, content) @@ -598,18 +599,18 @@ cb_fields = [base64.b64encode(crypto.encode_mpi(f)) for f in fields] - pubkey_s = '<RSAKeyValue xmlns="http://www.w3.org/2000/09/xmldsig#"' + pubkey_s = b'<RSAKeyValue xmlns="http://www.w3.org/2000/09/xmldsig#"' '><Modulus>%s</Modulus><Exponent>%s</Exponent></RSAKeyValue>' % \ tuple(cb_fields) else: - pubkey_s = '' + pubkey_s = b'' form_s2 = ''.join(nbxmpp.c14n.c14n(el, self._is_buggy_gajim()) for el \ in form.getChildren()) old_c_s = self.c_s content = self.n_o + self.n_s + crypto.encode_mpi(dh_i) + pubkey_s + \ - self.form_s + form_s2 + self.form_s.encode('utf-8') + form_s2.encode('utf-8') mac_s = self.hmac(self.ks_s, content) @@ -632,14 +633,16 @@ if self.status == 'requested-e2e' and self.sas_algs == 'sas28x5': # we're alice; check for a retained secret # if none exists, prompt the user with the SAS - self.sas = crypto.sas_28x5(m_s, self.form_o) + self.sas = crypto.sas_28x5(m_s, self.form_o.encode('utf-8')) if self.sigmai: # FIXME save retained secret? self.check_identity(tuple) - return (nbxmpp.DataField(name='identity', value=base64.b64encode(id_s)), - nbxmpp.DataField(name='mac', value=base64.b64encode(m_s))) + return (nbxmpp.DataField(name='identity', + value=base64.b64encode(id_s).decode('utf-8')), + nbxmpp.DataField(name='mac', + value=base64.b64encode(m_s).decode('utf-8'))) def negotiate_e2e(self, sigmai): self.negotiated = {} @@ -695,7 +698,7 @@ self.n_s = crypto.generate_nonce() x.addChild(node=nbxmpp.DataField(name='my_nonce', - value=base64.b64encode(self.n_s), typ='hidden')) + value=base64.b64encode(self.n_s).decode('utf-8'), typ='hidden')) modp_options = [ int(g) for g in gajim.config.get('esession_modp').split( ',') ] @@ -826,7 +829,7 @@ return dhhashes = dhhashes_f.getValues() self.negotiated['He'] = base64.b64decode(dhhashes[group_order].encode( - 'utf8')) + 'utf8')) bytes = int(self.n / 8) @@ -845,7 +848,7 @@ 'nonce': self.n_o} for name in to_add: - b64ed = base64.b64encode(to_add[name]) + b64ed = base64.b64encode(to_add[name]).decode('utf-8') x.addChild(node=nbxmpp.DataField(name=name, value=b64ed)) self.form_o = ''.join(nbxmpp.c14n.c14n(el, self._is_buggy_gajim()) for \ @@ -935,7 +938,7 @@ value='urn:xmpp:ssn')) result.addChild(node=nbxmpp.DataField(name='accept', value='1')) result.addChild(node=nbxmpp.DataField(name='nonce', - value=base64.b64encode(self.n_o))) + value=base64.b64encode(self.n_o).decode('utf-8'))) self.kc_s, self.km_s, self.ks_s = self.generate_initiator_keys(self.k) @@ -952,11 +955,12 @@ rshash_size = self.hash_alg().digest_size rshashes.append(crypto.random_bytes(rshash_size)) - rshashes = [base64.b64encode(rshash) for rshash in rshashes] + rshashes = [base64.b64encode(rshash).decode('utf-8') for rshash in \ + rshashes] result.addChild(node=nbxmpp.DataField(name='rshashes', value=rshashes)) result.addChild(node=nbxmpp.DataField(name='dhkeys', - value=base64.b64encode(crypto.encode_mpi(e)))) + value=base64.b64encode(crypto.encode_mpi(e)).decode('utf-8'))) self.form_o = ''.join(nbxmpp.c14n.c14n(el, self._is_buggy_gajim()) \ for el in form.getChildren()) @@ -1006,7 +1010,7 @@ self.verify_identity(form, e, False, 'a') # 4.5.4 generating bob's final session keys - srs = '' + srs = b'' srses = secrets.secrets().retained_secrets(self.conn.name, self.jid.getStripped()) @@ -1021,7 +1025,7 @@ # other shared secret # (we're not using one) - oss = '' + oss = b'' k = crypto.sha256(k + srs + oss) @@ -1030,16 +1034,16 @@ # 4.5.5 if srs: - srshash = self.hmac(srs, 'Shared Retained Secret') + srshash = self.hmac(srs, b'Shared Retained Secret') else: srshash = crypto.random_bytes(32) x.addChild(node=nbxmpp.DataField(name='FORM_TYPE', value='urn:xmpp:ssn')) x.addChild(node=nbxmpp.DataField(name='nonce', value=base64.b64encode( - self.n_o))) + self.n_o).decode('utf-8'))) x.addChild(node=nbxmpp.DataField(name='srshash', value=base64.b64encode( - srshash))) + srshash).decode('utf-8'))) for datafield in self.make_identity(x, self.d): x.addChild(node=datafield) @@ -1062,7 +1066,7 @@ self.stop_archiving_for_session() def final_steps_alice(self, form): - srs = '' + srs = b'' srses = secrets.secrets().retained_secrets(self.conn.name, self.jid.getStripped())

1 0

gajim: fix pyasn1 usage
by Gajim 09 Nov '14

09 Nov '14

changeset 5301bed9a8f8 in /home/hg/repos/gajim author: Yann Leboulanger <asterix(a)lagaule.org> branches: details:http://hg.gajim.org/gajim?cmd=changeset;node=5301bed9a8f8 description: fix pyasn1 usage diffstat: src/common/check_X509.py | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diffs (12 lines): diff -r 0f5d2c98c195 -r 5301bed9a8f8 src/common/check_X509.py --- a/src/common/check_X509.py Sun Nov 09 17:32:20 2014 +0100 +++ b/src/common/check_X509.py Sun Nov 09 22:33:32 2014 +0100 @@ -132,7 +132,7 @@ compared_srv_domain = '_xmpp-client.' + compared_domain for i in range(0, cnt): ext = cert.get_extension(i) - if ext.get_short_name() == 'subjectAltName': + if ext.get_short_name() == b'subjectAltName': try: r = _parse_asn1(ext.get_data()) except:

1 0

gajim: fix opening join groupchat dialog. Fixes #7861
by Gajim 09 Nov '14

09 Nov '14

changeset 0f5d2c98c195 in /home/hg/repos/gajim author: Yann Leboulanger <asterix(a)lagaule.org> branches: details:http://hg.gajim.org/gajim?cmd=changeset;node=0f5d2c98c195 description: fix opening join groupchat dialog. Fixes #7861 diffstat: data/gui/join_groupchat_window.ui | 232 +++++++++++++++++-------------------- src/dialogs.py | 25 +-- 2 files changed, 115 insertions(+), 142 deletions(-) diffs (truncated from 426 to 300 lines): diff -r 82599a0f0053 -r 0f5d2c98c195 data/gui/join_groupchat_window.ui --- a/data/gui/join_groupchat_window.ui Mon Oct 20 17:20:38 2014 +0200 +++ b/data/gui/join_groupchat_window.ui Sun Nov 09 17:32:20 2014 +0100 @@ -1,6 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> + <interface> -  + <requires lib="gtk+" version="3.10"/> <object class="GtkImage" id="image1"> <property name="visible">True</property> <property name="can_focus">False</property> @@ -19,32 +20,85 @@ <signal name="destroy" handler="on_join_groupchat_window_destroy" swapped="no"/> <signal name="key-press-event" handler="on_join_groupchat_window_key_press_event" swapped="no"/> <child> - <object class="GtkVBox" id="vbox28"> + <object class="GtkBox" id="box1"> <property name="visible">True</property> <property name="can_focus">False</property> + <property name="orientation">vertical</property> <property name="spacing">12</property> <child> - <object class="GtkTable" id="table15"> + <object class="GtkGrid" id="grid1"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="n_rows">8</property> - <property name="n_columns">2</property> + <property name="row_spacing">6</property> <property name="column_spacing">12</property> - <property name="row_spacing">6</property> <child> <object class="GtkEntry" id="room_jid_entry"> <property name="visible">True</property> <property name="can_focus">True</property> - <property name="has_focus">True</property> <property name="activates_default">True</property> <signal name="changed" handler="on_required_entry_changed" swapped="no"/> </object> <packing> <property name="left_attach">1</property> - <property name="right_attach">2</property> <property name="top_attach">3</property> - <property name="bottom_attach">4</property> - <property name="y_options"/> + </packing> + </child> + <child> + <object class="GtkLabel" id="account_label"> + <property name="can_focus">False</property> + <property name="no_show_all">True</property> + <property name="xalign">0</property> + <property name="label" translatable="yes">Account</property> + </object> + <packing> + <property name="left_attach">0</property> + <property name="top_attach">0</property> + </packing> + </child> + <child> + <object class="GtkComboBox" id="account_combobox"> + <property name="can_focus">False</property> + <property name="no_show_all">True</property> + <signal name="changed" handler="on_account_combobox_changed" swapped="no"/> + </object> + <packing> + <property name="left_attach">1</property> + <property name="top_attach">0</property> + </packing> + </child> + <child> + <object class="GtkLabel" id="label225"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="xalign">0</property> + <property name="label" translatable="yes">Recently:</property> + </object> + <packing> + <property name="left_attach">0</property> + <property name="top_attach">1</property> + </packing> + </child> + <child> + <object class="GtkComboBox" id="recently_combobox"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <signal name="changed" handler="on_recently_combobox_changed" swapped="no"/> + </object> + <packing> + <property name="left_attach">1</property> + <property name="top_attach">1</property> + </packing> + </child> + <child> + <object class="GtkLabel" id="label142"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="xalign">0</property> + <property name="label" translatable="yes">Nickname:</property> + </object> + <packing> + <property name="left_attach">0</property> + <property name="top_attach">2</property> </packing> </child> <child> @@ -56,10 +110,7 @@ </object> <packing> <property name="left_attach">1</property> - <property name="right_attach">2</property> <property name="top_attach">2</property> - <property name="bottom_attach">3</property> - <property name="y_options"/> </packing> </child> <child> @@ -70,53 +121,20 @@ <property name="label" translatable="yes">Room:</property> </object> <packing> + <property name="left_attach">0</property> <property name="top_attach">3</property> - <property name="bottom_attach">4</property> - <property name="x_options">GTK_FILL</property> - <property name="y_options"/> </packing> </child> <child> - <object class="GtkLabel" id="label142"> + <object class="GtkLabel" id="label1"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="xalign">0</property> - <property name="label" translatable="yes">Nickname:</property> + <property name="label" translatable="yes">Server:</property> </object> <packing> - <property name="top_attach">2</property> - <property name="bottom_attach">3</property> - <property name="x_options">GTK_FILL</property> - <property name="y_options"/> - </packing> - </child> - <child> - <object class="GtkLabel" id="label225"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="xalign">0</property> - <property name="label" translatable="yes">Recently:</property> - </object> - <packing> - <property name="top_attach">1</property> - <property name="bottom_attach">2</property> - <property name="x_options">GTK_FILL</property> - <property name="y_options"/> - </packing> - </child> - <child> - <object class="GtkComboBox" id="recently_combobox"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <signal name="changed" handler="on_recently_combobox_changed" swapped="no"/> - </object> - <packing> - <property name="left_attach">1</property> - <property name="right_attach">2</property> - <property name="top_attach">1</property> - <property name="bottom_attach">2</property> - <property name="x_options">GTK_FILL</property> - <property name="y_options">GTK_FILL</property> + <property name="left_attach">0</property> + <property name="top_attach">4</property> </packing> </child> <child> @@ -127,10 +145,8 @@ <property name="label" translatable="yes">Password:</property> </object> <packing> + <property name="left_attach">0</property> <property name="top_attach">5</property> - <property name="bottom_attach">6</property> - <property name="x_options">GTK_FILL</property> - <property name="y_options"/> </packing> </child> <child> @@ -142,10 +158,24 @@ </object> <packing> <property name="left_attach">1</property> - <property name="right_attach">2</property> <property name="top_attach">5</property> - <property name="bottom_attach">6</property> - <property name="y_options"/> + </packing> + </child> + <child> + <object class="GtkCheckButton" id="bookmark_checkbutton"> + <property name="label" translatable="yes">_Bookmark this room</property> + <property name="visible">True</property> + <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> + <signal name="toggled" handler="on_bookmark_checkbutton_toggled" swapped="no"/> + </object> + <packing> + <property name="left_attach">0</property> + <property name="top_attach">6</property> + <property name="width">2</property> </packing> </child> <child> @@ -160,76 +190,32 @@ <property name="draw_indicator">True</property> </object> <packing> - <property name="right_attach">2</property> + <property name="left_attach">0</property> <property name="top_attach">7</property> - <property name="bottom_attach">8</property> - <property name="x_options">GTK_FILL</property> - <property name="y_options"/> + <property name="width">2</property> </packing> </child> <child> - <object class="GtkLabel" id="account_label"> - <property name="can_focus">False</property> - <property name="no_show_all">True</property> - <property name="xalign">0</property> - <property name="label" translatable="yes">Account</property> - </object> - <packing> - <property name="x_options">GTK_FILL</property> - <property name="y_options"/> - </packing> - </child> - <child> - <object class="GtkComboBox" id="account_combobox"> - <property name="can_focus">False</property> - <property name="no_show_all">True</property> - <signal name="changed" handler="on_account_combobox_changed" swapped="no"/> - </object> - <packing> - <property name="left_attach">1</property> - <property name="right_attach">2</property> - <property name="x_options">GTK_FILL</property> - <property name="y_options">GTK_FILL</property> - </packing> - </child> - <child> - <object class="GtkCheckButton" id="bookmark_checkbutton"> - <property name="label" translatable="yes">_Bookmark this room</property> - <property name="visible">True</property> - <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> - <signal name="toggled" handler="on_bookmark_checkbutton_toggled" swapped="no"/> - </object> - <packing> - <property name="right_attach">2</property> - <property name="top_attach">6</property> - <property name="bottom_attach">7</property> - <property name="x_options">GTK_FILL</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" translatable="yes">Server:</property> - </object> - <packing> - <property name="top_attach">4</property> - <property name="bottom_attach">5</property> - </packing> - </child> - <child> - <object class="GtkHBox" id="hbox1"> + <object class="GtkBox" id="box2"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="spacing">6</property> <child> - <placeholder/> + <object class="GtkComboBoxText" id="server_comboboxtext"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="has_entry">True</property> + <child internal-child="entry"> + <object class="GtkEntry" id="comboboxtext-entry">

1 0

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

Commits November 2014