Commits February 2007

commits@gajim.org

2 participants
73 discussions

[commit-gajim] r7938 - trunk/src/common/xmpp
by asterix＠gajim.org 06 Feb '07

06 Feb '07

Author: asterix Date: 2007-02-06 09:57:59 +0100 (Tue, 06 Feb 2007) New Revision: 7938 Modified: trunk/src/common/xmpp/auth_nb.py Log: [smoku] fix SASL auth. fixes #1911 Modified: trunk/src/common/xmpp/auth_nb.py =================================================================== --- trunk/src/common/xmpp/auth_nb.py 2007-02-04 18:57:25 UTC (rev 7937) +++ trunk/src/common/xmpp/auth_nb.py 2007-02-06 08:57:59 UTC (rev 7938) @@ -49,7 +49,7 @@ if expecting == X_KEYWORD: if char == '=': expecting = X_VALUE - elif char == ',': + elif char in (',', ' ', '\t'): pass else: keyword = '%s%c' % (keyword, char) @@ -59,7 +59,7 @@ end = True else: quotes_open = True - elif char == ",": + elif char in (',', ' ', '\t'): if quotes_open: if not arr: arr = [value]

1 0

[commit-gajim] r7937 - trunk/src/common
by jim++＠gajim.org 04 Feb '07

04 Feb '07

