Commits July 2008

commits@gajim.org

7 participants
229 discussions

[commit-gajim] r10089 - trunk/po
by asterix＠gajim.org 30 Jul '08

30 Jul '08

Author: asterix Date: 2008-07-30 21:59:24 +0200 (Wed, 30 Jul 2008) New Revision: 10089 Modified: trunk/po/pl.po Log: [paszczus] updated polish translation. Fixes #4162 Modified: trunk/po/pl.po =================================================================== --- trunk/po/pl.po 2008-07-30 17:19:21 UTC (rev 10088) +++ trunk/po/pl.po 2008-07-30 19:59:24 UTC (rev 10089) @@ -505,7 +505,7 @@ #: ../data/glade/accounts_window.glade.h:4 msgid "Proxy" -msgstr "Proxy" +msgstr "Proxy" #: ../data/glade/accounts_window.glade.h:6 msgid "Accounts" @@ -1102,7 +1102,7 @@ #: ../data/glade/esession_info_window.glade.h:2 #, fuzzy msgid "Close" -msgstr "Kolor" +msgstr "Zamknij" #: ../data/glade/esession_info_window.glade.h:3 msgid "" @@ -1728,18 +1728,16 @@ msgstr "Wyświetlaj _dodatkowe informacje o poczcie e-mail" #: ../data/glade/preferences_window.glade.h:41 -#, fuzzy msgid "Display _tunes of contacts in roster" -msgstr "Wyświetlaj awatary kontaktów z listy" +msgstr "Wyświetlaj muzyczne ikonki kontaktów z listy" #: ../data/glade/preferences_window.glade.h:42 msgid "Display a_vatars of contacts in roster" msgstr "Wyświetlaj awatary kontaktów z listy" #: ../data/glade/preferences_window.glade.h:43 -#, fuzzy msgid "Display m_ood of contacts in roster" -msgstr "Wyświetlaj awatary kontaktów z listy" +msgstr "Wyświetlaj nastroje kontaktów z listy" #: ../data/glade/preferences_window.glade.h:44 msgid "Display status _messages of contacts in roster" @@ -1828,19 +1826,17 @@ "jego nazwą na liście kontaktów" #: ../data/glade/preferences_window.glade.h:57 -#, fuzzy msgid "" "If checked, Gajim will display the mood of contacts in the roster window" msgstr "" -"Zaznaczenie tej opcji spowoduje wyświetlanie awatarów w oknie listy " +"Zaznaczenie tej opcji spowoduje wyświetlanie nastrojów w oknie listy " "kontaktów (roster oraz okno czatu)" #: ../data/glade/preferences_window.glade.h:58 -#, fuzzy msgid "" "If checked, Gajim will display the tunes of contacts in the roster window" msgstr "" -"Zaznaczenie tej opcji spowoduje wyświetlanie awatarów w oknie listy " +"Zaznaczenie tej opcji spowoduje wyświetlanie muzycznych ikonek w oknie listy " "kontaktów (roster oraz okno czatu)" #: ../data/glade/preferences_window.glade.h:59 @@ -2068,6 +2064,11 @@ msgid "_Mail client:" msgstr "Klient _poczty:" +#: ../data/glade/preferences_window.glade.h:99 +#, fuzzy +msgid "_Make message windows compact" +msgstr "_Spraw, by okna wiadomości były zwarte" + #: ../data/glade/preferences_window.glade.h:102 msgid "_Not available after:" msgstr "Automatyczny status '_Nieobecny' po:"

1 0

[commit-gajim] r10088 - trunk/po
by js＠gajim.org 30 Jul '08

30 Jul '08

Author: js Date: 2008-07-30 19:19:21 +0200 (Wed, 30 Jul 2008) New Revision: 10088 Modified: trunk/po/de.po Log: Fix missing space in translation. Modified: trunk/po/de.po =================================================================== --- trunk/po/de.po 2008-07-30 16:08:38 UTC (rev 10087) +++ trunk/po/de.po 2008-07-30 17:19:21 UTC (rev 10088) @@ -7443,7 +7443,7 @@ #: ../src/gajim.py:1706 #, python-format msgid "You successfully sent %(filename)s to %(name)s." -msgstr "Sie haben%(filename)s erfolgreich an %(name)s gesendet." +msgstr "Sie haben %(filename)s erfolgreich an %(name)s gesendet." #. ft stopped #: ../src/gajim.py:1710

1 0

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

30 Jul '08

Author: asterix Date: 2008-07-30 18:08:38 +0200 (Wed, 30 Jul 2008) New Revision: 10087 Modified: trunk/src/roster_window.py Log: TrackMusickListener (so is PublishTune) is available only if dbus id supported. Fixes #4153 Modified: trunk/src/roster_window.py =================================================================== --- trunk/src/roster_window.py 2008-07-30 15:43:53 UTC (rev 10086) +++ trunk/src/roster_window.py 2008-07-30 16:08:38 UTC (rev 10087) @@ -4873,8 +4873,11 @@ pep_menuitem.set_submenu(pep_submenu) item = gtk.CheckMenuItem(_('Publish Tune')) pep_submenu.append(item) - item.set_active(have_tune) - item.connect('toggled', self.on_publish_tune_toggled, account) + if not dbus_support.supported: + item.set_sensitive(False) + else: + item.set_active(have_tune) + item.connect('toggled', self.on_publish_tune_toggled, account) item = gtk.CheckMenuItem(_('Mood')) pep_submenu.append(item) item.set_active(len(gajim.connections[account].mood) > 0) @@ -6304,7 +6307,8 @@ self.setup_and_draw_roster() for account in gajim.connections: - if gajim.config.get_per('accounts', account, 'publish_tune'): + if gajim.config.get_per('accounts', account, 'publish_tune') and \ + dbus_support.supported: listener = MusicTrackListener.get() self.music_track_changed_signal = listener.connect( 'music-track-changed', self.music_track_changed)

1 0

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

30 Jul '08

Author: asterix Date: 2008-07-30 17:43:53 +0200 (Wed, 30 Jul 2008) New Revision: 10086 Modified: trunk/src/common/connection.py trunk/src/common/xmpp/transports_nb.py trunk/src/gajim.py Log: handle disconnection while insecure connetion dialog is opened. fixes #4138 Modified: trunk/src/common/connection.py =================================================================== --- trunk/src/common/connection.py 2008-07-30 14:00:21 UTC (rev 10085) +++ trunk/src/common/connection.py 2008-07-30 15:43:53 UTC (rev 10086) @@ -154,6 +154,8 @@ self.activity = {} # Do we continue connection when we get roster (send presence,get vcard..) self.continue_connect_info = None + # Do we auto accept insecure connection + self.connection_auto_accepted = False # To know the groupchat jid associated with a sranza ID. Useful to # request vcard or os info... to a real JID but act as if it comes from # the fake jid @@ -617,9 +619,11 @@ 'warn_when_plaintext_connection'): self.dispatch('PLAIN_CONNECTION', (con,)) return True + con.RegisterDisconnectHandler(self._on_disconnected) if _con_type in ('tls', 'ssl') and not hasattr(con.Connection, '_sslContext') and gajim.config.get_per('accounts', self.name, - 'warn_when_insecure_ssl_connection'): + 'warn_when_insecure_ssl_connection') and \ + not self.connection_auto_accepted: # Pyopenssl is not used self.dispatch('INSECURE_SSL_CONNECTION', (con, _con_type)) return True @@ -627,8 +631,10 @@ def connection_accepted(self, con, con_type): self.hosts = [] + self.connection_auto_accepted = False self.connected_hostname = self._current_host['host'] self.on_connect_failure = None + con.UnregisterDisconnectHandler(self._on_disconnected) con.RegisterDisconnectHandler(self._disconnectedReconnCB) log.debug('Connected to server %s:%s with %s' % ( self._current_host['host'], self._current_host['port'], con_type)) @@ -1745,4 +1751,4 @@ # END Connection -# vim: se ts=3: \ No newline at end of file +# vim: se ts=3: Modified: trunk/src/common/xmpp/transports_nb.py =================================================================== --- trunk/src/common/xmpp/transports_nb.py 2008-07-30 14:00:21 UTC (rev 10085) +++ trunk/src/common/xmpp/transports_nb.py 2008-07-30 15:43:53 UTC (rev 10086) @@ -476,6 +476,7 @@ if errnum != 0: self.DEBUG(errtxt, 'error') log.error("Connection to %s lost: %s [%d]", self.getName(), errtxt, errnum) + self._owner.disconnected() self.printed_error = True if not errors_only and self.state >= 0: self.pollend(retry=True) @@ -1115,4 +1116,4 @@ ''' Overwrites DEBUG tag to allow debug output be presented as "CONNECTproxy".''' return self._owner.DEBUG(DBG_CONNECT_PROXY, text, severity) -# vim: se ts=3: \ No newline at end of file +# vim: se ts=3: Modified: trunk/src/gajim.py =================================================================== --- trunk/src/gajim.py 2008-07-30 14:00:21 UTC (rev 10085) +++ trunk/src/gajim.py 2008-07-30 15:43:53 UTC (rev 10086) @@ -2037,6 +2037,13 @@ if is_checked[1]: gajim.config.set_per('accounts', account, 'warn_when_insecure_ssl_connection', False) + if gajim.connections[account].connected == 0: + # We have been disconnecting (too long time since window is opened) + # re-connect with auto-accept + gajim.connections[account].connection_auto_accepted = True + show, msg = gajim.connections[account].continue_connect_info[:2] + self.roster.send_status(account, show, msg) + return gajim.connections[account].connection_accepted(data[0], data[1]) def on_cancel(): gajim.connections[account].disconnect(on_purpose=True)

1 0

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

30 Jul '08

Author: js Date: 2008-07-30 16:00:21 +0200 (Wed, 30 Jul 2008) New Revision: 10085 Modified: trunk/src/chat_control.py Log: Fix a TB. Modified: trunk/src/chat_control.py =================================================================== --- trunk/src/chat_control.py 2008-07-30 12:21:47 UTC (rev 10084) +++ trunk/src/chat_control.py 2008-07-30 14:00:21 UTC (rev 10085) @@ -1273,17 +1273,12 @@ # Translate standard subactivities if HAVE_MARKUP_TOOLTIPS: - activity = gobject.markup_escape_text(activity) - subactivity = gobject.markup_escape_text( - subactivity) - - tooltip = '' + activity + tooltip = '' + gobject.markup_escape_text(activity) if subactivity: - tooltip += ': ' + subactivity + tooltip += ': ' + gobject.markup_escape_text(subactivity) tooltip += '' if text: - text = gobject.markup_escape_text(text) - tooltip += '\n' + text + tooltip += '\n' + gobject.markup_escape_text(text) self._activity_image.set_tooltip_markup(tooltip) else: tooltip = activity @@ -1297,7 +1292,6 @@ else: self._activity_image.hide() - def update_tune(self): artist = None title = None @@ -2604,4 +2598,4 @@ self.print_conversation('%s' % (status), 'status', simple=True) self.print_conversation(')', 'status', simple=True) -# vim: se ts=3: \ No newline at end of file +# vim: se ts=3:

1 0

[commit-gajim] r10084 - in trunk/src: . common
by asterix＠gajim.org 30 Jul '08

30 Jul '08

