Commits

commits@gajim.org

17632 discussions

gajim: fix widget name in glade file. Fixes #8288
by Gajim 18 Mar '16

18 Mar '16

changeset 3c458f4d03c1 in /home/hg/repos/gajim author: Yann Leboulanger <asterix(a)lagaule.org> branches: details:http://hg.gajim.org/gajim?cmd=changeset;node=3c458f4d03c1 description: fix widget name in glade file. Fixes #8288 diffstat: data/gui/service_discovery_window.ui | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diffs (12 lines): diff -r 0e291af074d7 -r 3c458f4d03c1 data/gui/service_discovery_window.ui --- a/data/gui/service_discovery_window.ui Mon Mar 14 02:22:56 2016 +0200 +++ b/data/gui/service_discovery_window.ui Fri Mar 18 22:32:35 2016 +0100 @@ -70,7 +70,7 @@ </packing> </child> <child> - <object class="GtkBox" id="address_tabl"> + <object class="GtkBox" id="address_table"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="spacing">6</property>

1 0

gajim: autogen.sh: add option to skip autotools invocations
by Gajim 15 Mar '16

15 Mar '16

changeset 0e291af074d7 in /home/hg/repos/gajim author: Andrey Utkin <andrey_utkin(a)fastmail.com> branches: details:http://hg.gajim.org/gajim?cmd=changeset;node=0e291af074d7 description: autogen.sh: add option to skip autotools invocations This is to comply with Gentoo packaging policy: it is preferred that Portage-provided procedures handle autotools invcations. diffstat: autogen.sh | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) diffs (14 lines): diff -r d464a443f738 -r 0e291af074d7 autogen.sh --- a/autogen.sh Tue Mar 15 21:40:44 2016 +0100 +++ b/autogen.sh Mon Mar 14 02:22:56 2016 +0200 @@ -31,6 +31,10 @@ mkdir -p config + if [ "$NO_AUTOTOOLS_RUN" ]; then + exit 0 + fi + intltoolize --force --automake \ && aclocal -I ./m4 \ && $LIBTOOLIZE --copy --force --automake \

1 0

gajim: catch all errors when trying to load a plugin
by Gajim 15 Mar '16

15 Mar '16

changeset d464a443f738 in /home/hg/repos/gajim author: Yann Leboulanger <asterix(a)lagaule.org> branches: details:http://hg.gajim.org/gajim?cmd=changeset;node=d464a443f738 description: catch all errors when trying to load a plugin diffstat: src/plugins/pluginmanager.py | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diffs (12 lines): diff -r ed8f0555d852 -r d464a443f738 src/plugins/pluginmanager.py --- a/src/plugins/pluginmanager.py Tue Mar 08 22:36:22 2016 +0100 +++ b/src/plugins/pluginmanager.py Tue Mar 15 21:40:44 2016 +0100 @@ -480,7 +480,7 @@ continue try: module = __import__(module_name) - except (ValueError, ImportError, AttributeError) as error: + except Exception as error: log.debug(str(error)) if module is None:

1 0

gajim: handle message receipts corretly, even if they don't have...
by Gajim 13 Mar '16

13 Mar '16

changeset d84143872a64 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=d84143872a64 description: handle message receipts corretly, even if they don't have the <thread> element diffstat: src/common/connection_handlers.py | 22 +++++++++++++++------- 1 files changed, 15 insertions(+), 7 deletions(-) diffs (32 lines): diff -r b7c4f2c2e73f -r d84143872a64 src/common/connection_handlers.py --- a/src/common/connection_handlers.py Sun Mar 06 22:43:54 2016 +0100 +++ b/src/common/connection_handlers.py Tue Mar 08 22:36:22 2016 +0100 @@ -1196,13 +1196,21 @@ self.connection.send(receipt) # We got our message's receipt - if obj.receipt_received_tag and obj.session.control and \ - gajim.config.get_per('accounts', self.name, 'request_receipt'): - id_ = obj.receipt_received_tag.getAttr('id') - if not id_: - # old XEP implementation - id_ = obj.id_ - obj.session.control.conv_textview.hide_xep0184_warning(id_) + if obj.receipt_received_tag and gajim.config.get_per('accounts', + self.name, 'request_receipt'): + ctrl = obj.session.control + if not ctrl: + # Received <message> doesn't have the <thread> element? + # search in all sessions + for s in self.get_sessions(obj.jid): + if s.control: + ctrl = s.control + if ctrl: + id_ = obj.receipt_received_tag.getAttr('id') + if not id_: + # old XEP implementation + id_ = obj.id_ + ctrl.conv_textview.hide_xep0184_warning(id_) if obj.mtype == 'error': if not obj.msgtxt:

