Commits September 2007

commits@gajim.org

6 participants
193 discussions

[commit-gajim] r8848 - branches/gajim_0.11.1/src/common
by asterix＠gajim.org 22 Sep '07

22 Sep '07

Author: asterix Date: 2007-09-22 13:53:18 +0200 (Sat, 22 Sep 2007) New Revision: 8848 Modified: branches/gajim_0.11.1/src/common/events.py Log: fix type of returns variable in get_events: it's a dict if jid is not given Modified: branches/gajim_0.11.1/src/common/events.py =================================================================== --- branches/gajim_0.11.1/src/common/events.py 2007-09-21 23:56:11 UTC (rev 8847) +++ branches/gajim_0.11.1/src/common/events.py 2007-09-22 11:53:18 UTC (rev 8848) @@ -131,12 +131,14 @@ return self._get_nb_events(types = types, account = account) def get_events(self, account, jid = None, types = []): - '''if event is not specified, get all events from this jid, + '''returns all events from the given account of the form + {jid1: [], jid2: []} + if jid is given, returns all events from the given jid in a list: [] optionnaly only from given type''' if not self._events.has_key(account): return [] - events_list = [] # list of events if not jid: + events_list = {} # list of events for jid_ in self._events[account]: events = [] for ev in self._events[account][jid_]: @@ -147,6 +149,7 @@ return events_list if not self._events[account].has_key(jid): return [] + events_list = [] # list of events for ev in self._events[account][jid]: if not types or ev.type_ in types: events_list.append(ev)

1 0

[commit-gajim] r8847 - trunk/src/common
by asterix＠gajim.org 21 Sep '07

21 Sep '07

Author: asterix Date: 2007-09-22 01:56:11 +0200 (Sat, 22 Sep 2007) New Revision: 8847 Modified: trunk/src/common/events.py Log: fix type of returns variable in get_events: it's a dict if jid is not given Modified: trunk/src/common/events.py =================================================================== --- trunk/src/common/events.py 2007-09-21 16:30:19 UTC (rev 8846) +++ trunk/src/common/events.py 2007-09-21 23:56:11 UTC (rev 8847) @@ -160,12 +160,14 @@ return self._get_nb_events(types = types, account = account) def get_events(self, account, jid = None, types = []): - '''if event is not specified, get all events from this jid, + '''returns all events from the given account of the form + {jid1: [], jid2: []} + if jid is given, returns all events from the given jid in a list: [] optionnaly only from given type''' if not self._events.has_key(account): return [] - events_list = [] # list of events if not jid: + events_list = {} # list of events for jid_ in self._events[account]: events = [] for ev in self._events[account][jid_]: @@ -176,6 +178,7 @@ return events_list if not self._events[account].has_key(jid): return [] + events_list = [] # list of events for ev in self._events[account][jid]: if not types or ev.type_ in types: events_list.append(ev)

1 0

[commit-gajim] r8846 - trunk/src
by steve-e＠gajim.org 21 Sep '07

21 Sep '07

Author: steve-e Date: 2007-09-21 18:30:19 +0200 (Fri, 21 Sep 2007) New Revision: 8846 Modified: trunk/src/history_window.py Log: Disable logging checkbox for contacts of offline accounts Modified: trunk/src/history_window.py =================================================================== --- trunk/src/history_window.py 2007-09-21 16:10:05 UTC (rev 8845) +++ trunk/src/history_window.py 2007-09-21 16:30:19 UTC (rev 8846) @@ -12,6 +12,7 @@ ## Dimitur Kirov <dkirov(a)gmail.com> ## Travis Shirk <travis(a)pobox.com> ## Norman Rasmussen <norman(a)rasmussen.co.za> +## Copyright (C) 2007 Stephan Erb <steve-e(a)h3c.de> ## ## This program is free software; you can redistribute it and/or modify ## it under the terms of the GNU General Public License as published @@ -167,20 +168,20 @@ # be set. # FIXME: This may leed to wrong self nick in the displayed history self.account = gajim.contacts.get_accounts()[0] + self.checkbutton.set_sensitive(False) + else: + # Set the logging checkbutton, can only work if we have got an account. + log = True + if self.jid in gajim.config.get_per('accounts', self.account, + 'no_log_for').split(' '): + log = False + self.checkbutton.set_active(log) + self.checkbutton.set_sensitive(True) # select logs for last date we have logs with contact self.calendar.set_sensitive(True) lastlog = gajim.logger.get_last_date_that_has_logs(self.jid, self.account) - # Set the logging checkbutton - log = True - if self.jid in gajim.config.get_per('accounts', self.account, - 'no_log_for').split(' '): - log = False - self.checkbutton.set_active(log) - self.checkbutton.set_sensitive(True) - self.checkbutton.set_inconsistent(False) - if contact: title = _('Conversation History with %s') % contact.get_shown_name() else: @@ -191,7 +192,6 @@ else: # neither a valid jid, nor an existing contact name was entered lastlog = None - self.checkbutton.set_inconsistent(True) self.checkbutton.set_sensitive(False) self.calendar.set_sensitive(False)

