Commits July 2009

commits@gajim.org

5 participants
169 discussions

gajim: fix missing var in zeroconf
by Yann Leboulanger 16 Jul '09

16 Jul '09

changeset ab443200eabe in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=ab443200eabe description: fix missing var in zeroconf diffstat: src/common/zeroconf/client_zeroconf.py | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diffs (11 lines): diff -r 2cd211972bca -r ab443200eabe src/common/zeroconf/client_zeroconf.py --- a/src/common/zeroconf/client_zeroconf.py Thu Jul 16 15:29:07 2009 +0200 +++ b/src/common/zeroconf/client_zeroconf.py Thu Jul 16 17:22:34 2009 +0200 @@ -176,6 +176,7 @@ self.stanzaqueue.append((stanza, is_message)) if is_message: + thread_id = stanza.getThread() id_ = stanza.getID() if not id_: id_ = self.Dispatcher.getAnID()

1 0

gajim: detect and send all our local IPs from local DNS. Fixes #...
by Yann Leboulanger 16 Jul '09

16 Jul '09

changeset 2cd211972bca in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=2cd211972bca description: detect and send all our local IPs from local DNS. Fixes #4249 diffstat: src/common/connection_handlers.py | 18 ++++++++++++------ 1 files changed, 12 insertions(+), 6 deletions(-) diffs (28 lines): diff -r 0c2f1f04a96b -r 2cd211972bca src/common/connection_handlers.py --- a/src/common/connection_handlers.py Thu Jul 16 14:53:14 2009 +0200 +++ b/src/common/connection_handlers.py Thu Jul 16 15:29:07 2009 +0200 @@ -227,12 +227,18 @@ ostreamhost.setAttr('host', ft_host) ostreamhost.setAttr('jid', sender) try: - thehost = self.peerhost[0] - streamhost = common.xmpp.Node(tag = 'streamhost') # My IP - query.addChild(node = streamhost) - streamhost.setAttr('port', unicode(port)) - streamhost.setAttr('host', thehost) - streamhost.setAttr('jid', sender) + # The ip we're connected to server with + my_ips = [self.peerhost[0]] + # all IPs from local DNS + for addr in socket.getaddrinfo(socket.gethostname(), None): + if not addr[4][0] in my_ips: + my_ips.append(addr[4][0]) + for ip in my_ips: + streamhost = common.xmpp.Node(tag = 'streamhost') + query.addChild(node = streamhost) + streamhost.setAttr('port', unicode(port)) + streamhost.setAttr('host', ip) + streamhost.setAttr('jid', sender) except socket.gaierror: self.dispatch('ERROR', (_('Wrong host'), _('Invalid local address? :-O')))

1 0

gajim: don't remove occupant from room roster when we try to cha...
by Yann Leboulanger 16 Jul '09

16 Jul '09

changeset 0c2f1f04a96b in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=0c2f1f04a96b description: don't remove occupant from room roster when we try to change our nick to the occupant's nick. Fixes #5120 diffstat: src/common/connection_handlers.py | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-) diffs (15 lines): diff -r e07c087c2e4f -r 0c2f1f04a96b src/common/connection_handlers.py --- a/src/common/connection_handlers.py Thu Jul 16 12:27:53 2009 +0200 +++ b/src/common/connection_handlers.py Thu Jul 16 14:53:14 2009 +0200 @@ -2383,8 +2383,9 @@ # print in the window the error self.dispatch('ERROR_ANSWER', ('', jid_stripped, errmsg, errcode)) - self.dispatch('NOTIFY', (jid_stripped, 'error', errmsg, resource, prio, - keyID, timestamp, None)) + if errcode != '409': # conflict # See #5120 + self.dispatch('NOTIFY', (jid_stripped, 'error', errmsg, resource, + prio, keyID, timestamp, None)) if ptype == 'unavailable' and jid_stripped in self.sessions: # automatically terminate sessions that they haven't sent a thread ID

1 0

gajim: prevent traceback when kwalletcli is not available. see #...
by Yann Leboulanger 16 Jul '09

16 Jul '09