Author: jim++ Date: 2007-02-04 19:57:25 +0100 (Sun, 04 Feb 2007) New Revision: 7937 Modified: trunk/src/common/commands.py trunk/src/common/connection_handlers.py trunk/src/common/fuzzyclock.py trunk/src/common/helpers.py trunk/src/common/optparser.py trunk/src/common/rst_xhtml_generator.py trunk/src/common/xmpp_stringprep.py Log: No space in indentation, /src/common/ part Modified: trunk/src/common/commands.py =================================================================== --- trunk/src/common/commands.py 2007-02-04 14:09:38 UTC (rev 7936) +++ trunk/src/common/commands.py 2007-02-04 18:57:25 UTC (rev 7937) @@ -117,7 +117,7 @@ try: presencetype = form['presence-type'].value if not presencetype in \ - ('free-for-chat', 'online', 'away', 'xa', 'dnd', 'offline'): + ('free-for-chat', 'online', 'away', 'xa', 'dnd', 'offline'): self.badRequest(request) return False except: # KeyError if there's no presence-type field in form or @@ -282,8 +282,8 @@ iq = iq_obj.buildReply('result') q = iq.getTag('query') q.addChild('identity', attrs = {'type': 'command-node', - 'category': 'automation', - 'name': cmd.commandname}) + 'category': 'automation', + 'name': cmd.commandname}) q.addChild('feature', attrs = {'var': xmpp.NS_COMMANDS}) for feature in cmd.commandfeatures: q.addChild('feature', attrs = {'var': feature}) Modified: trunk/src/common/connection_handlers.py =================================================================== --- trunk/src/common/connection_handlers.py 2007-02-04 14:09:38 UTC (rev 7936) +++ trunk/src/common/connection_handlers.py 2007-02-04 18:57:25 UTC (rev 7937) @@ -859,14 +859,14 @@ dict[name] = [] entry = {} for c in info.getChildren(): - entry[c.getName()] = c.getData() + entry[c.getName()] = c.getData() dict[name].append(entry) elif info.getChildren() == []: dict[name] = info.getData() else: dict[name] = {} for c in info.getChildren(): - dict[name][c.getName()] = c.getData() + dict[name][c.getName()] = c.getData() return dict def save_vcard_to_hd(self, full_jid, card): Modified: trunk/src/common/fuzzyclock.py =================================================================== --- trunk/src/common/fuzzyclock.py 2007-02-04 14:09:38 UTC (rev 7936) +++ trunk/src/common/fuzzyclock.py 2007-02-04 18:57:25 UTC (rev 7937) @@ -34,103 +34,103 @@ import time class FuzzyClock: - def __init__(self): - self.__hour = 0 - self.__minute = 0 - self.__dayOfWeek = 0 + def __init__(self): + self.__hour = 0 + self.__minute = 0 + self.__dayOfWeek = 0 - self.__hourNames = [ _('one'), _('two'), _('three'), _('four'), _('five'), _('six'), - _('seven'), _('eight'), _('nine'), _('ten'), _('eleven'), - _('twelve')] + self.__hourNames = [ _('one'), _('two'), _('three'), _('four'), _('five'), _('six'), + _('seven'), _('eight'), _('nine'), _('ten'), _('eleven'), + _('twelve')] - #Strings to use for the output. %0 will be replaced with the preceding hour (e.g. "x PAST %0"), %1 with the coming hour (e.g. "x TO %1). ''' - self.__normalFuzzy = [ _("$0 o'clock"), _('five past $0'), - _('ten past $0'), _('quarter past $0'), - _('twenty past $0'), _('twenty five past $0'), - _('half past $0'), _('twenty five to $1'), - _('twenty to $1'), _('quarter to $1'), - _('ten to $1'), _('five to $1'), _("$1 o'clock") ] + #Strings to use for the output. %0 will be replaced with the preceding hour (e.g. "x PAST %0"), %1 with the coming hour (e.g. "x TO %1). ''' + self.__normalFuzzy = [ _("$0 o'clock"), _('five past $0'), + _('ten past $0'), _('quarter past $0'), + _('twenty past $0'), _('twenty five past $0'), + _('half past $0'), _('twenty five to $1'), + _('twenty to $1'), _('quarter to $1'), + _('ten to $1'), _('five to $1'), _("$1 o'clock") ] - #A "singular-form". It is used when talking about hour 0 - self.__normalFuzzyOne = [ _("$0 o'clock"), _('five past $0'), - _('ten past $0'), _('quarter past $0'), - _('twenty past $0'), _('twenty five past $0'), - _('half past $0'), _('twenty five to $1'), - _('twenty to $1'), _('quarter to $1'), - _('ten to $1'), _('five to $1'), - _("$1 o'clock") ] + #A "singular-form". It is used when talking about hour 0 + self.__normalFuzzyOne = [ _("$0 o'clock"), _('five past $0'), + _('ten past $0'), _('quarter past $0'), + _('twenty past $0'), _('twenty five past $0'), + _('half past $0'), _('twenty five to $1'), + _('twenty to $1'), _('quarter to $1'), + _('ten to $1'), _('five to $1'), + _("$1 o'clock") ] - self.__dayTime = [ _('Night'), _('Early morning'), _('Morning'), _('Almost noon'), - _('Noon'), _('Afternoon'), _('Evening'), _('Late evening') ] + self.__dayTime = [ _('Night'), _('Early morning'), _('Morning'), _('Almost noon'), + _('Noon'), _('Afternoon'), _('Evening'), _('Late evening') ] - self.__fuzzyWeek = [ _('Start of week'), _('Middle of week'), _('End of week'), - _('Weekend!') ] + self.__fuzzyWeek = [ _('Start of week'), _('Middle of week'), _('End of week'), + _('Weekend!') ] - self.setCurrent() + self.setCurrent() - def setHour(self,hour): - self.__hour = int(hour) + def setHour(self,hour): + self.__hour = int(hour) - def setMinute(self,minute): - self.__minute=int(minute) + def setMinute(self,minute): + self.__minute=int(minute) - def setDayOfWeek(self,day): - self.__dayOfWeek=int(day) + def setDayOfWeek(self,day): + self.__dayOfWeek=int(day) - def setTime(self,time): - timeArray = time.split(":") - self.setHour(timeArray[0]) - self.setMinute(timeArray[1]) + def setTime(self,time): + timeArray = time.split(":") + self.setHour(timeArray[0]) + self.setMinute(timeArray[1]) - def setCurrent(self): - hour=time.strftime("%H") - minute=time.strftime("%M") - day=time.strftime("%w") + def setCurrent(self): + hour=time.strftime("%H") + minute=time.strftime("%M") + day=time.strftime("%w") - self.setTime(hour+":"+minute) - self.setDayOfWeek(day) + self.setTime(hour+":"+minute) + self.setDayOfWeek(day) - def getFuzzyTime(self, fuzzyness = 1): - sector = 0 - realHour = 0 + def getFuzzyTime(self, fuzzyness = 1): + sector = 0 + realHour = 0 - if fuzzyness == 1 or fuzzyness == 2: - if fuzzyness == 1: - if self.__minute >2: - sector = (self.__minute - 3) / 5 +1 - else: - if self.__minute > 6: - sector = ((self.__minute - 7) / 15 + 1) * 3 + if fuzzyness == 1 or fuzzyness == 2: + if fuzzyness == 1: + if self.__minute >2: + sector = (self.__minute - 3) / 5 +1 + else: + if self.__minute > 6: + sector = ((self.__minute - 7) / 15 + 1) * 3 - newTimeStr = self.__normalFuzzy[sector] - #$0 or $1? - deltaHour = int(newTimeStr[newTimeStr.find("$")+1]) + newTimeStr = self.__normalFuzzy[sector] + #$0 or $1? + deltaHour = int(newTimeStr[newTimeStr.find("$")+1]) - if (self.__hour + deltaHour) % 12 > 0: - realHour = (self.__hour + deltaHour) % 12 - 1 - else: - realHour = 12 - ((self.__hour + deltaHour) % 12 + 1) + if (self.__hour + deltaHour) % 12 > 0: + realHour = (self.__hour + deltaHour) % 12 - 1 + else: + realHour = 12 - ((self.__hour + deltaHour) % 12 + 1) - if realHour == 0: - newTimeStr = self.__normalFuzzyOne[sector] + if realHour == 0: + newTimeStr = self.__normalFuzzyOne[sector] - newTimeStr = newTimeStr.replace("$"+str(deltaHour), - self.__hourNames[realHour]) + newTimeStr = newTimeStr.replace("$"+str(deltaHour), + self.__hourNames[realHour]) - elif fuzzyness == 3: - newTimeStr = self.__dayTime[self.__hour / 3] + elif fuzzyness == 3: + newTimeStr = self.__dayTime[self.__hour / 3] - else: - dayOfWeek = self.__dayOfWeek - if dayOfWeek == 1: - newTimeStr = self.__fuzzyWeek[0] - elif dayOfWeek >= 2 and dayOfWeek <= 4: - newTimeStr = self.__fuzzyWeek[1] - elif dayOfWeek == 5: - newTimeStr = self.__fuzzyWeek[2] - else: - newTimeStr = self.__fuzzyWeek[3] + else: + dayOfWeek = self.__dayOfWeek + if dayOfWeek == 1: + newTimeStr = self.__fuzzyWeek[0] + elif dayOfWeek >= 2 and dayOfWeek <= 4: + newTimeStr = self.__fuzzyWeek[1] + elif dayOfWeek == 5: + newTimeStr = self.__fuzzyWeek[2] + else: + newTimeStr = self.__fuzzyWeek[3] - return newTimeStr + return newTimeStr Modified: trunk/src/common/helpers.py =================================================================== --- trunk/src/common/helpers.py 2007-02-04 14:09:38 UTC (rev 7936) +++ trunk/src/common/helpers.py 2007-02-04 18:57:25 UTC (rev 7937) @@ -620,7 +620,7 @@ finally: win32api.RegCloseKey(rkey) return val - + def get_my_pictures_path(): '''windows-only atm. [Unix lives in the past]''' return get_windows_reg_env('My Pictures') @@ -698,7 +698,7 @@ (2, 5, 0): '2000', (2, 5, 1): 'XP', (2, 5, 2): '2003', - (2, 6, 0): 'Vista', + (2, 6, 0): 'Vista', } if win_version.has_key(ver_format): return 'Windows' + ' ' + win_version[ver_format] @@ -760,7 +760,7 @@ filename = filename.replace('?', '_').replace(':', '_')\ .replace('\\', '_').replace('"', "'").replace('|', '_')\ .replace('*', '_').replace('<', '_').replace('>', '_') - # 48 is the limit + # 48 is the limit if len(filename) > 48: extension = filename.split('.')[-1] filename = filename[0:48] Modified: trunk/src/common/optparser.py =================================================================== --- trunk/src/common/optparser.py 2007-02-04 14:09:38 UTC (rev 7936) +++ trunk/src/common/optparser.py 2007-02-04 18:57:25 UTC (rev 7937) @@ -361,14 +361,14 @@ trayicon_notification_on_events ''' if self.old_values.has_key('trayicon_notification_on_new_messages'): gajim.config.set('trayicon_notification_on_events', - self.old_values['trayicon_notification_on_new_messages']) + self.old_values['trayicon_notification_on_new_messages']) gajim.config.set('version', '0.10.1.7') def update_config_to_01018(self): '''chat_state_notifications -> outgoing_chat_state_notifications''' if self.old_values.has_key('chat_state_notifications'): gajim.config.set('outgoing_chat_state_notifications', - self.old_values['chat_state_notifications']) + self.old_values['chat_state_notifications']) gajim.config.set('version', '0.10.1.8') def update_config_to_01101(self): Modified: trunk/src/common/rst_xhtml_generator.py =================================================================== --- trunk/src/common/rst_xhtml_generator.py 2007-02-04 14:09:38 UTC (rev 7936) +++ trunk/src/common/rst_xhtml_generator.py 2007-02-04 18:57:25 UTC (rev 7937) @@ -28,7 +28,7 @@ options={}, content=[]): '''Role to make handy references to Jabber Enhancement Proposals (JEP). - Use as :JEP:`71` (or jep, or jep-reference). + Use as :JEP:`71` (or jep, or jep-reference). Modeled after the sample in docutils documentation. ''' @@ -111,8 +111,8 @@ print Generator.create_xhtml(''' test:: - >>> print 1 - 1 +>>> print 1 +1 *I* like it. It is for :JEP:`71` Modified: trunk/src/common/xmpp_stringprep.py =================================================================== --- trunk/src/common/xmpp_stringprep.py 2007-02-04 14:09:38 UTC (rev 7936) +++ trunk/src/common/xmpp_stringprep.py 2007-02-04 18:57:25 UTC (rev 7937) @@ -32,10 +32,10 @@ crippled = True warnings.warn("Accented and non-Western Jabber IDs will not be properly " - "case-folded with this version of Python, resulting in " - "incorrect protocol-level behavior. It is strongly " - "recommended you upgrade to Python 2.3.2 or newer if you " - "intend to use Twisted's Jabber support.") + "case-folded with this version of Python, resulting in " + "incorrect protocol-level behavior. It is strongly " + "recommended you upgrade to Python 2.3.2 or newer if you " + "intend to use Twisted's Jabber support.") else: import stringprep @@ -97,7 +97,7 @@ class Profile: def __init__(self, mappings=[], normalize=True, prohibiteds=[], - check_unassigneds=True, check_bidi=True): + check_unassigneds=True, check_bidi=True): self.mappings = mappings self.normalize = normalize self.prohibiteds = prohibiteds @@ -183,10 +183,10 @@ # Prohibited characters. prohibiteds = [unichr(n) for n in range(0x00, 0x2c + 1) + - range(0x2e, 0x2f + 1) + - range(0x3a, 0x40 + 1) + - range(0x5b, 0x60 + 1) + - range(0x7b, 0x7f + 1) ] + range(0x2e, 0x2f + 1) + + range(0x3a, 0x40 + 1) + + range(0x5b, 0x60 + 1) + + range(0x7b, 0x7f + 1) ] def prepare(self, string): result = [] @@ -206,8 +206,8 @@ def check_prohibiteds(self, string): for c in string: - if c in self.prohibiteds: - raise UnicodeError, "Invalid character %s" % repr(c) + if c in self.prohibiteds: + raise UnicodeError, "Invalid character %s" % repr(c) def nameprep(self, label): label = idna.nameprep(label) @@ -221,16 +221,16 @@ if crippled: case_map = MappingTableFromFunction(lambda c: c.lower()) nodeprep = Profile(mappings=[case_map], - normalize=False, - prohibiteds=[LookupTable([u' ', u'"', u'&', u"'", u'/', - u':', u'<', u'>', u'@'])], - check_unassigneds=False, - check_bidi=False) + normalize=False, + prohibiteds=[LookupTable([u' ', u'"', u'&', u"'", u'/', + u':', u'<', u'>', u'@'])], + check_unassigneds=False, + check_bidi=False) resourceprep = Profile(normalize=False, - check_unassigneds=False, - check_bidi=False) - + check_unassigneds=False, + check_bidi=False) + else: C_11 = LookupTableFromFunction(stringprep.in_table_c11) C_12 = LookupTableFromFunction(stringprep.in_table_c12) @@ -251,10 +251,10 @@ prohibiteds=[C_11, C_12, C_21, C_22, C_3, C_4, C_5, C_6, C_7, C_8, C_9, LookupTable([u'"', u'&', u"'", u'/', - u':', u'<', u'>', u'@'])]) + u':', u'<', u'>', u'@'])]) resourceprep = Profile(mappings=[B_1,], - prohibiteds=[C_12, C_21, C_22, + prohibiteds=[C_12, C_21, C_22, C_3, C_4, C_5, C_6, C_7, C_8, C_9]) nameprep = NamePrep()

