Commits January 2008

commits@gajim.org

4 participants
55 discussions

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

31 Jan '08

Author: asterix Date: 2008-01-31 21:39:03 +0100 (Thu, 31 Jan 2008) New Revision: 9284 Modified: trunk/src/roster_window.py Log: fix roster sorting whith user that just became offline and are still in roster. Fixes #3531 Modified: trunk/src/roster_window.py =================================================================== --- trunk/src/roster_window.py 2008-01-30 21:31:19 UTC (rev 9283) +++ trunk/src/roster_window.py 2008-01-31 20:39:03 UTC (rev 9284) @@ -4933,6 +4933,16 @@ show2 = cshow[s] else: show2 = 9 + removing1 = False + removing2 = False + if show1 == 6 and jid1 in gajim.to_be_removed[account1]: + removing1 = True + if show2 == 6 and jid2 in gajim.to_be_removed[account2]: + removing2 = True + if removing1 and not removing2: + return -1 + if removing2 and not removing1: + return 1 if show1 < show2: return -1 elif show1 > show2:

1 0

[commit-gajim] r9283 - trunk/src/common
by asterix＠gajim.org 30 Jan '08

30 Jan '08

Author: asterix Date: 2008-01-30 22:31:19 +0100 (Wed, 30 Jan 2008) New Revision: 9283 Modified: trunk/src/common/helpers.py Log: [TuX] better uname call Modified: trunk/src/common/helpers.py =================================================================== --- trunk/src/common/helpers.py 2008-01-30 21:29:55 UTC (rev 9282) +++ trunk/src/common/helpers.py 2008-01-30 21:31:19 UTC (rev 9283) @@ -793,7 +793,7 @@ return text # our last chance, ask uname and strip it - uname_output = get_output_of_command('uname -a | cut -d" " -f1,3') + uname_output = get_output_of_command('uname -sr') if uname_output is not None: return uname_output[0] # only first line return 'N/A'

1 0

[commit-gajim] r9282 - trunk/src/common
by asterix＠gajim.org 30 Jan '08

30 Jan '08

Author: asterix Date: 2008-01-30 22:29:55 +0100 (Wed, 30 Jan 2008) New Revision: 9282 Modified: trunk/src/common/helpers.py Log: arch linux file /etc/arch-release doesn't contain version number Modified: trunk/src/common/helpers.py =================================================================== --- trunk/src/common/helpers.py 2008-01-30 11:01:08 UTC (rev 9281) +++ trunk/src/common/helpers.py 2008-01-30 21:29:55 UTC (rev 9282) @@ -784,7 +784,8 @@ 'sourcemage') or not\ os.path.basename(path_to_file).startswith('slackware'): text = distro_name + ' ' + text - elif path_to_file.endswith('aurox-release'): + elif path_to_file.endswith('aurox-release') or \ + path_to_file.endswith('arch-release'): # file doesn't have version text = distro_name elif path_to_file.endswith('lfs-release'): # file just has version

1 0

[commit-gajim] r9281 - trunk/src/common/zeroconf
by asterix＠gajim.org 30 Jan '08

30 Jan '08

