Commits

commits@gajim.org

17632 discussions

gajim: fix some icon sizes
by Yann Leboulanger 28 Aug '12

28 Aug '12

changeset 484318a0df19 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=484318a0df19 description: fix some icon sizes diffstat: icons/hicolor/16x16/actions/gajim-receipt_missing.png | Bin icons/hicolor/32x32/actions/gajim-security_high.png | Bin icons/hicolor/32x32/actions/gajim-security_low.png | Bin icons/hicolor/48x48/actions/gajim-security_high.png | Bin icons/hicolor/48x48/actions/gajim-security_low.png | Bin icons/hicolor/48x48/actions/gajim-subscription_request.png | Bin 6 files changed, 0 insertions(+), 0 deletions(-) diffs (12 lines): diff -r cc198596ef50 -r 484318a0df19 icons/hicolor/16x16/actions/gajim-receipt_missing.png Binary file icons/hicolor/16x16/actions/gajim-receipt_missing.png has changed diff -r cc198596ef50 -r 484318a0df19 icons/hicolor/32x32/actions/gajim-security_high.png Binary file icons/hicolor/32x32/actions/gajim-security_high.png has changed diff -r cc198596ef50 -r 484318a0df19 icons/hicolor/32x32/actions/gajim-security_low.png Binary file icons/hicolor/32x32/actions/gajim-security_low.png has changed diff -r cc198596ef50 -r 484318a0df19 icons/hicolor/48x48/actions/gajim-security_high.png Binary file icons/hicolor/48x48/actions/gajim-security_high.png has changed diff -r cc198596ef50 -r 484318a0df19 icons/hicolor/48x48/actions/gajim-security_low.png Binary file icons/hicolor/48x48/actions/gajim-security_low.png has changed diff -r cc198596ef50 -r 484318a0df19 icons/hicolor/48x48/actions/gajim-subscription_request.png Binary file icons/hicolor/48x48/actions/gajim-subscription_request.png has changed

1 0

gajim: version will be 0.15.1
by Yann Leboulanger 28 Aug '12

28 Aug '12

changeset cc198596ef50 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=cc198596ef50 description: version will be 0.15.1 diffstat: autogen.sh | 2 +- src/common/defs.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diffs (22 lines): diff -r 71194a2f217f -r cc198596ef50 autogen.sh --- a/autogen.sh Tue Aug 28 10:39:08 2012 +0200 +++ b/autogen.sh Tue Aug 28 11:10:42 2012 +0200 @@ -1,5 +1,5 @@ #!/usr/bin/env bash - gajimversion="0.15.0.1" + gajimversion="0.15.1" if [ -d ".hg" ]; then node=$(hg tip --template "{node}") hgversion="-${node:0:12}" diff -r 71194a2f217f -r cc198596ef50 src/common/defs.py --- a/src/common/defs.py Tue Aug 28 10:39:08 2012 +0200 +++ b/src/common/defs.py Tue Aug 28 11:10:42 2012 +0200 @@ -27,7 +27,7 @@ basedir = '../' localedir = '../po' -version = '0.15.0.1' +version = '0.15.1' import subprocess try: node = subprocess.Popen('hg tip --template "{node|short}"', shell=True,

1 0

gajim: version will be 0.15.1
by Yann Leboulanger 28 Aug '12

28 Aug '12

changeset c5ff3f7dc4b9 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=c5ff3f7dc4b9 description: version will be 0.15.1 diffstat: autogen.sh | 2 +- src/common/defs.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diffs (22 lines): diff -r 92bf7b4042f0 -r c5ff3f7dc4b9 autogen.sh --- a/autogen.sh Tue Aug 28 10:39:08 2012 +0200 +++ b/autogen.sh Tue Aug 28 11:10:42 2012 +0200 @@ -1,5 +1,5 @@ #!/usr/bin/env bash - gajimversion="0.15.0.1" + gajimversion="0.15.1" if [ -d ".hg" ]; then node=$(hg tip --template "{node}") hgversion="-${node:0:12}" diff -r 92bf7b4042f0 -r c5ff3f7dc4b9 src/common/defs.py --- a/src/common/defs.py Tue Aug 28 10:39:08 2012 +0200 +++ b/src/common/defs.py Tue Aug 28 11:10:42 2012 +0200 @@ -27,7 +27,7 @@ basedir = '../' localedir = '../po' -version = '0.15.0.1' +version = '0.15.1' import subprocess try: node = subprocess.Popen('hg tip --template "{node|short}"', shell=True,

1 0

gajim: when we come ack from invisible, restore the block list i...
by Yann Leboulanger 28 Aug '12

28 Aug '12

