Commits May 2008

commits@gajim.org

9 participants
181 discussions

[commit-gajim] r9729 - trunk/src
by jim++＠gajim.org 31 May '08

31 May '08

Author: jim++ Date: 2008-06-01 00:13:57 +0200 (Sun, 01 Jun 2008) New Revision: 9729 Modified: trunk/src/history_window.py Log: Remove unused temp var Modified: trunk/src/history_window.py =================================================================== --- trunk/src/history_window.py 2008-05-31 20:49:48 UTC (rev 9728) +++ trunk/src/history_window.py 2008-05-31 22:13:57 UTC (rev 9729) @@ -272,10 +272,10 @@ # select logs for last date we have logs with contact self.calendar.set_sensitive(True) - lastlog = gajim.logger.get_last_date_that_has_logs(self.jid, self.account) + last_log = \ + gajim.logger.get_last_date_that_has_logs(self.jid, self.account) - tim = lastlog - date = time.localtime(tim) + date = time.localtime(last_log) y, m, d = date[0], date[1], date[2] gtk_month = gtkgui_helpers.make_python_month_gtk_month(m)

1 0

[commit-gajim] r9728 - trunk/src
by jim++＠gajim.org 31 May '08

31 May '08

Author: jim++ Date: 2008-05-31 22:49:48 +0200 (Sat, 31 May 2008) New Revision: 9728 Modified: trunk/src/history_window.py Log: -Fix TB in my last commit -Stop using idle_call for marking days with log in calendar, because this was... longer ! -Stop emiting month changed signal two times (so it was even longer) Modified: trunk/src/history_window.py =================================================================== --- trunk/src/history_window.py 2008-05-31 19:41:42 UTC (rev 9727) +++ trunk/src/history_window.py 2008-05-31 20:49:48 UTC (rev 9728) @@ -65,8 +65,6 @@ '''Class for browsing logs of conversations with contacts''' def __init__(self, jid = None, account = None): - self.mark_days_idle_call_id = None - xml = gtkgui_helpers.get_glade('history_window.glade') self.window = xml.get_widget('history_window') self.jid_entry = xml.get_widget('jid_entry') @@ -158,7 +156,8 @@ keys = self.completion_dict.keys() # Move the actual jid at first so we load history faster actual_jid = self.jid_entry.get_text().decode('utf-8') - keys.remove(actual_jid) + if actual_jid in keys: + keys.remove(actual_jid) keys.insert(0, actual_jid) # Map jid to info tuple # Warning : This for is time critical with big DB @@ -214,10 +213,6 @@ return account def on_history_window_destroy(self, widget): - if self.mark_days_idle_call_id: - # if user destroys the window, and we have a generator filling mark days - # stop him! - gobject.source_remove(self.mark_days_idle_call_id) self.history_textview.del_handlers() del gajim.interface.instances['logs'] @@ -277,7 +272,6 @@ # select logs for last date we have logs with contact self.calendar.set_sensitive(True) - self.calendar.emit('month-changed') lastlog = gajim.logger.get_last_date_that_has_logs(self.jid, self.account) tim = lastlog @@ -317,31 +311,21 @@ month = gtkgui_helpers.make_gtk_month_python_month(month) self._add_lines_for_date(year, month, day) - def do_possible_mark_for_days_in_this_month(self, widget, year, month): - '''this is a generator and does pseudo-threading via idle_add() - so it runs progressively! yea :) - asks for days in this month if they have logs it bolds them (marks them)''' - weekday, days_in_this_month = calendar.monthrange(year, month) - log_days = gajim.logger.get_days_with_logs(self.jid, year, - month, days_in_this_month, self.account) - for day in log_days: - widget.mark_day(day) - yield True - yield False - def on_calendar_month_changed(self, widget): + '''asks for days in this month if they have logs it bolds them (marks + them) + ''' year, month, day = widget.get_date() # integers # in gtk January is 1, in python January is 0, # I want the second # first day of month is 1 not 0 - if self.mark_days_idle_call_id: - # if user changed month, and we have a generator filling mark days - # stop him from marking dates for the previously selected month - gobject.source_remove(self.mark_days_idle_call_id) widget.clear_marks() month = gtkgui_helpers.make_gtk_month_python_month(month) - self.mark_days_idle_call_id = gobject.idle_add( - self.do_possible_mark_for_days_in_this_month(widget, year, month).next) + weekday, days_in_this_month = calendar.monthrange(year, month) + log_days = gajim.logger.get_days_with_logs(self.jid, year, + month, days_in_this_month, self.account) + for day in log_days: + widget.mark_day(day) def _get_string_show_from_constant_int(self, show): if show == constants.SHOW_ONLINE:

1 0

[commit-gajim] r9727 - trunk/src
by jim++＠gajim.org 31 May '08

31 May '08

Author: jim++ Date: 2008-05-31 21:41:42 +0200 (Sat, 31 May 2008) New Revision: 9727 Modified: trunk/src/history_window.py Log: Use idle_add for history_win._fill_completion_dict (LOT faster) Modified: trunk/src/history_window.py =================================================================== --- trunk/src/history_window.py 2008-05-31 16:51:40 UTC (rev 9726) +++ trunk/src/history_window.py 2008-05-31 19:41:42 UTC (rev 9727) @@ -117,22 +117,25 @@ self.completion_dict = {} self.accounts_seen_online = [] # Update dict when new accounts connect self.jids_to_search = [] - self._fill_completion_dict() + # This will load history too + gobject.idle_add(self._fill_completion_dict().next) + if jid: self.jid_entry.set_text(jid) xml.signal_autoconnect(self) - self._load_history(jid, account) self.window.show_all() def _fill_completion_dict(self): - '''Fill completion_dict for key auto completion. + '''Fill completion_dict for key auto completion. Then load history for + current jid (by calling another function). Key will be either jid or full_completion_name (contact name or long description like "pm-contact from groupchat....") {key : (jid, account, nick_name, full_completion_name} + this is a generator and does pseudo-threading via idle_add() ''' liststore = gtkgui_helpers.get_completion_liststore(self.jid_entry) @@ -150,8 +153,13 @@ muc_active_img = gtkgui_helpers.load_icon('muc_active') contact_img = gajim.interface.jabber_state_images['16']['online'] muc_active_pix = muc_active_img.get_pixbuf() - contact_pix = contact_img.get_pixbuf() + contact_pix = contact_img.get_pixbuf() + keys = self.completion_dict.keys() + # Move the actual jid at first so we load history faster + actual_jid = self.jid_entry.get_text().decode('utf-8') + keys.remove(actual_jid) + keys.insert(0, actual_jid) # Map jid to info tuple # Warning : This for is time critical with big DB for key in keys: @@ -180,13 +188,17 @@ info_name = nick else: pix = contact_pix - + liststore.append((pix, completed)) self.completion_dict[key] = (info_jid, info_acc, info_name, info_completion) self.completion_dict[completed] = (info_jid, info_acc, info_name, info_completion) + if key == actual_jid: + self._load_history(info_jid, info_acc) + yield True keys.sort() + yield False def _get_account_for_jid(self, jid): '''Return the corresponding account of the jid. @@ -480,7 +492,8 @@ message = row[4] local_time = time.localtime(tim) date = time.strftime('%x', local_time) - # jid (to which log is assigned to), name, date, message, time (full unix time) + # jid (to which log is assigned to), name, date, message, + # time (full unix time) model.append((jid, contact_name, date, message, tim)) def on_query_combobox_changed(self, widget): @@ -573,9 +586,12 @@ def open_history(self, jid, account): '''Load chat history of the specified jid''' + self.jid_entry.set_text(jid) if account and account not in self.accounts_seen_online: # Update dict to not only show bare jid - self._fill_completion_dict - self.jid_entry.set_text(jid) - self._load_history(jid, account) + gobject.idle_add(self._fill_completion_dict().next) + else: + # Only in that case because it's called by self._fill_completion_dict() + # otherwise + self._load_history(jid, account) self.results_window.set_property('visible', False)

1 0

[commit-gajim] r9726 - in branches/bosh_support/src/common/xmpp: . examples
by tomk＠gajim.org 31 May '08

