Commits

commits@gajim.org

17632 discussions

gajim: add monotonic to the list of ignored modules by demandimp...
by Yann Leboulanger 24 Aug '13

24 Aug '13

changeset 58cf0abfcab7 in /home/hg/repos/gajim branches: gajim_0.16 details:http://hg.gajim.org/gajim?cmd=changeset;node=58cf0abfcab7 description: add monotonic to the list of ignored modules by demandimport. Fixes #7409 diffstat: src/gajim.py | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diffs (13 lines): diff -r 5ea890ec4680 -r 58cf0abfcab7 src/gajim.py --- a/src/gajim.py Fri Aug 16 09:39:10 2013 +0200 +++ b/src/gajim.py Fri Aug 16 09:55:55 2013 +0200 @@ -73,7 +73,8 @@ demandimport.ignore += ['gobject._gobject', 'libasyncns', 'i18n', 'logging.NullHandler', 'dbus.service', 'OpenSSL.SSL', 'OpenSSL.crypto', 'common.sleepy', 'DLFCN', 'dl', 'xml.sax', 'xml.sax.handler', 'ic', - 'Crypto.PublicKey', 'IPython', 'contextlib', 'imp', 'gst.interfaces'] + 'Crypto.PublicKey', 'IPython', 'contextlib', 'imp', 'gst.interfaces', + 'monotonic'] if os.name == 'nt': import locale

1 0

gajim: Update russian translation
by Denis Fomin 24 Aug '13

24 Aug '13

changeset 5b2243cc067b in /home/hg/repos/gajim branches: gajim_0.16 details:http://hg.gajim.org/gajim?cmd=changeset;node=5b2243cc067b description: Update russian translation diffstat: po/ru.po | 46 ++++++++++++++++++---------------------------- 1 files changed, 18 insertions(+), 28 deletions(-) diffs (193 lines): diff -r 58cf0abfcab7 -r 5b2243cc067b po/ru.po --- a/po/ru.po Fri Aug 16 09:55:55 2013 +0200 +++ b/po/ru.po Fri Aug 16 13:14:53 2013 +0400 @@ -13,7 +13,7 @@ "Project-Id-Version: ru\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2013-08-08 01:12+0400\n" -"PO-Revision-Date: 2013-08-08 01:38+0300\n" +"PO-Revision-Date: 2013-08-16 13:10+0300\n" "Last-Translator: Fomin Denis <fominde(a)gmail.com>\n" "Language-Team: Linux Support LLC\n" "Language: ru\n" @@ -244,9 +244,8 @@ msgstr "Gajim" #: ../data/gui/accounts_window.ui.h:10 -#, fuzzy msgid "Synchronize contacts" -msgstr "Заблокированные контакты" +msgstr "Синхронизировать контакты" #: ../data/gui/accounts_window.ui.h:11 msgid "Click to request authorization to all contacts of another account" @@ -634,7 +633,6 @@ "вступили в силу" #: ../data/gui/advanced_configuration_window.ui.h:5 -#, fuzzy msgid "_Reset to default" msgstr "_Сбросить до исходных" @@ -863,7 +861,6 @@ msgstr "Пригласить к беседе (Ctrl+G)" #: ../data/gui/chat_control.ui.h:4 -#, fuzzy msgid "View contact information (Ctrl+I)" msgstr "Показать информацию о контакте (Ctrl+I)" @@ -1427,9 +1424,8 @@ msgstr "_Сохранять историю переписки" #: ../data/gui/history_window.ui.h:9 -#, fuzzy msgid "_Show status changes" -msgstr "Состояние хранилища и изменения" +msgstr "Показывать изменения _статуса" #: ../data/gui/item_archiving_preferences_window.ui.h:1 #, fuzzy @@ -3214,7 +3210,7 @@ #: ../src/chat_control.py:1764 msgid "Formattings are not available when GPG is active" -msgstr "" +msgstr "Форматирование невозможно если включено GPG" #: ../src/chat_control.py:1767 msgid "This contact does not support HTML" @@ -3509,7 +3505,7 @@ msgstr "" #: ../src/command_system/implementation/standard.py:99 -#, fuzzy, python-format +#, python-format msgid "%s: Nothing found" msgstr "%s: Ничего не найдено" @@ -5011,7 +5007,6 @@ msgstr "морской" #: ../src/common/config.py:555 -#, fuzzy msgid "Tor" msgstr "Tor" @@ -8573,6 +8568,7 @@ "Requires pybonjour and bonjour SDK running (http://developer.apple.com/" "opensource/)." msgstr "" +"Требует pybonjour и bonjour SDK (http://developer.apple.com/opensource/)." #: ../src/features_window.py:58 msgid "Command line" @@ -8748,13 +8744,12 @@ msgstr "Требует python-farstream и gstreamer-plugins-bad." #: ../src/features_window.py:106 -#, fuzzy msgid "UPnP-IGD" -msgstr "Требует python-gupnp-igd." +msgstr "UPnP-IGD" #: ../src/features_window.py:107 msgid "Ability to request your router to forward port for file transfer." -msgstr "" +msgstr "Возможность запроса порта для передачи файлов у роутера." #: ../src/features_window.py:108 msgid "Requires python-gupnp-igd." @@ -8766,7 +8761,7 @@ #: ../src/features_window.py:111 msgid "Ability to disconnect properly just before suspending the machine." -msgstr "" +msgstr "Возможность отключиться перед уходом машины в сон." #: ../src/features_window.py:112 msgid "Requires upower and python-dbus." @@ -8841,6 +8836,8 @@ "received.\n" "Do you want to reload it?" msgstr "" +"Файл %(file)s был получен, но возможно с ошибками.\n" +"Хотите загрузить его еще раз?" #: ../src/filetransfers_window.py:313 msgid "Choose File to Send..." @@ -9048,9 +9045,8 @@ #: ../src/gajim-remote.py:238 ../src/gajim-remote.py:245 #: ../src/gajim-remote.py:256 ../src/gajim-remote.py:281 #: ../src/gajim-remote.py:292 -#, fuzzy msgid "?CLI:account" -msgstr "Учетная запись" +msgstr "?CLI:учетная запись" #: ../src/gajim-remote.py:97 msgid "show only contacts of the given account" @@ -9066,9 +9062,8 @@ #. offline, online, chat, away, xa, dnd, invisible should not be translated #: ../src/gajim-remote.py:110 -#, fuzzy msgid "?CLI:status" -msgstr "Сообщение о статусе %s" +msgstr "?CLI:статус" #: ../src/gajim-remote.py:110 msgid "" @@ -9081,9 +9076,8 @@ #: ../src/gajim-remote.py:111 ../src/gajim-remote.py:134 #: ../src/gajim-remote.py:145 ../src/gajim-remote.py:159 #: ../src/gajim-remote.py:170 ../src/gajim-remote.py:283 -#, fuzzy msgid "?CLI:message" -msgstr "%(nickname)s: %(message)s" +msgstr "?CLI:сообщение" #: ../src/gajim-remote.py:111 msgid "status message" @@ -9103,9 +9097,8 @@ msgstr "Изменяет приоритет учетной записи или записей" #: ../src/gajim-remote.py:120 -#, fuzzy msgid "?CLI:priority" -msgstr "Неизвестный приоритет %s" +msgstr "?CLI:приоритет" #: ../src/gajim-remote.py:120 msgid "priority you want to give to the account" @@ -9353,27 +9346,24 @@ msgstr "Присоединиться к комнате MUC" #: ../src/gajim-remote.py:289 -#, fuzzy msgid "?CLI:room" -msgstr " в комнате %s" +msgstr "?CLI:комната" #: ../src/gajim-remote.py:289 msgid "Room JID" msgstr "JID комнаты" #: ../src/gajim-remote.py:290 -#, fuzzy msgid "?CLI:nick" -msgstr "Произнесено имя" +msgstr "?CLI:ник" #: ../src/gajim-remote.py:290 msgid "Nickname to use" msgstr "Используемый ник" #: ../src/gajim-remote.py:291 -#, fuzzy msgid "?CLI:password" -msgstr "Изменить пароль" +msgstr "?CLI:пароль" #: ../src/gajim-remote.py:291 msgid "Password to enter the room"

