Commits July 2008

commits@gajim.org

7 participants
229 discussions

[commit-gajim] r10039 - trunk/src
by bct＠gajim.org 27 Jul '08

27 Jul '08

Author: bct Date: 2008-07-27 23:35:02 +0200 (Sun, 27 Jul 2008) New Revision: 10039 Modified: trunk/src/chat_control.py Log: enable esession and gpg menuitems if they're active Modified: trunk/src/chat_control.py =================================================================== --- trunk/src/chat_control.py 2008-07-27 10:21:51 UTC (rev 10038) +++ trunk/src/chat_control.py 2008-07-27 21:35:02 UTC (rev 10039) @@ -1964,7 +1964,7 @@ gajim.jid_is_transport(jid): toggle_gpg_menuitem.set_sensitive(False) else: - toggle_gpg_menuitem.set_sensitive(not e2e_is_active) + toggle_gpg_menuitem.set_sensitive(self.gpg_is_active or not e2e_is_active) toggle_gpg_menuitem.set_active(self.gpg_is_active) # disable esessions if we or the other client don't support them @@ -1975,7 +1975,7 @@ toggle_e2e_menuitem.set_sensitive(False) else: toggle_e2e_menuitem.set_active(e2e_is_active) - toggle_e2e_menuitem.set_sensitive(not self.gpg_is_active) + toggle_e2e_menuitem.set_sensitive(e2e_is_active or not self.gpg_is_active) # add_to_roster_menuitem if not hide_buttonbar_entries and _('Not in Roster') in contact.groups:

1 0

[commit-gajim] r10038 - trunk/src
by jim++＠gajim.org 27 Jul '08

27 Jul '08

Author: jim++ Date: 2008-07-27 12:21:51 +0200 (Sun, 27 Jul 2008) New Revision: 10038 Modified: trunk/src/gtkgui_helpers.py trunk/src/notify.py trunk/src/roster_window.py trunk/src/vcard.py Log: Remove useless function and check. Make avatar in notification works with jpeg too. See #4060. Modified: trunk/src/gtkgui_helpers.py =================================================================== --- trunk/src/gtkgui_helpers.py 2008-07-26 22:42:40 UTC (rev 10037) +++ trunk/src/gtkgui_helpers.py 2008-07-27 10:21:51 UTC (rev 10038) @@ -615,16 +615,21 @@ def get_path_to_generic_or_avatar(generic, jid = None, suffix = None): '''Chooses between avatar image and default image. Returns full path to the avatar image if it exists, - otherwise returns full path to the image.''' + otherwise returns full path to the image. + generic must be with extension and suffix without''' if jid: + # we want an avatar puny_jid = helpers.sanitize_filename(jid) path_to_file = os.path.join(gajim.AVATAR_PATH, puny_jid) + suffix - filepath, extension = os.path.splitext(path_to_file) - path_to_local_file = filepath + '_local' + extension - if os.path.exists(path_to_local_file): - return path_to_local_file - if os.path.exists(path_to_file): - return path_to_file + path_to_local_file = path_to_file + '_local' + for extension in ('.png', '.jpeg'): + path_to_local_file_full = path_to_local_file + extension + if os.path.exists(path_to_local_file_full): + return path_to_local_file_full + for extension in ('.png', '.jpeg'): + path_to_file_full = path_to_file + extension + if os.path.exists(path_to_file_full): + return path_to_file_full return os.path.abspath(generic) def decode_filechooser_file_paths(file_paths): Modified: trunk/src/notify.py =================================================================== --- trunk/src/notify.py 2008-07-26 22:42:40 UTC (rev 10037) +++ trunk/src/notify.py 2008-07-27 10:21:51 UTC (rev 10038) @@ -205,13 +205,13 @@ 'status_change'): # Common code for popup for these three events if event == 'contact_disconnected': show_image = 'offline.png' - suffix = '_notif_size_bw.png' + suffix = '_notif_size_bw' else: #Status Change or Connected # FIXME: for status change, # we don't always 'online.png', but we # first need 48x48 for all status show_image = 'online.png' - suffix = '_notif_size_colored.png' + suffix = '_notif_size_colored' transport_name = gajim.get_transport_name_from_jid(jid) img = None if transport_name: Modified: trunk/src/roster_window.py =================================================================== --- trunk/src/roster_window.py 2008-07-26 22:42:40 UTC (rev 10037) +++ trunk/src/roster_window.py 2008-07-27 10:21:51 UTC (rev 10038) @@ -4116,7 +4116,7 @@ # Update chat window ctrl = gajim.interface.msg_win_mgr.get_control(jid, account) - if ctrl and ctrl.type_id != message_control.TYPE_GC: + if ctrl: ctrl.show_avatar() def on_roster_treeview_style_set(self, treeview, style): Modified: trunk/src/vcard.py =================================================================== --- trunk/src/vcard.py 2008-07-26 22:42:40 UTC (rev 10037) +++ trunk/src/vcard.py 2008-07-27 10:21:51 UTC (rev 10038) @@ -121,15 +121,6 @@ self.progressbar.pulse() return True # loop forever - def update_avatar_in_gui(self): - jid = self.contact.jid - # Update roster - gajim.interface.roster.draw_avatar(jid, self.account) - # Update chat windows - ctrl = gajim.interface.msg_win_mgr.get_control(jid, self.account) - if ctrl and ctrl.type_id != message_control.TYPE_GC: - ctrl.show_avatar() - def on_vcard_information_window_destroy(self, widget): if self.update_progressbar_timeout_id is not None: gobject.source_remove(self.update_progressbar_timeout_id)

1 0

[commit-gajim] r10037 - in branches/bosh_support: data/glade src src/common src/common/xmpp
by tomk＠gajim.org 26 Jul '08

26 Jul '08