31 May '08

Author: tomk Date: 2008-05-31 18:51:40 +0200 (Sat, 31 May 2008) New Revision: 9726 Added: branches/bosh_support/src/common/xmpp/client_bosh.py branches/bosh_support/src/common/xmpp/examples/ branches/bosh_support/src/common/xmpp/examples/run_client_bosh.py Modified: branches/bosh_support/src/common/xmpp/transports_nb.py Log: added prototype of BOSHClient class and script for usage example, removed import of common.gajim from transports_nb Added: branches/bosh_support/src/common/xmpp/client_bosh.py =================================================================== --- branches/bosh_support/src/common/xmpp/client_bosh.py (rev 0) +++ branches/bosh_support/src/common/xmpp/client_bosh.py 2008-05-31 16:51:40 UTC (rev 9726) @@ -0,0 +1,194 @@ +## client_bosh.py +## +## Copyright (C) 2008 Tomas Karasek <tom.to.the.k(a)gmail.com> +## +## This program is free software; you can redistribute it and/or modify +## it under the terms of the GNU General Public License as published by +## the Free Software Foundation; either version 2, or (at your option) +## any later version. +## +## This program is distributed in the hope that it will be useful, +## but WITHOUT ANY WARRANTY; without even the implied warranty of +## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +## GNU General Public License for more details. + +import locale, random +import protocol +import simplexml +import debug +import dispatcher_nb +from client_nb import NBCommonClient + +DBG_BOSHCLIENT='boshclient' + +class BOSHClient(NBCommonClient): + ''' + BOSH (XMPP over HTTP) client implementation. It should provide the same + methods and functionality as NonBlockingClient. + ''' + + + def __init__(self, server, bosh_conn_mgr, port=5222, bosh_port=5280, + on_connect=None, on_connect_failure=None, on_proxy_failure=None, caller=None): + ''' + Class constuctor has the same parameters as NBCommonClient plus bosh_conn_mgr + and bosh_port - Connection manager address and port. bosh_conn_mgr should be + in form: 'http://httpcm.jabber.org/http-bind/' + Tcp connection will be opened to bosh_conn_mgr:bosh_port instead of + server:port. + ''' + self.bosh_protocol, self.bosh_host, self.bosh_uri = self.urisplit(bosh_conn_mgr) + if self.bosh_protocol is None: + self.bosh_protocol = 'http' + + self.bosh_port = bosh_port + + if self.bosh_uri == '': + bosh_uri = '/' + + self.xmpp_server = server + self.xmpp_port = port + + self.bosh_hold = 1 + self.bosh_wait=60 + self.bosh_rid=-1 + self.bosh_httpversion = 'HTTP/1.1' + + NBCommonClient.__init__(self, self.bosh_host, self.bosh_port, caller=caller, + on_connect=on_connect, on_connect_failure=on_connect_failure, + on_proxy_failure=on_proxy_failure) + + # Namespace and DBG are detected in NBCommonClient constructor + # with isinstance(). Since BOSHClient is descendant of NBCommonClient + # and client_bosh.py is NOT imported in client_nb.py, NB_COMPONENT_ACCEPT + # is put to namespace. This is not very nice, thus: + # TODO: refactor Namespace and DBG recognition in NBCommonClient or + # derived classes + self.Namespace, self.DBG = protocol.NS_HTTP_BIND, DBG_BOSHCLIENT + # pop of DBG_COMPONENT + self.debug_flags.pop() + self.debug_flags.append(self.DBG) + self.debug_flags.append(simplexml.DBG_NODEBUILDER) + + + def urisplit(self, uri): + ''' + Function for splitting URI string to tuple (protocol, host, path). + e.g. urisplit('http://httpcm.jabber.org/webclient') returns + ('http', 'httpcm.jabber.org', '/webclient') + ''' + import re + regex = '(([^:/]+)(://))?([^/]*)(/?.*)' + grouped = re.match(regex, uri).groups() + proto, host, path = grouped[1], grouped[3], grouped[4] + return proto, host, path + + + def _on_connected(self): + ''' + method called after socket starts connecting from NonBlockingTcp._do_connect + ''' + self.onreceive(self.on_bosh_session_init_response) + dispatcher_nb.Dispatcher().PlugIn(self) + + + def parse_http_message(self, message): + ''' + splits http message to tuple ( + statusline - list of e.g. ['HTTP/1.1', '200', 'OK'], + headers - dictionary of headers e.g. {'Content-Length': '604', + 'Content-Type': 'text/xml; charset=utf-8'}, + httpbody - string with http body + ) + ''' + message = message.replace('\r','') + (header, httpbody) = message.split('\n\n') + header = header.split('\n') + statusline = header[0].split(' ') + header = header[1:] + headers = {} + for dummy in header: + row = dummy.split(' ',1) + headers[row[0][:-1]] = row[1] + return (statusline, headers, httpbody) + + + def on_bosh_session_init_response(self, data): + ''' + Called on init response - should check relevant attributes from body tag + ''' + if data: + statusline, headers, httpbody = self.parse_http_message(data) + + if statusline[1] != '200': + self.DEBUG(self.DBG, "HTTP Error in received session init response: %s" + % statusline, 'error') + # error handling TBD! + + # ATM, whole <body> tag is pass to ProcessNonBocking. + # Question is how to peel off the body tag from incoming stanzas and make + # use of ordinar xmpp traffic handling. + self.Dispatcher.ProcessNonBlocking(httpbody) + + + def _check_stream_start(self, ns, tag, attrs): + ''' + callback stub called from XML Parser when <stream..> is discovered + ''' + self.DEBUG(self.DBG, 'CHECK_STREAM_START: ns: %s, tag: %s, attrs: %s' + % (ns, tag, attrs), 'info') + + + def StreamInit(self): + ''' + Initiation of BOSH session. Called instead of Dispatcher.StreamInit() + Initial body tag is created and sent to Conn Manager. + ''' + self.Dispatcher.Stream = simplexml.NodeBuilder() + self.Dispatcher.Stream._dispatch_depth = 2 + self.Dispatcher.Stream.dispatch = self.Dispatcher.dispatch + self.Dispatcher.Stream.stream_header_received = self._check_stream_start + self.debug_flags.append(simplexml.DBG_NODEBUILDER) + self.Dispatcher.Stream.DEBUG = self.DEBUG + self.Dispatcher.Stream.features = None + + initial_body_tag = simplexml.Node('body') + initial_body_tag.setNamespace(self.Namespace) + initial_body_tag.setAttr('content', 'text/xml; charset=utf-8') + initial_body_tag.setAttr('hold', str(self.bosh_hold)) + initial_body_tag.setAttr('to', self.xmpp_server) + initial_body_tag.setAttr('wait', str(self.bosh_wait)) + + r = random.Random() + r.seed() + # with 50-bit random initial rid, session would have to go up + # to 7881299347898368 messages to raise rid over 2**53 + # (see http://www.xmpp.org/extensions/xep-0124.html#rids) + self.bosh_rid = r.getrandbits(50) + initial_body_tag.setAttr('rid', str(self.bosh_rid)) + + if locale.getdefaultlocale()[0]: + initial_body_tag.setAttr('xml:lang', + locale.getdefaultlocale()[0].split('_')[0]) + initial_body_tag.setAttr('xmpp:version', '1.0') + initial_body_tag.setAttr('xmlns:xmpp', 'urn:xmpp:xbosh') + + self.send(self.build_bosh_message(initial_body_tag)) + + + def build_bosh_message(self, httpbody): + ''' + Builds bosh http message with given body. + Values for headers and status line fields are taken from class variables. + ) + ''' + headers = ['POST %s HTTP/1.1' % self.bosh_uri, + 'Host: %s' % self.bosh_host, + 'Content-Type: text/xml; charset=utf-8', + 'Content-Length: %s' % len(str(httpbody)), + '\r\n'] + headers = '\r\n'.join(headers) + return('%s%s\r\n' % (headers, httpbody)) + + + Added: branches/bosh_support/src/common/xmpp/examples/run_client_bosh.py =================================================================== --- branches/bosh_support/src/common/xmpp/examples/run_client_bosh.py (rev 0) +++ branches/bosh_support/src/common/xmpp/examples/run_client_bosh.py 2008-05-31 16:51:40 UTC (rev 9726) @@ -0,0 +1,89 @@ +# Example script for usage of BOSHClient class +# -------------------------------------------- +# run `python run_client_bosh.py` in gajim/src/common/xmpp/examples/ directory +# and quit with CTRL + c. +# Script will open TCP connection to Connection Manager, send BOSH initial +# request and receive initial response. Handling of init response is not +# done yet. + + +# imports gtk because of gobject.timeout_add() which is used for processing +# idlequeue +# TODO: rewrite to thread timer +import gtk +import gobject +import sys, os.path + +xmpppy_dir = os.path.join(os.path.abspath(os.path.dirname(__file__)), '..') +sys.path.append(xmpppy_dir) + +import idlequeue +from client_bosh import BOSHClient + + +class DummyConnection(): + ''' + Dummy class for test run of bosh_client. I use it because in Connection class + the gajim.py module is imported and stuff from it is read in there, so it + would be difficult to debug IMHO. On the other hand, I will have to test with + Connection class sooner or later somehow because that's the main place where + BOSHClient should be used. + DummyConnection class holds and processes IdleQueue for BOSHClient. + ''' + + def __init__(self, iq_interval_ms=1000): + self.classname = self.__class__.__name__ + self.iq_interval_ms = iq_interval_ms + self.idlequeue = idlequeue.IdleQueue() + self.timer=gobject.timeout_add(iq_interval_ms, self.process_idlequeue) + + + def process_idlequeue(self): + ''' + called each iq_interval_ms miliseconds. Checks for idlequeue timeouts. + ''' + self.idlequeue.process() + return True + + # callback stubs follows + def _event_dispatcher(self, realm, event, data): + print "\n>>> %s._event_dispatcher called:" % self.classname + print ">>> realm: %s, event: %s, data: %s\n" % (realm, event, data) + + + def onconsucc(self): + print '%s: CONNECTION SUCCEEDED' % self.classname + + + def onconfail(self, retry=None): + print '%s: CONNECTION FAILED.. retry?: %s' % (self.classname, retry) + + +if __name__ == "__main__": + dc = DummyConnection() + + # you can use my instalation of ejabberd2: + server = 'star.securitynet.cz' + bosh_conn_mgr = 'http://star.securitynet.cz/http-bind/' + + #server='jabbim.cz' + #bosh_conn_mgr='http://bind.jabbim.cz/' + + bc = BOSHClient( + server = server, + bosh_conn_mgr = bosh_conn_mgr, + bosh_port = 80, + on_connect = dc.onconsucc, + on_connect_failure = dc.onconfail, + caller = dc + ) + + bc.set_idlequeue(dc.idlequeue) + + bc.connect() + + try: + gtk.main() + except KeyboardInterrupt: + dc.process_idlequeue() + Modified: branches/bosh_support/src/common/xmpp/transports_nb.py =================================================================== --- branches/bosh_support/src/common/xmpp/transports_nb.py 2008-05-31 15:50:17 UTC (rev 9725) +++ branches/bosh_support/src/common/xmpp/transports_nb.py 2008-05-31 16:51:40 UTC (rev 9726) @@ -33,8 +33,17 @@ import logging log = logging.getLogger('gajim.c.x.transports_nb') -import common.gajim +# I don't need to load gajim.py just because of few TLS variables, so I changed +# :%s/common\.gajim\.DATA_DIR/\'\.\.\/data\'/c +# :%s/common\.gajim\.MY_CACERTS/\'\%s\/\.gajim\/cacerts\.pem\' \% os\.environ\[\'HOME\'\]/c +# To change it back do: +# %s/\'\.\.\/data\'/common\.gajim\.DATA_DIR/c +# :%s/\'\%s\/\.gajim\/cacerts\.pem\' \% os\.environ\[\'HOME\'\]/common\.gajim\.MY_CACERTS/c + +# import common.gajim + + USE_PYOPENSSL = False try: @@ -762,16 +771,16 @@ #tcpsock._sslContext = OpenSSL.SSL.Context(OpenSSL.SSL.SSLv23_METHOD) tcpsock.ssl_errnum = 0 tcpsock._sslContext.set_verify(OpenSSL.SSL.VERIFY_PEER, self._ssl_verify_callback) - cacerts = os.path.join(common.gajim.DATA_DIR, 'other', 'cacerts.pem') + cacerts = os.path.join('../data', 'other', 'cacerts.pem') try: tcpsock._sslContext.load_verify_locations(cacerts) except: log.warning('Unable to load SSL certificats from file %s' % \ os.path.abspath(cacerts)) # load users certs - if os.path.isfile(common.gajim.MY_CACERTS): + if os.path.isfile('%s/.gajim/cacerts.pem' % os.environ['HOME']): store = tcpsock._sslContext.get_cert_store() - f = open(common.gajim.MY_CACERTS) + f = open('%s/.gajim/cacerts.pem' % os.environ['HOME']) lines = f.readlines() i = 0 begin = -1 @@ -786,11 +795,11 @@ store.add_cert(X509cert) except OpenSSL.crypto.Error, exception_obj: log.warning('Unable to load a certificate from file %s: %s' %\ - (common.gajim.MY_CACERTS, exception_obj.args[0][0][2])) + ('%s/.gajim/cacerts.pem' % os.environ['HOME'], exception_obj.args[0][0][2])) except: log.warning( 'Unknown error while loading certificate from file %s' % \ - common.gajim.MY_CACERTS) + '%s/.gajim/cacerts.pem' % os.environ['HOME']) begin = -1 i += 1 tcpsock._sslObj = OpenSSL.SSL.Connection(tcpsock._sslContext, tcpsock._sock)