changeset 92bf7b4042f0 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=92bf7b4042f0 description: when we come ack from invisible, restore the block list if we block some contacts. Fixes #7215 diffstat: src/common/connection.py | 9 ++++++--- 1 files changed, 6 insertions(+), 3 deletions(-) diffs (19 lines): diff -r 4727f3956b46 -r 92bf7b4042f0 src/common/connection.py --- a/src/common/connection.py Mon Aug 27 22:07:29 2012 +0200 +++ b/src/common/connection.py Tue Aug 28 10:39:08 2012 +0200 @@ -1794,9 +1794,12 @@ def _change_from_invisible(self): if self.privacy_rules_supported: - iq = self.build_privacy_rule('visible', 'allow') - self.connection.send(iq) - self.activate_privacy_rule('visible') + if self.blocked_list: + self.activate_privacy_rule('block') + else: + iq = self.build_privacy_rule('visible', 'allow') + self.connection.send(iq) + self.activate_privacy_rule('visible') def _update_status(self, show, msg): xmpp_show = helpers.get_xmpp_show(show)

1 0

gajim: show only rooms where user can be invited to in invite to...
by Yann Leboulanger 28 Aug '12

28 Aug '12

changeset 4727f3956b46 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=4727f3956b46 description: show only rooms where user can be invited to in invite to submenu. Fixes #7212 diffstat: src/gui_menu_builder.py | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diffs (12 lines): diff -r 074e7732f8e0 -r 4727f3956b46 src/gui_menu_builder.py --- a/src/gui_menu_builder.py Mon Aug 27 13:28:47 2012 +0200 +++ b/src/gui_menu_builder.py Mon Aug 27 22:07:29 2012 +0200 @@ -125,6 +125,8 @@ for gc_control in gajim.interface.msg_win_mgr.get_controls( message_control.TYPE_GC) + minimized_controls: acct = gc_control.account + if acct not in connected_accounts: + continue room_jid = gc_control.room_jid if room_jid in ignore_rooms: continue

1 0

gajim: fix displaying pubsub nodes
by Yann Leboulanger 28 Aug '12

28 Aug '12

changeset 074e7732f8e0 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=074e7732f8e0 description: fix displaying pubsub nodes diffstat: src/disco.py | 7 +++++-- 1 files changed, 5 insertions(+), 2 deletions(-) diffs (17 lines): diff -r cbfa665eca8b -r 074e7732f8e0 src/disco.py --- a/src/disco.py Sun Aug 26 22:34:29 2012 +0200 +++ b/src/disco.py Mon Aug 27 13:28:47 2012 +0200 @@ -2098,8 +2098,11 @@ name = gobject.markup_escape_text(name) name = '<b>%s</b>' % name - parent_iter = self._get_iter(parent_node) - if not self._in_list(node): + if parent_node: + parent_iter = self._get_iter(parent_node) + else: + parent_iter = None + if not node or not self._in_list(node): self.model.append(parent_iter, (jid, node, name, dunno, subscribed)) self.cache.get_items(jid, node, self._add_items, force = force, args = (force,))

1 0

gajim: don't close send single message if there was an error sen...
by Yann Leboulanger 28 Aug '12

28 Aug '12

changeset cbfa665eca8b in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=cbfa665eca8b description: don't close send single message if there was an error sending the message. Fixes #7187 diffstat: src/dialogs.py | 7 ++++--- 1 files changed, 4 insertions(+), 3 deletions(-) diffs (31 lines): diff -r 2d7dbe41958b -r cbfa665eca8b src/dialogs.py --- a/src/dialogs.py Fri Aug 24 13:33:27 2012 +0200 +++ b/src/dialogs.py Sun Aug 26 22:34:29 2012 +0200 @@ -3078,7 +3078,7 @@ # if offline or connecting ErrorDialog(_('Connection not available'), _('Please make sure you are connected with "%s".') % self.account) - return + return True if isinstance(self.to, list): sender_list = [] for i in self.to: @@ -3098,7 +3098,7 @@ ErrorDialog(_('Invalid Jabber ID'), _('It is not possible to send a message to %s, this JID is not ' 'valid.') % to_whom_jid) - return + return True subject = self.subject_entry.get_text().decode('utf-8') begin, end = self.message_tv_buffer.get_bounds() @@ -3142,7 +3142,8 @@ session=self.session) def on_send_and_close_button_clicked(self, widget): - self.send_single_message() + if self.send_single_message(): + return self.save_pos() self.window.destroy()

1 0

gajim: add ctrl+s shortcut to change status message.
by Yann Leboulanger 28 Aug '12

28 Aug '12