Author: asterix Date: 2008-07-30 14:21:47 +0200 (Wed, 30 Jul 2008) New Revision: 10084 Modified: trunk/src/common/helpers.py trunk/src/dialogs.py trunk/src/gajim.py trunk/src/message_control.py Log: prevent sending invalid XML chars in chat / groupchat and status. Fixes #3296 Modified: trunk/src/common/helpers.py =================================================================== --- trunk/src/common/helpers.py 2008-07-30 07:46:05 UTC (rev 10083) +++ trunk/src/common/helpers.py 2008-07-30 12:21:47 UTC (rev 10084) @@ -645,6 +645,11 @@ pass return string +def remove_invalid_xml_chars(string): + if string: + string = re.sub(gajim.interface.invalid_XML_chars_re, '', string) + return string + def get_windows_reg_env(varname, default=''): '''asks for paths commonly used but not exposed as ENVs in english Windows 2003 those are: @@ -1287,4 +1292,4 @@ gajim.connections[a].change_status(gajim.SHOW_LIST[connected], gajim.connections[a].status) -# vim: se ts=3: \ No newline at end of file +# vim: se ts=3: Modified: trunk/src/dialogs.py =================================================================== --- trunk/src/dialogs.py 2008-07-30 07:46:05 UTC (rev 10083) +++ trunk/src/dialogs.py 2008-07-30 12:21:47 UTC (rev 10084) @@ -608,6 +608,7 @@ beg, end = self.message_buffer.get_bounds() message = self.message_buffer.get_text(beg, end).decode('utf-8')\ .strip() + message = helpers.remove_invalid_xml_chars(message) msg = helpers.to_one_line(message) if self.show: gajim.config.set('last_status_msg_' + self.show, msg) @@ -3847,4 +3848,4 @@ self.session.verified_identity = True self.update_info() -# vim: se ts=3: \ No newline at end of file +# vim: se ts=3: Modified: trunk/src/gajim.py =================================================================== --- trunk/src/gajim.py 2008-07-30 07:46:05 UTC (rev 10083) +++ trunk/src/gajim.py 2008-07-30 12:21:47 UTC (rev 10084) @@ -2416,6 +2416,10 @@ # at least one character in 3 parts (before @, after @, after .) self.sth_at_sth_dot_sth_re = re.compile(r'\S+(a)\S+\.\S*[^\s)?]') + # Invalid XML chars + invalid_XML_chars = u'[\x00-\x08]|[\x0b-\x0c]|[\x0e-\x19]|[\ud800-\udfff]|[\ufffe-\uffff]' + self.invalid_XML_chars_re = re.compile(invalid_XML_chars) + re.purge() # clear the regular expression cache def on_emoticon_sort(self, emot1, emot2): @@ -3291,4 +3295,4 @@ except KeyboardInterrupt: print >> sys.stderr, 'KeyboardInterrupt' -# vim: se ts=3: \ No newline at end of file +# vim: se ts=3: Modified: trunk/src/message_control.py =================================================================== --- trunk/src/message_control.py 2008-07-30 07:46:05 UTC (rev 10083) +++ trunk/src/message_control.py 2008-07-30 12:21:47 UTC (rev 10084) @@ -20,6 +20,7 @@ import gtkgui_helpers from common import gajim +from common import helpers # Derived types MUST register their type IDs here if custom behavor is required TYPE_CHAT = 'chat' @@ -154,6 +155,9 @@ # Send the given message to the active tab. # Doesn't return None if error jid = self.contact.jid + + message = helpers.remove_invalid_xml_chars(message) + original_message = message conn = gajim.connections[self.account] @@ -176,4 +180,4 @@ session = self.session, original_message = original_message) -# vim: se ts=3: \ No newline at end of file +# vim: se ts=3:

1 0

[commit-gajim] r10083 - trunk/src/common
by asterix＠gajim.org 30 Jul '08

30 Jul '08

Author: asterix Date: 2008-07-30 09:46:05 +0200 (Wed, 30 Jul 2008) New Revision: 10083 Modified: trunk/src/common/dataforms.py Log: don't remove field in the loop that iter on them. Modified: trunk/src/common/dataforms.py =================================================================== --- trunk/src/common/dataforms.py 2008-07-29 20:57:13 UTC (rev 10082) +++ trunk/src/common/dataforms.py 2008-07-30 07:46:05 UTC (rev 10083) @@ -391,16 +391,19 @@ c = SimpleDataForm(extend=self) del c.title c.instructions = '' + to_be_removed = [] for f in c.iter_fields(): if f.required: # Keep all required fields continue if (hasattr(f, 'value') and not f.value) or (hasattr(f, 'values') and \ len(f.values) == 0): - c.delChild(f) + to_be_removed.append(f) else: del f.label del f.description + for f in to_be_removed: + c.delChild(f) return c class MultipleDataForm(DataForm): @@ -458,4 +461,4 @@ # return locals() -# vim: se ts=3: \ No newline at end of file +# vim: se ts=3:

1 0

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

29 Jul '08

Author: js Date: 2008-07-29 22:57:13 +0200 (Tue, 29 Jul 2008) New Revision: 10082 Modified: trunk/src/tooltips.py Log: Make tooltips consistent. Modified: trunk/src/tooltips.py =================================================================== --- trunk/src/tooltips.py 2008-07-29 19:49:31 UTC (rev 10081) +++ trunk/src/tooltips.py 2008-07-29 20:57:13 UTC (rev 10082) @@ -601,7 +601,7 @@ activity_sub = ACTIVITIES[act_plain][activity_sub] activity_sub = \ gobject.markup_escape_text(activity_sub) - activity_string += ' (%s)' % activity_sub + activity_string += ': %s' % activity_sub else: activity_string += '' if contact.activity.has_key('text'): @@ -738,4 +738,4 @@ 'It is most likely legacy or broken')) self.win.add(label) -# vim: se ts=3: \ No newline at end of file +# vim: se ts=3:

1 0

[commit-gajim] r10081 - in trunk: . data/emoticons/animated data/emoticons/static data/emoticons/static-big scripts/dev src src/common src/common/xmpp src/common/zeroconf src/osx src/osx/growl src/osx/syncmenu test
by js＠gajim.org 29 Jul '08

29 Jul '08

