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.
This commit is contained in:
js 2008-07-29 19:49:31 +00:00
parent 993d0d8609
commit 8605cd3f38
131 changed files with 265 additions and 3 deletions

View File

@ -49,3 +49,5 @@ emoticons = {
'puke.gif': [':-!'],
}
# vim: se ts=3:

View File

@ -41,3 +41,5 @@ emoticons = {
'rainbow.png': ['(R)'],
'puke.png': [':-!'],
}
# vim: se ts=3:

View File

@ -41,3 +41,5 @@ emoticons = {
'rainbow.png': ['(R)'],
'puke.png': [':-!'],
}
# vim: se ts=3:

View File

@ -1,4 +1,4 @@
#! /usr/bin/env python
#!/usr/bin/env python
# (C) 2006 Nikos Kouremenos <kourem@gmail.com>
import os
@ -10,3 +10,5 @@ if os.getcwd().endswith('dev'):
os.system('pychecker --limit 10000 --no-shadowbuiltin *.py &> /tmp/pychecker-gajim.log')
os.system('$EDITOR /tmp/pychecker-gajim.log')
# vim: se ts=3:

View File

@ -198,3 +198,5 @@ elif sys.argv[1] == "build":
finishApp()
elif sys.argv[1] == "dist":
distApp()
# vim: se ts=3:

View File

@ -75,3 +75,5 @@ setup(
('.', glob.glob('src/history_manager.glade')),
],
)
# vim: se ts=3:

View File

@ -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:

View File

@ -271,3 +271,5 @@ class AdvancedConfigurationWindow(object):
def on_advanced_entry_changed(self, widget):
self.modelfilter.refilter()
# vim: se ts=3:

View File

@ -133,3 +133,5 @@ class AtomWindow:
if uri is not None:
helpers.launch_browser_mailer('url', uri)
return True
# vim: se ts=3:

View File

@ -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:

View File

@ -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:

View File

@ -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:

View File

@ -655,3 +655,5 @@ GnuPGInterface = GnuPG
if __name__ == '__main__':
_run_doctests()
# vim: se ts=3:

View File

@ -0,0 +1,2 @@
# vim: se ts=3:

View File

@ -134,3 +134,5 @@ class OldEntry(xmpp.Node, object):
''' Last significant modification time. ''')
feed_tagline = u''
# vim: se ts=3:

View File

@ -278,3 +278,5 @@ class ConnectionCaps(object):
return
caps.update(identities, features)
# vim: se ts=3:

View File

@ -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:

View File

@ -412,3 +412,5 @@ class ConnectionCommands:
del self.__sessions[magictuple]
raise xmpp.NodeProcessed
# vim: se ts=3:

View File

@ -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:

View File

@ -121,3 +121,5 @@ class ConfigPaths:
# print "%s: %s" % (repr(k), repr(v))
gajimpaths = ConfigPaths()
# vim: se ts=3:

View File

@ -1744,3 +1744,5 @@ class Connection(ConnectionHandlers):
self.connection.SendAndCallForResponse(iq, _on_response)
# END Connection
# vim: se ts=3:

View File

@ -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:

View File

@ -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:

View File

@ -84,3 +84,5 @@ def powmod(base, exp, mod):
exp /= 2
return result
# vim: se ts=3:

View File

@ -457,3 +457,5 @@ class MultipleDataForm(DataForm):
# self.addChild(node=record)
# return locals()
# vim: se ts=3:

View File

@ -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:

View File

@ -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:

View File

@ -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:

View File

@ -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:

View File

@ -87,3 +87,5 @@ class GajimGeneralException(Exception):
def __str__(self):
return self.text
# vim: se ts=3:

View File

@ -139,3 +139,5 @@ class FuzzyClock:
newTimeStr = self.__fuzzyWeek[3]
return newTimeStr
# vim: se ts=3:

View File

@ -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:

View File

@ -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:

View File

@ -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:

View File

@ -760,3 +760,5 @@ class Logger:
self.con.commit()
except sqlite.OperationalError, e:
print >> sys.stderr, str(e)
# vim: se ts=3:

View File

@ -333,3 +333,5 @@ if __name__ == '__main__':
gobject.timeout_add(200, process)
gtk.main()
# vim: se ts=3:

View File

@ -595,3 +595,5 @@ class OptionsParser:
pass
con.close()
gajim.config.set('version', '0.11.4.4')
# vim: se ts=3:

View File

@ -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:

View File

@ -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:

View File

@ -275,3 +275,5 @@ class HostTester(Socks5, IdleObject):
self.idlequeue.plug_idle(self, True, False)
return
# vim: se ts=3:

View File

@ -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:

View File