Author: tomk Date: 2008-07-27 00:42:40 +0200 (Sun, 27 Jul 2008) New Revision: 10037 Modified: branches/bosh_support/data/glade/manage_proxies_window.glade branches/bosh_support/src/common/config.py branches/bosh_support/src/common/connection.py branches/bosh_support/src/common/xmpp/bosh.py branches/bosh_support/src/common/xmpp/client_nb.py branches/bosh_support/src/common/xmpp/dispatcher_nb.py branches/bosh_support/src/common/xmpp/idlequeue.py branches/bosh_support/src/common/xmpp/transports_nb.py branches/bosh_support/src/config.py branches/bosh_support/src/gajim.py Log: - implemented BOSH key sequencing, acknowledgements - improved HTTP persistent connections - added alarm-unregister method to idlequeue - extended proxy managing dialog for BOSH proxy Modified: branches/bosh_support/data/glade/manage_proxies_window.glade =================================================================== --- branches/bosh_support/data/glade/manage_proxies_window.glade 2008-07-26 18:44:47 UTC (rev 10036) +++ branches/bosh_support/data/glade/manage_proxies_window.glade 2008-07-26 22:42:40 UTC (rev 10037) @@ -235,6 +235,7 @@ <property name="max_length">0</property> <property name="text" translatable="yes"></property> <property name="has_frame">True</property> + <property name="invisible_char">●</property> <property name="activates_default">False</property> <signal name="changed" handler="on_proxyname_entry_changed" last_modification_time="Wed, 08 Jun 2005 17:43:44 GMT"/> </widget> @@ -305,7 +306,7 @@ <widget class="GtkTable" id="proxy_table"> <property name="visible">True</property> <property name="sensitive">False</property> - <property name="n_rows">5</property> + <property name="n_rows">8</property> <property name="n_columns">2</property> <property name="homogeneous">False</property> <property name="row_spacing">6</property> @@ -314,7 +315,7 @@ <child> <widget class="GtkLabel" id="label136"> <property name="visible">True</property> - <property name="label" translatable="yes">_Port:</property> + <property name="label" translatable="yes">Proxy _Port:</property> <property name="use_underline">True</property> <property name="use_markup">False</property> <property name="justify">GTK_JUSTIFY_LEFT</property> @@ -333,8 +334,8 @@ <packing> <property name="left_attach">0</property> <property name="right_attach">1</property> - <property name="top_attach">1</property> - <property name="bottom_attach">2</property> + <property name="top_attach">4</property> + <property name="bottom_attach">5</property> <property name="x_options">fill</property> <property name="y_options"></property> </packing> @@ -349,14 +350,15 @@ <property name="max_length">0</property> <property name="text" translatable="yes"></property> <property name="has_frame">True</property> + <property name="invisible_char">●</property> <property name="activates_default">False</property> <signal name="changed" handler="on_proxyhost_entry_changed" last_modification_time="Wed, 08 Jun 2005 20:56:20 GMT"/> </widget> <packing> <property name="left_attach">1</property> <property name="right_attach">2</property> - <property name="top_attach">0</property> - <property name="bottom_attach">1</property> + <property name="top_attach">3</property> + <property name="bottom_attach">4</property> <property name="y_options"></property> </packing> </child> @@ -370,14 +372,15 @@ <property name="max_length">0</property> <property name="text"></property> <property name="has_frame">True</property> + <property name="invisible_char">●</property> <property name="activates_default">False</property> <signal name="changed" handler="on_proxyport_entry_changed" last_modification_time="Wed, 08 Jun 2005 20:57:45 GMT"/> </widget> <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="top_attach">4</property> + <property name="bottom_attach">5</property> <property name="y_options"></property> </packing> </child> @@ -385,7 +388,7 @@ <child> <widget class="GtkLabel" id="label135"> <property name="visible">True</property> - <property name="label" translatable="yes">_Host:</property> + <property name="label" translatable="yes">Proxy _Host:</property> <property name="use_underline">True</property> <property name="use_markup">False</property> <property name="justify">GTK_JUSTIFY_LEFT</property> @@ -404,8 +407,8 @@ <packing> <property name="left_attach">0</property> <property name="right_attach">1</property> - <property name="top_attach">0</property> - <property name="bottom_attach">1</property> + <property name="top_attach">3</property> + <property name="bottom_attach">4</property> <property name="x_options">fill</property> <property name="y_options"></property> </packing> @@ -433,8 +436,8 @@ <packing> <property name="left_attach">0</property> <property name="right_attach">1</property> - <property name="top_attach">4</property> - <property name="bottom_attach">5</property> + <property name="top_attach">7</property> + <property name="bottom_attach">8</property> <property name="x_options">fill</property> <property name="y_options"></property> </packing> @@ -462,8 +465,8 @@ <packing> <property name="left_attach">0</property> <property name="right_attach">1</property> - <property name="top_attach">3</property> - <property name="bottom_attach">4</property> + <property name="top_attach">6</property> + <property name="bottom_attach">7</property> <property name="x_options">fill</property> <property name="y_options"></property> </packing> @@ -478,14 +481,15 @@ <property name="max_length">0</property> <property name="text" translatable="yes"></property> <property name="has_frame">True</property> + <property name="invisible_char">●</property> <property name="activates_default">False</property> <signal name="changed" handler="on_proxypass_entry_changed" last_modification_time="Wed, 08 Jun 2005 20:58:01 GMT"/> </widget> <packing> <property name="left_attach">1</property> <property name="right_attach">2</property> - <property name="top_attach">4</property> - <property name="bottom_attach">5</property> + <property name="top_attach">7</property> + <property name="bottom_attach">8</property> <property name="y_options"></property> </packing> </child> @@ -499,14 +503,15 @@ <property name="max_length">0</property> <property name="text" translatable="yes"></property> <property name="has_frame">True</property> + <property name="invisible_char">●</property> <property name="activates_default">False</property> <signal name="changed" handler="on_proxyuser_entry_changed" last_modification_time="Wed, 08 Jun 2005 20:57:53 GMT"/> </widget> <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="top_attach">6</property> + <property name="bottom_attach">7</property> <property name="y_options"></property> </packing> </child> @@ -515,7 +520,7 @@ <widget class="GtkCheckButton" id="useauth_checkbutton"> <property name="visible">True</property> <property name="can_focus">True</property> - <property name="label" translatable="yes">Use authentication</property> + <property name="label" translatable="yes">Use proxy authentication</property> <property name="use_underline">True</property> <property name="relief">GTK_RELIEF_NORMAL</property> <property name="focus_on_click">True</property> @@ -527,12 +532,137 @@ <packing> <property name="left_attach">0</property> <property name="right_attach">2</property> + <property name="top_attach">5</property> + <property name="bottom_attach">6</property> + <property name="x_options">fill</property> + <property name="y_options"></property> + </packing> + </child> + + <child> + <widget class="GtkLabel" id="boshuri_label"> + <property name="visible">True</property> + <property name="label" translatable="yes">_BOSH URL:</property> + <property name="use_underline">True</property> + <property name="use_markup">False</property> + <property name="justify">GTK_JUSTIFY_LEFT</property> + <property name="wrap">False</property> + <property name="selectable">False</property> + <property name="xalign">0</property> + <property name="yalign">0.5</property> + <property name="xpad">0</property> + <property name="ypad">0</property> + <property name="mnemonic_widget">proxyhost_entry</property> + <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property> + <property name="width_chars">-1</property> + <property name="single_line_mode">False</property> + <property name="angle">0</property> + </widget> + <packing> + <property name="left_attach">0</property> + <property name="right_attach">1</property> + <property name="top_attach">0</property> + <property name="bottom_attach">1</property> + <property name="x_options">fill</property> + <property name="y_options"></property> + </packing> + </child> + + <child> + <widget class="GtkEntry" id="boshuri_entry"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="editable">True</property> + <property name="visibility">True</property> + <property name="max_length">0</property> + <property name="text" translatable="yes"></property> + <property name="has_frame">True</property> + <property name="invisible_char">●</property> + <property name="activates_default">False</property> + <signal name="changed" handler="on_boshuri_entry_changed" last_modification_time="Thu, 24 Jul 2008 20:27:43 GMT"/> + </widget> + <packing> + <property name="left_attach">1</property> + <property name="right_attach">2</property> + <property name="top_attach">0</property> + <property name="bottom_attach">1</property> + <property name="y_options"></property> + </packing> + </child> + + <child> + <widget class="GtkCheckButton" id="boshuseproxy_checkbutton"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="label" translatable="yes">Use HTTP proxy</property> + <property name="use_underline">True</property> + <property name="relief">GTK_RELIEF_NORMAL</property> + <property name="focus_on_click">True</property> + <property name="active">False</property> + <property name="inconsistent">False</property> + <property name="draw_indicator">True</property> + <signal name="toggled" handler="on_boshuseproxy_checkbutton_toggled" last_modification_time="Thu, 24 Jul 2008 20:51:01 GMT"/> + </widget> + <packing> + <property name="left_attach">0</property> + <property name="right_attach">2</property> <property name="top_attach">2</property> <property name="bottom_attach">3</property> <property name="x_options">fill</property> <property name="y_options"></property> </packing> </child> + + <child> + <widget class="GtkLabel" id="boshport_label"> + <property name="visible">True</property> + <property name="label" translatable="yes">B_OSH Port:</property> + <property name="use_underline">True</property> + <property name="use_markup">False</property> + <property name="justify">GTK_JUSTIFY_LEFT</property> + <property name="wrap">False</property> + <property name="selectable">False</property> + <property name="xalign">0</property> + <property name="yalign">0.5</property> + <property name="xpad">0</property> + <property name="ypad">0</property> + <property name="mnemonic_widget">proxyhost_entry</property> + <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property> + <property name="width_chars">-1</property> + <property name="single_line_mode">False</property> + <property name="angle">0</property> + </widget> + <packing> + <property name="left_attach">0</property> + <property name="right_attach">1</property> + <property name="top_attach">1</property> + <property name="bottom_attach">2</property> + <property name="x_options">fill</property> + <property name="y_options"></property> + </packing> + </child> + + <child> + <widget class="GtkEntry" id="boshport_entry"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="editable">True</property> + <property name="visibility">True</property> + <property name="max_length">0</property> + <property name="text" translatable="yes"></property> + <property name="has_frame">True</property> + <property name="invisible_char">●</property> + <property name="activates_default">False</property> + <signal name="changed" handler="on_boshport_entry_changed" last_modification_time="Fri, 25 Jul 2008 21:27:58 GMT"/> + </widget> + <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="y_options"></property> + </packing> + </child> </widget> </child> </widget> Modified: branches/bosh_support/src/common/config.py =================================================================== --- branches/bosh_support/src/common/config.py 2008-07-26 18:44:47 UTC (rev 10036) +++ branches/bosh_support/src/common/config.py 2008-07-26 22:42:40 UTC (rev 10037) @@ -337,8 +337,17 @@ 'type': [ opt_str, 'http' ], 'host': [ opt_str, '' ], 'port': [ opt_int, 3128 ], + 'useauth': [ opt_bool, False ], 'user': [ opt_str, '' ], 'pass': [ opt_str, '' ], + 'bosh_uri': [ opt_str, '' ], + 'bosh_port': [ opt_int, 80 ], + 'bosh_useproxy': [ opt_bool, False ], + 'bosh_wait': [ opt_int, 30 ], + 'bosh_hold': [ opt_int, 2 ], + 'bosh_content': [ opt_str, 'text/xml; charset=utf-8' ], + 'bosh_http_pipelining': [ opt_bool, False ], + 'bosh_wait_for_restart_response': [ opt_bool, False ], }, {}), 'themes': ({ 'accounttextcolor': [ opt_color, 'black', '', True ], Modified: branches/bosh_support/src/common/connection.py =================================================================== --- branches/bosh_support/src/common/connection.py 2008-07-26 18:44:47 UTC (rev 10036) +++ branches/bosh_support/src/common/connection.py 2008-07-26 22:42:40 UTC (rev 10037) @@ -428,11 +428,11 @@ # create connection if it doesn't already exist self.connected = 1 if p and p in gajim.config.get_per('proxies'): - proxy = {'host': gajim.config.get_per('proxies', p, 'host')} - proxy['port'] = gajim.config.get_per('proxies', p, 'port') - proxy['user'] = gajim.config.get_per('proxies', p, 'user') - proxy['password'] = gajim.config.get_per('proxies', p, 'pass') - proxy['type'] = gajim.config.get_per('proxies', p, 'type') + proxy = {} + proxyptr = gajim.config.get_per('proxies',p) + for key in proxyptr.keys(): proxy[key]=proxyptr[key][1] + print proxy + elif gajim.config.get_per('accounts', self.name, 'use_env_http_proxy'): try: try: @@ -546,11 +546,11 @@ con.RegisterDisconnectHandler(self._on_new_account) # FIXME: BOSH properties should be loaded from config - if self._proxy and self._proxy['type'] == 'bosh': - self._proxy['bosh_hold'] = '1' - self._proxy['bosh_wait'] = '60' - self._proxy['bosh_content'] = 'text/xml; charset=utf-8' - self._proxy['wait_for_restart_response'] = False + #if self._proxy and self._proxy['type'] == 'bosh': + # self._proxy['bosh_hold'] = '2' + # self._proxy['bosh_wait'] = '10' + # self._proxy['bosh_content'] = 'text/xml; charset=utf-8' + # self._proxy['wait_for_restart_response'] = False log.info('Connecting to %s: [%s:%d]', self.name, @@ -1003,7 +1003,7 @@ self.connection.RegisterDisconnectHandler(self._on_disconnected) self.connection.send(p, now=True) - self.connection.StreamTerminate() + self.connection.start_disconnect() #self.connection.start_disconnect(p, self._on_disconnected) else: self.time_to_reconnect = None Modified: branches/bosh_support/src/common/xmpp/bosh.py =================================================================== --- branches/bosh_support/src/common/xmpp/bosh.py 2008-07-26 18:44:47 UTC (rev 10036) +++ branches/bosh_support/src/common/xmpp/bosh.py 2008-07-26 22:42:40 UTC (rev 10037) @@ -1,16 +1,20 @@ import locale, random -from transports_nb import NonBlockingTransport, NonBlockingHTTP, CONNECTED, CONNECTING, DISCONNECTED +from transports_nb import NonBlockingTransport, NonBlockingHTTPBOSH,\ + CONNECTED, CONNECTING, DISCONNECTED, DISCONNECTING,\ + urisplit from protocol import BOSHBody from simplexml import Node +import sha import logging log = logging.getLogger('gajim.c.x.bosh') +KEY_COUNT = 10 FAKE_DESCRIPTOR = -1337 '''Fake file descriptor - it's used for setting read_timeout in idlequeue for -BOSH Transport. Timeouts in queue are saved by socket descriptor. +BOSH Transport. In TCP-derived transports it is file descriptor of socket''' @@ -19,12 +23,6 @@ bosh_dict): NonBlockingTransport.__init__(self, raise_event, on_disconnect, idlequeue) - # with 50-bit random initial rid, session would have to go up - # to 7881299347898368 messages to raise rid over 2**53 - # (see http://www.xmpp.org/extensions/xep-0124.html#rids) - r = random.Random() - r.seed() - self.bosh_rid = r.getrandbits(50) self.bosh_sid = None if locale.getdefaultlocale()[0]: self.bosh_xml_lang = locale.getdefaultlocale()[0].split('_')[0] @@ -33,25 +31,30 @@ self.http_version = 'HTTP/1.1' self.http_persistent = True - self.http_pipelining = False + self.http_pipelining = bosh_dict['bosh_http_pipelining'] self.bosh_to = domain self.route_host, self.route_port = xmpp_server self.bosh_wait = bosh_dict['bosh_wait'] self.bosh_hold = bosh_dict['bosh_hold'] - self.bosh_host = bosh_dict['host'] - self.bosh_port = bosh_dict['port'] + self.bosh_requests = self.bosh_hold + self.bosh_uri = bosh_dict['bosh_uri'] + self.bosh_port = bosh_dict['bosh_port'] self.bosh_content = bosh_dict['bosh_content'] + self.wait_cb_time = None self.http_socks = [] - self.stanzas_to_send = [] - self.prio_bosh_stanza = None + self.stanza_buffer = [] + self.prio_bosh_stanzas = [] self.current_recv_handler = None + self.current_recv_socket = None + self.key_stack = None + self.ack_checker = None + self.after_init = False # if proxy_host .. do sth about HTTP proxy etc. - def connect(self, conn_5tuple, on_connect, on_connect_failure): NonBlockingTransport.connect(self, conn_5tuple, on_connect, on_connect_failure) @@ -59,14 +62,20 @@ FAKE_DESCRIPTOR = FAKE_DESCRIPTOR - 1 self.fd = FAKE_DESCRIPTOR - self.http_persistent = True - self.http_socks.append(self.get_http_socket()) + self.stanza_buffer = [] + self.prio_bosh_stanzas = [] + + self.key_stack = KeyStack(KEY_COUNT) + self.ack_checker = AckChecker() + self.after_init = True + + self.http_socks.append(self.get_new_http_socket()) self.tcp_connection_started() - # this connect() is not needed because sockets can be connected on send but - # we need to know if host is reachable in order to invoke callback for - # connecting failurei eventually (it's different than callback for errors - # occurring after connection is etabilished) + # following connect() is not necessary because sockets can be connected on + # send but we need to know if host is reachable in order to invoke callback + # for connecting failure eventually (the callback is different than callback + # for errors occurring after connection is etabilished) self.http_socks[0].connect( conn_5tuple = conn_5tuple, on_connect = lambda: self._on_connect(self.http_socks[0]), @@ -83,121 +92,209 @@ Called after HTTP response is received - another request is possible. There should be always one pending request on BOSH CM. ''' - log.info('on_http_req possible state:\n%s' % self.get_current_state()) - # if one of sockets is connecting, sth is about to be sent - # if there is a pending request, we shouldn't send another one + log.info('on_http_req possible, state:\n%s' % self.get_current_state()) + if self.state == DISCONNECTING: + self.disconnect() + return + self.send_BOSH(None) + + + def get_socket_in(self, state): for s in self.http_socks: - if s.state==CONNECTING or s.pending_requests>0: return - self.flush_stanzas() + if s.state==state: return s + return None - - def flush_stanzas(self): - # another to-be-locked candidate - log.info('flushing stanzas') - if self.prio_bosh_stanza: - tmp = self.prio_bosh_stanza - self.prio_bosh_stanza = None + def get_free_socket(self): + if self.http_pipelining: + assert( len(self.http_socks) == 1 ) + return self.get_socket_in(CONNECTED) else: - if self.stanzas_to_send: - tmp = self.stanzas_to_send.pop(0) - else: - tmp = [] - self.send_http(tmp) + last_recv_time, tmpsock = 0, None + for s in self.http_socks: + # we're interested only into CONNECTED socket with no req pending + if s.state==CONNECTED and s.pending_requests==0: + # if there's more of them, we want the one with less recent data receive + # (lowest last_recv_time) + if (last_recv_time==0) or (s.last_recv_time < last_recv_time): + last_recv_time = s.last_recv_time + tmpsock = s + if tmpsock: + return tmpsock + else: + return None - def send(self, stanza, now=False): - # body tags should be send only via send_http() - assert(not isinstance(stanza, BOSHBody)) - self.send_http([stanza]) + def send_BOSH(self, payload): + total_pending_reqs = sum([s.pending_requests for s in self.http_socks]) + # when called after HTTP response when there are some pending requests and + # no data to send, we do nothing and disccard the payload + if payload is None and \ + total_pending_reqs > 0 and \ + self.stanza_buffer == [] and \ + self.prio_bosh_stanzas == [] or \ + self.state==DISCONNECTED: + return - def send_http(self, payload): - # "Protocol" and string/unicode stanzas should be sent via send() - # (only initiating and terminating BOSH stanzas should be send via send_http) - assert(isinstance(payload, list) or isinstance(payload, BOSHBody)) - log.warn('send_http: stanzas: %s\n%s' % (payload, self.get_current_state())) + # now the payload is put to buffer and will be sent at some point + self.append_stanza(payload) - if isinstance(payload, list): - bosh_stanza = self.boshify_stanzas(payload) + # if we're about to make more requests than allowed, we don't send - stanzas will be + # sent after HTTP response from CM, exception is when we're disconnecting - then we + # send anyway + if total_pending_reqs >= self.bosh_requests and self.state!=DISCONNECTING: + log.warn('attemp to make more requests than allowed by Connection Manager:\n%s' % + self.get_current_state()) + return + + # when there's free CONNECTED socket, we flush the data + if self.get_free_socket(): + self.plug_socket() + return + + # if there is a connecting socket, we just wait for when it connects, + # payload will be sent in a sec when the socket connects + if self.get_socket_in(CONNECTING): return + + # being here means there are either DISCONNECTED sockets or all sockets are + # CONNECTED with too many pending requests + s = self.get_socket_in(DISCONNECTED) + + # if we have DISCONNECTED socket, lets connect it and ... + if s: + self.connect_and_flush(s) else: - # bodytag_payload is <body ...>, we don't boshify, only add the rid - bosh_stanza = payload - picked_sock = self.pick_socket() - if picked_sock: - log.info('sending to socket %s' % id(picked_sock)) - bosh_stanza.setAttr('rid', self.get_rid()) - picked_sock.send(bosh_stanza) + if len(self.http_socks) > 1: return + ss = self.get_new_http_socket() + self.http_socks.append(ss) + self.connect_and_flush(ss) + return + + def plug_socket(self): + stanza = None + s = self.get_free_socket() + if s: + s._plug_idle(writable=True, readable=True) else: - # no socket was picked but one is about to connect - save the stanza and - # return - log.info('send_http: no free socket:\n%s' % self.get_current_state()) - if self.prio_bosh_stanza: - payload = self.merge_stanzas(payload, self.prio_bosh_stanza) - if payload is None: - # if we cant merge the stanzas (both are BOSH <body>), add the current to - # queue to be sent later - self.stanzas_to_send.append(bosh_stanza) - log.warn('in BOSH send_http - unable to send %s because %s\ - is already about to be sent' % (str(payload), str(self.prio_bosh_stanza))) - return - self.prio_bosh_stanza = payload + log.error('=====!!!!!!!!====> Couldnt get free socket in plug_socket())') - def merge_stanzas(self, s1, s2): - if isinstance(s1, BOSHBody): - if isinstance(s2, BOSHBody): - # both are boshbodies - return - else: - s1.setPayload(s2, add=True) - return s1 - elif isinstance(s2, BOSHBody): - s2.setPayload(s1, add=True) - return s2 + def build_stanza(self, socket): + if self.prio_bosh_stanzas: + stanza, add_payload = self.prio_bosh_stanzas.pop(0) + if add_payload: + stanza.setPayload(self.stanza_buffer) + self.stanza_buffer = [] else: - #both are lists - s1.extend(s2) - return s1 + stanza = self.boshify_stanzas(self.stanza_buffer) + self.stanza_buffer = [] + stanza = self.ack_checker.backup_stanza(stanza, socket) + + key, newkey = self.key_stack.get() + if key: + stanza.setAttr('key', key) + if newkey: + stanza.setAttr('newkey', newkey) + + + log.info('sending msg with rid=%s to sock %s' % (stanza.getAttr('rid'), id(socket))) + socket.send(stanza) + self.renew_bosh_wait_timeout() + return stanza + + + def on_bosh_wait_timeout(self): + log.error('Connection Manager didn\'t respond within % seconds --> forcing \ + disconnect' % self.bosh_wait) + self.disconnect() + + + def renew_bosh_wait_timeout(self): + if self.wait_cb_time is not None: + self.remove_bosh_wait_timeout() + sched_time = self.idlequeue.set_alarm(self.on_bosh_wait_timeout, self.bosh_wait+10) + self.wait_cb_time = sched_time + + def remove_bosh_wait_timeout(self): + self.idlequeue.remove_alarm( + self.on_bosh_wait_timeout, + self.wait_cb_time) + + def on_persistent_fallback(self): + log.warn('Fallback to nonpersistent HTTP (no pipelining as well)') + self.http_persistent = False + self.http_pipelining = False + + def handle_body_attrs(self, stanza_attrs): + self.remove_bosh_wait_timeout() + + if self.after_init: + self.after_init = False + if stanza_attrs.has_key('sid'): + # session ID should be only in init response + self.bosh_sid = stanza_attrs['sid'] + + if stanza_attrs.has_key('requests'): + #self.bosh_requests = int(stanza_attrs['requests']) + self.bosh_requests = int(stanza_attrs['wait']) + + if stanza_attrs.has_key('wait'): + self.bosh_wait = int(stanza_attrs['wait']) + + ack = None + if stanza_attrs.has_key('ack'): + ack = stanza_attrs['ack'] + self.ack_checker.process_incoming_ack(ack=ack, + socket=self.current_recv_socket) + + if stanza_attrs.has_key('type'): + if stanza_attrs['type'] in ['terminate', 'terminal']: + condition = 'n/a' + if stanza_attrs.has_key('condition'): + condition = stanza_attrs['condition'] + log.error('Received terminating stanza: %s - %s' % (condition, bosh_errors[condition])) + self.set_state(DISCONNECTING) + + if stanza_attrs['type'] == 'error': + # recoverable error + pass + return + + + def append_stanza(self, stanza): + if stanza: + if isinstance(stanza, tuple): + # tuple of BOSH stanza and True/False for whether to add payload + self.prio_bosh_stanzas.append(stanza) + else: + self.stanza_buffer.append(stanza) + + + + def send(self, stanza, now=False): + # body tags should be send only via send_BOSH() + assert(not isinstance(stanza, BOSHBody)) + self.send_BOSH(stanza) + + + def get_current_state(self): t = '------ SOCKET_ID\tSOCKET_STATE\tPENDING_REQS\n' for s in self.http_socks: t = '%s------ %s\t%s\t%s\n' % (t,id(s), s.state, s.pending_requests) - t = '%s------ prio stanza to send: %s, queued stanzas: %s' \ - % (t, self.prio_bosh_stanza, self.stanzas_to_send) + t = '%s------ prio stanzas: %s, queued XMPP stanzas: %s, not_acked stanzas: %s' \ + % (t, self.prio_bosh_stanzas, self.stanza_buffer, + self.ack_checker.get_not_acked_rids()) return t - def pick_socket(self): - # try to pick connected socket with no pending reqs - for s in self.http_socks: - if s.state == CONNECTED and s.pending_requests == 0: - return s - # try to connect some disconnected socket - for s in self.http_socks: - if s.state==DISCONNECTED: - self.connect_and_flush(s) - return - # if there is any just-connecting socket, it will send the data in its - # connect callback - for s in self.http_socks: - if s.state==CONNECTING: - return - # being here means there are only CONNECTED scokets with pending requests. - # Lets create and connect another one - if len(self.http_socks) < 2: - s = self.get_http_socket() - self.http_socks.append(s) - self.connect_and_flush(s) - return - - def connect_and_flush(self, socket): socket.connect( conn_5tuple = self.conn_5tuple, - on_connect = self.flush_stanzas, + on_connect = lambda :self.send_BOSH(None), on_connect_failure = self.disconnect) @@ -209,65 +306,163 @@ return tag - def get_initial_bodytag(self, after_SASL=False): - return BOSHBody( - attrs={'content': self.bosh_content, - 'hold': str(self.bosh_hold), - 'route': '%s:%s' % (self.route_host, self.route_port), - 'to': self.bosh_to, - 'wait': str(self.bosh_wait), - 'xml:lang': self.bosh_xml_lang, - 'xmpp:version': '1.0', - 'ver': '1.6', - 'xmlns:xmpp': 'urn:xmpp:xbosh'}) + def send_init(self, after_SASL=False): + if after_SASL: + t = BOSHBody( + attrs={ 'to': self.bosh_to, + 'sid': self.bosh_sid, + 'xml:lang': self.bosh_xml_lang, + 'xmpp:restart': 'true', + 'xmlns:xmpp': 'urn:xmpp:xbosh'}) + else: + t = BOSHBody( + attrs={ 'content': self.bosh_content, + 'hold': str(self.bosh_hold), + 'route': '%s:%s' % (self.route_host, self.route_port), + 'to': self.bosh_to, + 'wait': str(self.bosh_wait), + 'xml:lang': self.bosh_xml_lang, + 'xmpp:version': '1.0', + 'ver': '1.6', + 'xmlns:xmpp': 'urn:xmpp:xbosh'}) + self.send_BOSH((t,True)) - def get_after_SASL_bodytag(self): - return BOSHBody( - attrs={ 'to': self.bosh_to, - 'sid': self.bosh_sid, - 'xml:lang': self.bosh_xml_lang, - 'xmpp:restart': 'true', - 'xmlns:xmpp': 'urn:xmpp:xbosh'}) + def start_disconnect(self): + NonBlockingTransport.start_disconnect(self) + self.send_BOSH( + (BOSHBody(attrs={'sid': self.bosh_sid, 'type': 'terminate'}), True)) - def get_closing_bodytag(self): - return BOSHBody(attrs={'sid': self.bosh_sid, 'type': 'terminate'}) - def get_rid(self): - self.bosh_rid = self.bosh_rid + 1 - return str(self.bosh_rid) - - - def get_http_socket(self): - s = NonBlockingHTTP( + def get_new_http_socket(self): + s = NonBlockingHTTPBOSH( raise_event=self.raise_event, on_disconnect=self.disconnect, idlequeue = self.idlequeue, on_http_request_possible = self.on_http_request_possible, - http_uri = self.bosh_host, + http_uri = self.bosh_uri, http_port = self.bosh_port, http_version = self.http_version, - http_persistent = self.http_persistent) - if self.current_recv_handler: - s.onreceive(self.current_recv_handler) + http_persistent = self.http_persistent, + on_persistent_fallback = self.on_persistent_fallback) + s.onreceive(self.on_received_http) + s.set_stanza_build_cb(self.build_stanza) return s + def onreceive(self, recv_handler): if recv_handler is None: recv_handler = self._owner.Dispatcher.ProcessNonBlocking self.current_recv_handler = recv_handler - for s in self.http_socks: - s.onreceive(recv_handler) - def http_socket_disconnect(self, socket): - if self.http_persistent: - self.disconnect() + def on_received_http(self, data, socket): + self.current_recv_socket = socket + self.current_recv_handler(data) def disconnect(self, do_callback=True): + self.remove_bosh_wait_timeout() if self.state == DISCONNECTED: return self.fd = -1 for s in self.http_socks: s.disconnect(do_callback=False) NonBlockingTransport.disconnect(self, do_callback) + +def get_rand_number(): + # with 50-bit random initial rid, session would have to go up + # to 7881299347898368 messages to raise rid over 2**53 + # (see http://www.xmpp.org/extensions/xep-0124.html#rids) + # it's also used for sequence key initialization + r = random.Random() + r.seed() + return r.getrandbits(50) + + + +class AckChecker(): + def __init__(self): + self.rid = get_rand_number() + self.ack = 1 + self.last_rids = {} + self.not_acked = [] + + + def get_not_acked_rids(self): return [rid for rid, st in self.not_acked] + + def backup_stanza(self, stanza, socket): + socket.pending_requests += 1 + rid = self.get_rid() + self.not_acked.append((rid, stanza)) + stanza.setAttr('rid', str(rid)) + self.last_rids[socket]=rid + + if self.rid != self.ack + 1: + stanza.setAttr('ack', str(self.ack)) + return stanza + + def process_incoming_ack(self, socket, ack=None): + socket.pending_requests -= 1 + if ack: + ack = int(ack) + else: + ack = self.last_rids[socket] + + i = len([rid for rid, st in self.not_acked if ack >= rid]) + self.not_acked = self.not_acked[i:] + + self.ack = ack + + + def get_rid(self): + self.rid = self.rid + 1 + return self.rid + + + + + +class KeyStack(): + def __init__(self, count): + self.count = count + self.keys = [] + self.reset() + self.first_call = True + + def reset(self): + seed = str(get_rand_number()) + self.keys = [sha.new(seed).hexdigest()] + for i in range(self.count-1): + curr_seed = self.keys[i] + self.keys.append(sha.new(curr_seed).hexdigest()) + + def get(self): + if self.first_call: + self.first_call = False + return (None, self.keys.pop()) + + if len(self.keys)>1: + return (self.keys.pop(), None) + else: + last_key = self.keys.pop() + self.reset() + new_key = self.keys.pop() + return (last_key, new_key) + +# http://www.xmpp.org/extensions/xep-0124.html#errorstatus-terminal +bosh_errors = { + 'n/a': 'none or unknown condition in terminating body stanza', + 'bad-request': 'The format of an HTTP header or binding element received from the client is unacceptable (e.g., syntax error), or Script Syntax is not supported.', + 'host-gone': 'The target domain specified in the "to" attribute or the target host or port specified in the "route" attribute is no longer serviced by the connection manager.', + 'host-unknown': 'The target domain specified in the "to" attribute or the target host or port specified in the "route" attribute is unknown to the connection manager.', + 'improper-addressing': 'The initialization element lacks a "to" or "route" attribute (or the attribute has no value) but the connection manager requires one.', + 'internal-server-error': 'The connection manager has experienced an internal error that prevents it from servicing the request.', + 'item-not-found': '(1) "sid" is not valid, (2) "stream" is not valid, (3) "rid" is larger than the upper limit of the expected window, (4) connection manager is unable to resend response, (5) "key" sequence is invalid', + 'other-request': 'Another request being processed at the same time as this request caused the session to terminate.', + 'policy-violation': 'The client has broken the session rules (polling too frequently, requesting too frequently, too many simultaneous requests).', + 'remote-connection-failed': 'The connection manager was unable to connect to, or unable to connect securely to, or has lost its connection to, the server.', + 'remote-stream-error': 'Encapsulates an error in the protocol being transported.', + 'see-other-uri': 'The connection manager does not operate at this URI (e.g., the connection manager accepts only SSL or TLS connections at some https: URI rather than the http: URI requested by the client). The client may try POSTing to the URI in the content of the <uri/> child element.', + 'system-shutdown': 'The connection manager is being shut down. All active HTTP sessions are being terminated. No new sessions can be created.', + 'undefined-condition': 'The error is not one of those defined herein; the connection manager SHOULD include application-specific information in the content of the <body/> wrapper.' +} Modified: branches/bosh_support/src/common/xmpp/client_nb.py =================================================================== --- branches/bosh_support/src/common/xmpp/client_nb.py 2008-07-26 18:44:47 UTC (rev 10036) +++ branches/bosh_support/src/common/xmpp/client_nb.py 2008-07-26 22:42:40 UTC (rev 10037) @@ -128,8 +128,8 @@ self.ip_addresses = socket.getaddrinfo(hostname,port, socket.AF_UNSPEC,socket.SOCK_STREAM) except socket.gaierror, (errnum, errstr): - on_failure(err_message='Lookup failure for %s:%s - %s %s' % - (self.Server, self.Port, errnum, errstr)) + on_failure('Lookup failure for %s:%s, hostname: %s - %s' % + (self.Server, self.Port, hostname, errstr)) else: on_success() @@ -385,7 +385,7 @@ # with proxies, client connects to proxy instead of directly to # XMPP server ((hostname, port)) # tcp_host is hostname of machine used for socket connection - # (DNS request will be done for this hostname) + # (DNS request will be done for proxy or BOSH CM hostname) tcp_host, tcp_port, proxy_user, proxy_pass = \ transports_nb.get_proxy_data_from_dict(proxy) @@ -400,7 +400,7 @@ domain = self.Server, bosh_dict = proxy) self.protocol_type = 'BOSH' - self.wait_for_restart_response = proxy['wait_for_restart_response'] + self.wait_for_restart_response = proxy['bosh_wait_for_restart_response'] else: if proxy['type'] == 'socks5': Modified: branches/bosh_support/src/common/xmpp/dispatcher_nb.py =================================================================== --- branches/bosh_support/src/common/xmpp/dispatcher_nb.py 2008-07-26 18:44:47 UTC (rev 10036) +++ branches/bosh_support/src/common/xmpp/dispatcher_nb.py 2008-07-26 22:42:40 UTC (rev 10037) @@ -35,7 +35,6 @@ DEFAULT_TIMEOUT_SECONDS = 25 ID = 0 -STREAM_TERMINATOR = '</stream:stream>' XML_DECLARATION = '<?xml version=\'1.0\'?>' # FIXME: ugly @@ -46,7 +45,8 @@ # named by __class__.__name__ of the dispatcher instance .. long story short: # I wrote following to avoid changing each client.Dispatcher.whatever() in xmpp/ -# If having two kinds of dispatcher will go well, I will rewrite the +# If having two kinds of dispatcher will go well, I will rewrite the dispatcher +# references in other scripts def PlugIn(self, client_obj, after_SASL=False, old_features=None): if client_obj.protocol_type == 'XMPP': XMPPDispatcher().PlugIn(client_obj) @@ -71,7 +71,7 @@ self._exported_methods=[self.RegisterHandler, self.RegisterDefaultHandler, \ self.RegisterEventHandler, self.UnregisterCycleHandler, self.RegisterCycleHandler, \ self.RegisterHandlerOnce, self.UnregisterHandler, self.RegisterProtocol, \ - self.SendAndWaitForResponse, self.StreamTerminate, \ + self.SendAndWaitForResponse, \ self.SendAndCallForResponse, self.getAnID, self.Event, self.send] def getAnID(self): @@ -134,9 +134,6 @@ locale.getdefaultlocale()[0].split('_')[0]) self._owner.send("%s%s>" % (XML_DECLARATION,str(self._metastream)[:-2])) - def StreamTerminate(self): - ''' Send a stream terminator. ''' - self._owner.send(STREAM_TERMINATOR) def _check_stream_start(self, ns, tag, attrs): if ns<>NS_STREAMS or tag<>'stream': @@ -445,16 +442,12 @@ locale.getdefaultlocale()[0].split('_')[0]) self.restart = True - if self.after_SASL: - self._owner.Connection.send_http(self._owner.Connection.get_after_SASL_bodytag()) - else: - self._owner.Connection.send_http(self._owner.Connection.get_initial_bodytag()) + self._owner.Connection.send_init(after_SASL = self.after_SASL) - def StreamTerminate(self): ''' Send a stream terminator. ''' - self._owner.Connection.send_http(self._owner.Connection.get_closing_bodytag()) + self._owner.Connection.send_terminator() def ProcessNonBlocking(self, data=None): @@ -472,22 +465,13 @@ if stanza.getName()=='body' and stanza.getNamespace()==NS_HTTP_BIND: stanza_attrs = stanza.getAttrs() - if stanza_attrs.has_key('authid'): # should be only in init response # auth module expects id of stream in document attributes self.Stream._document_attrs['id'] = stanza_attrs['authid'] - if stanza_attrs.has_key('sid'): - # session ID should be only in init response - self._owner.Connection.bosh_sid = stanza_attrs['sid'] + self._owner.Connection.handle_body_attrs(stanza_attrs) - if stanza_attrs.has_key('terminate'): - self._owner.disconnect() - - if stanza_attrs.has_key('error'): - # recoverable error - pass children = stanza.getChildren() Modified: branches/bosh_support/src/common/xmpp/idlequeue.py =================================================================== --- branches/bosh_support/src/common/xmpp/idlequeue.py 2008-07-26 18:44:47 UTC (rev 10036) +++ branches/bosh_support/src/common/xmpp/idlequeue.py 2008-07-26 22:42:40 UTC (rev 10037) @@ -15,7 +15,6 @@ import select import logging log = logging.getLogger('gajim.c.x.idlequeue') -log.setLevel(logging.DEBUG) class IdleObject: ''' base class for all idle listeners, these are the methods, which are called from IdleQueue @@ -68,6 +67,25 @@ self.alarms[alarm_time].append(alarm_cb) else: self.alarms[alarm_time] = [alarm_cb] + return alarm_time + + + + def remove_alarm(self, alarm_cb, alarm_time): + ''' removes alarm callback alarm_cb scheduled on alarm_time''' + if not self.alarms.has_key(alarm_time): return False + i = -1 + for i in range(len(self.alarms[alarm_time])): + # let's not modify the list inside the loop + if self.alarms[alarm_time][i] is alarm_cb: break + if i != -1: + del self.alarms[alarm_time][i] + if self.alarms[alarm_time] == []: + del self.alarms[alarm_time] + return True + else: + return False + def set_read_timeout(self, fd, seconds): ''' set a new timeout, if it is not removed after 'seconds', @@ -91,9 +109,10 @@ for alarm_time in times: if alarm_time > current_time: break - for cb in self.alarms[alarm_time]: - cb() - del(self.alarms[alarm_time]) + if self.alarms.has_key(alarm_time): + for cb in self.alarms[alarm_time]: + cb() + del(self.alarms[alarm_time]) def plug_idle(self, obj, writable = True, readable = True): if obj.fd == -1: Modified: branches/bosh_support/src/common/xmpp/transports_nb.py =================================================================== --- branches/bosh_support/src/common/xmpp/transports_nb.py 2008-07-26 18:44:47 UTC (rev 10036) +++ branches/bosh_support/src/common/xmpp/transports_nb.py 2008-07-26 22:42:40 UTC (rev 10037) @@ -46,25 +46,17 @@ return proto, host, path def get_proxy_data_from_dict(proxy): + tcp_host, tcp_port, proxy_user, proxy_pass = None, None, None, None type = proxy['type'] - # with http-connect/socks5 proxy, we do tcp connecting to the proxy machine - tcp_host, tcp_port = proxy['host'], proxy['port'] - if type == 'bosh': - # in ['host'] is whole URI - tcp_host = urisplit(proxy['host'])[1] - # in BOSH, client connects to Connection Manager instead of directly to - # XMPP server ((hostname, port)). If HTTP Proxy is specified, client connects - # to HTTP proxy and Connection Manager is specified at URI and Host header - # in HTTP message - if proxy.has_key('proxy_host') and proxy.has_key('proxy_port'): - tcp_host, tcp_port = proxy['proxy_host'], proxy['proxy_port'] - - # user and pass for socks5/http_connect proxy. In case of BOSH, it's user and - # pass for http proxy - If there's no proxy_host they won't be used - if proxy.has_key('user'): proxy_user = proxy['user'] - else: proxy_user = None - if proxy.has_key('pass'): proxy_pass = proxy['pass'] - else: proxy_pass = None + if type == 'bosh' and not proxy['bosh_useproxy']: + # with BOSH not over proxy we have to parse the hostname from BOSH URI + tcp_host, tcp_port = urisplit(proxy['bosh_uri'])[1], proxy['bosh_port'] + else: + # with proxy!=bosh or with bosh over HTTP proxy we're connecting to proxy + # machine + tcp_host, tcp_port = proxy['host'], proxy['port'] + if proxy['useauth']: + proxy_user, proxy_pass = proxy['user'], proxy['pass'] return tcp_host, tcp_port, proxy_user, proxy_pass @@ -104,7 +96,7 @@ self.port = None self.state = DISCONNECTED self._exported_methods=[self.disconnect, self.onreceive, self.set_send_timeout, - self.set_timeout, self.remove_timeout] + self.set_timeout, self.remove_timeout, self.start_disconnect] # time to wait for SOME stanza to come and then send keepalive self.sendtimeout = 0 @@ -152,10 +144,10 @@ self.on_connect_failure(err_message=err_message) def send(self, raw_data, now=False): - if self.state != CONNECTED: - log.error('Trying to send %s when state is %s.' % + if self.state not in [CONNECTED]: + log.error('Unable to send %s \n because state is %s.' % (raw_data, self.state)) - return + def disconnect(self, do_callback=True): self.set_state(DISCONNECTED) @@ -205,7 +197,11 @@ else: self.on_timeout = None + def start_disconnect(self): + self.set_state(DISCONNECTING) + + class NonBlockingTCP(NonBlockingTransport, IdleObject): ''' Non-blocking TCP socket wrapper @@ -221,9 +217,13 @@ # bytes remained from the last send message self.sendbuff = '' + + self.terminator = '</stream:stream>' + def start_disconnect(self): + self.send('</stream:stream>') + NonBlockingTransport.start_disconnect(self) - def connect(self, conn_5tuple, on_connect, on_connect_failure): ''' Creates and connects socket to server and port defined in conn_5tupe which @@ -316,7 +316,7 @@ def disconnect(self, do_callback=True): if self.state == DISCONNECTED: return - self.set_state(DISCONNECTING) + self.set_state(DISCONNECTED) self.idlequeue.unplug_idle(self.fd) try: self._sock.shutdown(socket.SHUT_RDWR) @@ -342,7 +342,7 @@ def set_timeout(self, timeout): - if self.state in [CONNECTING, CONNECTED] and self.fd != -1: + if self.state != DISCONNECTED and self.fd != -1: NonBlockingTransport.set_timeout(self, timeout) else: log.warn('set_timeout: TIMEOUT NOT SET: state is %s, fd is %s' % (self.state, self.fd)) @@ -394,6 +394,9 @@ if not self.sendbuff: if not self.sendqueue: log.warn('calling send on empty buffer and queue') + self._plug_idle( + writable= ((self.sendqueue!=[]) or (self.sendbuff!='')), + readable=True) return None self.sendbuff = self.sendqueue.pop(0) try: @@ -402,7 +405,7 @@ sent_data = self.sendbuff[:send_count] self.sendbuff = self.sendbuff[send_count:] self._plug_idle( - writable=self.sendqueue or self.sendbuff, + writable= ((self.sendqueue!=[]) or (self.sendbuff!='')), readable=True) self.raise_event(DATA_SENT, sent_data) @@ -477,7 +480,8 @@ ''' def __init__(self, raise_event, on_disconnect, idlequeue, on_http_request_possible, - http_uri, http_port, http_version='HTTP/1.1', http_persistent=False): + http_uri, http_port, on_persistent_fallback, http_version='HTTP/1.1', + http_persistent=False): NonBlockingTCP.__init__(self, raise_event, on_disconnect, idlequeue) @@ -493,22 +497,29 @@ self.recvbuff = '' self.expected_length = 0 self.pending_requests = 0 + self.on_persistent_fallback = on_persistent_fallback self.on_http_request_possible = on_http_request_possible + self.just_responed = False + self.last_recv_time = 0 def send(self, raw_data, now=False): NonBlockingTCP.send( self, self.build_http_message(raw_data), now) - self.pending_requests += 1 def on_remote_disconnect(self): + log.warn('on_remote_disconnect called, http_persistent = %s' % self.http_persistent) if self.http_persistent: self.http_persistent = False + self.on_persistent_fallback() self.disconnect(do_callback=False) self.connect( conn_5tuple = self.conn_5tuple, + # after connect, the socket will be plugged as writable - pollout will be + # called, and since there are still data in sendbuff, _do_send will be + # called and sendbuff will be flushed on_connect = lambda: self._plug_idle(writable=True, readable=True), on_connect_failure = self.disconnect) @@ -534,20 +545,21 @@ if self.expected_length > len(self.recvbuff): # If we haven't received the whole HTTP mess yet, let's end the thread. # It will be finnished from one of following polls (io_watch) on plugged socket. - log.info('not enough bytes - %d expected, %d got' % (self.expected_length, len(self.recvbuff))) + log.info('not enough bytes in HTTP response - %d expected, %d got' % + (self.expected_length, len(self.recvbuff))) return - # all was received, now call the on_receive callback + # everything was received httpbody = self.recvbuff self.recvbuff='' self.expected_length=0 - self.pending_requests -= 1 - assert(self.pending_requests >= 0) + if not self.http_persistent: # not-persistent connections disconnect after response self.disconnect(do_callback = False) - self.on_receive(httpbody) + self.last_recv_time = time.time() + self.on_receive(data=httpbody, socket=self) self.on_http_request_possible() @@ -563,6 +575,9 @@ 'Host: %s:%s' % (self.http_host, self.http_port), 'Content-Type: text/xml; charset=utf-8', 'Content-Length: %s' % len(str(httpbody)), + 'Proxy-Connection: keep-alive', + 'Pragma: no-cache', + 'Accept-Encoding: gzip, deflate', '\r\n'] headers = '\r\n'.join(headers) return('%s%s\r\n' % (headers, httpbody)) @@ -587,7 +602,36 @@ headers[row[0][:-1]] = row[1] return (statusline, headers, httpbody) +class NonBlockingHTTPBOSH(NonBlockingHTTP): + + def set_stanza_build_cb(self, build_cb): + self.build_cb = build_cb + + def _do_send(self): + if not self.sendbuff: + stanza = self.build_cb(socket=self) + stanza = self.build_http_message(httpbody=stanza) + if isinstance(stanza, unicode): + stanza = stanza.encode('utf-8') + elif not isinstance(stanza, str): + stanza = ustr(stanza).encode('utf-8') + self.sendbuff = stanza + try: + send_count = self._send(self.sendbuff) + if send_count: + sent_data = self.sendbuff[:send_count] + self.sendbuff = self.sendbuff[send_count:] + self._plug_idle(writable = self.sendbuff != '', readable = True) + self.raise_event(DATA_SENT, sent_data) + + except socket.error, e: + log.error('_do_send:', exc_info=True) + traceback.print_exc() + self.disconnect() + + + class NBProxySocket(NonBlockingTCP): ''' Interface for proxy socket wrappers - when tunnneling XMPP over proxies, @@ -663,7 +707,6 @@ self.after_proxy_connect() #self.onreceive(self._on_proxy_auth) - # FIXME: find out what it this method for def _on_proxy_auth(self, reply): if self.reply.find('\n\n') == -1: if reply is None: Modified: branches/bosh_support/src/config.py =================================================================== --- branches/bosh_support/src/config.py 2008-07-26 18:44:47 UTC (rev 10036) +++ branches/bosh_support/src/config.py 2008-07-26 22:42:40 UTC (rev 10037) @@ -1101,10 +1101,31 @@ self.proxies_treeview = self.xml.get_widget('proxies_treeview') self.proxyname_entry = self.xml.get_widget('proxyname_entry') self.proxytype_combobox = self.xml.get_widget('proxytype_combobox') + self.init_list() self.xml.signal_autoconnect(self) self.window.show_all() + # hide the BOSH fields by default + self.show_bosh_fields() + def show_bosh_fields(self, show=True): + if show: + self.xml.get_widget('boshuri_entry').show() + self.xml.get_widget('boshport_entry').show() + self.xml.get_widget('boshuri_label').show() + self.xml.get_widget('boshport_label').show() + self.xml.get_widget('boshuseproxy_checkbutton').show() + else: + cb = self.xml.get_widget('boshuseproxy_checkbutton') + cb.hide() + cb.set_active(True) + self.on_boshuseproxy_checkbutton_toggled(cb) + self.xml.get_widget('boshuri_entry').hide() + self.xml.get_widget('boshport_entry').hide() + self.xml.get_widget('boshuri_label').hide() + self.xml.get_widget('boshport_label').hide() + + def fill_proxies_treeview(self): model = self.proxies_treeview.get_model() model.clear() @@ -1158,9 +1179,18 @@ def on_useauth_checkbutton_toggled(self, widget): act = widget.get_active() + proxy = self.proxyname_entry.get_text().decode('utf-8') + gajim.config.set_per('proxies', proxy, 'useauth', act) self.xml.get_widget('proxyuser_entry').set_sensitive(act) self.xml.get_widget('proxypass_entry').set_sensitive(act) + def on_boshuseproxy_checkbutton_toggled(self, widget): + act = widget.get_active() + proxy = self.proxyname_entry.get_text().decode('utf-8') + gajim.config.set_per('proxies', proxy, 'bosh_useproxy', act) + self.xml.get_widget('proxyhost_entry').set_sensitive(act) + self.xml.get_widget('proxyport_entry').set_sensitive(act) + def on_proxies_treeview_cursor_changed(self, widget): #FIXME: check if off proxy settings are correct (see # http://trac.gajim.org/changeset/1921#file2 line 1221 @@ -1173,19 +1203,33 @@ proxyport_entry = self.xml.get_widget('proxyport_entry') proxyuser_entry = self.xml.get_widget('proxyuser_entry') proxypass_entry = self.xml.get_widget('proxypass_entry') + boshuri_entry = self.xml.get_widget('boshuri_entry') + boshport_entry = self.xml.get_widget('boshport_entry') useauth_checkbutton = self.xml.get_widget('useauth_checkbutton') + boshuseproxy_checkbutton = self.xml.get_widget('boshuseproxy_checkbutton') proxyhost_entry.set_text('') proxyport_entry.set_text('') proxyuser_entry.set_text('') proxypass_entry.set_text('') - useauth_checkbutton.set_active(False) - self.on_useauth_checkbutton_toggled(useauth_checkbutton) + boshuri_entry.set_text('') + + #boshuseproxy_checkbutton.set_active(False) + #self.on_boshuseproxy_checkbutton_toggled(boshuseproxy_checkbutton) + + #useauth_checkbutton.set_active(False) + #self.on_useauth_checkbutton_toggled(useauth_checkbutton) + if proxy == _('None'): # special proxy None + self.show_bosh_fields(False) self.proxyname_entry.set_editable(False) self.xml.get_widget('remove_proxy_button').set_sensitive(False) self.xml.get_widget('proxytype_combobox').set_sensitive(False) self.xml.get_widget('proxy_table').set_sensitive(False) else: + proxytype = gajim.config.get_per('proxies', proxy, 'type') + + self.show_bosh_fields(proxytype=='bosh') + self.proxyname_entry.set_editable(True) self.xml.get_widget('remove_proxy_button').set_sensitive(True) self.xml.get_widget('proxytype_combobox').set_sensitive(True) @@ -1198,11 +1242,16 @@ 'user')) proxypass_entry.set_text(gajim.config.get_per('proxies', proxy, 'pass')) - proxytype = gajim.config.get_per('proxies', proxy, 'type') + boshuri_entry.set_text(gajim.config.get_per('proxies', proxy, + 'bosh_uri')) + boshport_entry.set_text(unicode(gajim.config.get_per('proxies', proxy, + 'bosh_port'))) types = ['http', 'socks5', 'bosh'] self.proxytype_combobox.set_active(types.index(proxytype)) - if gajim.config.get_per('proxies', proxy, 'user'): - useauth_checkbutton.set_active(True) + boshuseproxy_checkbutton.set_active( + gajim.config.get_per('proxies', proxy, 'bosh_useproxy')) + useauth_checkbutton.set_active( + gajim.config.get_per('proxies', proxy, 'useauth')) def on_proxies_treeview_key_press_event(self, widget, event): if event.keyval == gtk.keysyms.Delete: @@ -1229,6 +1278,7 @@ def on_proxytype_combobox_changed(self, widget): types = ['http', 'socks5', 'bosh'] type_ = self.proxytype_combobox.get_active() + self.show_bosh_fields(types[type_]=='bosh') proxy = self.proxyname_entry.get_text().decode('utf-8') gajim.config.set_per('proxies', proxy, 'type', types[type_]) @@ -1247,6 +1297,16 @@ proxy = self.proxyname_entry.get_text().decode('utf-8') gajim.config.set_per('proxies', proxy, 'user', value) + def on_boshuri_entry_changed(self, widget): + value = widget.get_text().decode('utf-8') + proxy = self.proxyname_entry.get_text().decode('utf-8') + gajim.config.set_per('proxies', proxy, 'bosh_uri', value) + + def on_boshport_entry_changed(self, widget): + value = widget.get_text().decode('utf-8') + proxy = self.proxyname_entry.get_text().decode('utf-8') + gajim.config.set_per('proxies', proxy, 'bosh_port', value) + def on_proxypass_entry_changed(self, widget): value = widget.get_text().decode('utf-8') proxy = self.proxyname_entry.get_text().decode('utf-8') Modified: branches/bosh_support/src/gajim.py =================================================================== --- branches/bosh_support/src/gajim.py 2008-07-26 18:44:47 UTC (rev 10036) +++ branches/bosh_support/src/gajim.py 2008-07-26 22:42:40 UTC (rev 10037) @@ -50,7 +50,7 @@ consoleloghandler = logging.StreamHandler() consoleloghandler.setLevel(1) consoleloghandler.setFormatter( - logging.Formatter('%(name)s: %(levelname)s: %(message)s') + logging.Formatter('%(asctime)s %(name)s: %(levelname)s: %(message)s') ) log = logging.getLogger('gajim') log.setLevel(logging.WARNING)

1 0

[commit-gajim] r10036 - trunk/src
by bct＠gajim.org 26 Jul '08

26 Jul '08

Author: bct Date: 2008-07-26 20:44:47 +0200 (Sat, 26 Jul 2008) New Revision: 10036 Modified: trunk/src/roster_window.py Log: update resource-specific chat controls when that resource comes back online Modified: trunk/src/roster_window.py =================================================================== --- trunk/src/roster_window.py 2008-07-26 05:28:15 UTC (rev 10035) +++ trunk/src/roster_window.py 2008-07-26 18:44:47 UTC (rev 10036) @@ -1978,20 +1978,21 @@ # Remove resource when going offline if show in ('offline', 'error') and \ len(gajim.events.get_events(account, contact.get_full_jid())) == 0: - jid_with_resource = contact.jid + '/' + contact.resource - if gajim.interface.msg_win_mgr.has_window(jid_with_resource, - account): - win = gajim.interface.msg_win_mgr.get_window(jid_with_resource, - account) - ctrl = win.get_control(jid_with_resource, account) - if ctrl: - ctrl.update_ui() - win.redraw_tab(ctrl) - gajim.contacts.remove_contact(account, contact) + fjid = contact.jid + '/' + contact.resource + ctrl = gajim.interface.msg_win_mgr.get_control( + fjid, account) + if ctrl: + ctrl.update_ui() + ctrl.parent_win.redraw_tab(ctrl) + # keep the contact around, since it's + # already attached to the control + else: + gajim.contacts.remove_contact(account, contact) elif contact.jid == gajim.get_jid_from_account(account) and \ show in ('offline', 'error'): - # SelfContact went offline. Remove him when last pending message was read + # SelfContact went offline. Remove him when last pending + # message was read self.remove_contact(contact.jid, account, backend=True) uf_show = helpers.get_uf_show(show)

1 0

[commit-gajim] r10035 - in trunk/src: . common
by bct＠gajim.org 26 Jul '08

26 Jul '08

Author: bct Date: 2008-07-26 07:28:15 +0200 (Sat, 26 Jul 2008) New Revision: 10035 Modified: trunk/src/common/connection.py trunk/src/common/connection_handlers.py trunk/src/gajim.py trunk/src/message_control.py trunk/src/session.py Log: attach resource to sessions so that only the relevant sessions are terminated when a contact goes offline Modified: trunk/src/common/connection.py =================================================================== --- trunk/src/common/connection.py 2008-07-26 01:58:30 UTC (rev 10034) +++ trunk/src/common/connection.py 2008-07-26 05:28:15 UTC (rev 10035) @@ -1062,6 +1062,9 @@ msgtxt = msg msgenc = '' + if session: + fjid = str(session.jid) + if keyID and self.USE_GPG: if keyID == 'UNKNOWN': error = _('Neither the remote presence is signed, nor a key was assigned.') Modified: trunk/src/common/connection_handlers.py =================================================================== --- trunk/src/common/connection_handlers.py 2008-07-26 01:58:30 UTC (rev 10034) +++ trunk/src/common/connection_handlers.py 2008-07-26 05:28:15 UTC (rev 10035) @@ -1226,23 +1226,37 @@ # keep track of sessions this connection has with other JIDs self.sessions = {} - def get_or_create_session(self, jid, thread_id): - '''returns an existing session between this connection and 'jid', returns a new one if none exist.''' + def get_sessions(self, jid): + '''get all sessions for the given full jid''' - pm = True if not gajim.interface.is_pm_contact(jid, self.name): - pm = False jid = gajim.get_jid_without_resource(jid) + try: + return self.sessions[jid].values() + except KeyError: + return [] + + def get_or_create_session(self, fjid, thread_id): + '''returns an existing session between this connection and 'jid', returns a + new one if none exist.''' + + pm = True + jid = fjid + + if not gajim.interface.is_pm_contact(fjid, self.name): + pm = False + jid = gajim.get_jid_without_resource(fjid) + session = self.find_session(jid, thread_id) if session: return session if pm: - return self.make_new_session(jid, thread_id, type = 'pm') + return self.make_new_session(fjid, thread_id, type='pm') else: - return self.make_new_session(jid, thread_id) + return self.make_new_session(fjid, thread_id) def find_session(self, jid, thread_id): try: @@ -1311,13 +1325,13 @@ if not cls: cls = gajim.default_session_type + sess = cls(self, common.xmpp.JID(jid), thread_id, type) + # determine if this session is a pm session - # if not, discard the resource + # if not, discard the resource so that all sessions are stored bare if not type == 'pm': jid = gajim.get_jid_without_resource(jid) - sess = cls(self, common.xmpp.JID(jid), thread_id, type) - if not jid in self.sessions: self.sessions[jid] = {} Modified: trunk/src/gajim.py =================================================================== --- trunk/src/gajim.py 2008-07-26 01:58:30 UTC (rev 10034) +++ trunk/src/gajim.py 2008-07-26 05:28:15 UTC (rev 10035) @@ -769,10 +769,12 @@ if array[1] in ('offline', 'error'): contact1.our_chatstate = contact1.chatstate = \ contact1.composing_xep = None + + conn = gajim.connections[account] + # TODO: This causes problems when another # resource signs off! - gajim.connections[account]. \ - remove_transfers_for_contact(contact1) + conn.remove_transfers_for_contact(contact1) # disable encryption, since if any messages are # lost they'll be not decryptable (note that @@ -782,20 +784,16 @@ # FIXME: This *REALLY* are TOO many leves of # indentation! We even need to introduce # a temp var here to make it somehow fit! - if gajim.connections[account].sessions. \ - has_key(ji): - for sess in gajim.connections \ - [account]. sessions[ji].values(): - ctrl = sess.control - if ctrl: - ctrl.no_autonegotiation\ - = False - if sess.enable_encryption: - sess.terminate_e2e() - gajim.connections \ - [account]. \ - delete_session(jid, - sess.thread_id) + for sess in conn.get_sessions(ji): + if (ji+'/'+resource) != str(sess.jid): + continue + ctrl = sess.control + if ctrl: + ctrl.no_autonegotiation = False + if sess.enable_encryption: + sess.terminate_e2e() + conn.delete_session(jid, + sess.thread_id) self.roster.chg_contact_status(contact1, array[1], status_message, account) Modified: trunk/src/message_control.py =================================================================== --- trunk/src/message_control.py 2008-07-26 01:58:30 UTC (rev 10034) +++ trunk/src/message_control.py 2008-07-26 05:28:15 UTC (rev 10035) @@ -160,6 +160,9 @@ if not self.session: sess = conn.find_controlless_session(jid) + if self.resource: + jid += '/' + self.resource + if not sess: sess = conn.make_new_session(jid) Modified: trunk/src/session.py =================================================================== --- trunk/src/session.py 2008-07-26 01:58:30 UTC (rev 10034) +++ trunk/src/session.py 2008-07-26 05:28:15 UTC (rev 10035) @@ -440,7 +440,7 @@ form.getField('terminate').getValue() in ('1', 'true'): self.acknowledge_termination() - self.conn.delete_session(self.jid, self.thread_id) + self.conn.delete_session(str(self.jid), self.thread_id) return

1 0

[commit-gajim] r10034 - trunk/src
by js＠gajim.org 26 Jul '08

26 Jul '08

Author: js Date: 2008-07-26 03:58:30 +0200 (Sat, 26 Jul 2008) New Revision: 10034 Modified: trunk/src/gajim.py trunk/src/roster_window.py Log: Fix restoring of multiline status messages on reconnect. Modified: trunk/src/gajim.py =================================================================== --- trunk/src/gajim.py 2008-07-26 01:16:24 UTC (rev 10033) +++ trunk/src/gajim.py 2008-07-26 01:58:30 UTC (rev 10034) @@ -2782,8 +2782,9 @@ self.roster.send_status(a, gajim.config.get_per('accounts', a, 'last_status'), + helpers.from_one_line( gajim.config.get_per('accounts', a, - 'last_status_msg')) + 'last_status_msg'))) return False def show_systray(self): Modified: trunk/src/roster_window.py =================================================================== --- trunk/src/roster_window.py 2008-07-26 01:16:24 UTC (rev 10033) +++ trunk/src/roster_window.py 2008-07-26 01:58:30 UTC (rev 10034) @@ -1893,7 +1893,8 @@ gajim.config.set_per('accounts', account, 'last_status', status) gajim.config.set_per('accounts', account, - 'last_status_msg', txt) + 'last_status_msg', + helpers.to_one_line(txt)) if gajim.connections[account].connected < 2: self.set_connecting_state(account)