1 0

[commit-gajim] r8845 - trunk/data/glade
by steve-e＠gajim.org 21 Sep '07

21 Sep '07

Author: steve-e Date: 2007-09-21 18:10:05 +0200 (Fri, 21 Sep 2007) New Revision: 8845 Modified: trunk/data/glade/roster_window.glade Log: Use correct icon for filetransfer in roster menu Modified: trunk/data/glade/roster_window.glade =================================================================== --- trunk/data/glade/roster_window.glade 2007-09-20 19:58:31 UTC (rev 8844) +++ trunk/data/glade/roster_window.glade 2007-09-21 16:10:05 UTC (rev 8845) @@ -237,7 +237,7 @@ <child internal-child="image"> <widget class="GtkImage" id="image1613"> <property name="visible">True</property> - <property name="stock">gtk-file</property> + <property name="stock">gtk-save</property> <property name="icon_size">1</property> </widget> </child>

1 0

[commit-gajim] r8844 - trunk/src/common
by steve-e＠gajim.org 20 Sep '07

20 Sep '07

Author: steve-e Date: 2007-09-20 21:58:31 +0200 (Thu, 20 Sep 2007) New Revision: 8844 Modified: trunk/src/common/stanza_session.py Log: Adress some crypto functions correctly. Modified: trunk/src/common/stanza_session.py =================================================================== --- trunk/src/common/stanza_session.py 2007-09-20 16:32:45 UTC (rev 8843) +++ trunk/src/common/stanza_session.py 2007-09-20 19:58:31 UTC (rev 8844) @@ -281,7 +281,7 @@ if (not 1 < e < (p - 1)): raise exceptions.NegotiationError, "invalid DH value" - return self.sha256(self.encode_mpi(self.powmod(e, y, p))) + return crypto.sha256(crypto.encode_mpi(crypto.powmod(e, y, p))) def c7lize_mac_id(self, form): kids = form.getChildren() @@ -741,7 +741,7 @@ # 4.5.5 if srs: - srshash = crypto.hmac(srs, 'Shared Retained Secret') + srshash = self.hmac(srs, 'Shared Retained Secret') else: srshash = crypto.random_bytes(32)

1 0

[commit-gajim] r8843 - branches/gajim_0.11.1/src/common
by asterix＠gajim.org 20 Sep '07

20 Sep '07