1 0

gajim: handle message receipts corretly, even if they don't have...
by Gajim 08 Mar '16

08 Mar '16

changeset ed8f0555d852 in /home/hg/repos/gajim author: Yann Leboulanger <asterix(a)lagaule.org> branches: details:http://hg.gajim.org/gajim?cmd=changeset;node=ed8f0555d852 description: handle message receipts corretly, even if they don't have the <thread> element diffstat: src/common/connection_handlers.py | 22 +++++++++++++++------- 1 files changed, 15 insertions(+), 7 deletions(-) diffs (32 lines): diff -r 6702c61c7093 -r ed8f0555d852 src/common/connection_handlers.py --- a/src/common/connection_handlers.py Sat Mar 05 15:48:51 2016 +0100 +++ b/src/common/connection_handlers.py Tue Mar 08 22:36:22 2016 +0100 @@ -1194,13 +1194,21 @@ self.connection.send(receipt) # We got our message's receipt - if obj.receipt_received_tag and obj.session.control and \ - gajim.config.get_per('accounts', self.name, 'request_receipt'): - id_ = obj.receipt_received_tag.getAttr('id') - if not id_: - # old XEP implementation - id_ = obj.id_ - obj.session.control.conv_textview.hide_xep0184_warning(id_) + if obj.receipt_received_tag and gajim.config.get_per('accounts', + self.name, 'request_receipt'): + ctrl = obj.session.control + if not ctrl: + # Received <message> doesn't have the <thread> element? + # search in all sessions + for s in self.get_sessions(obj.jid): + if s.control: + ctrl = s.control + if ctrl: + id_ = obj.receipt_received_tag.getAttr('id') + if not id_: + # old XEP implementation + id_ = obj.id_ + ctrl.conv_textview.hide_xep0184_warning(id_) if obj.mtype == 'error': if not obj.msgtxt:

1 0

gajim: prevent a traceback.
by Gajim 06 Mar '16

06 Mar '16

changeset b7c4f2c2e73f 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=b7c4f2c2e73f description: prevent a traceback. diffstat: src/config.py | 11 ++++++----- 1 files changed, 6 insertions(+), 5 deletions(-) diffs (21 lines): diff -r b82d1ee5532e -r b7c4f2c2e73f src/config.py --- a/src/config.py Sat Feb 27 18:54:19 2016 +0100 +++ b/src/config.py Sun Mar 06 22:43:54 2016 +0100 @@ -3382,11 +3382,12 @@ # Fill in the data for childs self.title_entry.set_text(model[iter_][1]) room_jid = model[iter_][2].decode('utf-8') - (room, server) = room_jid.split('@') - self.room_entry.handler_block(self.room_entry_changed_id) - self.room_entry.set_text(room) - self.room_entry.handler_unblock(self.room_entry_changed_id) - self.server_entry.set_text(server) + if '@' in room_jid: + (room, server) = room_jid.split('@') + self.room_entry.handler_block(self.room_entry_changed_id) + self.room_entry.set_text(room) + self.room_entry.handler_unblock(self.room_entry_changed_id) + self.server_entry.set_text(server) self.autojoin_checkbutton.set_active(model[iter_][3]) self.minimize_checkbutton.set_active(model[iter_][4])

1 0

gajim-plugins: get plugins via zip files instead of file by file
by Gajim Plugins 06 Mar '16

06 Mar '16

