Commits

commits@gajim.org

17632 discussions

gajim: translate plugins descriptions
by Denis Fomin 16 Aug '13

16 Aug '13

changeset 44be8fd80494 in /home/hg/repos/gajim branches: details:http://hg.gajim.org/gajim?cmd=changeset;node=44be8fd80494 description: translate plugins descriptions diffstat: src/plugins/pluginmanager.py | 3 +++ 1 файлов изменено, 3 вставок(+), 0 удалений(-) различия (13 строк): diff -r bcd52c44b0f7 -r 44be8fd80494 src/plugins/pluginmanager.py --- a/src/plugins/pluginmanager.py Fri Aug 16 14:53:17 2013 +0200 +++ b/src/plugins/pluginmanager.py Fri Aug 16 23:29:48 2013 +0400 @@ -472,6 +472,9 @@ for option in fields: if conf.get('info', option) is '': raise ConfigParser.NoOptionError, 'field empty' + if option == 'description': + setattr(module_attr, option, _(conf.get('info', option))) + continue setattr(module_attr, option, conf.get('info', option)) conf.remove_section('info')

1 0

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

16 Aug '13

changeset bcd52c44b0f7 in /home/hg/repos/gajim branches: details:http://hg.gajim.org/gajim?cmd=changeset;node=bcd52c44b0f7 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 5c0725aba284 -r bcd52c44b0f7 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 5c0725aba284 -r bcd52c44b0f7 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) @@ -138,12 +141,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: add ability to handle urls in htmltextview.
by Yann Leboulanger 16 Aug '13

16 Aug '13

changeset 5c0725aba284 in /home/hg/repos/gajim branches: details:http://hg.gajim.org/gajim?cmd=changeset;node=5c0725aba284 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 4cfaa57d312b -r 5c0725aba284 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 4cfaa57d312b -r 5c0725aba284 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: Update russian translation
by Denis Fomin 16 Aug '13

16 Aug '13

changeset 4cfaa57d312b in /home/hg/repos/gajim branches: details:http://hg.gajim.org/gajim?cmd=changeset;node=4cfaa57d312b description: Update russian translation diffstat: po/ru.po | 46 ++++++++++++++++++---------------------------- 1 файлов изменено, 18 вставок(+), 28 удалений(-) различия (193 строк): diff -r db56fe34fe62 -r 4cfaa57d312b 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 monotonic to the list of ignored modules by demandimp...
by Yann Leboulanger 16 Aug '13

16 Aug '13

changeset db56fe34fe62 in /home/hg/repos/gajim branches: details:http://hg.gajim.org/gajim?cmd=changeset;node=db56fe34fe62 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 245139cb54d5 -r db56fe34fe62 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: disable metacontacts until it work correctly. see #7295
by Yann Leboulanger 16 Aug '13

16 Aug '13

changeset 66fa208e84c7 in /home/hg/repos/gajim branches: gtk3 details:http://hg.gajim.org/gajim?cmd=changeset;node=66fa208e84c7 description: disable metacontacts until it work correctly. see #7295 diffstat: src/common/connection_handlers_events.py | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diffs (12 lines): diff -r d3b7a46c63e7 -r 66fa208e84c7 src/common/connection_handlers_events.py --- a/src/common/connection_handlers_events.py Wed Aug 14 14:32:58 2013 +0200 +++ b/src/common/connection_handlers_events.py Fri Aug 16 09:52:33 2013 +0200 @@ -1842,6 +1842,8 @@ # Metacontact tags # http://www.xmpp.org/extensions/xep-0209.html self.meta_list = {} + # FIXME: disable metacontacts until they work correctly + return True query = self.stanza.getTag('query') storage = query.getTag('storage') metas = storage.getTags('meta')

1 0

gajim: disable rfilter only when we have finished getting the co...
by Yann Leboulanger 16 Aug '13

16 Aug '13

changeset 245139cb54d5 in /home/hg/repos/gajim branches: details:http://hg.gajim.org/gajim?cmd=changeset;node=245139cb54d5 description: disable rfilter only when we have finished getting the correct iter. Fixes #7430 diffstat: src/roster_window.py | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diffs (12 lines): diff -r 8d24454b2be0 -r 245139cb54d5 src/roster_window.py --- a/src/roster_window.py Fri Aug 16 09:34:01 2013 +0200 +++ b/src/roster_window.py Fri Aug 16 09:39:10 2013 +0200 @@ -4051,7 +4051,7 @@ self.tree.expand_row(path, False) return if self.rfilter_enabled: - self.disable_rfilter() + gobject.idle_add(self.disable_rfilter) jid = model[path][C_JID].decode('utf-8') resource = None contact = gajim.contacts.get_contact_with_highest_priority(account, jid)

