Commits November 2008

commits@gajim.org

6 participants
147 discussions

[commit-gajim] r10731 - in branches/gajim_0.12: . po src src/common src/common/xmpp src/common/zeroconf
by asterix＠gajim.org 30 Nov '08

30 Nov '08

Author: asterix Date: 2008-11-30 23:14:50 +0100 (Sun, 30 Nov 2008) New Revision: 10731 Removed: branches/gajim_0.12/config.h.in Modified: branches/gajim_0.12/gajim.nsi branches/gajim_0.12/po/de.po branches/gajim_0.12/po/fr.po branches/gajim_0.12/setup_win32.py branches/gajim_0.12/src/chat_control.py branches/gajim_0.12/src/common/connection.py branches/gajim_0.12/src/common/connection_handlers.py branches/gajim_0.12/src/common/gajim.py branches/gajim_0.12/src/common/helpers.py branches/gajim_0.12/src/common/pep.py branches/gajim_0.12/src/common/pubsub.py branches/gajim_0.12/src/common/socks5.py branches/gajim_0.12/src/common/xmpp/auth_nb.py branches/gajim_0.12/src/common/xmpp/dispatcher_nb.py branches/gajim_0.12/src/common/xmpp/protocol.py branches/gajim_0.12/src/common/xmpp/simplexml.py branches/gajim_0.12/src/common/xmpp/transports_nb.py branches/gajim_0.12/src/common/zeroconf/connection_zeroconf.py branches/gajim_0.12/src/conversation_textview.py branches/gajim_0.12/src/dialogs.py branches/gajim_0.12/src/features_window.py branches/gajim_0.12/src/gajim.py branches/gajim_0.12/src/music_track_listener.py branches/gajim_0.12/src/notify.py branches/gajim_0.12/src/roster_window.py branches/gajim_0.12/src/session.py branches/gajim_0.12/src/statusicon.py Log: merge bugfixes from trunk (r10670 r10672 r10674 r10676 r10679 r10680 r10685 r10687 r10688 r10692 r10693 r10694 r10695 r10696 r10697 r10698 r10699 r10700 r10701 r10702 r10703 r10704 r10705 r10706 r10707 r10709 r10710 r10711 r10712 r10713 r10719 r10720 r10722 r10723 r10724 r10725 r10726 r10727 r10728 r10729 r10730) Deleted: branches/gajim_0.12/config.h.in =================================================================== --- branches/gajim_0.12/config.h.in 2008-11-30 21:37:50 UTC (rev 10730) +++ branches/gajim_0.12/config.h.in 2008-11-30 22:14:50 UTC (rev 10731) @@ -1,91 +0,0 @@ -/* config.h.in. Generated from configure.ac by autoheader. */ - -/* always defined to indicate that i18n is enabled */ -#undef ENABLE_NLS - -/* Gettext package */ -#undef GETTEXT_PACKAGE - -/* Define to 1 if you have the `bind_textdomain_codeset' function. */ -#undef HAVE_BIND_TEXTDOMAIN_CODESET - -/* Define to 1 if you have the `dcgettext' function. */ -#undef HAVE_DCGETTEXT - -/* Define to 1 if you have the <dlfcn.h> header file. */ -#undef HAVE_DLFCN_H - -/* Define if the GNU gettext() function is already present or preinstalled. */ -#undef HAVE_GETTEXT - -/* Define to 1 if you have the <inttypes.h> header file. */ -#undef HAVE_INTTYPES_H - -/* Define if your <locale.h> file defines LC_MESSAGES. */ -#undef HAVE_LC_MESSAGES - -/* Define to 1 if you have the <libintl.h> header file. */ -#undef HAVE_LIBINTL_H - -/* Define to 1 if you have the `X11' library (-lX11). */ -#undef HAVE_LIBX11 - -/* Define to 1 if you have the `Xext' library (-lXext). */ -#undef HAVE_LIBXEXT - -/* Define to 1 if you have the `Xss' library (-lXss). */ -#undef HAVE_LIBXSS - -/* Define to 1 if you have the <locale.h> header file. */ -#undef HAVE_LOCALE_H - -/* Define to 1 if you have the <memory.h> header file. */ -#undef HAVE_MEMORY_H - -/* Define to 1 if you have the <stdint.h> header file. */ -#undef HAVE_STDINT_H - -/* Define to 1 if you have the <stdlib.h> header file. */ -#undef HAVE_STDLIB_H - -/* Define to 1 if you have the <strings.h> header file. */ -#undef HAVE_STRINGS_H - -/* Define to 1 if you have the <string.h> header file. */ -#undef HAVE_STRING_H - -/* Define to 1 if you have the <sys/stat.h> header file. */ -#undef HAVE_SYS_STAT_H - -/* Define to 1 if you have the <sys/types.h> header file. */ -#undef HAVE_SYS_TYPES_H - -/* Define to 1 if you have the <unistd.h> header file. */ -#undef HAVE_UNISTD_H - -/* Name of package */ -#undef PACKAGE - -/* Define to the address where bug reports for this package should be sent. */ -#undef PACKAGE_BUGREPORT - -/* Define to the full name of this package. */ -#undef PACKAGE_NAME - -/* Define to the full name and version of this package. */ -#undef PACKAGE_STRING - -/* Define to the one symbol short name of this package. */ -#undef PACKAGE_TARNAME - -/* Define to the version of this package. */ -#undef PACKAGE_VERSION - -/* Define to 1 if you have the ANSI C header files. */ -#undef STDC_HEADERS - -/* Version number of package */ -#undef VERSION - -/* Define to empty if `const' does not conform to ANSI C. */ -#undef const Modified: branches/gajim_0.12/gajim.nsi =================================================================== --- branches/gajim_0.12/gajim.nsi 2008-11-30 21:37:50 UTC (rev 10730) +++ branches/gajim_0.12/gajim.nsi 2008-11-30 22:14:50 UTC (rev 10731) @@ -146,21 +146,21 @@ File "THANKS.artists" SetOutPath "$INSTDIR\bin" - File "bin\_cairo.pyd" + File "bin\cairo._cairo.pyd" File "bin\_ctypes.pyd" - File "bin\_gobject.pyd" - File "bin\_gtk.pyd" + File "bin\gobject._gobject.pyd" + File "bin\gtk._gtk.pyd" File "bin\_hashlib.pyd" File "bin\_socket.pyd" File "bin\_sqlite3.pyd" File "bin\_ssl.pyd" File "bin\_win32sysloader.pyd" - File "bin\AES.pyd" + File "bin\Crypto.Cipher.AES.pyd" File "bin\atk.pyd" File "bin\bz2.pyd" - File "bin\crypto.pyd" + File "bin\OpenSSL.crypto.pyd" File "bin\gajim.exe" - File "bin\glade.pyd" + File "bin\gtk.glade.pyd" File "bin\history_manager.exe" File "bin\libeay32.dll" File "bin\libglade-2.0-0.dll" @@ -172,12 +172,12 @@ File "bin\pyexpat.pyd" File "bin\python25.dll" File "bin\pywintypes25.dll" - File "bin\rand.pyd" + File "bin\OpenSSL.rand.pyd" File "bin\select.pyd" - File "bin\SHA256.pyd" + File "bin\Crypto.Hash.SHA256.pyd" File "bin\sqlite3.dll" File "bin\ssleay32.dll" - File "bin\SSL.pyd" + File "bin\OpenSSL.SSL.pyd" File "bin\unicodedata.pyd" File "bin\w9xpopen.exe" File "bin\win32api.pyd" Modified: branches/gajim_0.12/po/de.po =================================================================== --- branches/gajim_0.12/po/de.po 2008-11-30 21:37:50 UTC (rev 10730) +++ branches/gajim_0.12/po/de.po 2008-11-30 22:14:50 UTC (rev 10731) @@ -9418,7 +9418,7 @@ #: ../src/systray.py:322 msgid "Hide this menu" -msgstr "Versteckt dieses Menü" +msgstr "Dieses Menü ausblenden" #: ../src/tooltips.py:327 ../src/tooltips.py:521 msgid "Jabber ID: " Modified: branches/gajim_0.12/po/fr.po =================================================================== --- branches/gajim_0.12/po/fr.po 2008-11-30 21:37:50 UTC (rev 10730) +++ branches/gajim_0.12/po/fr.po 2008-11-30 22:14:50 UTC (rev 10731) @@ -8407,7 +8407,7 @@ #: ../src/groupchat_control.py:603 msgid "Conversation with " -msgstr "Conversation avec" +msgstr "Conversation avec " #: ../src/groupchat_control.py:605 msgid "Continued conversation" Modified: branches/gajim_0.12/setup_win32.py =================================================================== --- branches/gajim_0.12/setup_win32.py 2008-11-30 21:37:50 UTC (rev 10730) +++ branches/gajim_0.12/setup_win32.py 2008-11-30 22:14:50 UTC (rev 10731) @@ -41,7 +41,7 @@ else: fill_docutils_files(os.path.join(sys.prefix, 'Lib', 'site-packages')) docutils_files.append((os.path.join('docutils', 'writers', 'html4css1'), - glob.glob(os.path.join(sys.prefix, 'Lib', 'site-packages', 'docutils', + glob.glob(os.path.join(sys.prefix, 'Lib', 'site-packages', 'docutils', 'writers', 'html4css1', '*.css')))) sys.path.append('src') @@ -52,7 +52,7 @@ opts = { 'py2exe': { # ConfigParser,UserString,roman are needed for docutils - 'includes': 'pango,atk,gobject,cairo,pangocairo,gtk.keysyms,encodings,encodings.*,ConfigParser,UserString,roman', + 'includes': 'pango,atk,gobject,cairo,pangocairo,gtk.keysyms,encodings,encodings.*,ConfigParser,UserString', 'dll_excludes': [ 'iconv.dll','intl.dll','libatk-1.0-0.dll', 'libgdk_pixbuf-2.0-0.dll','libgdk-win32-2.0-0.dll', Modified: branches/gajim_0.12/src/chat_control.py =================================================================== --- branches/gajim_0.12/src/chat_control.py 2008-11-30 21:37:50 UTC (rev 10730) +++ branches/gajim_0.12/src/chat_control.py 2008-11-30 22:14:50 UTC (rev 10731) @@ -49,8 +49,8 @@ from common.logger import Constants constants = Constants() from common.pep import MOODS, ACTIVITIES -from common.xmpp.protocol import NS_XHTML, NS_FILE, NS_MUC, NS_RECEIPTS -from common.xmpp.protocol import NS_ESESSION +from common.xmpp.protocol import NS_XHTML, NS_XHTML_IM, NS_FILE, NS_MUC +from common.xmpp.protocol import NS_RECEIPTS, NS_ESESSION try: import gtkspell @@ -993,13 +993,13 @@ def got_connected(self): self.msg_textview.set_sensitive(True) self.msg_textview.set_editable(True) - self.xml.get_widget('send_button').set_sensitive(True) + # FIXME: Set sensitivity for toolbar def got_disconnected(self): self.msg_textview.set_sensitive(False) self.msg_textview.set_editable(False) self.conv_textview.tv.grab_focus() - self.xml.get_widget('send_button').set_sensitive(False) + # FIXME: Set sensitivity for toolbar ################################################################################ class ChatControl(ChatControlBase): @@ -1018,6 +1018,8 @@ id = self.actions_button.connect('clicked', self.on_actions_button_clicked) self.handlers[id] = self.actions_button + self._formattings_button = self.xml.get_widget('formattings_button') + self._add_to_roster_button = self.xml.get_widget( 'add_to_roster_button') id = self._add_to_roster_button.connect('clicked', @@ -1164,6 +1166,13 @@ self.msg_textview.grab_focus() def update_toolbar(self): + # Formatting + if gajim.capscache.is_supported(self.contact, NS_XHTML_IM) \ + and not gajim.capscache.is_supported(self.contact, 'notexistant'): + self._formattings_button.set_sensitive(True) + else: + self._formattings_button.set_sensitive(False) + # Add to roster if not isinstance(self.contact, GC_Contact) \ and _('Not in Roster') in self.contact.groups: @@ -2570,12 +2579,17 @@ def _on_toggle_e2e_menuitem_activate(self, widget): if self.session and self.session.enable_encryption: + # e2e was enabled, disable it jid = str(self.session.jid) thread_id = self.session.thread_id self.session.terminate_e2e() gajim.connections[self.account].delete_session(jid, thread_id) + + # presumably the user had a good reason to shut it off, so + # disable autonegotiation too + self.no_autonegotiation = True else: self.begin_e2e_negotiation() Modified: branches/gajim_0.12/src/common/connection.py =================================================================== --- branches/gajim_0.12/src/common/connection.py 2008-11-30 21:37:50 UTC (rev 10730) +++ branches/gajim_0.12/src/common/connection.py 2008-11-30 22:14:50 UTC (rev 10731) @@ -153,7 +153,7 @@ self.blocked_list = [] self.blocked_contacts = [] self.blocked_groups = [] - self.music_track_info = None + self.music_track_info = 0 self.pep_supported = False self.mood = {} self.tune = {} @@ -378,7 +378,7 @@ elif event == common.xmpp.transports.DATA_SENT: self.dispatch('STANZA_SENT', unicode(data)) - def select_next_host(self, hosts): + def _select_next_host(self, hosts): '''Chooses best 'real' host basing on the SRV priority and weight data; more info in RFC2782''' hosts_best_prio = [] @@ -510,7 +510,7 @@ ssl_p = gajim.config.get_per('accounts', self.name, 'custom_port') for i in self._hosts: i['ssl_port'] = ssl_p - self.connect_to_next_host() + self._connect_to_next_host() def on_proxy_failure(self, reason): log.debug('Connection to proxy failed') @@ -521,7 +521,7 @@ self.dispatch('CONNECTION_LOST', (_('Connection to proxy failed'), reason)) - def connect_to_next_type(self, retry=False): + def _connect_to_next_type(self, retry=False): log.debug('Connection to next type') if len(self._connection_types): self._current_type = self._connection_types.pop(0) @@ -537,12 +537,12 @@ con = common.xmpp.NonBlockingClient(self._hostname, debug = d, caller = self, on_connect = self.on_connect_success, on_proxy_failure = self.on_proxy_failure, - on_connect_failure = self.connect_to_next_type) + on_connect_failure = self._connect_to_next_type) else: con = common.xmpp.NonBlockingClient(self._hostname, debug = [], caller = self, on_connect = self.on_connect_success, on_proxy_failure = self.on_proxy_failure, - on_connect_failure = self.connect_to_next_type) + on_connect_failure = self._connect_to_next_type) self.last_connection = con # increase default timeout for server responses common.xmpp.dispatcher_nb.DEFAULT_TIMEOUT_SECONDS = self.try_connecting_for_foo_secs @@ -565,9 +565,9 @@ con.connect((self._current_host['host'], port), proxy=self._proxy, secure = secur) else: - self.connect_to_next_host(retry) + self._connect_to_next_host(retry) - def connect_to_next_host(self, retry = False): + def _connect_to_next_host(self, retry = False): log.debug('Connection to next host') if len(self._hosts): # No config option exist when creating a new account @@ -581,10 +581,10 @@ 'connection_types').split() else: self._connection_types = ['tls', 'ssl', 'plain'] - host = self.select_next_host(self._hosts) + host = self._select_next_host(self._hosts) self._current_host = host self._hosts.remove(host) - self.connect_to_next_type() + self._connect_to_next_type() else: if not retry and self.retrycount == 0: @@ -619,7 +619,7 @@ if _con_type == 'tcp': _con_type = 'plain' if _con_type != self._current_type: - self.connect_to_next_type() + self._connect_to_next_type() return con.RegisterDisconnectHandler(self._on_disconnected) if _con_type == 'plain' and gajim.config.get_per('accounts', self.name, @@ -1075,7 +1075,8 @@ original_message=None, delayed=None): if not self.connection: return 1 - if msg and not xhtml and gajim.config.get('rst_formatting_outgoing_messages'): + if msg and not xhtml and gajim.config.get( + 'rst_formatting_outgoing_messages'): from common.rst_xhtml_generator import create_xhtml xhtml = create_xhtml(msg) if not msg and chatstate is None and form_node is None: @@ -1109,11 +1110,6 @@ tim = localtime() self.dispatch('MSGNOTSENT', (jid, error, msgtxt, tim, session)) return 3 - if msgtxt and not xhtml and gajim.config.get( - 'rst_formatting_outgoing_messages'): - # Generate a XHTML part using reStructured text markup - from common.rst_xhtml_generator import create_xhtml - xhtml = create_xhtml(msgtxt) if type_ == 'chat': msg_iq = common.xmpp.Message(to = fjid, body = msgtxt, typ = type_, xhtml = xhtml) Modified: branches/gajim_0.12/src/common/connection_handlers.py =================================================================== --- branches/gajim_0.12/src/common/connection_handlers.py 2008-11-30 21:37:50 UTC (rev 10730) +++ branches/gajim_0.12/src/common/connection_handlers.py 2008-11-30 22:14:50 UTC (rev 10731) @@ -2179,12 +2179,18 @@ keyID, timestamp, None)) if ptype == 'unavailable' and jid_stripped in self.sessions: - # automatically terminate sessions that they haven't sent a thread ID in + # automatically terminate sessions that they haven't sent a thread ID + # in, only if other part support thread ID for sess in self.sessions[jid_stripped].values(): if not sess.received_thread_id: - sess.terminate() - del self.sessions[jid_stripped][sess.thread_id] + contact = gajim.contacts.get_contact(self.name, jid_stripped) + session_supported = gajim.capscache.is_supported(contact, + common.xmpp.NS_SSN) + if session_supported: + sess.terminate() + del self.sessions[jid_stripped][sess.thread_id] + if avatar_sha is not None and ptype != 'error': if jid_stripped not in self.vcard_shas: cached_vcard = self.get_cached_vcard(jid_stripped) Modified: branches/gajim_0.12/src/common/gajim.py =================================================================== --- branches/gajim_0.12/src/common/gajim.py 2008-11-30 21:37:50 UTC (rev 10730) +++ branches/gajim_0.12/src/common/gajim.py 2008-11-30 22:14:50 UTC (rev 10731) @@ -180,7 +180,7 @@ xmpp.NS_MUC_CONFIG, xmpp.NS_COMMANDS, xmpp.NS_DISCO_INFO, 'ipv6', 'jabber:iq:gateway', xmpp.NS_LAST, xmpp.NS_PRIVACY, xmpp.NS_PRIVATE, xmpp.NS_REGISTER, xmpp.NS_VERSION, xmpp.NS_DATA, xmpp.NS_ENCRYPTED, 'msglog', - 'sslc2s', 'stringprep', xmpp.NS_PING, xmpp.NS_TIME_REVISED, xmpp.NS_GAMING, + 'sslc2s', 'stringprep', xmpp.NS_PING, xmpp.NS_TIME_REVISED, xmpp.NS_SSN, xmpp.NS_MOOD, xmpp.NS_ACTIVITY, xmpp.NS_NICK] # Optional features gajim supports per account Modified: branches/gajim_0.12/src/common/helpers.py =================================================================== --- branches/gajim_0.12/src/common/helpers.py 2008-11-30 21:37:50 UTC (rev 10730) +++ branches/gajim_0.12/src/common/helpers.py 2008-11-30 22:14:50 UTC (rev 10731) @@ -795,7 +795,7 @@ return 'Windows' elif os.name == 'posix': executable = 'lsb_release' - params = ' --id --codename --release --short' + params = ' --description --codename --release --short' full_path_to_executable = is_in_path(executable, return_abs_path = True) if full_path_to_executable: command = executable + params Modified: branches/gajim_0.12/src/common/pep.py =================================================================== --- branches/gajim_0.12/src/common/pep.py 2008-11-30 21:37:50 UTC (rev 10730) +++ branches/gajim_0.12/src/common/pep.py 2008-11-30 22:14:50 UTC (rev 10731) @@ -459,8 +459,7 @@ contact.contact_name = nick gajim.interface.roster.draw_contact(user, name) - ctrl = gajim.interface.msg_win_mgr.get_control(user, - name) + ctrl = gajim.interface.msg_win_mgr.get_control(user, name) if ctrl: ctrl.update_ui() win = ctrl.parent_win @@ -469,7 +468,7 @@ elif retract: contact.contact_name = '' -def user_send_mood(account, mood, message = ''): +def user_send_mood(account, mood, message=''): if not gajim.connections[account].pep_supported: return item = xmpp.Node('mood', {'xmlns': xmpp.NS_MOOD}) @@ -481,7 +480,7 @@ gajim.connections[account].send_pb_publish('', xmpp.NS_MOOD, item, '0') -def user_send_activity(account, activity, subactivity = '', message = ''): +def user_send_activity(account, activity, subactivity='', message=''): if not gajim.connections[account].pep_supported: return item = xmpp.Node('activity', {'xmlns': xmpp.NS_ACTIVITY}) @@ -493,11 +492,10 @@ i = item.addChild('text') i.addData(message) - gajim.connections[account].send_pb_publish('', xmpp.NS_ACTIVITY, - item, '0') + gajim.connections[account].send_pb_publish('', xmpp.NS_ACTIVITY, item, '0') -def user_send_tune(account, artist = '', title = '', source = '', track = 0, -length = 0, items = None): +def user_send_tune(account, artist='', title='', source='', track=0, length=0, +items=None): if not (gajim.config.get_per('accounts', account, 'publish_tune') and \ gajim.connections[account].pep_supported): return @@ -549,6 +547,7 @@ acc = gajim.connections[name] del acc.activity acc.activity = {} + user_send_tune(name) del acc.tune acc.tune = {} del acc.mood Modified: branches/gajim_0.12/src/common/pubsub.py =================================================================== --- branches/gajim_0.12/src/common/pubsub.py 2008-11-30 21:37:50 UTC (rev 10730) +++ branches/gajim_0.12/src/common/pubsub.py 2008-11-30 22:14:50 UTC (rev 10731) @@ -30,6 +30,8 @@ self.__callbacks={} def send_pb_subscription_query(self, jid, cb, *args, **kwargs): + if not self.connection or self.connected < 2: + return query = xmpp.Iq('get', to=jid) pb = query.addChild('pubsub', {'xmlns': xmpp.NS_PUBSUB}) pb.addChild('subscriptions') @@ -39,6 +41,8 @@ self.__callbacks[id]=(cb, args, kwargs) def send_pb_subscribe(self, jid, node, cb, *args, **kwargs): + if not self.connection or self.connected < 2: + return our_jid = gajim.get_jid_from_account(self.name) query = xmpp.Iq('set', to=jid) pb = query.addChild('pubsub', namespace=xmpp.NS_PUBSUB) @@ -49,6 +53,8 @@ self.__callbacks[id]=(cb, args, kwargs) def send_pb_unsubscribe(self, jid, node, cb, *args, **kwargs): + if not self.connection or self.connected < 2: + return our_jid = gajim.get_jid_from_account(self.name) query = xmpp.Iq('set', to=jid) pb = query.addChild('pubsub', namespace=xmpp.NS_PUBSUB) @@ -60,6 +66,8 @@ def send_pb_publish(self, jid, node, item, id_): '''Publish item to a node.''' + if not self.connection or self.connected < 2: + return query = xmpp.Iq('set', to=jid) e = query.addChild('pubsub', namespace=xmpp.NS_PUBSUB) e = e.addChild('publish', {'node': node}) @@ -69,6 +77,8 @@ def send_pb_retract(self, jid, node, id_): '''Delete item from a node''' + if not self.connection or self.connected < 2: + return query = xmpp.Iq('set', to=jid) r = query.addChild('pubsub', namespace=xmpp.NS_PUBSUB) r = r.addChild('retract', {'node': node, 'notify': '1'}) @@ -78,6 +88,8 @@ def send_pb_delete(self, jid, node): '''Deletes node.''' + if not self.connection or self.connected < 2: + return query = xmpp.Iq('set', to=jid) d = query.addChild('pubsub', namespace=xmpp.NS_PUBSUB) d = d.addChild('delete', {'node': node}) @@ -94,6 +106,8 @@ def send_pb_create(self, jid, node, configure = False, configure_form = None): '''Creates new node.''' + if not self.connection or self.connected < 2: + return query = xmpp.Iq('set', to=jid) c = query.addChild('pubsub', namespace=xmpp.NS_PUBSUB) c = c.addChild('create', {'node': node}) @@ -105,6 +119,8 @@ self.connection.send(query) def send_pb_configure(self, jid, node, form): + if not self.connection or self.connected < 2: + return query = xmpp.Iq('set', to=jid) c = query.addChild('pubsub', namespace=xmpp.NS_PUBSUB_OWNER) c = c.addChild('configure', {'node': node}) @@ -120,6 +136,8 @@ pass def request_pb_configuration(self, jid, node): + if not self.connection or self.connected < 2: + return query = xmpp.Iq('get', to=jid) e = query.addChild('pubsub', namespace=xmpp.NS_PUBSUB_OWNER) e = e.addChild('configure', {'node': node}) Modified: branches/gajim_0.12/src/common/socks5.py =================================================================== --- branches/gajim_0.12/src/common/socks5.py 2008-11-30 21:37:50 UTC (rev 10730) +++ branches/gajim_0.12/src/common/socks5.py 2008-11-30 22:14:50 UTC (rev 10731) @@ -68,7 +68,7 @@ self.error_cb = error_cb self.on_success = None self.on_failure = None - + def start_listener(self, port, sha_str, sha_handler, sid): ''' start waiting for incomming connections on (host, port) and do a socks5 authentication using sid for generated sha @@ -87,16 +87,16 @@ return None self.connected += 1 return self.listener - + def send_success_reply(self, file_props, streamhost): if 'streamhost-used' in file_props and \ - file_props['streamhost-used'] is True: - if 'proxyhosts' in file_props: - for proxy in file_props['proxyhosts']: - if proxy == streamhost: - self.on_success(streamhost) - return 2 - return 0 + file_props['streamhost-used'] is True: + if 'proxyhosts' in file_props: + for proxy in file_props['proxyhosts']: + if proxy == streamhost: + self.on_success(streamhost) + return 2 + return 0 if 'streamhosts' in file_props: for host in file_props['streamhosts']: if streamhost['state'] == 1: @@ -105,22 +105,21 @@ self.on_success(streamhost) return 1 return 0 - - def connect_to_hosts(self, account, sid, on_success = None, - on_failure = None): + + def connect_to_hosts(self, account, sid, on_success=None, on_failure=None): self.on_success = on_success self.on_failure = on_failure file_props = self.files_props[account][sid] file_props['failure_cb'] = on_failure - - # add streamhosts to the queue + + # add streamhosts to the queue for streamhost in file_props['streamhosts']: receiver = Socks5Receiver(self.idlequeue, streamhost, sid, file_props) self.add_receiver(account, receiver) streamhost['idx'] = receiver.queue_idx - + def _socket_connected(self, streamhost, file_props): - ''' called when there is a host connected to one of the + ''' called when there is a host connected to one of the senders's streamhosts. Stop othere attempts for connections ''' for host in file_props['streamhosts']: if host != streamhost and 'idx' in host: @@ -130,14 +129,14 @@ return # set state -2, meaning that this streamhost is stopped, # but it may be connectected later - if host['state'] >=0: + if host['state'] >= 0: self.remove_receiver(host['idx']) host['idx'] = -1 host['state'] = -2 - + def reconnect_receiver(self, receiver, streamhost): - ''' Check the state of all streamhosts and if all has failed, then - emit connection failure cb. If there are some which are still + ''' Check the state of all streamhosts and if all has failed, then + emit connection failure cb. If there are some which are still not connected try to establish connection to one of them. ''' self.idlequeue.remove_timeout(receiver.fd) @@ -156,7 +155,8 @@ for host in file_props['streamhosts']: if host['state'] == -2: host['state'] = 0 - receiver = Socks5Receiver(self.idlequeue, host, host['sid'], file_props) + receiver = Socks5Receiver(self.idlequeue, host, host['sid'], + file_props) self.add_receiver(receiver.account, receiver) host['idx'] = receiver.queue_idx # we still have chances to connect @@ -169,7 +169,7 @@ receiver.disconnect() file_props['error'] = -1 self.process_result(-1, receiver) - + def _connection_refused(self, streamhost, file_props, idx): ''' cb, called when we loose connection during transfer''' if file_props is None: @@ -182,10 +182,10 @@ return # failure_cb exists - this means that it has never been called if 'failure_cb' in file_props and file_props['failure_cb']: - file_props['failure_cb'](streamhost['initiator'], streamhost['id'], + file_props['failure_cb'](streamhost['initiator'], streamhost['id'], file_props['sid'], code = 404) del(file_props['failure_cb']) - + def add_receiver(self, account, sock5_receiver): ''' add new file request ''' self.readers[self.idx] = sock5_receiver @@ -200,23 +200,21 @@ self.process_result(result, sock5_receiver) return 1 return None - + def get_file_from_sender(self, file_props, account): if file_props is None: return - if 'hash' in file_props and \ - file_props['hash'] in self.senders: - + if 'hash' in file_props and file_props['hash'] in self.senders: sender = self.senders[file_props['hash']] sender.account = account result = self.get_file_contents(0) self.process_result(result, sender) - + def result_sha(self, sha_str, idx): if sha_str in self.sha_handlers: props = self.sha_handlers[sha_str] props[0](props[1], idx) - + def activate_proxy(self, idx): if idx not in self.readers: return @@ -242,15 +240,14 @@ self.idlequeue.plug_idle(reader, True, False) result = reader.write_next() self.process_result(result, reader) - + def send_file(self, file_props, account): - if 'hash' in file_props and \ - file_props['hash'] in self.senders: + if 'hash' in file_props and file_props['hash'] in self.senders: sender = self.senders[file_props['hash']] file_props['streamhost-used'] = True sender.account = account if file_props['type'] == 's': - sender.file_props = file_props + sender.file_props = file_props result = sender.send_file() self.process_result(result, sender) else: @@ -258,28 +255,27 @@ file_props['last-time'] = self.idlequeue.current_time() file_props['received-len'] = 0 sender.file_props = file_props - + def add_file_props(self, account, file_props): ''' file_prop to the dict of current file_props. It is identified by account name and sid ''' - if file_props is None or \ - ('sid' in file_props) is False: + if file_props is None or ('sid' in file_props) is False: return _id = file_props['sid'] if account not in self.files_props: self.files_props[account] = {} self.files_props[account][_id] = file_props - + def remove_file_props(self, account, sid): if account in self.files_props: fl_props = self.files_props[account] if sid in fl_props: del(fl_props[sid]) - + if len(self.files_props) == 0: self.connected = 0 - + def get_file_props(self, account, sid): ''' get fil_prop by account name and session id ''' if account in self.files_props: @@ -287,14 +283,14 @@ if sid in fl_props: return fl_props[sid] return None - + def on_connection_accepted(self, sock): - sock_hash = sock.__hash__() + sock_hash = sock.__hash__() if sock_hash not in self.senders: - self.senders[sock_hash] = Socks5Sender(self.idlequeue, - sock_hash, self, sock[0], sock[1][0], sock[1][1]) + self.senders[sock_hash] = Socks5Sender(self.idlequeue, sock_hash, self, + sock[0], sock[1][0], sock[1][1]) self.connected += 1 - + def process_result(self, result, actor): ''' Take appropriate actions upon the result: [ 0, - 1 ] complete/end transfer @@ -310,9 +306,9 @@ self.complete_transfer_cb(account, actor.file_props) elif self.progress_transfer_cb is not None: self.progress_transfer_cb(actor.account, actor.file_props) - - def remove_receiver(self, idx, do_disconnect = True): - ''' Remove reciver from the list and decrease + + def remove_receiver(self, idx, do_disconnect=True): + ''' Remove reciver from the list and decrease the number of active connections with 1''' if idx != -1: if idx in self.readers: @@ -323,11 +319,11 @@ reader.disconnect() else: if reader.streamhost is not None: - reader.streamhost['state'] = -1 + reader.streamhost['state'] = -1 del(self.readers[idx]) - - def remove_sender(self, idx, do_disconnect = True): - ''' Remove sender from the list of senders and decrease the + + def remove_sender(self, idx, do_disconnect=True): + ''' Remove sender from the list of senders and decrease the number of active connections with 1''' if idx != -1: if idx in self.senders: @@ -342,13 +338,14 @@ self.listener.disconnect() self.listener = None self.connected -= 1 - + class Socks5: def __init__(self, idlequeue, host, port, initiator, target, sid): if host is not None: try: self.host = host - self.ais = socket.getaddrinfo(host, port, socket.AF_UNSPEC, socket.SOCK_STREAM) + self.ais = socket.getaddrinfo(host, port, socket.AF_UNSPEC, + socket.SOCK_STREAM) except socket.gaierror: self.ais = None self.idlequeue = idlequeue @@ -364,7 +361,7 @@ self.size = 0 self.remaining_buff = '' self.file = None - + def open_file_for_reading(self): if self.file is None: try: @@ -376,7 +373,7 @@ except IOError, e: self.close_file() raise IOError, e - + def close_file(self): if self.file: if not self.file.closed: @@ -385,7 +382,7 @@ except Exception: pass self.file = None - + def get_fd(self): ''' Test if file is already open and return its fd, or just open the file and return the fd. @@ -404,7 +401,7 @@ self.file_props['last-time'] = self.idlequeue.current_time() self.file_props['received-len'] = offset return fd - + def rem_fd(self, fd): if 'fd' in self.file_props: del(self.file_props['fd']) @@ -412,21 +409,20 @@ fd.close() except Exception: pass - - + def receive(self): - ''' Reads small chunks of data. + ''' Reads small chunks of data. Calls owner's disconnected() method if appropriate.''' received = '' - try: + try: add = self._recv(64) - except Exception, e: - add='' - received +=add + except Exception, e: + add = '' + received += add if len(add) == 0: self.disconnect() return add - + def send_raw(self,raw_data): ''' Writes raw outgoing data. ''' try: @@ -434,7 +430,7 @@ except Exception, e: self.disconnect() return len(raw_data) - + def write_next(self): if self.remaining_buff != '': buff = self.remaining_buff @@ -483,12 +479,10 @@ self.state = 8 # end connection self.disconnect() return -1 - + def get_file_contents(self, timeout): - ''' read file contents from socket and write them to file ''', \ - self.file_props['type'], self.file_props['sid'] - if self.file_props is None or \ - ('file-name' in self.file_props) is False: + ''' read file contents from socket and write them to file ''' + if self.file_props is None or ('file-name' in self.file_props) is False: self.file_props['error'] = -2 return None fd = None @@ -510,7 +504,7 @@ return 0 else: fd = self.get_fd() - try: + try: buff = self._recv(MAX_BUFF_LEN) except Exception, e: buff = '' @@ -549,7 +543,7 @@ if self.file_props['received-len'] != 0: return self.file_props['received-len'] return None - + def disconnect(self): ''' Closes open descriptors and remover socket descr. from idleque ''' # be sure that we don't leave open file @@ -565,12 +559,12 @@ self.connected = False self.fd = -1 self.state = -1 - + def _get_auth_buff(self): - ''' Message, that we support 1 one auth mechanism: + ''' Message, that we support 1 one auth mechanism: the 'no auth' mechanism. ''' return struct.pack('!BBB', 0x05, 0x01, 0x00) - + def _parse_auth_buff(self, buff): ''' Parse the initial message and create a list of auth mechanisms ''' @@ -583,30 +577,31 @@ except Exception: return None return auth_mechanisms + def _get_auth_response(self): ''' socks version(5), number of extra auth methods (we send 0x00 - no auth ) ''' return struct.pack('!BB', 0x05, 0x00) - + def _get_connect_buff(self): ''' Connect request by domain name ''' - buff = struct.pack('!BBBBB%dsBB' % len(self.host), - 0x05, 0x01, 0x00, 0x03, len(self.host), self.host, + buff = struct.pack('!BBBBB%dsBB' % len(self.host), + 0x05, 0x01, 0x00, 0x03, len(self.host), self.host, self.port >> 8, self.port & 0xff) return buff - + def _get_request_buff(self, msg, command = 0x01): - ''' Connect request by domain name, + ''' Connect request by domain name, sid sha, instead of domain name (jep 0096) ''' - buff = struct.pack('!BBBBB%dsBB' % len(msg), + buff = struct.pack('!BBBBB%dsBB' % len(msg), 0x05, command, 0x00, 0x03, len(msg), msg, 0, 0) return buff - + def _parse_request_buff(self, buff): try: # don't trust on what comes from the outside - version, req_type, reserved, host_type, = \ - struct.unpack('!BBBB', buff[:4]) + version, req_type, reserved, host_type, = struct.unpack('!BBBB', + buff[:4]) if host_type == 0x01: host_arr = struct.unpack('!iiii', buff[4:8]) host, = '.'.join(str(s) for s in host_arr) @@ -615,18 +610,18 @@ host_len, = struct.unpack('!B' , buff[4]) host, = struct.unpack('!%ds' % host_len, buff[5:5 + host_len]) portlen = len(buff[host_len + 5:]) - if portlen == 1: + if portlen == 1: port, = struct.unpack('!B', buff[host_len + 5]) - elif portlen == 2: + elif portlen == 2: port, = struct.unpack('!H', buff[host_len + 5:]) # file data, comes with auth message (Gaim bug) - else: + else: port, = struct.unpack('!H', buff[host_len + 5: host_len + 7]) self.remaining_buff = buff[host_len + 7:] except Exception: return (None, None, None) return (req_type, host, port) - + def read_connect(self): ''' connect responce: version, auth method ''' buff = self._recv() @@ -636,7 +631,7 @@ version, method = None, None if version != 0x05 or method == 0xff: self.disconnect() - + def continue_paused_transfer(self): if self.state < 5: return @@ -644,18 +639,20 @@ self.idlequeue.plug_idle(self, False, True) else: self.idlequeue.plug_idle(self, True, False) - + def _get_sha1_auth(self): ''' get sha of sid + Initiator jid + Target jid ''' if 'is_a_proxy' in self.file_props: del(self.file_props['is_a_proxy']) - return sha.new('%s%s%s' % (self.sid, self.file_props['proxy_sender'], + return sha.new('%s%s%s' % (self.sid, self.file_props['proxy_sender'], self.file_props['proxy_receiver'])).hexdigest() - return sha.new('%s%s%s' % (self.sid, self.initiator, self.target)).hexdigest() - + return sha.new('%s%s%s' % (self.sid, self.initiator, self.target)).\ + hexdigest() + class Socks5Sender(Socks5, IdleObject): ''' class for sending file to socket over socks5 ''' - def __init__(self, idlequeue, sock_hash, parent, _sock, host = None, port = None): + def __init__(self, idlequeue, sock_hash, parent, _sock, host=None, + port=None): self.queue_idx = sock_hash self.queue = parent Socks5.__init__(self, idlequeue, host, port, None, None, None) @@ -669,7 +666,7 @@ self.file_props = None # start waiting for data self.idlequeue.plug_idle(self, False, True) - + def read_timeout(self): self.idlequeue.remove_timeout(self.fd) if self.state > 5: @@ -680,9 +677,9 @@ if SEND_TIMEOUT > 0: self.idlequeue.set_read_timeout(self.fd, SEND_TIMEOUT) else: - # stop transfer, there is no error code for this + # stop transfer, there is no error code for this self.pollend() - + def pollout(self): if not self.connected: self.disconnect() @@ -696,7 +693,7 @@ if self.file_props['paused']: self.file_props['continue_cb'] = self.continue_paused_transfer self.idlequeue.plug_idle(self, False, False) - return + return result = self.write_next() self.queue.process_result(result, self) if result is None or result <= 0: @@ -712,13 +709,13 @@ self.state += 1 # unplug and plug this time for reading self.idlequeue.plug_idle(self, False, True) - + def pollend(self): self.state = 8 # end connection self.disconnect() self.file_props['error'] = -1 self.queue.process_result(-1, self) - + def pollin(self): if self.connected: if self.state < 5: @@ -727,17 +724,16 @@ self.queue.result_sha(self.sha_msg, self.queue_idx) if result == -1: self.disconnect() - + elif self.state == 5: - if self.file_props is not None and \ - self.file_props['type'] == 'r': + if self.file_props is not None and self.file_props['type'] == 'r': result = self.get_file_contents(0) self.queue.process_result(result, self) else: self.disconnect() - + def send_file(self): - ''' start sending the file over verified connection ''' + ''' start sending the file over verified connection ''' if self.file_props['started']: return self.file_props['error'] = 0 @@ -756,7 +752,7 @@ # plug for writing self.idlequeue.plug_idle(self, True, False) return self.write_next() # initial for nl byte - + def main(self): ''' initial requests for verifying the connection ''' if self.state == 1: # initial read @@ -775,8 +771,8 @@ # unplug & plug for writing self.idlequeue.plug_idle(self, True, False) return None - - def disconnect(self, cb = True): + + def disconnect(self, cb=True): ''' Closes the socket. ''' # close connection and remove us from the queue Socks5.disconnect(self) @@ -788,20 +784,20 @@ class Socks5Listener(IdleObject): def __init__(self, idlequeue, port): - ''' handle all incomming connections on (0.0.0.0, port) + ''' handle all incomming connections on (0.0.0.0, port) This class implements IdleObject, but we will expect only pollin events though ''' self.port = port self.ais = socket.getaddrinfo(None, port, socket.AF_UNSPEC, - socket.SOCK_STREAM, socket.SOL_TCP, socket.AI_PASSIVE) - self.queue_idx = -1 + socket.SOCK_STREAM, socket.SOL_TCP, socket.AI_PASSIVE) + self.queue_idx = -1 self.idlequeue = idlequeue self.queue = None self.started = False self._sock = None self.fd = -1 - + def bind(self): for ai in self.ais: #try the different possibilities (ipv6, ipv4, etc.) @@ -825,16 +821,16 @@ self.fd = self._serv.fileno() self.idlequeue.plug_idle(self, False, True) self.started = True - + def pollend(self): ''' called when we stop listening on (host, port) ''' self.disconnect() - + def pollin(self): ''' accept a new incomming connection and notify queue''' sock = self.accept_conn() self.queue.on_connection_accepted(sock) - + def disconnect(self): ''' free all resources, we are not listening anymore ''' self.idlequeue.remove_timeout(self.fd) @@ -846,13 +842,13 @@ self._serv.close() except Exception: pass - + def accept_conn(self): ''' accepts a new incomming connection ''' _sock = self._serv.accept() _sock[0].setblocking(False) return _sock - + class Socks5Receiver(Socks5, IdleObject): def __init__(self, idlequeue, streamhost, sid, file_props = None): self.queue_idx = -1 @@ -871,9 +867,10 @@ self.file_props['paused'] = False self.file_props['continue_cb'] = self.continue_paused_transfer self.file_props['stalled'] = False - Socks5.__init__(self, idlequeue, streamhost['host'], int(streamhost['port']), - streamhost['initiator'], streamhost['target'], sid) - + Socks5.__init__(self, idlequeue, streamhost['host'], + int(streamhost['port']), streamhost['initiator'], streamhost['target'], + sid) + def read_timeout(self): self.idlequeue.remove_timeout(self.fd) if self.state > 5: @@ -886,11 +883,11 @@ if READ_TIMEOUT > 0: self.idlequeue.set_read_timeout(self.fd, READ_TIMEOUT) else: - # stop transfer, there is no error code for this + # stop transfer, there is no error code for this self.pollend() else: self.queue.reconnect_receiver(self, self.streamhost) - + def connect(self): ''' create the socket and plug it to the idlequeue ''' if self.ais is None: @@ -898,10 +895,10 @@ for ai in self.ais: try: - self._sock=socket.socket(*ai[:3]) + self._sock = socket.socket(*ai[:3]) # this will not block the GUI self._sock.setblocking(False) - self._server=ai[4] + self._server = ai[4] break except Exception: if sys.exc_value[0] == errno.EINPROGRESS: @@ -914,11 +911,12 @@ self.do_connect() self.idlequeue.set_read_timeout(self.fd, CONNECT_TIMEOUT) return None - + def _is_connected(self): if self.state < 5: return False return True + def pollout(self): self.idlequeue.remove_timeout(self.fd) if self.state == 0: @@ -939,7 +937,7 @@ # unplug and plug for reading self.idlequeue.plug_idle(self, False, True) self.idlequeue.set_read_timeout(self.fd, CONNECT_TIMEOUT) - + def pollend(self): if self.state >= 5: # error during transfer @@ -948,7 +946,7 @@ self.queue.process_result(-1, self) else: self.queue.reconnect_receiver(self, self.streamhost) - + def pollin(self): self.idlequeue.remove_timeout(self.fd) if self.connected: @@ -965,10 +963,9 @@ self.idlequeue.set_read_timeout(self.fd, STALLED_TIMEOUT) result = self.get_file_contents(0) self.queue.process_result(result, self) - else: self.disconnect() - + def do_connect(self): try: self._sock.connect(self._server) @@ -979,7 +976,7 @@ (errnum, errstr) = ee self.connect_timeout += 1 if errnum == 111 or self.connect_timeout > 1000: - self.queue._connection_refused(self.streamhost, + self.queue._connection_refused(self.streamhost, self.file_props, self.queue_idx) return None # win32 needs this @@ -994,13 +991,13 @@ self.file_props['connected'] = True self.file_props['disconnect_cb'] = self.disconnect self.state = 1 # connected - + # stop all others connections to sender's streamhosts self.queue._socket_connected(self.streamhost, self.file_props) self.idlequeue.plug_idle(self, True, False) return 1 # we are connected - - def main(self, timeout = 0): + + def main(self, timeout=0): ''' begin negotiation. on success 'address' != 0 ''' result = 1 buff = self.receive() @@ -1008,7 +1005,7 @@ # end connection self.pollend() return - + if self.state == 2: # read auth response if buff is None or len(buff) != 2: return None @@ -1027,7 +1024,7 @@ addrlen = ord(buff[4]) address = struct.unpack('!%ds' % addrlen, buff[5:addrlen + 5]) portlen = len(buff[addrlen + 5:]) - if portlen == 1: + if portlen == 1: port, = struct.unpack('!B', buff[addrlen + 5]) elif portlen == 2: port, = struct.unpack('!H', buff[addrlen + 5:]) @@ -1036,14 +1033,14 @@ self.remaining_buff = buff[addrlen + 7:] self.state = 5 # for senders: init file_props and send '\n' if self.queue.on_success: - result = self.queue.send_success_reply(self.file_props, + result = self.queue.send_success_reply(self.file_props, self.streamhost) if result == 0: self.state = 8 self.disconnect() - - # for senders: init file_props - if result == 1 and self.state == 5: + + # for senders: init file_props + if result == 1 and self.state == 5: if self.file_props['type'] == 's': self.file_props['error'] = 0 self.file_props['disconnect_cb'] = self.disconnect @@ -1063,15 +1060,15 @@ self.idlequeue.plug_idle(self, False, True) self.file_props['continue_cb'] = self.continue_paused_transfer # we have set up the connection, next - retrieve file - self.state = 6 + self.state = 6 if self.state < 5: self.idlequeue.plug_idle(self, True, False) self.state += 1 return None - - def disconnect(self, cb = True): + + def disconnect(self, cb=True): ''' Closes the socket. Remove self from queue if cb is True''' - # close connection + # close connection Socks5.disconnect(self) if cb is True: self.file_props['disconnect_cb'] = None Modified: branches/gajim_0.12/src/common/xmpp/auth_nb.py =================================================================== --- branches/gajim_0.12/src/common/xmpp/auth_nb.py 2008-11-30 21:37:50 UTC (rev 10730) +++ branches/gajim_0.12/src/common/xmpp/auth_nb.py 2008-11-30 22:14:50 UTC (rev 10731) @@ -135,24 +135,31 @@ self.startsasl='not-supported' self.DEBUG('SASL not supported by server', 'error') return - mecs=[] + self.mecs=[] for mec in feats.getTag('mechanisms', namespace=NS_SASL).getTags('mechanism'): - mecs.append(mec.getData()) + self.mecs.append(mec.getData()) self._owner.RegisterHandler('challenge', self.SASLHandler, xmlns=NS_SASL) self._owner.RegisterHandler('failure', self.SASLHandler, xmlns=NS_SASL) self._owner.RegisterHandler('success', self.SASLHandler, xmlns=NS_SASL) - if "GSSAPI" in mecs and have_kerberos: - rc, self.gss_vc = kerberos.authGSSClientInit('xmpp@' + - self._owner.Server) + self.MechanismHandler() + + def MechanismHandler(self): + if "GSSAPI" in self.mecs and have_kerberos: + self.mecs.remove("GSSAPI") + rc, self.gss_vc = kerberos.authGSSClientInit('xmpp@' + + self._owner.socket._hostfqdn) + rc = kerberos.authGSSClientStep(self.gss_vc, '') response = kerberos.authGSSClientResponse(self.gss_vc) node=Node('auth',attrs={'xmlns': NS_SASL, 'mechanism': 'GSSAPI'}, payload=(response or "")) self.mechanism = "GSSAPI" self.gss_step = GSS_STATE_STEP - elif "DIGEST-MD5" in mecs: + elif "DIGEST-MD5" in self.mecs: + self.mecs.remove("DIGEST-MD5") node=Node('auth',attrs={'xmlns': NS_SASL, 'mechanism': 'DIGEST-MD5'}) self.mechanism = "DIGEST-MD5" - elif "PLAIN" in mecs: + elif "PLAIN" in self.mecs: + self.mecs.remove("PLAIN") sasl_data='%s\x00%s\x00%s' % (self.username+'@' + self._owner.Server, self.username, self.password) node=Node('auth', attrs={'xmlns':NS_SASL,'mechanism':'PLAIN'}, @@ -177,6 +184,10 @@ except Exception: reason = challenge self.DEBUG('Failed SASL authentification: %s' % reason, 'error') + if len(self.mecs) > 0: + # There are other mechanisms to test + self.MechanismHandler() + raise NodeProcessed if self.on_sasl : self.on_sasl () raise NodeProcessed @@ -195,7 +206,7 @@ incoming_data = challenge.getData() data=base64.decodestring(incoming_data) self.DEBUG('Got challenge:'+data,'ok') - if self.mechanism == "GSSAPI": + if self.mechanism == 'GSSAPI': if self.gss_step == GSS_STATE_STEP: rc = kerberos.authGSSClientStep(self.gss_vc, incoming_data) if rc != kerberos.AUTH_GSS_CONTINUE: @@ -204,7 +215,7 @@ rc = kerberos.authGSSClientUnwrap(self.gss_vc, incoming_data) response = kerberos.authGSSClientResponse(self.gss_vc) rc = kerberos.authGSSClientWrap(self.gss_vc, response, - self.username) + kerberos.authGSSClientUserName(self.gss_vc)) response = kerberos.authGSSClientResponse(self.gss_vc) if not response: response = '' Modified: branches/gajim_0.12/src/common/xmpp/dispatcher_nb.py =================================================================== --- branches/gajim_0.12/src/common/xmpp/dispatcher_nb.py 2008-11-30 21:37:50 UTC (rev 10730) +++ branches/gajim_0.12/src/common/xmpp/dispatcher_nb.py 2008-11-30 22:14:50 UTC (rev 10731) @@ -141,6 +141,10 @@ self.DEBUG('Invalid XML received from server. Forcing disconnect.', 'error') self._owner.Connection.pollend() return 0 + except ValueError, e: + self.DEBUG(str(e), 'error') + self._owner.Connection.pollend() + return 0 if len(self._pendingExceptions) > 0: _pendingException = self._pendingExceptions.pop() raise _pendingException[0], _pendingException[1], _pendingException[2] Modified: branches/gajim_0.12/src/common/xmpp/protocol.py =================================================================== --- branches/gajim_0.12/src/common/xmpp/protocol.py 2008-11-30 21:37:50 UTC (rev 10730) +++ branches/gajim_0.12/src/common/xmpp/protocol.py 2008-11-30 22:14:50 UTC (rev 10731) @@ -92,7 +92,8 @@ NS_SI ='http://jabber.org/protocol/si' # XEP-0096 NS_SI_PUB ='http://jabber.org/protocol/sipub' # XEP-0137 NS_SIGNED ='jabber:x:signed' # XEP-0027 -NS_STANZA_CRYPTO='http://www.xmpp.org/extensions/xep-0200.html#ns' # JEP-0200 +NS_SSN ='urn:xmpp:ssn' # XEP-0155 +NS_STANZA_CRYPTO='http://www.xmpp.org/extensions/xep-0200.html#ns' # XEP-0200 NS_STANZAS ='urn:ietf:params:xml:ns:xmpp-stanzas' NS_STREAM ='http://affinix.com/jabber/stream' NS_STREAMS ='http://etherx.jabber.org/streams' Modified: branches/gajim_0.12/src/common/xmpp/simplexml.py =================================================================== --- branches/gajim_0.12/src/common/xmpp/simplexml.py 2008-11-30 21:37:50 UTC (rev 10730) +++ branches/gajim_0.12/src/common/xmpp/simplexml.py 2008-11-30 22:14:50 UTC (rev 10731) @@ -386,7 +386,11 @@ else: self._document_attrs[attr] = val ns = self._document_nsp.get(nsp, 'http://www.gajim.org/xmlns/undeclared-root') - self.stream_header_received(ns, name, attrs) + try: + self.stream_header_received(ns, name, attrs) + except ValueError, e: + self._document_attrs = None + raise ValueError(str(e)) if not self.last_is_data and self._ptr.parent: self._ptr.parent.data.append('') self.last_is_data = 0 Modified: branches/gajim_0.12/src/common/xmpp/transports_nb.py =================================================================== --- branches/gajim_0.12/src/common/xmpp/transports_nb.py 2008-11-30 21:37:50 UTC (rev 10730) +++ branches/gajim_0.12/src/common/xmpp/transports_nb.py 2008-11-30 22:14:50 UTC (rev 10731) @@ -246,6 +246,7 @@ self._exported_methods=[self.send, self.disconnect, self.onreceive, self.set_send_timeout, self.start_disconnect, self.set_timeout, self.remove_timeout] self._server = server + self._hostfqdn = server[0] self.on_connect = on_connect self.on_connect_failure = on_connect_failure self.on_receive = None @@ -304,6 +305,7 @@ server=self._server else: self._server = server + self._hostfqdn = self._server[0] self.printed_error = False self.state = 0 try: Modified: branches/gajim_0.12/src/common/zeroconf/connection_zeroconf.py =================================================================== --- branches/gajim_0.12/src/common/zeroconf/connection_zeroconf.py 2008-11-30 21:37:50 UTC (rev 10730) +++ branches/gajim_0.12/src/common/zeroconf/connection_zeroconf.py 2008-11-30 22:14:50 UTC (rev 10731) @@ -360,11 +360,16 @@ def get_status(self): return STATUS_LIST[self.connected] - def send_message(self, jid, msg, keyID, type_ = 'chat', subject='', - chatstate = None, msg_id = None, composing_xep = None, resource = None, - user_nick = None, session=None, forward_from=None, form_node=None, original_message=None): + def send_message(self, jid, msg, keyID, type_='chat', subject='', + chatstate=None, msg_id=None, composing_xep=None, resource=None, + user_nick=None, xhtml=None, session=None, forward_from=None, form_node=None, + original_message=None, delayed=None): fjid = jid + if msg and not xhtml and gajim.config.get( + 'rst_formatting_outgoing_messages'): + from common.rst_xhtml_generator import create_xhtml + xhtml = create_xhtml(msg) if not self.connection: return if not msg and chatstate is None: @@ -397,15 +402,16 @@ return 3 if type_ == 'chat': - msg_iq = common.xmpp.Message(to = fjid, body = msgtxt, typ = type_) + msg_iq = common.xmpp.Message(to=fjid, body=msgtxt, typ=type_, + xhtml=xhtml) else: if subject: - msg_iq = common.xmpp.Message(to = fjid, body = msgtxt, - typ = 'normal', subject = subject) + msg_iq = common.xmpp.Message(to=fjid, body=msgtxt, typ='normal', + subject=subject, xhtml=xhtml) else: - msg_iq = common.xmpp.Message(to = fjid, body = msgtxt, - typ = 'normal') + msg_iq = common.xmpp.Message(to=fjid, body=msgtxt, typ='normal', + xhtml=xhtml) if msgenc: msg_iq.setTag(common.xmpp.NS_ENCRYPTED + ' x').setData(msgenc) @@ -428,6 +434,20 @@ if chatstate is 'composing' or msgtxt: chatstate_node.addChild(name = 'composing') + if forward_from: + addresses = msg_iq.addChild('addresses', + namespace=common.xmpp.NS_ADDRESS) + addresses.addChild('address', attrs = {'type': 'ofrom', + 'jid': forward_from}) + + # XEP-0203 + if delayed: + our_jid = gajim.get_jid_from_account(self.name) + '/' + \ + self.server_resource + timestamp = time.strftime('%Y-%m-%dT%TZ', time.gmtime(delayed)) + msg_iq.addChild('delay', namespace=common.xmpp.NS_DELAY2, + attrs={'from': our_jid, 'stamp': timestamp}) + if session: session.last_send = time.time() msg_iq.setThread(session.thread_id) Modified: branches/gajim_0.12/src/conversation_textview.py =================================================================== --- branches/gajim_0.12/src/conversation_textview.py 2008-11-30 21:37:50 UTC (rev 10730) +++ branches/gajim_0.12/src/conversation_textview.py 2008-11-30 22:14:50 UTC (rev 10731) @@ -157,8 +157,8 @@ class ConversationTextview: - '''Class for the conversation textview (where user reads already said messages) - for chat/groupchat windows''' + '''Class for the conversation textview (where user reads already said + messages) for chat/groupchat windows''' FOCUS_OUT_LINE_PIXBUF = gtk.gdk.pixbuf_new_from_file(os.path.join( gajim.DATA_DIR, 'pixmaps', 'muc_separator.png')) @@ -440,7 +440,7 @@ self.xep0184_shown[id_] = SHOWN return False - gobject.timeout_add_seconds(4, show_it) + gobject.timeout_add_seconds(3, show_it) buffer.end_user_action() @@ -966,8 +966,13 @@ file.close() try: - p = Popen(['latex', '--interaction=nonstopmode', tmpfile + '.tex'], - cwd=gettempdir()) + if os.name == 'nt': + # CREATE_NO_WINDOW + p = Popen(['latex', '--interaction=nonstopmode', + tmpfile + '.tex'], creationflags=0x08000000, cwd=gettempdir()) + else: + p = Popen(['latex', '--interaction=nonstopmode', + tmpfile + '.tex'], cwd=gettempdir()) exitcode = p.wait() except Exception, e: exitcode = _('Error executing "%(command)s": %(error)s') % { @@ -977,15 +982,20 @@ if exitcode == 0: latex_png_dpi = gajim.config.get('latex_png_dpi') try: - p = Popen(['dvipng', '-bg', 'rgb 1.0 1.0 1.0', '-T', 'tight', '-D', - latex_png_dpi, tmpfile + '.dvi', '-o', tmpfile + '.png'], - cwd=gettempdir()) + if os.name == 'nt': + # CREATE_NO_WINDOW + p = Popen(['dvipng', '-bg', 'rgb 1.0 1.0 1.0', '-T', 'tight', + '-D', latex_png_dpi, tmpfile + '.dvi', '-o', + tmpfile + '.png'], creationflags=0x08000000, cwd=gettempdir()) + else: + p = Popen(['dvipng', '-bg', 'rgb 1.0 1.0 1.0', '-T', 'tight', + '-D', latex_png_dpi, tmpfile + '.dvi', '-o', + tmpfile + '.png'], cwd=gettempdir()) exitcode = p.wait() except Exception, e: exitcode = _('Error executing "%(command)s": %(error)s') % { - 'command': 'dvipng -bg rgb 1.0 1.0 1.0 -T tight -D %s %s.dvi -o %s.png' %\ - (latex_png_dpi, tmpfile, tmpfile), - 'error': str(e)} + 'command': 'dvipng -bg rgb 1.0 1.0 1.0 -T tight -D %s %s.dvi -o ' + '%s.png' % (latex_png_dpi, tmpfile, tmpfile), 'error': str(e)} extensions = ['.tex', '.log', '.aux', '.dvi'] for ext in extensions: @@ -1095,7 +1105,8 @@ imagepath = self.latex_to_image(special_text) except LatexError, e: # print the error after the line has been written - gobject.idle_add(self.print_conversation_line, str(e), '', 'info', '', None) + gobject.idle_add(self.print_conversation_line, str(e), '', 'info', + '', None) imagepath = None end_iter = buffer.get_end_iter() anchor = buffer.create_child_anchor(end_iter) @@ -1200,8 +1211,7 @@ # note that color of /me may be overwritten in gc_control text_tags.append(other_text_tag) else: # not status nor /me - if gajim.config.get( - 'chat_merge_consecutive_nickname'): + if gajim.config.get('chat_merge_consecutive_nickname'): if kind != old_kind: self.print_name(name, kind, other_tags_for_name) else: @@ -1279,17 +1289,17 @@ buffer.insert(end_iter, subject) self.print_empty_line() - def print_real_text(self, text, text_tags = [], name = None, xhtml = None): + def print_real_text(self, text, text_tags=[], name=None, xhtml=None): '''this adds normal and special text. call this to add text''' if xhtml: try: if name and (text.startswith('/me ') or text.startswith('/me\n')): - xhtml = xhtml.replace('/me', '<dfn>%s</dfn>'% (name,), 1) + xhtml = xhtml.replace('/me', '<dfn>%s</dfn>' % (name,), 1) self.tv.display_html(xhtml.encode('utf-8')) return except Exception, e: - gajim.log.debug(str('Error processing xhtml')+str(e)) - gajim.log.debug(str('with |'+xhtml+'|')) + gajim.log.debug(str('Error processing xhtml') + str(e)) + gajim.log.debug(str('with |' + xhtml + '|')) buffer = self.tv.get_buffer() # /me is replaced by name if name is given Modified: branches/gajim_0.12/src/dialogs.py =================================================================== --- branches/gajim_0.12/src/dialogs.py 2008-11-30 21:37:50 UTC (rev 10730) +++ branches/gajim_0.12/src/dialogs.py 2008-11-30 22:14:50 UTC (rev 10731) @@ -2038,10 +2038,11 @@ if not text: text = gajim.get_name_from_jid(account, jid) # default value of text if not title: - title = event_type + title = '' event_type_label.set_markup( - '%s' % title) + '%s' % + gobject.markup_escape_text(title)) # set colors [ http://www.pitt.edu/~nisg/cis/web/cgi/rgb.html ] self.window.modify_bg(gtk.STATE_NORMAL, gtk.gdk.color_parse('black')) @@ -2075,8 +2076,8 @@ popup_bg_color = gtk.gdk.color_parse(bg_color) close_button.modify_bg(gtk.STATE_NORMAL, popup_bg_color) eventbox.modify_bg(gtk.STATE_NORMAL, popup_bg_color) - event_description_label.set_markup( - '%s' % text) + event_description_label.set_markup('%s' % + gobject.markup_escape_text(text)) # set the image image.set_from_file(path_to_image) Modified: branches/gajim_0.12/src/features_window.py =================================================================== --- branches/gajim_0.12/src/features_window.py 2008-11-30 21:37:50 UTC (rev 10730) +++ branches/gajim_0.12/src/features_window.py 2008-11-30 22:14:50 UTC (rev 10731) @@ -277,15 +277,26 @@ file.flush() file.close() try: - p = Popen(['latex', '--interaction=nonstopmode', tmpfile + '.tex'], - cwd=gettempdir()) + if os.name == 'nt': + # CREATE_NO_WINDOW + p = Popen(['latex', '--interaction=nonstopmode', tmpfile + '.tex'], + creationflags=0x08000000, cwd=gettempdir()) + else: + p = Popen(['latex', '--interaction=nonstopmode', tmpfile + '.tex'], + cwd=gettempdir()) exitcode = p.wait() except Exception: exitcode = 1 if exitcode == 0: try: - p = Popen(['dvipng', '-bg', 'white', '-T', 'tight', - tmpfile + '.dvi', '-o', tmpfile + '.png'], cwd=gettempdir()) + if os.name == 'nt': + # CREATE_NO_WINDOW + p = Popen(['dvipng', '-bg', 'white', '-T', 'tight', + tmpfile + '.dvi', '-o', tmpfile + '.png'], + creationflags=0x08000000, cwd=gettempdir()) + else: + p = Popen(['dvipng', '-bg', 'white', '-T', 'tight', + tmpfile + '.dvi', '-o', tmpfile + '.png'], cwd=gettempdir()) exitcode = p.wait() except Exception: exitcode = 1 Modified: branches/gajim_0.12/src/gajim.py =================================================================== --- branches/gajim_0.12/src/gajim.py 2008-11-30 21:37:50 UTC (rev 10730) +++ branches/gajim_0.12/src/gajim.py 2008-11-30 22:14:50 UTC (rev 10731) @@ -976,7 +976,7 @@ c = gajim.contacts.get_first_contact_from_jid(account, jid) c.resource = array[1] self.roster.remove_contact_from_groups(c.jid, account, - [('Not in Roster'),]) + [_('Not in Roster'), _('Observers')], update=False) else: keyID = '' attached_keys = gajim.config.get_per('accounts', account, @@ -1488,7 +1488,7 @@ contacts = gajim.contacts.get_contacts(account, jid) if (not sub or sub == 'none') and (not ask or ask == 'none') and \ not name and not groups: - # contact removes us. + # contact removed us. if contacts: self.roster.remove_contact(jid, account, backend=True) return @@ -1503,22 +1503,24 @@ else: # it is an existing contact that might has changed re_draw = False - # if sub or groups changed: remove and re-add - # Maybe observer status changed: - # according to xep 0162, contact is not an observer anymore when - # we asked him is auth, so also remove him if ask changed - old_groups = contacts[0].get_shown_groups() + # If contact has changed (sub, ask or group) update roster + # Mind about observer status changes: + # According to xep 0162, a contact is not an observer anymore when + # we asked for auth, so also remove him if ask changed + old_groups = contacts[0].groups if contacts[0].sub != sub or contacts[0].ask != ask\ or old_groups != groups: re_draw = True + if re_draw: + # c.get_shown_groups() has changed. Reflect that in roster_winodow + self.roster.remove_contact(jid, account, force=True) for contact in contacts: - if not name: - name = '' - contact.name = name + contact.name = name or '' contact.sub = sub contact.ask = ask contact.groups = groups or [] if re_draw: + self.roster.add_contact(jid, account) # Refilter and update old groups for group in old_groups: self.roster.draw_group(group, account) Modified: branches/gajim_0.12/src/music_track_listener.py =================================================================== --- branches/gajim_0.12/src/music_track_listener.py 2008-11-30 21:37:50 UTC (rev 10730) +++ branches/gajim_0.12/src/music_track_listener.py 2008-11-30 22:14:50 UTC (rev 10731) @@ -87,6 +87,17 @@ 'NameOwnerChanged', 'org.freedesktop.DBus', arg0='org.bansheeproject.Banshee') + ## Quod Libet + bus.add_signal_receiver(self._quodlibet_state_change_cb, + 'SongStarted', 'net.sacredchao.QuodLibet') + bus.add_signal_receiver(self._quodlibet_state_change_cb, + 'Paused', 'net.sacredchao.QuodLibet') + bus.add_signal_receiver(self._quodlibet_state_change_cb, + 'Unpaused', 'net.sacredchao.QuodLibet') + bus.add_signal_receiver(self._player_name_owner_changed, + 'NameOwnerChanged', 'org.freedesktop.DBus', + arg0='net.sacredchao.QuodLibet') + def _player_name_owner_changed(self, name, old, new): if not new: self.emit('music-track-changed', None) @@ -143,11 +154,11 @@ def _rhythmbox_properties_extract(self, props): info = MusicTrackInfo() - info.title = props['title'] - info.album = props['album'] - info.artist = props['artist'] - info.duration = int(props['duration']) - info.track_number = int(props['track-number']) + info.title = props.get('title', None) + info.album = props.get('album', None) + info.artist = props.get('artist', None) + info.duration = int(props.get('duration', 0)) + info.track_number = int(props.get('track-number', 0)) return info def _banshee_state_changed_cb(self, state): @@ -170,6 +181,21 @@ info.duration = int(props.get('length', 0)) return info + def _quodlibet_state_change_cb(self, state=None): + info = self.get_playing_track() + if info: + self.emit('music-track-changed', info) + else: + self.emit('music-track-changed', None) + + def _quodlibet_properties_extract(self, props): + info = MusicTrackInfo() + info.title = props.get('title', None) + info.album = props.get('album', None) + info.artist = props.get('artist', None) + info.duration = int(props.get('~#length', 0)) + return info + def get_playing_track(self): '''Return a MusicTrackInfo for the currently playing song, or None if no song is playing''' @@ -236,6 +262,23 @@ self._last_playing_music = song return song + ## Check Quod Libet playing track + test = False + if hasattr(bus, 'name_has_owner'): + if bus.name_has_owner('net.sacredchao.QuodLibet'): + test = True + elif dbus.dbus_bindings.bus_name_has_owner(bus.get_connection(), + 'net.sacredchao.QuodLibet'): + test = True + if test: + quodlibet = bus.get_object('net.sacredchao.QuodLibet', + '/net/sacredchao/QuodLibet') + if quodlibet.IsPlaying(): + currentTrack = quodlibet.CurrentSong() + song = self._quodlibet_properties_extract(currentTrack) + self._last_playing_music = song + return song + return None # here we test :) Modified: branches/gajim_0.12/src/notify.py =================================================================== --- branches/gajim_0.12/src/notify.py 2008-11-30 21:37:50 UTC (rev 10730) +++ branches/gajim_0.12/src/notify.py 2008-11-30 22:14:50 UTC (rev 10731) @@ -320,10 +320,26 @@ '''Notifies a user of an event. It first tries to a valid implementation of the Desktop Notification Specification. If that fails, then we fall back to the older style PopupNotificationWindow method.''' + + # default image + if not path_to_image: + path_to_image = os.path.abspath( + os.path.join(gajim.DATA_DIR, 'pixmaps', 'events', + 'chat_msg_recv.png')) # img to display + + # Try Growl first, as we might have D-Bus and notification daemon running + # on OS X for some reason. + if USER_HAS_GROWL: + osx.growler.notify(event_type, jid, account, msg_type, path_to_image, + title, text) + return + + # Try to show our popup via D-Bus and notification daemon if gajim.config.get('use_notif_daemon') and dbus_support.supported: try: DesktopNotification(event_type, jid, account, msg_type, - path_to_image, title, text) + path_to_image, gobject.markup_escape_text(title), + gobject.markup_escape_text(text)) return # sucessfully did D-Bus Notification procedure! except dbus.DBusException, e: # Connection to D-Bus failed @@ -331,21 +347,23 @@ except TypeError, e: # This means that we sent the message incorrectly gajim.log.debug(str(e)) - # we failed to speak to notification daemon via D-Bus - if USER_HAS_PYNOTIFY: # try via libnotify + + # Ok, that failed. Let's try pynotify, which also uses notification daemon + if gajim.config.get('use_notif_daemon') and USER_HAS_PYNOTIFY: if not text and event_type == 'new_message': # empty text for new_message means do_preview = False - text = gajim.get_name_from_jid(account, jid) # default value of text + # -> default value for text + _text = gobject.markup_escape_text( + gajim.get_name_from_jid(account, jid)) + else: + _text = gobject.markup_escape_text(text) + if not title: - title = event_type - # default image - if not path_to_image: - path_to_image = os.path.abspath( - os.path.join(gajim.DATA_DIR, 'pixmaps', 'events', - 'chat_msg_recv.png')) # img to display + _title = '' + else: + _title = gobject.markup_escape_text(title) - - notification = pynotify.Notification(title, text) + notification = pynotify.Notification(_title, _text) timeout = gajim.config.get('notification_timeout') * 1000 # make it ms notification.set_timeout(timeout) @@ -364,13 +382,8 @@ except gobject.GError, e: # Connection to notification-daemon failed, see #2893 gajim.log.debug(str(e)) - # try os/x growl - if USER_HAS_GROWL: - osx.growler.notify(event_type, jid, account, msg_type, path_to_image, - title, text) - return - # go old style + # Either nothing succeeded or the user wants old-style notifications instance = dialogs.PopupNotificationWindow(event_type, jid, account, msg_type, path_to_image, title, text) gajim.interface.roster.popup_notification_windows.append(instance) @@ -517,7 +530,7 @@ if version > [0, 3]: if gajim.interface.systray_enabled and \ gajim.config.get('attach_notifications_to_systray'): - x, y = gajim.interface.systray.img_tray.window.get_position() + x, y = gajim.interface.systray.img_tray.window.get_origin() x_, y_, width, height, depth = \ gajim.interface.systray.img_tray.window.get_geometry() pos_x = x + (width / 2) Modified: branches/gajim_0.12/src/roster_window.py =================================================================== --- branches/gajim_0.12/src/roster_window.py 2008-11-30 21:37:50 UTC (rev 10730) +++ branches/gajim_0.12/src/roster_window.py 2008-11-30 22:14:50 UTC (rev 10731) @@ -872,12 +872,11 @@ for contact in gajim.contacts.get_contacts(account, jid): for group in groups: if group in contact.groups: - # Needed when we remove from "General" + # Needed when we remove from "General" or "Observers" contact.groups.remove(group) if update: gajim.connections[account].update_contact(jid, contact.name, contact.groups) - self.add_contact(jid, account) # Also redraw old groups @@ -2710,8 +2709,8 @@ for jid in gajim.contacts.get_jid_list(acc): contact = gajim.contacts.get_first_contact_from_jid(acc, jid) if old_text in contact.groups: - self.remove_contact_from_groups(jid, acc, [old_text,]) self.add_contact_to_groups(jid, acc, [new_text,]) + self.remove_contact_from_groups(jid, acc, [old_text,]) def on_canceled(): if 'rename' in gajim.interface.instances: Modified: branches/gajim_0.12/src/session.py =================================================================== --- branches/gajim_0.12/src/session.py 2008-11-30 21:37:50 UTC (rev 10730) +++ branches/gajim_0.12/src/session.py 2008-11-30 22:14:50 UTC (rev 10731) @@ -145,7 +145,7 @@ pm = False if groupchat_control and groupchat_control.type_id == \ - message_control.TYPE_GC: + message_control.TYPE_GC and resource: # It's a Private message pm = True msg_type = 'pm' Modified: branches/gajim_0.12/src/statusicon.py =================================================================== --- branches/gajim_0.12/src/statusicon.py 2008-11-30 21:37:50 UTC (rev 10730) +++ branches/gajim_0.12/src/statusicon.py 2008-11-30 22:14:50 UTC (rev 10731) @@ -38,8 +38,6 @@ class StatusIcon(systray.Systray): '''Class for the notification area icon''' - #FIXME: when we migrate to GTK 2.10 stick only to this class - # (move base stuff from systray.py and rm it) #NOTE: gtk api does NOT allow: # leave, enter motion notify # and can't do cool tooltips we use

