Commits June 2011

commits@gajim.org

3 participants
49 discussions

gajim: added tests for smacks.py
by Jefry Lagrange 16 Jun '11

16 Jun '11

changeset ac2f9133f663 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=ac2f9133f663 description: added tests for smacks.py diffstat: test/unit/test_xmpp_smacks.py | 141 ++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 141 insertions(+), 0 deletions(-) diffs (145 lines): diff -r d8abc5e99939 -r ac2f9133f663 test/unit/test_xmpp_smacks.py --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/test/unit/test_xmpp_smacks.py Wed Jun 15 19:12:55 2011 -0400 @@ -0,0 +1,141 @@ +''' +Tests for smacks.py Stream Management +''' +import unittest + +import lib +lib.setup_env() + +from mock import Mock + +from common.xmpp import dispatcher_nb +from common.xmpp import protocol +from common.xmpp import smacks + +class TestDispatcherNB(unittest.TestCase): + ''' + Test class for NonBlocking dispatcher. Tested dispatcher will be plugged + into a mock client + ''' + def setUp(self): + self.dispatcher = dispatcher_nb.XMPPDispatcher() + + # Setup mock client + self.client = Mock() + self.client.__str__ = lambda: 'Mock' # FIXME: why do I need this one? + self.client._caller = Mock() + self.client.defaultNamespace = protocol.NS_CLIENT + self.client.Connection = Mock() # mock transport + self.con = self.client.Connection + self.con.sm = smacks.Smacks(self.con) + + + + + + def tearDown(self): + # Unplug if needed + if hasattr(self.dispatcher, '_owner'): + self.dispatcher.PlugOut() + + def _simulate_connect(self): + self.dispatcher.PlugIn(self.client) # client is owner + self.con.sm.set_owner(self.client) + self.dispatcher.sm = self.con.sm + # Simulate that we have established a connection + self.dispatcher.StreamInit() + self.dispatcher.ProcessNonBlocking("<stream:stream xmlns:stream='http://etherx.jabber.org/streams' xmlns='jabber:client'>") + self.dispatcher.ProcessNonBlocking("<stream:features> <sm xmlns='urn:xmpp:sm:2'> <optional/> </sm> </stream:features>") + self.con.sm.negociate() + self.dispatcher.ProcessNonBlocking("<enabled xmlns='urn:xmpp:sm:2' id='some-long-sm-id' resume='true'/>") + assert(self.con.sm.enabled) + + + def _simulate_resume(self): + + self.con.sm.resume_request() + # Resuming acknowledging 5 stanzas + self.dispatcher.ProcessNonBlocking("<resumed xmlns='urn:xmpp:sm:2' id='some-long-sm-id' h='5'/>") + assert(self.con.sm.resuming) + + + def _send(self, send, r, stanza): + for i in range(r): + send(stanza) + def test_messages(self): + + message = '<message><body>Helloo </body></message>' + iq = '''<iq from='proxy.jabber.ru' to='j.xxxxxxxx.org/Gajim' type='error' id='18'> + <query xmlns='http://jabber.org/protocol/bytestreams'/> + <error code='403' type='auth'> + <forbidden xmlns='urn:ietf:params:xml:ns:xmpp-stanzas'/> + </error> + </iq>''' + presence = '''<presence from='xxxxxxxxx.com/Talk.v1044194B1E2' to='j.xxxxxxxx.org'> + <priority>24</priority> + <c node="http://www.google.com/xmpp/client/caps" ver="1.0.0.104" ext="share-v1 voice-v1" xmlns="http://jabber.org/protocol/caps"/> + <x stamp="20110614T23:17:51" xmlns="jabber:x:delay"/> + <status>In love Kakashi Sensei :P</status> + <x xmlns="vcard-temp:x:update"> + <photo>db4b7c52e39ba28562c74542d5988d47f09108a3</photo> + </x> + </presence> ''' + + self._simulate_connect() + uqueue = self.con.sm.uqueue + self.assertEqual(self.con.sm.out_h, 0) + self.assertEqual(self.con.sm.in_h, 0) + + # The server sends 10 stanzas + self._send(self.dispatcher.ProcessNonBlocking, 5, message) + self._send(self.dispatcher.ProcessNonBlocking, 4, iq) + self._send(self.dispatcher.ProcessNonBlocking, 1, presence) + + # The client has recieved 10 stanzas and sent none + self.assertEqual(self.con.sm.in_h, 10) + self.assertEqual(self.con.sm.out_h, 0) + + m = protocol.Message() + + # The client sends 10 stanzas + for i in range(10): + m = protocol.Message(body=str(i)) + self.dispatcher.send(m) + + # Client sends 10 stanzas and put them in the queue + self.assertEqual(self.con.sm.out_h, 10) + self.assertEqual(len(uqueue), 10) + + # The server acknowledges that it recieved 5 stanzas + self.dispatcher.ProcessNonBlocking("<a xmlns='urn:xmpp:sm:2' h='5'/>") + # 5 stanzas are removed from the queue, only 5 stanzas are left + + self.assertEqual(len(uqueue), 5) + + # Check for the right order of stanzas in the queue + l = ['5', '6', '7', '8', '9'] + for i in uqueue: + self.assertEqual(i.getBody(), l[0]) + l.pop(0) + + + def test_resumption(self): + + self._simulate_connect() + + m = protocol.Message() + + # The client sends 5 stanzas + for i in range(5): + m = protocol.Message(body=str(i)) + self.dispatcher.send(m) + + self._simulate_resume() + # No stanzas left + self.assertEqual(len(self.con.sm.uqueue), 0) + + + + +if __name__ == '__main__': + unittest.main()