1 0

gajim: remove external unused file
by Yann Leboulanger 16 Aug '13

16 Aug '13

changeset 8d24454b2be0 in /home/hg/repos/gajim branches: details:http://hg.gajim.org/gajim?cmd=changeset;node=8d24454b2be0 description: remove external unused file diffstat: src/pycallgraph.py | 410 ----------------------------------------------------- 1 files changed, 0 insertions(+), 410 deletions(-) diffs (truncated from 414 to 300 lines): diff -r 4f31915024de -r 8d24454b2be0 src/pycallgraph.py --- a/src/pycallgraph.py Fri Aug 16 09:33:15 2013 +0200 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,410 +0,0 @@ -""" -pycallgraph - -U{http://pycallgraph.slowchop.com/} - -Copyright Gerald Kaszuba 2007 - -This program is free software; you can redistribute it and/or modify -it under the terms of the GNU General Public License as published by -the Free Software Foundation; either version 2 of the License, or -(at your option) any later version. - -This program is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -GNU General Public License for more details. - -You should have received a copy of the GNU General Public License -along with this program; if not, write to the Free Software -Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA -""" - -__version__ = '0.4.1' -__author__ = 'Gerald Kaszuba' - -import inspect -import sys -import os -import re -import tempfile -import time -from distutils import sysconfig - -# Initialise module variables. -# TODO Move these into settings -trace_filter = None -time_filter = None - - -def colourize_node(calls, total_time): - value = float(total_time * 2 + calls) / 3 - return '%f %f %f' % (value / 2 + .5, value, 0.9) - - -def colourize_edge(calls, total_time): - value = float(total_time * 2 + calls) / 3 - return '%f %f %f' % (value / 2 + .5, value, 0.7) - - -def reset_settings(): - global settings - global graph_attributes - global __version__ - - settings = { - 'node_attributes': { - 'label': r'%(func)s\ncalls: %(hits)i\ntotal time: %(total_time)f', - 'color': '%(col)s', - }, - 'node_colour': colourize_node, - 'edge_colour': colourize_edge, - 'dont_exclude_anything': False, - 'include_stdlib': True, - } - - # TODO: Move this into settings - graph_attributes = { - 'graph': { - 'fontname': 'Verdana', - 'fontsize': 7, - 'fontcolor': '0 0 0.5', - 'label': r'Generated by Python Call Graph v%s\n' \ - r'http://pycallgraph.slowchop.com' % __version__, - }, - 'node': { - 'fontname': 'Verdana', - 'fontsize': 7, - 'color': '.5 0 .9', - 'style': 'filled', - 'shape': 'rect', - }, - } - - -def reset_trace(): - """Resets all collected statistics. This is run automatically by - start_trace(reset=True) and when the module is loaded. - """ - global call_dict - global call_stack - global func_count - global func_count_max - global func_time - global func_time_max - global call_stack_timer - - call_dict = {} - - # current call stack - call_stack = ['__main__'] - - # counters for each function - func_count = {} - func_count_max = 0 - - # accumative time per function - func_time = {} - func_time_max = 0 - - # keeps track of the start time of each call on the stack - call_stack_timer = [] - - -class PyCallGraphException(Exception): - """Exception used for pycallgraph""" - pass - - -class GlobbingFilter(object): - """Filter module names using a set of globs. - - Objects are matched against the exclude list first, then the include list. - Anything that passes through without matching either, is excluded. - """ - - def __init__(self, include=None, exclude=None, max_depth=None, - min_depth=None): - if include is None and exclude is None: - include = ['*'] - exclude = [] - elif include is None: - include = ['*'] - elif exclude is None: - exclude = [] - self.include = include - self.exclude = exclude - self.max_depth = max_depth or 9999 - self.min_depth = min_depth or 0 - - def __call__(self, stack, module_name=None, class_name=None, - func_name=None, full_name=None): - from fnmatch import fnmatch - if len(stack) > self.max_depth: - return False - if len(stack) < self.min_depth: - return False - for pattern in self.exclude: - if fnmatch(full_name, pattern): - return False - for pattern in self.include: - if fnmatch(full_name, pattern): - return True - return False - - -def is_module_stdlib(file_name): - """Returns True if the file_name is in the lib directory.""" - # TODO: Move these calls away from this function so it doesn't have to run - # every time. - lib_path = sysconfig.get_python_lib() - path = os.path.split(lib_path) - if path[1] == 'site-packages': - lib_path = path[0] - return file_name.lower().startswith(lib_path.lower()) - - -def start_trace(reset=True, filter_func=None, time_filter_func=None): - """Begins a trace. Setting reset to True will reset all previously recorded - trace data. filter_func needs to point to a callable function that accepts - the parameters (call_stack, module_name, class_name, func_name, full_name). - Every call will be passed into this function and it is up to the function - to decide if it should be included or not. Returning False means the call - will be filtered out and not included in the call graph. - """ - global trace_filter - global time_filter - if reset: - reset_trace() - - if filter_func: - trace_filter = filter_func - else: - trace_filter = GlobbingFilter(exclude=['pycallgraph.*']) - - if time_filter_func: - time_filter = time_filter_func - else: - time_filter = GlobbingFilter() - - sys.settrace(tracer) - - -def stop_trace(): - """Stops the currently running trace, if any.""" - sys.settrace(None) - - -def tracer(frame, event, arg): - """This is an internal function that is called every time a call is made - during a trace. It keeps track of relationships between calls. - """ - global func_count_max - global func_count - global trace_filter - global time_filter - global call_stack - global func_time - global func_time_max - - if event == 'call': - keep = True - code = frame.f_code - - # Stores all the parts of a human readable name of the current call. - full_name_list = [] - - # Work out the module name - module = inspect.getmodule(code) - if module: - module_name = module.__name__ - module_path = module.__file__ - if not settings['include_stdlib'] \ - and is_module_stdlib(module_path): - keep = False - if module_name == '__main__': - module_name = '' - else: - module_name = '' - if module_name: - full_name_list.append(module_name) - - # Work out the class name. - try: - class_name = frame.f_locals['self'].__class__.__name__ - full_name_list.append(class_name) - except (KeyError, AttributeError): - class_name = '' - - # Work out the current function or method - func_name = code.co_name - if func_name == '?': - func_name = '__main__' - full_name_list.append(func_name) - - # Create a readable representation of the current call - full_name = '.'.join(full_name_list) - - # Load the trace filter, if any. 'keep' determines if we should ignore - # this call - if keep and trace_filter: - keep = trace_filter(call_stack, module_name, class_name, - func_name, full_name) - - # Store the call information - if keep: - - fr = call_stack[-1] - if fr not in call_dict: - call_dict[fr] = {} - if full_name not in call_dict[fr]: - call_dict[fr][full_name] = 0 - call_dict[fr][full_name] += 1 - - if full_name not in func_count: - func_count[full_name] = 0 - func_count[full_name] += 1 - if func_count[full_name] > func_count_max: - func_count_max = func_count[full_name] - - call_stack.append(full_name) - call_stack_timer.append(time.time()) - - else: - call_stack.append('') - call_stack_timer.append(None) - - if event == 'return': - if call_stack: - full_name = call_stack.pop(-1) - t = call_stack_timer.pop(-1) - if t and time_filter(stack=call_stack, full_name=full_name): - if full_name not in func_time: - func_time[full_name] = 0 - call_time = (time.time() - t) - func_time[full_name] += call_time - if func_time[full_name] > func_time_max: - func_time_max = func_time[full_name] - - return tracer - - -def get_dot(stop=True): - """Returns a string containing a DOT file. Setting stop to True will cause - the trace to stop. - """ - global func_time_max

