Commits September 2013

commits@gajim.org

2 participants
122 discussions

gajim: ChangePasswordDialog set transient_for. See #7185
by Gajim 07 Sep '13

07 Sep '13

changeset 4599fa734cf9 in /home/hg/repos/gajim author: Denis Fomin <fominde(a)gmail.com> branches: gajim_0.16 details:http://hg.gajim.org/gajim?cmd=changeset;node=4599fa734cf9 description: ChangePasswordDialog set transient_for. See #7185 diffstat: src/config.py | 3 ++- src/dialogs.py | 3 ++- 2 файлов изменено, 4 вставок(+), 2 удалений(-) различия (33 строк): diff -r 901002a01074 -r 4599fa734cf9 src/config.py --- a/src/config.py Sat Sep 07 21:50:18 2013 +0400 +++ b/src/config.py Sat Sep 07 22:06:48 2013 +0400 @@ -2277,7 +2277,8 @@ new_password) try: - dialogs.ChangePasswordDialog(self.current_account, on_changed) + dialogs.ChangePasswordDialog(self.current_account, on_changed, + self.window) except GajimGeneralException: # if we showed ErrorDialog, there will not be dialog instance return diff -r 901002a01074 -r 4599fa734cf9 src/dialogs.py --- a/src/dialogs.py Sat Sep 07 21:50:18 2013 +0400 +++ b/src/dialogs.py Sat Sep 07 22:06:48 2013 +0400 @@ -2844,7 +2844,7 @@ gajim.interface.new_chat_from_jid(self.account, jid) class ChangePasswordDialog: - def __init__(self, account, on_response): + def __init__(self, account, on_response, transient_for=None): # 'account' can be None if we are about to create our first one if not account or gajim.connections[account].connected < 2: ErrorDialog(_('You are not connected to the server'), @@ -2854,6 +2854,7 @@ self.on_response = on_response self.xml = gtkgui_helpers.get_gtk_builder('change_password_dialog.ui') self.dialog = self.xml.get_object('change_password_dialog') + self.dialog.set_transient_for(transient_for) self.password1_entry = self.xml.get_object('password1_entry') self.password2_entry = self.xml.get_object('password2_entry') self.dialog.connect('response', self.on_dialog_response)

1 0

gajim: [Darlan] Transient dialogs. See #7185
by Gajim 07 Sep '13

07 Sep '13

changeset 901002a01074 in /home/hg/repos/gajim author: Denis Fomin <fominde(a)gmail.com> branches: gajim_0.16 details:http://hg.gajim.org/gajim?cmd=changeset;node=901002a01074 description: [Darlan] Transient dialogs. See #7185 diffstat: src/config.py | 3 ++- src/gui_interface.py | 2 +- 2 файлов изменено, 3 вставок(+), 2 удалений(-) различия (25 строк): diff -r ba4dd518a8e7 -r 901002a01074 src/config.py --- a/src/config.py Thu Sep 05 12:15:28 2013 +0400 +++ b/src/config.py Sat Sep 07 21:50:18 2013 +0400 @@ -2139,7 +2139,8 @@ message = _('Enter a new name for account %s') % self.current_account old_text = self.current_account dialogs.InputDialog(title, message, old_text, is_modal=False, - ok_handler=(on_renamed, self.current_account)) + ok_handler=(on_renamed, self.current_account), + transient_for=self.window) def option_changed(self, option, value): return gajim.config.get_per('accounts', self.current_account, option) \ diff -r ba4dd518a8e7 -r 901002a01074 src/gui_interface.py --- a/src/gui_interface.py Thu Sep 05 12:15:28 2013 +0400 +++ b/src/gui_interface.py Sat Sep 07 21:50:18 2013 +0400 @@ -1175,7 +1175,7 @@ dlg = dialogs.InputDialog(_('Username Conflict'), _('Please type a new username for your local account'), input_str=obj.alt_name, is_modal=True, ok_handler=on_ok, - cancel_handler=on_cancel) + cancel_handler=on_cancel, transient_for=self.roster.window) def handle_event_resource_conflict(self, obj): # ('RESOURCE_CONFLICT', account, ())

1 0

gajim: Fix sensitive for file transfer button
by Gajim 05 Sep '13

05 Sep '13