1 0

gajim: add ability to handle urls in htmltextview.
by Yann Leboulanger 24 Aug '13

24 Aug '13

changeset 5ccb7bd9fe55 in /home/hg/repos/gajim branches: gajim_0.16 details:http://hg.gajim.org/gajim?cmd=changeset;node=5ccb7bd9fe55 description: add ability to handle urls in htmltextview. diffstat: src/conversation_textview.py | 35 +------ src/htmltextview.py | 194 ++++++++++++++++++++++++++++++++++++++---- 2 files changed, 181 insertions(+), 48 deletions(-) diffs (truncated from 310 to 300 lines): diff -r 5b2243cc067b -r 5ccb7bd9fe55 src/conversation_textview.py --- a/src/conversation_textview.py Fri Aug 16 13:14:53 2013 +0400 +++ b/src/conversation_textview.py Fri Aug 16 14:06:52 2013 +0200 @@ -298,31 +298,7 @@ color = gajim.config.get('restored_messages_color') tag.set_property('foreground', color) - self.tagURL = buffer_.create_tag('url') - color = gajim.config.get('urlmsgcolor') - self.tagURL.set_property('foreground', color) - self.tagURL.set_property('underline', pango.UNDERLINE_SINGLE) - id_ = self.tagURL.connect('event', self.hyperlink_handler, 'url') - self.handlers[id_] = self.tagURL - - self.tagMail = buffer_.create_tag('mail') - self.tagMail.set_property('foreground', color) - self.tagMail.set_property('underline', pango.UNDERLINE_SINGLE) - id_ = self.tagMail.connect('event', self.hyperlink_handler, 'mail') - self.handlers[id_] = self.tagMail - - self.tagXMPP = buffer_.create_tag('xmpp') - self.tagXMPP.set_property('foreground', color) - self.tagXMPP.set_property('underline', pango.UNDERLINE_SINGLE) - id_ = self.tagXMPP.connect('event', self.hyperlink_handler, 'xmpp') - self.handlers[id_] = self.tagXMPP - - self.tagSthAtSth = buffer_.create_tag('sth_at_sth') - self.tagSthAtSth.set_property('foreground', color) - self.tagSthAtSth.set_property('underline', pango.UNDERLINE_SINGLE) - id_ = self.tagSthAtSth.connect('event', self.hyperlink_handler, - 'sth_at_sth') - self.handlers[id_] = self.tagSthAtSth + self.tv.create_tags() tag = buffer_.create_tag('bold') tag.set_property('weight', pango.WEIGHT_BOLD) @@ -369,8 +345,11 @@ self.tagOut.set_property('foreground', gajim.config.get('outmsgcolor')) self.tagStatus.set_property('foreground', gajim.config.get('statusmsgcolor')) - self.tagURL.set_property('foreground', gajim.config.get('urlmsgcolor')) - self.tagMail.set_property('foreground', gajim.config.get('urlmsgcolor')) + color = gajim.config.get('urlmsgcolor') + self.tv.tagURL.set_property('foreground', color) + self.tv.tagMail.set_property('foreground', color) + self.tv.tagXMPP.set_property('foreground', color) + self.tv.tagSthAtSth.set_property('foreground', color) def at_the_end(self): buffer_ = self.tv.get_buffer() @@ -1463,7 +1442,7 @@ try: if name and (text.startswith('/me ') or text.startswith('/me\n')): xhtml = xhtml.replace('/me', '<i>* %s</i>' % (name,), 1) - self.tv.display_html(xhtml.encode('utf-8'), self) + self.tv.display_html(xhtml.encode('utf-8'), self.tv, self) return except Exception, e: gajim.log.debug('Error processing xhtml' + str(e)) diff -r 5b2243cc067b -r 5ccb7bd9fe55 src/htmltextview.py --- a/src/htmltextview.py Fri Aug 16 13:14:53 2013 +0400 +++ b/src/htmltextview.py Fri Aug 16 14:06:52 2013 +0200 @@ -210,10 +210,10 @@ It keeps a stack of "style spans" (start/end element pairs) and a stack of list counters, for nested lists. """ - def __init__(self, conv_textview, startiter): + def __init__(self, textview, conv_textview, startiter): xml.sax.handler.ContentHandler.__init__(self) - self.textbuf = conv_textview.tv.get_buffer() - self.textview = conv_textview.tv + self.textbuf = textview.get_buffer() + self.textview = textview self.iter = startiter self.conv_textview = conv_textview self.text = '' @@ -512,15 +512,16 @@ (mem, alt, replace_mark) = loaded update = True else: - img_mark = self.textbuf.create_mark(None, self.iter, True) - gajim.thread_interface(helpers.download_image, [ - self.conv_textview.account, attrs], self._update_img, - [attrs, img_mark]) - alt = attrs.get('alt', '') - if alt: - alt += '\n' - alt += _('Loading') - pixbuf = get_icon_pixmap('gajim-receipt_missing') + if self.conv_textview: + img_mark = self.textbuf.create_mark(None, self.iter, True) + gajim.thread_interface(helpers.download_image, [ + self.conv_textview.account, attrs], self._update_img, + [attrs, img_mark]) + alt = attrs.get('alt', '') + if alt: + alt += '\n' + alt += _('Loading') + pixbuf = get_icon_pixmap('gajim-receipt_missing') if mem: # Caveat: GdkPixbuf is known not to be safe to load # images from network... this program is now potentially @@ -653,8 +654,11 @@ return False def handle_specials(self, text): - self.iter = self.conv_textview.detect_and_print_special_text(text, - self._get_style_tags()) + if self.conv_textview: + self.iter = self.conv_textview.detect_and_print_special_text(text, + self._get_style_tags()) + else: + self._insert_text(text) def characters(self, content): if self.preserve: @@ -758,9 +762,11 @@ #FIXME: plenty of unused attributes (width, height,...) :) self._jump_line() try: - self.textbuf.insert_pixbuf(self.iter, - self.textview.focus_out_line_pixbuf) - #self._insert_text(u'\u2550'*40) + if self.conv_textbuf: + self.conv_textbuf.insert_pixbuf(self.iter, + self.conv_textview.focus_out_line_pixbuf) + else: + self._insert_text(u'\u2550'*40) self._jump_line() except Exception, e: log.debug(str('Error in hr'+e)) @@ -808,12 +814,38 @@ self.connect('copy-clipboard', self.on_html_text_view_copy_clipboard) self.id_ = self.connect('button-release-event', self.on_left_mouse_button_release) - self.get_buffer().create_tag('eol', scale = pango.SCALE_XX_SMALL) + buffer_ = self.get_buffer() + buffer_.create_tag('eol', scale = pango.SCALE_XX_SMALL) + self.tooltip = tooltips.BaseTooltip() self.config = gajim.config self.interface = gajim.interface # end big hack + def create_tags(self): + buffer_ = self.get_buffer() + + self.tagURL = buffer_.create_tag('url') + color = gajim.config.get('urlmsgcolor') + self.tagURL.set_property('foreground', color) + self.tagURL.set_property('underline', pango.UNDERLINE_SINGLE) + self.tagURL.connect('event', self._hyperlink_handler, 'url') + + self.tagMail = buffer_.create_tag('mail') + self.tagMail.set_property('foreground', color) + self.tagMail.set_property('underline', pango.UNDERLINE_SINGLE) + self.tagMail.connect('event', self._hyperlink_handler, 'mail') + + self.tagXMPP = buffer_.create_tag('xmpp') + self.tagXMPP.set_property('foreground', color) + self.tagXMPP.set_property('underline', pango.UNDERLINE_SINGLE) + self.tagXMPP.connect('event', self._hyperlink_handler, 'xmpp') + + self.tagSthAtSth = buffer_.create_tag('sth_at_sth') + self.tagSthAtSth.set_property('foreground', color) + self.tagSthAtSth.set_property('underline', pango.UNDERLINE_SINGLE) + self.tagSthAtSth.connect('event', self._hyperlink_handler, 'sth_at_sth') + def __destroy_event(self, widget): if self.tooltip.timeout != 0: self.tooltip.hide_tooltip() @@ -864,14 +896,136 @@ self._changed_cursor = False return False - def display_html(self, html, conv_textview): + def on_open_link_activate(self, widget, kind, text): + helpers.launch_browser_mailer(kind, text) + + def on_copy_link_activate(self, widget, text): + clip = gtk.clipboard_get() + clip.set_text(text) + +# def on_start_chat_activate(self, widget, jid): +# gajim.interface.new_chat_from_jid(self.account, jid) + + def on_join_group_chat_menuitem_activate(self, widget, room_jid): + try: + dialogs.JoinGroupchatWindow(room_jid=room_jid) + except GajimGeneralException: + pass + + def on_add_to_roster_activate(self, widget, jid): + dialogs.AddNewContactWindow(self.account, jid) + + def make_link_menu(self, event, kind, text): + xml = gtkgui_helpers.get_gtk_builder('chat_context_menu.ui') + menu = xml.get_object('chat_context_menu') + childs = menu.get_children() + if kind == 'url': + childs[0].connect('activate', self.on_copy_link_activate, text) + childs[1].connect('activate', self.on_open_link_activate, kind, + text) + childs[2].hide() # copy mail address + childs[3].hide() # open mail composer + childs[4].hide() # jid section separator + childs[5].hide() # start chat + childs[6].hide() # join group chat + childs[7].hide() # add to roster + else: # It's a mail or a JID + # load muc icon + join_group_chat_menuitem = xml.get_object('join_group_chat_menuitem') + muc_icon = gtkgui_helpers.load_icon('muc_active') + if muc_icon: + join_group_chat_menuitem.set_image(muc_icon) + + text = text.lower() + if text.startswith('xmpp:'): + text = text[5:] + childs[2].connect('activate', self.on_copy_link_activate, text) + childs[3].connect('activate', self.on_open_link_activate, kind, + text) +# childs[5].connect('activate', self.on_start_chat_activate, text) + childs[6].connect('activate', + self.on_join_group_chat_menuitem_activate, text) + +# if self.account and gajim.connections[self.account].\ +# roster_supported: +# childs[7].connect('activate', +# self.on_add_to_roster_activate, text) +# childs[7].show() # show add to roster menuitem +# else: +# childs[7].hide() # hide add to roster menuitem + + if kind == 'xmpp': + childs[0].connect('activate', self.on_copy_link_activate, + 'xmpp:' + text) + childs[2].hide() # copy mail address + childs[3].hide() # open mail composer + elif kind == 'mail': + childs[6].hide() # join group chat + + if kind != 'xmpp': + childs[0].hide() # copy link location + childs[1].hide() # open link in browser + childs[4].hide() # jid section separator + childs[5].hide() # start chat + childs[7].hide() # add to roster + + menu.popup(None, None, None, event.button, event.time) + + def hyperlink_handler(self, texttag, widget, event, iter_, kind): + if event.type == gtk.gdk.BUTTON_PRESS: + begin_iter = iter_.copy() + # we get the begining of the tag + while not begin_iter.begins_tag(texttag): + begin_iter.backward_char() + end_iter = iter_.copy() + # we get the end of the tag + while not end_iter.ends_tag(texttag): + end_iter.forward_char() + + # Detect XHTML-IM link + word = getattr(texttag, 'href', None) + if word: + if word.startswith('xmpp'): + kind = 'xmpp' + elif word.startswith('mailto:'): + kind = 'mail' + elif gajim.interface.sth_at_sth_dot_sth_re.match(word): + # it's a JID or mail + kind = 'sth_at_sth' + else: + word = self.textview.get_buffer().get_text(begin_iter, + end_iter).decode('utf-8') + + if event.button == 3: # right click + self.make_link_menu(event, kind, word) + return True + else: + # we launch the correct application + if kind == 'xmpp': + word = word[5:] + if '?' in word: + (jid, action) = word.split('?') + if action == 'join': + self.on_join_group_chat_menuitem_activate(None, jid) + else: + self.on_start_chat_activate(None, jid) + else: + self.on_start_chat_activate(None, word) + else: + helpers.launch_browser_mailer(kind, word) + + def _hyperlink_handler(self, texttag, widget, event, iter_, kind): + # self.hyperlink_handler can be overwritten, so call it when needed + self.hyperlink_handler(texttag, widget, event, iter_, kind) + + def display_html(self, html, textview, conv_textview): buffer_ = self.get_buffer()

