Commits April 2012

commits@gajim.org

3 participants
95 discussions

gajim: ability to press ctrl+shift+u to enable rosterfilter. Fix...
by Yann Leboulanger 21 Apr '12

21 Apr '12

changeset 552a39d629be in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=552a39d629be description: ability to press ctrl+shift+u to enable rosterfilter. Fixes #7139 diffstat: src/roster_window.py | 7 +++++++ 1 files changed, 7 insertions(+), 0 deletions(-) diffs (24 lines): diff -r d5ca8294de56 -r 552a39d629be src/roster_window.py --- a/src/roster_window.py Mon Apr 09 23:22:53 2012 +0200 +++ b/src/roster_window.py Tue Apr 10 00:04:19 2012 +0200 @@ -3418,6 +3418,10 @@ num = gtk.gdk.keyval_to_unicode(event.keyval) self.enable_rfilter(unichr(num)) + elif event.state & gtk.gdk.CONTROL_MASK and event.state & gtk.gdk.SHIFT_MASK and event.keyval == gtk.keysyms.U: + self.enable_rfilter('') + self.rfilter_entry.emit('key_press_event', event) + elif event.keyval == gtk.keysyms.Left: treeselection = self.tree.get_selection() model, list_of_paths = treeselection.get_selected_rows() @@ -4325,6 +4329,9 @@ elif event.keyval in (gtk.keysyms.Up, gtk.keysyms.Down): self.tree.grab_focus() self.tree.emit('key_press_event', event) + elif event.keyval == gtk.keysyms.BackSpace: + if widget.get_text() == '': + self.disable_rfilter() def enable_rfilter(self, search_string): if self.rfilter_enabled:

1 0

gajim: handle right / left to expand / collapse rows in treeview...
by Yann Leboulanger 21 Apr '12

21 Apr '12

changeset d5ca8294de56 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=d5ca8294de56 description: handle right / left to expand / collapse rows in treeview. Fixes #7138 diffstat: src/roster_window.py | 21 +++++++++++++++++++++ 1 files changed, 21 insertions(+), 0 deletions(-) diffs (31 lines): diff -r a338967835e3 -r d5ca8294de56 src/roster_window.py --- a/src/roster_window.py Mon Apr 09 21:57:51 2012 +0200 +++ b/src/roster_window.py Mon Apr 09 23:22:53 2012 +0200 @@ -3418,6 +3418,27 @@ num = gtk.gdk.keyval_to_unicode(event.keyval) self.enable_rfilter(unichr(num)) + elif event.keyval == gtk.keysyms.Left: + treeselection = self.tree.get_selection() + model, list_of_paths = treeselection.get_selected_rows() + if len(list_of_paths) != 1: + return + path = list_of_paths[0] + iter_ = model.get_iter(path) + if model.iter_has_child(iter_): + self.tree.collapse_row(path) + return True + elif event.keyval == gtk.keysyms.Right: + treeselection = self.tree.get_selection() + model, list_of_paths = treeselection.get_selected_rows() + if len(list_of_paths) != 1: + return + path = list_of_paths[0] + iter_ = model.get_iter(path) + if model.iter_has_child(iter_): + self.tree.expand_row(path, False) + return True + def on_roster_treeview_button_release_event(self, widget, event): try: path = self.tree.get_path_at_pos(int(event.x), int(event.y))[0]

1 0

gajim: suggest python-gupnp-igd in debian package
by Yann Leboulanger 21 Apr '12

21 Apr '12