1 0

[commit-gajim] r7936 - trunk/src
by jim++＠gajim.org 04 Feb '07

04 Feb '07

Author: jim++ Date: 2007-02-04 15:09:38 +0100 (Sun, 04 Feb 2007) New Revision: 7936 Modified: trunk/src/gajim.py Log: Removing useless global vars (finally found a good debugger :) Modified: trunk/src/gajim.py =================================================================== --- trunk/src/gajim.py 2007-02-04 13:01:04 UTC (rev 7935) +++ trunk/src/gajim.py 2007-02-04 14:09:38 UTC (rev 7936) @@ -162,6 +162,8 @@ dlg.destroy() sys.exit() +del pritext + path = os.getcwd() if '.svn' in os.listdir(path) or '_svn' in os.listdir(path): # import gtkexcepthook only for those that run svn @@ -192,12 +194,14 @@ from common import optparser if verbose: gajim.verbose = True +del verbose import locale profile = unicode(profile, locale.getpreferredencoding()) import common.configpaths common.configpaths.init_profile(profile) +del profile gajimpaths = common.configpaths.gajimpaths pid_filename = gajimpaths['PID_FILE'] @@ -316,6 +320,7 @@ f.write(str(os.getpid())) f.close() del pid_dir +del f def on_exit(): # delete pid file on normal exit