Author: asterix Date: 2008-01-30 12:01:08 +0100 (Wed, 30 Jan 2008) New Revision: 9281 Modified: trunk/src/common/zeroconf/connection_zeroconf.py Log: remove useless spaces and tabs Modified: trunk/src/common/zeroconf/connection_zeroconf.py =================================================================== --- trunk/src/common/zeroconf/connection_zeroconf.py 2008-01-30 10:46:12 UTC (rev 9280) +++ trunk/src/common/zeroconf/connection_zeroconf.py 2008-01-30 11:01:08 UTC (rev 9281) @@ -71,9 +71,9 @@ self.status = '' self.old_show = '' self.priority = 0 - + self.call_resolve_timeout = False - + self.time_to_reconnect = None #self.new_account_info = None self.bookmarks = [] @@ -94,17 +94,17 @@ if gajim.HAVE_GPG: self.USE_GPG = True self.gpg = GnuPG.GnuPG(gajim.config.get('use_gpg_agent')) - + self.get_config_values_or_default() - + self.muc_jid = {} # jid of muc server for each transport type self.vcard_supported = False self.private_storage_supported = False def get_config_values_or_default(self): - ''' get name, host, port from config, or + ''' get name, host, port from config, or create zeroconf account with default values''' - + if not gajim.config.get_per('accounts', gajim.ZEROCONF_ACC_NAME, 'name'): gajim.log.debug('Creating zeroconf account') gajim.config.add_per('accounts', gajim.ZEROCONF_ACC_NAME) @@ -150,7 +150,7 @@ def quit(self, kill_core): if kill_core and self.connected > 1: self.disconnect() - + def disable_account(self): self.disconnect() @@ -195,12 +195,12 @@ #XXX open chat windows don't get refreshed (full name), add that return self.call_resolve_timeout - # callbacks called from zeroconf + # callbacks called from zeroconf def _on_new_service(self,jid): self.roster.setItem(jid) self.dispatch('ROSTER_INFO', (jid, self.roster.getName(jid), 'both', 'no', self.roster.getGroups(jid))) self.dispatch('NOTIFY', (jid, self.roster.getStatus(jid), self.roster.getMessage(jid), 'local', 0, None, 0, None)) - + def _on_remove_service(self, jid): self.roster.delItem(jid) # 'NOTIFY' (account, (jid, status, status message, resource, priority, @@ -332,7 +332,7 @@ elif show == 'offline' and self.connected: self.disconnect() self.time_to_reconnect = None - + # update status elif show != 'offline' and self.connected: was_invisible = self.connected == STATUS_LIST.index('invisible') @@ -350,18 +350,18 @@ if check: self.dispatch('STATUS', show) else: - # show notification that avahi or system bus is down + # show notification that avahi or system bus is down self.dispatch('STATUS', 'offline') self.status = 'offline' self.dispatch('CONNECTION_LOST', (_('Could not change status of account "%s"') % self.name, _('Please check if avahi-daemon is running.'))) - + def get_status(self): return STATUS_LIST[self.connected] def send_message(self, jid, msg, keyID, type = 'chat', subject='', - chatstate = None, msg_id = None, composing_xep = None, resource = None, + chatstate = None, msg_id = None, composing_xep = None, resource = None, user_nick = None, session=None): fjid = jid @@ -425,8 +425,8 @@ msg_id = '' chatstate_node.setTagData('id', msg_id) # when msgtxt, requests JEP-0022 composing notification - if chatstate is 'composing' or msgtxt: - chatstate_node.addChild(name = 'composing') + if chatstate is 'composing' or msgtxt: + chatstate_node.addChild(name = 'composing') if session: session.last_send = time.time() @@ -451,15 +451,15 @@ else: kind = 'single_msg_sent' gajim.logger.write(kind, jid, log_msg) - + self.dispatch('MSGSENT', (jid, msg, keyID)) - + def send_stanza(self, stanza): # send a stanza untouched if not self.connection: return self.connection.send(stanza) - + def ack_subscribed(self, jid): gajim.log.debug('This should not happen (ack_subscribed)') @@ -482,11 +482,11 @@ def unsubscribe_agent(self, agent): gajim.log.debug('This should not happen (unsubscribe_agent)') - def update_contact(self, jid, name, groups): + def update_contact(self, jid, name, groups): if self.connection: self.connection.getRoster().setItem(jid = jid, name = name, groups = groups) - + def new_account(self, name, config, sync = False): gajim.log.debug('This should not happen (new_account)') @@ -507,13 +507,13 @@ def get_bookmarks(self): gajim.log.debug('This should not happen (get_bookmarks)') - + def store_bookmarks(self): gajim.log.debug('This should not happen (store_bookmarks)') - + def get_metacontacts(self): gajim.log.debug('This should not happen (get_metacontacts)') - + def send_agent_status(self, agent, ptype): gajim.log.debug('This should not happen (send_agent_status)')

1 0

[commit-gajim] r9280 - trunk/src
by asterix＠gajim.org 30 Jan '08

30 Jan '08

Author: asterix Date: 2008-01-30 11:46:12 +0100 (Wed, 30 Jan 2008) New Revision: 9280 Modified: trunk/src/roster_window.py Log: re-compute big brother when a contact of a metacontact goes offline. fixes #3464 Modified: trunk/src/roster_window.py =================================================================== --- trunk/src/roster_window.py 2008-01-30 08:12:59 UTC (rev 9279) +++ trunk/src/roster_window.py 2008-01-30 10:46:12 UTC (rev 9280) @@ -520,7 +520,15 @@ gajim.account_is_disconnected(account))) and nb_events == 0: self.remove_contact(contact, account) else: - self.draw_contact(contact.jid, account) + # If it's a metacontact, big brother may have changed, so remove and + # re-add + model = self.tree.get_model() + iters = self.get_contact_iter(contact.jid, account) + if iters and model.iter_has_child(iters[0]): + self.remove_contact(contact, account) + self.add_contact_to_roster(contact.jid, account) + else: + self.draw_contact(contact.jid, account) def remove_contact(self, contact, account): '''Remove a contact from the roster'''

1 0

[commit-gajim] r9279 - trunk/src
by asterix＠gajim.org 30 Jan '08

30 Jan '08

Author: asterix Date: 2008-01-30 09:12:59 +0100 (Wed, 30 Jan 2008) New Revision: 9279 Modified: trunk/src/groupchat_control.py Log: prevent a GTK warning Modified: trunk/src/groupchat_control.py =================================================================== --- trunk/src/groupchat_control.py 2008-01-30 07:56:02 UTC (rev 9278) +++ trunk/src/groupchat_control.py 2008-01-30 08:12:59 UTC (rev 9279) @@ -2159,6 +2159,9 @@ self.tooltip.hide_tooltip() def show_tooltip(self, contact): + if not self.list_treeview.window: + # control has been destroyed since tooltip was requested + return pointer = self.list_treeview.get_pointer() props = self.list_treeview.get_path_at_pos(pointer[0], pointer[1]) # check if the current pointer is at the same path