1 0

gajim: ability to show HTML in plugin descriptions
by Yann Leboulanger 24 Aug '13

24 Aug '13

changeset 2f25891c2c80 in /home/hg/repos/gajim branches: gajim_0.16 details:http://hg.gajim.org/gajim?cmd=changeset;node=2f25891c2c80 description: ability to show HTML in plugin descriptions diffstat: data/gui/plugins_window.ui | 15 ++++++--------- src/plugins/gui.py | 25 +++++++++++++++++++------ 2 files changed, 25 insertions(+), 15 deletions(-) diffs (83 lines): diff -r 5ccb7bd9fe55 -r 2f25891c2c80 data/gui/plugins_window.ui --- a/data/gui/plugins_window.ui Fri Aug 16 14:06:52 2013 +0200 +++ b/data/gui/plugins_window.ui Fri Aug 16 14:53:17 2013 +0200 @@ -248,17 +248,14 @@ </packing> </child> <child> - <object class="GtkTextView" id="plugin_description_textview"> + <object class="GtkScrolledWindow" id="scrolledwindow2"> <property name="visible">True</property> - <property name="sensitive">False</property> <property name="can_focus">True</property> - <property name="pixels_above_lines">6</property> - <property name="editable">False</property> - <property name="wrap_mode">word</property> - <property name="left_margin">6</property> - <property name="right_margin">6</property> - <property name="indent">1</property> - <property name="buffer">textbuffer1</property> + <property name="hscrollbar_policy">automatic</property> + <property name="vscrollbar_policy">automatic</property> + <child> + <placeholder/> + </child> </object> <packing> <property name="position">1</property> diff -r 5ccb7bd9fe55 -r 2f25891c2c80 src/plugins/gui.py --- a/src/plugins/gui.py Fri Aug 16 14:06:52 2013 +0200 +++ b/src/plugins/gui.py Fri Aug 16 14:53:17 2013 +0200 @@ -31,6 +31,7 @@ import gtkgui_helpers from dialogs import WarningDialog, YesNoDialog, ArchiveChooserDialog +from htmltextview import HtmlTextView from common import gajim from plugins.helpers import log_calls, log from plugins.helpers import GajimPluginActivateException @@ -57,13 +58,15 @@ widgets_to_extract = ('plugins_notebook', 'plugin_name_label', 'plugin_version_label', 'plugin_authors_label', - 'plugin_homepage_linkbutton', 'plugin_description_textview', - 'uninstall_plugin_button', 'configure_plugin_button', - 'installed_plugins_treeview') + 'plugin_homepage_linkbutton', 'uninstall_plugin_button', + 'configure_plugin_button', 'installed_plugins_treeview') for widget_name in widgets_to_extract: setattr(self, widget_name, self.xml.get_object(widget_name)) + self.plugin_description_textview = HtmlTextView() + sw = self.xml.get_object('scrolledwindow2') + sw.add(self.plugin_description_textview) attr_list = pango.AttrList() attr_list.insert(pango.AttrWeight(pango.WEIGHT_BOLD, 0, -1)) self.plugin_name_label.set_attributes(attr_list) @@ -140,12 +143,22 @@ self.plugin_homepage_linkbutton.set_label(plugin.homepage) self.plugin_homepage_linkbutton.set_property('sensitive', True) - desc_textbuffer = self.plugin_description_textview.get_buffer() + sw = self.xml.get_object('scrolledwindow2') + old_tv = sw.get_children()[0] + old_tv.destroy() + self.plugin_description_textview = HtmlTextView() + sw.add(self.plugin_description_textview) + sw.show_all() from plugins.plugins_i18n import _ txt = plugin.description + txt.replace('</body>', '') if plugin.available_text: - txt += '\n\n' + _('Warning: %s') % plugin.available_text - desc_textbuffer.set_text(txt) + txt += '<br/><br/>' + _('Warning: %s') % plugin.available_text + if not txt.startswith('<body '): + txt = '<body xmlns=\'http://www.w3.org/1999/xhtml\'>' + txt + txt += ' </body>' + self.plugin_description_textview.display_html(txt, + self.plugin_description_textview, None) self.plugin_description_textview.set_property('sensitive', True) self.uninstall_plugin_button.set_property('sensitive', gajim.PLUGINS_DIRS[1] in plugin.__path__)