1 0

gajim: first version of Triggers plugin
by Yann Leboulanger 15 Jun '11

15 Jun '11

changeset 0c0fd94dbd19 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=0c0fd94dbd19 description: first version of Triggers plugin diffstat: plugins/triggers/__init__.py | 1 + plugins/triggers/config_dialog.ui | 900 ++++++++++++++++++++++++++++++++++++++ plugins/triggers/manifest.ini | 7 + plugins/triggers/triggers.py | 637 ++++++++++++++++++++++++++ 4 files changed, 1545 insertions(+), 0 deletions(-) diffs (truncated from 1561 to 300 lines): diff -r 8148ba147f21 -r 0c0fd94dbd19 plugins/triggers/__init__.py --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/plugins/triggers/__init__.py Wed Jun 15 18:41:24 2011 +0200 @@ -0,0 +1,1 @@ +from triggers import Triggers diff -r 8148ba147f21 -r 0c0fd94dbd19 plugins/triggers/config_dialog.ui --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/plugins/triggers/config_dialog.ui Wed Jun 15 18:41:24 2011 +0200 @@ -0,0 +1,900 @@ +<?xml version="1.0"?> +<interface> + <requires lib="gtk+" version="2.16"/> +  + <object class="GtkListStore" id="liststore1"> + <columns> +  + <column type="gchararray"/> + </columns> + <data> + <row> + <col id="0" translatable="yes">contact(s)</col> + </row> + <row> + <col id="0" translatable="yes">group(s)</col> + </row> + <row> + <col id="0" translatable="yes">everybody</col> + </row> + </data> + </object> + <object class="GtkListStore" id="liststore2"> + <columns> +  + <column type="gchararray"/> + </columns> + <data> + <row> + <col id="0" translatable="yes">Receive a Message</col> + </row> + </data> + </object> + <object class="GtkWindow" id="advanced_notifications_window"> + <property name="border_width">6</property> + <property name="title" translatable="yes">Advanced Notifications Control</property> + <property name="role">Advanced Notifications Control</property> + <property name="resizable">False</property> + <property name="destroy_with_parent">True</property> + <child> + <object class="GtkVBox" id="vbox"> + <property name="visible">True</property> + <property name="border_width">12</property> + <property name="orientation">vertical</property> + <property name="spacing">12</property> + <child> + <object class="GtkVBox" id="vbox100"> + <property name="visible">True</property> + <property name="orientation">vertical</property> + <property name="spacing">5</property> + <child> + <object class="GtkScrolledWindow" id="scrolledwindow23"> + <property name="height_request">90</property> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="hscrollbar_policy">never</property> + <property name="vscrollbar_policy">automatic</property> + <property name="shadow_type">in</property> + <child> + <object class="GtkTreeView" id="conditions_treeview"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <signal name="cursor_changed" handler="on_conditions_treeview_cursor_changed"/> + </object> + </child> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">False</property> + <property name="position">0</property> + </packing> + </child> + <child> + <object class="GtkAlignment" id="alignment99"> + <property name="visible">True</property> + <property name="xalign">1</property> + <property name="left_padding">212</property> + <child> + <object class="GtkHBox" id="hbox3045"> + <property name="visible">True</property> + <child> + <object class="GtkHButtonBox" id="hbuttonbox2"> + <property name="visible">True</property> + <property name="spacing">10</property> + <child> + <object class="GtkButton" id="new_button"> + <property name="label">gtk-new</property> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="can_default">True</property> + <property name="receives_default">False</property> + <property name="use_stock">True</property> + <signal name="clicked" handler="on_new_button_clicked"/> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">False</property> + <property name="position">0</property> + </packing> + </child> + <child> + <object class="GtkButton" id="up_button"> + <property name="label">gtk-go-up</property> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="can_default">True</property> + <property name="receives_default">False</property> + <property name="use_stock">True</property> + <signal name="clicked" handler="on_up_button_clicked"/> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">False</property> + <property name="position">1</property> + </packing> + </child> + <child> + <object class="GtkButton" id="down_button"> + <property name="label">gtk-go-down</property> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="can_default">True</property> + <property name="receives_default">False</property> + <property name="use_stock">True</property> + <signal name="clicked" handler="on_down_button_clicked"/> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">False</property> + <property name="position">2</property> + </packing> + </child> + <child> + <object class="GtkButton" id="delete_button"> + <property name="label">gtk-delete</property> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="can_default">True</property> + <property name="receives_default">False</property> + <property name="use_stock">True</property> + <signal name="clicked" handler="on_delete_button_clicked"/> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">False</property> + <property name="position">3</property> + </packing> + </child> + </object> + <packing> + <property name="fill">False</property> + <property name="position">0</property> + </packing> + </child> + </object> + </child> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">False</property> + <property name="position">1</property> + </packing> + </child> + </object> + <packing> + <property name="position">0</property> + </packing> + </child> + <child> + <object class="GtkVBox" id="config_vbox"> + <property name="visible">True</property> + <property name="orientation">vertical</property> + <property name="spacing">5</property> + <child> + <object class="GtkLabel" id="label391"> + <property name="visible">True</property> + <property name="label" translatable="yes"><b>Conditions</b></property> + <property name="use_markup">True</property> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">False</property> + <property name="position">0</property> + </packing> + </child> + <child> + <object class="GtkVBox" id="vbox101"> + <property name="visible">True</property> + <property name="orientation">vertical</property> + <property name="spacing">5</property> + <child> + <object class="GtkHBox" id="hbox3042"> + <property name="visible">True</property> + <property name="spacing">5</property> + <child> + <object class="GtkLabel" id="label401"> + <property name="visible">True</property> + <property name="label" translatable="yes">When </property> + <property name="use_markup">True</property> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">False</property> + <property name="position">0</property> + </packing> + </child> + <child> + <object class="GtkComboBox" id="event_combobox"> + <property name="visible">True</property> + <property name="model">liststore2</property> + <signal name="changed" handler="on_event_combobox_changed"/> + <child> + <object class="GtkCellRendererText" id="cellrenderertext2"/> + <attributes> + <attribute name="text">0</attribute> + </attributes> + </child> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">False</property> + <property name="position">1</property> + </packing> + </child> + </object> + <packing> + <property name="position">0</property> + </packing> + </child> + <child> + <object class="GtkHBox" id="hbox3048"> + <property name="visible">True</property> + <property name="spacing">5</property> + <child> + <object class="GtkLabel" id="label400"> + <property name="visible">True</property> + <property name="label" translatable="yes">for </property> + <property name="use_markup">True</property> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">False</property> + <property name="position">0</property> + </packing> + </child> + <child> + <object class="GtkComboBox" id="recipient_type_combobox"> + <property name="visible">True</property> + <property name="model">liststore1</property> + <signal name="changed" handler="on_recipient_type_combobox_changed"/> + <child> + <object class="GtkCellRendererText" id="cellrenderertext1"/> + <attributes> + <attribute name="text">0</attribute> + </attributes> + </child> + </object> + <packing> + <property name="expand">False</property> + <property name="position">1</property> + </packing> + </child> + <child> + <object class="GtkEntry" id="recipient_list_entry"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="no_show_all">True</property> + <signal name="changed" handler="on_recipient_list_entry_changed"/> + </object> + <packing> + <property name="position">2</property> + </packing> + </child> + </object> + <packing> + <property name="position">1</property> + </packing> + </child> + <child> + <object class="GtkHBox" id="hbox3049"> + <property name="visible">True</property> + <child> + <object class="GtkLabel" id="label402"> + <property name="visible">True</property> + <property name="label" translatable="yes">when I'm in</property> + <property name="use_markup">True</property> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">False</property> + <property name="position">0</property> + </packing>