1 0

[commit-gajim] r10730 - trunk/src
by asterix＠gajim.org 30 Nov '08

30 Nov '08

Author: asterix Date: 2008-11-30 22:37:50 +0100 (Sun, 30 Nov 2008) New Revision: 10730 Modified: trunk/src/notify.py Log: [urandom] fix position of notification when attach_to_systray is enabled. Fixes #4537 Modified: trunk/src/notify.py =================================================================== --- trunk/src/notify.py 2008-11-30 21:32:59 UTC (rev 10729) +++ trunk/src/notify.py 2008-11-30 21:37:50 UTC (rev 10730) @@ -530,7 +530,7 @@ if version > [0, 3]: if gajim.interface.systray_enabled and \ gajim.config.get('attach_notifications_to_systray'): - x, y = gajim.interface.systray.img_tray.window.get_position() + x, y = gajim.interface.systray.img_tray.window.get_origin() x_, y_, width, height, depth = \ gajim.interface.systray.img_tray.window.get_geometry() pos_x = x + (width / 2)

1 0

[commit-gajim] r10729 - trunk/src
by asterix＠gajim.org 30 Nov '08

30 Nov '08

Author: asterix Date: 2008-11-30 22:32:59 +0100 (Sun, 30 Nov 2008) New Revision: 10729 Modified: trunk/src/conversation_textview.py Log: coding standard Modified: trunk/src/conversation_textview.py =================================================================== --- trunk/src/conversation_textview.py 2008-11-30 18:59:34 UTC (rev 10728) +++ trunk/src/conversation_textview.py 2008-11-30 21:32:59 UTC (rev 10729) @@ -1253,8 +1253,7 @@ # note that color of /me may be overwritten in gc_control text_tags.append(other_text_tag) else: # not status nor /me - if gajim.config.get( - 'chat_merge_consecutive_nickname'): + if gajim.config.get('chat_merge_consecutive_nickname'): if kind != old_kind: self.print_name(name, kind, other_tags_for_name) else: @@ -1332,17 +1331,17 @@ buffer.insert(end_iter, subject) self.print_empty_line() - def print_real_text(self, text, text_tags = [], name = None, xhtml = None): + def print_real_text(self, text, text_tags=[], name=None, xhtml=None): '''this adds normal and special text. call this to add text''' if xhtml: try: if name and (text.startswith('/me ') or text.startswith('/me\n')): - xhtml = xhtml.replace('/me', '<dfn>%s</dfn>'% (name,), 1) + xhtml = xhtml.replace('/me', '<dfn>%s</dfn>' % (name,), 1) self.tv.display_html(xhtml.encode('utf-8')) return except Exception, e: - gajim.log.debug(str('Error processing xhtml')+str(e)) - gajim.log.debug(str('with |'+xhtml+'|')) + gajim.log.debug(str('Error processing xhtml') + str(e)) + gajim.log.debug(str('with |' + xhtml + '|')) buffer = self.tv.get_buffer() # /me is replaced by name if name is given