1 0

gajim: make very E2E code transient for the calling window. See ...
by Yann Leboulanger 24 Aug '13

24 Aug '13

changeset 2a61daddb48b in /home/hg/repos/gajim branches: gajim_0.16 details:http://hg.gajim.org/gajim?cmd=changeset;node=2a61daddb48b description: make very E2E code transient for the calling window. See #7185 diffstat: src/dialogs.py | 10 +++++++--- 1 files changed, 7 insertions(+), 3 deletions(-) diffs (29 lines): diff -r 37e14b6aed6a -r 2a61daddb48b src/dialogs.py --- a/src/dialogs.py Thu Aug 15 15:11:51 2013 +0200 +++ b/src/dialogs.py Thu Aug 15 19:45:34 2013 +0200 @@ -1623,10 +1623,13 @@ """ def __init__(self, pritext, sectext='', checktext='', text_label=None, - on_response_yes=None, on_response_no=None, type_=gtk.MESSAGE_QUESTION): + on_response_yes=None, on_response_no=None, type_=gtk.MESSAGE_QUESTION, + transient_for=None): self.user_response_yes = on_response_yes self.user_response_no = on_response_no - if hasattr(gajim.interface, 'roster') and gajim.interface.roster: + if transient_for: + parent = transient_for + elif hasattr(gajim.interface, 'roster') and gajim.interface.roster: parent = gajim.interface.roster.window else: parent = None @@ -5149,7 +5152,8 @@ self.session.verified_identity = False self.update_info() - YesNoDialog(pritext, sectext, on_response_yes=on_yes, on_response_no=on_no) + YesNoDialog(pritext, sectext, on_response_yes=on_yes, + on_response_no=on_no, transient_for=self.window) class GPGInfoWindow: """