1 0

gajim: [Dave Cridland] Fix BOSH for bodies with "\r\n" sequences
by Yann Leboulanger 15 Jun '11

15 Jun '11

changeset 22efffadfe47 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=22efffadfe47 description: [Dave Cridland] Fix BOSH for bodies with "\r\n" sequences diffstat: src/common/xmpp/transports_nb.py | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diffs (22 lines): diff -r 73a053432c2b -r 22efffadfe47 src/common/xmpp/transports_nb.py --- a/src/common/xmpp/transports_nb.py Wed Jun 15 12:20:23 2011 +0200 +++ b/src/common/xmpp/transports_nb.py Mon Jun 13 18:14:45 2011 +0200 @@ -740,15 +740,15 @@ httpbody - string with http body) http_rest - what is left in the message after a full HTTP header + body """ - message = message.replace('\r', '') - message = message.lstrip('\n') - splitted = message.split('\n\n') + splitted = message.split('\r\n\r\n') if len(splitted) < 2: # no complete http message. Keep filling the buffer until we find one buffer_rest = message return ('', '', '', buffer_rest) else: (header, httpbody) = splitted[:2] + header = header.replace('\r', '') + header = header.lstrip('\n') header = header.split('\n') statusline = header[0].split(' ', 2) header = header[1:]

1 0

gajim: prevent traceback with metacontacts. Fixes #6902, #5910
by Yann Leboulanger 15 Jun '11

15 Jun '11

changeset 73a053432c2b in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=73a053432c2b description: prevent traceback with metacontacts. Fixes #6902, #5910 diffstat: src/roster_window.py | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diffs (15 lines): diff -r f19deb09f7db -r 73a053432c2b src/roster_window.py --- a/src/roster_window.py Tue Jun 14 19:28:13 2011 +0200 +++ b/src/roster_window.py Wed Jun 15 12:20:23 2011 +0200 @@ -1409,9 +1409,10 @@ self._iters = {} # for merged mode self._iters['MERGED'] = {'account': None, 'groups': {}} - for acct in gajim.contacts.get_accounts(): self._iters[acct] = {'account': None, 'groups': {}, 'contacts': {}} + + for acct in gajim.contacts.get_accounts(): self.add_account(acct) self.add_account_contacts(acct)

1 0

gajim: prevent traceback with metacontacts. Fixes #6902, #5910
by Yann Leboulanger 15 Jun '11

15 Jun '11

changeset 8148ba147f21 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=8148ba147f21 description: prevent traceback with metacontacts. Fixes #6902, #5910 diffstat: src/roster_window.py | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diffs (15 lines): diff -r 73523ed11fc3 -r 8148ba147f21 src/roster_window.py --- a/src/roster_window.py Tue Jun 14 19:17:39 2011 +0200 +++ b/src/roster_window.py Wed Jun 15 12:20:23 2011 +0200 @@ -1418,9 +1418,10 @@ self._iters = {} # for merged mode self._iters['MERGED'] = {'account': None, 'groups': {}} - for acct in gajim.contacts.get_accounts(): self._iters[acct] = {'account': None, 'groups': {}, 'contacts': {}} + + for acct in gajim.contacts.get_accounts(): self.add_account(acct) self.add_account_contacts(acct)

1 0

gajim: fix indentation error. Fixes #6909
by Yann Leboulanger 14 Jun '11

14 Jun '11

changeset f19deb09f7db in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=f19deb09f7db description: fix indentation error. Fixes #6909 diffstat: src/roster_window.py | 9 ++++----- 1 files changed, 4 insertions(+), 5 deletions(-) diffs (19 lines): diff -r 6663ff0619db -r f19deb09f7db src/roster_window.py --- a/src/roster_window.py Fri Oct 29 11:41:38 2010 +0200 +++ b/src/roster_window.py Tue Jun 14 19:28:13 2011 +0200 @@ -2296,11 +2296,10 @@ 'quit_on_roster_x_button') and gajim.config.get('trayicon') != \ 'on_event': self.tooltip.hide_tooltip() - if gajim.config.get('save-roster-position'): - x, y = self.window.get_position() - gajim.config.set('roster_x-position', x) - gajim.config.set('roster_y-position', y) - self.window.hide() + x, y = self.window.get_position() + gajim.config.set('roster_x-position', x) + gajim.config.set('roster_y-position', y) + self.window.hide() elif gajim.config.get('quit_on_roster_x_button'): self.on_quit_request() else:

1 0

gajim: fix indentation error. Fixes #6909
by Yann Leboulanger 14 Jun '11

14 Jun '11

changeset 73523ed11fc3 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=73523ed11fc3 description: fix indentation error. Fixes #6909 diffstat: src/roster_window.py | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diffs (12 lines): diff -r 6be70e755ccb -r 73523ed11fc3 src/roster_window.py --- a/src/roster_window.py Mon Jun 13 23:06:43 2011 +0200 +++ b/src/roster_window.py Tue Jun 14 19:17:39 2011 +0200 @@ -2322,7 +2322,7 @@ x, y = self.window.get_position() gajim.config.set('roster_x-position', x) gajim.config.set('roster_y-position', y) - self.window.hide() + self.window.hide() elif gajim.config.get('quit_on_roster_x_button'): self.on_quit_request() else:

1 0

gajim: remove old way of doing advanced notification.
by Yann Leboulanger 14 Jun '11

14 Jun '11

changeset 6be70e755ccb in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=6be70e755ccb description: remove old way of doing advanced notification. diffstat: data/gui/advanced_notifications_window.ui | 951 ------------------------------ data/gui/preferences_window.ui | 27 - src/common/config.py | 16 - src/common/connection_handlers_events.py | 2 - src/common/helpers.py | 29 +- src/config.py | 3 - src/dialogs.py | 470 -------------- src/notify.py | 99 +-- src/plugins/plugin.py | 5 + src/session.py | 6 +- 10 files changed, 20 insertions(+), 1588 deletions(-) diffs (truncated from 1795 to 300 lines): diff -r 6003ec14e77f -r 6be70e755ccb data/gui/advanced_notifications_window.ui --- a/data/gui/advanced_notifications_window.ui Mon Jun 13 18:14:45 2011 +0200 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,951 +0,0 @@ -<?xml version="1.0"?> -<interface> - <requires lib="gtk+" version="2.16"/> -  - <object class="GtkListStore" id="liststore1"> - <columns> -  - <column type="gchararray"/> - </columns> - <data> - <row> - <col id="0" translatable="yes">contact(s)</col> - </row> - <row> - <col id="0" translatable="yes">group(s)</col> - </row> - <row> - <col id="0" translatable="yes">everybody</col> - </row> - </data> - </object> - <object class="GtkListStore" id="liststore2"> - <columns> -  - <column type="gchararray"/> - </columns> - <data> - <row> - <col id="0" translatable="yes">Receive a Message</col> - </row> - <row> - <col id="0" translatable="yes">Contact Disconnected </col> - </row> - <row> - <col id="0" translatable="yes">Contact Change Status </col> - </row> - <row> - <col id="0" translatable="yes">Group Chat Message Highlight </col> - </row> - <row> - <col id="0" translatable="yes">Group Chat Message Received </col> - </row> - <row> - <col id="0" translatable="yes">File Transfer Request </col> - </row> - <row> - <col id="0" translatable="yes">File Transfer Started </col> - </row> - <row> - <col id="0" translatable="yes">File Transfer Finished</col> - </row> - </data> - </object> - <object class="GtkWindow" id="advanced_notifications_window"> - <property name="border_width">6</property> - <property name="title" translatable="yes">Advanced Notifications Control</property> - <property name="role">Advanced Notifications Control</property> - <property name="resizable">False</property> - <property name="destroy_with_parent">True</property> - <child> - <object class="GtkVBox" id="vbox95"> - <property name="visible">True</property> - <property name="border_width">12</property> - <property name="orientation">vertical</property> - <property name="spacing">12</property> - <child> - <object class="GtkHBox" id="hbox3041"> - <property name="visible">True</property> - <child> - <object class="GtkLabel" id="label396"> - <property name="visible">True</property> - <property name="label">Hi HG users ! This window does nothing for the moment. Discussions about this take place in ticket #1005.</property> - <property name="wrap">True</property> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">False</property> - <property name="position">0</property> - </packing> - </child> - <child> - <placeholder/> - </child> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">False</property> - <property name="position">0</property> - </packing> - </child> - <child> - <object class="GtkVBox" id="vbox100"> - <property name="visible">True</property> - <property name="orientation">vertical</property> - <property name="spacing">5</property> - <child> - <object class="GtkScrolledWindow" id="scrolledwindow23"> - <property name="height_request">90</property> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="hscrollbar_policy">never</property> - <property name="vscrollbar_policy">automatic</property> - <property name="shadow_type">in</property> - <child> - <object class="GtkTreeView" id="conditions_treeview"> - <property name="visible">True</property> - <property name="can_focus">True</property> - <signal name="cursor_changed" handler="on_conditions_treeview_cursor_changed"/> - </object> - </child> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">False</property> - <property name="position">0</property> - </packing> - </child> - <child> - <object class="GtkAlignment" id="alignment99"> - <property name="visible">True</property> - <property name="xalign">1</property> - <property name="left_padding">212</property> - <child> - <object class="GtkHBox" id="hbox3045"> - <property name="visible">True</property> - <child> - <object class="GtkHButtonBox" id="hbuttonbox2"> - <property name="visible">True</property> - <property name="spacing">10</property> - <child> - <object class="GtkButton" id="new_button"> - <property name="label">gtk-new</property> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="can_default">True</property> - <property name="receives_default">False</property> - <property name="use_stock">True</property> - <signal name="clicked" handler="on_new_button_clicked"/> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">False</property> - <property name="position">0</property> - </packing> - </child> - <child> - <object class="GtkButton" id="up_button"> - <property name="label">gtk-go-up</property> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="can_default">True</property> - <property name="receives_default">False</property> - <property name="use_stock">True</property> - <signal name="clicked" handler="on_up_button_clicked"/> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">False</property> - <property name="position">1</property> - </packing> - </child> - <child> - <object class="GtkButton" id="down_button"> - <property name="label">gtk-go-down</property> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="can_default">True</property> - <property name="receives_default">False</property> - <property name="use_stock">True</property> - <signal name="clicked" handler="on_down_button_clicked"/> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">False</property> - <property name="position">2</property> - </packing> - </child> - <child> - <object class="GtkButton" id="delete_button"> - <property name="label">gtk-delete</property> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="can_default">True</property> - <property name="receives_default">False</property> - <property name="use_stock">True</property> - <signal name="clicked" handler="on_delete_button_clicked"/> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">False</property> - <property name="position">3</property> - </packing> - </child> - </object> - <packing> - <property name="fill">False</property> - <property name="position">0</property> - </packing> - </child> - </object> - </child> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">False</property> - <property name="position">1</property> - </packing> - </child> - </object> - <packing> - <property name="position">1</property> - </packing> - </child> - <child> - <object class="GtkVBox" id="config_vbox"> - <property name="visible">True</property> - <property name="orientation">vertical</property> - <property name="spacing">5</property> - <child> - <object class="GtkLabel" id="label391"> - <property name="visible">True</property> - <property name="label" translatable="yes"><b>Conditions</b></property> - <property name="use_markup">True</property> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">False</property> - <property name="position">0</property> - </packing> - </child> - <child> - <object class="GtkVBox" id="vbox101"> - <property name="visible">True</property> - <property name="orientation">vertical</property> - <property name="spacing">5</property> - <child> - <object class="GtkHBox" id="hbox3042"> - <property name="visible">True</property> - <property name="spacing">5</property> - <child> - <object class="GtkLabel" id="label401"> - <property name="visible">True</property> - <property name="label" translatable="yes">When </property> - <property name="use_markup">True</property> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">False</property> - <property name="position">0</property> - </packing> - </child> - <child> - <object class="GtkComboBox" id="event_combobox"> - <property name="visible">True</property> - <property name="model">liststore2</property> - <signal name="changed" handler="on_event_combobox_changed"/> - <child> - <object class="GtkCellRendererText" id="cellrenderertext2"/> - <attributes> - <attribute name="text">0</attribute> - </attributes> - </child> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">False</property> - <property name="position">1</property> - </packing> - </child> - </object> - <packing> - <property name="position">0</property> - </packing> - </child> - <child> - <object class="GtkHBox" id="hbox3048"> - <property name="visible">True</property> - <property name="spacing">5</property> - <child> - <object class="GtkLabel" id="label400"> - <property name="visible">True</property> - <property name="label" translatable="yes">for </property> - <property name="use_markup">True</property> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">False</property> - <property name="position">0</property> - </packing> - </child> - <child> - <object class="GtkComboBox" id="recipient_type_combobox"> - <property name="visible">True</property> - <property name="model">liststore1</property> - <signal name="changed" handler="on_recipient_type_combobox_changed"/> - <child>

1 0

gajim: whitespaces aren't added to the SM queue
by Jefry Lagrange 14 Jun '11

14 Jun '11

changeset d8abc5e99939 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=d8abc5e99939 description: whitespaces aren't added to the SM queue diffstat: src/common/xmpp/dispatcher_nb.py | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diffs (13 lines): diff -r f8d257de1052 -r d8abc5e99939 src/common/xmpp/dispatcher_nb.py --- a/src/common/xmpp/dispatcher_nb.py Sat Jun 11 16:29:08 2011 -0400 +++ b/src/common/xmpp/dispatcher_nb.py Mon Jun 13 22:37:29 2011 -0400 @@ -536,7 +536,8 @@ if self._owner._registered_name and not stanza.getAttr('from'): stanza.setAttr('from', self._owner._registered_name) - if self.sm and self.sm.enabled: + # If no ID then it is a whitespace + if self.sm and self.sm.enabled and ID: self.sm.uqueue.append(stanza) self.sm.out_h = self.sm.out_h + 1 if len(self.sm.uqueue) > self.sm.max_queue:

1 0

gajim: [Dave Cridland] Fix BOSH for bodies with "\r\n" sequences
by Yann Leboulanger 13 Jun '11

13 Jun '11

changeset 6003ec14e77f in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=6003ec14e77f description: [Dave Cridland] Fix BOSH for bodies with "\r\n" sequences diffstat: src/common/xmpp/transports_nb.py | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diffs (22 lines): diff -r 67ebe296c925 -r 6003ec14e77f src/common/xmpp/transports_nb.py --- a/src/common/xmpp/transports_nb.py Tue May 31 17:46:49 2011 +0200 +++ b/src/common/xmpp/transports_nb.py Mon Jun 13 18:14:45 2011 +0200 @@ -740,15 +740,15 @@ httpbody - string with http body) http_rest - what is left in the message after a full HTTP header + body """ - message = message.replace('\r', '') - message = message.lstrip('\n') - splitted = message.split('\n\n') + splitted = message.split('\r\n\r\n') if len(splitted) < 2: # no complete http message. Keep filling the buffer until we find one buffer_rest = message return ('', '', '', buffer_rest) else: (header, httpbody) = splitted[:2] + header = header.replace('\r', '') + header = header.lstrip('\n') header = header.split('\n') statusline = header[0].split(' ', 2) header = header[1:]

1 0

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

Commits June 2011