1 0

[commit-gajim] r10728 - trunk/src
by asterix＠gajim.org 30 Nov '08

30 Nov '08

Author: asterix Date: 2008-11-30 19:59:34 +0100 (Sun, 30 Nov 2008) New Revision: 10728 Modified: trunk/src/chat_control.py Log: fix missing argument Modified: trunk/src/chat_control.py =================================================================== --- trunk/src/chat_control.py 2008-11-30 18:58:32 UTC (rev 10727) +++ trunk/src/chat_control.py 2008-11-30 18:59:34 UTC (rev 10728) @@ -1236,7 +1236,7 @@ def update_toolbar(self): # Formatting if gajim.capscache.is_supported(self.contact, NS_XHTML_IM) \ - and not gajim.capscache.is_supported('notexistant'): + and not gajim.capscache.is_supported(self.contact, 'notexistant'): self._formattings_button.set_sensitive(True) else: self._formattings_button.set_sensitive(False)

1 0

[commit-gajim] r10727 - trunk/src
by asterix＠gajim.org 30 Nov '08

30 Nov '08

Author: asterix Date: 2008-11-30 19:58:32 +0100 (Sun, 30 Nov 2008) New Revision: 10727 Modified: trunk/src/chat_control.py Log: fix typo Modified: trunk/src/chat_control.py =================================================================== --- trunk/src/chat_control.py 2008-11-30 18:53:02 UTC (rev 10726) +++ trunk/src/chat_control.py 2008-11-30 18:58:32 UTC (rev 10727) @@ -1235,7 +1235,7 @@ def update_toolbar(self): # Formatting - if gajim.capscache.is_supported(self.contact, NS_XHTML_IM) + if gajim.capscache.is_supported(self.contact, NS_XHTML_IM) \ and not gajim.capscache.is_supported('notexistant'): self._formattings_button.set_sensitive(True) else:

1 0

[commit-gajim] r10726 - in trunk/src/common: . xmpp
by asterix＠gajim.org 30 Nov '08

30 Nov '08

Author: asterix Date: 2008-11-30 19:53:02 +0100 (Sun, 30 Nov 2008) New Revision: 10726 Modified: trunk/src/common/connection_handlers.py trunk/src/common/gajim.py trunk/src/common/xmpp/protocol.py Log: check session support instead of Esession support, and announce we support it. Fixes #4429 Modified: trunk/src/common/connection_handlers.py =================================================================== --- trunk/src/common/connection_handlers.py 2008-11-30 18:16:11 UTC (rev 10725) +++ trunk/src/common/connection_handlers.py 2008-11-30 18:53:02 UTC (rev 10726) @@ -2186,7 +2186,7 @@ contact = gajim.contacts.get_contact(self.name, jid_stripped) session_supported = gajim.capscache.is_supported(contact, - common.xmpp.NS_ESESSION) + common.xmpp.NS_SSN) if session_supported: sess.terminate() del self.sessions[jid_stripped][sess.thread_id] Modified: trunk/src/common/gajim.py =================================================================== --- trunk/src/common/gajim.py 2008-11-30 18:16:11 UTC (rev 10725) +++ trunk/src/common/gajim.py 2008-11-30 18:53:02 UTC (rev 10726) @@ -180,7 +180,7 @@ xmpp.NS_MUC_CONFIG, xmpp.NS_COMMANDS, xmpp.NS_DISCO_INFO, 'ipv6', 'jabber:iq:gateway', xmpp.NS_LAST, xmpp.NS_PRIVACY, xmpp.NS_PRIVATE, xmpp.NS_REGISTER, xmpp.NS_VERSION, xmpp.NS_DATA, xmpp.NS_ENCRYPTED, 'msglog', - 'sslc2s', 'stringprep', xmpp.NS_PING, xmpp.NS_TIME_REVISED, xmpp.NS_GAMING, + 'sslc2s', 'stringprep', xmpp.NS_PING, xmpp.NS_TIME_REVISED, xmpp.NS_SSN, xmpp.NS_MOOD, xmpp.NS_ACTIVITY, xmpp.NS_NICK] # Optional features gajim supports per account Modified: trunk/src/common/xmpp/protocol.py =================================================================== --- trunk/src/common/xmpp/protocol.py 2008-11-30 18:16:11 UTC (rev 10725) +++ trunk/src/common/xmpp/protocol.py 2008-11-30 18:53:02 UTC (rev 10726) @@ -92,7 +92,8 @@ NS_SI ='http://jabber.org/protocol/si' # XEP-0096 NS_SI_PUB ='http://jabber.org/protocol/sipub' # XEP-0137 NS_SIGNED ='jabber:x:signed' # XEP-0027 -NS_STANZA_CRYPTO='http://www.xmpp.org/extensions/xep-0200.html#ns' # JEP-0200 +NS_SSN ='urn:xmpp:ssn' # XEP-0155 +NS_STANZA_CRYPTO='http://www.xmpp.org/extensions/xep-0200.html#ns' # XEP-0200 NS_STANZAS ='urn:ietf:params:xml:ns:xmpp-stanzas' NS_STREAM ='http://affinix.com/jabber/stream' NS_STREAMS ='http://etherx.jabber.org/streams'