1 0

[commit-gajim] r7935 - trunk/src
by jim++＠gajim.org 04 Feb '07

04 Feb '07

Author: jim++ Date: 2007-02-04 14:01:04 +0100 (Sun, 04 Feb 2007) New Revision: 7935 Modified: trunk/src/config.py trunk/src/conversation_textview.py trunk/src/dialogs.py trunk/src/gajim.py trunk/src/groupchat_control.py trunk/src/gtkgui_helpers.py trunk/src/history_manager.py trunk/src/message_window.py trunk/src/profile_window.py trunk/src/roster_window.py trunk/src/tooltips.py Log: No space in indentation, checked by drpython (editor). /src part Modified: trunk/src/config.py =================================================================== --- trunk/src/config.py 2007-02-04 00:45:14 UTC (rev 7934) +++ trunk/src/config.py 2007-02-04 13:01:04 UTC (rev 7935) @@ -2387,7 +2387,7 @@ prompt = _('Whom do you want to make an administrator?\n\n') prompt += _('Can be one of the following:\n' '1. user@domain/resource (only that resource matches).\n' - '2. user@domain (any resource matches).\n' + '2. user@domain (any resource matches).\n' '3. domain/resource (only that resource matches).\n' '4. domain (the domain itself matches, as does any user@domain,\n' 'domain/resource, or address containing a subdomain.') Modified: trunk/src/conversation_textview.py =================================================================== --- trunk/src/conversation_textview.py 2007-02-04 00:45:14 UTC (rev 7934) +++ trunk/src/conversation_textview.py 2007-02-04 13:01:04 UTC (rev 7935) @@ -747,7 +747,7 @@ # number of days since epoch for current time (in GMT) - # number of days since epoch for message (in GMT) diff_day = int(timegm(time.localtime())) / 86400 -\ - int(timegm(tim)) / 86400 + int(timegm(tim)) / 86400 if diff_day == 0: day_str = '' elif diff_day == 1: Modified: trunk/src/dialogs.py =================================================================== --- trunk/src/dialogs.py 2007-02-04 00:45:14 UTC (rev 7934) +++ trunk/src/dialogs.py 2007-02-04 13:01:04 UTC (rev 7935) @@ -1658,7 +1658,7 @@ sender_list = [i[0].jid + '/' + i[0].resource for i in self.to] else: sender_list = [self.to_entry.get_text().decode('utf-8')] - + for to_whom_jid in sender_list: if self.completion_dict.has_key(to_whom_jid): to_whom_jid = self.completion_dict[to_whom_jid].jid Modified: trunk/src/gajim.py =================================================================== --- trunk/src/gajim.py 2007-02-04 00:45:14 UTC (rev 7934) +++ trunk/src/gajim.py 2007-02-04 13:01:04 UTC (rev 7935) @@ -1158,7 +1158,7 @@ def handle_event_bad_passphrase(self, account, array): use_gpg_agent = gajim.config.get('use_gpg_agent') if use_gpg_agent: - return + return keyID = gajim.config.get_per('accounts', account, 'keyid') self.roster.forget_gpg_passphrase(keyID) dialogs.WarningDialog(_('Your passphrase is incorrect'), Modified: trunk/src/groupchat_control.py =================================================================== --- trunk/src/groupchat_control.py 2007-02-04 00:45:14 UTC (rev 7934) +++ trunk/src/groupchat_control.py 2007-02-04 13:01:04 UTC (rev 7935) @@ -1491,8 +1491,8 @@ splitted_text2 = text.split(None, 1) if text.startswith('/topic '): if len(splitted_text2) == 2 and \ - self.subject.startswith(splitted_text2[1]) and\ - len(self.subject) > len(splitted_text2[1]): + self.subject.startswith(splitted_text2[1]) and\ + len(self.subject) > len(splitted_text2[1]): message_buffer.insert_at_cursor( self.subject[len(splitted_text2[1]):]) return True Modified: trunk/src/gtkgui_helpers.py =================================================================== --- trunk/src/gtkgui_helpers.py 2007-02-04 00:45:14 UTC (rev 7934) +++ trunk/src/gtkgui_helpers.py 2007-02-04 13:01:04 UTC (rev 7935) @@ -497,8 +497,8 @@ p = 0.3 # background q = 0.7 # foreground # p + q should do 1.0 return gtk.gdk.Color(int(bg.red*p + fg.red*q), - int(bg.green*p + fg.green*q), - int(bg.blue*p + fg.blue*q)) + int(bg.green*p + fg.green*q), + int(bg.blue*p + fg.blue*q)) def get_scaled_pixbuf(pixbuf, kind): '''returns scaled pixbuf, keeping ratio etc or None Modified: trunk/src/history_manager.py =================================================================== --- trunk/src/history_manager.py 2007-02-04 00:45:14 UTC (rev 7934) +++ trunk/src/history_manager.py 2007-02-04 13:01:04 UTC (rev 7935) @@ -220,7 +220,7 @@ list_of_rowrefs = [] for path in list_of_paths: # make them treerowrefs (it's needed) - list_of_rowrefs.append(gtk.TreeRowReference(liststore, path)) + list_of_rowrefs.append(gtk.TreeRowReference(liststore, path)) for rowref in list_of_rowrefs: # FILL THE STORE, for all rows selected path = rowref.get_path() @@ -433,7 +433,7 @@ list_of_rowrefs = [] for path in list_of_paths: # make them treerowrefs (it's needed) - list_of_rowrefs.append(gtk.TreeRowReference(liststore, path)) + list_of_rowrefs.append(gtk.TreeRowReference(liststore, path)) for rowref in list_of_rowrefs: path = rowref.get_path() @@ -486,7 +486,7 @@ self.dialog.destroy() list_of_rowrefs = [] for path in list_of_paths: # make them treerowrefs (it's needed) - list_of_rowrefs.append(gtk.TreeRowReference(liststore, path)) + list_of_rowrefs.append(gtk.TreeRowReference(liststore, path)) for rowref in list_of_rowrefs: path = rowref.get_path() @@ -528,7 +528,7 @@ # delete rows from db that match log_line_id list_of_rowrefs = [] for path in list_of_paths: # make them treerowrefs (it's needed) - list_of_rowrefs.append(gtk.TreeRowReference(liststore, path)) + list_of_rowrefs.append(gtk.TreeRowReference(liststore, path)) for rowref in list_of_rowrefs: path = rowref.get_path() Modified: trunk/src/message_window.py =================================================================== --- trunk/src/message_window.py 2007-02-04 00:45:14 UTC (rev 7934) +++ trunk/src/message_window.py 2007-02-04 13:01:04 UTC (rev 7935) @@ -537,10 +537,10 @@ '''Set tab label as drag source and connect the drag_data_get signal''' tab_label = self.notebook.get_tab_label(child) tab_label.dnd_handler = tab_label.connect('drag_data_get', - self.on_tab_label_drag_data_get_cb) + self.on_tab_label_drag_data_get_cb) self.handlers[tab_label.dnd_handler] = tab_label tab_label.drag_source_set(gtk.gdk.BUTTON1_MASK, self.DND_TARGETS, - gtk.gdk.ACTION_MOVE) + gtk.gdk.ACTION_MOVE) tab_label.page_num = self.notebook.page_num(child) def on_tab_label_drag_data_get_cb(self, widget, drag_context, selection, @@ -573,14 +573,14 @@ tab_alloc = tab.get_allocation() if horiz: if (x >= tab_alloc.x) and \ - (x <= (tab_alloc.x + tab_alloc.width)): + (x <= (tab_alloc.x + tab_alloc.width)): page_num = i if x >= tab_alloc.x + (tab_alloc.width / 2.0): to_right = True break else: if (y >= tab_alloc.y) and \ - (y <= (tab_alloc.y + tab_alloc.height)): + (y <= (tab_alloc.y + tab_alloc.height)): page_num = i if y > tab_alloc.y + (tab_alloc.height / 2.0): @@ -621,10 +621,10 @@ def __init__(self): ''' A dictionary of windows; the key depends on the config: - ONE_MSG_WINDOW_NEVER: The key is the contact JID - ONE_MSG_WINDOW_ALWAYS: The key is MessageWindowMgr.MAIN_WIN - ONE_MSG_WINDOW_PERACCT: The key is the account name - ONE_MSG_WINDOW_PERTYPE: The key is a message type constant''' + ONE_MSG_WINDOW_NEVER: The key is the contact JID + ONE_MSG_WINDOW_ALWAYS: The key is MessageWindowMgr.MAIN_WIN + ONE_MSG_WINDOW_PERACCT: The key is the account name + ONE_MSG_WINDOW_PERTYPE: The key is a message type constant''' self._windows = {} # Map the mode to a int constant for frequent compares mode = gajim.config.get('one_message_window') Modified: trunk/src/profile_window.py =================================================================== --- trunk/src/profile_window.py 2007-02-04 00:45:14 UTC (rev 7934) +++ trunk/src/profile_window.py 2007-02-04 13:01:04 UTC (rev 7935) @@ -321,8 +321,8 @@ return if gajim.connections[self.account].connected < 2: dialogs.ErrorDialog(_('You are not connected to the server'), - _('Without a connection you can not publish your contact ' - 'information.')) + _('Without a connection you can not publish your contact ' + 'information.')) return vcard = self.make_vcard() nick = '' Modified: trunk/src/roster_window.py =================================================================== --- trunk/src/roster_window.py 2007-02-04 00:45:14 UTC (rev 7934) +++ trunk/src/roster_window.py 2007-02-04 13:01:04 UTC (rev 7935) @@ -400,7 +400,7 @@ def add_to_not_in_the_roster(self, account, jid, nick = '', resource = ''): ''' add jid to group "not in the roster", he MUST not be in roster yet, - return contact ''' + return contact ''' keyID = '' attached_keys = gajim.config.get_per('accounts', account, 'attached_gpg_keys').split() @@ -986,7 +986,7 @@ for account in connected_accounts_with_vcard: # profile, avatar profile_avatar_item = gtk.MenuItem(_('of account %s') % account, - False) + False) profile_avatar_sub_menu.append(profile_avatar_item) profile_avatar_item.connect('activate', self.on_profile_avatar_menuitem_activate, account) Modified: trunk/src/tooltips.py =================================================================== --- trunk/src/tooltips.py 2007-02-04 00:45:14 UTC (rev 7934) +++ trunk/src/tooltips.py 2007-02-04 13:01:04 UTC (rev 7935) @@ -298,7 +298,7 @@ # escape markup entities status = helpers.reduce_chars_newlines(status, 100, 5) status = '' +\ - gobject.markup_escape_text(status) + '' + gobject.markup_escape_text(status) + '' properties.append((status, None)) else: # no status message, show SHOW instead show = helpers.get_uf_show(contact.show) @@ -588,7 +588,7 @@ status = _('Not started') elif file_props.has_key('connected'): if file_props.has_key('stopped') and \ - file_props['stopped'] == True: + file_props['stopped'] == True: status = _('Stopped') elif file_props['completed']: status = _('Completed') @@ -597,10 +597,10 @@ status = _('Completed') else: if file_props.has_key('paused') and \ - file_props['paused'] == True: - status = _('?transfer status:Paused') + file_props['paused'] == True: + status = _('?transfer status:Paused') elif file_props.has_key('stalled') and \ - file_props['stalled'] == True: + file_props['stalled'] == True: #stalled is not paused. it is like 'frozen' it stopped alone status = _('Stalled') else:

