Commits February 2018

commits@gajim.org

1 participants
76 discussions

[Git][gajim/gajim][master] Simplify cellrenderers
by Philipp Hörist 18 Feb '18

18 Feb '18

Philipp Hörist pushed to branch master at gajim / gajim Commits: 828e969d by Philipp Hörist at 2018-02-18T02:00:43+01:00 Simplify cellrenderers - Makes it better understandable - Fixes a bug where an avatar was drawn in a group row - Fixes not all cells getting the same background color while using a theme - - - - - 1 changed file: - gajim/groupchat_control.py Changes: ===================================== gajim/groupchat_control.py ===================================== --- a/gajim/groupchat_control.py +++ b/gajim/groupchat_control.py @@ -82,60 +82,65 @@ empty_pixbuf = GdkPixbuf.Pixbuf.new(GdkPixbuf.Colorspace.RGB, True, 8, 1, 1) empty_pixbuf.fill(0xffffff00) -def status_cell_data_func(column, renderer, model, iter_, user_data): +def cell_data_func(column, renderer, model, iter_, user_data): + # Background color has to be rendered for all cells + theme = app.config.get('roster_theme') + has_parent = bool(model.iter_parent(iter_)) + if has_parent: + bgcolor = app.config.get_per('themes', theme, 'contactbgcolor') + renderer.set_property('cell-background', bgcolor or None) + else: + bgcolor = app.config.get_per('themes', theme, 'groupbgcolor') + renderer.set_property('cell-background', bgcolor or None) + + if user_data == 'status': + status_cell_data_func(column, renderer, model, iter_, has_parent) + elif user_data == 'name': + text_cell_data_func(column, renderer, model, iter_, has_parent, theme) + elif user_data == 'avatar': + avatar_cell_data_func(column, renderer, model, iter_, has_parent) + +def status_cell_data_func(column, renderer, model, iter_, has_parent): renderer.set_property('width', 26) image = model[iter_][Column.IMG] surface = image.get_property('surface') renderer.set_property('surface', surface) - -def tree_cell_data_func(column, renderer, model, iter_, user_data): - # cell data func is global, because we don't want it to keep - # reference to GroupchatControl instance (self) - theme = app.config.get('roster_theme') - # allocate space for avatar only if needed - parent_iter = model.iter_parent(iter_) - if isinstance(renderer, Gtk.CellRendererPixbuf): - image = model[iter_][Column.AVATAR_IMG] - if image is None: - return +def avatar_cell_data_func(column, renderer, model, iter_, has_parent): + image = model[iter_][Column.AVATAR_IMG] + if image is None: + renderer.set_property('surface', None) + else: surface = image.get_property('surface') renderer.set_property('surface', surface) - avatar_position = app.config.get('avatar_position_in_roster') - if avatar_position == 'right': - renderer.set_property('xalign', 1) # align pixbuf to the right - else: - renderer.set_property('xalign', 0.5) - if parent_iter: - renderer.set_property('visible', True) - renderer.set_property('width', AvatarSize.ROSTER) - else: - renderer.set_property('visible', False) - if parent_iter: - bgcolor = app.config.get_per('themes', theme, 'contactbgcolor') - if bgcolor: - renderer.set_property('cell-background', bgcolor) + avatar_position = app.config.get('avatar_position_in_roster') + if avatar_position == 'right': + renderer.set_property('xalign', 1) + else: + renderer.set_property('xalign', 0.5) + if has_parent: + renderer.set_property('visible', True) + renderer.set_property('width', AvatarSize.ROSTER) + else: + renderer.set_property('visible', False) + +def text_cell_data_func(column, renderer, model, iter_, has_parent, theme): + # cell data func is global, because we don't want it to keep + # reference to GroupchatControl instance (self) + if has_parent: + color = app.config.get_per('themes', theme, 'contacttextcolor') + if color: + renderer.set_property('foreground', color) else: - renderer.set_property('cell-background', None) - if isinstance(renderer, Gtk.CellRendererText): - # foreground property is only with CellRendererText - color = app.config.get_per('themes', theme, 'contacttextcolor') - if color: - renderer.set_property('foreground', color) - else: - renderer.set_property('foreground', None) - renderer.set_property('font', - gtkgui_helpers.get_theme_font_for_option(theme, 'contactfont')) - else: # it is root (eg. group) - bgcolor = app.config.get_per('themes', theme, 'groupbgcolor') - renderer.set_property('cell-background', bgcolor or None) - if isinstance(renderer, Gtk.CellRendererText): - # foreground property is only with CellRendererText - color = app.config.get_per('themes', theme, 'grouptextcolor') - renderer.set_property('foreground', color or None) - renderer.set_property('font', - gtkgui_helpers.get_theme_font_for_option(theme, 'groupfont')) + renderer.set_property('foreground', None) + renderer.set_property('font', + gtkgui_helpers.get_theme_font_for_option(theme, 'contactfont')) + else: + color = app.config.get_per('themes', theme, 'grouptextcolor') + renderer.set_property('foreground', color or None) + renderer.set_property('font', + gtkgui_helpers.get_theme_font_for_option(theme, 'groupfont')) class PrivateChatControl(ChatControl): @@ -438,15 +443,15 @@ class GroupchatControl(ChatControlBase): self.renderers_list += ( # status img ('icon', Gtk.CellRendererPixbuf(), False, - None, Column.IMG, status_cell_data_func, None), + None, Column.IMG, cell_data_func, 'status'), # contact name ('name', renderer_text, True, - 'markup', Column.TEXT, tree_cell_data_func, None)) + 'markup', Column.TEXT, cell_data_func, 'name')) # avatar img avatar_renderer = ('avatar', Gtk.CellRendererPixbuf(), False, None, Column.AVATAR_IMG, - tree_cell_data_func, None) + cell_data_func, 'avatar') if app.config.get('avatar_position_in_roster') == 'right': self.renderers_list.append(avatar_renderer) View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/828e969d231ff03f1bef5e938b4281057b… --- View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/828e969d231ff03f1bef5e938b4281057b… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim] Pushed new tag gajim-1.0.0-beta2
by Philipp Hörist 17 Feb '18

