Commits January 2007

commits@gajim.org

5 participants
181 discussions

[commit-gajim] r7925 - trunk/src
by asterix＠gajim.org 31 Jan '07

31 Jan '07

Author: asterix Date: 2007-01-31 22:31:10 +0100 (Wed, 31 Jan 2007) New Revision: 7925 Modified: trunk/src/groupchat_control.py Log: stringprep nickname when we want to change nick in a room. fixes #2605 Modified: trunk/src/groupchat_control.py =================================================================== --- trunk/src/groupchat_control.py 2007-01-31 20:39:44 UTC (rev 7924) +++ trunk/src/groupchat_control.py 2007-01-31 21:31:10 UTC (rev 7925) @@ -1048,6 +1048,7 @@ # example: /nick foo if len(message_array) and message_array[0] != self.nick: nick = message_array[0] + nick = helpers.parse_resource(nick) gajim.connections[self.account].change_gc_nick(self.room_jid, nick) self.clear(self.msg_textview) else: @@ -1327,6 +1328,7 @@ '''asks user for new nick and on ok it sets it on room''' def on_ok(widget): nick = instance.input_entry.get_text().decode('utf-8') + nick = helpers.parse_resource(nick) gajim.connections[self.account].change_gc_nick(self.room_jid, nick) self.nick = nick instance = dialogs.InputDialog(title, prompt, proposed_nick,

1 0

[commit-gajim] r7924 - trunk/src
by asterix＠gajim.org 31 Jan '07

31 Jan '07

Author: asterix Date: 2007-01-31 21:39:44 +0100 (Wed, 31 Jan 2007) New Revision: 7924 Modified: trunk/src/gajim.py Log: reset status_before_autoaway var when we come back online Modified: trunk/src/gajim.py =================================================================== --- trunk/src/gajim.py 2007-01-31 20:38:49 UTC (rev 7923) +++ trunk/src/gajim.py 2007-01-31 20:39:44 UTC (rev 7924) @@ -1657,17 +1657,18 @@ continue if state == common.sleepy.STATE_AWAKE and \ gajim.sleeper_state[account] in ('autoaway', 'autoxa'): - #we go online + # we go online self.roster.send_status(account, 'online', gajim.status_before_autoaway[account]) + gajim.status_before_autoaway[account] = '' gajim.sleeper_state[account] = 'online' elif state == common.sleepy.STATE_AWAY and \ gajim.sleeper_state[account] == 'online' and \ gajim.config.get('autoaway'): - #we save out online status + # we save out online status gajim.status_before_autoaway[account] = \ gajim.connections[account].status - #we go away (no auto status) [we pass True to auto param] + # we go away (no auto status) [we pass True to auto param] self.roster.send_status(account, 'away', gajim.config.get('autoaway_message'), auto=True) gajim.sleeper_state[account] = 'autoaway' @@ -1675,7 +1676,7 @@ gajim.sleeper_state[account] == 'autoaway' or \ gajim.sleeper_state[account] == 'online') and \ gajim.config.get('autoxa'): - #we go extended away [we pass True to auto param] + # we go extended away [we pass True to auto param] self.roster.send_status(account, 'xa', gajim.config.get('autoxa_message'), auto=True) gajim.sleeper_state[account] = 'autoxa'

1 0

[commit-gajim] r7923 - trunk/src/common
by asterix＠gajim.org 31 Jan '07

31 Jan '07

Author: asterix Date: 2007-01-31 21:38:49 +0100 (Wed, 31 Jan 2007) New Revision: 7923 Modified: trunk/src/common/connection.py Log: when we are disconnected while autoaway, don't loose previous status. fixes #2934 Modified: trunk/src/common/connection.py =================================================================== --- trunk/src/common/connection.py 2007-01-31 19:45:13 UTC (rev 7922) +++ trunk/src/common/connection.py 2007-01-31 20:38:49 UTC (rev 7923) @@ -112,7 +112,7 @@ def _reconnect(self): # Do not try to reco while we are already trying self.time_to_reconnect = None - if self.connected < 2: #connection failed + if self.connected < 2: # connection failed log.debug('reconnect') self.connected = 1 self.dispatch('STATUS', 'connecting') @@ -152,6 +152,11 @@ if gajim.config.get_per('accounts', self.name, 'autoreconnect'): self.connected = -1 self.dispatch('STATUS', 'error') + if gajim.status_before_autoaway[self.name]: + # We were auto away. So go back online + self.status = gajim.status_before_autoaway[self.name] + gajim.status_before_autoaway[self.name] = '' + self.old_show = 'online' # this check has moved from _reconnect method # do exponential backoff until 15 minutes, # then small linear increase

1 0

[commit-gajim] r7922 - trunk/src
by asterix＠gajim.org 31 Jan '07

31 Jan '07

