changeset 823f3461f8c3 in /home/hg/repos/gajim

details:http://hg.gajim.org/gajim?cmd=changeset;node=823f3461f8c3 description: add ossplay to the list of tested soundplayer. Fixes #5061 X-Hg-Repo: gajim Subject: gajim: mark groupchat messages as read when we scroll at the end in groupchat window From: Yann Leboulanger asterix@lagaule.org

changeset 16fbbe884fde in /home/hg/repos/gajim

details:http://hg.gajim.org/gajim?cmd=changeset;node=16fbbe884fde description: mark groupchat messages as read when we scroll at the end in groupchat window X-Hg-Repo: gajim Subject: gajim: really execute ad hoc command when clicking on Execute command in disco window From: Yann Leboulanger asterix@lagaule.org

changeset 22b67d3eba1c in /home/hg/repos/gajim

details:http://hg.gajim.org/gajim?cmd=changeset;node=22b67d3eba1c description: really execute ad hoc command when clicking on Execute command in disco window

diffstat:

src/adhoc_commands.py | 12 ++++++++---- src/chat_control.py | 6 +++++- src/disco.py | 5 +++-- src/gajim.py | 2 +- 4 files changed, 17 insertions(+), 8 deletions(-)

diffs (85 lines):

diff -r 18fd2007aade -r 22b67d3eba1c src/adhoc_commands.py --- a/src/adhoc_commands.py Sat Jun 06 18:01:37 2009 +0200 +++ b/src/adhoc_commands.py Fri Jun 05 21:26:23 2009 +0200 @@ -44,7 +44,7 @@

TODO: gtk 2.10 has a special wizard-widget, consider using it...'''

- def __init__(self, account, jid): + def __init__(self, account, jid, commandnode=None): '''Create new window.'''

# an account object @@ -55,7 +55,7 @@ self.commandlist=None # a list of (commandname, commanddescription)

# command's data - self.commandnode = None + self.commandnode = commandnode self.sessionid = None self.dataform = None self.allow_stage3_close = False @@ -78,8 +78,12 @@ self.data_form_widget.show() self.sending_form_stage_vbox.pack_start(self.data_form_widget)

- # setting initial stage - self.stage1() + if self.commandnode: + # Execute command + self.stage3() + else: + # setting initial stage + self.stage1()

# displaying the window self.xml.signal_autoconnect(self) diff -r 18fd2007aade -r 22b67d3eba1c src/chat_control.py --- a/src/chat_control.py Sat Jun 06 18:01:37 2009 +0200 +++ b/src/chat_control.py Fri Jun 05 21:26:23 2009 +0200 @@ -922,7 +922,11 @@ self.parent_win.get_active_control() == self and \ self.parent_win.window.is_active(): # we are at the end - if self.session and self.session.remove_events(types_list): + if self.type_id == message_control.TYPE_GC: + if not gajim.events.remove_events(self.account, jid, + types=types_list): + self.redraw_after_event_removed(jid) + elif self.session and self.session.remove_events(types_list): # There were events to remove self.redraw_after_event_removed(jid)

diff -r 18fd2007aade -r 22b67d3eba1c src/disco.py --- a/src/disco.py Sat Jun 06 18:01:37 2009 +0200 +++ b/src/disco.py Fri Jun 05 21:26:23 2009 +0200 @@ -1259,14 +1259,15 @@ self._renderer.set_property('cell-background', bgcolor) self.window.services_treeview.queue_draw()

- def on_execute_button_clicked(self, widget = None): + def on_execute_button_clicked(self, widget=None): '''When we want to execute a command: open adhoc command window''' model, iter = self.window.services_treeview.get_selection().get_selected() if not iter: return service = model[iter][0].decode('utf-8') - adhoc_commands.CommandWindow(self.account, service) + node = model[iter][1].decode('utf-8') + adhoc_commands.CommandWindow(self.account, service, commandnode=node)

def on_register_button_clicked(self, widget = None): '''When we want to register an agent: diff -r 18fd2007aade -r 22b67d3eba1c src/gajim.py --- a/src/gajim.py Sat Jun 06 18:01:37 2009 +0200 +++ b/src/gajim.py Fri Jun 05 21:26:23 2009 +0200 @@ -3476,7 +3476,7 @@

if gajim.config.get('soundplayer') == '': # only on first time Gajim starts - commands = ('aplay', 'play', 'esdplay', 'artsplay') + commands = ('aplay', 'play', 'esdplay', 'artsplay', 'ossplay') for command in commands: if helpers.is_in_path(command): if command == 'aplay':