Commits June 2016

commits@gajim.org

1 participants
8 discussions

gajim-plugins: small bugfix (see last commit)...
by Gajim Plugins 26 Jun '16

26 Jun '16

changeset ef563f9ec921 in /home/hg/repos/gajim-plugins author: tmolitor <thilo(a)eightysoft.de> branches: details:gajim-plugins?cmd=changeset;node=ef563f9ec921 description: small bugfix (see last commit)... diffstat: httpupload/manifest.ini | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diffs (20 lines): diff -r 670565db3fab -r ef563f9ec921 httpupload/manifest.ini --- a/httpupload/manifest.ini Sun Jun 26 22:37:54 2016 +0200 +++ b/httpupload/manifest.ini Sun Jun 26 22:53:36 2016 +0200 @@ -1,7 +1,7 @@ [info] name: HttpUpload short_name: httpupload -version: 0.3.4 +version: 0.3.5 description: This plugin is designed to send a file to a contact or muc by using httpupload.<br/> Your server must support <a href="http://xmpp.org/extensions/xep-0363.html">XEP-0363: HTTP Upload</a>.<br/> Conversations supported this.<br/> @@ -10,6 +10,7 @@ If the receiving side doesn't support this, only a text message containing the link to the image is send. authors: Thilo Molitor <thilo(a)eightysoft.de> Anders Sandblad <runeson(a)gmail.com> + Philipp Hörist <philipp(a)hoerist.com> homepage: https://trac-plugins.gajim.org/wiki/HttpUploadPlugin min_gajim_version: 0.16.4 max_gajim_version: 0.16.9

1 0

gajim-plugins: Better way of getting local file path
by Gajim Plugins 26 Jun '16

26 Jun '16

changeset 670565db3fab in /home/hg/repos/gajim-plugins author: Philipp Hörist <philipp(a)hoerist.com> branches: details:gajim-plugins?cmd=changeset;node=670565db3fab description: Better way of getting local file path diffstat: httpupload/httpupload.py | 17 ++++++++--------- 1 files changed, 8 insertions(+), 9 deletions(-) diffs (62 lines): diff -r e89baf64da56 -r 670565db3fab httpupload/httpupload.py --- a/httpupload/httpupload.py Tue May 03 18:33:45 2016 +0200 +++ b/httpupload/httpupload.py Sun Jun 26 22:37:54 2016 +0200 @@ -27,7 +27,7 @@ from common import ged import chat_control from plugins import GajimPlugin -from plugins.helpers import log_calls, log +from plugins.helpers import log_calls, logging from dialogs import FileChooserDialog, ImageChooserDialog, ErrorDialog import nbxmpp @@ -38,6 +38,7 @@ last_info_query = {} max_thumbnail_size = 2048 max_thumbnail_dimension = 160 +log = logging.getLogger('gajim.plugin_system.httpupload') class HttpuploadPlugin(GajimPlugin): @@ -179,8 +180,7 @@ self.button.set_property('can-focus', False) self.button.set_sensitive(False) img = gtk.Image() - img.set_from_file(os.path.join(gajim.gajimpaths.data_root, - u'plugins', u'httpupload', u'httpupload.png')) + img.set_from_file(self.plugin.local_file_path('httpupload.png')) self.button.set_image(img) self.button.set_tooltip_text(_('Your server does not support http uploads')) self.image_button = gtk.Button(label=None, stock=None, use_underline=True) @@ -188,8 +188,7 @@ self.image_button.set_property('can-focus', False) self.image_button.set_sensitive(False) img = gtk.Image() - img.set_from_file(os.path.join(gajim.gajimpaths.data_root, - u'plugins', u'httpupload', u'image.png')) + img.set_from_file(self.plugin.local_file_path('image.png')) self.image_button.set_image(img) self.image_button.set_tooltip_text(_('Your server does not support http uploads')) send_button = chat_control.xml.get_object('send_button') @@ -270,7 +269,7 @@ mime_type = 'application/octet-stream' # fallback mime type log.info("Detected MIME Type of file: " + str(mime_type)) progress_messages = Queue(8) - progress_window = ProgressWindow(_('HTTP Upload'), _('Requesting HTTP Upload Slot...'), progress_messages) + progress_window = ProgressWindow(_('HTTP Upload'), _('Requesting HTTP Upload Slot...'), progress_messages, self.plugin) def upload_file(stanza): slot = stanza.getTag("slot") if not slot: @@ -510,9 +509,9 @@ return data class ProgressWindow: - def __init__(self, title_text, during_text, messages_queue): - self.xml = gtkgui_helpers.get_gtk_builder(os.path.join(gajim.gajimpaths.data_root, - u'plugins', u'httpupload', 'upload_progress_dialog.ui')) + def __init__(self, title_text, during_text, messages_queue, plugin): + self.plugin = plugin + self.xml = gtkgui_helpers.get_gtk_builder(self.plugin.local_file_path('upload_progress_dialog.ui')) self.messages_queue = messages_queue self.dialog = self.xml.get_object('progress_dialog') self.label = self.xml.get_object('label')