1 0

gajim: show error dialog of profile window transient for profile...
by Yann Leboulanger 24 Aug '13

24 Aug '13

changeset 296b7ab8b24f in /home/hg/repos/gajim branches: gajim_0.16 details:http://hg.gajim.org/gajim?cmd=changeset;node=296b7ab8b24f description: show error dialog of profile window transient for profile window. see #7185 diffstat: src/profile_window.py | 12 +++++++----- 1 files changed, 7 insertions(+), 5 deletions(-) diffs (50 lines): diff -r 2a61daddb48b -r 296b7ab8b24f src/profile_window.py --- a/src/profile_window.py Thu Aug 15 19:45:34 2013 +0200 +++ b/src/profile_window.py Thu Aug 15 22:20:13 2013 +0200 @@ -143,7 +143,8 @@ invalid_file = True if invalid_file: if True: # keep identation - dialogs.ErrorDialog(_('Could not load image'), msg) + dialogs.ErrorDialog(_('Could not load image'), msg, + transient_for=self.window) return if filesize > 16384: if scaled_pixbuf: @@ -159,7 +160,8 @@ # rescale it pixbuf = gtkgui_helpers.get_scaled_pixbuf(pixbuf, 'vcard') except AttributeError: # unknown format - dialogs.ErrorDialog(_('Could not load image')) + dialogs.ErrorDialog(_('Could not load image'), + transient_for=self.window) return self.dialog.destroy() self.dialog = None @@ -232,7 +234,7 @@ if not widget.is_focus(): pritext = _('Wrong date format') dialogs.ErrorDialog(pritext, _('Format of the date must be ' - 'YYYY-MM-DD')) + 'YYYY-MM-DD'), transient_for=self.window) gobject.idle_add(lambda: widget.grab_focus()) return True @@ -368,7 +370,7 @@ if gajim.connections[self.account].connected < 2: dialogs.ErrorDialog(_('You are not connected to the server'), _('Without a connection, you can not publish your contact ' - 'information.')) + 'information.'), transient_for=self.window) return vcard_ = self.make_vcard() nick = '' @@ -408,7 +410,7 @@ self.update_progressbar_timeout_id = None dialogs.InformationDialog(_('vCard publication failed'), _('There was an error while publishing your personal information, ' - 'try again later.')) + 'try again later.'), transient_for=self.window) def on_cancel_button_clicked(self, widget): self.window.destroy()

