diff options
| author | js <js-gajim@webkeks.org> | 2008-07-29 23:49:31 +0400 |
|---|---|---|
| committer | js <js-gajim@webkeks.org> | 2008-07-29 23:49:31 +0400 |
| commit | 8605cd3f383f25b01294ed50f89d965f25fb4fd1 (patch) | |
| tree | a86e5c6e3aef733d68824c1ba18ebc259d56ed75 /src | |
| parent | 993d0d8609ee30ebbf5162bb6d1fdcaf2c14729f (diff) | |
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.
Diffstat (limited to 'src')
117 files changed, 236 insertions, 2 deletions
diff --git a/src/adhoc_commands.py b/src/adhoc_commands.py index d933fb3d5..ca63f785d 100644 --- a/src/adhoc_commands.py +++ b/src/adhoc_commands.py @@ -516,3 +516,5 @@ class CommandWindow: # 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 diff --git a/src/advanced.py b/src/advanced.py index e7d9647ff..360c18e06 100644 --- a/src/advanced.py +++ b/src/advanced.py @@ -271,3 +271,5 @@ class AdvancedConfigurationWindow(object): def on_advanced_entry_changed(self, widget): self.modelfilter.refilter() + +# vim: se ts=3:
\ No newline at end of file diff --git a/src/atom_window.py b/src/atom_window.py index 25836c6dc..5fdc272f9 100644 --- a/src/atom_window.py +++ b/src/atom_window.py @@ -133,3 +133,5 @@ class AtomWindow: if uri is not None: helpers.launch_browser_mailer('url', uri) return True + +# vim: se ts=3:
\ No newline at end of file diff --git a/src/cell_renderer_image.py b/src/cell_renderer_image.py index 749edcae0..7f4f2a345 100644 --- a/src/cell_renderer_image.py +++ b/src/cell_renderer_image.py @@ -140,3 +140,5 @@ class CellRendererImage(gtk.GenericCellRenderer): (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 diff --git a/src/chat_control.py b/src/chat_control.py index 902cf8bc0..a3b9dc4cd 100644 --- a/src/chat_control.py +++ b/src/chat_control.py @@ -2603,3 +2603,5 @@ class ChatControl(ChatControlBase): 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 diff --git a/src/common/GnuPG.py b/src/common/GnuPG.py index 928da7bfc..75f707588 100644 --- a/src/common/GnuPG.py +++ b/src/common/GnuPG.py @@ -228,3 +228,5 @@ if gajim.HAVE_GPG: out = out + data + "\n" out = out + "-----END PGP %s-----\n" % type return out + +# vim: se ts=3:
\ No newline at end of file diff --git a/src/common/GnuPGInterface.py b/src/common/GnuPGInterface.py index 9b50af894..73189116a 100644 --- a/src/common/GnuPGInterface.py +++ b/src/common/GnuPGInterface.py @@ -655,3 +655,5 @@ GnuPGInterface = GnuPG if __name__ == '__main__': _run_doctests() + +# vim: se ts=3:
\ No newline at end of file diff --git a/src/common/__init__.py b/src/common/__init__.py index e69de29bb..bbd45f43d 100644 --- a/src/common/__init__.py +++ b/src/common/__init__.py @@ -0,0 +1,2 @@ + +# vim: se ts=3:
\ No newline at end of file diff --git a/src/common/atom.py b/src/common/atom.py index 86c75c5ba..3031e6651 100644 --- a/src/common/atom.py +++ b/src/common/atom.py @@ -134,3 +134,5 @@ class OldEntry(xmpp.Node, object): ''' Last significant modification time. ''') feed_tagline = u'' + +# vim: se ts=3:
\ No newline at end of file diff --git a/src/common/caps.py b/src/common/caps.py index 09189df2e..4baa1bc71 100644 --- a/src/common/caps.py +++ b/src/common/caps.py @@ -278,3 +278,5 @@ class ConnectionCaps(object): return caps.update(identities, features) + +# vim: se ts=3:
\ No newline at end of file diff --git a/src/common/check_paths.py b/src/common/check_paths.py index 970c5a4b2..d93a8fbab 100644 --- a/src/common/check_paths.py +++ b/src/common/check_paths.py @@ -146,3 +146,5 @@ def check_and_possibly_create_paths(): def create_path(directory): print _('creating %s directory') % directory os.mkdir(directory, 0700) + +# vim: se ts=3:
\ No newline at end of file diff --git a/src/common/commands.py b/src/common/commands.py index 28c6f3a3c..51d075b15 100644 --- a/src/common/commands.py +++ b/src/common/commands.py @@ -412,3 +412,5 @@ class ConnectionCommands: del self.__sessions[magictuple] raise xmpp.NodeProcessed + +# vim: se ts=3:
\ No newline at end of file diff --git a/src/common/config.py b/src/common/config.py index 12a3684fc..d6d9b3c9a 100644 --- a/src/common/config.py +++ b/src/common/config.py @@ -649,3 +649,5 @@ class Config: 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 diff --git a/src/common/configpaths.py b/src/common/configpaths.py index 3b59c4ff7..ab153f7d6 100644 --- a/src/common/configpaths.py +++ b/src/common/configpaths.py @@ -121,3 +121,5 @@ class ConfigPaths: # print "%s: %s" % (repr(k), repr(v)) gajimpaths = ConfigPaths() + +# vim: se ts=3:
\ No newline at end of file diff --git a/src/common/connection.py b/src/common/connection.py index 50d3c39f4..a64b7ed3f 100644 --- a/src/common/connection.py +++ b/src/common/connection.py @@ -1744,3 +1744,5 @@ class Connection(ConnectionHandlers): self.connection.SendAndCallForResponse(iq, _on_response) # END Connection + +# vim: se ts=3:
\ No newline at end of file diff --git a/src/common/connection_handlers.py b/src/common/connection_handlers.py index 6ec2cbb5f..cbe85181a 100644 --- a/src/common/connection_handlers.py +++ b/src/common/connection_handlers.py @@ -2447,3 +2447,5 @@ class ConnectionHandlers(ConnectionVcard, ConnectionBytestream, ConnectionDisco, 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 diff --git a/src/common/contacts.py b/src/common/contacts.py index d96e27cf3..efbf14a8c 100644 --- a/src/common/contacts.py +++ b/src/common/contacts.py @@ -614,3 +614,5 @@ class Contacts: 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 diff --git a/src/common/crypto.py b/src/common/crypto.py index 190685f11..9c0caaaea 100644 --- a/src/common/crypto.py +++ b/src/common/crypto.py @@ -84,3 +84,5 @@ def powmod(base, exp, mod): exp /= 2 return result + +# vim: se ts=3:
\ No newline at end of file diff --git a/src/common/dataforms.py b/src/common/dataforms.py index 01c1e93d2..3dba7cf24 100644 --- a/src/common/dataforms.py +++ b/src/common/dataforms.py @@ -457,3 +457,5 @@ class MultipleDataForm(DataForm): # self.addChild(node=record) # return locals() + +# vim: se ts=3:
\ No newline at end of file diff --git a/src/common/dbus_support.py b/src/common/dbus_support.py index b5998d2f4..d9c04ab0d 100644 --- a/src/common/dbus_support.py +++ b/src/common/dbus_support.py @@ -149,3 +149,5 @@ if supported: 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 diff --git a/src/common/defs.py b/src/common/defs.py index 3ef48939c..4966a783c 100644 --- a/src/common/defs.py +++ b/src/common/defs.py @@ -8,3 +8,5 @@ version = '0.11.4.4-svn' 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 diff --git a/src/common/dh.py b/src/common/dh.py index 1d62636a4..f336edc16 100644 --- a/src/common/dh.py +++ b/src/common/dh.py @@ -205,3 +205,5 @@ def hex_to_decimal(stripee): 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 diff --git a/src/common/events.py b/src/common/events.py index b2df06b88..8dbf17a31 100644 --- a/src/common/events.py +++ b/src/common/events.py @@ -291,3 +291,5 @@ class Events: '''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 diff --git a/src/common/exceptions.py b/src/common/exceptions.py index c8385f6b7..a6e9ea971 100644 --- a/src/common/exceptions.py +++ b/src/common/exceptions.py @@ -87,3 +87,5 @@ class GajimGeneralException(Exception): def __str__(self): return self.text + +# vim: se ts=3:
\ No newline at end of file diff --git a/src/common/fuzzyclock.py b/src/common/fuzzyclock.py index a1ed31e58..36a5585ee 100755 --- a/src/common/fuzzyclock.py +++ b/src/common/fuzzyclock.py @@ -139,3 +139,5 @@ class FuzzyClock: newTimeStr = self.__fuzzyWeek[3] return newTimeStr + +# vim: se ts=3:
\ No newline at end of file diff --git a/src/common/gajim.py b/src/common/gajim.py index c70139c10..2a46d30b8 100644 --- a/src/common/gajim.py +++ b/src/common/gajim.py @@ -388,3 +388,5 @@ def get_priority(account, show): 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 diff --git a/src/common/helpers.py b/src/common/helpers.py index f7b98bc29..94f241240 100644 --- a/src/common/helpers.py +++ b/src/common/helpers.py @@ -1286,3 +1286,5 @@ def update_optional_features(account = None): 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 diff --git a/src/common/i18n.py b/src/common/i18n.py index 450a73002..0ffe57909 100644 --- a/src/common/i18n.py +++ b/src/common/i18n.py @@ -86,3 +86,5 @@ def ngettext(s_sing, s_plural, n, replace_sing = None, replace_plural = None): 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 diff --git a/src/common/logger.py b/src/common/logger.py index 0e3a8c97c..be29b7cca 100644 --- a/src/common/logger.py +++ b/src/common/logger.py @@ -760,3 +760,5 @@ class Logger: self.con.commit() except sqlite.OperationalError, e: print >> sys.stderr, str(e) + +# vim: se ts=3:
\ No newline at end of file diff --git a/src/common/nslookup.py b/src/common/nslookup.py index 1bce3f4c0..12722b478 100644 --- a/src/common/nslookup.py +++ b/src/common/nslookup.py @@ -333,3 +333,5 @@ if __name__ == '__main__': gobject.timeout_add(200, process) gtk.main() + +# vim: se ts=3:
\ No newline at end of file diff --git a/src/common/optparser.py b/src/common/optparser.py index 5d62f8dd7..8dfb03f70 100644 --- a/src/common/optparser.py +++ b/src/common/optparser.py @@ -595,3 +595,5 @@ class OptionsParser: pass con.close() gajim.config.set('version', '0.11.4.4') + +# vim: se ts=3:
\ No newline at end of file diff --git a/src/common/passwords.py b/src/common/passwords.py index 9e50e8ae9..1ec2f29dc 100644 --- a/src/common/passwords.py +++ b/src/common/passwords.py @@ -137,3 +137,5 @@ def get_password(account_name): def save_password(account_name, password): return get_storage().save_password(account_name, password) + +# vim: se ts=3:
\ No newline at end of file diff --git a/src/common/pep.py b/src/common/pep.py index a011db977..0e1bd4005 100644 --- a/src/common/pep.py +++ b/src/common/pep.py @@ -467,3 +467,5 @@ def user_retract_tune(account): 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 diff --git a/src/common/proxy65_manager.py b/src/common/proxy65_manager.py index 29627478f..587c68960 100644 --- a/src/common/proxy65_manager.py +++ b/src/common/proxy65_manager.py @@ -275,3 +275,5 @@ class HostTester(Socks5, IdleObject): self.idlequeue.plug_idle(self, True, False) return + +# vim: se ts=3:
\ No newline at end of file diff --git a/src/common/pubsub.py b/src/common/pubsub.py index 8becf043c..e5e8bf8f9 100644 --- a/src/common/pubsub.py +++ b/src/common/pubsub.py @@ -104,3 +104,5 @@ class ConnectionPubSub: 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 diff --git a/src/common/rst_xhtml_generator.py b/src/common/rst_xhtml_generator.py index 978ca2b48..8c7d059b2 100644 --- a/src/common/rst_xhtml_generator.py +++ b/src/common/rst_xhtml_generator.py @@ -161,3 +161,5 @@ this `` should trigger`` should trigger the problem. test2_ """) print "test 3\n", Generator.create_xhtml(""":ticket:`316` implements :xep:`71`""") + +# vim: se ts=3:
\ No newline at end of file diff --git a/src/common/sleepy.py b/src/common/sleepy.py index f56a7e044..4cc36970c 100644 --- a/src/common/sleepy.py +++ b/src/common/sleepy.py @@ -128,3 +128,5 @@ if os.name == 'nt': Sleepy = SleepyWindows else: Sleepy = SleepyUnix + +# vim: se ts=3:
\ No newline at end of file diff --git a/src/common/socks5.py b/src/common/socks5.py index c7aa99bf9..c81321362 100644 --- a/src/common/socks5.py +++ b/src/common/socks5.py @@ -1083,3 +1083,5 @@ class Socks5Receiver(Socks5, IdleObject): 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 diff --git a/src/common/stanza_session.py b/src/common/stanza_session.py index b061f7fd5..5469dd086 100644 --- a/src/common/stanza_session.py +++ b/src/common/stanza_session.py @@ -944,3 +944,5 @@ otherwise, list the fields we haven't implemented''' self.enable_encryption = False self.km_o = '' + +# vim: se ts=3:
\ No newline at end of file diff --git a/src/common/xmpp/__init__.py b/src/common/xmpp/__init__.py index 4645ceda2..1bc3ff027 100644 --- a/src/common/xmpp/__init__.py +++ b/src/common/xmpp/__init__.py @@ -30,3 +30,5 @@ import simplexml,protocol,debug,auth_nb,auth,transports,transports_nb,roster_nb, from client_nb import * from client import * from protocol import * + +# vim: se ts=3:
\ No newline at end of file diff --git a/src/common/xmpp/auth.py b/src/common/xmpp/auth.py index 3091f5542..77666c48d 100644 --- a/src/common/xmpp/auth.py +++ b/src/common/xmpp/auth.py @@ -304,3 +304,5 @@ class ComponentBind(PlugIn): else: self.DEBUG('Binding failed: timeout expired.','error') return '' + +# vim: se ts=3:
\ No newline at end of file diff --git a/src/common/xmpp/auth_nb.py b/src/common/xmpp/auth_nb.py index fa6d40ad3..476c19836 100644 --- a/src/common/xmpp/auth_nb.py +++ b/src/common/xmpp/auth_nb.py @@ -427,3 +427,5 @@ class NBComponentBind(ComponentBind): 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 diff --git a/src/common/xmpp/browser.py b/src/common/xmpp/browser.py index d696606a8..7d89a95bd 100644 --- a/src/common/xmpp/browser.py +++ b/src/common/xmpp/browser.py @@ -214,3 +214,5 @@ class Browser(PlugIn): 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 diff --git a/src/common/xmpp/c14n.py b/src/common/xmpp/c14n.py index b58e0a1d6..91fecaa0d 100644 --- a/src/common/xmpp/c14n.py +++ b/src/common/xmpp/c14n.py @@ -34,3 +34,5 @@ def normalise_attr(val): def normalise_text(val): return val.replace('&', '&').replace('<', '<').replace('>', '>').replace('\r', '
') + +# vim: se ts=3:
\ No newline at end of file diff --git a/src/common/xmpp/client.py b/src/common/xmpp/client.py index bc2335eff..8d6bfa9cc 100644 --- a/src/common/xmpp/client.py +++ b/src/common/xmpp/client.py @@ -320,3 +320,5 @@ class Component(CommonClient): 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 diff --git a/src/common/xmpp/client_nb.py b/src/common/xmpp/client_nb.py index ef8cfbf9e..8393ff160 100644 --- a/src/common/xmpp/client_nb.py +++ b/src/common/xmpp/client_nb.py @@ -407,3 +407,5 @@ class Component(NBCommonClient): def _on_component_bound(self, resp): self.NBComponentBind.PlugOut() + +# vim: se ts=3:
\ No newline at end of file diff --git a/src/common/xmpp/commands.py b/src/common/xmpp/commands.py index 433faee86..8dd7863c4 100644 --- a/src/common/xmpp/commands.py +++ b/src/common/xmpp/commands.py @@ -328,3 +328,5 @@ class TestCommand(Command_Handler_Prototype): del sessions[request.getTagAttr('command','sessionid')] + +# vim: se ts=3:
\ No newline at end of file diff --git a/src/common/xmpp/debug.py b/src/common/xmpp/debug.py index fd711b511..fa1e52c29 100644 --- a/src/common/xmpp/debug.py +++ b/src/common/xmpp/debug.py @@ -400,3 +400,5 @@ DBG_ALWAYS='always' ##Uncomment this to effectively disable all debugging and all debugging overhead. #Debug=NoDebug + +# vim: se ts=3:
\ No newline at end of file diff --git a/src/common/xmpp/dispatcher.py b/src/common/xmpp/dispatcher.py index 95e0f00b0..060185706 100644 --- a/src/common/xmpp/dispatcher.py +++ b/src/common/xmpp/dispatcher.py @@ -381,3 +381,5 @@ class Dispatcher(PlugIn): """ 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 diff --git a/src/common/xmpp/dispatcher_nb.py b/src/common/xmpp/dispatcher_nb.py index 515a09d10..8265a0d6e 100644 --- a/src/common/xmpp/dispatcher_nb.py +++ b/src/common/xmpp/dispatcher_nb.py @@ -437,3 +437,5 @@ class Dispatcher(PlugIn): def disconnect(self): ''' Send a stream terminator. ''' self._owner.Connection.send('</stream:stream>') + +# vim: se ts=3:
\ No newline at end of file diff --git a/src/common/xmpp/features.py b/src/common/xmpp/features.py index 5b4b6fea6..769ab42bc 100644 --- a/src/common/xmpp/features.py +++ b/src/common/xmpp/features.py @@ -182,3 +182,5 @@ def delPrivacyList(disp,listname): """ 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 diff --git a/src/common/xmpp/features_nb.py b/src/common/xmpp/features_nb.py index 786c9f6bd..ac1737948 100644 --- a/src/common/xmpp/features_nb.py +++ b/src/common/xmpp/features_nb.py @@ -251,3 +251,5 @@ def delPrivacyList(disp,listname,cb=None): """ 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 diff --git a/src/common/xmpp/filetransfer.py b/src/common/xmpp/filetransfer.py index 87ddc2196..77f912301 100644 --- a/src/common/xmpp/filetransfer.py +++ b/src/common/xmpp/filetransfer.py @@ -197,3 +197,5 @@ class IBB(PlugIn): 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 diff --git a/src/common/xmpp/idlequeue.py b/src/common/xmpp/idlequeue.py index ad92b7408..b3be0e755 100644 --- a/src/common/xmpp/idlequeue.py +++ b/src/common/xmpp/idlequeue.py @@ -219,3 +219,5 @@ class SelectIdleQueue(IdleQueue): q.pollend() self.check_time_events() return True + +# vim: se ts=3:
\ No newline at end of file diff --git a/src/common/xmpp/protocol.py b/src/common/xmpp/protocol.py index f26128b73..7ae19a667 100644 --- a/src/common/xmpp/protocol.py +++ b/src/common/xmpp/protocol.py @@ -776,3 +776,5 @@ class DataForm(Node): 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 diff --git a/src/common/xmpp/roster.py b/src/common/xmpp/roster.py index ff64aca5f..3ec9952bb 100644 --- a/src/common/xmpp/roster.py +++ b/src/common/xmpp/roster.py @@ -193,3 +193,5 @@ class Roster(PlugIn): def getRaw(self): """Returns the internal data representation of the roster.""" return self._data + +# vim: se ts=3:
\ No newline at end of file diff --git a/src/common/xmpp/roster_nb.py b/src/common/xmpp/roster_nb.py index 307ffd9b1..ee1d297e2 100644 --- a/src/common/xmpp/roster_nb.py +++ b/src/common/xmpp/roster_nb.py @@ -57,3 +57,5 @@ class NonBlockingRoster(Roster): on_ready = None else: return self + +# vim: se ts=3:
\ No newline at end of file diff --git a/src/common/xmpp/session.py b/src/common/xmpp/session.py index b61e4f6de..174a6a981 100644 --- a/src/common/xmpp/session.py +++ b/src/common/xmpp/session.py @@ -348,3 +348,5 @@ class Session: 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 diff --git a/src/common/xmpp/simplexml.py b/src/common/xmpp/simplexml.py index 89a6cec59..0c65a0b2f 100644 --- a/src/common/xmpp/simplexml.py +++ b/src/common/xmpp/simplexml.py @@ -424,3 +424,5 @@ def BadXML2Node(xml): I.e. "<html>some text <br>some more text". Will raise xml.parser.expat.parsererror on misplaced tags though. F.e. "<b>some text <br>some more text</b>" will not work.""" return NodeBuilder(xml).getDom() + +# vim: se ts=3:
\ No newline at end of file diff --git a/src/common/xmpp/transports.py b/src/common/xmpp/transports.py index 86c3850fa..0747b130b 100644 --- a/src/common/xmpp/transports.py +++ b/src/common/xmpp/transports.py @@ -287,3 +287,5 @@ class TLS(PlugIn): self._startSSL() self._owner.Dispatcher.PlugOut() dispatcher.Dispatcher().PlugIn(self._owner) + +# vim: se ts=3:
\ No newline at end of file diff --git a/src/common/xmpp/transports_nb.py b/src/common/xmpp/transports_nb.py index 601cb203c..ff6ef2b85 100644 --- a/src/common/xmpp/transports_nb.py +++ b/src/common/xmpp/transports_nb.py @@ -1114,3 +1114,5 @@ class NBSOCKS5PROXYsocket(NonBlockingTcp): 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 diff --git a/src/common/xmpp_stringprep.py b/src/common/xmpp_stringprep.py index 9ce38e16f..e3a760f05 100644 --- a/src/common/xmpp_stringprep.py +++ b/src/common/xmpp_stringprep.py @@ -263,3 +263,5 @@ else: 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 diff --git a/src/common/zeroconf/__init__.py b/src/common/zeroconf/__init__.py index e69de29bb..bbd45f43d 100644 --- a/src/common/zeroconf/__init__.py +++ b/src/common/zeroconf/__init__.py @@ -0,0 +1,2 @@ + +# vim: se ts=3:
\ No newline at end of file diff --git a/src/common/zeroconf/client_zeroconf.py b/src/common/zeroconf/client_zeroconf.py index ba94f696d..14c2ac162 100644 --- a/src/common/zeroconf/client_zeroconf.py +++ b/src/common/zeroconf/client_zeroconf.py @@ -715,3 +715,5 @@ class ClientZeroconf: # 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 diff --git a/src/common/zeroconf/connection_handlers_zeroconf.py b/src/common/zeroconf/connection_handlers_zeroconf.py index ba43b684c..e724e8651 100644 --- a/src/common/zeroconf/connection_handlers_zeroconf.py +++ b/src/common/zeroconf/connection_handlers_zeroconf.py @@ -481,3 +481,5 @@ class ConnectionHandlersZeroconf(ConnectionVcard, ConnectionBytestream, connecti def remove_transfer(self, file_props, remove_from_list = True): pass + +# vim: se ts=3:
\ No newline at end of file diff --git a/src/common/zeroconf/connection_zeroconf.py b/src/common/zeroconf/connection_zeroconf.py index 18f4250b6..1bc3bda31 100644 --- a/src/common/zeroconf/connection_zeroconf.py +++ b/src/common/zeroconf/connection_zeroconf.py @@ -553,3 +553,5 @@ class ConnectionZeroconf(ConnectionHandlersZeroconf): self.dispatch('STANZA_SENT', unicode(data)) # END ConnectionZeroconf + +# vim: se ts=3:
\ No newline at end of file diff --git a/src/common/zeroconf/roster_zeroconf.py b/src/common/zeroconf/roster_zeroconf.py index 2fb4123f8..ad1aca81c 100644 --- a/src/common/zeroconf/roster_zeroconf.py +++ b/src/common/zeroconf/roster_zeroconf.py @@ -161,3 +161,5 @@ class Roster: def Unauthorize(self,jid): pass + +# vim: se ts=3:
\ No newline at end of file diff --git a/src/common/zeroconf/zeroconf.py b/src/common/zeroconf/zeroconf.py index c33ff48c3..6b7c08783 100644 --- a/src/common/zeroconf/zeroconf.py +++ b/src/common/zeroconf/zeroconf.py @@ -45,3 +45,5 @@ if test_avahi(): elif test_bonjour(): from common.zeroconf import zeroconf_bonjour Zeroconf = zeroconf_bonjour.Zeroconf + +# vim: se ts=3:
\ No newline at end of file diff --git a/src/common/zeroconf/zeroconf_avahi.py b/src/common/zeroconf/zeroconf_avahi.py index 626d1be32..77dab5cfb 100644 --- a/src/common/zeroconf/zeroconf_avahi.py +++ b/src/common/zeroconf/zeroconf_avahi.py @@ -428,3 +428,5 @@ class Zeroconf: # END Zeroconf + +# vim: se ts=3:
\ No newline at end of file diff --git a/src/common/zeroconf/zeroconf_bonjour.py b/src/common/zeroconf/zeroconf_bonjour.py index 884ef59ea..857cba269 100644 --- a/src/common/zeroconf/zeroconf_bonjour.py +++ b/src/common/zeroconf/zeroconf_bonjour.py @@ -334,3 +334,5 @@ class Zeroconf: return False return True + +# vim: se ts=3:
\ No newline at end of file diff --git a/src/config.py b/src/config.py index 8bf3352f3..5e4cbbbf4 100644 --- a/src/config.py +++ b/src/config.py @@ -3736,3 +3736,5 @@ class ManagePEPServicesWindow: title = "Configure %s" % node window.set_title(title) window.show_all() + +# vim: se ts=3:
\ No newline at end of file diff --git a/src/conversation_textview.py b/src/conversation_textview.py index a5fcdb5fb..4dac1af24 100644 --- a/src/conversation_textview.py +++ b/src/conversation_textview.py @@ -1236,3 +1236,5 @@ class ConversationTextview: # 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 diff --git a/src/dataforms_widget.py b/src/dataforms_widget.py index 59a245b1e..3e62573d7 100644 --- a/src/dataforms_widget.py +++ b/src/dataforms_widget.py @@ -579,3 +579,5 @@ class SingleForm(gtk.Table, object): 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 diff --git a/src/dialogs.py b/src/dialogs.py index 8d40bfc15..c018354ed 100644 --- a/src/dialogs.py +++ b/src/dialogs.py @@ -3846,3 +3846,5 @@ class ESessionInfoWindow: self.session._verified_srs_cb() self.session.verified_identity = True self.update_info() + +# vim: se ts=3:
\ No newline at end of file diff --git a/src/disco.py b/src/disco.py index ed2626f38..258be8bbd 100644 --- a/src/disco.py +++ b/src/disco.py @@ -1995,3 +1995,5 @@ class DiscussionGroupsBrowser(AgentBrowser): # Fill the global agent type info dictionary _agent_type_info = _gen_agent_type_info() + +# vim: se ts=3:
\ No newline at end of file diff --git a/src/features_window.py b/src/features_window.py index 5c8f10290..44d476161 100644 --- a/src/features_window.py +++ b/src/features_window.py @@ -318,3 +318,5 @@ class FeaturesWindow: def pysexy_available(self): from common import gajim return gajim.HAVE_PYSEXY + +# vim: se ts=3:
\ No newline at end of file diff --git a/src/filetransfers_window.py b/src/filetransfers_window.py index f6e346933..1ee6086ad 100644 --- a/src/filetransfers_window.py +++ b/src/filetransfers_window.py @@ -964,3 +964,5 @@ _('Connection with peer cannot be established.')) if event.keyval == gtk.keysyms.Escape: # ESCAPE self.window.hide() + +# vim: se ts=3:
\ No newline at end of file diff --git a/src/gajim-remote.py b/src/gajim-remote.py index 4846705bc..05c2dccb3 100755 --- a/src/gajim-remote.py +++ b/src/gajim-remote.py @@ -544,3 +544,5 @@ class GajimRemote: if __name__ == '__main__': GajimRemote() + +# vim: se ts=3:
\ No newline at end of file diff --git a/src/gajim.py b/src/gajim.py index c1d00f390..999e6169e 100755 --- a/src/gajim.py +++ b/src/gajim.py @@ -3290,3 +3290,5 @@ if __name__ == '__main__': gtk.main() except KeyboardInterrupt: print >> sys.stderr, 'KeyboardInterrupt' + +# vim: se ts=3:
\ No newline at end of file diff --git a/src/gajim_themes_window.py b/src/gajim_themes_window.py index eea5fb651..7de3e8338 100644 --- a/src/gajim_themes_window.py +++ b/src/gajim_themes_window.py @@ -402,3 +402,5 @@ class GajimThemesWindow: 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 diff --git a/src/groupchat_control.py b/src/groupchat_control.py index 7cb6a6e2b..f824d01db 100644 --- a/src/groupchat_control.py +++ b/src/groupchat_control.py @@ -2320,3 +2320,5 @@ class GroupchatControl(ChatControlBase): self.grant_owner(widget, jid) else: self.revoke_owner(widget, jid) + +# vim: se ts=3:
\ No newline at end of file diff --git a/src/groups.py b/src/groups.py index fc277db29..c8f0c5492 100644 --- a/src/groups.py +++ b/src/groups.py @@ -45,3 +45,5 @@ class GroupsPostWindow: # close the window self.window.destroy() + +# vim: se ts=3:
\ No newline at end of file diff --git a/src/gtkexcepthook.py b/src/gtkexcepthook.py index 404f7313e..6d8999f89 100644 --- a/src/gtkexcepthook.py +++ b/src/gtkexcepthook.py @@ -107,3 +107,5 @@ if __name__ == '__main__': _excepthook_save = sys.excepthook sys.excepthook = _info print x # this always tracebacks + +# vim: se ts=3:
\ No newline at end of file diff --git a/src/gtkgui_helpers.py b/src/gtkgui_helpers.py index 7e68c7b98..c1435eae2 100644 --- a/src/gtkgui_helpers.py +++ b/src/gtkgui_helpers.py @@ -979,3 +979,5 @@ def make_jabber_state_images(): 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 diff --git a/src/history_manager.py b/src/history_manager.py index 406bcfbca..f20bab870 100755 --- a/src/history_manager.py +++ b/src/history_manager.py @@ -622,3 +622,5 @@ if __name__ == '__main__': signal.signal(signal.SIGINT, signal.SIG_DFL) # ^C exits the application HistoryManager() gtk.main() + +# vim: se ts=3:
\ No newline at end of file diff --git a/src/history_window.py b/src/history_window.py index 002124af0..f53896c2f 100644 --- a/src/history_window.py +++ b/src/history_window.py @@ -580,3 +580,5 @@ class HistoryWindow: # otherwise self._load_history(jid, account) self.results_window.set_property('visible', False) + +# vim: se ts=3:
\ No newline at end of file diff --git a/src/htmltextview.py b/src/htmltextview.py index 2bf6fd99b..4ba87c3c1 100644 --- a/src/htmltextview.py +++ b/src/htmltextview.py @@ -1147,3 +1147,5 @@ if __name__ == '__main__': w.show_all() w.connect('destroy', lambda w: gtk.main_quit()) gtk.main() + +# vim: se ts=3:
\ No newline at end of file diff --git a/src/ipython_view.py b/src/ipython_view.py index 08b689dea..ace9352be 100644 --- a/src/ipython_view.py +++ b/src/ipython_view.py @@ -521,3 +521,5 @@ class IPythonView(ConsoleView, IterableIPShell): self.showReturned(rv) self.cout.truncate(0) + +# vim: se ts=3:
\ No newline at end of file diff --git a/src/lastfm.py b/src/lastfm.py index 3e4822b2c..2d6796b0f 100644 --- a/src/lastfm.py +++ b/src/lastfm.py @@ -1,4 +1,4 @@ -#!/bin/env python +#!/usr/bin/env python """ LastFM Python class Copyright (C) 2007 Olivier Mehani <shtrom@ssji.net> @@ -215,3 +215,5 @@ if __name__ == '__main__': if lfm.updateData(): print lfm.formatSongTitle() sleep(60) + +# vim: se ts=3: diff --git a/src/lastfm_track_listener.py b/src/lastfm_track_listener.py index fe3d28240..2f8cbff22 100644 --- a/src/lastfm_track_listener.py +++ b/src/lastfm_track_listener.py @@ -101,3 +101,5 @@ if __name__ == '__main__': else: print 'Now playing: "%s" by %s' % (track.title, track.artist) gobject.MainLoop().run() + +# vim: se ts=3:
\ No newline at end of file diff --git a/src/message_control.py b/src/message_control.py index b324d89d1..4b1d050e1 100644 --- a/src/message_control.py +++ b/src/message_control.py @@ -175,3 +175,5 @@ class MessageControl: resource = self.resource, user_nick = user_nick, session = self.session, original_message = original_message) + +# vim: se ts=3:
\ No newline at end of file diff --git a/src/message_textview.py b/src/message_textview.py index ba93e6cd5..7013c6006 100644 --- a/src/message_textview.py +++ b/src/message_textview.py @@ -119,3 +119,5 @@ gtk.binding_entry_add_signal(MessageTextView, gtk.keysyms.KP_Enter, 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 diff --git a/src/message_window.py b/src/message_window.py index 66d8fcf88..48acffa11 100644 --- a/src/message_window.py +++ b/src/message_window.py @@ -1087,3 +1087,5 @@ May be useful some day in the future?''' ctrl.type_id) ctrl.parent_win = mw mw.new_tab(ctrl) + +# vim: se ts=3:
\ No newline at end of file diff --git a/src/music_track_listener.py b/src/music_track_listener.py index 65aa0375f..b96978222 100644 --- a/src/music_track_listener.py +++ b/src/music_track_listener.py @@ -245,3 +245,5 @@ if __name__ == '__main__': else: print 'Now playing: "%s" by %s' % (track.title, track.artist) gobject.MainLoop().run() + +# vim: se ts=3:
\ No newline at end of file diff --git a/src/negotiation.py b/src/negotiation.py index c2b1fcf56..865f7d227 100644 --- a/src/negotiation.py +++ b/src/negotiation.py @@ -64,3 +64,5 @@ class FeatureNegotiationWindow: gajim.connections[self.account].send_stanza(rejection) self.window.destroy() + +# vim: se ts=3:
\ No newline at end of file diff --git a/src/network_manager_listener.py b/src/network_manager_listener.py index e6d42fee1..e95a3651e 100644 --- a/src/network_manager_listener.py +++ b/src/network_manager_listener.py @@ -58,3 +58,5 @@ else: '/org/freedesktop/NetworkManager') except: pass + +# vim: se ts=3:
\ No newline at end of file diff --git a/src/notify.py b/src/notify.py index 63abdc526..09c3ad82b 100644 --- a/src/notify.py +++ b/src/notify.py @@ -585,3 +585,5 @@ class DesktopNotification: 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 diff --git a/src/osx/__init__.py b/src/osx/__init__.py index 263633712..b78753261 100644 --- a/src/osx/__init__.py +++ b/src/osx/__init__.py @@ -41,3 +41,5 @@ def netDeviceChanged(): net_device_active = True device_now_active(None) return + +# vim: se ts=3:
\ No newline at end of file diff --git a/src/osx/dbus.py b/src/osx/dbus.py index 41f1e83c5..700b274d7 100644 --- a/src/osx/dbus.py +++ b/src/osx/dbus.py @@ -129,3 +129,5 @@ def shutdown(): return os.kill(int(env[1]), signal.SIGINT) return + +# vim: se ts=3:
\ No newline at end of file diff --git a/src/osx/growl/Growl.py b/src/osx/growl/Growl.py index 15e037673..4a9e03f91 100644 --- a/src/osx/growl/Growl.py +++ b/src/osx/growl/Growl.py @@ -245,3 +245,5 @@ class GrowlNotifier(object): def notifyCB(self, userdata): print "Got notify in pyland", userdata + +# vim: se ts=3:
\ No newline at end of file diff --git a/src/osx/growl/__init__.py b/src/osx/growl/__init__.py index 2f3c16e5d..48a685022 100644 --- a/src/osx/growl/__init__.py +++ b/src/osx/growl/__init__.py @@ -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 diff --git a/src/osx/growl/setup.py b/src/osx/growl/setup.py index 5a7235dee..80e56b14b 100644 --- a/src/osx/growl/setup.py +++ b/src/osx/growl/setup.py @@ -1,4 +1,4 @@ -#!/usr/bin/python +#!/usr/bin/env python from distutils.core import setup, Extension import sys @@ -23,3 +23,5 @@ setup(name="py-Growl", py_modules=["Growl"], ext_modules = modules ) + +# vim: se ts=3: diff --git a/src/osx/growler.py b/src/osx/growler.py index c3ea320cf..0b39a66f6 100644 --- a/src/osx/growler.py +++ b/src/osx/growler.py @@ -61,3 +61,5 @@ def filterString(string): string = string.replace(""", "'") return string + +# vim: se ts=3:
\ No newline at end of file diff --git a/src/osx/prep_py2app.py b/src/osx/prep_py2app.py index dfe087d40..b215a9960 100644 --- a/src/osx/prep_py2app.py +++ b/src/osx/prep_py2app.py @@ -21,3 +21,5 @@ if ((lib_dyn > -1) and (site_zip > -1)): sys.path[site_zip] = tmp if py > -1: del sys.path[py] + +# vim: se ts=3:
\ No newline at end of file diff --git a/src/osx/setup.py b/src/osx/setup.py index 2eaeb1bb9..c2211a35e 100644 --- a/src/osx/setup.py +++ b/src/osx/setup.py @@ -18,3 +18,5 @@ setup( extra_link_args=['-framework', 'AppKit', '-framework', 'Cocoa']), ] ) + +# vim: se ts=3:
\ No newline at end of file diff --git a/src/osx/syncmenu/setup.py b/src/osx/syncmenu/setup.py index 7b20709f9..3e0fc6561 100644 --- a/src/osx/syncmenu/setup.py +++ b/src/osx/syncmenu/setup.py @@ -25,3 +25,5 @@ setup(name='syncmenu', version='0.2', extra_link_args=libs + ['-framework', 'Carbon'], extra_compile_args=['-Wall'] + cflags) ]) + +# vim: se ts=3:
\ No newline at end of file diff --git a/src/osx/syncmenu/test-menu.py b/src/osx/syncmenu/test-menu.py index b9c4471c8..c0a1c18d9 100644 --- a/src/osx/syncmenu/test-menu.py +++ b/src/osx/syncmenu/test-menu.py @@ -76,3 +76,5 @@ menubar.hide() syncmenu.takeover_menu(menubar) gtk.main() + +# vim: se ts=3:
\ No newline at end of file diff --git a/src/profile_window.py b/src/profile_window.py index c690cc0ff..78bbfb561 100644 --- a/src/profile_window.py +++ b/src/profile_window.py @@ -358,3 +358,5 @@ class ProfileWindow: def on_cancel_button_clicked(self, widget): self.window.destroy() + +# vim: se ts=3:
\ No newline at end of file diff --git a/src/remote_control.py b/src/remote_control.py index c7b0382fb..7615e4c64 100644 --- a/src/remote_control.py +++ b/src/remote_control.py @@ -675,3 +675,5 @@ class SignalObject(dbus.service.Object): 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 diff --git a/src/roster_window.py b/src/roster_window.py index 9aa993c37..06911a57b 100644 --- a/src/roster_window.py +++ b/src/roster_window.py @@ -6333,3 +6333,5 @@ class RosterWindow: if sys.platform == 'darwin': self.setup_for_osx() + +# vim: se ts=3:
\ No newline at end of file diff --git a/src/search_window.py b/src/search_window.py index a08f3d8de..231bee6fc 100644 --- a/src/search_window.py +++ b/src/search_window.py @@ -231,3 +231,5 @@ class SearchWindow: self.window.set_title('%s - Search - Gajim' % \ self.data_form_widget.title) + +# vim: se ts=3:
\ No newline at end of file diff --git a/src/secrets.py b/src/secrets.py index d8c42ee1c..1861d330d 100644 --- a/src/secrets.py +++ b/src/secrets.py @@ -101,3 +101,5 @@ def secrets(): secrets_cache = Secrets(secrets_filename) return secrets_cache + +# vim: se ts=3:
\ No newline at end of file diff --git a/src/session.py b/src/session.py index 97b04ac2b..bcd54f13d 100644 --- a/src/session.py +++ b/src/session.py @@ -461,3 +461,5 @@ class ChatControlSession(stanza_session.EncryptedStanzaSession): resource = resource, session = self) negotiation.FeatureNegotiationWindow(account, self.jid, self, form) + +# vim: se ts=3:
\ No newline at end of file diff --git a/src/statusicon.py b/src/statusicon.py index 54d5aec3e..34d910b6f 100644 --- a/src/statusicon.py +++ b/src/statusicon.py @@ -90,3 +90,5 @@ class StatusIcon(systray.Systray): #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 diff --git a/src/systray.py b/src/systray.py index a2f0c10fb..6d08bd83e 100644 --- a/src/systray.py +++ b/src/systray.py @@ -404,3 +404,5 @@ class Systray: self.t.destroy() self.t = None self.unsubscribe_events() + +# vim: se ts=3:
\ No newline at end of file diff --git a/src/tooltips.py b/src/tooltips.py index f6a8fbf88..1cd79cfdc 100644 --- a/src/tooltips.py +++ b/src/tooltips.py @@ -737,3 +737,5 @@ class ServiceDiscoveryTooltip(BaseTooltip): _('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 diff --git a/src/vcard.py b/src/vcard.py index ce9fb069e..8406ec599 100644 --- a/src/vcard.py +++ b/src/vcard.py @@ -525,3 +525,5 @@ class ZeroconfVcardWindow: def on_close_button_clicked(self, widget): self.window.destroy() + +# vim: se ts=3:
\ No newline at end of file |