changeset ba4dd518a8e7 in /home/hg/repos/gajim author: Denis Fomin <fominde(a)gmail.com> branches: gajim_0.16 details:http://hg.gajim.org/gajim?cmd=changeset;node=ba4dd518a8e7 description: Fix sensitive for file transfer button diffstat: src/chat_control.py | 7 ++++--- 1 файлов изменено, 4 вставок(+), 3 удалений(-) различия (22 строк): diff -r 9c6487d0be7c -r ba4dd518a8e7 src/chat_control.py --- a/src/chat_control.py Wed Sep 04 18:01:57 2013 +0400 +++ b/src/chat_control.py Thu Sep 05 12:15:28 2013 +0400 @@ -1773,14 +1773,15 @@ # Send file if ((self.contact.supports(NS_FILE) or \ - self.contact.supports(NS_JINGLE_FILE_TRANSFER)) or \ - self.type_id == 'chat' or self.gc_contact.resource) and \ + self.contact.supports(NS_JINGLE_FILE_TRANSFER)) and \ + (self.type_id == 'chat' or self.gc_contact.resource)) and \ self.contact.show != 'offline': self._send_file_button.set_sensitive(True) self._send_file_button.set_tooltip_text(_('Send files')) else: self._send_file_button.set_sensitive(False) - if not (self.contact.supports(NS_FILE) or self.contact.supports(NS_JINGLE_FILE_TRANSFER)): + if not (self.contact.supports(NS_FILE) or self.contact.supports( + NS_JINGLE_FILE_TRANSFER)): self._send_file_button.set_tooltip_text(_( "This contact does not support file transfer.")) else:

1 0

gajim-plugins: UrlShortenerPlugin. Fix deactivation
by Gajim Plugins 04 Sep '13

04 Sep '13

changeset 60595dfa0f19 in /home/hg/repos/gajim-plugins author: Denis Fomin <fominde(a)gmail.com> branches: details:gajim-plugins?cmd=changeset;node=60595dfa0f19 description: UrlShortenerPlugin. Fix deactivation diffstat: url_shortener/manifest.ini | 2 +- url_shortener/url_shortener.py | 2 ++ 2 файлов изменено, 3 вставок(+), 1 удалений(-) различия (24 строк): diff -r b024c3868083 -r 60595dfa0f19 url_shortener/manifest.ini --- a/url_shortener/manifest.ini Sun Sep 01 22:33:43 2013 -0400 +++ b/url_shortener/manifest.ini Wed Sep 04 21:54:48 2013 +0400 @@ -1,7 +1,7 @@ [info] name: Url Shortener short_name: url_shortener -version: 0.3.3 +version: 0.3.4 description: Plugin that allows users to shorten a long URL in messages.<br/> For example, you can turn this link:<br/> <a href="http://maps.google.com/maps?f=d&saddr=New+York+Penn+Station&daddr=9…">http://maps.google.com/maps?f=d&saddr=New+York+Penn+Station&daddr=9…</a><br/> diff -r b024c3868083 -r 60595dfa0f19 url_shortener/url_shortener.py --- a/url_shortener/url_shortener.py Sun Sep 01 22:33:43 2013 -0400 +++ b/url_shortener/url_shortener.py Wed Sep 04 21:54:48 2013 +0400 @@ -104,6 +104,8 @@ self.chat_control.handlers[self.id_] = self.textview.tv def print_special_text(self, special_text, other_tags, graphics=True): + if not self.plugin.active: + return is_xhtml_link = None text_is_valid_uri = False buffer_ = self.textview.tv.get_buffer()

1 0

gajim-plugins: UrlShortenerPlugin. Fix deactivation
by Gajim Plugins 04 Sep '13

04 Sep '13

changeset 8f2c9095f69c in /home/hg/repos/gajim-plugins author: Denis Fomin <fominde(a)gmail.com> branches: gajim_0.15 details:gajim-plugins?cmd=changeset;node=8f2c9095f69c description: UrlShortenerPlugin. Fix deactivation diffstat: url_shortener/manifest.ini | 2 +- url_shortener/url_shortener.py | 2 ++ 2 файлов изменено, 3 вставок(+), 1 удалений(-) различия (24 строк): diff -r f2335ee0b8d9 -r 8f2c9095f69c url_shortener/manifest.ini --- a/url_shortener/manifest.ini Tue Aug 20 13:39:40 2013 +0400 +++ b/url_shortener/manifest.ini Wed Sep 04 21:57:11 2013 +0400 @@ -1,7 +1,7 @@ [info] name: Url Shortener short_name: url_shortener -version: 0.3.3 +version: 0.3.4 description: Plugin that allows users to shorten a long URL in messages. For example, you can turn this link: http://maps.google.com/maps?f=d&saddr=New+York+Penn+Station&daddr=9th+Ave+%… diff -r f2335ee0b8d9 -r 8f2c9095f69c url_shortener/url_shortener.py --- a/url_shortener/url_shortener.py Tue Aug 20 13:39:40 2013 +0400 +++ b/url_shortener/url_shortener.py Wed Sep 04 21:57:11 2013 +0400 @@ -113,6 +113,8 @@ self.chat_control.handlers[self.id_] = self.textview.tv def print_special_text(self, special_text, other_tags, graphics=True): + if not self.plugin.active: + return is_xhtml_link = None text_is_valid_uri = False buffer_ = self.textview.tv.get_buffer()