@ -161,3 +161,5 @@ this `` should trigger`` should trigger the &nbsp; problem.
test2_
""")
print "test 3\n", Generator.create_xhtml(""":ticket:`316` implements :xep:`71`""")
# vim: se ts=3:

View File

@ -128,3 +128,5 @@ if os.name == 'nt':
Sleepy = SleepyWindows
else:
Sleepy = SleepyUnix
# vim: se ts=3:

View File

@ -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:

View File

@ -944,3 +944,5 @@ otherwise, list the fields we haven't implemented'''
self.enable_encryption = False
self.km_o = ''
# vim: se ts=3:

View File

@ -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:

View File

@ -304,3 +304,5 @@ class ComponentBind(PlugIn):
else:
self.DEBUG('Binding failed: timeout expired.','error')
return ''
# vim: se ts=3:

View File

@ -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:

View File

@ -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:

View File

@ -34,3 +34,5 @@ def normalise_attr(val):
def normalise_text(val):
return val.replace('&', '&amp;').replace('<', '&lt;').replace('>', '&gt;').replace('\r', '&#xD;')
# vim: se ts=3:

View File

@ -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:

View File

@ -407,3 +407,5 @@ class Component(NBCommonClient):
def _on_component_bound(self, resp):
self.NBComponentBind.PlugOut()
# vim: se ts=3:

View File

@ -328,3 +328,5 @@ class TestCommand(Command_Handler_Prototype):
del sessions[request.getTagAttr('command','sessionid')]
# vim: se ts=3:

View File

@ -400,3 +400,5 @@ DBG_ALWAYS='always'
##Uncomment this to effectively disable all debugging and all debugging overhead.
#Debug=NoDebug
# vim: se ts=3:

View File

@ -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:

View File

@ -437,3 +437,5 @@ class Dispatcher(PlugIn):
def disconnect(self):
''' Send a stream terminator. '''
self._owner.Connection.send('</stream:stream>')
# vim: se ts=3:

View File

@ -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:

View File

@ -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:

View File

@ -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:

View File

@ -219,3 +219,5 @@ class SelectIdleQueue(IdleQueue):
q.pollend()
self.check_time_events()
return True
# vim: se ts=3:

View File

@ -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:

View File

@ -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:

View File

@ -57,3 +57,5 @@ class NonBlockingRoster(Roster):
on_ready = None
else:
return self
# vim: se ts=3:

View File

@ -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:

View File

@ -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:

View File

@ -287,3 +287,5 @@ class TLS(PlugIn):
self._startSSL()
self._owner.Dispatcher.PlugOut()
dispatcher.Dispatcher().PlugIn(self._owner)
# vim: se ts=3:

View File

@ -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:

View File

@ -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:

View File

@ -0,0 +1,2 @@
# vim: se ts=3:

View File

@ -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:

View File

@ -481,3 +481,5 @@ class ConnectionHandlersZeroconf(ConnectionVcard, ConnectionBytestream, connecti
def remove_transfer(self, file_props, remove_from_list = True):
pass
# vim: se ts=3:

View File

@ -553,3 +553,5 @@ class ConnectionZeroconf(ConnectionHandlersZeroconf):
self.dispatch('STANZA_SENT', unicode(data))
# END ConnectionZeroconf
# vim: se ts=3:

View File

@ -161,3 +161,5 @@ class Roster:
def Unauthorize(self,jid):
pass
# vim: se ts=3:

View File

@ -45,3 +45,5 @@ if test_avahi():
elif test_bonjour():
from common.zeroconf import zeroconf_bonjour
Zeroconf = zeroconf_bonjour.Zeroconf
# vim: se ts=3:

View File

@ -428,3 +428,5 @@ class Zeroconf:
# END Zeroconf
# vim: se ts=3:

View File

@ -334,3 +334,5 @@ class Zeroconf:
return False
return True
# vim: se ts=3:

View File

@ -3736,3 +3736,5 @@ class ManagePEPServicesWindow:
title = "Configure %s" % node
window.set_title(title)
window.show_all()
# vim: se ts=3:

View File

@ -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:

View File

@ -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:

View File

@ -3846,3 +3846,5 @@ class ESessionInfoWindow:
self.session._verified_srs_cb()
self.session.verified_identity = True
self.update_info()
# vim: se ts=3:

View File

@ -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:

View File

@ -318,3 +318,5 @@ class FeaturesWindow:
def pysexy_available(self):
from common import gajim
return gajim.HAVE_PYSEXY
# vim: se ts=3:

View File

@ -964,3 +964,5 @@ _('Connection with peer cannot be established.'))
if event.keyval == gtk.keysyms.Escape: # ESCAPE
self.window.hide()
# vim: se ts=3:

View File

@ -544,3 +544,5 @@ class GajimRemote:
if __name__ == '__main__':
GajimRemote()
# vim: se ts=3:

View File

@ -3290,3 +3290,5 @@ if __name__ == '__main__':
gtk.main()
except KeyboardInterrupt:
print >> sys.stderr, 'KeyboardInterrupt'
# vim: se ts=3:

View File

@ -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:

View File

@ -2320,3 +2320,5 @@ class GroupchatControl(ChatControlBase):
self.grant_owner(widget, jid)
else:
self.revoke_owner(widget, jid)
# vim: se ts=3:

View File

@ -45,3 +45,5 @@ class GroupsPostWindow:
# close the window
self.window.destroy()
# vim: se ts=3:

View File

@ -107,3 +107,5 @@ if __name__ == '__main__':
_excepthook_save = sys.excepthook
sys.excepthook = _info
print x # this always tracebacks
# vim: se ts=3:

View File

@ -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:

View File

@ -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:

View File

@ -580,3 +580,5 @@ class HistoryWindow:
# otherwise
self._load_history(jid, account)
self.results_window.set_property('visible', False)
# vim: se ts=3:

View File

@ -1147,3 +1147,5 @@ if __name__ == '__main__':
w.show_all()
w.connect('destroy', lambda w: gtk.main_quit())
gtk.main()
# vim: se ts=3:

View File

@ -521,3 +521,5 @@ class IPythonView(ConsoleView, IterableIPShell):
self.showReturned(rv)
self.cout.truncate(0)
# vim: se ts=3:

View File

@ -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:

View File

@ -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:

View File

@ -175,3 +175,5 @@ class MessageControl:
resource = self.resource, user_nick = user_nick,
session = self.session,
original_message = original_message)
# vim: se ts=3:

View File

@ -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:

View File

@ -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:

View File

@ -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:

Some files were not shown because too many files have changed in this diff Show More