Author: asterix Date: 2007-09-20 18:32:45 +0200 (Thu, 20 Sep 2007) New Revision: 8843 Modified: branches/gajim_0.11.1/src/common/events.py Log: fix get_events when no jid is given but types are given Modified: branches/gajim_0.11.1/src/common/events.py =================================================================== --- branches/gajim_0.11.1/src/common/events.py 2007-09-20 16:32:06 UTC (rev 8842) +++ branches/gajim_0.11.1/src/common/events.py 2007-09-20 16:32:45 UTC (rev 8843) @@ -135,11 +135,18 @@ optionnaly only from given type''' if not self._events.has_key(account): return [] + events_list = [] # list of events if not jid: - return self._events[account] + for jid_ in self._events[account]: + events = [] + for ev in self._events[account][jid_]: + if not types or ev.type_ in types: + events.append(ev) + if events: + events_list[jid_] = events + return events_list if not self._events[account].has_key(jid): return [] - events_list = [] # list of events for ev in self._events[account][jid]: if not types or ev.type_ in types: events_list.append(ev)

1 0

[commit-gajim] r8842 - branches/gajim_0.11.1/src
by asterix＠gajim.org 20 Sep '07

20 Sep '07

Author: asterix Date: 2007-09-20 18:32:06 +0200 (Thu, 20 Sep 2007) New Revision: 8842 Modified: branches/gajim_0.11.1/src/roster_window.py Log: allow to execute commands even if there is no resource. XEP don't forbid that. fixes #3453 Modified: branches/gajim_0.11.1/src/roster_window.py =================================================================== --- branches/gajim_0.11.1/src/roster_window.py 2007-09-20 16:30:45 UTC (rev 8841) +++ branches/gajim_0.11.1/src/roster_window.py 2007-09-20 16:32:06 UTC (rev 8842) @@ -1854,15 +1854,8 @@ else: # one resource start_chat_menuitem.connect('activate', self.on_open_chat_window, contact, account) - # we cannot execute commands when the resource is unknown - # TODO: that's true only if the entity is a contact, - # TODO: we need to show this also for transports - if contact.resource: - execute_command_menuitem.connect('activate', - self.on_execute_command, contact, account, contact.resource) - else: - execute_command_menuitem.hide() - execute_command_menuitem.set_no_show_all(True) + execute_command_menuitem.connect('activate', self.on_execute_command, + contact, account, contact.resource) our_jid_other_resource = None if our_jid:

1 0

[commit-gajim] r8841 - branches/gajim_0.11.1/src
by asterix＠gajim.org 20 Sep '07

20 Sep '07

Author: asterix Date: 2007-09-20 18:30:45 +0200 (Thu, 20 Sep 2007) New Revision: 8841 Modified: branches/gajim_0.11.1/src/music_track_listener.py Log: don't crash when we close rhythmbox while Gajim is running. fixes #3442 Modified: branches/gajim_0.11.1/src/music_track_listener.py =================================================================== --- branches/gajim_0.11.1/src/music_track_listener.py 2007-09-20 16:30:06 UTC (rev 8840) +++ branches/gajim_0.11.1/src/music_track_listener.py 2007-09-20 16:30:45 UTC (rev 8841) @@ -136,6 +136,8 @@ return info def _rhythmbox_music_track_change_cb(self, uri): + if not uri: + return bus = dbus.SessionBus() rbshellobj = bus.get_object('org.gnome.Rhythmbox', '/org/gnome/Rhythmbox/Shell')

1 0

[commit-gajim] r8840 - branches/gajim_0.11.1/src
by asterix＠gajim.org 20 Sep '07

20 Sep '07

Author: asterix Date: 2007-09-20 18:30:06 +0200 (Thu, 20 Sep 2007) New Revision: 8840 Modified: branches/gajim_0.11.1/src/dialogs.py Log: [thekingpizza] add svg images to Images filter. fixes #3452 Modified: branches/gajim_0.11.1/src/dialogs.py =================================================================== --- branches/gajim_0.11.1/src/dialogs.py 2007-09-20 16:29:43 UTC (rev 8839) +++ branches/gajim_0.11.1/src/dialogs.py 2007-09-20 16:30:06 UTC (rev 8840) @@ -2402,6 +2402,7 @@ filter.add_mime_type('image/jpeg') filter.add_mime_type('image/gif') filter.add_mime_type('image/tiff') + filter.add_mime_type('image/svg+xml') filter.add_mime_type('image/x-xpixmap') # xpm self.add_filter(filter) self.set_filter(filter)

1 0

[commit-gajim] r8839 - branches/gajim_0.11.1/src/common
by asterix＠gajim.org 20 Sep '07

20 Sep '07

Author: asterix Date: 2007-09-20 18:29:43 +0200 (Thu, 20 Sep 2007) New Revision: 8839 Modified: branches/gajim_0.11.1/src/common/proxy65_manager.py Log: <activate> tag must contain a jid according to proxy65 XEP. Modified: branches/gajim_0.11.1/src/common/proxy65_manager.py =================================================================== --- branches/gajim_0.11.1/src/common/proxy65_manager.py 2007-09-20 16:29:17 UTC (rev 8838) +++ branches/gajim_0.11.1/src/common/proxy65_manager.py 2007-09-20 16:29:43 UTC (rev 8839) @@ -108,9 +108,8 @@ query.setNamespace(common.xmpp.NS_BYTESTREAM) query.setAttr('sid', self.sid) - query.setTag('activate') - # activate = query.setTag('activate') - # activate.setData(self.jid + "/" + self.sid) + activate = query.setTag('activate') + activate.setData(self.jid + "/" + self.sid) if self.active_connection: self.active_connection.send(iq)

1 0

← Newer
1
2
3
4
5
6
7
...
20
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 September 2007