Commits May 2006

commits@gajim.org

6 participants
155 discussions

[commit-gajim] r6266 - trunk/src
by dkirov＠gajim.org 02 May '06

02 May '06

Author: dkirov Date: 2006-05-02 18:10:13 +0200 (Tue, 02 May 2006) New Revision: 6266 Modified: trunk/src/history_manager.py Log: glade is moved to data/glade Modified: trunk/src/history_manager.py =================================================================== --- trunk/src/history_manager.py 2006-05-02 15:53:25 UTC (rev 6265) +++ trunk/src/history_manager.py 2006-05-02 16:10:13 UTC (rev 6266) @@ -369,7 +369,7 @@ def on_listview_button_press_event(self, widget, event): if event.button == 3: # right click - xml = gtk.glade.XML('history_manager.glade', 'context_menu', i18n.APP) + xml = gtkgui_helpers.get_glade('history_manager.glade', 'context_menu') if widget.name != 'jids_listview': xml.get_widget('export_menuitem').hide() xml.get_widget('delete_menuitem').connect('activate', @@ -384,7 +384,7 @@ return True def on_export_menuitem_activate(self, widget): - xml = gtk.glade.XML('history_manager.glade', 'filechooserdialog', i18n.APP) + xml = gtkgui_helpers.get_glade('history_manager.glade', 'filechooserdialog') xml.signal_autoconnect(self) dlg = xml.get_widget('filechooserdialog')

1 0

[commit-gajim] r6264 - trunk/autopackage
by asterix＠gajim.org 02 May '06

02 May '06

Author: asterix Date: 2006-05-02 13:11:44 +0200 (Tue, 02 May 2006) New Revision: 6264 Modified: trunk/autopackage/default.apspec Log: [Filippos] updated autopackage file Modified: trunk/autopackage/default.apspec =================================================================== --- trunk/autopackage/default.apspec 2006-05-02 06:36:49 UTC (rev 6263) +++ trunk/autopackage/default.apspec 2006-05-02 11:11:44 UTC (rev 6264) @@ -5,11 +5,11 @@ DisplayName: Gajim Jabber Client ShortName: gajim Maintainer: The Gajim Developers <gajim-devel-subscribe(a)gajim.org> -Packager: Filippos Papadopoulos <filip(a)cs.uoi.gr> +Packager: Filippos Papadopoulos <psybases(a)gmail.com> Summary: Gajim is a Jabber client written in Python. URL: http://www.gajim.org/ License: GNU General Public License, Version 2 -SoftwareVersion: 0.9 +SoftwareVersion: 0.10 AutopackageTarget: 1.0 PackageVersion: 1 @@ -51,25 +51,19 @@ [Prepare] # Dependency checking -#PyGTK 2.4 requires python 2.3 -require @python.org/python 2.3 -require @python.org/python-xml 2.3 +require @python.org/python 2.4 +require @python.org/python-xml 2.4 require @gtk.org/gtk 2.6 + +########The 2.5 version is for SUSE 9.3 require @gnome.org/pygtk 2.5 require @gnome.org/pyglade 2.5 require @glade.gnome.org/libglade 2 require @pysqlite.org/pysqlite 2 recommend @gtkspell.sourceforge.net/gtkspell 0 -if ! require @dnspython.org/dnspython 1; then -recommend @pydns.sourceforge.net/pydns 2 -fi -#recommend @dnspython.org/dnspython 1 -#recommend @pydns.sourceforge.net/pydns 2 - - [Install] # Put your installation script here

1 0

[commit-gajim] r6263 - trunk/src/common
by asterix＠gajim.org 02 May '06

02 May '06

Author: asterix Date: 2006-05-02 08:36:49 +0200 (Tue, 02 May 2006) New Revision: 6263 Modified: trunk/src/common/helpers.py Log: correct list of not allowed chars under windows. Fixes #1913 Modified: trunk/src/common/helpers.py =================================================================== --- trunk/src/common/helpers.py 2006-05-01 21:20:01 UTC (rev 6262) +++ trunk/src/common/helpers.py 2006-05-02 06:36:49 UTC (rev 6263) @@ -695,8 +695,9 @@ filename = punycode_encode(filename) # make it latin chars only filename = filename.replace('/', '_') if os.name == 'nt': - filename = filename.replace('?', '').replace(':', '').replace('!', '')\ - .replace('"', "'") + filename = filename.replace('?', '_').replace(':', '_')\ + .replace('\\', '_').replace('"', "'").replace('|', '_')\ + .replace('*', '_').replace('<', '_').replace('>', '_') # 48 is the limit if len(filename) > 48: extension = filename.split('.')[-1]