Author: js Date: 2008-07-29 21:49:31 +0200 (Tue, 29 Jul 2008) New Revision: 10081 Modified: trunk/data/emoticons/animated/emoticons.py trunk/data/emoticons/static-big/emoticons.py trunk/data/emoticons/static/emoticons.py trunk/scripts/dev/run-pychecker.py trunk/setup_osx.py trunk/setup_win32.py trunk/src/adhoc_commands.py trunk/src/advanced.py trunk/src/atom_window.py trunk/src/cell_renderer_image.py trunk/src/chat_control.py trunk/src/common/GnuPG.py trunk/src/common/GnuPGInterface.py trunk/src/common/__init__.py trunk/src/common/atom.py trunk/src/common/caps.py trunk/src/common/check_paths.py trunk/src/common/commands.py trunk/src/common/config.py trunk/src/common/configpaths.py trunk/src/common/connection.py trunk/src/common/connection_handlers.py trunk/src/common/contacts.py trunk/src/common/crypto.py trunk/src/common/dataforms.py trunk/src/common/dbus_support.py trunk/src/common/defs.py trunk/src/common/dh.py trunk/src/common/events.py trunk/src/common/exceptions.py trunk/src/common/fuzzyclock.py trunk/src/common/gajim.py trunk/src/common/helpers.py trunk/src/common/i18n.py trunk/src/common/logger.py trunk/src/common/nslookup.py trunk/src/common/optparser.py trunk/src/common/passwords.py trunk/src/common/pep.py trunk/src/common/proxy65_manager.py trunk/src/common/pubsub.py trunk/src/common/rst_xhtml_generator.py trunk/src/common/sleepy.py trunk/src/common/socks5.py trunk/src/common/stanza_session.py trunk/src/common/xmpp/__init__.py trunk/src/common/xmpp/auth.py trunk/src/common/xmpp/auth_nb.py trunk/src/common/xmpp/browser.py trunk/src/common/xmpp/c14n.py trunk/src/common/xmpp/client.py trunk/src/common/xmpp/client_nb.py trunk/src/common/xmpp/commands.py trunk/src/common/xmpp/debug.py trunk/src/common/xmpp/dispatcher.py trunk/src/common/xmpp/dispatcher_nb.py trunk/src/common/xmpp/features.py trunk/src/common/xmpp/features_nb.py trunk/src/common/xmpp/filetransfer.py trunk/src/common/xmpp/idlequeue.py trunk/src/common/xmpp/protocol.py trunk/src/common/xmpp/roster.py trunk/src/common/xmpp/roster_nb.py trunk/src/common/xmpp/session.py trunk/src/common/xmpp/simplexml.py trunk/src/common/xmpp/transports.py trunk/src/common/xmpp/transports_nb.py trunk/src/common/xmpp_stringprep.py trunk/src/common/zeroconf/__init__.py trunk/src/common/zeroconf/client_zeroconf.py trunk/src/common/zeroconf/connection_handlers_zeroconf.py trunk/src/common/zeroconf/connection_zeroconf.py trunk/src/common/zeroconf/roster_zeroconf.py trunk/src/common/zeroconf/zeroconf.py trunk/src/common/zeroconf/zeroconf_avahi.py trunk/src/common/zeroconf/zeroconf_bonjour.py trunk/src/config.py trunk/src/conversation_textview.py trunk/src/dataforms_widget.py trunk/src/dialogs.py trunk/src/disco.py trunk/src/features_window.py trunk/src/filetransfers_window.py trunk/src/gajim-remote.py trunk/src/gajim.py trunk/src/gajim_themes_window.py trunk/src/groupchat_control.py trunk/src/groups.py trunk/src/gtkexcepthook.py trunk/src/gtkgui_helpers.py trunk/src/history_manager.py trunk/src/history_window.py trunk/src/htmltextview.py trunk/src/ipython_view.py trunk/src/lastfm.py trunk/src/lastfm_track_listener.py trunk/src/message_control.py trunk/src/message_textview.py trunk/src/message_window.py trunk/src/music_track_listener.py trunk/src/negotiation.py trunk/src/network_manager_listener.py trunk/src/notify.py trunk/src/osx/__init__.py trunk/src/osx/dbus.py trunk/src/osx/growl/Growl.py trunk/src/osx/growl/__init__.py trunk/src/osx/growl/setup.py trunk/src/osx/growler.py trunk/src/osx/prep_py2app.py trunk/src/osx/setup.py trunk/src/osx/syncmenu/setup.py trunk/src/osx/syncmenu/test-menu.py trunk/src/profile_window.py trunk/src/remote_control.py trunk/src/roster_window.py trunk/src/search_window.py trunk/src/secrets.py trunk/src/session.py trunk/src/statusicon.py trunk/src/systray.py trunk/src/tooltips.py trunk/src/vcard.py trunk/test/mock.py trunk/test/mocks.py trunk/test/notify.py trunk/test/test_caps.py trunk/test/test_dispatcher_nb.py trunk/test/test_misc_interface.py trunk/test/test_sessions.py trunk/test/testlib.py Log: For historical reasons, we have a tab width of 3. This is strange, but we have that in all files. To at least lesser the confusion a bit, add vim tags for that. Additionally, fix wrong #! in a few files. Modified: trunk/data/emoticons/animated/emoticons.py =================================================================== --- trunk/data/emoticons/animated/emoticons.py 2008-07-29 19:42:31 UTC (rev 10080) +++ trunk/data/emoticons/animated/emoticons.py 2008-07-29 19:49:31 UTC (rev 10081) @@ -49,3 +49,5 @@ 'puke.gif': [':-!'], } + +# vim: se ts=3: \ No newline at end of file Modified: trunk/data/emoticons/static/emoticons.py =================================================================== --- trunk/data/emoticons/static/emoticons.py 2008-07-29 19:42:31 UTC (rev 10080) +++ trunk/data/emoticons/static/emoticons.py 2008-07-29 19:49:31 UTC (rev 10081) @@ -41,3 +41,5 @@ 'rainbow.png': ['(R)'], 'puke.png': [':-!'], } + +# vim: se ts=3: \ No newline at end of file Modified: trunk/data/emoticons/static-big/emoticons.py =================================================================== --- trunk/data/emoticons/static-big/emoticons.py 2008-07-29 19:42:31 UTC (rev 10080) +++ trunk/data/emoticons/static-big/emoticons.py 2008-07-29 19:49:31 UTC (rev 10081) @@ -41,3 +41,5 @@ 'rainbow.png': ['(R)'], 'puke.png': [':-!'], } + +# vim: se ts=3: \ No newline at end of file Modified: trunk/scripts/dev/run-pychecker.py =================================================================== --- trunk/scripts/dev/run-pychecker.py 2008-07-29 19:42:31 UTC (rev 10080) +++ trunk/scripts/dev/run-pychecker.py 2008-07-29 19:49:31 UTC (rev 10081) @@ -1,4 +1,4 @@ -#! /usr/bin/env python +#!/usr/bin/env python # (C) 2006 Nikos Kouremenos <kourem(a)gmail.com> import os @@ -10,3 +10,5 @@ os.system('pychecker --limit 10000 --no-shadowbuiltin *.py &> /tmp/pychecker-gajim.log') os.system('$EDITOR /tmp/pychecker-gajim.log') + +# vim: se ts=3: Modified: trunk/setup_osx.py =================================================================== --- trunk/setup_osx.py 2008-07-29 19:42:31 UTC (rev 10080) +++ trunk/setup_osx.py 2008-07-29 19:49:31 UTC (rev 10081) @@ -198,3 +198,5 @@ finishApp() elif sys.argv[1] == "dist": distApp() + +# vim: se ts=3: \ No newline at end of file Modified: trunk/setup_win32.py =================================================================== --- trunk/setup_win32.py 2008-07-29 19:42:31 UTC (rev 10080) +++ trunk/setup_win32.py 2008-07-29 19:49:31 UTC (rev 10081) @@ -75,3 +75,5 @@ ('.', glob.glob('src/history_manager.glade')), ], ) + +# vim: se ts=3: \ No newline at end of file Modified: trunk/src/adhoc_commands.py =================================================================== --- trunk/src/adhoc_commands.py 2008-07-29 19:42:31 UTC (rev 10080) +++ trunk/src/adhoc_commands.py 2008-07-29 19:49:31 UTC (rev 10081) @@ -516,3 +516,5 @@ # we did not received any reply from service; FIXME: we should wait and # then send cancel; for now we do nothing pass + +# vim: se ts=3: \ No newline at end of file Modified: trunk/src/advanced.py =================================================================== --- trunk/src/advanced.py 2008-07-29 19:42:31 UTC (rev 10080) +++ trunk/src/advanced.py 2008-07-29 19:49:31 UTC (rev 10081) @@ -271,3 +271,5 @@ def on_advanced_entry_changed(self, widget): self.modelfilter.refilter() + +# vim: se ts=3: \ No newline at end of file Modified: trunk/src/atom_window.py =================================================================== --- trunk/src/atom_window.py 2008-07-29 19:42:31 UTC (rev 10080) +++ trunk/src/atom_window.py 2008-07-29 19:49:31 UTC (rev 10081) @@ -133,3 +133,5 @@ if uri is not None: helpers.launch_browser_mailer('url', uri) return True + +# vim: se ts=3: \ No newline at end of file Modified: trunk/src/cell_renderer_image.py =================================================================== --- trunk/src/cell_renderer_image.py 2008-07-29 19:42:31 UTC (rev 10080) +++ trunk/src/cell_renderer_image.py 2008-07-29 19:49:31 UTC (rev 10081) @@ -140,3 +140,5 @@ (cell_area.height - calc_height - \ self.get_property('ypad')) return x_offset, y_offset, calc_width, calc_height + +# vim: se ts=3: \ No newline at end of file Modified: trunk/src/chat_control.py =================================================================== --- trunk/src/chat_control.py 2008-07-29 19:42:31 UTC (rev 10080) +++ trunk/src/chat_control.py 2008-07-29 19:49:31 UTC (rev 10081) @@ -2603,3 +2603,5 @@ self.print_conversation(' (', 'status', simple=True) self.print_conversation('%s' % (status), 'status', simple=True) self.print_conversation(')', 'status', simple=True) + +# vim: se ts=3: \ No newline at end of file Modified: trunk/src/common/GnuPG.py =================================================================== --- trunk/src/common/GnuPG.py 2008-07-29 19:42:31 UTC (rev 10080) +++ trunk/src/common/GnuPG.py 2008-07-29 19:49:31 UTC (rev 10081) @@ -228,3 +228,5 @@ out = out + data + "\n" out = out + "-----END PGP %s-----\n" % type return out + +# vim: se ts=3: \ No newline at end of file Modified: trunk/src/common/GnuPGInterface.py =================================================================== --- trunk/src/common/GnuPGInterface.py 2008-07-29 19:42:31 UTC (rev 10080) +++ trunk/src/common/GnuPGInterface.py 2008-07-29 19:49:31 UTC (rev 10081) @@ -655,3 +655,5 @@ if __name__ == '__main__': _run_doctests() + +# vim: se ts=3: \ No newline at end of file Modified: trunk/src/common/__init__.py =================================================================== --- trunk/src/common/__init__.py 2008-07-29 19:42:31 UTC (rev 10080) +++ trunk/src/common/__init__.py 2008-07-29 19:49:31 UTC (rev 10081) @@ -0,0 +1,2 @@ + +# vim: se ts=3: \ No newline at end of file Modified: trunk/src/common/atom.py =================================================================== --- trunk/src/common/atom.py 2008-07-29 19:42:31 UTC (rev 10080) +++ trunk/src/common/atom.py 2008-07-29 19:49:31 UTC (rev 10081) @@ -134,3 +134,5 @@ ''' Last significant modification time. ''') feed_tagline = u'' + +# vim: se ts=3: \ No newline at end of file Modified: trunk/src/common/caps.py =================================================================== --- trunk/src/common/caps.py 2008-07-29 19:42:31 UTC (rev 10080) +++ trunk/src/common/caps.py 2008-07-29 19:49:31 UTC (rev 10081) @@ -278,3 +278,5 @@ return caps.update(identities, features) + +# vim: se ts=3: \ No newline at end of file Modified: trunk/src/common/check_paths.py =================================================================== --- trunk/src/common/check_paths.py 2008-07-29 19:42:31 UTC (rev 10080) +++ trunk/src/common/check_paths.py 2008-07-29 19:49:31 UTC (rev 10081) @@ -146,3 +146,5 @@ def create_path(directory): print _('creating %s directory') % directory os.mkdir(directory, 0700) + +# vim: se ts=3: \ No newline at end of file Modified: trunk/src/common/commands.py =================================================================== --- trunk/src/common/commands.py 2008-07-29 19:42:31 UTC (rev 10080) +++ trunk/src/common/commands.py 2008-07-29 19:49:31 UTC (rev 10081) @@ -412,3 +412,5 @@ del self.__sessions[magictuple] raise xmpp.NodeProcessed + +# vim: se ts=3: \ No newline at end of file Modified: trunk/src/common/config.py =================================================================== --- trunk/src/common/config.py 2008-07-29 19:42:31 UTC (rev 10080) +++ trunk/src/common/config.py 2008-07-29 19:49:31 UTC (rev 10081) @@ -649,3 +649,5 @@ self.add_per('defaultstatusmsg', status) self.set_per('defaultstatusmsg', status, 'enabled', default[0]) self.set_per('defaultstatusmsg', status, 'message', default[1]) + +# vim: se ts=3: \ No newline at end of file Modified: trunk/src/common/configpaths.py =================================================================== --- trunk/src/common/configpaths.py 2008-07-29 19:42:31 UTC (rev 10080) +++ trunk/src/common/configpaths.py 2008-07-29 19:49:31 UTC (rev 10081) @@ -121,3 +121,5 @@ # print "%s: %s" % (repr(k), repr(v)) gajimpaths = ConfigPaths() + +# vim: se ts=3: \ No newline at end of file Modified: trunk/src/common/connection.py =================================================================== --- trunk/src/common/connection.py 2008-07-29 19:42:31 UTC (rev 10080) +++ trunk/src/common/connection.py 2008-07-29 19:49:31 UTC (rev 10081) @@ -1744,3 +1744,5 @@ self.connection.SendAndCallForResponse(iq, _on_response) # END Connection + +# vim: se ts=3: \ No newline at end of file Modified: trunk/src/common/connection_handlers.py =================================================================== --- trunk/src/common/connection_handlers.py 2008-07-29 19:42:31 UTC (rev 10080) +++ trunk/src/common/connection_handlers.py 2008-07-29 19:49:31 UTC (rev 10081) @@ -2447,3 +2447,5 @@ con.RegisterHandler('presence', self._StanzaArrivedCB) con.RegisterHandler('message', self._StanzaArrivedCB) con.RegisterHandler('unknown', self._StreamCB, 'urn:ietf:params:xml:ns:xmpp-streams', xmlns='http://etherx.jabber.org/streams') + +# vim: se ts=3: \ No newline at end of file Modified: trunk/src/common/contacts.py =================================================================== --- trunk/src/common/contacts.py 2008-07-29 19:42:31 UTC (rev 10080) +++ trunk/src/common/contacts.py 2008-07-29 19:49:31 UTC (rev 10081) @@ -614,3 +614,5 @@ if not nick in nick_list: return None return self._gc_contacts[account][room_jid][nick] + +# vim: se ts=3: \ No newline at end of file Modified: trunk/src/common/crypto.py =================================================================== --- trunk/src/common/crypto.py 2008-07-29 19:42:31 UTC (rev 10080) +++ trunk/src/common/crypto.py 2008-07-29 19:49:31 UTC (rev 10081) @@ -84,3 +84,5 @@ exp /= 2 return result + +# vim: se ts=3: \ No newline at end of file Modified: trunk/src/common/dataforms.py =================================================================== --- trunk/src/common/dataforms.py 2008-07-29 19:42:31 UTC (rev 10080) +++ trunk/src/common/dataforms.py 2008-07-29 19:49:31 UTC (rev 10081) @@ -457,3 +457,5 @@ # self.addChild(node=record) # return locals() + +# vim: se ts=3: \ No newline at end of file Modified: trunk/src/common/dbus_support.py =================================================================== --- trunk/src/common/dbus_support.py 2008-07-29 19:42:31 UTC (rev 10080) +++ trunk/src/common/dbus_support.py 2008-07-29 19:49:31 UTC (rev 10081) @@ -149,3 +149,5 @@ class InvalidArgument(dbus.DBusException): '''Raised when one of the provided arguments is invalid.''' _dbus_error_name = _GAJIM_ERROR_IFACE + '.InvalidArgument' + +# vim: se ts=3: \ No newline at end of file Modified: trunk/src/common/defs.py =================================================================== --- trunk/src/common/defs.py 2008-07-29 19:42:31 UTC (rev 10080) +++ trunk/src/common/defs.py 2008-07-29 19:49:31 UTC (rev 10081) @@ -8,3 +8,5 @@ import sys, os.path for base in ('.', 'common'): sys.path.append(os.path.join(base, '.libs')) + +# vim: se ts=3: \ No newline at end of file Modified: trunk/src/common/dh.py =================================================================== --- trunk/src/common/dh.py 2008-07-29 19:42:31 UTC (rev 10080) +++ trunk/src/common/dh.py 2008-07-29 19:49:31 UTC (rev 10081) @@ -205,3 +205,5 @@ return int(stripee.translate(all_ascii, string.whitespace), 16) primes = map(hex_to_decimal, hex_primes) + +# vim: se ts=3: \ No newline at end of file Modified: trunk/src/common/events.py =================================================================== --- trunk/src/common/events.py 2008-07-29 19:42:31 UTC (rev 10080) +++ trunk/src/common/events.py 2008-07-29 19:49:31 UTC (rev 10081) @@ -291,3 +291,5 @@ '''return all events that must be displayed in roster: {account1: {jid1: [ev1, ev2], },. }''' return self._get_some_events('roster') + +# vim: se ts=3: \ No newline at end of file Modified: trunk/src/common/exceptions.py =================================================================== --- trunk/src/common/exceptions.py 2008-07-29 19:42:31 UTC (rev 10080) +++ trunk/src/common/exceptions.py 2008-07-29 19:49:31 UTC (rev 10081) @@ -87,3 +87,5 @@ def __str__(self): return self.text + +# vim: se ts=3: \ No newline at end of file Modified: trunk/src/common/fuzzyclock.py =================================================================== --- trunk/src/common/fuzzyclock.py 2008-07-29 19:42:31 UTC (rev 10080) +++ trunk/src/common/fuzzyclock.py 2008-07-29 19:49:31 UTC (rev 10081) @@ -139,3 +139,5 @@ newTimeStr = self.__fuzzyWeek[3] return newTimeStr + +# vim: se ts=3: \ No newline at end of file Modified: trunk/src/common/gajim.py =================================================================== --- trunk/src/common/gajim.py 2008-07-29 19:42:31 UTC (rev 10080) +++ trunk/src/common/gajim.py 2008-07-29 19:49:31 UTC (rev 10081) @@ -388,3 +388,5 @@ config.get_per('accounts', account, 'adjust_priority_with_status'): return config.get_per('accounts', account, 'autopriority_' + show) return config.get_per('accounts', account, 'priority') + +# vim: se ts=3: \ No newline at end of file Modified: trunk/src/common/helpers.py =================================================================== --- trunk/src/common/helpers.py 2008-07-29 19:42:31 UTC (rev 10080) +++ trunk/src/common/helpers.py 2008-07-29 19:49:31 UTC (rev 10081) @@ -1286,3 +1286,5 @@ if connected > 1 and gajim.SHOW_LIST[connected] != 'invisible': gajim.connections[a].change_status(gajim.SHOW_LIST[connected], gajim.connections[a].status) + +# vim: se ts=3: \ No newline at end of file Modified: trunk/src/common/i18n.py =================================================================== --- trunk/src/common/i18n.py 2008-07-29 19:42:31 UTC (rev 10080) +++ trunk/src/common/i18n.py 2008-07-29 19:49:31 UTC (rev 10081) @@ -86,3 +86,5 @@ elif n > 1 and replace_plural is not None: text = text % replace_plural return text + +# vim: se ts=3: \ No newline at end of file Modified: trunk/src/common/logger.py =================================================================== --- trunk/src/common/logger.py 2008-07-29 19:42:31 UTC (rev 10080) +++ trunk/src/common/logger.py 2008-07-29 19:49:31 UTC (rev 10081) @@ -760,3 +760,5 @@ self.con.commit() except sqlite.OperationalError, e: print >> sys.stderr, str(e) + +# vim: se ts=3: \ No newline at end of file Modified: trunk/src/common/nslookup.py =================================================================== --- trunk/src/common/nslookup.py 2008-07-29 19:42:31 UTC (rev 10080) +++ trunk/src/common/nslookup.py 2008-07-29 19:49:31 UTC (rev 10081) @@ -333,3 +333,5 @@ gobject.timeout_add(200, process) gtk.main() + +# vim: se ts=3: \ No newline at end of file Modified: trunk/src/common/optparser.py =================================================================== --- trunk/src/common/optparser.py 2008-07-29 19:42:31 UTC (rev 10080) +++ trunk/src/common/optparser.py 2008-07-29 19:49:31 UTC (rev 10081) @@ -595,3 +595,5 @@ pass con.close() gajim.config.set('version', '0.11.4.4') + +# vim: se ts=3: \ No newline at end of file Modified: trunk/src/common/passwords.py =================================================================== --- trunk/src/common/passwords.py 2008-07-29 19:42:31 UTC (rev 10080) +++ trunk/src/common/passwords.py 2008-07-29 19:49:31 UTC (rev 10081) @@ -137,3 +137,5 @@ def save_password(account_name, password): return get_storage().save_password(account_name, password) + +# vim: se ts=3: \ No newline at end of file Modified: trunk/src/common/pep.py =================================================================== --- trunk/src/common/pep.py 2008-07-29 19:42:31 UTC (rev 10080) +++ trunk/src/common/pep.py 2008-07-29 19:49:31 UTC (rev 10081) @@ -467,3 +467,5 @@ def user_retract_nickname(account): gajim.connections[account].send_pb_retract('', xmpp.NS_NICK, '0') + +# vim: se ts=3: \ No newline at end of file Modified: trunk/src/common/proxy65_manager.py =================================================================== --- trunk/src/common/proxy65_manager.py 2008-07-29 19:42:31 UTC (rev 10080) +++ trunk/src/common/proxy65_manager.py 2008-07-29 19:49:31 UTC (rev 10081) @@ -275,3 +275,5 @@ self.idlequeue.plug_idle(self, True, False) return + +# vim: se ts=3: \ No newline at end of file Modified: trunk/src/common/pubsub.py =================================================================== --- trunk/src/common/pubsub.py 2008-07-29 19:42:31 UTC (rev 10080) +++ trunk/src/common/pubsub.py 2008-07-29 19:49:31 UTC (rev 10081) @@ -104,3 +104,5 @@ query.setID(id) self.awaiting_answers[id] = (connection_handlers.PEP_CONFIG,) self.connection.send(query) + +# vim: se ts=3: \ No newline at end of file Modified: trunk/src/common/rst_xhtml_generator.py =================================================================== --- trunk/src/common/rst_xhtml_generator.py 2008-07-29 19:42:31 UTC (rev 10080) +++ trunk/src/common/rst_xhtml_generator.py 2008-07-29 19:49:31 UTC (rev 10081) @@ -161,3 +161,5 @@ test2_ """) print "test 3\n", Generator.create_xhtml(""":ticket:`316` implements :xep:`71`""") + +# vim: se ts=3: \ No newline at end of file Modified: trunk/src/common/sleepy.py =================================================================== --- trunk/src/common/sleepy.py 2008-07-29 19:42:31 UTC (rev 10080) +++ trunk/src/common/sleepy.py 2008-07-29 19:49:31 UTC (rev 10081) @@ -128,3 +128,5 @@ Sleepy = SleepyWindows else: Sleepy = SleepyUnix + +# vim: se ts=3: \ No newline at end of file Modified: trunk/src/common/socks5.py =================================================================== --- trunk/src/common/socks5.py 2008-07-29 19:42:31 UTC (rev 10080) +++ trunk/src/common/socks5.py 2008-07-29 19:49:31 UTC (rev 10081) @@ -1083,3 +1083,5 @@ self.file_props['disconnect_cb'] = None if self.queue is not None: self.queue.remove_receiver(self.queue_idx, False) + +# vim: se ts=3: \ No newline at end of file Modified: trunk/src/common/stanza_session.py =================================================================== --- trunk/src/common/stanza_session.py 2008-07-29 19:42:31 UTC (rev 10080) +++ trunk/src/common/stanza_session.py 2008-07-29 19:49:31 UTC (rev 10081) @@ -944,3 +944,5 @@ self.enable_encryption = False self.km_o = '' + +# vim: se ts=3: \ No newline at end of file Modified: trunk/src/common/xmpp/__init__.py =================================================================== --- trunk/src/common/xmpp/__init__.py 2008-07-29 19:42:31 UTC (rev 10080) +++ trunk/src/common/xmpp/__init__.py 2008-07-29 19:49:31 UTC (rev 10081) @@ -30,3 +30,5 @@ from client_nb import * from client import * from protocol import * + +# vim: se ts=3: \ No newline at end of file Modified: trunk/src/common/xmpp/auth.py =================================================================== --- trunk/src/common/xmpp/auth.py 2008-07-29 19:42:31 UTC (rev 10080) +++ trunk/src/common/xmpp/auth.py 2008-07-29 19:49:31 UTC (rev 10081) @@ -304,3 +304,5 @@ else: self.DEBUG('Binding failed: timeout expired.','error') return '' + +# vim: se ts=3: \ No newline at end of file Modified: trunk/src/common/xmpp/auth_nb.py =================================================================== --- trunk/src/common/xmpp/auth_nb.py 2008-07-29 19:42:31 UTC (rev 10080) +++ trunk/src/common/xmpp/auth_nb.py 2008-07-29 19:49:31 UTC (rev 10081) @@ -427,3 +427,5 @@ self.DEBUG('Binding failed: timeout expired.', 'error') if self.on_bind: self.on_bind(None) + +# vim: se ts=3: \ No newline at end of file Modified: trunk/src/common/xmpp/browser.py =================================================================== --- trunk/src/common/xmpp/browser.py 2008-07-29 19:42:31 UTC (rev 10080) +++ trunk/src/common/xmpp/browser.py 2008-07-29 19:49:31 UTC (rev 10081) @@ -214,3 +214,5 @@ if dt.has_key('xdata'): q.addChild(node=dt['xdata']) conn.send(rep) raise NodeProcessed + +# vim: se ts=3: \ No newline at end of file Modified: trunk/src/common/xmpp/c14n.py =================================================================== --- trunk/src/common/xmpp/c14n.py 2008-07-29 19:42:31 UTC (rev 10080) +++ trunk/src/common/xmpp/c14n.py 2008-07-29 19:49:31 UTC (rev 10081) @@ -34,3 +34,5 @@ def normalise_text(val): return val.replace('&', '&').replace('<', '<').replace('>', '>').replace('\r', '') + +# vim: se ts=3: \ No newline at end of file Modified: trunk/src/common/xmpp/client.py =================================================================== --- trunk/src/common/xmpp/client.py 2008-07-29 19:42:31 UTC (rev 10080) +++ trunk/src/common/xmpp/client.py 2008-07-29 19:49:31 UTC (rev 10081) @@ -320,3 +320,5 @@ raise auth.NotAuthorized(self.SASL.startsasl) except: self.DEBUG(self.DBG,"Failed to authenticate %s"%name,'error') + +# vim: se ts=3: \ No newline at end of file Modified: trunk/src/common/xmpp/client_nb.py =================================================================== --- trunk/src/common/xmpp/client_nb.py 2008-07-29 19:42:31 UTC (rev 10080) +++ trunk/src/common/xmpp/client_nb.py 2008-07-29 19:49:31 UTC (rev 10081) @@ -407,3 +407,5 @@ def _on_component_bound(self, resp): self.NBComponentBind.PlugOut() + +# vim: se ts=3: \ No newline at end of file Modified: trunk/src/common/xmpp/commands.py =================================================================== --- trunk/src/common/xmpp/commands.py 2008-07-29 19:42:31 UTC (rev 10080) +++ trunk/src/common/xmpp/commands.py 2008-07-29 19:49:31 UTC (rev 10081) @@ -328,3 +328,5 @@ del sessions[request.getTagAttr('command','sessionid')] + +# vim: se ts=3: \ No newline at end of file Modified: trunk/src/common/xmpp/debug.py =================================================================== --- trunk/src/common/xmpp/debug.py 2008-07-29 19:42:31 UTC (rev 10080) +++ trunk/src/common/xmpp/debug.py 2008-07-29 19:49:31 UTC (rev 10081) @@ -400,3 +400,5 @@ ##Uncomment this to effectively disable all debugging and all debugging overhead. #Debug=NoDebug + +# vim: se ts=3: \ No newline at end of file Modified: trunk/src/common/xmpp/dispatcher.py =================================================================== --- trunk/src/common/xmpp/dispatcher.py 2008-07-29 19:42:31 UTC (rev 10080) +++ trunk/src/common/xmpp/dispatcher.py 2008-07-29 19:49:31 UTC (rev 10081) @@ -381,3 +381,5 @@ """ Send a stream terminator and and handle all incoming stanzas before stream closure. """ self._owner_send('</stream:stream>') while self.Process(1): pass + +# vim: se ts=3: \ No newline at end of file Modified: trunk/src/common/xmpp/dispatcher_nb.py =================================================================== --- trunk/src/common/xmpp/dispatcher_nb.py 2008-07-29 19:42:31 UTC (rev 10080) +++ trunk/src/common/xmpp/dispatcher_nb.py 2008-07-29 19:49:31 UTC (rev 10081) @@ -437,3 +437,5 @@ def disconnect(self): ''' Send a stream terminator. ''' self._owner.Connection.send('</stream:stream>') + +# vim: se ts=3: \ No newline at end of file Modified: trunk/src/common/xmpp/features.py =================================================================== --- trunk/src/common/xmpp/features.py 2008-07-29 19:42:31 UTC (rev 10080) +++ trunk/src/common/xmpp/features.py 2008-07-29 19:49:31 UTC (rev 10081) @@ -182,3 +182,5 @@ """ Deletes privacy list 'listname'. Returns true on success.""" resp=disp.SendAndWaitForResponse(Iq('set',NS_PRIVACY,payload=[Node('list',{'name':listname})])) if isResultNode(resp): return 1 + +# vim: se ts=3: \ No newline at end of file Modified: trunk/src/common/xmpp/features_nb.py =================================================================== --- trunk/src/common/xmpp/features_nb.py 2008-07-29 19:42:31 UTC (rev 10080) +++ trunk/src/common/xmpp/features_nb.py 2008-07-29 19:49:31 UTC (rev 10081) @@ -251,3 +251,5 @@ """ Deletes privacy list 'listname'. Returns true on success.""" iq = Iq('set',NS_PRIVACY,payload=[Node('list',{'name':listname})]) _on_default_response(disp, iq, cb) + +# vim: se ts=3: \ No newline at end of file Modified: trunk/src/common/xmpp/filetransfer.py =================================================================== --- trunk/src/common/xmpp/filetransfer.py 2008-07-29 19:42:31 UTC (rev 10080) +++ trunk/src/common/xmpp/filetransfer.py 2008-07-29 19:49:31 UTC (rev 10081) @@ -197,3 +197,5 @@ stream['direction']=stream['direction'][1:] conn.Event(self.DBG_LINE,'STREAM COMMITTED',stream) else: conn.send(Error(stanza,ERR_UNEXPECTED_REQUEST)) + +# vim: se ts=3: \ No newline at end of file Modified: trunk/src/common/xmpp/idlequeue.py =================================================================== --- trunk/src/common/xmpp/idlequeue.py 2008-07-29 19:42:31 UTC (rev 10080) +++ trunk/src/common/xmpp/idlequeue.py 2008-07-29 19:49:31 UTC (rev 10081) @@ -219,3 +219,5 @@ q.pollend() self.check_time_events() return True + +# vim: se ts=3: \ No newline at end of file Modified: trunk/src/common/xmpp/protocol.py =================================================================== --- trunk/src/common/xmpp/protocol.py 2008-07-29 19:42:31 UTC (rev 10080) +++ trunk/src/common/xmpp/protocol.py 2008-07-29 19:49:31 UTC (rev 10081) @@ -776,3 +776,5 @@ def __setitem__(self,name,val): """ Simple dictionary interface for setting datafields values by their names.""" return self.setField(name).setValue(val) + +# vim: se ts=3: \ No newline at end of file Modified: trunk/src/common/xmpp/roster.py =================================================================== --- trunk/src/common/xmpp/roster.py 2008-07-29 19:42:31 UTC (rev 10080) +++ trunk/src/common/xmpp/roster.py 2008-07-29 19:49:31 UTC (rev 10081) @@ -193,3 +193,5 @@ def getRaw(self): """Returns the internal data representation of the roster.""" return self._data + +# vim: se ts=3: \ No newline at end of file Modified: trunk/src/common/xmpp/roster_nb.py =================================================================== --- trunk/src/common/xmpp/roster_nb.py 2008-07-29 19:42:31 UTC (rev 10080) +++ trunk/src/common/xmpp/roster_nb.py 2008-07-29 19:49:31 UTC (rev 10081) @@ -57,3 +57,5 @@ on_ready = None else: return self + +# vim: se ts=3: \ No newline at end of file Modified: trunk/src/common/xmpp/session.py =================================================================== --- trunk/src/common/xmpp/session.py 2008-07-29 19:42:31 UTC (rev 10080) +++ trunk/src/common/xmpp/session.py 2008-07-29 19:49:31 UTC (rev 10081) @@ -348,3 +348,5 @@ Note that some features (like TLS and SASL) requires stream re-start so this state can have non-linear changes. """ if self._stream_state<newstate: self._stream_state=newstate + +# vim: se ts=3: \ No newline at end of file Modified: trunk/src/common/xmpp/simplexml.py =================================================================== --- trunk/src/common/xmpp/simplexml.py 2008-07-29 19:42:31 UTC (rev 10080) +++ trunk/src/common/xmpp/simplexml.py 2008-07-29 19:49:31 UTC (rev 10081) @@ -424,3 +424,5 @@ I.e. "<html>some text some more text". Will raise xml.parser.expat.parsererror on misplaced tags though. F.e. "some text some more text" will not work.""" return NodeBuilder(xml).getDom() + +# vim: se ts=3: \ No newline at end of file Modified: trunk/src/common/xmpp/transports.py =================================================================== --- trunk/src/common/xmpp/transports.py 2008-07-29 19:42:31 UTC (rev 10080) +++ trunk/src/common/xmpp/transports.py 2008-07-29 19:49:31 UTC (rev 10081) @@ -287,3 +287,5 @@ self._startSSL() self._owner.Dispatcher.PlugOut() dispatcher.Dispatcher().PlugIn(self._owner) + +# vim: se ts=3: \ No newline at end of file Modified: trunk/src/common/xmpp/transports_nb.py =================================================================== --- trunk/src/common/xmpp/transports_nb.py 2008-07-29 19:42:31 UTC (rev 10080) +++ trunk/src/common/xmpp/transports_nb.py 2008-07-29 19:49:31 UTC (rev 10081) @@ -1114,3 +1114,5 @@ def DEBUG(self, text, severity): ''' Overwrites DEBUG tag to allow debug output be presented as "CONNECTproxy".''' return self._owner.DEBUG(DBG_CONNECT_PROXY, text, severity) + +# vim: se ts=3: \ No newline at end of file Modified: trunk/src/common/xmpp_stringprep.py =================================================================== --- trunk/src/common/xmpp_stringprep.py 2008-07-29 19:42:31 UTC (rev 10080) +++ trunk/src/common/xmpp_stringprep.py 2008-07-29 19:49:31 UTC (rev 10081) @@ -263,3 +263,5 @@ C_3, C_4, C_5, C_6, C_7, C_8, C_9]) nameprep = NamePrep() + +# vim: se ts=3: \ No newline at end of file Modified: trunk/src/common/zeroconf/__init__.py =================================================================== --- trunk/src/common/zeroconf/__init__.py 2008-07-29 19:42:31 UTC (rev 10080) +++ trunk/src/common/zeroconf/__init__.py 2008-07-29 19:49:31 UTC (rev 10081) @@ -0,0 +1,2 @@ + +# vim: se ts=3: \ No newline at end of file Modified: trunk/src/common/zeroconf/client_zeroconf.py =================================================================== --- trunk/src/common/zeroconf/client_zeroconf.py 2008-07-29 19:42:31 UTC (rev 10080) +++ trunk/src/common/zeroconf/client_zeroconf.py 2008-07-29 19:49:31 UTC (rev 10081) @@ -715,3 +715,5 @@ # otherwise open new connection P2PClient(None, item['address'], item['port'], self, [(stanza, is_message)], to, on_ok=on_ok, on_not_ok=on_not_ok) + +# vim: se ts=3: \ No newline at end of file Modified: trunk/src/common/zeroconf/connection_handlers_zeroconf.py =================================================================== --- trunk/src/common/zeroconf/connection_handlers_zeroconf.py 2008-07-29 19:42:31 UTC (rev 10080) +++ trunk/src/common/zeroconf/connection_handlers_zeroconf.py 2008-07-29 19:49:31 UTC (rev 10081) @@ -481,3 +481,5 @@ def remove_transfer(self, file_props, remove_from_list = True): pass + +# vim: se ts=3: \ No newline at end of file Modified: trunk/src/common/zeroconf/connection_zeroconf.py =================================================================== --- trunk/src/common/zeroconf/connection_zeroconf.py 2008-07-29 19:42:31 UTC (rev 10080) +++ trunk/src/common/zeroconf/connection_zeroconf.py 2008-07-29 19:49:31 UTC (rev 10081) @@ -553,3 +553,5 @@ self.dispatch('STANZA_SENT', unicode(data)) # END ConnectionZeroconf + +# vim: se ts=3: \ No newline at end of file Modified: trunk/src/common/zeroconf/roster_zeroconf.py =================================================================== --- trunk/src/common/zeroconf/roster_zeroconf.py 2008-07-29 19:42:31 UTC (rev 10080) +++ trunk/src/common/zeroconf/roster_zeroconf.py 2008-07-29 19:49:31 UTC (rev 10081) @@ -161,3 +161,5 @@ def Unauthorize(self,jid): pass + +# vim: se ts=3: \ No newline at end of file Modified: trunk/src/common/zeroconf/zeroconf.py =================================================================== --- trunk/src/common/zeroconf/zeroconf.py 2008-07-29 19:42:31 UTC (rev 10080) +++ trunk/src/common/zeroconf/zeroconf.py 2008-07-29 19:49:31 UTC (rev 10081) @@ -45,3 +45,5 @@ elif test_bonjour(): from common.zeroconf import zeroconf_bonjour Zeroconf = zeroconf_bonjour.Zeroconf + +# vim: se ts=3: \ No newline at end of file Modified: trunk/src/common/zeroconf/zeroconf_avahi.py =================================================================== --- trunk/src/common/zeroconf/zeroconf_avahi.py 2008-07-29 19:42:31 UTC (rev 10080) +++ trunk/src/common/zeroconf/zeroconf_avahi.py 2008-07-29 19:49:31 UTC (rev 10081) @@ -428,3 +428,5 @@ # END Zeroconf + +# vim: se ts=3: \ No newline at end of file Modified: trunk/src/common/zeroconf/zeroconf_bonjour.py =================================================================== --- trunk/src/common/zeroconf/zeroconf_bonjour.py 2008-07-29 19:42:31 UTC (rev 10080) +++ trunk/src/common/zeroconf/zeroconf_bonjour.py 2008-07-29 19:49:31 UTC (rev 10081) @@ -334,3 +334,5 @@ return False return True + +# vim: se ts=3: \ No newline at end of file Modified: trunk/src/config.py =================================================================== --- trunk/src/config.py 2008-07-29 19:42:31 UTC (rev 10080) +++ trunk/src/config.py 2008-07-29 19:49:31 UTC (rev 10081) @@ -3736,3 +3736,5 @@ title = "Configure %s" % node window.set_title(title) window.show_all() + +# vim: se ts=3: \ No newline at end of file Modified: trunk/src/conversation_textview.py =================================================================== --- trunk/src/conversation_textview.py 2008-07-29 19:42:31 UTC (rev 10080) +++ trunk/src/conversation_textview.py 2008-07-29 19:49:31 UTC (rev 10081) @@ -1236,3 +1236,5 @@ # add the rest of text located in the index and after end_iter = buffer.get_end_iter() buffer.insert_with_tags_by_name(end_iter, text[index:], *text_tags) + +# vim: se ts=3: \ No newline at end of file Modified: trunk/src/dataforms_widget.py =================================================================== --- trunk/src/dataforms_widget.py 2008-07-29 19:42:31 UTC (rev 10080) +++ trunk/src/dataforms_widget.py 2008-07-29 19:49:31 UTC (rev 10081) @@ -579,3 +579,5 @@ def on_jid_multi_clean_button_clicked(self, widget, model, field): model.clear() del field.values + +# vim: se ts=3: \ No newline at end of file Modified: trunk/src/dialogs.py =================================================================== --- trunk/src/dialogs.py 2008-07-29 19:42:31 UTC (rev 10080) +++ trunk/src/dialogs.py 2008-07-29 19:49:31 UTC (rev 10081) @@ -3846,3 +3846,5 @@ self.session._verified_srs_cb() self.session.verified_identity = True self.update_info() + +# vim: se ts=3: \ No newline at end of file Modified: trunk/src/disco.py =================================================================== --- trunk/src/disco.py 2008-07-29 19:42:31 UTC (rev 10080) +++ trunk/src/disco.py 2008-07-29 19:49:31 UTC (rev 10081) @@ -1995,3 +1995,5 @@ # Fill the global agent type info dictionary _agent_type_info = _gen_agent_type_info() + +# vim: se ts=3: \ No newline at end of file Modified: trunk/src/features_window.py =================================================================== --- trunk/src/features_window.py 2008-07-29 19:42:31 UTC (rev 10080) +++ trunk/src/features_window.py 2008-07-29 19:49:31 UTC (rev 10081) @@ -318,3 +318,5 @@ def pysexy_available(self): from common import gajim return gajim.HAVE_PYSEXY + +# vim: se ts=3: \ No newline at end of file Modified: trunk/src/filetransfers_window.py =================================================================== --- trunk/src/filetransfers_window.py 2008-07-29 19:42:31 UTC (rev 10080) +++ trunk/src/filetransfers_window.py 2008-07-29 19:49:31 UTC (rev 10081) @@ -964,3 +964,5 @@ if event.keyval == gtk.keysyms.Escape: # ESCAPE self.window.hide() + +# vim: se ts=3: \ No newline at end of file Modified: trunk/src/gajim-remote.py =================================================================== --- trunk/src/gajim-remote.py 2008-07-29 19:42:31 UTC (rev 10080) +++ trunk/src/gajim-remote.py 2008-07-29 19:49:31 UTC (rev 10081) @@ -544,3 +544,5 @@ if __name__ == '__main__': GajimRemote() + +# vim: se ts=3: \ No newline at end of file Modified: trunk/src/gajim.py =================================================================== --- trunk/src/gajim.py 2008-07-29 19:42:31 UTC (rev 10080) +++ trunk/src/gajim.py 2008-07-29 19:49:31 UTC (rev 10081) @@ -3290,3 +3290,5 @@ gtk.main() except KeyboardInterrupt: print >> sys.stderr, 'KeyboardInterrupt' + +# vim: se ts=3: \ No newline at end of file Modified: trunk/src/gajim_themes_window.py =================================================================== --- trunk/src/gajim_themes_window.py 2008-07-29 19:42:31 UTC (rev 10080) +++ trunk/src/gajim_themes_window.py 2008-07-29 19:49:31 UTC (rev 10081) @@ -402,3 +402,5 @@ self.no_update = True self._set_color(True, widget, 'state_muc_directed_msg_color') self.no_update = False + +# vim: se ts=3: \ No newline at end of file Modified: trunk/src/groupchat_control.py =================================================================== --- trunk/src/groupchat_control.py 2008-07-29 19:42:31 UTC (rev 10080) +++ trunk/src/groupchat_control.py 2008-07-29 19:49:31 UTC (rev 10081) @@ -2320,3 +2320,5 @@ self.grant_owner(widget, jid) else: self.revoke_owner(widget, jid) + +# vim: se ts=3: \ No newline at end of file Modified: trunk/src/groups.py =================================================================== --- trunk/src/groups.py 2008-07-29 19:42:31 UTC (rev 10080) +++ trunk/src/groups.py 2008-07-29 19:49:31 UTC (rev 10081) @@ -45,3 +45,5 @@ # close the window self.window.destroy() + +# vim: se ts=3: \ No newline at end of file Modified: trunk/src/gtkexcepthook.py =================================================================== --- trunk/src/gtkexcepthook.py 2008-07-29 19:42:31 UTC (rev 10080) +++ trunk/src/gtkexcepthook.py 2008-07-29 19:49:31 UTC (rev 10081) @@ -107,3 +107,5 @@ _excepthook_save = sys.excepthook sys.excepthook = _info print x # this always tracebacks + +# vim: se ts=3: \ No newline at end of file Modified: trunk/src/gtkgui_helpers.py =================================================================== --- trunk/src/gtkgui_helpers.py 2008-07-29 19:42:31 UTC (rev 10080) +++ trunk/src/gtkgui_helpers.py 2008-07-29 19:49:31 UTC (rev 10081) @@ -979,3 +979,5 @@ def reload_jabber_state_images(): make_jabber_state_images() gajim.interface.roster.update_jabber_state_images() + +# vim: se ts=3: \ No newline at end of file Modified: trunk/src/history_manager.py =================================================================== --- trunk/src/history_manager.py 2008-07-29 19:42:31 UTC (rev 10080) +++ trunk/src/history_manager.py 2008-07-29 19:49:31 UTC (rev 10081) @@ -622,3 +622,5 @@ signal.signal(signal.SIGINT, signal.SIG_DFL) # ^C exits the application HistoryManager() gtk.main() + +# vim: se ts=3: \ No newline at end of file Modified: trunk/src/history_window.py =================================================================== --- trunk/src/history_window.py 2008-07-29 19:42:31 UTC (rev 10080) +++ trunk/src/history_window.py 2008-07-29 19:49:31 UTC (rev 10081) @@ -580,3 +580,5 @@ # otherwise self._load_history(jid, account) self.results_window.set_property('visible', False) + +# vim: se ts=3: \ No newline at end of file Modified: trunk/src/htmltextview.py =================================================================== --- trunk/src/htmltextview.py 2008-07-29 19:42:31 UTC (rev 10080) +++ trunk/src/htmltextview.py 2008-07-29 19:49:31 UTC (rev 10081) @@ -1147,3 +1147,5 @@ w.show_all() w.connect('destroy', lambda w: gtk.main_quit()) gtk.main() + +# vim: se ts=3: \ No newline at end of file Modified: trunk/src/ipython_view.py =================================================================== --- trunk/src/ipython_view.py 2008-07-29 19:42:31 UTC (rev 10080) +++ trunk/src/ipython_view.py 2008-07-29 19:49:31 UTC (rev 10081) @@ -521,3 +521,5 @@ self.showReturned(rv) self.cout.truncate(0) + +# vim: se ts=3: \ No newline at end of file Modified: trunk/src/lastfm.py =================================================================== --- trunk/src/lastfm.py 2008-07-29 19:42:31 UTC (rev 10080) +++ trunk/src/lastfm.py 2008-07-29 19:49:31 UTC (rev 10081) @@ -1,4 +1,4 @@ -#!/bin/env python +#!/usr/bin/env python """ LastFM Python class Copyright (C) 2007 Olivier Mehani <shtrom(a)ssji.net> @@ -215,3 +215,5 @@ if lfm.updateData(): print lfm.formatSongTitle() sleep(60) + +# vim: se ts=3: Modified: trunk/src/lastfm_track_listener.py =================================================================== --- trunk/src/lastfm_track_listener.py 2008-07-29 19:42:31 UTC (rev 10080) +++ trunk/src/lastfm_track_listener.py 2008-07-29 19:49:31 UTC (rev 10081) @@ -101,3 +101,5 @@ else: print 'Now playing: "%s" by %s' % (track.title, track.artist) gobject.MainLoop().run() + +# vim: se ts=3: \ No newline at end of file Modified: trunk/src/message_control.py =================================================================== --- trunk/src/message_control.py 2008-07-29 19:42:31 UTC (rev 10080) +++ trunk/src/message_control.py 2008-07-29 19:49:31 UTC (rev 10081) @@ -175,3 +175,5 @@ resource = self.resource, user_nick = user_nick, session = self.session, original_message = original_message) + +# vim: se ts=3: \ No newline at end of file Modified: trunk/src/message_textview.py =================================================================== --- trunk/src/message_textview.py 2008-07-29 19:42:31 UTC (rev 10080) +++ trunk/src/message_textview.py 2008-07-29 19:49:31 UTC (rev 10081) @@ -119,3 +119,5 @@ gtk.binding_entry_add_signal(MessageTextView, gtk.keysyms.KP_Enter, gtk.gdk.CONTROL_MASK, 'mykeypress', int, gtk.keysyms.KP_Enter, gtk.gdk.ModifierType, gtk.gdk.CONTROL_MASK) + +# vim: se ts=3: \ No newline at end of file Modified: trunk/src/message_window.py =================================================================== --- trunk/src/message_window.py 2008-07-29 19:42:31 UTC (rev 10080) +++ trunk/src/message_window.py 2008-07-29 19:49:31 UTC (rev 10081) @@ -1087,3 +1087,5 @@ ctrl.type_id) ctrl.parent_win = mw mw.new_tab(ctrl) + +# vim: se ts=3: \ No newline at end of file Modified: trunk/src/music_track_listener.py =================================================================== --- trunk/src/music_track_listener.py 2008-07-29 19:42:31 UTC (rev 10080) +++ trunk/src/music_track_listener.py 2008-07-29 19:49:31 UTC (rev 10081) @@ -245,3 +245,5 @@ else: print 'Now playing: "%s" by %s' % (track.title, track.artist) gobject.MainLoop().run() + +# vim: se ts=3: \ No newline at end of file Modified: trunk/src/negotiation.py =================================================================== --- trunk/src/negotiation.py 2008-07-29 19:42:31 UTC (rev 10080) +++ trunk/src/negotiation.py 2008-07-29 19:49:31 UTC (rev 10081) @@ -64,3 +64,5 @@ gajim.connections[self.account].send_stanza(rejection) self.window.destroy() + +# vim: se ts=3: \ No newline at end of file Modified: trunk/src/network_manager_listener.py =================================================================== --- trunk/src/network_manager_listener.py 2008-07-29 19:42:31 UTC (rev 10080) +++ trunk/src/network_manager_listener.py 2008-07-29 19:49:31 UTC (rev 10081) @@ -58,3 +58,5 @@ '/org/freedesktop/NetworkManager') except: pass + +# vim: se ts=3: \ No newline at end of file Modified: trunk/src/notify.py =================================================================== --- trunk/src/notify.py 2008-07-29 19:42:31 UTC (rev 10080) +++ trunk/src/notify.py 2008-07-29 19:49:31 UTC (rev 10081) @@ -585,3 +585,5 @@ def version_error_handler_3_x_try(self, e): self.version = self.default_version self.attempt_notify() + +# vim: se ts=3: \ No newline at end of file Modified: trunk/src/osx/__init__.py =================================================================== --- trunk/src/osx/__init__.py 2008-07-29 19:42:31 UTC (rev 10080) +++ trunk/src/osx/__init__.py 2008-07-29 19:49:31 UTC (rev 10081) @@ -41,3 +41,5 @@ net_device_active = True device_now_active(None) return + +# vim: se ts=3: \ No newline at end of file Modified: trunk/src/osx/dbus.py =================================================================== --- trunk/src/osx/dbus.py 2008-07-29 19:42:31 UTC (rev 10080) +++ trunk/src/osx/dbus.py 2008-07-29 19:49:31 UTC (rev 10081) @@ -129,3 +129,5 @@ return os.kill(int(env[1]), signal.SIGINT) return + +# vim: se ts=3: \ No newline at end of file Modified: trunk/src/osx/growl/Growl.py =================================================================== --- trunk/src/osx/growl/Growl.py 2008-07-29 19:42:31 UTC (rev 10080) +++ trunk/src/osx/growl/Growl.py 2008-07-29 19:49:31 UTC (rev 10081) @@ -245,3 +245,5 @@ def notifyCB(self, userdata): print "Got notify in pyland", userdata + +# vim: se ts=3: \ No newline at end of file Modified: trunk/src/osx/growl/__init__.py =================================================================== --- trunk/src/osx/growl/__init__.py 2008-07-29 19:42:31 UTC (rev 10080) +++ trunk/src/osx/growl/__init__.py 2008-07-29 19:49:31 UTC (rev 10081) @@ -1 +1,3 @@ # No-op file that just helps python with the growl module directory. + +# vim: se ts=3: \ No newline at end of file Modified: trunk/src/osx/growl/setup.py =================================================================== --- trunk/src/osx/growl/setup.py 2008-07-29 19:42:31 UTC (rev 10080) +++ trunk/src/osx/growl/setup.py 2008-07-29 19:49:31 UTC (rev 10081) @@ -1,4 +1,4 @@ -#!/usr/bin/python +#!/usr/bin/env python from distutils.core import setup, Extension import sys @@ -23,3 +23,5 @@ py_modules=["Growl"], ext_modules = modules ) + +# vim: se ts=3: Modified: trunk/src/osx/growler.py =================================================================== --- trunk/src/osx/growler.py 2008-07-29 19:42:31 UTC (rev 10080) +++ trunk/src/osx/growler.py 2008-07-29 19:49:31 UTC (rev 10081) @@ -61,3 +61,5 @@ string = string.replace(""", "'") return string + +# vim: se ts=3: \ No newline at end of file Modified: trunk/src/osx/prep_py2app.py =================================================================== --- trunk/src/osx/prep_py2app.py 2008-07-29 19:42:31 UTC (rev 10080) +++ trunk/src/osx/prep_py2app.py 2008-07-29 19:49:31 UTC (rev 10081) @@ -21,3 +21,5 @@ sys.path[site_zip] = tmp if py > -1: del sys.path[py] + +# vim: se ts=3: \ No newline at end of file Modified: trunk/src/osx/setup.py =================================================================== --- trunk/src/osx/setup.py 2008-07-29 19:42:31 UTC (rev 10080) +++ trunk/src/osx/setup.py 2008-07-29 19:49:31 UTC (rev 10081) @@ -18,3 +18,5 @@ extra_link_args=['-framework', 'AppKit', '-framework', 'Cocoa']), ] ) + +# vim: se ts=3: \ No newline at end of file Modified: trunk/src/osx/syncmenu/setup.py =================================================================== --- trunk/src/osx/syncmenu/setup.py 2008-07-29 19:42:31 UTC (rev 10080) +++ trunk/src/osx/syncmenu/setup.py 2008-07-29 19:49:31 UTC (rev 10081) @@ -25,3 +25,5 @@ extra_link_args=libs + ['-framework', 'Carbon'], extra_compile_args=['-Wall'] + cflags) ]) + +# vim: se ts=3: \ No newline at end of file Modified: trunk/src/osx/syncmenu/test-menu.py =================================================================== --- trunk/src/osx/syncmenu/test-menu.py 2008-07-29 19:42:31 UTC (rev 10080) +++ trunk/src/osx/syncmenu/test-menu.py 2008-07-29 19:49:31 UTC (rev 10081) @@ -76,3 +76,5 @@ syncmenu.takeover_menu(menubar) gtk.main() + +# vim: se ts=3: \ No newline at end of file Modified: trunk/src/profile_window.py =================================================================== --- trunk/src/profile_window.py 2008-07-29 19:42:31 UTC (rev 10080) +++ trunk/src/profile_window.py 2008-07-29 19:49:31 UTC (rev 10081) @@ -358,3 +358,5 @@ def on_cancel_button_clicked(self, widget): self.window.destroy() + +# vim: se ts=3: \ No newline at end of file Modified: trunk/src/remote_control.py =================================================================== --- trunk/src/remote_control.py 2008-07-29 19:42:31 UTC (rev 10080) +++ trunk/src/remote_control.py 2008-07-29 19:49:31 UTC (rev 10081) @@ -675,3 +675,5 @@ JoinGroupchatWindow(account, room_jid, nick) else: gajim.interface.join_gc_room(account, room_jid, nick, password) + +# vim: se ts=3: \ No newline at end of file Modified: trunk/src/roster_window.py =================================================================== --- trunk/src/roster_window.py 2008-07-29 19:42:31 UTC (rev 10080) +++ trunk/src/roster_window.py 2008-07-29 19:49:31 UTC (rev 10081) @@ -6333,3 +6333,5 @@ if sys.platform == 'darwin': self.setup_for_osx() + +# vim: se ts=3: \ No newline at end of file Modified: trunk/src/search_window.py =================================================================== --- trunk/src/search_window.py 2008-07-29 19:42:31 UTC (rev 10080) +++ trunk/src/search_window.py 2008-07-29 19:49:31 UTC (rev 10081) @@ -231,3 +231,5 @@ self.window.set_title('%s - Search - Gajim' % \ self.data_form_widget.title) + +# vim: se ts=3: \ No newline at end of file Modified: trunk/src/secrets.py =================================================================== --- trunk/src/secrets.py 2008-07-29 19:42:31 UTC (rev 10080) +++ trunk/src/secrets.py 2008-07-29 19:49:31 UTC (rev 10081) @@ -101,3 +101,5 @@ secrets_cache = Secrets(secrets_filename) return secrets_cache + +# vim: se ts=3: \ No newline at end of file Modified: trunk/src/session.py =================================================================== --- trunk/src/session.py 2008-07-29 19:42:31 UTC (rev 10080) +++ trunk/src/session.py 2008-07-29 19:49:31 UTC (rev 10081) @@ -461,3 +461,5 @@ resource = resource, session = self) negotiation.FeatureNegotiationWindow(account, self.jid, self, form) + +# vim: se ts=3: \ No newline at end of file Modified: trunk/src/statusicon.py =================================================================== --- trunk/src/statusicon.py 2008-07-29 19:42:31 UTC (rev 10080) +++ trunk/src/statusicon.py 2008-07-29 19:49:31 UTC (rev 10081) @@ -90,3 +90,5 @@ #or they were lazy to get it to work under Windows! WTF! #elif image.get_storage_type() == gtk.IMAGE_ANIMATION: # self.img_tray.set_from_animation(image.get_animation()) + +# vim: se ts=3: \ No newline at end of file Modified: trunk/src/systray.py =================================================================== --- trunk/src/systray.py 2008-07-29 19:42:31 UTC (rev 10080) +++ trunk/src/systray.py 2008-07-29 19:49:31 UTC (rev 10081) @@ -404,3 +404,5 @@ self.t.destroy() self.t = None self.unsubscribe_events() + +# vim: se ts=3: \ No newline at end of file Modified: trunk/src/tooltips.py =================================================================== --- trunk/src/tooltips.py 2008-07-29 19:42:31 UTC (rev 10080) +++ trunk/src/tooltips.py 2008-07-29 19:49:31 UTC (rev 10081) @@ -737,3 +737,5 @@ _('This service could not respond with detailed information.\n' 'It is most likely legacy or broken')) self.win.add(label) + +# vim: se ts=3: \ No newline at end of file Modified: trunk/src/vcard.py =================================================================== --- trunk/src/vcard.py 2008-07-29 19:42:31 UTC (rev 10080) +++ trunk/src/vcard.py 2008-07-29 19:49:31 UTC (rev 10081) @@ -525,3 +525,5 @@ def on_close_button_clicked(self, widget): self.window.destroy() + +# vim: se ts=3: \ No newline at end of file Modified: trunk/test/mock.py =================================================================== --- trunk/test/mock.py 2008-07-29 19:42:31 UTC (rev 10080) +++ trunk/test/mock.py 2008-07-29 19:49:31 UTC (rev 10081) @@ -463,3 +463,5 @@ + +# vim: se ts=3: \ No newline at end of file Modified: trunk/test/mocks.py =================================================================== --- trunk/test/mocks.py 2008-07-29 19:42:31 UTC (rev 10080) +++ trunk/test/mocks.py 2008-07-29 19:49:31 UTC (rev 10081) @@ -66,3 +66,5 @@ def __nonzero__(self): return True + +# vim: se ts=3: \ No newline at end of file Modified: trunk/test/notify.py =================================================================== --- trunk/test/notify.py 2008-07-29 19:42:31 UTC (rev 10080) +++ trunk/test/notify.py 2008-07-29 19:49:31 UTC (rev 10081) @@ -13,3 +13,5 @@ def get_show_in_systray(event, account, contact, type_ = None): return True + +# vim: se ts=3: \ No newline at end of file Modified: trunk/test/test_caps.py =================================================================== --- trunk/test/test_caps.py 2008-07-29 19:42:31 UTC (rev 10080) +++ trunk/test/test_caps.py 2008-07-29 19:49:31 UTC (rev 10081) @@ -45,3 +45,5 @@ if __name__ == '__main__': unittest.main() + +# vim: se ts=3: \ No newline at end of file Modified: trunk/test/test_dispatcher_nb.py =================================================================== --- trunk/test/test_dispatcher_nb.py 2008-07-29 19:42:31 UTC (rev 10080) +++ trunk/test/test_dispatcher_nb.py 2008-07-29 19:49:31 UTC (rev 10081) @@ -51,3 +51,5 @@ if __name__ == '__main__': unittest.main() + +# vim: se ts=3: \ No newline at end of file Modified: trunk/test/test_misc_interface.py =================================================================== --- trunk/test/test_misc_interface.py 2008-07-29 19:42:31 UTC (rev 10080) +++ trunk/test/test_misc_interface.py 2008-07-29 19:49:31 UTC (rev 10081) @@ -45,3 +45,5 @@ if __name__ == '__main__': unittest.main() + +# vim: se ts=3: \ No newline at end of file Modified: trunk/test/test_sessions.py =================================================================== --- trunk/test/test_sessions.py 2008-07-29 19:42:31 UTC (rev 10080) +++ trunk/test/test_sessions.py 2008-07-29 19:49:31 UTC (rev 10081) @@ -202,3 +202,5 @@ if __name__ == '__main__': unittest.main() + +# vim: se ts=3: \ No newline at end of file Modified: trunk/test/testlib.py =================================================================== --- trunk/test/testlib.py 2008-07-29 19:42:31 UTC (rev 10080) +++ trunk/test/testlib.py 2008-07-29 19:49:31 UTC (rev 10081) @@ -33,3 +33,5 @@ import gtkgui_helpers gtkgui_helpers.GLADE_DIR = gajim_root + '/data/glade' + +# vim: se ts=3: \ No newline at end of file