1 0

[commit-gajim] r9725 - trunk
by asterix＠gajim.org 31 May '08

31 May '08

Author: asterix Date: 2008-05-31 17:50:17 +0200 (Sat, 31 May 2008) New Revision: 9725 Added: trunk/epydoc.conf Log: [Vardo] conf file for epydoc generation Added: trunk/epydoc.conf =================================================================== --- trunk/epydoc.conf (rev 0) +++ trunk/epydoc.conf 2008-05-31 15:50:17 UTC (rev 9725) @@ -0,0 +1,29 @@ +[epydoc] + +# Information about the project. +name: Gajim +url: http://gajim.org + +verbosity: 3 +imports: yes +redundant-details: yes +docformat: restructuredtext +# top: gajim + +# The list of modules to document. Modules can be named using +# dotted names, module filenames, or package directory names. +# This option may be repeated. +modules: src/* test/* + +# Write html output to the directory "apidocs" +#output: pdf +output: html +target: apidocs/ + +# Include all automatically generated graphs. These graphs are +# generated using Graphviz dot. +graph: all +dotpath: /usr/bin/dot +graph-font: Sans +graph-font-size: 10 +

1 0

[commit-gajim] r9724 - branches
by tomk＠gajim.org 31 May '08

31 May '08

Author: tomk Date: 2008-05-31 17:38:23 +0200 (Sat, 31 May 2008) New Revision: 9724 Added: branches/bosh_support/ Log: Added branch for BOSH support implementation Copied: branches/bosh_support (from rev 9723, trunk)