Author: asterix Date: 2007-01-31 20:45:13 +0100 (Wed, 31 Jan 2007) New Revision: 7922 Modified: trunk/src/roster_window.py Log: we can now remove a contact from not in roster group which has unread events. there are just removed. fixes #2888 Modified: trunk/src/roster_window.py =================================================================== --- trunk/src/roster_window.py 2007-01-31 16:38:04 UTC (rev 7921) +++ trunk/src/roster_window.py 2007-01-31 19:45:13 UTC (rev 7922) @@ -2672,6 +2672,8 @@ gajim.contacts.add_contact(account, contact) self.add_contact_to_roster(contact.jid, account) else: + if _('Not in Roster') in contact.groups: + gajim.events.remove_events(account, contact.jid) self.readd_if_needed(contact, account) if len(list_) == 1: contact = list_[0][0]

1 0

[commit-gajim] r7921 - trunk/src
by asterix＠gajim.org 31 Jan '07

31 Jan '07

Author: asterix Date: 2007-01-31 17:38:04 +0100 (Wed, 31 Jan 2007) New Revision: 7921 Modified: trunk/src/statusicon.py Log: create statusicon only when needed Modified: trunk/src/statusicon.py =================================================================== --- trunk/src/statusicon.py 2007-01-31 11:31:07 UTC (rev 7920) +++ trunk/src/statusicon.py 2007-01-31 16:38:04 UTC (rev 7921) @@ -28,11 +28,14 @@ # and can't do cool tooltips we use def __init__(self): systray.Systray.__init__(self) - self.status_icon = gtk.StatusIcon() + self.status_icon = None def show_icon(self): - self.status_icon.connect('activate', self.on_status_icon_left_clicked) - self.status_icon.connect('popup-menu', self.on_status_icon_right_clicked) + if not self.status_icon: + self.status_icon - gtk.StatusIcon() + self.status_icon.connect('activate', self.on_status_icon_left_clicked) + self.status_icon.connect('popup-menu', + self.on_status_icon_right_clicked) self.set_img() self.status_icon.props.visible = True

1 0

[commit-gajim] r7920 - in trunk/src: . common
by asterix＠gajim.org 31 Jan '07

31 Jan '07