1 0

[commit-gajim] r9278 - trunk/src/common
by asterix＠gajim.org 30 Jan '08

30 Jan '08

Author: asterix Date: 2008-01-30 08:56:02 +0100 (Wed, 30 Jan 2008) New Revision: 9278 Modified: trunk/src/common/GnuPG.py Log: [nijel] unescape non-ascii chars in the output of GnuPG. fixes #3709 Modified: trunk/src/common/GnuPG.py =================================================================== --- trunk/src/common/GnuPG.py 2008-01-29 18:24:22 UTC (rev 9277) +++ trunk/src/common/GnuPG.py 2008-01-30 07:56:02 UTC (rev 9278) @@ -193,8 +193,10 @@ sline = line.split(':') if (sline[0] == 'sec' and secret) or \ (sline[0] == 'pub' and not secret): + # decode escaped chars + name = eval('"' + sline[9].replace('"', '\\"') + '"') # make it unicode instance - keys[sline[4][8:]] = helpers.decode_string(sline[9]) + keys[sline[4][8:]] = helpers.decode_string(name) return keys try: proc.wait() except IOError: pass

1 0

[commit-gajim] r9277 - trunk/src
by asterix＠gajim.org 29 Jan '08

29 Jan '08

Author: asterix Date: 2008-01-29 19:24:22 +0100 (Tue, 29 Jan 2008) New Revision: 9277 Modified: trunk/src/conversation_textview.py Log: don't generate transparent png file when rendering latex expressions. Modified: trunk/src/conversation_textview.py =================================================================== --- trunk/src/conversation_textview.py 2008-01-28 21:22:38 UTC (rev 9276) +++ trunk/src/conversation_textview.py 2008-01-29 18:24:22 UTC (rev 9277) @@ -830,7 +830,7 @@ exitcode = p.wait() if exitcode == 0: - p = Popen(['convert', tmpfile + '.ps', tmpfile + '.png'], + p = Popen(['convert', '-alpha', 'off', tmpfile + '.ps', tmpfile + '.png'], cwd=gettempdir()) exitcode = p.wait()

1 0

[commit-gajim] r9276 - trunk/src
by steve-e＠gajim.org 28 Jan '08

28 Jan '08

Author: steve-e Date: 2008-01-28 22:22:38 +0100 (Mon, 28 Jan 2008) New Revision: 9276 Modified: trunk/src/groupchat_control.py Log: We may not add ourself to roster. Make entry in occupants menu insensitive. Modified: trunk/src/groupchat_control.py =================================================================== --- trunk/src/groupchat_control.py 2008-01-28 18:40:26 UTC (rev 9275) +++ trunk/src/groupchat_control.py 2008-01-28 21:22:38 UTC (rev 9276) @@ -2000,7 +2000,8 @@ self.handlers[id] = item item = xml.get_widget('add_to_roster_menuitem') - if not jid: + our_jid = gajim.get_jid_from_account(self.account) + if not jid or jid == our_jid: item.set_sensitive(False) else: id = item.connect('activate', self.on_add_to_roster, jid)

1 0

[commit-gajim] r9275 - trunk/src
by asterix＠gajim.org 28 Jan '08

28 Jan '08

Author: asterix Date: 2008-01-28 19:40:26 +0100 (Mon, 28 Jan 2008) New Revision: 9275 Modified: trunk/src/Makefile.am Log: compile .py to .pyc and .pyo and install those files too. Modified: trunk/src/Makefile.am =================================================================== --- trunk/src/Makefile.am 2008-01-27 22:34:32 UTC (rev 9274) +++ trunk/src/Makefile.am 2008-01-28 18:40:26 UTC (rev 9275) @@ -44,26 +44,26 @@ $(srcdir)/trayicon.defs > $@ endif gajimsrcdir = $(pkgdatadir)/src -gajimsrc_DATA = $(srcdir)/*.py +gajimsrc_PYTHON = $(srcdir)/*.py gajimsrc1dir = $(pkgdatadir)/src/common -gajimsrc1_DATA = \ +gajimsrc1_PYTHON = \ $(srcdir)/common/*.py gajimsrc2dir = $(pkgdatadir)/src/common/xmpp -gajimsrc2_DATA = \ +gajimsrc2_PYTHON = \ $(srcdir)/common/xmpp/*.py gajimsrc3dir = $(pkgdatadir)/src/common/zeroconf -gajimsrc3_DATA = \ +gajimsrc3_PYTHON = \ $(srcdir)/common/zeroconf/*.py DISTCLEANFILES = -EXTRA_DIST = $(gajimsrc_DATA) \ - $(gajimsrc1_DATA) \ - $(gajimsrc2_DATA) \ - $(gajimsrc3_DATA) \ +EXTRA_DIST = $(gajimsrc_PYTHON) \ + $(gajimsrc1_PYTHON) \ + $(gajimsrc2_PYTHON) \ + $(gajimsrc3_PYTHON) \ gtkspellmodule.c \ eggtrayicon.c \ trayiconmodule.c \

1 0

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

Commits January 2008