1 0

gajim: fix length of printed string in about tab of vcard window
by Gajim 16 Jun '16

16 Jun '16

changeset 8f80f0e56f0d in /home/hg/repos/gajim author: Yann Leboulanger <asterix(a)lagaule.org> branches: details:http://hg.gajim.org/gajim?cmd=changeset;node=8f80f0e56f0d description: fix length of printed string in about tab of vcard window diffstat: src/profile_window.py | 2 +- src/vcard.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diffs (24 lines): diff -r 245eea8097ec -r 8f80f0e56f0d src/profile_window.py --- a/src/profile_window.py Thu Jun 16 21:40:15 2016 +0200 +++ b/src/profile_window.py Thu Jun 16 21:49:09 2016 +0200 @@ -288,7 +288,7 @@ else: if i == 'DESC': self.xml.get_object('DESC_textview').get_buffer().set_text( - vcard_[i], len(vcard[i])) + vcard_[i], len(vcard[i].encode('utf-8'))) else: self.set_value(i + '_entry', vcard_[i]) if self.update_progressbar_timeout_id is not None: diff -r 245eea8097ec -r 8f80f0e56f0d src/vcard.py --- a/src/vcard.py Thu Jun 16 21:40:15 2016 +0200 +++ b/src/vcard.py Thu Jun 16 21:49:09 2016 +0200 @@ -240,7 +240,7 @@ else: if i == 'DESC': self.xml.get_object('DESC_textview').get_buffer().set_text( - vcard[i], len(vcard[i])) + vcard[i], len(vcard[i].encode('utf-8'))) elif i != 'jid': # Do not override jid_label self.set_value(i + '_label', vcard[i]) self.vcard_arrived = True

1 0

gajim: fix about tab in vcard
by Gajim 16 Jun '16

16 Jun '16

changeset 245eea8097ec in /home/hg/repos/gajim author: Yann Leboulanger <asterix(a)lagaule.org> branches: details:http://hg.gajim.org/gajim?cmd=changeset;node=245eea8097ec description: fix about tab in vcard diffstat: src/profile_window.py | 2 +- src/vcard.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diffs (24 lines): diff -r c6f06623f074 -r 245eea8097ec src/profile_window.py --- a/src/profile_window.py Sun May 22 23:09:49 2016 +0200 +++ b/src/profile_window.py Thu Jun 16 21:40:15 2016 +0200 @@ -288,7 +288,7 @@ else: if i == 'DESC': self.xml.get_object('DESC_textview').get_buffer().set_text( - vcard_[i], 0) + vcard_[i], len(vcard[i])) else: self.set_value(i + '_entry', vcard_[i]) if self.update_progressbar_timeout_id is not None: diff -r c6f06623f074 -r 245eea8097ec src/vcard.py --- a/src/vcard.py Sun May 22 23:09:49 2016 +0200 +++ b/src/vcard.py Thu Jun 16 21:40:15 2016 +0200 @@ -240,7 +240,7 @@ else: if i == 'DESC': self.xml.get_object('DESC_textview').get_buffer().set_text( - vcard[i], 0) + vcard[i], len(vcard[i])) elif i != 'jid': # Do not override jid_label self.set_value(i + '_label', vcard[i]) self.vcard_arrived = True