17 Feb '18

Philipp Hörist pushed new tag gajim-1.0.0-beta2 at gajim / gajim --- View it on GitLab: https://dev.gajim.org/gajim/gajim/tree/gajim-1.0.0-beta2 You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] Update ChangeLog
by Philipp Hörist 17 Feb '18

17 Feb '18

Philipp Hörist pushed to branch master at gajim / gajim Commits: d38e8532 by Philipp Hörist at 2018-02-17T19:10:39+01:00 Update ChangeLog - - - - - 1 changed file: - ChangeLog Changes: ===================================== ChangeLog ===================================== --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +Gajim 0.99.2 (17 February 2018) + + * Speed up DB querys on MAM sync + * Fix config file encoding + * Bug fixes + Gajim 0.99.1 (08 February 2018) * Integrate HTTPUpload View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/d38e8532e7b9b2216414e46507d19c7473… --- View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/d38e8532e7b9b2216414e46507d19c7473… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][gajim_1.0] Update ChangeLog
by Philipp Hörist 17 Feb '18

17 Feb '18

Philipp Hörist pushed to branch gajim_1.0 at gajim / gajim Commits: 44521fcb by Philipp Hörist at 2018-02-17T19:09:15+01:00 Update ChangeLog - - - - - 1 changed file: - ChangeLog Changes: ===================================== ChangeLog ===================================== --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +Gajim 0.99.2 (17 February 2018) + + * Speed up DB querys on MAM sync + * Fix config file encoding + * Bug fixes + Gajim 0.99.1 (08 February 2018) * Integrate HTTPUpload View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/44521fcbaa8759f5a540a687d465272195… --- View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/44521fcbaa8759f5a540a687d465272195… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][gajim_1.0] 7 commits: Parse uri with message action correctly
by Philipp Hörist 17 Feb '18