1 0

[commit-gajim] r7934 - trunk/src/common
by jim++＠gajim.org 04 Feb '07

04 Feb '07

Author: jim++ Date: 2007-02-04 01:45:14 +0100 (Sun, 04 Feb 2007) New Revision: 7934 Modified: trunk/src/common/connection_handlers.py Log: If we got sha from disk and don't ask for new avatar, store sha in mem Modified: trunk/src/common/connection_handlers.py =================================================================== --- trunk/src/common/connection_handlers.py 2007-02-03 23:56:40 UTC (rev 7933) +++ trunk/src/common/connection_handlers.py 2007-02-04 00:45:14 UTC (rev 7934) @@ -1683,7 +1683,11 @@ cached_sha = '' if cached_sha != avatar_sha: # avatar has been updated + # sha in mem will be updated later self.request_vcard(who, True) + else: + # save sha in mem NOW + self.vcard_shas[who] = avatar_sha self.dispatch('GC_NOTIFY', (jid_stripped, show, status, resource, prs.getRole(), prs.getAffiliation(), prs.getJid(), prs.getReason(), prs.getActor(), prs.getStatusCode(),

1 0

[commit-gajim] r7933 - trunk/src/common
by jim++＠gajim.org 03 Feb '07

03 Feb '07

Author: jim++ Date: 2007-02-04 00:56:40 +0100 (Sun, 04 Feb 2007) New Revision: 7933 Modified: trunk/src/common/connection_handlers.py Log: Group chat avatars fixs : - Stop saving avatars of participants without their resource. - Complement of [7927], don't save sha before avatar. Really fix #2956 - Don't save sha if avatar not readable. Modified: trunk/src/common/connection_handlers.py =================================================================== --- trunk/src/common/connection_handlers.py 2007-02-03 18:06:47 UTC (rev 7932) +++ trunk/src/common/connection_handlers.py 2007-02-03 23:56:40 UTC (rev 7933) @@ -1109,20 +1109,26 @@ puny_jid = helpers.sanitize_filename(frm) puny_nick = None begin_path = os.path.join(gajim.AVATAR_PATH, puny_jid) + frm_jid = frm if frm in self.room_jids: puny_nick = helpers.sanitize_filename(resource) # create folder if needed if not os.path.isdir(begin_path): os.mkdir(begin_path, 0700) begin_path = os.path.join(begin_path, puny_nick) + frm_jid += '/' + resource if photo_decoded: avatar_file = begin_path + '_notif_size_colored.png' - if frm == our_jid and avatar_sha != self.vcard_sha: + if frm_jid == our_jid and avatar_sha != self.vcard_sha: gajim.interface.save_avatar_files(frm, photo_decoded, puny_nick) - elif frm != our_jid and (not os.path.exists(avatar_file) or \ - not self.vcard_shas.has_key(frm) or \ - avatar_sha != self.vcard_shas[frm]): + elif frm_jid != our_jid and (not os.path.exists(avatar_file) or \ + not self.vcard_shas.has_key(frm_jid) or \ + avatar_sha != self.vcard_shas[frm_jid]): gajim.interface.save_avatar_files(frm, photo_decoded, puny_nick) + if avatar_sha: + self.vcard_shas[frm_jid] = avatar_sha + elif self.vcard_shas.has_key(frm): + del self.vcard_shas[frm] else: for ext in ('.jpeg', '.png', '_notif_size_bw.png', '_notif_size_colored.png'): @@ -1130,15 +1136,9 @@ if os.path.isfile(path): os.remove(path) - if frm != our_jid: - if avatar_sha: - self.vcard_shas[frm] = avatar_sha - elif self.vcard_shas.has_key(frm): - del self.vcard_shas[frm] - vcard['jid'] = frm vcard['resource'] = resource - if frm == our_jid: + if frm_jid == our_jid: self.dispatch('MYVCARD', vcard) # we re-send our presence with sha if has changed and if we are # not invisible @@ -1675,16 +1675,15 @@ # avatar has been updated self.request_vcard(who, True) else: # Verify sha cached in hdd - self.vcard_shas[who] = avatar_sha cached_vcard = self.get_cached_vcard(who, True) if cached_vcard and cached_vcard.has_key('PHOTO') and \ cached_vcard['PHOTO'].has_key('SHA'): cached_sha = cached_vcard['PHOTO']['SHA'] else: cached_sha = '' - if cached_sha != self.vcard_shas[who]: + if cached_sha != avatar_sha: # avatar has been updated - self.request_vcard(who) + self.request_vcard(who, True) self.dispatch('GC_NOTIFY', (jid_stripped, show, status, resource, prs.getRole(), prs.getAffiliation(), prs.getJid(), prs.getReason(), prs.getActor(), prs.getStatusCode(),