1 0

gajim: we release under GPL v3
by Yann Leboulanger 16 Aug '13

16 Aug '13

changeset 4f31915024de in /home/hg/repos/gajim branches: details:http://hg.gajim.org/gajim?cmd=changeset;node=4f31915024de description: we release under GPL v3 diffstat: src/common/jingle.py | 10 ++++++---- src/common/jingle_content.py | 10 ++++++---- src/common/jingle_ftstates.py | 10 ++++++---- src/common/jingle_rtp.py | 10 ++++++---- src/common/jingle_session.py | 10 ++++++---- src/common/jingle_transport.py | 10 ++++++---- src/common/multimedia_helpers.py | 10 ++++++---- 7 files changed, 42 insertions(+), 28 deletions(-) diffs (175 lines): diff -r 3b0dc15e7f5b -r 4f31915024de src/common/jingle.py --- a/src/common/jingle.py Fri Aug 16 09:25:07 2013 +0200 +++ b/src/common/jingle.py Fri Aug 16 09:33:15 2013 +0200 @@ -1,15 +1,17 @@ ## ## Copyright (C) 2006 Gajim Team ## -## This program is free software; you can redistribute it and/or modify +## Gajim is free software; you can redistribute it and/or modify ## it under the terms of the GNU General Public License as published -## by the Free Software Foundation; version 2 only. +## by the Free Software Foundation; version 3 only. ## -## This program is distributed in the hope that it will be useful, +## Gajim is distributed in the hope that it will be useful, ## but WITHOUT ANY WARRANTY; without even the implied warranty of -## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ## GNU General Public License for more details. ## +## You should have received a copy of the GNU General Public License +## along with Gajim. If not, see <http://www.gnu.org/licenses/>. """ Handles the jingle signalling protocol """ diff -r 3b0dc15e7f5b -r 4f31915024de src/common/jingle_content.py --- a/src/common/jingle_content.py Fri Aug 16 09:25:07 2013 +0200 +++ b/src/common/jingle_content.py Fri Aug 16 09:33:15 2013 +0200 @@ -1,15 +1,17 @@ ## ## Copyright (C) 2006 Gajim Team ## -## This program is free software; you can redistribute it and/or modify +## Gajim is free software; you can redistribute it and/or modify ## it under the terms of the GNU General Public License as published -## by the Free Software Foundation; version 2 only. +## by the Free Software Foundation; version 3 only. ## -## This program is distributed in the hope that it will be useful, +## Gajim is distributed in the hope that it will be useful, ## but WITHOUT ANY WARRANTY; without even the implied warranty of -## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ## GNU General Public License for more details. ## +## You should have received a copy of the GNU General Public License +## along with Gajim. If not, see <http://www.gnu.org/licenses/>. """ Handles Jingle contents (XEP 0166) diff -r 3b0dc15e7f5b -r 4f31915024de src/common/jingle_ftstates.py --- a/src/common/jingle_ftstates.py Fri Aug 16 09:25:07 2013 +0200 +++ b/src/common/jingle_ftstates.py Fri Aug 16 09:33:15 2013 +0200 @@ -1,15 +1,17 @@ ## ## Copyright (C) 2006 Gajim Team ## -## This program is free software; you can redistribute it and/or modify +## Gajim is free software; you can redistribute it and/or modify ## it under the terms of the GNU General Public License as published -## by the Free Software Foundation; version 2 only. +## by the Free Software Foundation; version 3 only. ## -## This program is distributed in the hope that it will be useful, +## Gajim is distributed in the hope that it will be useful, ## but WITHOUT ANY WARRANTY; without even the implied warranty of -## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ## GNU General Public License for more details. ## +## You should have received a copy of the GNU General Public License +## along with Gajim. If not, see <http://www.gnu.org/licenses/>. import gajim import nbxmpp diff -r 3b0dc15e7f5b -r 4f31915024de src/common/jingle_rtp.py --- a/src/common/jingle_rtp.py Fri Aug 16 09:25:07 2013 +0200 +++ b/src/common/jingle_rtp.py Fri Aug 16 09:33:15 2013 +0200 @@ -1,15 +1,17 @@ ## ## Copyright (C) 2006 Gajim Team ## -## This program is free software; you can redistribute it and/or modify +## Gajim is free software; you can redistribute it and/or modify ## it under the terms of the GNU General Public License as published -## by the Free Software Foundation; version 2 only. +## by the Free Software Foundation; version 3 only. ## -## This program is distributed in the hope that it will be useful, +## Gajim is distributed in the hope that it will be useful, ## but WITHOUT ANY WARRANTY; without even the implied warranty of -## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ## GNU General Public License for more details. ## +## You should have received a copy of the GNU General Public License +## along with Gajim. If not, see <http://www.gnu.org/licenses/>. """ Handles Jingle RTP sessions (XEP 0167) diff -r 3b0dc15e7f5b -r 4f31915024de src/common/jingle_session.py --- a/src/common/jingle_session.py Fri Aug 16 09:25:07 2013 +0200 +++ b/src/common/jingle_session.py Fri Aug 16 09:33:15 2013 +0200 @@ -1,15 +1,17 @@ ## ## Copyright (C) 2006 Gajim Team ## -## This program is free software; you can redistribute it and/or modify +## Gajim is free software; you can redistribute it and/or modify ## it under the terms of the GNU General Public License as published -## by the Free Software Foundation; version 2 only. +## by the Free Software Foundation; version 3 only. ## -## This program is distributed in the hope that it will be useful, +## Gajim is distributed in the hope that it will be useful, ## but WITHOUT ANY WARRANTY; without even the implied warranty of -## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ## GNU General Public License for more details. ## +## You should have received a copy of the GNU General Public License +## along with Gajim. If not, see <http://www.gnu.org/licenses/>. """ Handles Jingle sessions (XEP 0166) diff -r 3b0dc15e7f5b -r 4f31915024de src/common/jingle_transport.py --- a/src/common/jingle_transport.py Fri Aug 16 09:25:07 2013 +0200 +++ b/src/common/jingle_transport.py Fri Aug 16 09:33:15 2013 +0200 @@ -1,15 +1,17 @@ ## ## Copyright (C) 2006 Gajim Team ## -## This program is free software; you can redistribute it and/or modify +## Gajim is free software; you can redistribute it and/or modify ## it under the terms of the GNU General Public License as published -## by the Free Software Foundation; version 2 only. +## by the Free Software Foundation; version 3 only. ## -## This program is distributed in the hope that it will be useful, +## Gajim is distributed in the hope that it will be useful, ## but WITHOUT ANY WARRANTY; without even the implied warranty of -## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ## GNU General Public License for more details. ## +## You should have received a copy of the GNU General Public License +## along with Gajim. If not, see <http://www.gnu.org/licenses/>. """ Handles Jingle Transports (currently only ICE-UDP) diff -r 3b0dc15e7f5b -r 4f31915024de src/common/multimedia_helpers.py --- a/src/common/multimedia_helpers.py Fri Aug 16 09:25:07 2013 +0200 +++ b/src/common/multimedia_helpers.py Fri Aug 16 09:33:15 2013 +0200 @@ -1,15 +1,17 @@ ## ## Copyright (C) 2009 Thibaut GIRKA <thib AT sitedethib.com> ## -## This program is free software; you can redistribute it and/or modify +## Gajim is free software; you can redistribute it and/or modify ## it under the terms of the GNU General Public License as published -## by the Free Software Foundation; version 2 only. +## by the Free Software Foundation; version 3 only. ## -## This program is distributed in the hope that it will be useful, +## Gajim is distributed in the hope that it will be useful, ## but WITHOUT ANY WARRANTY; without even the implied warranty of -## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ## GNU General Public License for more details. ## +## You should have received a copy of the GNU General Public License +## along with Gajim. If not, see <http://www.gnu.org/licenses/>. import gst

1 0

gajim: show scrollbar only when needed. Fixes #7239
by Yann Leboulanger 16 Aug '13

16 Aug '13

changeset 3b0dc15e7f5b in /home/hg/repos/gajim branches: details:http://hg.gajim.org/gajim?cmd=changeset;node=3b0dc15e7f5b description: show scrollbar only when needed. Fixes #7239 diffstat: data/gui/preferences_window.ui | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diffs (12 lines): diff -r 9d80b8b2ee72 -r 3b0dc15e7f5b data/gui/preferences_window.ui --- a/data/gui/preferences_window.ui Fri Aug 16 09:21:32 2013 +0200 +++ b/data/gui/preferences_window.ui Fri Aug 16 09:25:07 2013 +0200 @@ -1351,6 +1351,8 @@ <object class="GtkScrolledWindow" id="scrolledwindow22"> <property name="visible">True</property> <property name="can_focus">True</property> + <property name="hscrollbar_policy">automatic</property> + <property name="vscrollbar_policy">automatic</property> <property name="shadow_type">in</property> <child> <object class="GtkTreeView" id="msg_treeview">

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