17 Feb '18

Philipp Hörist pushed to branch gajim_1.0 at gajim / gajim Commits: 0b984c48 by Philipp Hörist at 2018-02-17T19:02:20+01:00 Parse uri with message action correctly Fixes #8894 - - - - - 7d7d818b by Philipp Hörist at 2018-02-17T19:02:20+01:00 VCard Window: fix URI Fixes #8902 - - - - - 0652b424 by Philipp Hörist at 2018-02-17T19:02:20+01:00 StatusIcon: Set account name correctly Fixes #8901 - - - - - e1fba8dc by Philipp Hörist at 2018-02-17T19:02:20+01:00 Make string translatable - - - - - 1c9df8e0 by Philipp Hörist at 2018-02-17T19:02:20+01:00 Dont mutate THANKS constant - - - - - 21cffe50 by Yann Leboulanger at 2018-02-17T19:05:28+01:00 add index on stanza_id column to speed up de-duplication when syncing logs - - - - - 47e55b49 by Yann Leboulanger at 2018-02-17T19:05:38+01:00 update Gajim version to 0.99.2 - - - - - 6 changed files: - gajim/__init__.py - gajim/common/optparser.py - gajim/dialogs.py - gajim/gajim.py - gajim/statusicon.py - gajim/vcard.py Changes: ===================================== gajim/__init__.py ===================================== --- a/gajim/__init__.py +++ b/gajim/__init__.py @@ -1,6 +1,6 @@ import subprocess -__version__ = "0.99.1" +__version__ = "0.99.2" try: node = subprocess.Popen('git rev-parse --short=12 HEAD', shell=True, ===================================== gajim/common/optparser.py ===================================== --- a/gajim/common/optparser.py +++ b/gajim/common/optparser.py @@ -251,6 +251,8 @@ class OptionsParser: self.update_config_to_0982() if old < [0, 98, 3] and new >= [0, 98, 3]: self.update_config_to_0983() + if old < [0, 99, 2] and new >= [0, 99, 2]: + self.update_config_to_0992() app.logger.init_vars() app.logger.attach_cache_database() @@ -935,3 +937,12 @@ class OptionsParser: elif password == "libsecret:": app.config.set_per('accounts', account, 'password', '') app.config.set('version', '0.98.3') + + def update_config_to_0992(self): + self.call_sql(logger.LOG_DB_PATH, + ''' + CREATE INDEX IF NOT EXISTS + idx_logs_stanza_id ON logs (stanza_id); + ''' + ) + app.config.set('version', '0.99.2') ===================================== gajim/dialogs.py ===================================== --- a/gajim/dialogs.py +++ b/gajim/dialogs.py @@ -1312,11 +1312,11 @@ class AboutDialog(Gtk.AboutDialog): self.add_credit_section(_('Past Developers'), const.DEVS_PAST) self.add_credit_section(_('Artists'), const.ARTISTS) - thanks = const.THANKS + thanks = const.THANKS[:] thanks.append('') thanks.append(_('Last but not least')) thanks.append(_('we would like to thank all the package maintainers.')) - self.add_credit_section('Thanks', thanks) + self.add_credit_section(_('Thanks'), thanks) self.set_translator_credits(_('translator-credits')) self.set_logo_icon_name('org.gajim.Gajim') ===================================== gajim/gajim.py ===================================== --- a/gajim/gajim.py +++ b/gajim/gajim.py @@ -41,6 +41,8 @@ import sys import os import signal import locale +from urllib.parse import unquote + import gi gi.require_version('GLib', '2.0') gi.require_version('Gio', '2.0') @@ -49,6 +51,7 @@ gi.require_version('Gdk', '3.0') gi.require_version('GObject', '2.0') gi.require_version('Pango', '1.0') from gi.repository import GLib, Gio, Gtk + from gajim.common import i18n from gajim.common import logging_helpers from gajim.common import crypto @@ -266,12 +269,20 @@ class GajimApplication(Gtk.Application): self.interface.join_gc_minimal(None, jid) elif cmd == 'roster': self.activate_action('add-contact', GLib.Variant('s', jid)) - elif cmd == 'message': + elif cmd.startswith('message'): + attributes = cmd.split(';') + message = None + for key in attributes: + if key.startswith('body'): + try: + message = unquote(key.split('=')[1]) + except Exception: + app.log('uri_handler').error('Invalid URI: %s', cmd) accounts = list(app.connections.keys()) if not accounts: continue if len(accounts) == 1: - app.interface.new_chat_from_jid(accounts[0], jid) + app.interface.new_chat_from_jid(accounts[0], jid, message) else: self.activate_action('start-chat') start_chat_window = app.interface.instances['start_chat'] ===================================== gajim/statusicon.py ===================================== --- a/gajim/statusicon.py +++ b/gajim/statusicon.py @@ -244,10 +244,12 @@ class StatusIcon: self.popup_menus.append(account_menu_for_chat_with) for account in accounts_list: + account_label = app.config.get_per( + 'accounts', account, 'account_label') if app.account_is_connected(account): # for chat_with item = Gtk.MenuItem.new_with_label( - _('using account %s') % account) + _('using account %s') % account_label) account_menu_for_chat_with.append(item) item.connect('activate', self.on_new_chat, account) @@ -288,6 +290,8 @@ class StatusIcon: self.popup_menus.append(account_menu_for_single_message) for account in accounts_list: + account_label = app.config.get_per( + 'accounts', account, 'account_label') if app.connections[account].is_zeroconf or \ not app.account_is_connected(account): continue @@ -295,14 +299,14 @@ class StatusIcon: connected_accounts_with_private_storage += 1 # for single message item = Gtk.MenuItem.new_with_label( - _('using account %s') % account) + _('using account %s') % account_label) item.connect('activate', self.on_single_message_menuitem_activate, account) account_menu_for_single_message.append(item) # join gc gc_item = Gtk.MenuItem.new_with_label( - _('using account %s') % account) + _('using account %s') % account_label) gc_sub_menu.append(gc_item) gc_menuitem_menu = Gtk.Menu() app.interface.roster.add_bookmarks_list(gc_menuitem_menu, ===================================== gajim/vcard.py ===================================== --- a/gajim/vcard.py +++ b/gajim/vcard.py @@ -188,7 +188,10 @@ class VcardWindow: if entry_name in ('URL_label', 'EMAIL_WORK_USERID_label', 'EMAIL_HOME_USERID_label'): - widget.set_uri('mailto:' + value) + if entry_name == 'URL_label': + widget.set_uri(value) + else: + widget.set_uri('mailto:' + value) widget.set_label(value) self.xml.get_object(entry_name).show() else: View it on GitLab: https://dev.gajim.org/gajim/gajim/compare/83a0d36281276c363679af458317a4611… --- View it on GitLab: https://dev.gajim.org/gajim/gajim/compare/83a0d36281276c363679af458317a4611… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] update Gajim version to 0.99.2
by Yann Leboulanger 17 Feb '18