1 0

gajim: prevent a traceback when making metacontact while filteri...
by Gajim 07 Jun '16

07 Jun '16

changeset d03d48f0083c 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=d03d48f0083c description: prevent a traceback when making metacontact while filtering is enabled. Fixes #8341 diffstat: src/roster_window.py | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diffs (12 lines): diff -r 67d97224e7a4 -r d03d48f0083c src/roster_window.py --- a/src/roster_window.py Tue Jun 07 21:21:48 2016 +0200 +++ b/src/roster_window.py Tue Jun 07 22:36:38 2016 +0200 @@ -1688,6 +1688,8 @@ if model.iter_has_child(titer): iter_c = model.iter_children(titer) while iter_c: + if not model[iter_c][C_NAME]: # see #8341 + return False if self.rfilter_string in model[iter_c][C_NAME].decode( 'utf-8').lower(): return True

1 0

gajim: do not show empty groups when filtering roster id showoff...
by Gajim 07 Jun '16

07 Jun '16

changeset 67d97224e7a4 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=67d97224e7a4 description: do not show empty groups when filtering roster id showoffline=True Correctly redraw group icon after filtering. Fixes #8342 diffstat: src/roster_window.py | 21 +++++++++++++++++++-- 1 files changed, 19 insertions(+), 2 deletions(-) diffs (45 lines): diff -r a5053540b806 -r 67d97224e7a4 src/roster_window.py --- a/src/roster_window.py Fri Jun 03 20:47:40 2016 +0200 +++ b/src/roster_window.py Tue Jun 07 21:21:48 2016 +0200 @@ -1521,6 +1521,23 @@ self.tree.expand_row(path, False) self.modelfilter.foreach(func) + # Now redraw group icons for all groups, even hidden ones + def func2(model, path, iter_): + type_ = model[iter_][C_TYPE] + if type_ != 'group': + return + acct = model[iter_][C_ACCOUNT].decode('utf-8') + jid = model[iter_][C_JID].decode('utf-8') + key = acct + jid + if key in self.collapsed_rows: + model[iter_][C_IMG] = gajim.interface.\ + jabber_state_images['16']['closed'] + else: + model[iter_][C_IMG] = gajim.interface.\ + jabber_state_images['16']['opened'] + + self.model.foreach(func2) + def _adjust_account_expand_collapse_state(self, account): """ Expand/collapse account row based on self.collapsed_rows @@ -1587,6 +1604,8 @@ def contact_is_visible(self, contact, account): if self.rfilter_enabled: return self.rfilter_string in contact.get_shown_name().lower() + if gajim.config.get('showoffline'): + return True if self.contact_has_pending_roster_events(contact, account): return True @@ -1644,8 +1663,6 @@ return gajim.config.get('show_transports_group') and \ (gajim.account_is_connected(account) or \ gajim.config.get('showoffline')) - if gajim.config.get('showoffline'): - return True if self.regroup: # C_ACCOUNT for groups depends on the order

1 0

gajim: Add gajim-remote.desktop.in to POTFILES.skip. Fixes #8345
by Gajim 03 Jun '16

03 Jun '16