changeset e07c087c2e4f in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=e07c087c2e4f description: prevent traceback when kwalletcli is not available. see #5153 diffstat: src/common/kwalletbinding.py | 5 ++++- 1 files changed, 4 insertions(+), 1 deletions(-) diffs (15 lines): diff -r 6c332dd9e795 -r e07c087c2e4f src/common/kwalletbinding.py --- a/src/common/kwalletbinding.py Wed Jul 15 21:02:47 2009 +0200 +++ b/src/common/kwalletbinding.py Thu Jul 16 12:27:53 2009 +0200 @@ -26,7 +26,10 @@ def kwallet_available(): """Return True if kwalletcli can be run, False otherwise.""" - p = subprocess.Popen(["kwalletcli", "-qV"]) + try: + p = subprocess.Popen(["kwalletcli", "-qV"]) + except Exception: + return False p.communicate() if p.returncode == 0: return True

1 0

gajim: Circle drawing xml sent (hopefully) correctly now
by Ummu 16 Jul '09

16 Jul '09

changeset 19f0ee88d090 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=19f0ee88d090 description: Circle drawing xml sent (hopefully) correctly now diffstat: src/whiteboardwidget.py | 48 ++++++++++++++++++++++++++++++++++++++---------- 1 files changed, 38 insertions(+), 10 deletions(-) diffs (77 lines): diff -r 9c358f48cb12 -r 19f0ee88d090 src/whiteboardwidget.py --- a/src/whiteboardwidget.py Thu Jul 16 03:11:33 2009 -0700 +++ b/src/whiteboardwidget.py Thu Jul 16 03:27:32 2009 -0700 @@ -79,7 +79,6 @@ radius_x=abs(x - self.item_temp_coords[0]) / 2, radius_y=abs(y - self.item_temp_coords[1]) / 2, stroke_color='black', - fill_color='white', line_width=self.line_width) def button_release_event(self, widget, event): @@ -96,19 +95,16 @@ radius_x=1, radius_y=1, stroke_color='black', - fill_color='white', + fill_color='black', line_width=self.line_width) self.image.add_path(self.item_data, self.line_width) if self.draw_tool == 'oval': - self.item_temp = goocanvas.Ellipse(parent=self.root, - center_x=self.item_temp_coords[0] + (x - self.item_temp_coords[0]) / 2, - center_y=self.item_temp_coords[1] + (y - self.item_temp_coords[1]) / 2, - radius_x=abs(x - self.item_temp_coords[0]) / 2, - radius_y=abs(y - self.item_temp_coords[1]) / 2, - stroke_color='black', - fill_color='white', - line_width=self.line_width) + cx = self.item_temp_coords[0] + (x - self.item_temp_coords[0]) / 2 + cy = self.item_temp_coords[1] + (y - self.item_temp_coords[1]) / 2 + rx = abs(x - self.item_temp_coords[0]) / 2 + ry = abs(y - self.item_temp_coords[1]) / 2 + self.image.add_ellipse(cx, cy, rx, ry, self.line_width) self.item_data = None if self.item_temp is not None: @@ -163,7 +159,39 @@ self.items[rids[3]] = {'type':'attr', 'data':'stroke', 'parent':node} self.session.send_items(self.items, rids) + + def add_ellipse(self, cx, cy, rx, ry, line_width): + ''' adds the ellipse to the items listing, both minidom node and goocanvas + object in a tuple ''' + goocanvas_obj = goocanvas.Ellipse(parent=self.root, + center_x=cx, + center_y=cy, + radius_x=rx, + radius_y=ry, + stroke_color='black', + line_width=line_width) + + node = self.g.addChild(name='ellipse') + node.setAttr('cx', str(cx)) + node.setAttr('cy', str(cy)) + node.setAttr('rx', str(rx)) + node.setAttr('ry', str(ry)) + node.setAttr('stroke-width', str(line_width)) + node.setAttr('stroke', 'black') + self.g.addChild(node=node) + + rids = self.session.generate_rids(7) + self.items[rids[0]] = {'type':'element', 'data':[node, goocanvas_obj]} + self.items[rids[1]] = {'type':'attr', 'data':'cx', 'parent':node} + self.items[rids[2]] = {'type':'attr', 'data':'cy', 'parent':node} + self.items[rids[3]] = {'type':'attr', 'data':'rx', 'parent':node} + self.items[rids[4]] = {'type':'attr', 'data':'ry', 'parent':node} + self.items[rids[5]] = {'type':'attr', 'data':'stroke-width', 'parent':node} + self.items[rids[6]] = {'type':'attr', 'data':'stroke', 'parent':node} + + self.session.send_items(self.items, rids) + def print_xml(self): file = open('whiteboardtest.svg','w') file.writelines(str(self.svg, True))

1 0

gajim: Circle drawing, does not send xml yet
by Ummu 16 Jul '09