1 0

[commit-gajim] r6262 - branches
by asterix＠gajim.org 01 May '06

01 May '06

Author: asterix Date: 2006-05-01 23:20:01 +0200 (Mon, 01 May 2006) New Revision: 6262 Added: branches/gajim_0.10/ Log: branch for 0.10 release Copied: branches/gajim_0.10 (from rev 6261, trunk)

1 0

[commit-gajim] r6261 - in trunk/src: . common
by asterix＠gajim.org 01 May '06

01 May '06

Author: asterix Date: 2006-05-01 20:29:12 +0200 (Mon, 01 May 2006) New Revision: 6261 Modified: trunk/src/common/connection.py trunk/src/common/connection_handlers.py trunk/src/gajim.py trunk/src/roster_window.py Log: be sure that transport is really removed before we start to remove its contacts. Modified: trunk/src/common/connection.py =================================================================== --- trunk/src/common/connection.py 2006-05-01 17:42:12 UTC (rev 6260) +++ trunk/src/common/connection.py 2006-05-01 18:29:12 UTC (rev 6261) @@ -744,6 +744,9 @@ return iq = common.xmpp.Iq('set', common.xmpp.NS_REGISTER, to = agent) iq.getTag('query').setTag('remove') + id = self.connection.getAnID() + iq.setID(id) + self.awaiting_answers[id] = (AGENT_REMOVED, agent) self.connection.send(iq) self.connection.getRoster().delItem(agent) Modified: trunk/src/common/connection_handlers.py =================================================================== --- trunk/src/common/connection_handlers.py 2006-05-01 17:42:12 UTC (rev 6260) +++ trunk/src/common/connection_handlers.py 2006-05-01 18:29:12 UTC (rev 6261) @@ -40,6 +40,7 @@ # kind of events we can wait for an answer VCARD_PUBLISHED = 'vcard_published' VCARD_ARRIVED = 'vcard_arrived' +AGENT_REMOVED = 'agent_removed' HAS_IDLE = True try: import common.idle as idle # when we launch gajim from sources @@ -947,6 +948,9 @@ self.dispatch('VCARD', {'jid': jid}) elif jid == our_jid: self.dispatch('MYVCARD', {'jid': jid}) + elif self.awaiting_answers[id][0] == AGENT_REMOVED: + jid = self.awaiting_answers[id][1] + self.dispatch('AGENT_REMOVED', jid) del self.awaiting_answers[id] def _vCardCB(self, con, vc): Modified: trunk/src/gajim.py =================================================================== --- trunk/src/gajim.py 2006-05-01 17:42:12 UTC (rev 6260) +++ trunk/src/gajim.py 2006-05-01 18:29:12 UTC (rev 6261) @@ -729,6 +729,23 @@ except AttributeError: return + def handle_event_agent_removed(self, account, agent): + # remove transport's contacts from treeview + jid_list = gajim.contacts.get_jid_list(account) + for jid in jid_list: + if jid.endswith('@' + agent): + c = gajim.contacts.get_first_contact_from_jid(account, jid) + gajim.log.debug( + 'Removing contact %s due to unregistered transport %s'\ + % (jid, agent)) + gajim.connections[account].unsubscribe(c.jid) + # Transport contacts can't have 2 resources + if c.jid in gajim.to_be_removed[account]: + # This way we'll really remove it + gajim.to_be_removed[account].remove(c.jid) + gajim.contacts.remove_jid(account, c.jid) + self.roster.remove_contact(c, account) + def handle_event_register_agent_info(self, account, array): #('REGISTER_AGENT_INFO', account, (agent, infos, is_form)) if array[1].has_key('instructions'): @@ -1623,6 +1640,7 @@ 'SUBSCRIBE': self.handle_event_subscribe, 'AGENT_ERROR_INFO': self.handle_event_agent_info_error, 'AGENT_ERROR_ITEMS': self.handle_event_agent_items_error, + 'AGENT_REMOVED': self.handle_event_agent_removed, 'REGISTER_AGENT_INFO': self.handle_event_register_agent_info, 'AGENT_INFO_ITEMS': self.handle_event_agent_info_items, 'AGENT_INFO_INFO': self.handle_event_agent_info_info, Modified: trunk/src/roster_window.py =================================================================== --- trunk/src/roster_window.py 2006-05-01 17:42:12 UTC (rev 6260) +++ trunk/src/roster_window.py 2006-05-01 18:29:12 UTC (rev 6261) @@ -1142,18 +1142,6 @@ gajim.connections[account].unsubscribe_agent(full_jid) # remove transport from treeview self.remove_contact(contact, account) - # remove transport's contacts from treeview - jid_list = gajim.contacts.get_jid_list(account) - for jid in jid_list: - if jid.endswith('@' + contact.jid): - c = gajim.contacts.get_first_contact_from_jid(account, jid) - gajim.log.debug( - 'Removing contact %s due to unregistered transport %s'\ - % (jid, contact.jid)) - gajim.connections[account].unsubscribe(c.jid) - # Transport contacts can't have 2 resources - gajim.contacts.remove_jid(account, c.jid) - self.remove_contact(c, account) gajim.contacts.remove_jid(account, contact.jid) gajim.contacts.remove_contact(account, contact)