1 0

[commit-gajim] r7932 - trunk/src
by asterix＠gajim.org 03 Feb '07

03 Feb '07

Author: asterix Date: 2007-02-03 19:06:47 +0100 (Sat, 03 Feb 2007) New Revision: 7932 Modified: trunk/src/htmltextview.py Log: let's freeze even less Modified: trunk/src/htmltextview.py =================================================================== --- trunk/src/htmltextview.py 2007-02-03 17:28:36 UTC (rev 7931) +++ trunk/src/htmltextview.py 2007-02-03 18:06:47 UTC (rev 7932) @@ -36,6 +36,7 @@ import warnings from cStringIO import StringIO import socket +import time import urllib2 import operator @@ -689,18 +690,31 @@ gajim.log.debug(str('Error loading image %s ' % attrs['src'] + ex)) pixbuf = None alt = attrs.get('alt', 'Broken image') - try: - loader.close() - except: - pass else: # Wait 10ms between each byte try: f.fp._sock.fp._sock.settimeout(0.01) except: pass - # Max image size = 2 MB (to try to prevent DoS) - mem = f.read(2*1024*1024) + # Max image size = 2 MB (to try to prevent DoS) in Max 3s + mem = '' + deadline = time.time() + 3 + while True: + if time.time() > deadline: + gajim.log.debug(str('Timeout loading image %s ' % \ + attrs['src'] + ex)) + pixbuf = None + alt = attrs.get('alt', 'Timeout loading image') + break + temp = f.read(100) + if temp: + mem += temp + else: + break + if len(mem) > 2*1024*1024: + alt = attrs.get('alt', 'Image is too big') + break + # Caveat: GdkPixbuf is known not to be safe to load # images from network... this program is now potentially # hackable ;)