16 Jul '09

changeset 9c358f48cb12 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=9c358f48cb12 description: Circle drawing, does not send xml yet diffstat: src/chat_control.py | 3 +++ src/whiteboardwidget.py | 34 +++++++++++++++++++++++++++------- 2 files changed, 30 insertions(+), 7 deletions(-) diffs (90 lines): diff -r 01038a1fc5ea -r 9c358f48cb12 src/chat_control.py --- a/src/chat_control.py Wed Jul 08 05:02:03 2009 -0700 +++ b/src/chat_control.py Thu Jul 16 03:11:33 2009 -0700 @@ -2755,6 +2755,9 @@ try: hbox.pack_start(whiteboard) whiteboard.show() + # set minimum size + whiteboard.set_size_request(300, 0) + hbox.pack_start(whiteboard, expand=False, fill=False) except: pass # TODO: Fix problem with groupchat? diff -r 01038a1fc5ea -r 9c358f48cb12 src/whiteboardwidget.py --- a/src/whiteboardwidget.py Wed Jul 08 05:02:03 2009 -0700 +++ b/src/whiteboardwidget.py Thu Jul 16 03:11:33 2009 -0700 @@ -28,8 +28,8 @@ self.connect('key-press-event', self.key_press_event) # Config - self.draw_tool = 'brush' - self.line_width = 10 + self.draw_tool = 'oval' + self.line_width = 2 # SVG Storage # TODO: get height width info @@ -48,7 +48,6 @@ self.item_temp_coords = (x,y) if self.draw_tool == 'brush': - self.item_data = 'M %s,%s ' % (x, y) self.item_temp = goocanvas.Ellipse(parent=self.root, center_x=x, center_y=y, @@ -57,7 +56,9 @@ stroke_color='black', fill_color='black', line_width=self.line_width) - self.item_data = self.item_data + 'L ' + self.item_data = 'M %s,%s L ' % (x, y) + elif self.draw_tool == 'oval': + self.item_data = True def motion_notify_event(self, widget, event): x = event.x @@ -66,11 +67,20 @@ if self.item_temp is not None: self.item_temp.remove() - if self.draw_tool == 'brush': - if self.item_data is not None: + if self.item_data is not None: + if self.draw_tool == 'brush': self.item_data = self.item_data + '%s,%s ' % (x, y) self.item_temp = goocanvas.Path(parent=self.root, data=self.item_data, line_width=self.line_width) + elif self.draw_tool == 'oval': + self.item_temp = goocanvas.Ellipse(parent=self.root, + center_x=self.item_temp_coords[0] + (x - self.item_temp_coords[0]) / 2, + center_y=self.item_temp_coords[1] + (y - self.item_temp_coords[1]) / 2, + radius_x=abs(x - self.item_temp_coords[0]) / 2, + radius_y=abs(y - self.item_temp_coords[1]) / 2, + stroke_color='black', + fill_color='white', + line_width=self.line_width) def button_release_event(self, widget, event): x = event.x @@ -86,9 +96,19 @@ radius_x=1, radius_y=1, stroke_color='black', - fill_color='black', + fill_color='white', line_width=self.line_width) self.image.add_path(self.item_data, self.line_width) + + if self.draw_tool == 'oval': + self.item_temp = goocanvas.Ellipse(parent=self.root, + center_x=self.item_temp_coords[0] + (x - self.item_temp_coords[0]) / 2, + center_y=self.item_temp_coords[1] + (y - self.item_temp_coords[1]) / 2, + radius_x=abs(x - self.item_temp_coords[0]) / 2, + radius_y=abs(y - self.item_temp_coords[1]) / 2, + stroke_color='black', + fill_color='white', + line_width=self.line_width) self.item_data = None if self.item_temp is not None:

1 0

gajim: [mirabilos] save password in kwallet is available. Fixes ...
by Yann Leboulanger 15 Jul '09

15 Jul '09