1 0

gajim: fix transient for windows. Fixes #7185
by Yann Leboulanger 24 Aug '13

24 Aug '13

changeset 93bff5d6bd5f in /home/hg/repos/gajim branches: gajim_0.16 details:http://hg.gajim.org/gajim?cmd=changeset;node=93bff5d6bd5f description: fix transient for windows. Fixes #7185 diffstat: src/chat_control.py | 12 +++++++----- src/dialogs.py | 33 ++++++++++++++++++++++----------- src/disco.py | 8 +++++--- src/groupchat_control.py | 12 ++++++++---- src/session.py | 3 ++- 5 files changed, 44 insertions(+), 24 deletions(-) diffs (205 lines): diff -r 296b7ab8b24f -r 93bff5d6bd5f src/chat_control.py --- a/src/chat_control.py Thu Aug 15 22:20:13 2013 +0200 +++ b/src/chat_control.py Thu Aug 15 23:14:42 2013 +0200 @@ -2787,11 +2787,13 @@ on_no(self) dialogs.ConfirmationDialog( - # %s is being replaced in the code with JID - _('You just received a new message from "%s"') % self.contact.jid, - _('If you close this tab and you have history disabled, '\ - 'this message will be lost.'), on_response_ok=on_ok, - on_response_cancel=on_cancel) + #%s is being replaced in the code with JID + _('You just received a new message from "%s"') % \ + self.contact.jid, + _('If you close this tab and you have history disabled, '\ + 'this message will be lost.'), on_response_ok=on_ok, + on_response_cancel=on_cancel, + transient_for=self.parent_win.window) return on_yes(self) diff -r 296b7ab8b24f -r 93bff5d6bd5f src/dialogs.py --- a/src/dialogs.py Thu Aug 15 22:20:13 2013 +0200 +++ b/src/dialogs.py Thu Aug 15 23:14:42 2013 +0200 @@ -1508,10 +1508,10 @@ """ def __init__(self, pritext, sectext='', on_response_ok=None, - on_response_cancel=None): + on_response_cancel=None, transient_for=None): self.user_response_ok = on_response_ok self.user_response_cancel = on_response_cancel - HigDialog.__init__(self, None, + HigDialog.__init__(self, transient_for, gtk.MESSAGE_QUESTION, gtk.BUTTONS_OK_CANCEL, pritext, sectext, self.on_response_ok, self.on_response_cancel) self.popup() @@ -1589,8 +1589,10 @@ HIG compliant info dialog """ - def __init__(self, pritext, sectext=''): - if hasattr(gajim.interface, 'roster') and gajim.interface.roster: + def __init__(self, pritext, sectext='', transient_for=None): + if transient_for: + parent = transient_for + elif hasattr(gajim.interface, 'roster') and gajim.interface.roster: parent = gajim.interface.roster.window else: parent = None @@ -1712,11 +1714,13 @@ """ def __init__(self, pritext, sectext='', checktext='', on_response_ok=None, - on_response_cancel=None, is_modal=True): + on_response_cancel=None, is_modal=True, transient_for=None): self.user_response_ok = on_response_ok self.user_response_cancel = on_response_cancel - if hasattr(gajim.interface, 'roster') and gajim.interface.roster: + if transient_for: + parent = transient_for + elif hasattr(gajim.interface, 'roster') and gajim.interface.roster: parent = gajim.interface.roster.window else: parent = None @@ -1972,13 +1976,16 @@ Common Class for Input dialogs """ - def __init__(self, title, label_str, is_modal, ok_handler, cancel_handler): + def __init__(self, title, label_str, is_modal, ok_handler, cancel_handler, + transient_for=None): self.dialog = self.xml.get_object('input_dialog') label = self.xml.get_object('label') self.dialog.set_title(title) label.set_markup(label_str) self.cancel_handler = cancel_handler self.vbox = self.xml.get_object('vbox') + if transient_for: + self.dialog.set_transient_for(transient_for) self.ok_handler = ok_handler okbutton = self.xml.get_object('okbutton') @@ -2015,10 +2022,10 @@ """ def __init__(self, title, label_str, input_str=None, is_modal=True, - ok_handler=None, cancel_handler=None): + ok_handler=None, cancel_handler=None, transient_for=None): self.xml = gtkgui_helpers.get_gtk_builder('input_dialog.ui') CommonInputDialog.__init__(self, title, label_str, is_modal, ok_handler, - cancel_handler) + cancel_handler, transient_for=transient_for) self.input_entry = self.xml.get_object('input_entry') if input_str: self.set_entry(input_str) @@ -2198,7 +2205,8 @@ """ def __init__(self, title, label_str1, label_str2, input_str1=None, - input_str2=None, is_modal=True, ok_handler=None, cancel_handler=None): + input_str2=None, is_modal=True, ok_handler=None, cancel_handler=None, + transient_for=None): self.xml = gtkgui_helpers.get_gtk_builder('dubbleinput_dialog.ui') self.dialog = self.xml.get_object('dubbleinput_dialog') label1 = self.xml.get_object('label1') @@ -2215,6 +2223,8 @@ if input_str2: self.input_entry2.set_text(input_str2) self.input_entry2.select_region(0, -1) # select all + if transient_for: + self.dialog.set_transient_for(transient_for) self.dialog.set_modal(is_modal) @@ -4531,7 +4541,8 @@ name = self.new_privacy_list_entry.get_text() if not name: ErrorDialog(_('Invalid List Name'), - _('You must enter a name to create a privacy list.')) + _('You must enter a name to create a privacy list.'), + transient_for=self.window) return key_name = 'privacy_list_%s' % name if key_name in gajim.interface.instances[self.account]: diff -r 296b7ab8b24f -r 93bff5d6bd5f src/disco.py --- a/src/disco.py Thu Aug 15 22:20:13 2013 +0200 +++ b/src/disco.py Thu Aug 15 23:14:42 2013 +0200 @@ -759,13 +759,15 @@ # We can't travel anywhere else. self.destroy() dialogs.ErrorDialog(_('The service could not be found'), -_('There is no service at the address you entered, or it is not responding. ' - 'Check the address and try again.')) + _('There is no service at the address you entered, or it is ' + 'not responding. Check the address and try again.'), + transient_for=self.window) return klass = self.cache.get_browser(identities, features) if not klass: dialogs.ErrorDialog(_('The service is not browsable'), -_('This type of service does not contain any items to browse.')) + _('This type of service does not contain any items to browse.'), + transient_for=self.window) return elif klass is None: klass = AgentBrowser diff -r 296b7ab8b24f -r 93bff5d6bd5f src/groupchat_control.py --- a/src/groupchat_control.py Thu Aug 15 22:20:13 2013 +0200 +++ b/src/groupchat_control.py Thu Aug 15 23:14:42 2013 +0200 @@ -2130,7 +2130,8 @@ dialogs.ConfirmationDialogCheck(pritext, sectext, _('_Do not ask me again'), on_response_ok=on_ok, - on_response_cancel=on_cancel) + on_response_cancel=on_cancel, + transient_for=self.parent_win.window) return on_yes(self) @@ -2206,7 +2207,8 @@ dialogs.DoubleInputDialog(_('Destroying %s') % u'\u200E' + \ self.room_jid, _('You are going to definitively destroy this ' 'room.\nYou may specify a reason below:'), - _('You may also enter an alternate venue:'), ok_handler=on_ok) + _('You may also enter an alternate venue:'), ok_handler=on_ok, + transient_for=self.parent_win.window) def _on_bookmark_room_menuitem_activate(self, widget): """ @@ -2406,7 +2408,8 @@ # ask for reason dialogs.InputDialog(_('Kicking %s') % nick, - _('You may specify a reason below:'), ok_handler=on_ok) + _('You may specify a reason below:'), ok_handler=on_ok, + transient_for=self.parent_win.window) def mk_menu(self, event, iter_): """ @@ -2738,7 +2741,8 @@ nick = gajim.get_nick_from_jid(jid) # ask for reason dialogs.InputDialog(_('Banning %s') % nick, - _('You may specify a reason below:'), ok_handler=on_ok) + _('You may specify a reason below:'), ok_handler=on_ok, + transient_for=self.parent_win.window) def grant_membership(self, widget, jid): """ diff -r 296b7ab8b24f -r 93bff5d6bd5f src/session.py --- a/src/session.py Thu Aug 15 22:20:13 2013 +0200 +++ b/src/session.py Thu Aug 15 23:14:42 2013 +0200 @@ -413,7 +413,8 @@ 'acceptable?''') % ( negotiation.describe_features(ask_user)), on_response_yes=accept_nondefault_options, - on_response_no=reject_nondefault_options) + on_response_no=reject_nondefault_options, + transient_for=self.control.parent_win.window) else: self.respond_e2e_bob(form, negotiated, not_acceptable)