changeset d815964e2845 in /home/hg/repos/gajim-plugins author: Yann Leboulanger <asterix(a)lagaule.org> branches: details:gajim-plugins?cmd=changeset;node=d815964e2845 description: get plugins via zip files instead of file by file diffstat: plugin_installer/manifest.ini | 2 +- plugin_installer/plugin_installer.py | 55 +++++++---------------------------- 2 files changed, 13 insertions(+), 44 deletions(-) diffs (92 lines): diff -r 2560a9ae79ca -r d815964e2845 plugin_installer/manifest.ini --- a/plugin_installer/manifest.ini Sat Feb 27 13:46:45 2016 +0100 +++ b/plugin_installer/manifest.ini Sun Mar 06 16:06:29 2016 +0100 @@ -1,7 +1,7 @@ [info] name: Plugin Installer short_name: plugin_installer -version: 0.11.22 +version: 0.11.30 description: Install and upgrade plugins from ftp authors: Denis Fomin <fominde(a)gmail.com> Yann Leboulanger <asterix(a)lagaule.org> diff -r 2560a9ae79ca -r d815964e2845 plugin_installer/plugin_installer.py --- a/plugin_installer/plugin_installer.py Sat Feb 27 13:46:45 2016 +0100 +++ b/plugin_installer/plugin_installer.py Sun Mar 06 16:06:29 2016 +0100 @@ -79,7 +79,7 @@ elif gajim.version.startswith('0.16.10'): self.server_folder = 'plugins_gtk3' else: - self.server_folder = 'plugins_0.16' + self.server_folder = 'plugins_0.16_zip' @log_calls('PluginInstallerPlugin') def activate(self): @@ -588,29 +588,7 @@ self.pulse = gobject.timeout_add(150, self.progressbar_pulse) gobject.idle_add(self.progressbar.set_text, _('Creating a list of files')) for remote_dir in self.remote_dirs: - - def nlstr(dir_, subdir=None): - if subdir: - dir_ = dir_ + '/' + subdir - list_ = self.ftp.nlst(dir_) - for i in list_: - name = i.split('/')[-1] - if '.' not in name: - try: - if i == self.ftp.nlst(i)[0]: - files.append(i[1:]) - del dirs[i[1:]] - except Exception, e: - # empty dir or file - continue - dirs.append(i[1:]) - subdirs = name - nlstr(dir_, subdirs) - else: - files.append(i[1:]) - dirs, files = [], [] - nlstr('/%s/%s' % (self.plugin.server_folder, remote_dir)) - + filename = remote_dir + '.zip' base_dir, user_dir = gajim.PLUGINS_DIRS if not os.path.isdir(user_dir): os.mkdir(user_dir) @@ -619,26 +597,17 @@ os.mkdir(local_dir) local_dir = os.path.split(user_dir)[0] - # creating dirs - for dir_ in dirs: - dir_ = dir_.replace(self.plugin.server_folder, 'plugins') - if os.path.exists(os.path.join(local_dir, dir_)): - continue - os.mkdir(os.path.join(local_dir, dir_)) + # downloading zip file + gobject.idle_add(self.progressbar.set_text, + _('Downloading "%s"') % filename) + self.buffer_ = io.BytesIO() + try: + self.ftp.retrbinary('RETR %s' % filename, self.handleDownload) + except ftplib.error_perm: + print 'ERROR: cannot read file "%s"' % filename + with zipfile.ZipFile(self.buffer_) as zip_file: + zip_file.extractall(os.path.join(local_dir, 'plugins')) - # downloading files - for filename in files: - gobject.idle_add(self.progressbar.set_text, - _('Downloading "%s"') % filename) - full_filename = os.path.join(local_dir, filename.replace( - self.plugin.server_folder, 'plugins')) - try: - self.ftp.retrbinary('RETR /%s' % filename, - open(full_filename, 'wb').write) - #full_filename.close() - except ftplib.error_perm: - print 'ERROR: cannot read file "%s"' % filename - os.unlink(filename) self.ftp.quit() gobject.idle_add(self.window.emit, 'plugin_downloaded', self.remote_dirs)

1 0

gajim-plugins: get plugins via zip files instead of file by file
by Gajim Plugins 06 Mar '16

06 Mar '16