Author: asterix Date: 2007-01-31 12:31:07 +0100 (Wed, 31 Jan 2007) New Revision: 7920 Modified: trunk/src/common/connection_handlers.py trunk/src/tooltips.py Log: better indentation Modified: trunk/src/common/connection_handlers.py =================================================================== --- trunk/src/common/connection_handlers.py 2007-01-30 19:58:34 UTC (rev 7919) +++ trunk/src/common/connection_handlers.py 2007-01-31 11:31:07 UTC (rev 7920) @@ -1070,12 +1070,14 @@ self.get_metacontacts() del self.awaiting_answers[id] - + def _vCardCB(self, con, vc): '''Called when we receive a vCard Parse the vCard and send it to plugins''' if not vc.getTag('vCard'): return + if not vc.getTag('vCard').getNamespace() == common.xmpp.NS_VCARD: + return frm_iq = vc.getFrom() our_jid = gajim.get_jid_from_account(self.name) resource = '' @@ -1084,75 +1086,74 @@ frm, resource = gajim.get_room_and_nick_from_fjid(who) else: who = frm = our_jid - if vc.getTag('vCard').getNamespace() == common.xmpp.NS_VCARD: - card = vc.getChildren()[0] - vcard = self.node_to_dict(card) - photo_decoded = None - if vcard.has_key('PHOTO') and isinstance(vcard['PHOTO'], dict) and \ - vcard['PHOTO'].has_key('BINVAL'): - photo = vcard['PHOTO']['BINVAL'] - try: - photo_decoded = base64.decodestring(photo) - avatar_sha = sha.sha(photo_decoded).hexdigest() - except: - avatar_sha = '' - else: + card = vc.getChildren()[0] + vcard = self.node_to_dict(card) + photo_decoded = None + if vcard.has_key('PHOTO') and isinstance(vcard['PHOTO'], dict) and \ + vcard['PHOTO'].has_key('BINVAL'): + photo = vcard['PHOTO']['BINVAL'] + try: + photo_decoded = base64.decodestring(photo) + avatar_sha = sha.sha(photo_decoded).hexdigest() + except: avatar_sha = '' + else: + avatar_sha = '' - if avatar_sha: - card.getTag('PHOTO').setTagData('SHA', avatar_sha) + if avatar_sha: + card.getTag('PHOTO').setTagData('SHA', avatar_sha) - # Save it to file - self.save_vcard_to_hd(who, card) - # Save the decoded avatar to a separate file too, and generate files for dbus notifications - puny_jid = helpers.sanitize_filename(frm) - puny_nick = None - begin_path = os.path.join(gajim.AVATAR_PATH, puny_jid) - 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) - if photo_decoded: - avatar_file = begin_path + '_notif_size_colored.png' - if frm == 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]): - gajim.interface.save_avatar_files(frm, photo_decoded, puny_nick) - else: - for ext in ('.jpeg', '.png', '_notif_size_bw.png', - '_notif_size_colored.png'): - path = begin_path + ext - if os.path.isfile(path): - os.remove(path) + # Save it to file + self.save_vcard_to_hd(who, card) + # Save the decoded avatar to a separate file too, and generate files for dbus notifications + puny_jid = helpers.sanitize_filename(frm) + puny_nick = None + begin_path = os.path.join(gajim.AVATAR_PATH, puny_jid) + 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) + if photo_decoded: + avatar_file = begin_path + '_notif_size_colored.png' + if frm == 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]): + gajim.interface.save_avatar_files(frm, photo_decoded, puny_nick) + else: + for ext in ('.jpeg', '.png', '_notif_size_bw.png', + '_notif_size_colored.png'): + path = begin_path + ext + 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] + 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: - self.dispatch('MYVCARD', vcard) - # we re-send our presence with sha if has changed and if we are - # not invisible - if self.vcard_sha == avatar_sha: - return - self.vcard_sha = avatar_sha - if STATUS_LIST[self.connected] == 'invisible': - return - sshow = helpers.get_xmpp_show(STATUS_LIST[self.connected]) - p = common.xmpp.Presence(typ = None, priority = self.priority, - show = sshow, status = self.status) - p = self.add_sha(p) - self.connection.send(p) - else: - self.dispatch('VCARD', vcard) + vcard['jid'] = frm + vcard['resource'] = resource + if frm == our_jid: + self.dispatch('MYVCARD', vcard) + # we re-send our presence with sha if has changed and if we are + # not invisible + if self.vcard_sha == avatar_sha: + return + self.vcard_sha = avatar_sha + if STATUS_LIST[self.connected] == 'invisible': + return + sshow = helpers.get_xmpp_show(STATUS_LIST[self.connected]) + p = common.xmpp.Presence(typ = None, priority = self.priority, + show = sshow, status = self.status) + p = self.add_sha(p) + self.connection.send(p) + else: + self.dispatch('VCARD', vcard) class ConnectionHandlers(ConnectionVcard, ConnectionBytestream, ConnectionDisco, ConnectionCommands, ConnectionPubSub): def __init__(self): @@ -1653,7 +1654,7 @@ errmsg, errcode)) if not ptype or ptype == 'unavailable': if gajim.config.get('log_contact_status_changes') and self.name\ - not in no_log_for and jid_stripped not in no_log_for: + not in no_log_for and jid_stripped not in no_log_for: gc_c = gajim.contacts.get_gc_contact(self.name, jid_stripped, resource) st = status or '' if gc_c: Modified: trunk/src/tooltips.py =================================================================== --- trunk/src/tooltips.py 2007-01-30 19:58:34 UTC (rev 7919) +++ trunk/src/tooltips.py 2007-01-31 11:31:07 UTC (rev 7920) @@ -615,13 +615,13 @@ label.set_alignment(0, 0) label.set_markup(property[0]) ft_table.attach(label, 1, 2, current_row, current_row + 1, - gtk.FILL, gtk.FILL, 0, 0) + gtk.FILL, gtk.FILL, 0, 0) label = gtk.Label() label.set_alignment(0, 0) label.set_line_wrap(True) label.set_markup(property[1]) ft_table.attach(label, 2, 3, current_row, current_row + 1, - gtk.EXPAND | gtk.FILL, gtk.FILL, 0, 0) + gtk.EXPAND | gtk.FILL, gtk.FILL, 0, 0) self.win.add(ft_table)

1 0

[commit-gajim] r7919 - trunk/po
by asterix＠gajim.org 30 Jan '07

30 Jan '07