changeset a338967835e3 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=a338967835e3 description: suggest python-gupnp-igd in debian package diffstat: debian/control | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diffs (12 lines): diff -r 7573b92ebe99 -r a338967835e3 debian/control --- a/debian/control Mon Apr 09 21:54:54 2012 +0200 +++ b/debian/control Mon Apr 09 21:57:51 2012 +0200 @@ -12,7 +12,7 @@ Architecture: all Depends: ${misc:Depends}, ${python:Depends}, python-gtk2 (>= 2.22.0), dnsutils Recommends: dbus, python-dbus, notification-daemon, python-openssl (>= 0.12), python-crypto, python-pyasn1 -Suggests: python-gconf, python-gnome2, nautilus-sendto, avahi-daemon, python-avahi, network-manager, libgtkspell0, aspell-en, python-gnomekeyring, gnome-keyring, python-kerberos (>= 1.1), texlive-latex-base, dvipng, python-farsight, gstreamer0.10-plugins-ugly, python-pycurl +Suggests: python-gconf, python-gnome2, nautilus-sendto, avahi-daemon, python-avahi, network-manager, libgtkspell0, aspell-en, python-gnomekeyring, gnome-keyring, python-kerberos (>= 1.1), texlive-latex-base, dvipng, python-farsight, gstreamer0.10-plugins-ugly, python-pycurl, python-gupnp-igd Description: Jabber client written in PyGTK 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,

1 0

gajim: allow to press Shift + a letter to enable roster filter. ...
by Yann Leboulanger 21 Apr '12

21 Apr '12

changeset 7573b92ebe99 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=7573b92ebe99 description: allow to press Shift + a letter to enable roster filter. Fixes #7136 diffstat: src/roster_window.py | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diffs (16 lines): diff -r c73e2b65a8e2 -r 7573b92ebe99 src/roster_window.py --- a/src/roster_window.py Sun Apr 08 17:53:53 2012 +0200 +++ b/src/roster_window.py Mon Apr 09 21:54:54 2012 +0200 @@ -3412,9 +3412,9 @@ elif type_ == 'agent': self.on_remove_agent(widget, list_) - elif not (event.state & (gtk.gdk.SHIFT_MASK | gtk.gdk.CONTROL_MASK | \ - gtk.gdk.MOD1_MASK)) and gtk.gdk.keyval_to_unicode(event.keyval): - # if we got unicode symbol without ctrl / shift / alt + elif not (event.state & (gtk.gdk.CONTROL_MASK | gtk.gdk.MOD1_MASK)) and\ + gtk.gdk.keyval_to_unicode(event.keyval): + # if we got unicode symbol without ctrl / alt num = gtk.gdk.keyval_to_unicode(event.keyval) self.enable_rfilter(unichr(num))

1 0

gajim: ability for a plugin to raise NodeProcessed
by Yann Leboulanger 21 Apr '12

21 Apr '12

changeset c73e2b65a8e2 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=c73e2b65a8e2 description: ability for a plugin to raise NodeProcessed diffstat: src/common/ged.py | 6 ++++++ 1 files changed, 6 insertions(+), 0 deletions(-) diffs (28 lines): diff -r b2ad41ec5d73 -r c73e2b65a8e2 src/common/ged.py --- a/src/common/ged.py Sun Apr 08 17:32:45 2012 +0200 +++ b/src/common/ged.py Sun Apr 08 17:53:53 2012 +0200 @@ -27,6 +27,7 @@ import traceback +from common.xmpp import NodeProcessed import logging log = logging.getLogger('gajim.c.ged') @@ -86,11 +87,16 @@ def raise_event(self, event_name, *args, **kwargs): log.debug('%s\nArgs: %s'%(event_name, str(args))) if event_name in self.handlers: + node_processed = False for priority, handler in self.handlers[event_name]: try: if handler(*args, **kwargs): return True + except NodeProcessed: + node_processed = True except Exception, e: log.error('Error while running an even handler: %s' % \ handler) traceback.print_exc() + if node_processed: + raise NodeProcessed

1 0

gajim: don't enable roster filter when we press a unicode key wi...
by Yann Leboulanger 21 Apr '12

21 Apr '12

