Commits

commits@gajim.org

17632 discussions

gajim: start porting Gajim to gobject introspection and GTK3
by Yann Leboulanger 23 Dec '12

23 Dec '12

changeset 193bd037c983 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=193bd037c983 description: start porting Gajim to gobject introspection and GTK3 diffstat: data/gui/account_creation_wizard_window.ui | 245 +++++++-- data/gui/message_window.ui | 1 - setup_win32.py | 2 +- src/adhoc_commands.py | 20 +- src/advanced_configuration_window.py | 20 +- src/atom_window.py | 18 +- src/cell_renderer_image.py | 73 +- src/chat_control.py | 342 +++++++------ src/command_system/implementation/middleware.py | 4 +- src/command_system/tools.py | 12 +- src/common/config.py | 4 +- src/common/gajim.py | 2 + src/common/jingle_rtp.py | 6 +- src/common/jingle_transport.py | 1 + src/common/logger.py | 4 +- src/common/pep.py | 27 +- src/common/protocol/bytestream.py | 6 +- src/common/resolver.py | 22 +- src/common/zeroconf/connection_zeroconf.py | 4 +- src/config.py | 308 ++++++------ src/conversation_textview.py | 189 ++++--- src/dataforms_widget.py | 102 ++-- src/dialogs.py | 485 ++++++++++--------- src/disco.py | 217 ++++---- src/features_window.py | 20 +- src/filetransfers_window.py | 147 +++--- src/gajim.py | 103 ++- src/gajim_themes_window.py | 34 +- src/groupchat_control.py | 153 +++--- src/groups.py | 2 +- src/gtkexcepthook.py | 28 +- src/gtkgui_helpers.py | 146 +++-- src/gui_interface.py | 98 ++- src/gui_menu_builder.py | 24 +- src/history_manager.py | 86 +- src/history_window.py | 34 +- src/htmltextview.py | 182 +++--- src/ipython_view.py | 55 +- src/message_control.py | 4 +- src/message_textview.py | 147 +++--- src/message_window.py | 160 +++--- src/music_track_listener.py | 8 +- src/negotiation.py | 2 +- src/notify.py | 20 +- src/plugins/gui.py | 59 +- src/profile_window.py | 45 +- src/remote_control.py | 22 +- src/roster_window.py | 582 ++++++++++++----------- src/search_window.py | 36 +- src/statusicon.py | 67 +- src/tooltips.py | 129 ++-- src/vcard.py | 44 +- 52 files changed, 2372 insertions(+), 2179 deletions(-) diffs (truncated from 13129 to 300 lines): diff -r 21ba342ff001 -r 193bd037c983 data/gui/account_creation_wizard_window.ui --- a/data/gui/account_creation_wizard_window.ui Sun Dec 16 23:53:32 2012 +0100 +++ b/data/gui/account_creation_wizard_window.ui Sun Dec 23 16:23:43 2012 +0100 @@ -1,31 +1,51 @@ -<?xml version="1.0"?> +<?xml version="1.0" encoding="UTF-8"?> <interface> - <requires lib="gtk+" version="2.16"/> -  +  + <object class="GtkListStore" id="liststore1"> + <columns> +  + <column type="gchararray"/> + </columns> + <data> + <row> + <col id="0" translatable="yes">None</col> + </row> + </data> + </object> + <object class="GtkEntryCompletion" id="server_entrycompletion"> + <property name="model">server_liststore</property> + <property name="text_column">0</property> + </object> + <object class="GtkEntryCompletion" id="server_entrycompletion1"> + <property name="model">server_liststore</property> + <property name="text_column">0</property> + </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="show_tabs">False</property> + <property name="can_focus">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,26 +59,31 @@ <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"> <property name="label" translatable="yes">I already have an account I want to _use</property> + <property name="use_action_appearance">False</property> <property name="visible">True</property> <property name="can_focus">True</property> <property name="receives_default">False</property> + <property name="use_action_appearance">False</property> <property name="use_underline">True</property> + <property name="xalign">0</property> <property name="draw_indicator">True</property> </object> <packing> @@ -70,10 +95,13 @@ <child> <object class="GtkRadioButton" id="register_new_account_radiobutton"> <property name="label" translatable="yes">I want to _register for a new account</property> + <property name="use_action_appearance">False</property> <property name="visible">True</property> <property name="can_focus">True</property> <property name="receives_default">False</property> + <property name="use_action_appearance">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 +118,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 +135,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 +144,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 +164,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,21 +197,24 @@ <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> <object class="GtkCheckButton" id="save_password_checkbutton"> <property name="label" translatable="yes">Save pass_word</property> + <property name="use_action_appearance">False</property> <property name="visible">True</property> <property name="can_focus">True</property> <property name="receives_default">False</property> <property name="tooltip_text" translatable="yes">If checked, Gajim will remember the password for this account</property> + <property name="use_action_appearance">False</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 +222,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 +237,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,41 +251,34 @@ </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> <property name="right_attach">3</property> - <property name="x_options"></property> - </packing> - </child> - <child> - <object class="GtkComboBoxEntry" id="server_comboboxentry"> - <property name="visible">True</property> - </object> - <packing> - <property name="left_attach">3</property> - <property name="right_attach">4</property> - <property name="x_options">GTK_FILL</property> - <property name="y_options">GTK_FILL</property> + <property name="x_options"/> </packing> </child> <child> <object class="GtkCheckButton" id="anonymous_checkbutton1"> <property name="label" translatable="yes">Anon_ymous authentication</property> + <property name="use_action_appearance">False</property> <property name="visible">True</property> <property name="can_focus">True</property> <property name="receives_default">False</property> + <property name="use_action_appearance">False</property> <property name="use_underline">True</property> + <property name="xalign">0.5</property> <property name="draw_indicator">True</property> - <signal name="toggled" handler="on_anonymous_checkbutton1_toggled"/> + <signal name="toggled" handler="on_anonymous_checkbutton1_toggled" swapped="no"/> </object> <packing> <property name="left_attach">1</property> @@ -255,11 +288,29 @@ </packing> </child> <child> - <placeholder/> + <object class="GtkComboBoxText" id="server_comboboxentry"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="has_entry">True</property> + <property name="entry_text_column">0</property> + <property name="id_column">1</property> + <child internal-child="entry"> + <object class="GtkEntry" id="comboboxtext-entry"> + <property name="can_focus">True</property> + <property name="invisible_char">●</property> + <property name="completion">server_entrycompletion</property> + </object> + </child> + </object> + <packing> + <property name="left_attach">3</property> + <property name="right_attach">4</property> + </packing> </child> </object> <packing> <property name="expand">False</property>