17 Feb '18

Yann Leboulanger pushed to branch master at gajim / gajim Commits: be028288 by Yann Leboulanger at 2018-02-17T18:54:18+01:00 update Gajim version to 0.99.2 - - - - - 1 changed file: - gajim/__init__.py Changes: ===================================== gajim/__init__.py ===================================== --- a/gajim/__init__.py +++ b/gajim/__init__.py @@ -1,6 +1,6 @@ import subprocess -__version__ = "0.99.1" +__version__ = "0.99.2" try: node = subprocess.Popen('git rev-parse --short=12 HEAD', shell=True, View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/be028288612aa72cb049e33bff69f67cbf… --- View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/be028288612aa72cb049e33bff69f67cbf… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][gajim_1.0] update translations
by Yann Leboulanger 17 Feb '18

17 Feb '18

Yann Leboulanger pushed to branch gajim_1.0 at gajim / gajim Commits: 83a0d362 by Yann Leboulanger at 2018-02-17T17:48:55+00:00 update translations - - - - - 14 changed files: - po/be.po - po/be(a)latin.po - po/bg.po - po/br.po - po/ca.po - po/cs.po - po/da.po - po/de.po - po/el.po - po/en_GB.po - po/eo.po - po/es.po - po/eu.po - po/fr.po The diff was not included because it is too large. View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/83a0d36281276c363679af458317a46114… --- View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/83a0d36281276c363679af458317a46114… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] update translations
by Yann Leboulanger 17 Feb '18