1 0

[commit-gajim] r10033 - in trunk/src: . common
by bct＠gajim.org 26 Jul '08

26 Jul '08

Author: bct Date: 2008-07-26 03:16:24 +0200 (Sat, 26 Jul 2008) New Revision: 10033 Modified: trunk/src/chat_control.py trunk/src/common/contacts.py Log: fix some issues with the difference between Contacts and GC_Contacts Modified: trunk/src/chat_control.py =================================================================== --- trunk/src/chat_control.py 2008-07-25 16:51:26 UTC (rev 10032) +++ trunk/src/chat_control.py 2008-07-26 01:16:24 UTC (rev 10033) @@ -144,7 +144,7 @@ # This is bad, we need the highest for caps etc. c = gajim.contacts.get_contact_with_highest_priority( acct, contact.jid) - if c: + if c and not isinstance(c, GC_Contact): contact = c MessageControl.__init__(self, type_id, parent_win, widget_name, @@ -1184,7 +1184,8 @@ def update_toolbar(self): # Add to roster - if _('Not in Roster') in self.contact.groups: + if not isinstance(self.contact, GC_Contact) \ + and _('Not in Roster') in self.contact.groups: self._add_to_roster_button.show() else: self._add_to_roster_button.hide() @@ -1202,14 +1203,16 @@ self._convert_to_gc_button.set_sensitive(False) def update_mood(self): - if self.contact.mood.has_key('mood'): + if not isinstance(self.contact, GC_Contact) \ + and self.contact.mood.has_key('mood'): mood = self.contact.mood['mood'] if HAVE_MARKUP_TOOLTIPS: mood = gobject.markup_escape_text(mood) else: mood = None - if self.contact.mood.has_key('text'): + if not isinstance(self.contact, GC_Contact) \ + and self.contact.mood.has_key('text'): text = self.contact.mood['text'] if HAVE_MARKUP_TOOLTIPS: text = gobject.markup_escape_text(text) @@ -1245,15 +1248,18 @@ title = None source = None - if self.contact.tune.has_key('artist'): + if not isinstance(self.contact, GC_Contact) \ + and self.contact.tune.has_key('artist'): artist = self.contact.tune['artist'].strip() if HAVE_MARKUP_TOOLTIPS: artist = gobject.markup_escape_text(artist) - if self.contact.tune.has_key('title'): + if not isinstance(self.contact, GC_Contact) \ + and self.contact.tune.has_key('title'): title = self.contact.tune['title'].strip() if HAVE_MARKUP_TOOLTIPS: title = gobject.markup_escape_text(title) - if self.contact.tune.has_key('source'): + if not isinstance(self.contact, GC_Contact) \ + and self.contact.tune.has_key('source'): source = self.contact.tune['source'].strip() if HAVE_MARKUP_TOOLTIPS: source = gobject.markup_escape_text(source) Modified: trunk/src/common/contacts.py =================================================================== --- trunk/src/common/contacts.py 2008-07-25 16:51:26 UTC (rev 10032) +++ trunk/src/common/contacts.py 2008-07-26 01:16:24 UTC (rev 10033) @@ -81,8 +81,6 @@ return self.jid.split('@')[0] def get_shown_groups(self): - ''' - ''' if self.is_observer(): return [_('Observers')] elif self.is_groupchat(): @@ -132,7 +130,8 @@ class GC_Contact: '''Information concerning each groupchat contact''' def __init__(self, room_jid='', name='', show='', status='', role='', - affiliation='', jid = '', resource = ''): + affiliation='', jid = '', resource = '', our_chatstate = None, + composing_xep = None, chatstate = None): self.room_jid = room_jid self.name = name self.show = show @@ -144,6 +143,9 @@ self.caps_node = None self.caps_hash_method = None self.caps_hash = None + self.our_chatstate = our_chatstate + self.composing_xep = composing_xep + self.chatstate = chatstate def get_full_jid(self): return self.room_jid + '/' + self.name