changeset a5053540b806 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=a5053540b806 description: Add gajim-remote.desktop.in to POTFILES.skip. Fixes #8345 diffstat: autogen.sh | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diffs (12 lines): diff -r dd39d9f43ed8 -r a5053540b806 autogen.sh --- a/autogen.sh Thu Jun 02 21:51:48 2016 +0200 +++ b/autogen.sh Fri Jun 03 20:47:40 2016 +0200 @@ -17,7 +17,7 @@ && ls -1 data/gajim.desktop.in.in data/gajim-remote.desktop.in.in \ src/*.py src/common/*.py src/command_system/*.py src/command_system/implementation/*.py src/common/zeroconf/*.py src/plugins/*.py | grep -v ipython_view.py >> \ po/POTFILES.in \ - && echo -e "data/gajim.desktop.in\nsrc/ipython_view.py" > po/POTFILES.skip || exit 1 + && echo -e "data/gajim.desktop.in\ndata/gajim-remote.desktop.in\nsrc/ipython_view.py" > po/POTFILES.skip || exit 1 if [ $(find plugins/ -name '*.py' | wc -l) -gt 0 ];then ls -1 plugins/*/*.py plugins/*/*.ui >> po/POTFILES.skip fi

1 0

gajim: [mister] Correctly restore metacontact collapse state aft...
by Gajim 02 Jun '16

02 Jun '16

changeset dd39d9f43ed8 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=dd39d9f43ed8 description: [mister] Correctly restore metacontact collapse state after filtering. See #8342 diffstat: src/roster_window.py | 18 ++++++++++++------ 1 files changed, 12 insertions(+), 6 deletions(-) diffs (59 lines): diff -r d10220579f97 -r dd39d9f43ed8 src/roster_window.py --- a/src/roster_window.py Mon May 16 20:24:53 2016 +0200 +++ b/src/roster_window.py Thu Jun 02 21:51:48 2016 +0200 @@ -4186,7 +4186,8 @@ for account in accounts: if group in gajim.groups[account]: # This account has this group gajim.groups[account][group]['expand'] = True - if account + group in self.collapsed_rows: + if account + group in self.collapsed_rows \ + and not self.rfilter_enabled: self.collapsed_rows.remove(account + group) for contact in gajim.contacts.iter_contacts(account): jid = contact.jid @@ -4199,7 +4200,8 @@ self.tree.expand_row(path, False) elif type_ == 'account': account = accounts[0] # There is only one cause we don't use merge - if account in self.collapsed_rows: + if account in self.collapsed_rows \ + and not self.rfilter_enabled: self.collapsed_rows.remove(account) self.draw_account(account) # When we expand, groups are collapsed. Restore expand state @@ -4215,7 +4217,8 @@ account = model[titer][C_ACCOUNT].decode('utf-8') contact = gajim.contacts.get_contact(account, jid) for group in contact.groups: - if account + group + jid in self.collapsed_rows: + if account + group + jid in self.collapsed_rows \ + and not self.rfilter_enabled: self.collapsed_rows.remove(account + group + jid) family = gajim.contacts.get_metacontacts_family(account, jid) nearby_family = \ @@ -4250,11 +4253,13 @@ for account in accounts: if group in gajim.groups[account]: # This account has this group gajim.groups[account][group]['expand'] = False - if account + group not in self.collapsed_rows: + if account + group not in self.collapsed_rows \ + and not self.rfilter_enabled: self.collapsed_rows.append(account + group) elif type_ == 'account': account = accounts[0] # There is only one cause we don't use merge - if account not in self.collapsed_rows: + if account not in self.collapsed_rows \ + and not self.rfilter_enabled: self.collapsed_rows.append(account) self.draw_account(account) elif type_ == 'contact': @@ -4266,7 +4271,8 @@ if not groups: groups = [_('General')] for group in groups: - if account + group + jid not in self.collapsed_rows: + if account + group + jid not in self.collapsed_rows \ + and not self.rfilter_enabled: self.collapsed_rows.append(account + group + jid) family = gajim.contacts.get_metacontacts_family(account, jid) nearby_family = \

1 0

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

Commits June 2016