17 Feb '18

Yann Leboulanger pushed to branch master at gajim / gajim Commits: 89cec79d by Yann Leboulanger at 2018-02-17T17:46:09+00:00 update translations - - - - - 4 changed files: - po/be.po - po/be(a)latin.po - po/bg.po - po/br.po The diff was not included because it is too large. View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/89cec79dba02236f5f6b30009a2aff626d… --- View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/89cec79dba02236f5f6b30009a2aff626d… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] add index on stanza_id column to speed up de-duplication when syncing logs
by Yann Leboulanger 17 Feb '18

17 Feb '18

Yann Leboulanger pushed to branch master at gajim / gajim Commits: 4149bcac by Yann Leboulanger at 2018-02-17T18:37:22+01:00 add index on stanza_id column to speed up de-duplication when syncing logs - - - - - 1 changed file: - gajim/common/optparser.py Changes: ===================================== gajim/common/optparser.py ===================================== --- a/gajim/common/optparser.py +++ b/gajim/common/optparser.py @@ -245,6 +245,8 @@ class OptionsParser: self.update_config_to_0982() if old < [0, 98, 3] and new >= [0, 98, 3]: self.update_config_to_0983() + if old < [0, 99, 2] and new >= [0, 99, 2]: + self.update_config_to_0992() app.logger.init_vars() app.logger.attach_cache_database() @@ -929,3 +931,12 @@ class OptionsParser: elif password == "libsecret:": app.config.set_per('accounts', account, 'password', '') app.config.set('version', '0.98.3') + + def update_config_to_0992(self): + self.call_sql(logger.LOG_DB_PATH, + ''' + CREATE INDEX IF NOT EXISTS + idx_logs_stanza_id ON logs (stanza_id); + ''' + ) + app.config.set('version', '0.99.2') View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/4149bcacb962a04b7aca125b84c0a48753… --- View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/4149bcacb962a04b7aca125b84c0a48753… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] Dont mutate THANKS constant
by Philipp Hörist 16 Feb '18

16 Feb '18

Philipp Hörist pushed to branch master at gajim / gajim Commits: 958c898e by Philipp Hörist at 2018-02-16T21:44:12+01:00 Dont mutate THANKS constant - - - - - 1 changed file: - gajim/dialogs.py Changes: ===================================== gajim/dialogs.py ===================================== --- a/gajim/dialogs.py +++ b/gajim/dialogs.py @@ -1312,7 +1312,7 @@ class AboutDialog(Gtk.AboutDialog): self.add_credit_section(_('Past Developers'), const.DEVS_PAST) self.add_credit_section(_('Artists'), const.ARTISTS) - thanks = const.THANKS + thanks = const.THANKS[:] thanks.append('') thanks.append(_('Last but not least')) thanks.append(_('we would like to thank all the package maintainers.')) View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/958c898ed13e26fd020fc2f1b424efb86b… --- View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/958c898ed13e26fd020fc2f1b424efb86b… You're receiving this email because of your account on dev.gajim.org.

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 2018