1 0

gajim-plugins: UrlShortenerPlugin. gc support
by Gajim Plugins 04 Sep '13

04 Sep '13

changeset 71ca477abd63 in /home/hg/repos/gajim-plugins author: Denis Fomin <fominde(a)gmail.com> branches: gtk3 details:gajim-plugins?cmd=changeset;node=71ca477abd63 description: UrlShortenerPlugin. gc support diffstat: url_shortener/manifest.ini | 2 +- url_shortener/url_shortener.py | 12 ++++++++++++ 2 файлов изменено, 13 вставок(+), 1 удалений(-) различия (45 строк): diff -r 820e94f4b5fb -r 71ca477abd63 url_shortener/manifest.ini --- a/url_shortener/manifest.ini Tue Aug 20 13:39:40 2013 +0400 +++ b/url_shortener/manifest.ini Wed Sep 04 22:05:43 2013 +0400 @@ -1,7 +1,7 @@ [info] name: Url Shortener short_name: url_shortener -version: 0.3.1 +version: 0.3.2 description: Plugin that allows users to shorten a long URL in messages. For example, you can turn this link: https://trac.gajim.org/timeline diff -r 820e94f4b5fb -r 71ca477abd63 url_shortener/url_shortener.py --- a/url_shortener/url_shortener.py Tue Aug 20 13:39:40 2013 +0400 +++ b/url_shortener/url_shortener.py Wed Sep 04 22:05:43 2013 +0400 @@ -34,10 +34,15 @@ 'SHORTEN_OUTGOING': (False, ''),} self.events_handlers['message-outgoing'] = (ged.OUT_PRECORE, self.handle_outgoing_msg) + self.events_handlers['gc-message-outgoing'] = (ged.OUT_PRECORE, + self.handle_outgoing_msg) self.chat_control = None self.controls = [] + self.is_active = None def handle_outgoing_msg(self, event): + if not self.active: + return if not event.message: return if not self.config['SHORTEN_OUTGOING']: @@ -94,6 +99,13 @@ control.disconnect_from_chat_control() self.controls.remove(control) + def activate(self): + self.active = True + + def deactivate(self): + self.active = False + + class Base(object): def __init__(self, plugin, chat_control): self.plugin = plugin

1 0

gajim-plugins: UrlShortenerPlugin. coding style
by Gajim Plugins 04 Sep '13

04 Sep '13