1 0

[commit-gajim] r7931 - trunk/src
by asterix＠gajim.org 03 Feb '07

03 Feb '07

Author: asterix Date: 2007-02-03 18:28:36 +0100 (Sat, 03 Feb 2007) New Revision: 7931 Modified: trunk/src/htmltextview.py Log: [bb & me] don't block when we get an image Modified: trunk/src/htmltextview.py =================================================================== --- trunk/src/htmltextview.py 2007-02-03 14:05:43 UTC (rev 7930) +++ trunk/src/htmltextview.py 2007-02-03 17:28:36 UTC (rev 7931) @@ -35,6 +35,7 @@ import re import warnings from cStringIO import StringIO +import socket import urllib2 import operator @@ -680,22 +681,33 @@ if not self.starting: self._jump_line() elif name == 'img': + # Wait maximum 1s for connection + socket.setdefaulttimeout(1) try: + f = urllib2.urlopen(attrs['src']) + except Exception, ex: + gajim.log.debug(str('Error loading image %s ' % attrs['src'] + ex)) + pixbuf = None + alt = attrs.get('alt', 'Broken image') + try: + loader.close() + except: + pass + else: + # Wait 10ms between each byte + try: + f.fp._sock.fp._sock.settimeout(0.01) + except: + pass # Max image size = 2 MB (to try to prevent DoS) - mem = urllib2.urlopen(attrs['src']).read(2*1024*1024) + mem = f.read(2*1024*1024) # Caveat: GdkPixbuf is known not to be safe to load # images from network... this program is now potentially # hackable ;) loader = gtk.gdk.PixbufLoader() - loader.write(mem); loader.close() + loader.write(mem) + loader.close() pixbuf = loader.get_pixbuf() - except Exception, ex: - gajim.log.debug(str('Error loading image'+ex)) - pixbuf = None - alt = attrs.get('alt', 'Broken image') - try: - loader.close() - except: pass if pixbuf is not None: tags = self._get_style_tags() if tags:

1 0

[commit-gajim] r7930 - branches/gajim_0.11/po
by asterix＠gajim.org 03 Feb '07

03 Feb '07

Author: asterix Date: 2007-02-03 15:05:43 +0100 (Sat, 03 Feb 2007) New Revision: 7930 Modified: branches/gajim_0.11/po/it.po Log: [Matteo] updated it translation Modified: branches/gajim_0.11/po/it.po =================================================================== --- branches/gajim_0.11/po/it.po 2007-02-03 14:05:31 UTC (rev 7929) +++ branches/gajim_0.11/po/it.po 2007-02-03 14:05:43 UTC (rev 7930) @@ -2261,7 +2261,7 @@ #: ../data/glade/systray_context_menu.glade.h:3 msgid "Show All Pending _Events" -msgstr "Mostra tutti gli _eventi pendenti" +msgstr "Mostra tutti gli _eventi in attesa" #: ../data/glade/systray_context_menu.glade.h:4 msgid "Show _Roster" @@ -2708,7 +2708,7 @@ #: ../src/config.py:1303 msgid "To change the account name, you must read all pending events." msgstr "" -"Per cambiare nome account, è necessario leggere tutti gli eventi pendenti." +"Per cambiare nome account, è necessario leggere tutti gli eventi in attesa." #: ../src/config.py:1307 msgid "Account Name Already Used" @@ -2819,7 +2819,7 @@ #: ../src/config.py:1897 msgid "Read all pending events before removing this account." -msgstr "Leggere tutti gli eventi pendenti prima di rimuovere questo account." +msgstr "Leggere tutti gli eventi in attesa prima di rimuovere questo account." #: ../src/config.py:1934 #, python-format @@ -4071,7 +4071,7 @@ #: ../src/gajim-remote.py:78 msgid "Pops up a window with the next pending event" -msgstr "Apre una finestra con il prossimo evento pendente" +msgstr "Apre una finestra con il prossimo evento in attesa" #: ../src/gajim-remote.py:82 msgid ""

1 0

[commit-gajim] r7929 - trunk/po
by asterix＠gajim.org 03 Feb '07

03 Feb '07

Author: asterix Date: 2007-02-03 15:05:31 +0100 (Sat, 03 Feb 2007) New Revision: 7929 Modified: trunk/po/it.po Log: [Matteo] updated it translation Modified: trunk/po/it.po =================================================================== --- trunk/po/it.po 2007-02-01 16:26:52 UTC (rev 7928) +++ trunk/po/it.po 2007-02-03 14:05:31 UTC (rev 7929) @@ -14,7 +14,7 @@ "Project-Id-Version: Gajim 2\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2007-01-19 11:39+0100\n" -"PO-Revision-Date: 2007-01-30 17:48+0100\n" +"PO-Revision-Date: 2007-01-31 14:26+0100\n" "Last-Translator: Matteo Dell'Amico <della(a)linux.it>\n" "Language-Team: Italian\n" "MIME-Version: 1.0\n" @@ -2266,7 +2266,7 @@ #: ../data/glade/systray_context_menu.glade.h:3 msgid "Show All Pending _Events" -msgstr "Mostra tutti gli _eventi pendenti" +msgstr "Mostra tutti gli _eventi in attesa" #: ../data/glade/systray_context_menu.glade.h:4 msgid "Show _Roster" @@ -2712,8 +2712,7 @@ #: ../src/config.py:1312 msgid "To change the account name, you must read all pending events." -msgstr "" -"Per cambiare nome account, è necessario leggere tutti gli eventi pendenti." +msgstr "Per cambiare nome account, è necessario leggere tutti gli eventi in attesa." #: ../src/config.py:1316 msgid "Account Name Already Used" @@ -2824,7 +2823,7 @@ #: ../src/config.py:1906 msgid "Read all pending events before removing this account." -msgstr "Leggere tutti gli eventi pendenti prima di rimuovere questo account." +msgstr "Leggere tutti gli eventi in attesa prima di rimuovere questo account." #: ../src/config.py:1943 #, python-format @@ -4075,7 +4074,7 @@ #: ../src/gajim-remote.py:77 msgid "Pops up a window with the next pending event" -msgstr "Apre una finestra con il prossimo evento pendente" +msgstr "Apre una finestra con il prossimo evento in attesa" #: ../src/gajim-remote.py:81 msgid ""

1 0

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

Commits February 2007