changeset 603efa2fac1f in /home/hg/repos/gajim-plugins author: Yann Leboulanger <asterix(a)lagaule.org> branches: gtk3 details:gajim-plugins?cmd=changeset;node=603efa2fac1f description: get plugins via zip files instead of file by file diffstat: plugin_installer/plugin_installer.py | 65 ++++++++--------------------------- 1 files changed, 15 insertions(+), 50 deletions(-) diffs (91 lines): diff -r 10545d5cd4f3 -r 603efa2fac1f plugin_installer/plugin_installer.py --- a/plugin_installer/plugin_installer.py Sun Sep 22 17:05:00 2013 +0200 +++ b/plugin_installer/plugin_installer.py Sun Mar 06 15:38:55 2016 +0100 @@ -81,7 +81,7 @@ if gajim.version.startswith('0.15'): self.server_folder = 'plugins_0.15' elif gajim.version.startswith('0.16.10'): - self.server_folder = 'plugins_gtk3' + self.server_folder = 'plugins_1' else: self.server_folder = 'plugins_0.16' @@ -586,29 +586,7 @@ self.pulse = GLib.timeout_add(150, self.progressbar_pulse) GLib.idle_add(self.progressbar.set_text, _('Creating a list of files')) for remote_dir in self.remote_dirs: - - def nlstr(dir_, subdir=None): - if subdir: - dir_ = dir_ + '/' + subdir - list_ = self.ftp.nlst(dir_) - for i in list_: - name = i.split('/')[-1] - if '.' not in name: - try: - if i == self.ftp.nlst(i)[0]: - files.append(i[1:]) - del dirs[i[1:]] - except Exception as e: - # empty dir or file - continue - dirs.append(i[1:]) - subdirs = name - nlstr(dir_, subdirs) - else: - files.append(i[1:]) - dirs, files = [], [] - nlstr('/%s/%s' % (self.plugin.server_folder, remote_dir)) - + filename = remote_dir + '.zip' base_dir, user_dir = gajim.PLUGINS_DIRS if not os.path.isdir(user_dir): os.mkdir(user_dir) @@ -617,34 +595,21 @@ os.mkdir(local_dir) local_dir = os.path.split(user_dir)[0] - # creating dirs - for dir_ in dirs: - dir_ = dir_.replace(self.plugin.server_folder, 'plugins') - try: - os.mkdir(os.path.join(local_dir, dir_)) - except OSError as e: - if str(e).startswith('[Errno 17]'): - continue - raise + # downloading zip file + GLib.idle_add(self.progressbar.set_text, + _('Downloading "%s"') % filename) + full_filename = os.path.join(local_dir, 'plugins', filename) + self.buffer_ = io.BytesIO() + try: + self.ftp.retrbinary('RETR %s' % filename, self.handleDownload) + except ftplib.all_errors as e: + print (str(e)) - # downloading files - for filename in files: - GLib.idle_add(self.progressbar.set_text, - _('Downloading "%s"') % filename) - full_filename = os.path.join(local_dir, filename.replace( - self.plugin.server_folder, 'plugins')) - try: - file_ = open(full_filename, 'wb') - - self.ftp.retrbinary('RETR /%s' % filename, - file_.write) - file_.close() - except ftplib.all_errors as e: - print (str(e)) - os.unlink(filename) + with zipfile.ZipFile(self.buffer_) as zip_file: + zip_file.extractall(os.path.join(local_dir, 'plugins')) + self.ftp.quit() - GLib.idle_add(self.window.emit, 'plugin_downloaded', - self.remote_dirs) + GLib.idle_add(self.window.emit, 'plugin_downloaded', self.remote_dirs) GLib.source_remove(self.pulse)

1 0

gajim-plugins: fix a few warnings
by Gajim Plugins 06 Mar '16

06 Mar '16