changeset 4cebc64451dc in /home/hg/repos/gajim-plugins author: Denis Fomin <fominde(a)gmail.com> branches: gtk3 details:gajim-plugins?cmd=changeset;node=4cebc64451dc description: UrlShortenerPlugin. coding style diffstat: gui_for_me/gui_for_me.py | 2 +- url_shortener/manifest.ini | 2 +- url_shortener/url_shortener.py | 15 ++++----------- 3 файлов изменено, 6 вставок(+), 13 удалений(-) различия (58 строк): diff -r 71ca477abd63 -r 4cebc64451dc gui_for_me/gui_for_me.py --- a/gui_for_me/gui_for_me.py Wed Sep 04 22:05:43 2013 +0400 +++ b/gui_for_me/gui_for_me.py Thu Aug 15 12:27:51 2013 +0400 @@ -56,7 +56,7 @@ self.create_buttons() def create_buttons(self): - # create juick button + # create /me button actions_hbox = self.chat_control.xml.get_object('actions_hbox') self.button = Gtk.Button(label=None, stock=None, use_underline=True) self.button.set_property('relief', Gtk.ReliefStyle.NONE) diff -r 71ca477abd63 -r 4cebc64451dc url_shortener/manifest.ini --- a/url_shortener/manifest.ini Wed Sep 04 22:05:43 2013 +0400 +++ b/url_shortener/manifest.ini Thu Aug 15 12:27:51 2013 +0400 @@ -1,7 +1,7 @@ [info] name: Url Shortener short_name: url_shortener -version: 0.3.2 +version: 0.3.3 description: Plugin that allows users to shorten a long URL in messages. For example, you can turn this link: https://trac.gajim.org/timeline diff -r 71ca477abd63 -r 4cebc64451dc url_shortener/url_shortener.py --- a/url_shortener/url_shortener.py Wed Sep 04 22:05:43 2013 +0400 +++ b/url_shortener/url_shortener.py Thu Aug 15 12:27:51 2013 +0400 @@ -32,13 +32,12 @@ 'MAX_CHARS': (50, ('MAX_CHARS(30-...)')), 'IN_MAX_CHARS': (50, ('MAX_CHARS(30-...)')), 'SHORTEN_OUTGOING': (False, ''),} - self.events_handlers['message-outgoing'] = (ged.OUT_PRECORE, - self.handle_outgoing_msg) - self.events_handlers['gc-message-outgoing'] = (ged.OUT_PRECORE, - self.handle_outgoing_msg) + self.events_handlers = {'message-outgoing': (ged.OUT_PRECORE, + self.handle_outgoing_msg), + 'gc-message-outgoing': (ged.OUT_PRECORE, + self.handle_outgoing_msg)} self.chat_control = None self.controls = [] - self.is_active = None def handle_outgoing_msg(self, event): if not self.active: @@ -99,12 +98,6 @@ control.disconnect_from_chat_control() self.controls.remove(control) - def activate(self): - self.active = True - - def deactivate(self): - self.active = False - class Base(object): def __init__(self, plugin, chat_control):

1 0

gajim-plugins: UrlShortenerPlugin. Fix deactivation
by Gajim Plugins 04 Sep '13

04 Sep '13

changeset b08c72baa3af in /home/hg/repos/gajim-plugins author: Denis Fomin <fominde(a)gmail.com> branches: gtk3 details:gajim-plugins?cmd=changeset;node=b08c72baa3af description: UrlShortenerPlugin. Fix deactivation diffstat: url_shortener/manifest.ini | 2 +- url_shortener/url_shortener.py | 2 ++ 2 файлов изменено, 3 вставок(+), 1 удалений(-) различия (24 строк): diff -r 4cebc64451dc -r b08c72baa3af url_shortener/manifest.ini --- a/url_shortener/manifest.ini Thu Aug 15 12:27:51 2013 +0400 +++ b/url_shortener/manifest.ini Wed Sep 04 21:57:11 2013 +0400 @@ -1,7 +1,7 @@ [info] name: Url Shortener short_name: url_shortener -version: 0.3.3 +version: 0.3.4 description: Plugin that allows users to shorten a long URL in messages. For example, you can turn this link: https://trac.gajim.org/timeline diff -r 4cebc64451dc -r b08c72baa3af url_shortener/url_shortener.py --- a/url_shortener/url_shortener.py Thu Aug 15 12:27:51 2013 +0400 +++ b/url_shortener/url_shortener.py Wed Sep 04 21:57:11 2013 +0400 @@ -110,6 +110,8 @@ self.chat_control.handlers[self.id_] = self.textview.tv def print_special_text(self, special_text, other_tags, graphics=True): + if not self.plugin.active: + return is_xhtml_link = None text_is_valid_uri = False buffer_ = self.textview.tv.get_buffer()

1 0

gajim: add time of stanza in XML console
by Gajim 04 Sep '13

04 Sep '13

changeset 5dfc7eae3e90 in /home/hg/repos/gajim author: Yann Leboulanger <asterix(a)lagaule.org> branches: details:http://hg.gajim.org/gajim?cmd=changeset;node=5dfc7eae3e90 description: add time of stanza in XML console diffstat: src/dialogs.py | 7 +++++-- 1 files changed, 5 insertions(+), 2 deletions(-) diffs (25 lines): diff -r 078d34fe00e1 -r 5dfc7eae3e90 src/dialogs.py --- a/src/dialogs.py Tue Sep 03 21:17:36 2013 +0200 +++ b/src/dialogs.py Wed Sep 04 17:31:12 2013 +0200 @@ -33,6 +33,7 @@ import gobject import os import nbxmpp +import time import gtkgui_helpers import vcard @@ -3423,9 +3424,11 @@ type_ = kind # 'incoming' or 'outgoing' if kind == 'incoming': - buffer.insert_with_tags_by_name(end_iter, '\n', type_) + buffer.insert_with_tags_by_name(end_iter, '\n' % \ + time.strftime('%c'), type_) elif kind == 'outgoing': - buffer.insert_with_tags_by_name(end_iter, '\n', type_) + buffer.insert_with_tags_by_name(end_iter, '\n' % \ + time.strftime('%c'), type_) end_iter = buffer.get_end_iter() buffer.insert_with_tags_by_name(end_iter, stanza.replace('><', '>\n<') \ + '\n\n', type_)