1 0

[commit-gajim] r10032 - trunk/src
by js＠gajim.org 25 Jul '08

25 Jul '08

Author: js Date: 2008-07-25 18:51:26 +0200 (Fri, 25 Jul 2008) New Revision: 10032 Modified: trunk/src/tooltips.py Log: If I add that missing quote, I should add it at the right place... Modified: trunk/src/tooltips.py =================================================================== --- trunk/src/tooltips.py 2008-07-25 16:44:20 UTC (rev 10031) +++ trunk/src/tooltips.py 2008-07-25 16:51:26 UTC (rev 10032) @@ -621,7 +621,7 @@ else: source = _('Unknown Source') tune_string = _('Tune:') + ' ' + \ - _('"%(title)s" by %(artist)s\n' + + _('"%(title)s" by %(artist)s\n' + 'from %(source)s') % {'title': title, 'artist': artist, 'source': source} properties.append((tune_string, None))

1 0

[commit-gajim] r10031 - trunk/src
by js＠gajim.org 25 Jul '08

25 Jul '08

Author: js Date: 2008-07-25 18:44:20 +0200 (Fri, 25 Jul 2008) New Revision: 10031 Modified: trunk/src/tooltips.py Log: Oops, killed that quote by mistake. Modified: trunk/src/tooltips.py =================================================================== --- trunk/src/tooltips.py 2008-07-25 14:11:14 UTC (rev 10030) +++ trunk/src/tooltips.py 2008-07-25 16:44:20 UTC (rev 10031) @@ -621,7 +621,7 @@ else: source = _('Unknown Source') tune_string = _('Tune:') + ' ' + \ - _('"%(title)s by %(artist)s\n' + + _('"%(title)s" by %(artist)s\n' + 'from %(source)s') % {'title': title, 'artist': artist, 'source': source} properties.append((tune_string, None))

1 0

[commit-gajim] r10030 - in trunk: data/glade src src/common
by js＠gajim.org 25 Jul '08

25 Jul '08

Author: js Date: 2008-07-25 16:11:14 +0200 (Fri, 25 Jul 2008) New Revision: 10030 Modified: trunk/data/glade/preferences_window.glade trunk/src/common/config.py trunk/src/common/pep.py trunk/src/config.py trunk/src/roster_window.py Log: Show tunes in roster. Modified: trunk/data/glade/preferences_window.glade =================================================================== --- trunk/data/glade/preferences_window.glade 2008-07-25 10:50:56 UTC (rev 10029) +++ trunk/data/glade/preferences_window.glade 2008-07-25 14:11:14 UTC (rev 10030) @@ -90,6 +90,23 @@ </packing> </child> <child> + <widget class="GtkCheckButton" id="show_tunes_in_roster_checkbutton"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="tooltip" translatable="yes">If checked, Gajim will display the tunes of contacts in the roster window</property> + <property name="label" translatable="yes">Display _tunes of contacts in roster</property> + <property name="use_underline">True</property> + <property name="response_id">0</property> + <property name="draw_indicator">True</property> + <signal name="toggled" handler="on_show_tunes_in_roster_checkbutton_toggled"/> + </widget> + <packing> + <property name="expand">False</property> + <property name="fill">False</property> + <property name="position">3</property> + </packing> + </child> + <child> <widget class="GtkCheckButton" id="sort_by_show_checkbutton"> <property name="visible">True</property> <property name="can_focus">True</property> @@ -103,7 +120,7 @@ <packing> <property name="expand">False</property> <property name="fill">False</property> - <property name="position">3</property> + <property name="position">4</property> </packing> </child> </widget> @@ -203,7 +220,7 @@ <widget class="GtkCheckButton" id="compact_view_checkbutton"> <property name="can_focus">True</property> <property name="tooltip" translatable="yes">Hide all buttons in chat windows</property> - <property name="label" translatable="yes">_Make message windows compact</property> + <property name="label" translatable="yes">Ma_ke message windows compact</property> <property name="use_underline">True</property> <property name="response_id">0</property> <property name="draw_indicator">True</property> Modified: trunk/src/common/config.py =================================================================== --- trunk/src/common/config.py 2008-07-25 10:50:56 UTC (rev 10029) +++ trunk/src/common/config.py 2008-07-25 14:11:14 UTC (rev 10030) @@ -214,6 +214,7 @@ 'show_status_msgs_in_roster': [opt_bool, True, _('If True, Gajim will display the status message, if not empty, for every contact under the contact name in roster window.'), True], 'show_avatars_in_roster': [opt_bool, True, '', True], 'show_mood_in_roster': [opt_bool, True, '', True], + 'show_tunes_in_roster': [opt_bool, True, '', True], 'avatar_position_in_roster': [opt_str, 'right', _('Define the position of the avatar in roster. Can be left or right'), True], 'ask_avatars_on_startup': [opt_bool, True, _('If True, Gajim will ask for avatar each contact that did not have an avatar last time or has one cached that is too old.')], 'print_status_in_chats': [opt_bool, True, _('If False, Gajim will no longer print status line in chats when a contact changes his or her status and/or his or her status message.')], Modified: trunk/src/common/pep.py =================================================================== --- trunk/src/common/pep.py 2008-07-25 10:50:56 UTC (rev 10029) +++ trunk/src/common/pep.py 2008-07-25 14:11:14 UTC (rev 10030) @@ -167,9 +167,13 @@ if contact.tune.has_key('length'): del contact.tune['length'] - ctrl = gajim.interface.msg_win_mgr.get_control(user, name) - if ctrl: - ctrl.update_tune() + if jid == gajim.get_jid_from_account(name): + gajim.interface.roster.draw_account(name) + else: + gajim.interface.roster.draw_tune(user, name) + ctrl = gajim.interface.msg_win_mgr.get_control(user, name) + if ctrl: + ctrl.update_tune() def user_geoloc(items, name, jid): pass Modified: trunk/src/config.py =================================================================== --- trunk/src/config.py 2008-07-25 10:50:56 UTC (rev 10029) +++ trunk/src/config.py 2008-07-25 14:11:14 UTC (rev 10030) @@ -105,6 +105,11 @@ self.xml.get_widget('show_mood_in_roster_checkbutton'). \ set_active(st) + # Display tunes in roster + st = gajim.config.get('show_tunes_in_roster') + self.xml.get_widget('show_tunes_in_roster_checkbutton'). \ + set_active(st) + # Sort contacts by show st = gajim.config.get('sort_by_show') self.xml.get_widget('sort_by_show_checkbutton').set_active(st) @@ -537,6 +542,10 @@ self.on_checkbutton_toggled(widget, 'show_mood_in_roster') gajim.interface.roster.setup_and_draw_roster() + def on_show_tunes_in_roster_checkbutton_toggled(self, widget): + self.on_checkbutton_toggled(widget, 'show_tunes_in_roster') + gajim.interface.roster.setup_and_draw_roster() + def on_sort_by_show_checkbutton_toggled(self, widget): self.on_checkbutton_toggled(widget, 'sort_by_show') gajim.interface.roster.setup_and_draw_roster() Modified: trunk/src/roster_window.py =================================================================== --- trunk/src/roster_window.py 2008-07-25 10:50:56 UTC (rev 10029) +++ trunk/src/roster_window.py 2008-07-25 14:11:14 UTC (rev 10030) @@ -77,9 +77,10 @@ C_JID, # the jid of the row C_ACCOUNT, # cellrenderer text that holds account name C_MOOD_PIXBUF, +C_TUNE_PIXBUF, C_AVATAR_PIXBUF, # avatar_pixbuf C_PADLOCK_PIXBUF, # use for account row only -) = range(8) +) = range(9) class RosterWindow: '''Class for main window of the GTK+ interface''' @@ -289,7 +290,7 @@ self.model.append(None, [ gajim.interface.jabber_state_images['16'][show], _('Merged accounts'), 'account', '', 'all', - None, None, None]) + None, None, None, None]) else: show = gajim.SHOW_LIST[gajim.connections[account]. \ connected] @@ -305,7 +306,7 @@ self.model.append(None, [ gajim.interface.jabber_state_images['16'][show], gobject.markup_escape_text(account), 'account', - our_jid, account, None, None, tls_pixbuf]) + our_jid, account, None, None, None, tls_pixbuf]) self.draw_account(account) @@ -368,7 +369,8 @@ for child_iter in parent_iters: it = self.model.append(child_iter, (None, contact.get_shown_name(), 'contact', - contact.jid, account, None, None, None)) + contact.jid, account, None, None, None, + None)) added_iters.append(it) else: # We are a normal contact. Add us to our groups. @@ -387,7 +389,7 @@ ['closed'], gobject. \ markup_escape_text(group), 'group', group, account, None, - None, None]) + None, None, None]) self.draw_group(group, account) if contact.is_transport(): @@ -401,7 +403,8 @@ # for more i_ = self.model.append(child_iterG, (None, contact.get_shown_name(), typestr, - contact.jid, account, None, None, None)) + contact.jid, account, None, None, None, + None)) added_iters.append(i_) # Restore the group expand state @@ -609,6 +612,7 @@ for c, acc in brothers: self.draw_contact(c.jid, acc) self.draw_mood(c.jid, acc) + self.draw_tune(c.jid, acc) self.draw_avatar(c.jid, acc) @@ -650,10 +654,11 @@ child_iterA = self._get_account_iter(account, self.model) self.model.append(child_iterA, (None, gajim.nicks[account], - 'self_contact', jid, account, None, None, None)) + 'self_contact', jid, account, None, None, None, None)) self.draw_contact(jid, account) self.draw_mood(jid, account) + self.draw_tune(jid, account) self.draw_avatar(jid, account) self.draw_account(account) @@ -712,6 +717,7 @@ for c, acc in contacts: self.draw_contact(c.jid, acc) self.draw_mood(c.jid, acc) + self.draw_tune(c.jid, acc) self.draw_avatar(c.jid, acc) for group in contact.get_shown_groups(): self.draw_group(group, account) @@ -769,6 +775,7 @@ for c, acc in brothers: self.draw_contact(c.jid, acc) self.draw_mood(c.jid, acc) + self.draw_tune(c.jid, acc) self.draw_avatar(c.jid, acc) # Draw all groups of the contact @@ -989,6 +996,15 @@ else: self.model[child_iter][C_MOOD_PIXBUF] = None + if gajim.config.get('show_tunes_in_roster') \ + and (gajim.connections[account].tune.has_key('artist') \ + or gajim.connections[account].tune.has_key('title')): + self.model[child_iter][C_TUNE_PIXBUF] = \ + gtk.gdk.pixbuf_new_from_file( + '../data/emoticons/static/music.png') + else: + self.model[child_iter][C_TUNE_PIXBUF] = None + return False def draw_group(self, group, account): @@ -1233,6 +1249,24 @@ return False + def draw_tune(self, jid, account): + iters = self._get_contact_iter(jid, account, model = self.model) + if not iters or not gajim.config.get('show_tunes_in_roster'): + return + jid = self.model[iters[0]][C_JID] + jid = jid.decode('utf-8') + contact = gajim.contacts.get_contact(account, jid) + if contact.tune.has_key('artist') \ + or contact.tune.has_key('title'): + pixbuf = gtk.gdk.pixbuf_new_from_file( + '../data/emoticons/static/music.png') + else: + pixbuf = None + for child_iter in iters: + self.model[child_iter][C_TUNE_PIXBUF] = pixbuf + return False + + def draw_avatar(self, jid, account): iters = self._get_contact_iter(jid, account, model = self.model) if not iters or not gajim.config.get('show_avatars_in_roster'): @@ -1280,6 +1314,7 @@ for jid in jids: self.draw_contact(jid, account) self.draw_mood(jid, account) + self.draw_tune(jid, account) self.draw_avatar(jid, account) yield True yield False @@ -1293,7 +1328,8 @@ # (icon, name, type, jid, account, editable, mood_pixbuf, # avatar_pixbuf, padlock_pixbuf) self.model = gtk.TreeStore(gtk.Image, str, str, str, str, - gtk.gdk.Pixbuf, gtk.gdk.Pixbuf, gtk.gdk.Pixbuf) + gtk.gdk.Pixbuf, gtk.gdk.Pixbuf, gtk.gdk.Pixbuf, + gtk.gdk.Pixbuf) self.model.set_sort_func(1, self._compareIters) self.model.set_sort_column_id(1, gtk.SORT_ASCENDING) @@ -3696,6 +3732,7 @@ for c, acc in brothers: self.draw_contact(c.jid, acc) self.draw_mood(c.jid, acc) + self.draw_tune(c.jid, acc) self.draw_avatar(c.jid, acc) old_groups.extend(c_dest.groups) @@ -4256,6 +4293,59 @@ renderer.set_property('xalign', 1) + def _fill_tune_pixbuf_rederer(self, column, renderer, model, titer, + data = None): + '''When a row is added, set properties for avatar renderer''' + theme = gajim.config.get('roster_theme') + type_ = model[titer][C_TYPE] + if type_ == 'group': + renderer.set_property('visible', False) + return + + # allocate space for the icon only if needed + if model[titer][C_TUNE_PIXBUF]: + renderer.set_property('visible', True) + else: + renderer.set_property('visible', False) + if type_ == 'account': + color = gajim.config.get_per('themes', theme, + 'accountbgcolor') + if color: + renderer.set_property('cell-background', color) + else: + self.set_renderer_color(renderer, + gtk.STATE_ACTIVE) + # align pixbuf to the right) + renderer.set_property('xalign', 1) + # prevent type_ = None, see http://trac.gajim.org/ticket/2534 + elif type_: + if not model[titer][C_JID] \ + or not model[titer][C_ACCOUNT]: + # This can append at the moment we add the row + return + jid = model[titer][C_JID].decode('utf-8') + account = model[titer][C_ACCOUNT].decode('utf-8') + if jid in gajim.newly_added[account]: + renderer.set_property('cell-background', + gajim.config.get( + 'just_connected_bg_color')) + elif jid in gajim.to_be_removed[account]: + renderer.set_property('cell-background', + gajim.config.get( + 'just_disconnected_bg_color')) + else: + color = gajim.config.get_per('themes', + theme, 'contactbgcolor') + if color: + renderer.set_property( + 'cell-background', color) + else: + renderer.set_property( + 'cell-background', None) + # align pixbuf to the right + renderer.set_property('xalign', 1) + + def _fill_avatar_pixbuf_rederer(self, column, renderer, model, titer, data = None): '''When a row is added, set properties for avatar renderer''' @@ -6066,6 +6156,12 @@ col.set_cell_data_func(render_pixbuf, self._fill_mood_pixbuf_rederer, None) + render_pixbuf = gtk.CellRendererPixbuf() + col.pack_start(render_pixbuf, expand = False) + col.add_attribute(render_pixbuf, 'pixbuf', C_TUNE_PIXBUF) + col.set_cell_data_func(render_pixbuf, + self._fill_tune_pixbuf_rederer, None) + if gajim.config.get('avatar_position_in_roster') == 'right': add_avatar_renderer()

1 0

← Newer
1
...
4
5
6
7
8
9
10
...
23
Older →

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 July 2008