1 0

[commit-gajim] r6260 - trunk/src
by asterix＠gajim.org 01 May '06

01 May '06

Author: asterix Date: 2006-05-01 19:42:12 +0200 (Mon, 01 May 2006) New Revision: 6260 Modified: trunk/src/history_manager.py trunk/src/migrate_logs_to_dot9_db.py Log: typo Modified: trunk/src/history_manager.py =================================================================== --- trunk/src/history_manager.py 2006-05-01 17:34:08 UTC (rev 6259) +++ trunk/src/history_manager.py 2006-05-01 17:42:12 UTC (rev 6260) @@ -1,6 +1,6 @@ #!/bin/sh ''':' -exec python -OOt "$0" +exec python -OOt "$0" ${1+"$@"} ' ''' ## history_manager.py ## Modified: trunk/src/migrate_logs_to_dot9_db.py =================================================================== --- trunk/src/migrate_logs_to_dot9_db.py 2006-05-01 17:34:08 UTC (rev 6259) +++ trunk/src/migrate_logs_to_dot9_db.py 2006-05-01 17:42:12 UTC (rev 6260) @@ -1,6 +1,6 @@ #!/bin/sh ''':' -exec python -OOt "$0" +exec python -OOt "$0" ${1+"$@"} ' ''' ## Contributors for this file: ## - Yann Le Boulanger <asterix(a)lagaule.org>

1 0

[commit-gajim] r6259 - trunk/src
by asterix＠gajim.org 01 May '06

01 May '06

Author: asterix Date: 2006-05-01 19:34:08 +0200 (Mon, 01 May 2006) New Revision: 6259 Modified: trunk/src/history_manager.py trunk/src/migrate_logs_to_dot9_db.py Log: nicer file header for executable files. Modified: trunk/src/history_manager.py =================================================================== --- trunk/src/history_manager.py 2006-05-01 17:25:43 UTC (rev 6258) +++ trunk/src/history_manager.py 2006-05-01 17:34:08 UTC (rev 6259) @@ -1,4 +1,7 @@ -#! /usr/bin/env python +#!/bin/sh +''':' +exec python -OOt "$0" +' ''' ## history_manager.py ## ## Copyright (C) 2006 Nikos Kouremenos <kourem(a)gmail.com> Modified: trunk/src/migrate_logs_to_dot9_db.py =================================================================== --- trunk/src/migrate_logs_to_dot9_db.py 2006-05-01 17:25:43 UTC (rev 6258) +++ trunk/src/migrate_logs_to_dot9_db.py 2006-05-01 17:34:08 UTC (rev 6259) @@ -1,4 +1,7 @@ -#!/usr/bin/env python +#!/bin/sh +''':' +exec python -OOt "$0" +' ''' ## Contributors for this file: ## - Yann Le Boulanger <asterix(a)lagaule.org> ## - Nikos Kouremenos <kourem(a)gmail.com>