1 0

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

29 Jul '08

Author: js Date: 2008-07-29 21:42:31 +0200 (Tue, 29 Jul 2008) New Revision: 10080 Modified: trunk/data/glade/change_activity_dialog.glade trunk/src/common/pep.py trunk/src/dialogs.py Log: Revert r10064 and to it the right way?\226?\132?\162. Modified: trunk/data/glade/change_activity_dialog.glade =================================================================== --- trunk/data/glade/change_activity_dialog.glade 2008-07-29 19:27:16 UTC (rev 10079) +++ trunk/data/glade/change_activity_dialog.glade 2008-07-29 19:42:31 UTC (rev 10080) @@ -63,7 +63,6 @@ <child> <widget class="GtkImage" id="working_image"> <property name="visible">True</property> - <property name="tooltip" translatable="yes">Working</property> <property name="stock">gtk-missing-image</property> <property name="icon_size">1</property> </widget> @@ -106,7 +105,6 @@ <child> <widget class="GtkImage" id="eating_image"> <property name="visible">True</property> - <property name="tooltip" translatable="yes">Eating</property> <property name="stock">gtk-missing-image</property> <property name="icon_size">1</property> </widget> @@ -150,7 +148,6 @@ <child> <widget class="GtkImage" id="exercising_image"> <property name="visible">True</property> - <property name="tooltip" translatable="yes">Exercising</property> <property name="stock">gtk-missing-image</property> <property name="icon_size">1</property> </widget> @@ -194,7 +191,6 @@ <child> <widget class="GtkImage" id="relaxing_image"> <property name="visible">True</property> - <property name="tooltip" translatable="yes">Relaxing</property> <property name="stock">gtk-missing-image</property> <property name="icon_size">1</property> </widget> @@ -238,7 +234,6 @@ <child> <widget class="GtkImage" id="talking_image"> <property name="visible">True</property> - <property name="tooltip" translatable="yes">Talking</property> <property name="stock">gtk-missing-image</property> <property name="icon_size">1</property> </widget> @@ -282,7 +277,6 @@ <child> <widget class="GtkImage" id="doing_chores_image"> <property name="visible">True</property> - <property name="tooltip" translatable="yes">Doing Chores</property> <property name="stock">gtk-missing-image</property> <property name="icon_size">1</property> </widget> @@ -326,7 +320,6 @@ <child> <widget class="GtkImage" id="inactive_image"> <property name="visible">True</property> - <property name="tooltip" translatable="yes">Inactive</property> <property name="stock">gtk-missing-image</property> <property name="icon_size">1</property> </widget> @@ -370,7 +363,6 @@ <child> <widget class="GtkImage" id="traveling_image"> <property name="visible">True</property> - <property name="tooltip" translatable="yes">Traveling</property> <property name="stock">gtk-missing-image</property> <property name="icon_size">1</property> </widget> @@ -414,7 +406,6 @@ <child> <widget class="GtkImage" id="having_appointment_image"> <property name="visible">True</property> - <property name="tooltip" translatable="yes">Having an Appointment</property> <property name="stock">gtk-missing-image</property> <property name="icon_size">1</property> </widget> @@ -458,7 +449,6 @@ <child> <widget class="GtkImage" id="drinking_image"> <property name="visible">True</property> - <property name="tooltip" translatable="yes">Drinking</property> <property name="stock">gtk-missing-image</property> <property name="icon_size">1</property> </widget> @@ -502,7 +492,6 @@ <child> <widget class="GtkImage" id="grooming_image"> <property name="visible">True</property> - <property name="tooltip" translatable="yes">Grooming</property> <property name="stock">gtk-missing-image</property> <property name="icon_size">1</property> </widget> Modified: trunk/src/common/pep.py =================================================================== --- trunk/src/common/pep.py 2008-07-29 19:27:16 UTC (rev 10079) +++ trunk/src/common/pep.py 2008-07-29 19:42:31 UTC (rev 10080) @@ -37,78 +37,78 @@ GAJIM_MOODS = ['thoughtful'] ACTIVITIES = { - 'doing_chores': {'category': _('Doing Chores'), - 'buying_groceries': _('Buying Groceries'), - 'cleaning': _('Cleaning'), - 'cooking': _('Cooking'), - 'doing_maintenance': _('Doing Maintenance'), - 'doing_the_dishes': _('Doing the Dishes'), - 'doing_the_laundry': _('Doing the Laundry'), - 'gardening': _('Gardening'), - 'running_an_errand': _('Running an Errand'), - 'walking_the_dog': _('Walking the Dog')}, - 'drinking': {'category': _('Drinking'), - 'having_a_beer': _('Having a Beer'), - 'having_coffee': _('Having Coffee'), - 'having_tea': _('Having Tea')}, - 'eating': {'category': _('Eating'), - 'having_a_snack': _('Having a Snack'), - 'having_breakfast': _('Having Breakfast'), - 'having_dinner': _('Having Dinner'), - 'having_lunch': _('Having Lunch')}, - 'exercising': {'category': _('Exercising'), - 'cycling': _('Cycling'), - 'hiking': _('Hiking'), - 'jogging': _('Jogging'), - 'playing_sports': _('Playing Sports'), - 'running': _('Running'), - 'skiing': _('Skiing'), - 'swimming': _('Swimming'), - 'working_out': _('Working out')}, - 'grooming': {'category': _('Grooming'), - 'at_the_spa': _('At the Spa'), - 'brushing_teeth': _('Brushing Teeth'), - 'getting_a_haircut': _('Getting a Haircut'), - 'shaving': _('Shaving'), - 'taking_a_bath': _('Taking a Bath'), - 'taking_a_shower': _('Taking a Shower')}, - 'having_appointment': {'category:': _('Having an Appointment')}, - 'inactive': {'category': _('Inactive'), - 'day_off': _('Day Off'), - 'hanging_out': _('Haning out'), - 'on_vacation': _('On Vacation'), - 'scheduled_holiday': _('Scheduled Holiday'), - 'sleeping': _('Sleeping')}, - 'relaxing': {'category': _('Relaxing'), - 'gaming': _('Gaming'), - 'going_out': _('Going out'), - 'partying': _('Partying'), - 'reading': _('Reading'), - 'rehearsing': _('Rehearsing'), - 'shopping': _('Shopping'), - 'socializing': _('Socializing'), - 'sunbathing': _('Sunbathing'), - 'watching_tv': _('Watching TV'), - 'watching_a_movie': _('Watching a Movie')}, - 'talking': {'category': _('Talking'), - 'in_real_life': _('In Real Life'), - 'on_the_phone': _('On the Phone'), - 'on_video_phone': _('On Video Phone')}, - 'traveling': {'category': _('Traveling'), - 'commuting': _('Commuting'), - 'cycling': _('Cycling'), - 'driving': _('Driving'), - 'in_a_car': _('In a Car'), - 'on_a_bus': _('On a Bus'), - 'on_a_plane': _('On a Plane'), - 'on_a_train': _('On a Train'), - 'on_a_trip': _('On a Trip'), - 'walking': _('Walking')}, - 'working': {'category': _('Working'), - 'coding': _('Coding'), - 'in_a_meeting': _('In a Meeting'), - 'studying': _('Studying'), - 'writing': _('Writing')}} + 'doing_chores': {'category': _('Doing Chores'), + 'buying_groceries': _('Buying Groceries'), + 'cleaning': _('Cleaning'), + 'cooking': _('Cooking'), + 'doing_maintenance': _('Doing Maintenance'), + 'doing_the_dishes': _('Doing the Dishes'), + 'doing_the_laundry': _('Doing the Laundry'), + 'gardening': _('Gardening'), + 'running_an_errand': _('Running an Errand'), + 'walking_the_dog': _('Walking the Dog')}, + 'drinking': {'category': _('Drinking'), + 'having_a_beer': _('Having a Beer'), + 'having_coffee': _('Having Coffee'), + 'having_tea': _('Having Tea')}, + 'eating': {'category': _('Eating'), + 'having_a_snack': _('Having a Snack'), + 'having_breakfast': _('Having Breakfast'), + 'having_dinner': _('Having Dinner'), + 'having_lunch': _('Having Lunch')}, + 'exercising': {'category': _('Exercising'), + 'cycling': _('Cycling'), + 'hiking': _('Hiking'), + 'jogging': _('Jogging'), + 'playing_sports': _('Playing Sports'), + 'running': _('Running'), + 'skiing': _('Skiing'), + 'swimming': _('Swimming'), + 'working_out': _('Working out')}, + 'grooming': {'category': _('Grooming'), + 'at_the_spa': _('At the Spa'), + 'brushing_teeth': _('Brushing Teeth'), + 'getting_a_haircut': _('Getting a Haircut'), + 'shaving': _('Shaving'), + 'taking_a_bath': _('Taking a Bath'), + 'taking_a_shower': _('Taking a Shower')}, + 'having_appointment': {'category': _('Having an Appointment')}, + 'inactive': {'category': _('Inactive'), + 'day_off': _('Day Off'), + 'hanging_out': _('Haning out'), + 'on_vacation': _('On Vacation'), + 'scheduled_holiday': _('Scheduled Holiday'), + 'sleeping': _('Sleeping')}, + 'relaxing': {'category': _('Relaxing'), + 'gaming': _('Gaming'), + 'going_out': _('Going out'), + 'partying': _('Partying'), + 'reading': _('Reading'), + 'rehearsing': _('Rehearsing'), + 'shopping': _('Shopping'), + 'socializing': _('Socializing'), + 'sunbathing': _('Sunbathing'), + 'watching_tv': _('Watching TV'), + 'watching_a_movie': _('Watching a Movie')}, + 'talking': {'category': _('Talking'), + 'in_real_life': _('In Real Life'), + 'on_the_phone': _('On the Phone'), + 'on_video_phone': _('On Video Phone')}, + 'traveling': {'category': _('Traveling'), + 'commuting': _('Commuting'), + 'cycling': _('Cycling'), + 'driving': _('Driving'), + 'in_a_car': _('In a Car'), + 'on_a_bus': _('On a Bus'), + 'on_a_plane': _('On a Plane'), + 'on_a_train': _('On a Train'), + 'on_a_trip': _('On a Trip'), + 'walking': _('Walking')}, + 'working': {'category': _('Working'), + 'coding': _('Coding'), + 'in_a_meeting': _('In a Meeting'), + 'studying': _('Studying'), + 'writing': _('Writing')}} def user_mood(items, name, jid): has_child = False Modified: trunk/src/dialogs.py =================================================================== --- trunk/src/dialogs.py 2008-07-29 19:27:16 UTC (rev 10079) +++ trunk/src/dialogs.py 2008-07-29 19:42:31 UTC (rev 10080) @@ -355,8 +355,8 @@ for category in pep.ACTIVITIES: item = self.xml.get_widget(category + '_image') item.set_from_pixbuf( - gtkgui_helpers.load_activity_icon( - category).get_pixbuf()) + gtkgui_helpers.load_activity_icon(category).get_pixbuf()) + gtk.Tooltips().set_tip(item, pep.ACTIVITIES[category]['category']) vbox = self.xml.get_widget(category + '_vbox') for activity in pep.ACTIVITIES[category]: @@ -370,10 +370,8 @@ else: rbtns[act] = group = gtk.RadioButton() - rbtns[act].set_label( - pep.ACTIVITIES[category][activity]) - rbtns[act].connect('toggled', - self.on_rbtn_toggled, + rbtns[act].set_label(pep.ACTIVITIES[category][activity]) + rbtns[act].connect('toggled', self.on_rbtn_toggled, [category, activity]) vbox.pack_start(rbtns[act], False, False, 0)

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