Commits February 2014

commits@gajim.org

3 participants
35 discussions

gajim: gobject -> GLib
by Gajim 15 Feb '14

15 Feb '14

changeset 969aae73b11a in /home/hg/repos/gajim author: Yann Leboulanger <asterix(a)lagaule.org> branches: gtk3 details:http://hg.gajim.org/gajim?cmd=changeset;node=969aae73b11a description: gobject -> GLib diffstat: src/conversation_textview.py | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diffs (12 lines): diff -r 92b04b3a3ced -r 969aae73b11a src/conversation_textview.py --- a/src/conversation_textview.py Sat Feb 15 21:09:13 2014 +0100 +++ b/src/conversation_textview.py Sat Feb 15 21:11:45 2014 +0100 @@ -1129,7 +1129,7 @@ emot_ascii = possible_emot_ascii_caps anchor = buffer_.create_child_anchor(end_iter) img = TextViewImage(anchor, - gobject.markup_escape_text(special_text)) + GLib.markup_escape_text(special_text)) animations = gajim.interface.emoticons_animations if not emot_ascii in animations: animations[emot_ascii] = GdkPixbuf.PixbufAnimation.new_from_file(

1 0

gajim: some gtk3 fixes in plugins window
by Gajim 15 Feb '14

15 Feb '14

changeset e4de73d0d9b7 in /home/hg/repos/gajim author: Yann Leboulanger <asterix(a)lagaule.org> branches: gtk3 details:http://hg.gajim.org/gajim?cmd=changeset;node=e4de73d0d9b7 description: some gtk3 fixes in plugins window diffstat: src/plugins/gui.py | 16 ++++++---------- 1 files changed, 6 insertions(+), 10 deletions(-) diffs (56 lines): diff -r c65d0ee0f558 -r e4de73d0d9b7 src/plugins/gui.py --- a/src/plugins/gui.py Mon Dec 30 21:19:15 2013 +0100 +++ b/src/plugins/gui.py Sat Feb 15 21:08:54 2014 +0100 @@ -37,7 +37,6 @@ from htmltextview import HtmlTextView from common import gajim from plugins.helpers import log_calls, log -from conversation_textview import ConversationTextview from plugins.helpers import GajimPluginActivateException from plugins.plugins_i18n import _ from common.exceptions import PluginsystemError @@ -103,7 +102,7 @@ self.installed_plugins_treeview_selection_changed) selection.set_mode(Gtk.SelectionMode.SINGLE) - #self._clear_installed_plugin_info() + self._clear_installed_plugin_info() self.fill_installed_plugins_model() root_iter = self.installed_plugins_model.get_iter_first() @@ -125,11 +124,6 @@ @log_calls('PluginsWindow') def installed_plugins_treeview_selection_changed(self, treeview_selection): model, iter = treeview_selection.get_selected() - self.xml.get_object('scrolledwindow').get_children()[0].destroy() - self.plugin_description_textview = ConversationTextview(None) - sw = self.xml.get_object('scrolledwindow') - sw.add(self.plugin_description_textview.tv) - sw.show_all() if iter: plugin = model.get_value(iter, PLUGIN) plugin_name = model.get_value(iter, NAME) @@ -158,10 +152,10 @@ if not txt.startswith('<body '): txt = '<body xmlns=\'http://www.w3.org/1999/xhtml\'>' + txt txt += ' </body>' - self.plugin_description_textview.tv.display_html(txt, + self.plugin_description_textview.display_html(txt, self.plugin_description_textview, None) - self.plugin_description_textview.tv.set_property('sensitive', True) + self.plugin_description_textview.set_property('sensitive', True) self.uninstall_plugin_button.set_property('sensitive', gajim.PLUGINS_DIRS[1] in plugin.__path__) self.configure_plugin_button.set_property( @@ -175,7 +169,9 @@ self.plugin_homepage_linkbutton.set_label('') self.plugin_homepage_linkbutton.set_property('sensitive', False) - self.plugin_description_textview.tv.set_property('sensitive', False) + desc_textbuffer = self.plugin_description_textview.get_buffer() + desc_textbuffer.set_text('') + self.plugin_description_textview.set_property('sensitive', False) self.uninstall_plugin_button.set_property('sensitive', False) self.configure_plugin_button.set_property('sensitive', False)

1 0

gajim: active plugin installer plugin by default if it's availab...
by Gajim 12 Feb '14

12 Feb '14