changeset 2b76e17f3706 in /home/hg/repos/gajim-plugins author: Yann Leboulanger <asterix(a)lagaule.org> branches: gtk3 details:gajim-plugins?cmd=changeset;node=2b76e17f3706 description: fix a few warnings diffstat: plugin_installer/manifest.ini | 2 +- plugin_installer/plugin_installer.py | 22 +++++++++++----------- 2 files changed, 12 insertions(+), 12 deletions(-) diffs (83 lines): diff -r 603efa2fac1f -r 2b76e17f3706 plugin_installer/manifest.ini --- a/plugin_installer/manifest.ini Sun Mar 06 15:38:55 2016 +0100 +++ b/plugin_installer/manifest.ini Sun Mar 06 15:39:54 2016 +0100 @@ -1,7 +1,7 @@ [info] name: Plugin Installer short_name: plugin_installer -version: 0.12.2 +version: 0.13.0 description: Install and upgrade plugins from ftp authors: Denis Fomin <fominde(a)gmail.com> Yann Leboulanger <asterix(a)lagaule.org> diff -r 603efa2fac1f -r 2b76e17f3706 plugin_installer/plugin_installer.py --- a/plugin_installer/plugin_installer.py Sun Mar 06 15:38:55 2016 +0100 +++ b/plugin_installer/plugin_installer.py Sun Mar 06 15:39:54 2016 +0100 @@ -37,7 +37,7 @@ from common import gajim from plugins import GajimPlugin from plugins.helpers import log_calls, log -from conversation_textview import ConversationTextview +from htmltextview import HtmlTextView from dialogs import WarningDialog, HigDialog, YesNoDialog from plugins.gui import GajimPluginConfigDialog @@ -192,7 +192,7 @@ self.xml.add_objects_from_file(self.Gtk_BUILDER_FILE_PATH, ['hpaned2']) self.hpaned = self.xml.get_object('hpaned2') self.page_num = self.notebook.append_page(self.hpaned, - Gtk.Label(_('Available'))) + Gtk.Label.new(_('Available'))) widgets_to_extract = ('plugin_name_label1', 'available_treeview', 'progressbar', 'inslall_upgrade_button', @@ -237,10 +237,10 @@ if GObject.signal_lookup('error_signal', self.window) is 0: GObject.signal_new('error_signal', self.window, - GObject.SIGNAL_RUN_LAST, GObject.TYPE_STRING, + GObject.SignalFlags.RUN_LAST, GObject.TYPE_STRING, (GObject.TYPE_STRING,)) GObject.signal_new('plugin_downloaded', self.window, - GObject.SIGNAL_RUN_LAST, GObject.TYPE_STRING, + GObject.SignalFlags.RUN_LAST, GObject.TYPE_STRING, (GObject.TYPE_PYOBJECT,)) id_ = self.window.connect('error_signal', self.on_some_ftp_error) @@ -256,9 +256,9 @@ self._clear_available_plugin_info() - self.plugin_description_textview = ConversationTextview(None) + self.plugin_description_textview = HtmlTextView() sw = self.xml.get_object('scrolledwindow1') - sw.add(self.plugin_description_textview.tv) + sw.add(self.plugin_description_textview) self.xml.connect_signals(self) self.window.show_all() @@ -363,9 +363,9 @@ def available_plugins_treeview_selection_changed(self, treeview_selection): model, iter = treeview_selection.get_selected() self.xml.get_object('scrolledwindow1').get_children()[0].destroy() - self.plugin_description_textview = ConversationTextview(None) + self.plugin_description_textview = HtmlTextView() sw = self.xml.get_object('scrolledwindow1') - sw.add(self.plugin_description_textview.tv) + sw.add(self.plugin_description_textview) sw.show_all() if iter: self.plugin_name_label1.set_text(model.get_value(iter, C_NAME)) @@ -382,9 +382,9 @@ desc = '<body xmlns=\'http://www.w3.org/1999/xhtml\'>' + \ desc + ' </body>' desc = desc.replace('\n', '<br/>') - self.plugin_description_textview.tv.display_html( - desc, self.plugin_description_textview) - self.plugin_description_textview.tv.set_property('sensitive', True) + self.plugin_description_textview.display_html( + desc, self.plugin_description_textview, None) + self.plugin_description_textview.set_property('sensitive', True) else: self._clear_available_plugin_info()

1 0

gajim: improve plugins window
by Gajim 05 Mar '16

05 Mar '16

changeset 6702c61c7093 in /home/hg/repos/gajim author: Yann Leboulanger <asterix(a)lagaule.org> branches: details:http://hg.gajim.org/gajim?cmd=changeset;node=6702c61c7093 description: improve plugins window diffstat: data/gui/plugins_window.ui | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diffs (12 lines): diff -r c9fb0c33631e -r 6702c61c7093 data/gui/plugins_window.ui --- a/data/gui/plugins_window.ui Sat Mar 05 15:23:48 2016 +0100 +++ b/data/gui/plugins_window.ui Sat Mar 05 15:48:51 2016 +0100 @@ -42,7 +42,7 @@ <object class="GtkPaned" id="hpaned1"> <property name="visible">True</property> <property name="can_focus">True</property> - <property name="position_set">True</property> + <property name="position">250</property> <child> <object class="GtkBox" id="vbox6"> <property name="visible">True</property>

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