1 0

[commit-gajim] r9723 - trunk/src
by steve-e＠gajim.org 31 May '08

31 May '08

Author: steve-e Date: 2008-05-31 17:31:49 +0200 (Sat, 31 May 2008) New Revision: 9723 Modified: trunk/src/roster_window.py Log: Use correct modelfilter API to expand to selected contacts. Modified: trunk/src/roster_window.py =================================================================== --- trunk/src/roster_window.py 2008-05-31 14:48:15 UTC (rev 9722) +++ trunk/src/roster_window.py 2008-05-31 15:31:49 UTC (rev 9723) @@ -382,6 +382,7 @@ added_iters.append(i_) # Restore the group expand state + # FIXME path may be invalid at this point! path = self.model.get_path(child_iterG) if account + group in self.collapsed_rows: is_expanded = False @@ -1254,7 +1255,6 @@ # Refiltering SHOULD NOT be needed: # When a contact gets a new event he will be redrawn and his # icon changes, so _visible_func WILL be called on him anyway - iters = self._get_contact_iter(jid, account) if not iters: # Not visible in roster @@ -1263,8 +1263,7 @@ if self.dragging or not gajim.config.get('scroll_roster_to_last_message'): # do not change selection while DND'ing return - self.tree.expand_row(path[0:1], False) - self.tree.expand_row(path[0:2], False) + self.tree.expand_to_path(path) self.tree.scroll_to_cell(path) self.tree.set_cursor(path)