changeset 908d55eea9ac in /home/hg/repos/gajim author: Yann Leboulanger <asterix(a)lagaule.org> branches: gajim_0.16 details:http://hg.gajim.org/gajim?cmd=changeset;node=908d55eea9ac description: active plugin installer plugin by default if it's available. Fixes #7655 diffstat: src/gui_interface.py | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) diffs (14 lines): diff -r 94a426dcbee4 -r 908d55eea9ac src/gui_interface.py --- a/src/gui_interface.py Wed Feb 05 12:46:48 2014 +0100 +++ b/src/gui_interface.py Wed Feb 12 14:04:19 2014 +0100 @@ -2774,6 +2774,10 @@ cfg_was_read = parser.read() + if not cfg_was_read: + # enable plugin_installer by default when creating config file + gajim.config.set_per('plugins', 'plugin_installer', 'active', True) + gajim.logger.reset_shown_unread_messages() # override logging settings from config (don't take care of '-q' option) if gajim.config.get('verbose'):

1 0

gajim-plugins: Clients icons. prevent traceback
by Gajim Plugins 07 Feb '14

07 Feb '14

changeset 7fe945b5b8af in /home/hg/repos/gajim-plugins author: Denis Fomin <fominde(a)gmail.com> branches: details:gajim-plugins?cmd=changeset;node=7fe945b5b8af description: Clients icons. prevent traceback diffstat: clients_icons/clients_icons.py | 1 + clients_icons/manifest.ini | 2 +- 2 файлов изменено, 2 вставок(+), 1 удалений(-) различия (23 строк): diff -r f6fa329a5295 -r 7fe945b5b8af clients_icons/clients_icons.py --- a/clients_icons/clients_icons.py Thu Dec 19 00:00:23 2013 +0400 +++ b/clients_icons/clients_icons.py Fri Feb 07 18:13:44 2014 +0400 @@ -309,6 +309,7 @@ if not caps: return gtk.image_new_from_pixbuf(self.default_pixbuf), _('Unknown') + client_name = _('Unknown') caps_from_jid = self.check_jid(contact.jid) if caps_from_jid: caps = caps_from_jid diff -r f6fa329a5295 -r 7fe945b5b8af clients_icons/manifest.ini --- a/clients_icons/manifest.ini Thu Dec 19 00:00:23 2013 +0400 +++ b/clients_icons/manifest.ini Fri Feb 07 18:13:44 2014 +0400 @@ -1,7 +1,7 @@ [info] name: Clients icons short_name: clients_icons -version: 5.2 +version: 5.3 description: Shows the client icons in the roster and in groupchats. authors: Denis Fomin <fominde(a)gmail.com> Artem Klyop <art.klyop(a)gmail.com>

1 0

gajim: don't allow to do ctrl+r when roster is hidden. See #7315
by Gajim 05 Feb '14

05 Feb '14

changeset 94a426dcbee4 in /home/hg/repos/gajim author: Yann Leboulanger <asterix(a)lagaule.org> branches: gajim_0.16 details:http://hg.gajim.org/gajim?cmd=changeset;node=94a426dcbee4 description: don't allow to do ctrl+r when roster is hidden. See #7315 diffstat: data/gui/roster_window.ui | 1 + src/message_window.py | 6 ++++++ 2 files changed, 7 insertions(+), 0 deletions(-) diffs (41 lines): diff -r 6892eee71437 -r 94a426dcbee4 data/gui/roster_window.ui --- a/data/gui/roster_window.ui Fri Jan 31 16:29:38 2014 +0100 +++ b/data/gui/roster_window.ui Wed Feb 05 12:46:48 2014 +0100 @@ -210,6 +210,7 @@ <child> <object class="GtkCheckMenuItem" id="show_roster_menuitem"> <property name="visible">True</property> + <property name="sensitive">False</property> <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property> <property name="label" translatable="yes">Show _Roster</property> <property name="use_underline">True</property> diff -r 6892eee71437 -r 94a426dcbee4 src/message_window.py --- a/src/message_window.py Fri Jan 31 16:29:38 2014 +0100 +++ b/src/message_window.py Wed Feb 05 12:46:48 2014 +0100 @@ -84,6 +84,8 @@ self.parent_paned = parent_paned self.notebook.reparent(self.parent_paned) self.parent_paned.pack2(self.notebook, resize=True, shrink=True) + gajim.interface.roster.xml.get_object('show_roster_menuitem').\ + set_sensitive(True) orig_window.destroy() del orig_window @@ -613,6 +615,8 @@ # Don't close parent window, just remove the child child = self.parent_paned.get_child2() self.parent_paned.remove(child) + gajim.interface.roster.xml.get_object('show_roster_menuitem').\ + set_sensitive(False) else: self.window.destroy() return # don't show_title, we are dead @@ -1254,6 +1258,8 @@ # Don't close parent window, just remove the child child = w.parent_paned.get_child2() w.parent_paned.remove(child) + gajim.interface.roster.xml.get_object('show_roster_menuitem').\ + set_sensitive(False) gtkgui_helpers.resize_window(w.window, gajim.config.get('roster_width'), gajim.config.get('roster_height'))

1 0

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

Commits February 2014