changeset b2ad41ec5d73 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=b2ad41ec5d73 description: don't enable roster filter when we press a unicode key with alt, control or shift (like Ctrl+i) diffstat: src/roster_window.py | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diffs (14 lines): diff -r 2661d4712a1e -r b2ad41ec5d73 src/roster_window.py --- a/src/roster_window.py Sun Apr 08 12:29:57 2012 +0200 +++ b/src/roster_window.py Sun Apr 08 17:32:45 2012 +0200 @@ -3412,7 +3412,9 @@ elif type_ == 'agent': self.on_remove_agent(widget, list_) - elif gtk.gdk.keyval_to_unicode(event.keyval): # if we got unicode symbol + elif not (event.state & (gtk.gdk.SHIFT_MASK | gtk.gdk.CONTROL_MASK | \ + gtk.gdk.MOD1_MASK)) and gtk.gdk.keyval_to_unicode(event.keyval): + # if we got unicode symbol without ctrl / shift / alt num = gtk.gdk.keyval_to_unicode(event.keyval) self.enable_rfilter(unichr(num))

1 0

gajim: [aranea] install plugins in datadir, even when using --en...
by Yann Leboulanger 21 Apr '12

21 Apr '12

changeset 2661d4712a1e in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=2661d4712a1e description: [aranea] install plugins in datadir, even when using --enable-site-packages si Gajim can find them. diffstat: configure.ac | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diffs (17 lines): diff -r 692089c2d7d4 -r 2661d4712a1e configure.ac --- a/configure.ac Tue Apr 03 19:38:15 2012 +0200 +++ b/configure.ac Sun Apr 08 12:29:57 2012 +0200 @@ -47,11 +47,11 @@ instead of DATADIR/gajim/src.])] , AC_SUBST([gajim_srcdir], [\${pkgpythondir}]) -AC_SUBST([gajim_pluginsdir], [\${pkgpythondir}]) , AC_SUBST([gajim_srcdir], [\${datadir}/\${PACKAGE}/src]) +) + AC_SUBST([gajim_pluginsdir], [\${datadir}/\${PACKAGE}/plugins]) -) AS_AC_EXPAND(GAJIM_SRCDIR, "${gajim_srcdir}") AS_AC_EXPAND(PKGDATADIR, "${datadir}/${PACKAGE}")

1 0

gajim: Backed out changeset 1e414d1b429c
by Yann Leboulanger 20 Apr '12

20 Apr '12

changeset 98b1e19ae4a3 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=98b1e19ae4a3 description: Backed out changeset 1e414d1b429c diffstat: src/common/jingle_rtp.py | 11 +++-------- src/common/multimedia_helpers.py | 2 +- 2 files changed, 4 insertions(+), 9 deletions(-) diffs (41 lines): diff -r 1e414d1b429c -r 98b1e19ae4a3 src/common/jingle_rtp.py --- a/src/common/jingle_rtp.py Fri Apr 20 16:15:25 2012 +0200 +++ b/src/common/jingle_rtp.py Fri Apr 20 16:27:30 2012 +0200 @@ -364,13 +364,9 @@ JingleRTPContent.setup_stream(self, self._on_src_pad_added) # the local parts - if gajim.config.get('video_input_device').startswith('ximagesrc'): - colorspace = 'rgb' - else: - colorspace = 'yuv' if gajim.config.get('video_framerate'): - framerate = 'videorate ! video/x-raw-%s,framerate=%s ! ' % \ - (colorspace, gajim.config.get('video_framerate')) + framerate = 'videorate ! video/x-raw-yuv,framerate=%s ! ' % \ + gajim.config.get('video_framerate') else: framerate = '' try: @@ -378,8 +374,7 @@ except: w = h = None if w and h: - video_size = 'video/x-raw-%s,width=%s,height=%s ! ' % (colorspace, - w, h) + video_size = 'video/x-raw-yuv,width=%s,height=%s ! ' % (w, h) else: video_size = '' self.src_bin = self.make_bin_from_config('video_input_device', diff -r 1e414d1b429c -r 98b1e19ae4a3 src/common/multimedia_helpers.py --- a/src/common/multimedia_helpers.py Fri Apr 20 16:15:25 2012 +0200 +++ b/src/common/multimedia_helpers.py Fri Apr 20 16:27:30 2012 +0200 @@ -95,7 +95,7 @@ self.detect_element('v4l2src', _('V4L2: %s')) # Funny things, just to test... # self.devices['GOOM'] = 'audiotestsrc ! goom' - self.detect_element('ximagesrc', _('Screen')) + # self.devices['screen'] = 'ximagesrc' class VideoOutputManager(DeviceManager):