changeset 2d7dbe41958b in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=2d7dbe41958b description: add ctrl+s shortcut to change status message. diffstat: src/roster_window.py | 32 ++++++++++++++++++++++++++++++-- 1 files changed, 30 insertions(+), 2 deletions(-) diffs (56 lines): diff -r a248652c6491 -r 2d7dbe41958b src/roster_window.py --- a/src/roster_window.py Tue Aug 28 10:55:36 2012 +0200 +++ b/src/roster_window.py Fri Aug 24 13:33:27 2012 +0200 @@ -3511,6 +3511,27 @@ self.on_row_activated(widget, path) self.clicked_path = None + def accel_group_func(self, accel_group, acceleratable, keyval, modifier): + # CTRL mask + if modifier & gtk.gdk.CONTROL_MASK: + if keyval == gtk.keysyms.s: # CTRL + s + model = self.status_combobox.get_model() + accounts = gajim.connections.keys() + status = model[self.previous_status_combobox_active][2].decode( + 'utf-8') + def on_response(message, pep_dict): + if message is not None: # None if user pressed Cancel + for account in accounts: + if not gajim.config.get_per('accounts', account, + 'sync_with_global_status'): + continue + current_show = gajim.SHOW_LIST[ + gajim.connections[account].connected] + self.send_status(account, current_show, message) + self.send_pep(account, pep_dict) + dialogs.ChangeStatusMessageDialog(on_response, status) + return + def on_roster_treeview_button_press_event(self, widget, event): # hide tooltip, no matter the button is pressed self.tooltip.hide_tooltip() @@ -6328,8 +6349,8 @@ # activity_pixbuf, tune_pixbuf, location_pixbuf, avatar_pixbuf, # padlock_pixbuf] self.columns = [gtk.Image, str, str, str, str, - gtk.gdk.Pixbuf, gtk.gdk.Pixbuf, gtk.gdk.Pixbuf, - gtk.gdk.Pixbuf, gtk.gdk.Pixbuf, gtk.gdk.Pixbuf] + gtk.gdk.Pixbuf, gtk.gdk.Pixbuf, gtk.gdk.Pixbuf, gtk.gdk.Pixbuf, + gtk.gdk.Pixbuf, gtk.gdk.Pixbuf] self.xml = gtkgui_helpers.get_gtk_builder('roster_window.ui') self.window = self.xml.get_object('roster_window') self.hpaned = self.xml.get_object('roster_hpaned') @@ -6599,6 +6620,13 @@ new_chat_menuitem.add_accelerator('activate', accel_group, gtk.keysyms.n, gtk.gdk.CONTROL_MASK, gtk.ACCEL_VISIBLE) + # Setting CTRL+S to be the shortcut to change status message + accel_group = gtk.AccelGroup() + keyval, mod = gtk.accelerator_parse('<Control>s') + accel_group.connect_group(keyval, mod, gtk.ACCEL_VISIBLE, + self.accel_group_func) + self.window.add_accel_group(accel_group) + # Setting the search stuff self.rfilter_entry = self.xml.get_object('rfilter_entry') self.rfilter_string = ''

1 0

gajim: plugin system. checking the type of stored data. Fix #7220
by Yann Leboulanger 28 Aug '12

28 Aug '12

changeset a248652c6491 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=a248652c6491 description: plugin system. checking the type of stored data. Fix #7220 diffstat: src/plugins/plugin.py | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diffs (12 lines): diff -r 90053ad6a8b2 -r a248652c6491 src/plugins/plugin.py --- a/src/plugins/plugin.py Tue Aug 28 10:54:50 2012 +0200 +++ b/src/plugins/plugin.py Tue Aug 28 10:55:36 2012 +0200 @@ -259,6 +259,8 @@ s = shelve.open(self.FILE_PATH) for (k, v) in s.iteritems(): self.data[k] = v + if not isinstance(self.data, dict): + raise GajimPluginException s.close() self.save() except:

1 0

gajim: update 0.15.1 changelog
by Yann Leboulanger 28 Aug '12

28 Aug '12

changeset 90053ad6a8b2 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=90053ad6a8b2 description: update 0.15.1 changelog diffstat: ChangeLog | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diffs (10 lines): diff -r 25d3e44badb1 -r 90053ad6a8b2 ChangeLog --- a/ChangeLog Tue Aug 21 20:55:05 2012 +0200 +++ b/ChangeLog Tue Aug 28 10:54:50 2012 +0200 @@ -1,5 +1,6 @@ Gajim 0.15.1 () + * Switch from python-farsight to python-farstream * improve performences * Fix roster filter with unicode chars * Fix connection to msn jabber server

1 0

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