Commits May 2011

commits@gajim.org

3 participants
119 discussions

gajim: [milouse] Fix identation error
by Yann Leboulanger 28 May '11

28 May '11

changeset 6414b6ef409f in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=6414b6ef409f description: [milouse] Fix identation error diffstat: plugins/whiteboard/plugin.py | 13 +++++++------ 1 files changed, 7 insertions(+), 6 deletions(-) diffs (23 lines): diff -r a7aabf08ded7 -r 6414b6ef409f plugins/whiteboard/plugin.py --- a/plugins/whiteboard/plugin.py Fri May 27 00:14:21 2011 +0200 +++ b/plugins/whiteboard/plugin.py Sat May 28 15:37:40 2011 +0200 @@ -73,12 +73,13 @@ def _compute_caps_hash(self): for a in gajim.connections: gajim.caps_hash[a] = caps_cache.compute_caps_hash([ - gajim.gajim_identity], gajim.gajim_common_features + gajim.gajim_optional_features[a]) - # re-send presence with new hash - connected = gajim.connections[a].connected - if connected > 1 and gajim.SHOW_LIST[connected] != 'invisible': - gajim.connections[a].change_status(gajim.SHOW_LIST[connected], - gajim.connections[a].status) + gajim.gajim_identity], gajim.gajim_common_features + \ + gajim.gajim_optional_features[a]) + # re-send presence with new hash + connected = gajim.connections[a].connected + if connected > 1 and gajim.SHOW_LIST[connected] != 'invisible': + gajim.connections[a].change_status(gajim.SHOW_LIST[connected], + gajim.connections[a].status) @log_calls('WhiteboardPlugin') def activate(self):

1 0

gajim: handle caps only on the receiving account
by Yann Leboulanger 26 May '11

26 May '11

changeset a7aabf08ded7 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=a7aabf08ded7 description: handle caps only on the receiving account diffstat: src/common/protocol/caps.py | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diffs (12 lines): diff -r d030774e7d5c -r a7aabf08ded7 src/common/protocol/caps.py --- a/src/common/protocol/caps.py Thu May 26 19:39:03 2011 +0200 +++ b/src/common/protocol/caps.py Fri May 27 00:14:21 2011 +0200 @@ -88,6 +88,8 @@ callback to update our caps cache with queried information after we have retrieved an unknown caps hash and issued a disco """ + if obj.conn.name != self._account: + return contact = self._get_contact_or_gc_contact_for_jid(obj.fjid) if not contact: log.info('Received Disco from unknown contact %s' % obj.fjid)

1 0

gajim: Prevent Ctrl+f to open send file dialog if GTK has Emacs-...
by Yann Leboulanger 26 May '11

26 May '11

changeset d030774e7d5c in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=d030774e7d5c description: Prevent Ctrl+f to open send file dialog if GTK has Emacs-style keybindings enabled. Fixes #6874 diffstat: src/message_window.py | 6 +++++- 1 files changed, 5 insertions(+), 1 deletions(-) diffs (16 lines): diff -r e9815dc29718 -r d030774e7d5c src/message_window.py --- a/src/message_window.py Thu May 26 19:38:09 2011 +0200 +++ b/src/message_window.py Thu May 26 19:39:03 2011 +0200 @@ -355,7 +355,11 @@ control._on_history_menuitem_activate() elif control.type_id == message_control.TYPE_CHAT and \ keyval == gtk.keysyms.f: # CTRL + f - control._on_send_file_menuitem_activate(None) + # CTRL + f moves cursor one char forward when user uses Emacs + # theme + if not gtk.settings_get_default().get_property( + 'gtk-key-theme-name') == 'Emacs': + control._on_send_file_menuitem_activate(None) elif control.type_id == message_control.TYPE_CHAT and \ keyval == gtk.keysyms.g: # CTRL + g control._on_convert_to_gc_menuitem_activate(None)

1 0

gajim: don't block key pressed events to go until textview so th...
by Yann Leboulanger 26 May '11

26 May '11

changeset e9815dc29718 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=e9815dc29718 description: don't block key pressed events to go until textview so that ctrl+W work in Emacs theme. Fixes #6786 diffstat: src/message_window.py | 1 - 1 files changed, 0 insertions(+), 1 deletions(-) diffs (11 lines): diff -r 2ad464f78b35 -r e9815dc29718 src/message_window.py --- a/src/message_window.py Thu May 26 19:04:05 2011 +0200 +++ b/src/message_window.py Thu May 26 19:38:09 2011 +0200 @@ -421,7 +421,6 @@ elif keyval == gtk.keysyms.Escape and \ gajim.config.get('escape_key_closes'): # Escape self.remove_tab(control, self.CLOSE_ESC) - return True def _on_close_button_clicked(self, button, control): """