1 0

[commit-gajim] r10725 - trunk/src
by js＠gajim.org 30 Nov '08

30 Nov '08

Author: js Date: 2008-11-30 19:16:11 +0100 (Sun, 30 Nov 2008) New Revision: 10725 Modified: trunk/src/chat_control.py Log: Also apply our notexistant caps trick to XHTML. Modified: trunk/src/chat_control.py =================================================================== --- trunk/src/chat_control.py 2008-11-29 23:43:23 UTC (rev 10724) +++ trunk/src/chat_control.py 2008-11-30 18:16:11 UTC (rev 10725) @@ -1235,7 +1235,8 @@ def update_toolbar(self): # Formatting - if gajim.capscache.is_supported(self.contact, NS_XHTML_IM): + if gajim.capscache.is_supported(self.contact, NS_XHTML_IM) + and not gajim.capscache.is_supported('notexistant'): self._formattings_button.set_sensitive(True) else: self._formattings_button.set_sensitive(False)

1 0

[commit-gajim] r10724 - trunk/src
by steve-e＠gajim.org 29 Nov '08

29 Nov '08

Author: steve-e Date: 2008-11-30 00:43:23 +0100 (Sun, 30 Nov 2008) New Revision: 10724 Modified: trunk/src/gajim.py trunk/src/roster_window.py Log: Do not duplicate a contact in roster on subscription changes. Fixes #4524. For performance reasons, get_contact_iters() cannot find a contact if get_shown_groups() returns something different to what has been applied to roster model. The contact was therefore duplicated as it was believed not to be there... Modified: trunk/src/gajim.py =================================================================== --- trunk/src/gajim.py 2008-11-29 18:50:03 UTC (rev 10723) +++ trunk/src/gajim.py 2008-11-29 23:43:23 UTC (rev 10724) @@ -1489,7 +1489,7 @@ contacts = gajim.contacts.get_contacts(account, jid) if (not sub or sub == 'none') and (not ask or ask == 'none') and \ not name and not groups: - # contact removes us. + # contact removed us. if contacts: self.roster.remove_contact(jid, account, backend=True) return @@ -1504,22 +1504,24 @@ else: # it is an existing contact that might has changed re_draw = False - # if sub or groups changed: remove and re-add - # Maybe observer status changed: - # according to xep 0162, contact is not an observer anymore when - # we asked him is auth, so also remove him if ask changed - old_groups = contacts[0].get_shown_groups() + # If contact has changed (sub, ask or group) update roster + # Mind about observer status changes: + # According to xep 0162, a contact is not an observer anymore when + # we asked for auth, so also remove him if ask changed + old_groups = contacts[0].groups if contacts[0].sub != sub or contacts[0].ask != ask\ or old_groups != groups: re_draw = True + if re_draw: + # c.get_shown_groups() has changed. Reflect that in roster_winodow + self.roster.remove_contact(jid, account, force=True) for contact in contacts: - if not name: - name = '' - contact.name = name + contact.name = name or '' contact.sub = sub contact.ask = ask contact.groups = groups or [] if re_draw: + self.roster.add_contact(jid, account) # Refilter and update old groups for group in old_groups: self.roster.draw_group(group, account) Modified: trunk/src/roster_window.py =================================================================== --- trunk/src/roster_window.py 2008-11-29 18:50:03 UTC (rev 10723) +++ trunk/src/roster_window.py 2008-11-29 23:43:23 UTC (rev 10724) @@ -872,12 +872,11 @@ for contact in gajim.contacts.get_contacts(account, jid): for group in groups: if group in contact.groups: - # Needed when we remove from "General" + # Needed when we remove from "General" or "Observers" contact.groups.remove(group) if update: gajim.connections[account].update_contact(jid, contact.name, contact.groups) - self.add_contact(jid, account) # Also redraw old groups