1 0

gajim: fix transient for. See #7185
by Yann Leboulanger 24 Aug '13

24 Aug '13

changeset 894c5bef952e in /home/hg/repos/gajim branches: gajim_0.16 details:http://hg.gajim.org/gajim?cmd=changeset;node=894c5bef952e description: fix transient for. See #7185 diffstat: src/session.py | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diffs (13 lines): diff -r 93bff5d6bd5f -r 894c5bef952e src/session.py --- a/src/session.py Thu Aug 15 23:14:42 2013 +0200 +++ b/src/session.py Thu Aug 15 23:16:38 2013 +0200 @@ -473,7 +473,8 @@ negotiation.describe_features(ask_user)), _('Always accept for this contact'), on_response_yes = accept_nondefault_options, - on_response_no = reject_nondefault_options) + on_response_no = reject_nondefault_options, + transient_for=self.control.parent_win.window) else: try: self.accept_e2e_alice(form, negotiated)

1 0

gajim: [Yves-Alexis Perez] Fix oid_xmppaddr and oid_dnssrv for X...
by Yann Leboulanger 24 Aug '13

24 Aug '13

changeset 859d7f83b926 in /home/hg/repos/gajim branches: gajim_0.16 details:http://hg.gajim.org/gajim?cmd=changeset;node=859d7f83b926 description: [Yves-Alexis Perez] Fix oid_xmppaddr and oid_dnssrv for X509 cert checking diffstat: src/common/check_X509.py | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diffs (14 lines): diff -r 894c5bef952e -r 859d7f83b926 src/common/check_X509.py --- a/src/common/check_X509.py Thu Aug 15 23:16:38 2013 +0200 +++ b/src/common/check_X509.py Thu Aug 15 23:19:23 2013 +0200 @@ -12,8 +12,8 @@ from common.helpers import prep, InvalidFormat MAX = 64 - oid_xmppaddr = '(1, 3, 6, 1, 5, 5, 7, 8, 5)' - oid_dnssrv = '(1, 3, 6, 1, 5, 5, 7, 8, 7)' + oid_xmppaddr = '1.3.6.1.5.5.7.8.5' + oid_dnssrv = '1.3.6.1.5.5.7.8.7'

1 0

gajim: [Tanguy Ortolo] add _Keywords field to gajim.desktop file
by Yann Leboulanger 24 Aug '13

24 Aug '13

changeset 682b58d5de1e in /home/hg/repos/gajim branches: gajim_0.16 details:http://hg.gajim.org/gajim?cmd=changeset;node=682b58d5de1e description: [Tanguy Ortolo] add _Keywords field to gajim.desktop file diffstat: data/gajim.desktop.in.in | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diffs (11 lines): diff -r 859d7f83b926 -r 682b58d5de1e data/gajim.desktop.in.in --- a/data/gajim.desktop.in.in Thu Aug 15 23:19:23 2013 +0200 +++ b/data/gajim.desktop.in.in Thu Aug 15 23:21:24 2013 +0200 @@ -3,6 +3,7 @@ _Name=Gajim _GenericName=Jabber IM Client _Comment=A GTK+ Jabber client +_Keywords=chat;messaging;im;jabber;xmpp;bonjour;voip Version=1.0 Exec=gajim Icon=gajim

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