changeset 6c332dd9e795 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=6c332dd9e795 description: [mirabilos] save password in kwallet is available. Fixes #5153 diffstat: src/common/config.py | 1 + src/common/kwalletbinding.py | 75 +++++++++++++++++++++++++++++++++++++ src/common/passwords.py | 66 +++++++++++++++++++++++++++++---- src/features_window.py | 9 +++- 4 files changed, 140 insertions(+), 11 deletions(-) diffs (240 lines): diff -r 130d308b573a -r 6c332dd9e795 src/common/config.py --- a/src/common/config.py Tue Jul 14 18:48:24 2009 +0200 +++ b/src/common/config.py Wed Jul 15 21:02:47 2009 +0200 @@ -247,6 +247,7 @@ 'confirm_metacontacts': [ opt_str, '', _('Should we show the confirm metacontacts creation dialog or not? Empty string means we never show the dialog.')], 'enable_negative_priority': [ opt_bool, False, _('If True, you will be able to set a negative priority to your account in account modification window. BE CAREFUL, when you are logged in with a negative priority, you will NOT receive any message from your server.')], 'use_gnomekeyring': [opt_bool, True, _('If True, Gajim will use Gnome Keyring (if available) to store account passwords.')], + 'use_kwalletcli': [opt_bool, True, _('If True, Gajim will use KDE Wallet (if kwalletcli is available) to store account passwords.')], 'show_contacts_number': [opt_bool, True, _('If True, Gajim will show number of online and total contacts in account and group rows.')], 'treat_incoming_messages': [ opt_str, '', _('Can be empty, \'chat\' or \'normal\'. If not empty, treat all incoming messages as if they were of this type')], 'scroll_roster_to_last_message': [opt_bool, True, _('If True, Gajim will scroll and select the contact who sent you the last message, if chat window is not already opened.')], diff -r 130d308b573a -r 6c332dd9e795 src/common/kwalletbinding.py --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/common/kwalletbinding.py Wed Jul 15 21:02:47 2009 +0200 @@ -0,0 +1,75 @@ +# -*- coding:utf-8 -*- +## src/common/kwalletbinding.py +## +## Copyright (c) 2009 Thorsten Glaser <t.glaser AT tarent.de> +## +## This file is part of Gajim. +## +## Gajim is free software; you can redistribute it and/or modify +## it under the terms of the GNU General Public License as published +## by the Free Software Foundation; version 3 only. This file is +## also available under the terms of The MirOS Licence. +## +## Gajim is distributed in the hope that it will be useful, +## but WITHOUT ANY WARRANTY; without even the implied warranty of +## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +## GNU General Public License for more details. +## +## You should have received a copy of the GNU General Public License +## along with Gajim. If not, see <http://www.gnu.org/licenses/>. +## + +__all__ = ['kwallet_available', 'kwallet_get', 'kwallet_put'] + +import subprocess + + +def kwallet_available(): + """Return True if kwalletcli can be run, False otherwise.""" + p = subprocess.Popen(["kwalletcli", "-qV"]) + p.communicate() + if p.returncode == 0: + return True + return False + + +def kwallet_get(folder, entry): + """Retrieve a passphrase from the KDE Wallet via kwalletcli. + + Arguments: + • folder: The top-level category to use (normally the programme name) + • entry: The key of the entry to retrieve + + Returns the passphrase as unicode, False if it cannot be found, + or None if an error occured. + + """ + p = subprocess.Popen(["kwalletcli", "-q", "-f", folder.encode('utf-8'), + "-e", entry.encode('utf-8')], stdout=subprocess.PIPE) + pw = p.communicate()[0] + if p.returncode == 0: + return unicode(pw.decode('utf-8')) + if p.returncode == 1 or p.returncode == 4: + # ENOENT + return False + # error + return None + + +def kwallet_put(folder, entry, passphrase): + """Store a passphrase into the KDE Wallet via kwalletcli. + + Arguments: + • folder: The top-level category to use (normally the programme name) + • entry: The key of the entry to store + • passphrase: The value to store + + Returns True on success, False otherwise. + + """ + p = subprocess.Popen(["kwalletcli", "-q", "-f", folder.encode('utf-8'), + "-e", entry.encode('utf-8'), "-P"], stdin=subprocess.PIPE) + p.communicate(passphrase.encode('utf-8')) + if p.returncode == 0: + return True + return False diff -r 130d308b573a -r 6c332dd9e795 src/common/passwords.py --- a/src/common/passwords.py Tue Jul 14 18:48:24 2009 +0200 +++ b/src/common/passwords.py Wed Jul 15 21:02:47 2009 +0200 @@ -7,6 +7,7 @@ ## Copyright (C) 2007 Jean-Marie Traissard <jim AT lapin.org> ## Julien Pivotto <roidelapluie AT gmail.com> ## Copyright (C) 2008 Stephan Erb <steve-e AT h3c.de> +## Copyright (c) 2009 Thorsten Glaser <t.glaser AT tarent.de> ## ## This file is part of Gajim. ## @@ -27,9 +28,11 @@ import warnings from common import gajim +from common import kwalletbinding USER_HAS_GNOMEKEYRING = False USER_USES_GNOMEKEYRING = False +USER_HAS_KWALLETCLI = False gnomekeyring = None class PasswordStorage(object): @@ -42,8 +45,11 @@ class SimplePasswordStorage(PasswordStorage): def get_password(self, account_name): passwd = gajim.config.get_per('accounts', account_name, 'password') - if passwd and passwd.startswith('gnomekeyring:'): - return None # this is not a real password, it's a gnome keyring token + if passwd and (passwd.startswith('gnomekeyring:') or \ + passwd == '<kwallet>'): + # this is not a real password, it's either a gnome + # keyring token or stored in the KDE wallet + return None else: return passwd @@ -65,7 +71,7 @@ def get_password(self, account_name): conf = gajim.config.get_per('accounts', account_name, 'password') - if conf is None: + if conf is None or conf == '<kwallet>': return None if not conf.startswith('gnomekeyring:'): password = conf @@ -129,6 +135,45 @@ if account_name in gajim.connections: gajim.connections[account_name].password = password +class KWalletPasswordStorage(PasswordStorage): + def get_password(self, account_name): + pw = gajim.config.get_per('accounts', account_name, 'password') + if not pw or pw.startswith('gnomekeyring:'): + # unset, empty or not ours + return None + if pw != '<kwallet>': + # migrate the password + if kwalletbinding.kwallet_put('gajim', account_name, pw): + gajim.config.set_per('accounts', account_name, 'password', + '<kwallet>') + else: + # stop using the KDE Wallet + set_storage(SimplePasswordStorage()) + return pw + pw = kwalletbinding.kwallet_get('gajim', account_name) + if pw is None: + # stop using the KDE Wallet + set_storage(SimplePasswordStorage()) + if not pw: + # False, None, or the empty string + return None + return pw + + def save_password(self, account_name, password): + if not kwalletbinding.kwallet_put('gajim', account_name, password): + # stop using the KDE Wallet + set_storage(SimplePasswordStorage()) + storage.save_password(account_name, password) + return + pwtoken = '<kwallet>' + if not password: + # no sense in looking up the empty string in the KWallet + pwtoken = '' + gajim.config.set_per('accounts', account_name, 'password', pwtoken) + if account_name in gajim.connections: + gajim.connections[account_name].password = password + + storage = None def get_storage(): global storage @@ -150,11 +195,16 @@ if USER_USES_GNOMEKEYRING: try: storage = GnomePasswordStorage() - except gnomekeyring.NoKeyringDaemonError: - storage = SimplePasswordStorage() - except gnomekeyring.DeniedError: - storage = SimplePasswordStorage() - else: + except (gnomekeyring.NoKeyringDaemonError, gnomekeyring.DeniedError): + storage = None + if storage is None: + if gajim.config.get('use_kwalletcli'): + global USER_HAS_KWALLETCLI + if kwalletbinding.kwallet_available(): + USER_HAS_KWALLETCLI = True + if USER_HAS_KWALLETCLI: + storage = KWalletPasswordStorage() + if storage is None: storage = SimplePasswordStorage() return storage diff -r 130d308b573a -r 6c332dd9e795 src/features_window.py --- a/src/features_window.py Tue Jul 14 18:48:24 2009 +0200 +++ b/src/features_window.py Wed Jul 15 21:02:47 2009 +0200 @@ -30,6 +30,7 @@ from common import gajim from common import helpers +from common import kwalletbinding class FeaturesWindow: '''Class for features window''' @@ -66,9 +67,9 @@ _('Gajim session is stored on logout and restored on login.'), _('Requires python-gnome2.'), _('Feature not available under Windows.')), - _('Password encryption'): (self.gnome_keyring_available, + _('Password encryption'): (self.some_keyring_available, _('Passwords can be stored securely and not just in plaintext.'), - _('Requires gnome-keyring and python-gnome2-desktop.'), + _('Requires gnome-keyring and python-gnome2-desktop, or kwalletcli.'), _('Feature not available under Windows.')), _('SRV'): (self.srv_available, _('Ability to connect to servers which are using SRV records.'), @@ -200,9 +201,11 @@ return False return True - def gnome_keyring_available(self): + def some_keyring_available(self): if os.name == 'nt': return False + if kwalletbinding.kwallet_available(): + return True try: import gnomekeyring except Exception:

1 0

gajim: * added an entry in the roster menu to display archiving ...
by Anaël Verrier 15 Jul '09

15 Jul '09

changeset 5abc3754d886 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=5abc3754d886 description: * added an entry in the roster menu to display archiving preferences window * now we check service discovery features for message archiving diffstat: data/glade/advanced_menuitem_menu.glade | 7 +++++++ src/common/connection_handlers.py | 8 ++++++++ src/common/message_archiving.py | 4 ++++ src/dialogs.py | 5 +++++ src/roster_window.py | 27 +++++++++++++++++++++------ 5 files changed, 45 insertions(+), 6 deletions(-) diffs (115 lines): diff -r f0472ee0e7b7 -r 5abc3754d886 data/glade/advanced_menuitem_menu.glade --- a/data/glade/advanced_menuitem_menu.glade Wed Jul 15 15:13:12 2009 +0200 +++ b/data/glade/advanced_menuitem_menu.glade Wed Jul 15 20:44:34 2009 +0200 @@ -10,6 +10,13 @@ </widget> </child> <child> + <widget class="GtkMenuItem" id="archiving_preferences_menuitem"> + <property name="visible">True</property> + <property name="label" translatable="yes">Edit Archi_ving Preferences...</property> + <property name="use_underline">True</property> + </widget> + </child> + <child> <widget class="GtkMenuItem" id="privacy_lists_menuitem"> <property name="label" translatable="yes">Edit _Privacy Lists...</property> <property name="use_underline">True</property> diff -r f0472ee0e7b7 -r 5abc3754d886 src/common/connection_handlers.py --- a/src/common/connection_handlers.py Wed Jul 15 15:13:12 2009 +0200 +++ b/src/common/connection_handlers.py Wed Jul 15 20:44:34 2009 +0200 @@ -894,6 +894,14 @@ break if features.__contains__(common.xmpp.NS_PUBSUB): self.pubsub_supported = True + if features.__contains__(common.xmpp.NS_ARCHIVE_AUTO): + self.archive_auto_supported = True + if features.__contains__(common.xmpp.NS_ARCHIVE_MANAGE): + self.archive_manage_supported = True + if features.__contains__(common.xmpp.NS_ARCHIVE_MANUAL): + self.archive_manual_supported = True + if features.__contains__(common.xmpp.NS_ARCHIVE_PREF): + self.archive_pref_supported = True if features.__contains__(common.xmpp.NS_BYTESTREAM): our_jid = helpers.parse_jid(gajim.get_jid_from_account(self.name) +\ '/' + self.server_resource) diff -r f0472ee0e7b7 -r 5abc3754d886 src/common/message_archiving.py --- a/src/common/message_archiving.py Wed Jul 15 15:13:12 2009 +0200 +++ b/src/common/message_archiving.py Wed Jul 15 20:44:34 2009 +0200 @@ -21,6 +21,10 @@ class ConnectionArchive: def __init__(self): + self.archive_auto_supported = False + self.archive_manage_supported = False + self.archive_manual_supported = False + self.archive_pref_supported = False self.auto_save = None self.method_auto = None self.method_local = None diff -r f0472ee0e7b7 -r 5abc3754d886 src/dialogs.py --- a/src/dialogs.py Wed Jul 15 15:13:12 2009 +0200 +++ b/src/dialogs.py Wed Jul 15 20:44:34 2009 +0200 @@ -2848,6 +2848,11 @@ self.window.destroy() +class ArchivingPreferencesWindow: + def __init__(self, account): + self.account = account + + class PrivacyListWindow: '''Window that is used for creating NEW or EDITING already there privacy lists''' diff -r f0472ee0e7b7 -r 5abc3754d886 src/roster_window.py --- a/src/roster_window.py Wed Jul 15 15:13:12 2009 +0200 +++ b/src/roster_window.py Wed Jul 15 20:44:34 2009 +0200 @@ -2336,6 +2336,14 @@ gajim.interface.instances[account]['xml_console'] = \ dialogs.XMLConsoleWindow(account) + def on_archiving_preferences_menuitem_activate(self, widget, account): + if 'archiving_preferences' in gajim.interface.instances[account]: + gajim.interface.instances[account]['archiving_preferences'].window.\ + present() + else: + gajim.interface.instances[account]['archiving_preferences'] = \ + dialogs.ArchivingPreferencesWindow(account) + def on_privacy_lists_menuitem_activate(self, widget, account): if 'privacy_lists' in gajim.interface.instances[account]: gajim.interface.instances[account]['privacy_lists'].window.present() @@ -6022,6 +6030,8 @@ advanced_menuitem_menu = xml.get_widget('advanced_menuitem_menu') xml_console_menuitem = xml.get_widget('xml_console_menuitem') + archiving_preferences_menuitem = \ + xml.get_widget('archiving_preferences_menuitem') privacy_lists_menuitem = xml.get_widget('privacy_lists_menuitem') administrator_menuitem = xml.get_widget('administrator_menuitem') send_server_message_menuitem = xml.get_widget( @@ -6033,12 +6043,17 @@ xml_console_menuitem.connect('activate', self.on_xml_console_menuitem_activate, account) - if gajim.connections[account] and gajim.connections[account].\ - privacy_rules_supported: - privacy_lists_menuitem.connect('activate', - self.on_privacy_lists_menuitem_activate, account) - else: - privacy_lists_menuitem.set_sensitive(False) + if gajim.connections[account]: + if gajim.connections[account].privacy_rules_supported: + privacy_lists_menuitem.connect('activate', + self.on_privacy_lists_menuitem_activate, account) + else: + privacy_lists_menuitem.set_sensitive(False) + if gajim.connections[account].archive_pref_supported: + archiving_preferences_menuitem.connect('activate', + self.on_archiving_preferences_menuitem_activate, account) + else: + archiving_preferences_menuitem.set_sensitive(False) if gajim.connections[account].is_zeroconf: administrator_menuitem.set_sensitive(False)

1 0

gajim: * now we handle result for archiving preferences request ...
by Anaël Verrier 15 Jul '09

15 Jul '09

changeset f0472ee0e7b7 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=f0472ee0e7b7 description: * now we handle result for archiving preferences request and also all changes that come from server diffstat: src/common/connection.py | 7 +++ src/common/connection_handlers.py | 5 ++- src/common/message_archiving.py | 52 ++++++++++++++++++++++---- 3 files changed, 55 insertions(+), 9 deletions(-) diffs (120 lines): diff -r 263b56882fdd -r f0472ee0e7b7 src/common/connection.py --- a/src/common/connection.py Mon Jul 13 05:07:38 2009 +0200 +++ b/src/common/connection.py Wed Jul 15 15:13:12 2009 +0200 @@ -1032,6 +1032,13 @@ self.connection.set_send_timeout(self.keepalives, self.send_keepalive) self.connection.set_send_timeout2(self.pingalives, self.sendPing) self.connection.onreceive(None) + + # Request message archiving preferences + iq = common.xmpp.Iq('get') + iq.setTag('pref', namespace=common.xmpp.NS_ARCHIVE) + self.connection.send(iq) + + # Request privacy list iq = common.xmpp.Iq('get', common.xmpp.NS_PRIVACY, xmlns = '') id_ = self.connection.getAnID() iq.setID(id_) diff -r 263b56882fdd -r f0472ee0e7b7 src/common/connection_handlers.py --- a/src/common/connection_handlers.py Mon Jul 13 05:07:38 2009 +0200 +++ b/src/common/connection_handlers.py Wed Jul 15 15:13:12 2009 +0200 @@ -51,6 +51,7 @@ from common.commands import ConnectionCommands from common.pubsub import ConnectionPubSub from common.caps import ConnectionCaps +from common.message_archiving import ConnectionArchive from common import dbus_support if dbus_support.supported: @@ -1433,8 +1434,9 @@ return sess -class ConnectionHandlers(ConnectionVcard, ConnectionBytestream, ConnectionDisco, ConnectionCommands, ConnectionPubSub, ConnectionCaps, ConnectionHandlersBase): +class ConnectionHandlers(ConnectionArchive, ConnectionVcard, ConnectionBytestream, ConnectionDisco, ConnectionCommands, ConnectionPubSub, ConnectionCaps, ConnectionHandlersBase): def __init__(self): + ConnectionArchive.__init__(self) ConnectionVcard.__init__(self) ConnectionBytestream.__init__(self) ConnectionCommands.__init__(self) @@ -2739,6 +2741,7 @@ common.xmpp.NS_SEARCH) con.RegisterHandler('iq', self._PrivacySetCB, 'set', common.xmpp.NS_PRIVACY) + con.RegisterHandler('iq', self._ArchiveCB, ns=common.xmpp.NS_ARCHIVE) con.RegisterHandler('iq', self._PubSubCB, 'result') con.RegisterHandler('iq', self._ErrorCB, 'error') con.RegisterHandler('iq', self._IqCB) diff -r 263b56882fdd -r f0472ee0e7b7 src/common/message_archiving.py --- a/src/common/message_archiving.py Mon Jul 13 05:07:38 2009 +0200 +++ b/src/common/message_archiving.py Wed Jul 15 15:13:12 2009 +0200 @@ -19,7 +19,7 @@ ## -class ArchivingPreferences: +class ConnectionArchive: def __init__(self): self.auto_save = None self.method_auto = None @@ -28,17 +28,53 @@ self.default = None self.items = {} - def set(self, auto_save, method_auto, method_local, method_manual): - self.auto_save = auto_save - self.method_auto = method_auto - self.method_local = method_local - self.method_manual = method_manual - def set_default(self, otr, save, expire=None, unset=False): - self.default = {'expire': expire, 'otr': otr, 'save': save, 'unset': unset} + self.default = {'expire': expire, 'otr': otr, 'save': save, + 'unset': unset} def append_or_update_item(self, jid, expire, otr, save): self.items[jid] = {'expire': expire, 'otr': otr, 'save': save} def remove_item(self, jid): del self.items[jid] + + def _ArchiveCB(self, con, iq_obj): + print '_ArchiveCB', iq_obj.getType() + if iq_obj.getType() not in ('result', 'set'): + return + if iq_obj.getTag('pref'): + pref = iq_obj.getTag('pref') + + if pref.getTag('auto'): + self.auto_save = pref.getTagAttr('auto', 'save') + print 'auto_save:', self.auto_save + + method_auto = pref.getTag('method', attrs={'type': 'auto'}) + if method_auto: + self.method_auto = method_auto.getAttr('use') + + method_local = pref.getTag('method', attrs={'type': 'local'}) + if method_local: + self.method_local = method_local.getAttr('use') + + method_manual = pref.getTag('method', attrs={'type': 'manual'}) + if method_manual: + self.method_manual = method_manual.getAttr('use') + + print 'method alm:', self.method_auto, self.method_local, self.method_manual + + if pref.getTag('default'): + default = pref.getTag('default') + print 'default oseu:', default.getAttr('otr'), default.getAttr('save'), default.getAttr('expire'), default.getAttr('unset') + self.set_default(default.getAttr('otr'), + default.getAttr('save'), default.getAttr('expire'), + default.getAttr('unset')) + for item in pref.getTags('item'): + print item.getAttr('jid'), item.getAttr('otr'), item.getAttr('save'), item.getAttr('expire') + self.append_or_update_item(item.getAttr('jid'), + item.getAttr('otr'), item.getAttr('save'), + item.getAttr('expire')) + elif iq_obj.getTag('itemremove'): + for item in pref.getTags('item'): + print 'del', item.getAttr('jid') + self.remove_item(item.getAttr('jid'))

1 0

gajim: * second draft of ArchivingPreferences
by Anaël Verrier 15 Jul '09

15 Jul '09

changeset 263b56882fdd in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=263b56882fdd description: * second draft of ArchivingPreferences diffstat: src/common/message_archiving.py | 11 +++++------ 1 files changed, 5 insertions(+), 6 deletions(-) diffs (31 lines): diff -r 8dca9165c064 -r 263b56882fdd src/common/message_archiving.py --- a/src/common/message_archiving.py Mon Jul 13 01:03:43 2009 +0200 +++ b/src/common/message_archiving.py Mon Jul 13 05:07:38 2009 +0200 @@ -21,22 +21,21 @@ class ArchivingPreferences: def __init__(self): - self.auto = None + self.auto_save = None self.method_auto = None self.method_local = None self.method_manual = None self.default = None self.items = {} - def set(self, auto, method_auto, method_local, method_manual, default): - self.auto = auto + def set(self, auto_save, method_auto, method_local, method_manual): + self.auto_save = auto_save self.method_auto = method_auto self.method_local = method_local self.method_manual = method_manual - self.default = default - def set_default(self, expire, otr, save): - self.default = {'expire': expire, 'otr': otr, 'save': save} + def set_default(self, otr, save, expire=None, unset=False): + self.default = {'expire': expire, 'otr': otr, 'save': save, 'unset': unset} def append_or_update_item(self, jid, expire, otr, save): self.items[jid] = {'expire': expire, 'otr': otr, 'save': save}

1 0

← Newer
1
...
9
10
11
12
13
14
15
16
17
Older →

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 July 2009