1 0

[commit-gajim] r10723 - trunk/src/common
by asterix＠gajim.org 29 Nov '08

29 Nov '08

Author: asterix Date: 2008-11-29 19:50:03 +0100 (Sat, 29 Nov 2008) New Revision: 10723 Modified: trunk/src/common/connection_handlers.py Log: fix session problem when other part don't support sessions. Fixes #4429 Modified: trunk/src/common/connection_handlers.py =================================================================== --- trunk/src/common/connection_handlers.py 2008-11-29 14:48:19 UTC (rev 10722) +++ trunk/src/common/connection_handlers.py 2008-11-29 18:50:03 UTC (rev 10723) @@ -2179,12 +2179,18 @@ keyID, timestamp, None)) if ptype == 'unavailable' and jid_stripped in self.sessions: - # automatically terminate sessions that they haven't sent a thread ID in + # automatically terminate sessions that they haven't sent a thread ID + # in, only if other part support thread ID for sess in self.sessions[jid_stripped].values(): if not sess.received_thread_id: - sess.terminate() - del self.sessions[jid_stripped][sess.thread_id] + contact = gajim.contacts.get_contact(self.name, jid_stripped) + session_supported = gajim.capscache.is_supported(contact, + common.xmpp.NS_ESESSION) + if session_supported: + sess.terminate() + del self.sessions[jid_stripped][sess.thread_id] + if avatar_sha is not None and ptype != 'error': if jid_stripped not in self.vcard_shas: cached_vcard = self.get_cached_vcard(jid_stripped)