1 0

[commit-gajim] r9722 - trunk/src
by asterix＠gajim.org 31 May '08

31 May '08

Author: asterix Date: 2008-05-31 16:48:15 +0200 (Sat, 31 May 2008) New Revision: 9722 Modified: trunk/src/config.py Log: make some strings translatable Modified: trunk/src/config.py =================================================================== --- trunk/src/config.py 2008-05-31 08:28:33 UTC (rev 9721) +++ trunk/src/config.py 2008-05-31 14:48:15 UTC (rev 9722) @@ -379,19 +379,19 @@ # (status, translated_status, message, enabled) model = gtk.ListStore(str, str, str, bool) self.default_msg_tree.set_model(model) - col = gtk.TreeViewColumn('Status') + col = gtk.TreeViewColumn(_('Status')) self.default_msg_tree.append_column(col) renderer = gtk.CellRendererText() col.pack_start(renderer, False) col.set_attributes(renderer, text = 1) - col = gtk.TreeViewColumn('Default Message') + col = gtk.TreeViewColumn(_('Default Message')) self.default_msg_tree.append_column(col) renderer = gtk.CellRendererText() col.pack_start(renderer, True) col.set_attributes(renderer, text = 2) renderer.connect('edited', self.on_default_msg_cell_edited) renderer.set_property('editable', True) - col = gtk.TreeViewColumn('Enabled') + col = gtk.TreeViewColumn(_('Enabled')) self.default_msg_tree.append_column(col) renderer = gtk.CellRendererToggle() col.pack_start(renderer, False)