1 0

gajim: Fix 'document-open-recent' icon problem. Fixes #7444
by Gajim 04 Sep '13

04 Sep '13

changeset 9c6487d0be7c in /home/hg/repos/gajim author: Denis Fomin <fominde(a)gmail.com> branches: gajim_0.16 details:http://hg.gajim.org/gajim?cmd=changeset;node=9c6487d0be7c description: Fix 'document-open-recent' icon problem. Fixes #7444 diffstat: src/groupchat_control.py | 10 ++++++---- src/gui_menu_builder.py | 5 +++-- src/roster_window.py | 6 ++++-- 3 файлов изменено, 13 вставок(+), 8 удалений(-) различия (59 строк): diff -r 5eae49e90205 -r 9c6487d0be7c src/groupchat_control.py --- a/src/groupchat_control.py Tue Sep 03 23:29:20 2013 +0400 +++ b/src/groupchat_control.py Wed Sep 04 18:01:57 2013 +0400 @@ -823,11 +823,13 @@ request_voice_separator = xml.get_object('request_voice_separator') if gtkgui_helpers.gtk_icon_theme.has_icon('bookmark-new'): - gtkgui_helpers.add_image_to_menuitem(bookmark_room_menuitem, - 'bookmark-new') + img = gtk.Image() + img.set_from_icon_name('bookmark-new', gtk.ICON_SIZE_MENU) + bookmark_room_menuitem.set_image(img) if gtkgui_helpers.gtk_icon_theme.has_icon('document-open-recent'): - gtkgui_helpers.add_image_to_menuitem(history_menuitem, - 'document-open-recent') + img = gtk.Image() + img.set_from_icon_name('document-open-recent', gtk.ICON_SIZE_MENU) + history_menuitem.set_image(img) if hide_buttonbar_items: change_nick_menuitem.hide() diff -r 5eae49e90205 -r 9c6487d0be7c src/gui_menu_builder.py --- a/src/gui_menu_builder.py Tue Sep 03 23:29:20 2013 +0400 +++ b/src/gui_menu_builder.py Wed Sep 04 18:01:57 2013 +0400 @@ -254,8 +254,9 @@ account) history_menuitem.connect('activate', roster.on_history, contact, account) if gtkgui_helpers.gtk_icon_theme.has_icon('document-open-recent'): - gtkgui_helpers.add_image_to_menuitem(history_menuitem, - 'document-open-recent') + img = gtk.Image() + img.set_from_icon_name('document-open-recent', gtk.ICON_SIZE_MENU) + history_menuitem.set_image(img) if control: convert_to_gc_menuitem.connect('activate', diff -r 5eae49e90205 -r 9c6487d0be7c src/roster_window.py --- a/src/roster_window.py Tue Sep 03 23:29:20 2013 +0400 +++ b/src/roster_window.py Wed Sep 04 18:01:57 2013 +0400 @@ -4331,6 +4331,7 @@ w.set_sensitive(True) def on_view_menu_activate(self, widget): + self.make_menu() # Hide the show roster menu if we are not in the right windowing mode. if self.hpaned.get_child2() is not None: self.xml.get_object('show_roster_menuitem').show() @@ -5219,8 +5220,9 @@ return history_menuitem = self.xml.get_object('history_menuitem') if gtkgui_helpers.gtk_icon_theme.has_icon('document-open-recent'): - gtkgui_helpers.add_image_to_menuitem(history_menuitem, - 'document-open-recent') + img = gtk.Image() + img.set_from_icon_name('document-open-recent', gtk.ICON_SIZE_MENU) + history_menuitem.set_image(img) new_chat_menuitem = self.xml.get_object('new_chat_menuitem') single_message_menuitem = self.xml.get_object( 'send_single_message_menuitem')

1 0

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

Commits September 2013