1 0

gajim: remove pysqlite2 from depend list
by Yann Leboulanger 26 May '11

26 May '11

changeset 2ad464f78b35 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=2ad464f78b35 description: remove pysqlite2 from depend list diffstat: README.html | 1 - 1 files changed, 0 insertions(+), 1 deletions(-) diffs (11 lines): diff -r 04d235722aa4 -r 2ad464f78b35 README.html --- a/README.html Thu May 26 13:35:33 2011 +0400 +++ b/README.html Thu May 26 19:04:05 2011 +0200 @@ -16,7 +16,6 @@ <ul> <li>python2.5 or higher</li> <li>pygtk2.16 or higher</li> -<li>pysqlite2 (if you have python 2.5, you already have this)</li> </ul> <h2>Optional Runtime Requirements</h2>

1 0

gajim: change add to bookmarks icon in the gc context menu
by Denis Fomin 26 May '11

26 May '11

changeset 04d235722aa4 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=04d235722aa4 description: change add to bookmarks icon in the gc context menu diffstat: src/groupchat_control.py | 5 +++++ 1 files changed, 5 insertions(+), 0 deletions(-) diffs (15 lines): diff -r b9076fa038eb -r 04d235722aa4 src/groupchat_control.py --- a/src/groupchat_control.py Wed May 25 23:48:53 2011 +0400 +++ b/src/groupchat_control.py Thu May 26 13:35:33 2011 +0400 @@ -801,6 +801,11 @@ separatormenuitem2 = xml.get_object('separatormenuitem2') request_voice_separator = xml.get_object('request_voice_separator') + if gtkgui_helpers.gtk_icon_theme.has_icon('bookmark-new'): + img = gtk.Image() + img.set_from_icon_name('bookmark-new', gtk.ICON_SIZE_MENU) + bookmark_room_menuitem.set_image(img) + if hide_buttonbar_items: change_nick_menuitem.hide() change_subject_menuitem.hide()

1 0

gajim: remove unused code
by Denis Fomin 25 May '11

25 May '11

changeset b9076fa038eb in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=b9076fa038eb description: remove unused code diffstat: src/groupchat_control.py | 1 - 1 files changed, 0 insertions(+), 1 deletions(-) diffs (11 lines): diff -r d4dc395d423c -r b9076fa038eb src/groupchat_control.py --- a/src/groupchat_control.py Wed May 25 23:45:51 2011 +0400 +++ b/src/groupchat_control.py Wed May 25 23:48:53 2011 +0400 @@ -323,7 +323,6 @@ if gtkgui_helpers.gtk_icon_theme.has_icon('bookmark-new'): img = self.xml.get_object('image7') img.set_from_icon_name('bookmark-new', gtk.ICON_SIZE_MENU) - img.show() widget.show()

1 0

gajim: use gtkgui_helpers for search icon
by Denis Fomin 25 May '11

25 May '11