1 0

[commit-gajim] r9721 - trunk/src/common
by asterix＠gajim.org 31 May '08

31 May '08

Author: asterix Date: 2008-05-31 10:28:33 +0200 (Sat, 31 May 2008) New Revision: 9721 Modified: trunk/src/common/config.py Log: set publish_tune False by default Modified: trunk/src/common/config.py =================================================================== --- trunk/src/common/config.py 2008-05-31 00:54:57 UTC (rev 9720) +++ trunk/src/common/config.py 2008-05-31 08:28:33 UTC (rev 9721) @@ -313,7 +313,7 @@ 'otr_flags': [opt_int, 58 ], 'publish_mood': [opt_bool, True], 'publish_activity': [opt_bool, True], - 'publish_tune': [opt_bool, True], + 'publish_tune': [opt_bool, False], 'publish_nick': [opt_bool, True], 'subscribe_mood': [opt_bool, True], 'subscribe_activity': [opt_bool, True],

1 0

[commit-gajim] r9720 - trunk/src
by bct＠gajim.org 31 May '08

31 May '08

Author: bct Date: 2008-05-31 02:54:57 +0200 (Sat, 31 May 2008) New Revision: 9720 Modified: trunk/src/chat_control.py Log: fix on_vadjustment TB Modified: trunk/src/chat_control.py =================================================================== --- trunk/src/chat_control.py 2008-05-31 00:54:48 UTC (rev 9719) +++ trunk/src/chat_control.py 2008-05-31 00:54:57 UTC (rev 9720) @@ -924,7 +924,7 @@ self.parent_win.get_active_control() == self and \ self.parent_win.window.is_active(): # we are at the end - if self.session.remove_events(types_list): + if self.session and self.session.remove_events(types_list): # There were events to remove self.redraw_after_event_removed(jid)

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