1 0

gajim: add screen sharing ability by choosing Screen in video in...
by Yann Leboulanger 20 Apr '12

20 Apr '12

changeset b15d9e0061a5 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=b15d9e0061a5 description: add screen sharing ability by choosing Screen in video input device. diffstat: src/common/multimedia_helpers.py | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diffs (12 lines): diff -r 98b1e19ae4a3 -r b15d9e0061a5 src/common/multimedia_helpers.py --- a/src/common/multimedia_helpers.py Fri Apr 20 16:27:30 2012 +0200 +++ b/src/common/multimedia_helpers.py Fri Apr 20 16:28:10 2012 +0200 @@ -95,7 +95,7 @@ self.detect_element('v4l2src', _('V4L2: %s')) # Funny things, just to test... # self.devices['GOOM'] = 'audiotestsrc ! goom' - # self.devices['screen'] = 'ximagesrc' + self.detect_element('ximagesrc', _('Screen'), '%s ! ffmpegcolorspace') class VideoOutputManager(DeviceManager):

1 0

gajim: add screen sharing ability by choosing Screen in video in...
by Yann Leboulanger 20 Apr '12

20 Apr '12

changeset 1e414d1b429c in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=1e414d1b429c description: add screen sharing ability by choosing Screen in video input device. diffstat: src/common/jingle_rtp.py | 11 ++++++++--- src/common/multimedia_helpers.py | 2 +- 2 files changed, 9 insertions(+), 4 deletions(-) diffs (41 lines): diff -r a0560814bf8b -r 1e414d1b429c src/common/jingle_rtp.py --- a/src/common/jingle_rtp.py Fri Apr 20 14:34:24 2012 +0200 +++ b/src/common/jingle_rtp.py Fri Apr 20 16:15:25 2012 +0200 @@ -364,9 +364,13 @@ JingleRTPContent.setup_stream(self, self._on_src_pad_added) # the local parts + if gajim.config.get('video_input_device').startswith('ximagesrc'): + colorspace = 'rgb' + else: + colorspace = 'yuv' if gajim.config.get('video_framerate'): - framerate = 'videorate ! video/x-raw-yuv,framerate=%s ! ' % \ - gajim.config.get('video_framerate') + framerate = 'videorate ! video/x-raw-%s,framerate=%s ! ' % \ + (colorspace, gajim.config.get('video_framerate')) else: framerate = '' try: @@ -374,7 +378,8 @@ except: w = h = None if w and h: - video_size = 'video/x-raw-yuv,width=%s,height=%s ! ' % (w, h) + video_size = 'video/x-raw-%s,width=%s,height=%s ! ' % (colorspace, + w, h) else: video_size = '' self.src_bin = self.make_bin_from_config('video_input_device', diff -r a0560814bf8b -r 1e414d1b429c src/common/multimedia_helpers.py --- a/src/common/multimedia_helpers.py Fri Apr 20 14:34:24 2012 +0200 +++ b/src/common/multimedia_helpers.py Fri Apr 20 16:15:25 2012 +0200 @@ -95,7 +95,7 @@ self.detect_element('v4l2src', _('V4L2: %s')) # Funny things, just to test... # self.devices['GOOM'] = 'audiotestsrc ! goom' - # self.devices['screen'] = 'ximagesrc' + self.detect_element('ximagesrc', _('Screen')) class VideoOutputManager(DeviceManager):

1 0

← Newer
1
2
3
4
5
6
7
8
9
10
Older →

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

Commits April 2012