changeset d4dc395d423c in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=d4dc395d423c description: use gtkgui_helpers for search icon diffstat: src/groupchat_control.py | 3 +-- 1 files changed, 1 insertions(+), 2 deletions(-) diffs (13 lines): diff -r 0f12feba3669 -r d4dc395d423c src/groupchat_control.py --- a/src/groupchat_control.py Wed May 25 22:59:18 2011 +0400 +++ b/src/groupchat_control.py Wed May 25 23:45:51 2011 +0400 @@ -320,8 +320,7 @@ self._on_bookmark_room_menuitem_activate) self.handlers[id_] = widget - icon_theme = gtk.icon_theme_get_default() - if icon_theme.has_icon('bookmark-new'): + if gtkgui_helpers.gtk_icon_theme.has_icon('bookmark-new'): img = self.xml.get_object('image7') img.set_from_icon_name('bookmark-new', gtk.ICON_SIZE_MENU) img.show()

1 0

gajim: change add to bookmarks icon. Fixes #6893
by Denis Fomin 25 May '11

25 May '11

changeset 0f12feba3669 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=0f12feba3669 description: change add to bookmarks icon. Fixes #6893 diffstat: src/groupchat_control.py | 7 +++++++ 1 files changed, 7 insertions(+), 0 deletions(-) diffs (17 lines): diff -r d58f8dff7331 -r 0f12feba3669 src/groupchat_control.py --- a/src/groupchat_control.py Wed May 25 19:11:04 2011 +0400 +++ b/src/groupchat_control.py Wed May 25 22:59:18 2011 +0400 @@ -319,6 +319,13 @@ id_ = widget.connect('clicked', self._on_bookmark_room_menuitem_activate) self.handlers[id_] = widget + + icon_theme = gtk.icon_theme_get_default() + if icon_theme.has_icon('bookmark-new'): + img = self.xml.get_object('image7') + img.set_from_icon_name('bookmark-new', gtk.ICON_SIZE_MENU) + img.show() + widget.show() widget = self.xml.get_object('list_treeview')

1 0

gajim: [Darlan] History manager.
by Denis Fomin 25 May '11

25 May '11

changeset d58f8dff7331 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=d58f8dff7331 description: [Darlan] History manager. Add the name of the Contact to the confirmation dialog. Add the title to the confirmation dialogs. Fixes #6892 diffstat: src/history_manager.py | 17 ++++++++++++----- 1 files changed, 12 insertions(+), 5 deletions(-) diffs (43 lines): diff -r 0ae6238d37ce -r d58f8dff7331 src/history_manager.py --- a/src/history_manager.py Tue May 24 22:43:42 2011 +0200 +++ b/src/history_manager.py Wed May 25 19:11:04 2011 +0400 @@ -256,6 +256,7 @@ 'database filesize, click YES, else click NO.' '\n\nIn case you click YES, please wait...'), on_response_yes=on_yes, on_response_no=on_no) + dialog.set_title(_('Database Cleanup')) button_box = dialog.get_children()[0].get_children()[1] button_box.get_children()[0].grab_focus() @@ -586,13 +587,18 @@ self.AT_LEAST_ONE_DELETION_DONE = True - pri_text = i18n.ngettext( - 'Do you really want to delete logs of the selected contact?', - 'Do you really want to delete logs of the selected contacts?', - paths_len) - dialog = dialogs.ConfirmationDialog(pri_text, + if paths_len == 1: + jid_id = '<i>%s</i>' % liststore[list_of_paths[0]][0] + pri_text = _('Do you really want to delete the logs of %(jid)s?') \ + % {'jid': jid_id} + else: + pri_text = _( + 'Do you really want to delete logs of the selected contacts?') + dialog = dialogs.ConfirmationDialog('', _('This is an irreversible operation.'), on_response_ok=(on_ok, liststore, list_of_paths)) + dialog.set_title(_('Deletion Confirmation')) + dialog.set_markup(pri_text) ok_button = dialog.get_children()[0].get_children()[1].get_children()[0] ok_button.grab_focus() dialog.set_transient_for(self.window) @@ -630,6 +636,7 @@ dialog = dialogs.ConfirmationDialog(pri_text, _('This is an irreversible operation.'), on_response_ok=(on_ok, liststore, list_of_paths)) + dialog.set_title(_('Deletion Confirmation')) ok_button = dialog.get_children()[0].get_children()[1].get_children()[0] ok_button.grab_focus() dialog.set_transient_for(self.window)

1 0

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

Commits May 2011