1 0

[commit-gajim] r6258 - trunk/debian
by asterix＠gajim.org 01 May '06

01 May '06

Author: asterix Date: 2006-05-01 19:25:43 +0200 (Mon, 01 May 2006) New Revision: 6258 Modified: trunk/debian/control Log: fix debian description Modified: trunk/debian/control =================================================================== --- trunk/debian/control 2006-05-01 17:11:15 UTC (rev 6257) +++ trunk/debian/control 2006-05-01 17:25:43 UTC (rev 6258) @@ -11,6 +11,6 @@ Recommends: dnsutils, python2.4-dbus, notification-daemon Suggests: python2.4-gnome2 Description: Jabber client written in PyGTK - Gajim is a Jabber client written in PyGTK. It has a tabbed user interface - with normal chats, group chats, and has many features such as, TLS, GPG, - SSL, multiple accounts, avatars, file transfers, D-Bus and Metacontacts. + Gajim is a Jabber client. It has a tabbed user interface with normal chats, + group chats, and has many features such as, TLS, GPG, SSL, multiple accounts, + avatars, file transfers, D-Bus and Metacontacts.

1 0

[commit-gajim] r6257 - trunk/po/es/LC_MESSAGES
by asterix＠gajim.org 01 May '06

01 May '06

Author: asterix Date: 2006-05-01 19:11:15 +0200 (Mon, 01 May 2006) New Revision: 6257 Modified: trunk/po/es/LC_MESSAGES/gajim.po Log: fix typo in es translation Modified: trunk/po/es/LC_MESSAGES/gajim.po =================================================================== --- trunk/po/es/LC_MESSAGES/gajim.po 2006-05-01 17:11:00 UTC (rev 6256) +++ trunk/po/es/LC_MESSAGES/gajim.po 2006-05-01 17:11:15 UTC (rev 6257) @@ -4021,8 +4021,8 @@ #, python-format msgid "Gajim - %d unread message" msgid_plural "Gajim - %d unread messages" -msgstr[0] "Gajim - %s mensaje sin leer" -msgstr[1] "Gajim - %s mensajes sin leer" +msgstr[0] "Gajim - %d mensaje sin leer" +msgstr[1] "Gajim - %d mensajes sin leer" #: ../src/tooltips.py:321 #, python-format @@ -4035,15 +4035,15 @@ #, python-format msgid "Gajim - %d unread group chat message" msgid_plural "Gajim - %d unread group chat messages" -msgstr[0] "Gajim - %s mensajes sin leer" -msgstr[1] "Gajim - %s mensajes sin leer" +msgstr[0] "Gajim - %d mensajes sin leer" +msgstr[1] "Gajim - %d mensajes sin leer" #: ../src/tooltips.py:333 #, python-format msgid "Gajim - %d unread private message" msgid_plural "Gajim - %d unread private messages" -msgstr[0] "Gajim - %s mensaje privado sin leer" -msgstr[1] "Gajim - %s mensajes privados sin leer" +msgstr[0] "Gajim - %d mensaje privado sin leer" +msgstr[1] "Gajim - %d mensajes privados sin leer" #: ../src/tooltips.py:348 ../src/tooltips.py:350 #, python-format

1 0

[commit-gajim] r6256 - trunk/debian
by asterix＠gajim.org 01 May '06

01 May '06

Author: asterix Date: 2006-05-01 19:11:00 +0200 (Mon, 01 May 2006) New Revision: 6256 Modified: trunk/debian/changelog Log: one more fixed debian bug Modified: trunk/debian/changelog =================================================================== --- trunk/debian/changelog 2006-05-01 15:50:33 UTC (rev 6255) +++ trunk/debian/changelog 2006-05-01 17:11:00 UTC (rev 6256) @@ -3,9 +3,9 @@ * new upstream release * fix description typo Closes: #349249 * Gajim now recommends dnsutils instead of python-dns - * Gajim now depends on python2.4 Closes: #357777 + * Gajim now depends on python2.4 Closes: #357777, #364078 * Use Gajim's GnuPGInterface file as there is no python2.4-gnupginterface - package + package -- Yann Le Boulanger <asterix(a)lagaule.org> Wed, 12 Apr 2006 10:55:16 +0100

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 2006