1 0

[commit-gajim] r10722 - trunk
by js＠gajim.org 29 Nov '08

29 Nov '08

Author: js Date: 2008-11-29 15:48:19 +0100 (Sat, 29 Nov 2008) New Revision: 10722 Modified: trunk/setup_win32.py Log: Fix building on win32. There is no import named roman. Modified: trunk/setup_win32.py =================================================================== --- trunk/setup_win32.py 2008-11-29 13:38:47 UTC (rev 10721) +++ trunk/setup_win32.py 2008-11-29 14:48:19 UTC (rev 10722) @@ -41,7 +41,7 @@ else: fill_docutils_files(os.path.join(sys.prefix, 'Lib', 'site-packages')) docutils_files.append((os.path.join('docutils', 'writers', 'html4css1'), - glob.glob(os.path.join(sys.prefix, 'Lib', 'site-packages', 'docutils', + glob.glob(os.path.join(sys.prefix, 'Lib', 'site-packages', 'docutils', 'writers', 'html4css1', '*.css')))) sys.path.append('src') @@ -52,7 +52,7 @@ opts = { 'py2exe': { # ConfigParser,UserString,roman are needed for docutils - 'includes': 'pango,atk,gobject,cairo,pangocairo,gtk.keysyms,encodings,encodings.*,ConfigParser,UserString,roman', + 'includes': 'pango,atk,gobject,cairo,pangocairo,gtk.keysyms,encodings,encodings.*,ConfigParser,UserString', 'dll_excludes': [ 'iconv.dll','intl.dll','libatk-1.0-0.dll', 'libgdk_pixbuf-2.0-0.dll','libgdk-win32-2.0-0.dll',

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

Commits November 2008