Author: asterix Date: 2007-01-30 20:58:34 +0100 (Tue, 30 Jan 2007) New Revision: 7919 Modified: trunk/po/it.po Log: [Matteo Dell'Amico] Tiny bugfix for Italian translation Modified: trunk/po/it.po =================================================================== --- trunk/po/it.po 2007-01-30 19:57:57 UTC (rev 7918) +++ trunk/po/it.po 2007-01-30 19:58:34 UTC (rev 7919) @@ -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-19 12:17+0100\n" +"PO-Revision-Date: 2007-01-30 17:48+0100\n" "Last-Translator: Matteo Dell'Amico <della(a)linux.it>\n" "Language-Team: Italian\n" "MIME-Version: 1.0\n" @@ -2561,7 +2561,7 @@ #: ../src/chat_control.py:247 msgid "Spelling language" -msgstr "Linguaggio da computare" +msgstr "Lingua per la correzione ortografica" #. we are not connected #: ../src/chat_control.py:270 ../src/chat_control.py:476

1 0

[commit-gajim] r7918 - branches/gajim_0.11/po
by asterix＠gajim.org 30 Jan '07

30 Jan '07

Author: asterix Date: 2007-01-30 20:57:57 +0100 (Tue, 30 Jan 2007) New Revision: 7918 Modified: branches/gajim_0.11/po/it.po Log: [Matteo Dell'Amico] Tiny bugfix for Italian translation Modified: branches/gajim_0.11/po/it.po =================================================================== --- branches/gajim_0.11/po/it.po 2007-01-30 18:32:15 UTC (rev 7917) +++ branches/gajim_0.11/po/it.po 2007-01-30 19:57:57 UTC (rev 7918) @@ -14,7 +14,7 @@ "Project-Id-Version: Gajim 2\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2007-01-23 21:28+0100\n" -"PO-Revision-Date: 2007-01-19 12:17+0100\n" +"PO-Revision-Date: 2007-01-30 17:48+0100\n" "Last-Translator: Matteo Dell'Amico <della(a)linux.it>\n" "Language-Team: Italian\n" "MIME-Version: 1.0\n" @@ -2556,7 +2556,7 @@ #: ../src/chat_control.py:247 msgid "Spelling language" -msgstr "Linguaggio da computare" +msgstr "Lingua per la correzione ortografica" #. we are not connected #: ../src/chat_control.py:270 ../src/chat_control.py:476 @@ -3858,7 +3858,7 @@ #: ../src/gajim.py:55 msgid "Gajim needs GTK 2.6 or above to run. Quiting..." -msgstr "Gajim ha bisogno di GTK2.6 o superiore per essere eseguito. Uscita..." +msgstr "Gajim ha bisogno di GTK 2.6 o superiore per essere eseguito. Uscita..." #: ../src/gajim.py:60 msgid "GTK+ runtime is missing libglade support"

1 0

[commit-gajim] r7917 - trunk/src/common
by jim++＠gajim.org 30 Jan '07

30 Jan '07

Author: jim++ Date: 2007-01-30 19:32:15 +0100 (Tue, 30 Jan 2007) New Revision: 7917 Modified: trunk/src/common/connection_handlers.py Log: utf problem ? Modified: trunk/src/common/connection_handlers.py =================================================================== --- trunk/src/common/connection_handlers.py 2007-01-29 22:04:22 UTC (rev 7916) +++ trunk/src/common/connection_handlers.py 2007-01-30 18:32:15 UTC (rev 7917) @@ -1673,7 +1673,7 @@ if avatar_sha != self.vcard_shas[who]: # avatar has been updated self.request_vcard(who, True) - else: # Verify sha cached in hdd + 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 \

1 0

[commit-gajim] r7916 - trunk/src/common
by jim++＠gajim.org 29 Jan '07

29 Jan '07

Author: jim++ Date: 2007-01-29 23:04:22 +0100 (Mon, 29 Jan 2007) New Revision: 7916 Modified: trunk/src/common/connection.py trunk/src/common/connection_handlers.py Log: Verify avatars'sha on hdd in muc too, don't send sha when disconnecting from muc Modified: trunk/src/common/connection.py =================================================================== --- trunk/src/common/connection.py 2007-01-29 18:29:51 UTC (rev 7915) +++ trunk/src/common/connection.py 2007-01-29 22:04:22 UTC (rev 7916) @@ -1170,10 +1170,10 @@ ptype = None if show == 'offline': ptype = 'unavailable' - show = helpers.get_xmpp_show(show) + xmpp_show = helpers.get_xmpp_show(show) p = common.xmpp.Presence(to = '%s/%s' % (jid, nick), typ = ptype, - show = show, status = status) - if gajim.config.get('send_sha_in_gc_presence'): + show = xmpp_show, status = status) + if gajim.config.get('send_sha_in_gc_presence') and show != 'offline': p = self.add_sha(p, ptype != 'unavailable') # send instantly so when we go offline, status is sent to gc before we # disconnect from jabber server Modified: trunk/src/common/connection_handlers.py =================================================================== --- trunk/src/common/connection_handlers.py 2007-01-29 18:29:51 UTC (rev 7915) +++ trunk/src/common/connection_handlers.py 2007-01-29 22:04:22 UTC (rev 7916) @@ -1669,12 +1669,22 @@ # contact has no avatar puny_nick = helpers.sanitize_filename(resource) gajim.interface.remove_avatar_files(jid_stripped, puny_nick) - if self.vcard_shas.has_key(who): + if self.vcard_shas.has_key(who): # Verify sha cached in mem if avatar_sha != self.vcard_shas[who]: # avatar has been updated self.request_vcard(who, True) - else: + 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]: + # avatar has been updated + self.request_vcard(who) + 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

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 January 2007