1 0

gajim: fix module name
by Yann Leboulanger 16 Dec '12

16 Dec '12

changeset 21ba342ff001 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=21ba342ff001 description: fix module name diffstat: src/adhoc_commands.py | 2 +- src/common/connection.py | 6 +++--- src/common/connection_handlers.py | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diffs (41 lines): diff -r 796f1c446dbb -r 21ba342ff001 src/adhoc_commands.py --- a/src/adhoc_commands.py Sun Dec 16 20:28:57 2012 +0100 +++ b/src/adhoc_commands.py Sun Dec 16 23:53:32 2012 +0100 @@ -572,7 +572,7 @@ """ Request the command list. Change stage on delivery """ - query = nbxmpp.Iq(typ='get', to=xmpp.JID(self.jid), + query = nbxmpp.Iq(typ='get', to=nbxmpp.JID(self.jid), queryNS=nbxmpp.NS_DISCO_ITEMS) query.setQuerynode(nbxmpp.NS_COMMANDS) diff -r 796f1c446dbb -r 21ba342ff001 src/common/connection.py --- a/src/common/connection.py Sun Dec 16 20:28:57 2012 +0100 +++ b/src/common/connection.py Sun Dec 16 23:53:32 2012 +0100 @@ -2656,10 +2656,10 @@ """ message = nbxmpp.Message(to=room) - x = xmpp.DataForm(typ='submit') - x.addChild(node=xmpp.DataField(name='FORM_TYPE', + x = nbxmpp.DataForm(typ='submit') + x.addChild(node=nbxmpp.DataField(name='FORM_TYPE', value=nbxmpp.NS_MUC + '#request')) - x.addChild(node=xmpp.DataField(name='muc#role', value='participant', + x.addChild(node=nbxmpp.DataField(name='muc#role', value='participant', typ='text-single')) message.addChild(node=x) diff -r 796f1c446dbb -r 21ba342ff001 src/common/connection_handlers.py --- a/src/common/connection_handlers.py Sun Dec 16 20:28:57 2012 +0100 +++ b/src/common/connection_handlers.py Sun Dec 16 23:53:32 2012 +0100 @@ -1722,7 +1722,7 @@ gajim.jid_is_transport(obj.fjid) or obj.jid in self.jids_for_auto_auth \ or obj.transport_auto_auth: if self.connection: - p = xmpp.Presence(obj.fjid, 'subscribed') + p = nbxmpp.Presence(obj.fjid, 'subscribed') p = self.add_sha(p) self.connection.send(p) if gajim.jid_is_transport(obj.fjid) or obj.transport_auto_auth:

1 0

gajim: improve multi-resource
by Yann Leboulanger 16 Dec '12

16 Dec '12

changeset 796f1c446dbb in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=796f1c446dbb description: improve multi-resource diffstat: src/message_control.py | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diffs (11 lines): diff -r 49e37bbba42d -r 796f1c446dbb src/message_control.py --- a/src/message_control.py Sun Dec 16 18:29:59 2012 +0100 +++ b/src/message_control.py Sun Dec 16 20:28:57 2012 +0100 @@ -219,6 +219,7 @@ def remove_session(self, session): if session != self.session: return + self.session.control = None self.session = None def _nec_message_outgoing(self, obj):

1 0

gajim: fix module name
by Yann Leboulanger 16 Dec '12

16 Dec '12

changeset 49e37bbba42d in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=49e37bbba42d description: fix module name diffstat: src/common/stanza_session.py | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diffs (12 lines): diff -r 17cbc1fb12da -r 49e37bbba42d src/common/stanza_session.py --- a/src/common/stanza_session.py Sun Dec 16 18:29:49 2012 +0100 +++ b/src/common/stanza_session.py Sun Dec 16 18:29:59 2012 +0100 @@ -813,7 +813,7 @@ # the offset of the group we chose (need it to match up with the dhhash) group_order = 0 self.modp = int(form.getField('modp').getOptions()[group_order][1]) - x.addChild(node=xmpp.DataField(name='modp', value=self.modp)) + x.addChild(node=nbxmpp.DataField(name='modp', value=self.modp)) g = dh.generators[self.modp] p = dh.primes[self.modp]

1 0

gajim: fix demandimport with ipython
by Yann Leboulanger 16 Dec '12

16 Dec '12

changeset 17cbc1fb12da in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=17cbc1fb12da description: fix demandimport with ipython diffstat: src/gajim.py | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diffs (12 lines): diff -r bd08d235e815 -r 17cbc1fb12da src/gajim.py --- a/src/gajim.py Thu Dec 13 10:07:51 2012 +0100 +++ b/src/gajim.py Sun Dec 16 18:29:49 2012 +0100 @@ -73,7 +73,7 @@ demandimport.ignore += ['gobject._gobject', 'libasyncns', 'i18n', 'logging.NullHandler', 'dbus.service', 'OpenSSL.SSL', 'OpenSSL.crypto', 'common.sleepy', 'DLFCN', 'dl', 'xml.sax', 'xml.sax.handler', 'ic', - 'Crypto.PublicKey'] + 'Crypto.PublicKey', 'IPython'] if os.name == 'nt': import locale

1 0

gajim: keep in config file room.JID.muc_restore_*. Fixes #7276
by Yann Leboulanger 13 Dec '12

13 Dec '12

changeset bd08d235e815 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=bd08d235e815 description: keep in config file room.JID.muc_restore_*. Fixes #7276 diffstat: src/common/config.py | 2 ++ src/common/connection.py | 9 ++++----- 2 files changed, 6 insertions(+), 5 deletions(-) diffs (38 lines): diff -r 9dd95b98e3fe -r bd08d235e815 src/common/config.py --- a/src/common/config.py Wed Dec 12 22:03:13 2012 +0100 +++ b/src/common/config.py Thu Dec 13 10:07:51 2012 +0100 @@ -477,6 +477,8 @@ }, {}), 'rooms': ({ 'speller_language': [ opt_str, '', _('Language for which we want to check misspelled words')], + 'muc_restore_lines': [opt_int, -2, _('How many lines to request from server when entering a groupchat. -1 means no limit, -2 means global value')], + 'muc_restore_timeout': [opt_int, -2, _('How many minutes back to request logs when a entering a groupchat. -1 means no limit, -2 means global value')], }, {}), 'plugins': ({ 'active': [opt_bool, False, _('State whether plugins should be activated on startup (this is saved on Gajim exit). This option SHOULD NOT be used to (de)activate plug-ins. Use GUI instead.')], diff -r 9dd95b98e3fe -r bd08d235e815 src/common/connection.py --- a/src/common/connection.py Wed Dec 12 22:03:13 2012 +0100 +++ b/src/common/connection.py Thu Dec 13 10:07:51 2012 +0100 @@ -2380,10 +2380,9 @@ tags = {} timeout = gajim.config.get_per('room', room_jid, 'muc_restore_timeout') - if timeout is None: - timeout = gajim.config.get('muc_restore_timeout') * 60 - else: - timeout *= 60 + if timeout is None or timeout == -2: + timeout = gajim.config.get('muc_restore_timeout') + timeout *= 60 if timeout >= 0: last_date = self.last_history_time[room_jid] if last_date == 0: @@ -2394,7 +2393,7 @@ last_date)) tags['since'] = last_date nb = gajim.config.get_per('room', room_jid, 'muc_restore_lines') - if nb is None: + if nb is None or nb == -2: nb = gajim.config.get('muc_restore_lines') if nb >= 0: tags['maxstanzas'] = nb

1 0

gajim: don't reconnect a disabled account. Fixes #7265
by Yann Leboulanger 12 Dec '12

12 Dec '12

changeset 9dd95b98e3fe in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=9dd95b98e3fe description: don't reconnect a disabled account. Fixes #7265 diffstat: src/common/connection.py | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diffs (13 lines): diff -r 446cfdc62462 -r 9dd95b98e3fe src/common/connection.py --- a/src/common/connection.py Wed Dec 12 20:34:02 2012 +0100 +++ b/src/common/connection.py Wed Dec 12 22:03:13 2012 +0100 @@ -2668,6 +2668,9 @@ self.connection.send(message) def check_pingalive(self): + if not gajim.config.get_per('accounts', self.name, 'active'): + # Account may have been disabled + return if self.awaiting_xmpp_ping_id: # We haven't got the pong in time, disco and reconnect log.warn("No reply received for keepalive ping. Reconnecting.")

1 0

gajim: fix module name
by Yann Leboulanger 12 Dec '12

12 Dec '12

changeset 446cfdc62462 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=446cfdc62462 description: fix module name diffstat: src/common/atom.py | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diffs (12 lines): diff -r 80eff1ccbe42 -r 446cfdc62462 src/common/atom.py --- a/src/common/atom.py Tue Dec 11 07:55:35 2012 +0100 +++ b/src/common/atom.py Wed Dec 12 20:34:02 2012 +0100 @@ -32,7 +32,7 @@ import nbxmpp import time -class PersonConstruct(nb.Node, object): +class PersonConstruct(nbxmpp.Node, object): """ Not used for now, as we don't need authors/contributors in pubsub.com feeds. They rarely exist there

1 0

gajim: don't build non-existing folder.
by Yann Leboulanger 11 Dec '12

11 Dec '12

changeset 80eff1ccbe42 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=80eff1ccbe42 description: don't build non-existing folder. diffstat: src/Makefile.am | 1 - 1 files changed, 0 insertions(+), 1 deletions(-) diffs (11 lines): diff -r a6934b5d7c0b -r 80eff1ccbe42 src/Makefile.am --- a/src/Makefile.am Sun Dec 09 21:37:51 2012 +0100 +++ b/src/Makefile.am Tue Dec 11 07:55:35 2012 +0100 @@ -7,7 +7,6 @@ $(srcdir)/*.py \ $(srcdir)/common/*.py \ $(srcdir)/common/protocol/*.py \ - $(srcdir)/common/xmpp/*.py \ $(srcdir)/common/zeroconf/*.py \ $(srcdir)/command_system/*.py \ $(srcdir)/command_system/implementation/*.py \

1 0

gajim: Gajim now uses python-nbxmpp library instead of embedding...
by Yann Leboulanger 09 Dec '12

09 Dec '12

changeset a6934b5d7c0b in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=a6934b5d7c0b description: Gajim now uses python-nbxmpp library instead of embedding it. diffstat: README.html | 1 + src/adhoc_commands.py | 32 +- src/chat_control.py | 9 +- src/common/atom.py | 14 +- src/common/caps_cache.py | 10 +- src/common/commands.py | 24 +- src/common/connection.py | 316 +-- src/common/connection_handlers.py | 227 +- src/common/connection_handlers_events.py | 130 +- src/common/dataforms.py | 26 +- src/common/gajim.py | 21 +- src/common/ged.py | 2 +- src/common/helpers.py | 57 +- src/common/jingle.py | 22 +- src/common/jingle_content.py | 28 +- src/common/jingle_ft.py | 24 +- src/common/jingle_ftstates.py | 10 +- src/common/jingle_rtp.py | 16 +- src/common/jingle_session.py | 79 +- src/common/jingle_transport.py | 36 +- src/common/jingle_xtls.py | 11 +- src/common/message_archiving.py | 44 +- src/common/pep.py | 43 +- src/common/protocol/bytestream.py | 159 +- src/common/proxy65_manager.py | 14 +- src/common/pubsub.py | 46 +- src/common/resolver.py | 4 +- src/common/socks5.py | 2 +- src/common/stanza_session.py | 265 +- src/common/xmpp/__init__.py | 18 - src/common/xmpp/auth_nb.py | 724 --------- src/common/xmpp/bosh.py | 581 ------- src/common/xmpp/c14n.py | 59 - src/common/xmpp/client_nb.py | 629 -------- src/common/xmpp/dispatcher_nb.py | 639 -------- src/common/xmpp/features_nb.py | 218 -- src/common/xmpp/idlequeue.py | 550 ------- src/common/xmpp/plugin.py | 96 - src/common/xmpp/protocol.py | 1489 ------------------- src/common/xmpp/proxy_connectors.py | 238 --- src/common/xmpp/roster_nb.py | 368 ---- src/common/xmpp/simplexml.py | 692 -------- src/common/xmpp/smacks.py | 132 - src/common/xmpp/stringprepare.py | 238 --- src/common/xmpp/tls_nb.py | 461 ----- src/common/xmpp/transports_nb.py | 786 ---------- src/common/zeroconf/client_zeroconf.py | 31 +- src/common/zeroconf/connection_handlers_zeroconf.py | 10 +- src/common/zeroconf/connection_zeroconf.py | 6 +- src/dataforms_widget.py | 2 +- src/disco.py | 20 +- src/filetransfers_window.py | 6 +- src/gajim.py | 6 + src/groups.py | 5 +- src/gui_interface.py | 4 +- src/gui_menu_builder.py | 3 +- src/negotiation.py | 16 +- src/roster_window.py | 2 +- src/session.py | 2 - 59 files changed, 898 insertions(+), 8805 deletions(-) diffs (truncated from 13239 to 300 lines): diff -r a026afdb8095 -r a6934b5d7c0b README.html --- a/README.html Sun Dec 09 17:07:50 2012 +0100 +++ b/README.html Sun Dec 09 21:37:51 2012 +0100 @@ -16,6 +16,7 @@ <ul> <li>python2.5 or higher</li> <li>pygtk2.22 or higher</li> +<li>python-nbxmpp</li> </ul> <h2>Optional Runtime Requirements</h2> diff -r a026afdb8095 -r a6934b5d7c0b src/adhoc_commands.py --- a/src/adhoc_commands.py Sun Dec 09 17:07:50 2012 +0100 +++ b/src/adhoc_commands.py Sun Dec 09 21:37:51 2012 +0100 @@ -28,7 +28,9 @@ import gobject import gtk -from common import xmpp, gajim, dataforms +import nbxmpp +from common import gajim +from common import dataforms import gtkgui_helpers import dialogs @@ -386,7 +388,7 @@ self.send_command(action) def stage3_next_form(self, command): - if not isinstance(command, xmpp.Node): + if not isinstance(command, nbxmpp.Node): self.stage5(error=_('Service sent malformed data'), senderror=True) return @@ -506,8 +508,8 @@ if errorid: # we've got error code, display appropriate message try: - errorname = xmpp.NS_STANZAS + ' ' + str(errorid) - errordesc = xmpp.ERRORS[errorname][2] + errorname = nbxmpp.NS_STANZAS + ' ' + str(errorid) + errordesc = nbxmpp.ERRORS[errorname][2] error = errordesc.decode('utf-8') del errorname, errordesc except KeyError: # when stanza doesn't have error description @@ -570,9 +572,9 @@ """ Request the command list. Change stage on delivery """ - query = xmpp.Iq(typ='get', to=xmpp.JID(self.jid), - queryNS=xmpp.NS_DISCO_ITEMS) - query.setQuerynode(xmpp.NS_COMMANDS) + query = nbxmpp.Iq(typ='get', to=xmpp.JID(self.jid), + queryNS=nbxmpp.NS_DISCO_ITEMS) + query.setQuerynode(nbxmpp.NS_COMMANDS) def callback(response): '''Called on response to query.''' @@ -580,14 +582,14 @@ # is error => error stage error = response.getError() if error: - # extracting error description from xmpp/protocol.py - self.stage5(errorid = error) + # extracting error description + self.stage5(errorid=error) return # no commands => no commands stage # commands => command selection stage query = response.getTag('query') - if query and query.getAttr('node') == xmpp.NS_COMMANDS: + if query and query.getAttr('node') == nbxmpp.NS_COMMANDS: items = query.getTags('item') else: items = [] @@ -609,9 +611,9 @@ assert isinstance(self.commandnode, unicode) assert action in ('execute', 'prev', 'next', 'complete') - stanza = xmpp.Iq(typ='set', to=self.jid) - cmdnode = stanza.addChild('command', namespace=xmpp.NS_COMMANDS, attrs={ - 'node':self.commandnode, 'action':action}) + stanza = nbxmpp.Iq(typ='set', to=self.jid) + cmdnode = stanza.addChild('command', namespace=nbxmpp.NS_COMMANDS, + attrs={'node':self.commandnode, 'action':action}) if self.sessionid: cmdnode.setAttr('sessionid', self.sessionid) @@ -636,8 +638,8 @@ assert self.commandnode if self.sessionid and self.account.connection: # we already have sessionid, so the service sent at least one reply. - stanza = xmpp.Iq(typ='set', to=self.jid) - stanza.addChild('command', namespace=xmpp.NS_COMMANDS, attrs={ + stanza = nbxmpp.Iq(typ='set', to=self.jid) + stanza.addChild('command', namespace=nbxmpp.NS_COMMANDS, attrs={ 'node':self.commandnode, 'sessionid':self.sessionid, 'action':'cancel' diff -r a026afdb8095 -r a6934b5d7c0b src/chat_control.py --- a/src/chat_control.py Sun Dec 09 17:07:50 2012 +0100 +++ b/src/chat_control.py Sun Dec 09 21:37:51 2012 +0100 @@ -51,10 +51,11 @@ from common.contacts import GC_Contact from common.logger import constants from common.pep import MOODS, ACTIVITIES -from common.xmpp.protocol import NS_XHTML, NS_XHTML_IM, NS_FILE, NS_MUC -from common.xmpp.protocol import NS_RECEIPTS, NS_ESESSION -from common.xmpp.protocol import NS_JINGLE_RTP_AUDIO, NS_JINGLE_RTP_VIDEO, NS_JINGLE_ICE_UDP, NS_JINGLE_FILE_TRANSFER -from common.xmpp.protocol import NS_CHATSTATES +from nbxmpp.protocol import NS_XHTML, NS_XHTML_IM, NS_FILE, NS_MUC +from nbxmpp.protocol import NS_RECEIPTS, NS_ESESSION +from nbxmpp.protocol import NS_JINGLE_RTP_AUDIO, NS_JINGLE_RTP_VIDEO +from nbxmpp.protocol import NS_JINGLE_ICE_UDP, NS_JINGLE_FILE_TRANSFER +from nbxmpp.protocol import NS_CHATSTATES from common.connection_handlers_events import MessageOutgoingEvent from common.exceptions import GajimGeneralException diff -r a026afdb8095 -r a6934b5d7c0b src/common/atom.py --- a/src/common/atom.py Sun Dec 09 17:07:50 2012 +0100 +++ b/src/common/atom.py Sun Dec 09 21:37:51 2012 +0100 @@ -29,10 +29,10 @@ # suggestion: rewrite functions that return dates to return standard python time tuples, # exteneded to contain timezone -import xmpp +import nbxmpp import time -class PersonConstruct(xmpp.Node, object): +class PersonConstruct(nb.Node, object): """ Not used for now, as we don't need authors/contributors in pubsub.com feeds. They rarely exist there @@ -40,7 +40,7 @@ def __init__(self, node): ''' Create person construct from node. ''' - xmpp.Node.__init__(self, node=node) + nbxmpp.Node.__init__(self, node=node) def get_name(self): return self.getTagData('name') @@ -63,14 +63,14 @@ '''Conveys an e-mail address associated with the person. Might be None when not set.''') -class Entry(xmpp.Node, object): +class Entry(nbxmpp.Node, object): def __init__(self, node=None): - xmpp.Node.__init__(self, 'entry', node=node) + nbxmpp.Node.__init__(self, 'entry', node=node) def __repr__(self): return '<Atom:Entry object of id="%r">' % self.getAttr('id') -class OldEntry(xmpp.Node, object): +class OldEntry(nbxmpp.Node, object): """ Parser for feeds from pubsub.com. They use old Atom 0.3 format with their extensions @@ -78,7 +78,7 @@ def __init__(self, node=None): ''' Create new Atom 0.3 entry object. ''' - xmpp.Node.__init__(self, 'entry', node=node) + nbxmpp.Node.__init__(self, 'entry', node=node) def __repr__(self): return '<Atom0.3:Entry object of id="%r">' % self.getAttr('id') diff -r a026afdb8095 -r a6934b5d7c0b src/common/caps_cache.py --- a/src/common/caps_cache.py Sun Dec 09 17:07:50 2012 +0100 +++ b/src/common/caps_cache.py Sun Dec 09 21:37:51 2012 +0100 @@ -37,11 +37,13 @@ import logging log = logging.getLogger('gajim.c.caps_cache') -from common.xmpp import (NS_XHTML_IM, NS_RECEIPTS, NS_ESESSION, NS_CHATSTATES, - NS_JINGLE_ICE_UDP, NS_JINGLE_RTP_AUDIO, NS_JINGLE_RTP_VIDEO, NS_CAPS, NS_JINGLE_FILE_TRANSFER) +from nbxmpp import (NS_XHTML_IM, NS_RECEIPTS, NS_ESESSION, NS_CHATSTATES, + NS_JINGLE_ICE_UDP, NS_JINGLE_RTP_AUDIO, NS_JINGLE_RTP_VIDEO, NS_CAPS, + NS_JINGLE_FILE_TRANSFER) # Features where we cannot safely assume that the other side supports them FEATURE_BLACKLIST = [NS_CHATSTATES, NS_XHTML_IM, NS_RECEIPTS, NS_ESESSION, - NS_JINGLE_ICE_UDP, NS_JINGLE_RTP_AUDIO, NS_JINGLE_RTP_VIDEO, NS_JINGLE_FILE_TRANSFER] + NS_JINGLE_ICE_UDP, NS_JINGLE_RTP_AUDIO, NS_JINGLE_RTP_VIDEO, + NS_JINGLE_FILE_TRANSFER] # Query entry status codes NEW = 0 @@ -96,7 +98,7 @@ """ Compute caps hash according to XEP-0115, V1.5 - dataforms are xmpp.DataForms objects as common.dataforms don't allow several + dataforms are nbxmpp.DataForms objects as common.dataforms don't allow several values without a field type list-multi """ def sort_identities_func(i1, i2): diff -r a026afdb8095 -r a6934b5d7c0b src/common/commands.py --- a/src/common/commands.py Sun Dec 09 17:07:50 2012 +0100 +++ b/src/common/commands.py Sun Dec 09 21:37:51 2012 +0100 @@ -22,7 +22,7 @@ ## along with Gajim. If not, see <http://www.gnu.org/licenses/>. ## -import xmpp +import nbxmpp import helpers import dataforms import gajim @@ -33,7 +33,7 @@ class AdHocCommand: commandnode = 'command' commandname = 'The Command' - commandfeatures = (xmpp.NS_DATA,) + commandfeatures = (nbxmpp.NS_DATA,) @staticmethod def isVisibleFor(samejid): @@ -56,7 +56,7 @@ assert status in ('executing', 'completed', 'canceled') response = request.buildReply('result') - cmd = response.getTag('command', namespace=xmpp.NS_COMMANDS) + cmd = response.getTag('command', namespace=nbxmpp.NS_COMMANDS) cmd.setAttr('sessionid', self.sessionid) cmd.setAttr('node', self.commandnode) cmd.setAttr('status', status) @@ -72,8 +72,8 @@ return response, cmd def badRequest(self, stanza): - self.connection.connection.send(xmpp.Error(stanza, xmpp.NS_STANZAS + \ - ' bad-request')) + self.connection.connection.send(nbxmpp.Error(stanza, + nbxmpp.NS_STANZAS + ' bad-request')) def cancel(self, request): response = self.buildResponse(request, status = 'canceled')[0] @@ -354,14 +354,14 @@ """ Test if the bare jid given is the same as our bare jid """ - return xmpp.JID(jid).getStripped() == self.getOurBareJID() + return nbxmpp.JID(jid).getStripped() == self.getOurBareJID() def commandListQuery(self, con, iq_obj): iq = iq_obj.buildReply('result') jid = helpers.get_full_jid_from_iq(iq_obj) q = iq.getTag('query') # buildReply don't copy the node attribute. Re-add it - q.setAttr('node', xmpp.NS_COMMANDS) + q.setAttr('node', nbxmpp.NS_COMMANDS) for node, cmd in self.__commands.iteritems(): if cmd.isVisibleFor(self.isSameJID(jid)): @@ -394,7 +394,7 @@ q.addChild('identity', attrs = {'type': 'command-node', 'category': 'automation', 'name': cmd.commandname}) - q.addChild('feature', attrs = {'var': xmpp.NS_COMMANDS}) + q.addChild('feature', attrs = {'var': nbxmpp.NS_COMMANDS}) for feature in cmd.commandfeatures: q.addChild('feature', attrs = {'var': feature}) @@ -436,8 +436,8 @@ # and command exist if node not in self.__commands.keys(): self.connection.send( - xmpp.Error(iq_obj, xmpp.NS_STANZAS + ' item-not-found')) - raise xmpp.NodeProcessed + nbxmpp.Error(iq_obj, nbxmpp.NS_STANZAS + ' item-not-found')) + raise nbxmpp.NodeProcessed newcmd = self.__commands[node] if not newcmd.isVisibleFor(self.isSameJID(jid)): @@ -451,7 +451,7 @@ rc = obj.execute(iq_obj) if rc: self.__sessions[(jid, sessionid, node)] = obj - raise xmpp.NodeProcessed + raise nbxmpp.NodeProcessed else: # the command is already running, check for it magictuple = (jid, sessionid, node) @@ -486,4 +486,4 @@ if not rc: del self.__sessions[magictuple] - raise xmpp.NodeProcessed + raise nbxmpp.NodeProcessed diff -r a026afdb8095 -r a6934b5d7c0b src/common/connection.py --- a/src/common/connection.py Sun Dec 09 17:07:50 2012 +0100 +++ b/src/common/connection.py Sun Dec 09 21:37:51 2012 +0100 @@ -52,7 +52,7 @@ if os.name != 'nt': signal.signal(signal.SIGPIPE, signal.SIG_DFL)

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

Commits