gajim.org
Sign In
Sign Up
Sign In
Sign Up
Manage this list
×
Keyboard Shortcuts
Thread View
j
: Next unread message
k
: Previous unread message
j a
: Jump to all threads
j l
: Jump to MailingList overview
2026
October
September
August
July
June
May
April
March
February
January
2025
December
November
October
September
August
July
June
May
April
March
February
January
2024
December
November
October
September
August
July
June
May
April
March
February
January
2023
December
November
October
September
August
July
June
May
April
March
February
January
2022
December
November
October
September
August
July
June
May
April
March
February
January
2021
December
November
October
September
August
July
June
May
April
March
February
January
2020
December
November
October
September
August
July
June
May
April
March
February
January
2019
December
November
October
September
August
July
June
May
April
March
February
January
2018
December
November
October
September
August
July
June
May
April
March
February
January
2017
December
November
October
September
August
July
June
May
April
March
February
January
2016
December
November
October
September
August
July
June
May
April
March
February
January
2015
December
November
October
September
August
July
June
May
April
March
February
January
2014
December
November
October
September
August
July
June
May
April
March
February
January
2013
December
November
October
September
August
July
June
May
April
March
February
January
2012
December
November
October
September
August
July
June
May
April
March
February
January
2011
December
November
October
September
August
July
June
May
April
March
February
January
2010
December
November
October
September
August
July
June
May
April
March
February
January
2009
December
November
October
September
August
July
June
May
April
March
February
January
2008
December
November
October
September
August
July
June
May
April
March
February
January
2007
December
November
October
September
August
July
June
May
April
March
February
January
2006
December
November
October
September
August
July
June
May
April
List overview
Download
Commits
September 2010
----- 2026 -----
October 2026
September 2026
August 2026
July 2026
June 2026
May 2026
April 2026
March 2026
February 2026
January 2026
----- 2025 -----
December 2025
November 2025
October 2025
September 2025
August 2025
July 2025
June 2025
May 2025
April 2025
March 2025
February 2025
January 2025
----- 2024 -----
December 2024
November 2024
October 2024
September 2024
August 2024
July 2024
June 2024
May 2024
April 2024
March 2024
February 2024
January 2024
----- 2023 -----
December 2023
November 2023
October 2023
September 2023
August 2023
July 2023
June 2023
May 2023
April 2023
March 2023
February 2023
January 2023
----- 2022 -----
December 2022
November 2022
October 2022
September 2022
August 2022
July 2022
June 2022
May 2022
April 2022
March 2022
February 2022
January 2022
----- 2021 -----
December 2021
November 2021
October 2021
September 2021
August 2021
July 2021
June 2021
May 2021
April 2021
March 2021
February 2021
January 2021
----- 2020 -----
December 2020
November 2020
October 2020
September 2020
August 2020
July 2020
June 2020
May 2020
April 2020
March 2020
February 2020
January 2020
----- 2019 -----
December 2019
November 2019
October 2019
September 2019
August 2019
July 2019
June 2019
May 2019
April 2019
March 2019
February 2019
January 2019
----- 2018 -----
December 2018
November 2018
October 2018
September 2018
August 2018
July 2018
June 2018
May 2018
April 2018
March 2018
February 2018
January 2018
----- 2017 -----
December 2017
November 2017
October 2017
September 2017
August 2017
July 2017
June 2017
May 2017
April 2017
March 2017
February 2017
January 2017
----- 2016 -----
December 2016
November 2016
October 2016
September 2016
August 2016
July 2016
June 2016
May 2016
April 2016
March 2016
February 2016
January 2016
----- 2015 -----
December 2015
November 2015
October 2015
September 2015
August 2015
July 2015
June 2015
May 2015
April 2015
March 2015
February 2015
January 2015
----- 2014 -----
December 2014
November 2014
October 2014
September 2014
August 2014
July 2014
June 2014
May 2014
April 2014
March 2014
February 2014
January 2014
----- 2013 -----
December 2013
November 2013
October 2013
September 2013
August 2013
July 2013
June 2013
May 2013
April 2013
March 2013
February 2013
January 2013
----- 2012 -----
December 2012
November 2012
October 2012
September 2012
August 2012
July 2012
June 2012
May 2012
April 2012
March 2012
February 2012
January 2012
----- 2011 -----
December 2011
November 2011
October 2011
September 2011
August 2011
July 2011
June 2011
May 2011
April 2011
March 2011
February 2011
January 2011
----- 2010 -----
December 2010
November 2010
October 2010
September 2010
August 2010
July 2010
June 2010
May 2010
April 2010
March 2010
February 2010
January 2010
----- 2009 -----
December 2009
November 2009
October 2009
September 2009
August 2009
July 2009
June 2009
May 2009
April 2009
March 2009
February 2009
January 2009
----- 2008 -----
December 2008
November 2008
October 2008
September 2008
August 2008
July 2008
June 2008
May 2008
April 2008
March 2008
February 2008
January 2008
----- 2007 -----
December 2007
November 2007
October 2007
September 2007
August 2007
July 2007
June 2007
May 2007
April 2007
March 2007
February 2007
January 2007
----- 2006 -----
December 2006
November 2006
October 2006
September 2006
August 2006
July 2006
June 2006
May 2006
April 2006
commits@gajim.org
5 participants
70 discussions
Start a n
N
ew thread
gajim: [Dicson] improve KDE4 notifications. Fixes #5940
by Yann Leboulanger
30 Sep '10
30 Sep '10
changeset 2244319acd41 in /home/hg/repos/gajim
details:http://hg.gajim.org/gajim?cmd=changeset;node=2244319acd41
description: [Dicson] improve KDE4 notifications. Fixes #5940 diffstat: src/notify.py | 8 ++++++++ 1 files changed, 8 insertions(+), 0 deletions(-) diffs (18 lines): diff -r 41d885b69263 -r 2244319acd41 src/notify.py --- a/src/notify.py Thu Sep 30 11:17:16 2010 +0200 +++ b/src/notify.py Thu Sep 30 22:36:55 2010 +0200 @@ -583,6 +583,14 @@ text = self.text else: text = ' ' + if os.environ.get('KDE_FULL_SESSION') == 'true': + self.path_to_image = os.path.abspath(self.path_to_image) + text = '<table style=\'padding: 3px\'><tr><td>' \ + '<img src=\"%s\"></td><td width=20> </td>' \ + '<td>%st4i</td></tr></table>' % (self.path_to_image, + text) + self.path_to_image = os.path.abspath( + gtkgui_helpers.get_icon_path('gajim', 48)) actions = () if 'actions' in self.capabilities: actions = (dbus.String('default'), dbus.String(
1
0
0
0
gajim: fix typo
by Yann Leboulanger
30 Sep '10
30 Sep '10
changeset 41d885b69263 in /home/hg/repos/gajim
details:http://hg.gajim.org/gajim?cmd=changeset;node=41d885b69263
description: fix typo diffstat: src/common/connection_handlers_events.py | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diffs (12 lines): diff -r a55fd8a287d0 -r 41d885b69263 src/common/connection_handlers_events.py --- a/src/common/connection_handlers_events.py Thu Sep 30 09:12:07 2010 +0200 +++ b/src/common/connection_handlers_events.py Thu Sep 30 11:17:16 2010 +0200 @@ -296,7 +296,7 @@ self.received_from_server = self.xmpp_roster.received_from_server self.roster = {} raw_roster = self.xmpp_roster.getRaw() - our_jid = gajim.get_jid_from_account(self.name) + our_jid = gajim.get_jid_from_account(self.conn.name) for jid in raw_roster: try:
1
0
0
0
gajim: remove ununsed signal from gtk builder file. Fixes #5954
by Yann Leboulanger
30 Sep '10
30 Sep '10
changeset a55fd8a287d0 in /home/hg/repos/gajim
details:http://hg.gajim.org/gajim?cmd=changeset;node=a55fd8a287d0
description: remove ununsed signal from gtk builder file. Fixes #5954 diffstat: data/gui/input_dialog.ui | 1 - 1 files changed, 0 insertions(+), 1 deletions(-) diffs (11 lines): diff -r a5662d22b8e7 -r a55fd8a287d0 data/gui/input_dialog.ui --- a/data/gui/input_dialog.ui Wed Sep 29 17:51:52 2010 +0200 +++ b/data/gui/input_dialog.ui Thu Sep 30 09:12:07 2010 +0200 @@ -7,7 +7,6 @@ <property name="type_hint">dialog</property> <property name="has_separator">False</property> <signal name="destroy" handler="on_input_dialog_destroy"/> - <signal name="delete_event" handler="on_input_dialog_delete_event"/> <child internal-child="vbox"> <object class="GtkVBox" id="dialog-vbox10"> <property name="visible">True</property>
1
0
0
0
gajim: show "room has been destroyed" only when it has been dest...
by Yann Leboulanger
29 Sep '10
29 Sep '10
changeset a5662d22b8e7 in /home/hg/repos/gajim
details:http://hg.gajim.org/gajim?cmd=changeset;node=a5662d22b8e7
description: show "room has been destroyed" only when it has been destroyed. Fixes #5952 diffstat: src/common/connection_handlers_events.py | 32 ++++++++++++++++---------------- 1 files changed, 16 insertions(+), 16 deletions(-) diffs (55 lines): diff -r 39f3e0c96e4e -r a5662d22b8e7 src/common/connection_handlers_events.py --- a/src/common/connection_handlers_events.py Tue Sep 28 22:38:42 2010 +0200 +++ b/src/common/connection_handlers_events.py Wed Sep 29 17:51:52 2010 +0200 @@ -883,11 +883,12 @@ jid = self.gc_contact.jid else: jid = self.iq_obj.getJid() + st = self.status if jid: # we know real jid, save it in db - self.status += ' (%s)' % jid + st += ' (%s)' % jid try: - gajim.logger.write('gcstatus', self.fjid, self.status, + gajim.logger.write('gcstatus', self.fjid, st, self.show) except exceptions.PysqliteOperationalError, e: self.conn.dispatch('DB_ERROR', (_('Disk Write Error'), @@ -908,23 +909,22 @@ # We may ask it to real jid in gui part. self.status_code = [] ns_muc_user_x = self.iq_obj.getTag('x', namespace=xmpp.NS_MUC_USER) - if ns_muc_user_x: + destroy = ns_muc_user_x.getTag('destroy') + if ns_muc_user_x and destroy: # Room has been destroyed. see #
http://www.xmpp.org/extensions/xep-0045.html#destroyroom
self.reason = _('Room has been destroyed') - destroy = ns_muc_user_x.getTag('destroy') - if destroy: - r = destroy.getTagData('reason') - if r: - self.reason += ' (%s)' % r - if destroy.getAttr('jid'): - try: - jid = helpers.parse_jid(destroy.getAttr('jid')) - self.reason += '\n' + \ - _('You can join this room instead: %s') % jid - except common.helpers.InvalidFormat: - pass - self.status_code = ['destroyed'] + r = destroy.getTagData('reason') + if r: + self.reason += ' (%s)' % r + if destroy.getAttr('jid'): + try: + jid = helpers.parse_jid(destroy.getAttr('jid')) + self.reason += '\n' + \ + _('You can join this room instead: %s') % jid + except common.helpers.InvalidFormat: + pass + self.status_code = ['destroyed'] else: self.reason = self.iq_obj.getReason() self.status_code = self.iq_obj.getStatusCode()
1
0
0
0
gajim: stop handling presences when we close a groupchat control...
by Yann Leboulanger
28 Sep '10
28 Sep '10
changeset 39f3e0c96e4e in /home/hg/repos/gajim
details:http://hg.gajim.org/gajim?cmd=changeset;node=39f3e0c96e4e
description: stop handling presences when we close a groupchat control. Fixes #5949 diffstat: src/groupchat_control.py | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diffs (13 lines): diff -r 4ed2ec3f80fc -r 39f3e0c96e4e src/groupchat_control.py --- a/src/groupchat_control.py Tue Sep 28 21:05:18 2010 +0200 +++ b/src/groupchat_control.py Tue Sep 28 22:38:42 2010 +0200 @@ -1684,6 +1684,9 @@ # Preventing autorejoin from being activated self.autorejoin = False + gajim.ged.remove_event_handler('gc-presence-received', ged.GUI1, + self._nec_gc_presence_received) + if self.room_jid in gajim.gc_connected[self.account] and \ gajim.gc_connected[self.account][self.room_jid]: # Tell connection to note the date we disconnect to avoid duplicate
1
0
0
0
gajim: import hmac where it needs to be. Fixes #5948
by Yann Leboulanger
28 Sep '10
28 Sep '10
changeset 4ed2ec3f80fc in /home/hg/repos/gajim
details:http://hg.gajim.org/gajim?cmd=changeset;node=4ed2ec3f80fc
description: import hmac where it needs to be. Fixes #5948 diffstat: src/common/connection_handlers.py | 1 - src/common/connection_handlers_events.py | 1 + 2 files changed, 1 insertions(+), 1 deletions(-) diffs (22 lines): diff -r 809a9f9de21a -r 4ed2ec3f80fc src/common/connection_handlers.py --- a/src/common/connection_handlers.py Tue Sep 28 15:51:26 2010 +0200 +++ b/src/common/connection_handlers.py Tue Sep 28 21:05:18 2010 +0200 @@ -33,7 +33,6 @@ import sys import operator import hashlib -import hmac from time import (altzone, daylight, gmtime, localtime, mktime, strftime, time as time_time, timezone, tzname) diff -r 809a9f9de21a -r 4ed2ec3f80fc src/common/connection_handlers_events.py --- a/src/common/connection_handlers_events.py Tue Sep 28 15:51:26 2010 +0200 +++ b/src/common/connection_handlers_events.py Tue Sep 28 21:05:18 2010 +0200 @@ -22,6 +22,7 @@ import sys from time import (localtime, time as time_time) from calendar import timegm +import hmac from common import nec from common import helpers
1
0
0
0
gajim: fix some tracebacks when adding / removing a contact. Fix...
by Yann Leboulanger
28 Sep '10
28 Sep '10
changeset 809a9f9de21a in /home/hg/repos/gajim
details:http://hg.gajim.org/gajim?cmd=changeset;node=809a9f9de21a
description: fix some tracebacks when adding / removing a contact. Fixes #5946 diffstat: src/common/connection_handlers.py | 5 +++-- src/common/connection_handlers_events.py | 2 +- 2 files changed, 4 insertions(+), 3 deletions(-) diffs (34 lines): diff -r 410bd743ad79 -r 809a9f9de21a src/common/connection_handlers.py --- a/src/common/connection_handlers.py Tue Sep 28 15:21:34 2010 +0200 +++ b/src/common/connection_handlers.py Tue Sep 28 15:51:26 2010 +0200 @@ -1773,7 +1773,8 @@ break if obj.contact: - obj.old_show = statuss.index(obj.contact.show) + if obj.contact.show in statuss: + obj.old_show = statuss.index(obj.contact.show) # nick changed if obj.contact_nickname is not None and \ obj.contact.contact_name != obj.contact_nickname: @@ -1800,7 +1801,7 @@ resource=obj.resource) gajim.contacts.add_contact(account, obj.contact) obj.contact_list.append(obj.contact) - else: + elif obj.contact.show in statuss: obj.old_show = statuss.index(obj.contact.show) if (resources != [''] and (len(obj.contact_list) != 1 or \ obj.contact_list[0].show != 'offline')) and \ diff -r 410bd743ad79 -r 809a9f9de21a src/common/connection_handlers_events.py --- a/src/common/connection_handlers_events.py Tue Sep 28 15:21:34 2010 +0200 +++ b/src/common/connection_handlers_events.py Tue Sep 28 15:51:26 2010 +0200 @@ -772,7 +772,7 @@ gajim.config.set_per('account', self.conn.name, 'dont_ack_subscription', True) else: - self.dispatch('UNSUBSCRIBED', self.jid) + self.conn.dispatch('UNSUBSCRIBED', self.jid) elif self.ptype == 'error': errmsg = self.iq_obj.getError() errcode = self.iq_obj.getErrorCode()
1
0
0
0
gajim: fix traceback when opening add contact dialog. Fixes #5945
by Yann Leboulanger
28 Sep '10
28 Sep '10
changeset 410bd743ad79 in /home/hg/repos/gajim
details:http://hg.gajim.org/gajim?cmd=changeset;node=410bd743ad79
description: fix traceback when opening add contact dialog. Fixes #5945 diffstat: src/dialogs.py | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diffs (11 lines): diff -r 54e155704bb0 -r 410bd743ad79 src/dialogs.py --- a/src/dialogs.py Tue Sep 28 15:13:51 2010 +0200 +++ b/src/dialogs.py Tue Sep 28 15:21:34 2010 +0200 @@ -42,6 +42,7 @@ from random import randrange from common import pep +from common import ged try: import gtkspell
1
0
0
0
gajim: new event for groupchat presences
by Yann Leboulanger
28 Sep '10
28 Sep '10
changeset 54e155704bb0 in /home/hg/repos/gajim
details:http://hg.gajim.org/gajim?cmd=changeset;node=54e155704bb0
description: new event for groupchat presences diffstat: src/common/connection_handlers_events.py | 231 ++++++++++++---------------- src/groupchat_control.py | 240 +++++++++++++++--------------- src/gui_interface.py | 121 +++++++++----- 3 files changed, 298 insertions(+), 294 deletions(-) diffs (truncated from 881 to 300 lines): diff -r c821dd3af25f -r 54e155704bb0 src/common/connection_handlers_events.py --- a/src/common/connection_handlers_events.py Fri Sep 24 23:15:21 2010 +0200 +++ b/src/common/connection_handlers_events.py Tue Sep 28 15:13:51 2010 +0200 @@ -636,8 +636,7 @@ self.get_id() self.is_gc = False # is it a GC presence ? sigTag = None - ns_muc_user_x = None - avatar_sha = None + self.avatar_sha = None # XEP-0172 User Nickname self.user_nick = self.iq_obj.getTagData('nick') or '' self.contact_nickname = None @@ -653,12 +652,10 @@ namespace = x.getNamespace() if namespace.startswith(xmpp.NS_MUC): self.is_gc = True - if namespace == xmpp.NS_MUC_USER and x.getTag('destroy'): - ns_muc_user_x = x elif namespace == xmpp.NS_SIGNED: sigTag = x elif namespace == xmpp.NS_VCARD_UPDATE: - avatar_sha = x.getTagData('photo') + self.avatar_sha = x.getTagData('photo') self.contact_nickname = x.getTagData('nickname') elif namespace == xmpp.NS_DELAY and not self.timestamp: # XEP-0091 @@ -703,133 +700,12 @@ self.jid, self.keyID) if self.is_gc: - if self.ptype == 'error': - errcon = self.iq_obj.getError() - errmsg = self.iq_obj.getErrorMsg() - errcode = self.iq_obj.getErrorCode() - - gc_control = gajim.interface.msg_win_mgr.get_gc_control( - self.jid, self.conn.name) - - # If gc_control is missing - it may be minimized. Try to get it - # from there. If it's not there - then it's missing anyway and - # will remain set to None. - if gc_control is None: - minimized = gajim.interface.minimized_controls[ - self.conn.name] - gc_control = minimized.get(self.jid) - - if errcode == '502': - # Internal Timeout: - self.show = 'error' - self.status = errmsg - return True - elif errcode == '503': - if gc_control is None or gc_control.autorejoin is None: - # maximum user number reached - self.conn.dispatch('GC_ERROR', (gc_control, - _('Unable to join group chat'), - _('Maximum number of users for %s has been ' - 'reached') % self.jid)) - elif (errcode == '401') or (errcon == 'not-authorized'): - # password required to join - self.conn.dispatch('GC_PASSWORD_REQUIRED', (self.jid, - self.resource)) - elif (errcode == '403') or (errcon == 'forbidden'): - # we are banned - self.conn.dispatch('GC_ERROR', (gc_control, - _('Unable to join group chat'), - _('You are banned from group chat %s.') % self.jid)) - elif (errcode == '404') or (errcon in ('item-not-found', - 'remote-server-not-found')): - if gc_control is None or gc_control.autorejoin is None: - # group chat does not exist - self.conn.dispatch('GC_ERROR', (gc_control, - _('Unable to join group chat'), - _('Group chat %s does not exist.') % self.jid)) - elif (errcode == '405') or (errcon == 'not-allowed'): - self.conn.dispatch('GC_ERROR', (gc_control, - _('Unable to join group chat'), - _('Group chat creation is restricted.'))) - elif (errcode == '406') or (errcon == 'not-acceptable'): - self.conn.dispatch('GC_ERROR', (gc_control, - _('Unable to join group chat'), - _('Your registered nickname must be used in group chat ' - '%s.') % self.jid)) - elif (errcode == '407') or (errcon == 'registration-required'): - self.conn.dispatch('GC_ERROR', (gc_control, - _('Unable to join group chat'), - _('You are not in the members list in groupchat %s.') %\ - self.jid)) - elif (errcode == '409') or (errcon == 'conflict'): - # nick conflict - self.conn.dispatch('ASK_NEW_NICK', (self.jid,)) - else: # print in the window the error - self.conn.dispatch('ERROR_ANSWER', ('', self.jid, - errmsg, errcode)) - elif not self.ptype or self.ptype == 'unavailable': - if gajim.config.get('log_contact_status_changes') and \ - gajim.config.should_log(self.conn.name, self.jid): - gc_c = gajim.contacts.get_gc_contact(self.conn.name, - self.jid, self.resource) - st = self.status or '' - if gc_c: - jid = gc_c.jid - else: - jid = self.iq_obj.getJid() - if jid: - # we know real jid, save it in db - st += ' (%s)' % jid - try: - gajim.logger.write('gcstatus', self.fjid, st, self.show) - except exceptions.PysqliteOperationalError, e: - self.conn.dispatch('DB_ERROR', (_('Disk Write Error'), - str(e))) - except exceptions.DatabaseMalformed: - pritext = _('Database Error') - sectext = _('The database file (%s) cannot be read. ' - 'Try to repair it (see ' - '
http://trac.gajim.org/wiki/DatabaseBackup
) or ' - 'remove it (all history will be lost).') % \ - LOG_DB_PATH - self.conn.dispatch('DB_ERROR', (pritext, sectext)) - if avatar_sha == '': - # contact has no avatar - puny_nick = helpers.sanitize_filename(self.resource) - gajim.interface.remove_avatar_files(self.jid, puny_nick) - # NOTE: if it's a gc presence, don't ask vcard here. - # We may ask it to real jid in gui part. - if ns_muc_user_x: - # Room has been destroyed. see - #
http://www.xmpp.org/extensions/xep-0045.html#destroyroom
- reason = _('Room has been destroyed') - destroy = ns_muc_user_x.getTag('destroy') - r = destroy.getTagData('reason') - if r: - reason += ' (%s)' % r - if destroy.getAttr('jid'): - try: - jid = helpers.parse_jid(destroy.getAttr('jid')) - reason += '\n' + \ - _('You can join this room instead: %s') % jid - except common.helpers.InvalidFormat: - pass - statusCode = ['destroyed'] - else: - reason = self.iq_obj.getReason() - statusCode = self.iq_obj.getStatusCode() - role = self.iq_obj.getRole() - affiliation = self.iq_obj.getAffiliation() - prs_jid = self.iq_obj.getJid() - actor = self.iq_obj.getActor() - new_nick = self.iq_obj.getNewNick() - self.conn.dispatch('GC_NOTIFY', (self.jid, self.show, - self.status, self.resource, role, affiliation, prs_jid, - reason, actor, statusCode, new_nick, avatar_sha)) + gajim.nec.push_incoming_event(GcPresenceReceivedEvent(None, + conn=self.conn, iq_obj=self.iq_obj, presence_obj=self)) return if self.ptype == 'subscribe': - log.debug('subscribe request from %s' % self.jfid) + log.debug('subscribe request from %s' % self.fjid) if self.fjid.find('@') <= 0 and self.fjid in \ self.conn.agent_registrations: self.conn.agent_registrations[self.fjid]['sub_received'] = True @@ -929,7 +805,7 @@ sess.terminate() del self.conn.sessions[jid][sess.thread_id] - if avatar_sha is not None and self.ptype != 'error': + if self.avatar_sha is not None and self.ptype != 'error': if self.jid not in self.conn.vcard_shas: cached_vcard = self.conn.get_cached_vcard(self.jid) if cached_vcard and 'PHOTO' in cached_vcard and \ @@ -938,7 +814,7 @@ cached_vcard['PHOTO']['SHA'] else: self.conn.vcard_shas[self.jid] = '' - if avatar_sha != self.conn.vcard_shas[self.jid]: + if self.avatar_sha != self.conn.vcard_shas[self.jid]: # avatar has been updated self.conn.request_vcard(self.jid) @@ -964,3 +840,96 @@ self.conn.dispatch('STATUS', self.show) elif self.jid in jid_list: return True + +class GcPresenceReceivedEvent(nec.NetworkIncomingEvent): + name = 'gc-presence-received' + base_network_events = [] + + def get_gc_control(self): + self.gc_control = gajim.interface.msg_win_mgr.get_gc_control( + self.room_jid, self.conn.name) + + # If gc_control is missing - it may be minimized. Try to get it + # from there. If it's not there - then it's missing anyway and + # will remain set to None. + if not self.gc_control: + minimized = gajim.interface.minimized_controls[self.conn.name] + self.gc_control = minimized.get(self.room_jid) + + def generate(self): + self.ptype = self.presence_obj.ptype + self.fjid = self.presence_obj.fjid + self.room_jid = self.presence_obj.jid + self.nick = self.presence_obj.resource + self.show = self.presence_obj.show + self.status = self.presence_obj.status + self.avatar_sha = self.presence_obj.avatar_sha + self.errcon = self.iq_obj.getError() + self.errmsg = self.iq_obj.getErrorMsg() + self.errcode = self.iq_obj.getErrorCode() + self.get_gc_control() + self.gc_contact = gajim.contacts.get_gc_contact(self.conn.name, + self.room_jid, self.nick) + + if self.ptype == 'error': + return True + + if self.ptype and self.ptype != 'unavailable': + return + if gajim.config.get('log_contact_status_changes') and \ + gajim.config.should_log(self.conn.name, self.room_jid): + if self.gc_contact: + jid = self.gc_contact.jid + else: + jid = self.iq_obj.getJid() + if jid: + # we know real jid, save it in db + self.status += ' (%s)' % jid + try: + gajim.logger.write('gcstatus', self.fjid, self.status, + self.show) + except exceptions.PysqliteOperationalError, e: + self.conn.dispatch('DB_ERROR', (_('Disk Write Error'), + str(e))) + except exceptions.DatabaseMalformed: + pritext = _('Database Error') + sectext = _('The database file (%s) cannot be read. ' + 'Try to repair it (see ' + '
http://trac.gajim.org/wiki/DatabaseBackup
) or ' + 'remove it (all history will be lost).') % \ + LOG_DB_PATH + self.conn.dispatch('DB_ERROR', (pritext, sectext)) + if self.avatar_sha == '': + # contact has no avatar + puny_nick = helpers.sanitize_filename(self.nick) + gajim.interface.remove_avatar_files(self.room_jid, puny_nick) + # NOTE: if it's a gc presence, don't ask vcard here. + # We may ask it to real jid in gui part. + self.status_code = [] + ns_muc_user_x = self.iq_obj.getTag('x', namespace=xmpp.NS_MUC_USER) + if ns_muc_user_x: + # Room has been destroyed. see + #
http://www.xmpp.org/extensions/xep-0045.html#destroyroom
+ self.reason = _('Room has been destroyed') + destroy = ns_muc_user_x.getTag('destroy') + if destroy: + r = destroy.getTagData('reason') + if r: + self.reason += ' (%s)' % r + if destroy.getAttr('jid'): + try: + jid = helpers.parse_jid(destroy.getAttr('jid')) + self.reason += '\n' + \ + _('You can join this room instead: %s') % jid + except common.helpers.InvalidFormat: + pass + self.status_code = ['destroyed'] + else: + self.reason = self.iq_obj.getReason() + self.status_code = self.iq_obj.getStatusCode() + self.role = self.iq_obj.getRole() + self.affiliation = self.iq_obj.getAffiliation() + self.real_jid = self.iq_obj.getJid() + self.actor = self.iq_obj.getActor() + self.new_nick = self.iq_obj.getNewNick() + return True diff -r c821dd3af25f -r 54e155704bb0 src/groupchat_control.py --- a/src/groupchat_control.py Fri Sep 24 23:15:21 2010 +0200 +++ b/src/groupchat_control.py Tue Sep 28 15:13:51 2010 +0200 @@ -45,6 +45,7 @@ from common import gajim from common import helpers from common import dataforms +from common import ged from chat_control import ChatControl from chat_control import ChatControlBase @@ -388,9 +389,11 @@ self.list_treeview.set_expander_column(column) self.setup_seclabel(self.xml.get_object('label_selector')) - + self.form_widget = None + gajim.ged.register_event_handler('gc-presence-received', ged.GUI1, + self._nec_gc_presence_received)
1
0
0
0
gajim-website: update opensuse links. Fixes #5939
by Yann Leboulanger
26 Sep '10
26 Sep '10
changeset 32dfc26d7042 in /home/hg/repos/gajim-website
details:http://hg.gajim.org/gajim-website?cmd=changeset;node=32dfc26d7042
description: update opensuse links. Fixes #5939 diffstat: downloads.php | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diffs (15 lines): diff -r 035edf75639c -r 32dfc26d7042 downloads.php --- a/downloads.php Thu Sep 02 21:37:31 2010 +0200 +++ b/downloads.php Sun Sep 26 14:16:35 2010 +0200 @@ -72,9 +72,9 @@ print _(" SUSE\n"); print (" </h2>\n"); print ("</a>\n"); -print _(" openSuSE 11: ")."<a href=\"
http://software.opensuse.org/ymp/server:messaging/openSUSE_11.0/gajim.ymp\
">"._("one click install")."</a><br/>"; +print _(" One click install for openSuSE")." <a href=\"
http://software.opensuse.org/ymp/server:messaging/openSUSE_11.1/gajim.ymp\
">11.1</a>, <a href=\"
http://software.opensuse.org/ymp/server:messaging/openSUSE_11.2/gajim.ymp\
">11.2</a>, <a href=\"
http://software.opensuse.org/ymp/server:messaging/openSUSE_11.3/gajim.ymp\
">11.3</a><br/>"; //print _("or")."<br/><a href=\"
http://download.opensuse.org/repositories/server:/messaging/openSUSE_11.0/i…
">"._("gajim rpm")."</a> "."<a href=\"
http://download.opensuse.org/repositories/server:/mail/openSUSE_11.0/i586/p…
">"._("pydns rpm")."</a> "._("and")."<a href=\"
http://download.opensuse.org/repositories/openSUSE:/11.0/standard/i586/pyth…
"> "._("python-sqlite2 rpm")."</a><br/>\n"; -print _(" openSuSE 10.x: ")."<a href=\"
http://software.opensuse.org/Search\
">"._("get it here")."</a><br>\n"; +print _(" For other versions, ")."<a href=\"
http://software.opensuse.org/Search\
">"._("get it here")."</a><br>\n"; print ("<a name=\"pld\">\n"); print (" <h2>\n");
1
0
0
0
← Newer
1
2
3
4
5
6
7
Older →
Jump to page:
1
2
3
4
5
6
7
Results per page:
10
25
50
100
200