Commits

commits@gajim.org

17632 discussions

[Git][gajim/gajim][master] 3 commits: Limit deduplication to correct archive
by Philipp Hörist 21 Feb '18

21 Feb '18

Philipp Hörist pushed to branch master at gajim / gajim Commits: 17fc8ff9 by Philipp Hörist at 2018-02-21T19:23:26+01:00 Limit deduplication to correct archive We limit the search to non-groupchat messages because a stanza id is only unique within an archive - - - - - 0c7f1937 by Philipp Hörist at 2018-02-21T22:09:13+01:00 Fix duplicates for self messages and MUC PMs Fixes #8812 - - - - - 015d99ea by Philipp Hörist at 2018-02-21T22:21:35+01:00 Print correct archive jid in log message - - - - - 2 changed files: - gajim/common/connection_handlers_events.py - gajim/common/logger.py Changes: ===================================== gajim/common/connection_handlers_events.py ===================================== --- a/gajim/common/connection_handlers_events.py +++ b/gajim/common/connection_handlers_events.py @@ -163,6 +163,23 @@ class HelperEvent: if forwarded is not None: return forwarded.getTag('message', protocol=True) + def _is_self_message(self, message): + if self.self_message is not None: + return self.self_message + own_jid = self.conn.get_own_jid() + frm = message.getFrom() + to = message.getTo() + # If 'to' is not set we assume own jid + self.self_message = frm.bareMatch(to or own_jid) + return self.self_message + + def _is_muc_pm(self, message): + if self.muc_pm is not None: + return self.muc_pm + self.muc_pm = message.getTag( + 'x', namespace=nbxmpp.NS_MUC_USER) is not None + return self.muc_pm + class HttpAuthReceivedEvent(nec.NetworkIncomingEvent): name = 'http-auth-received' base_network_events = [] @@ -1015,6 +1032,8 @@ class MamMessageReceivedEvent(nec.NetworkIncomingEvent, HelperEvent): self.encrypted = False self.groupchat = False self.nick = None + self.self_message = None + self.muc_pm = None def generate(self): account = self.conn.name @@ -1081,6 +1100,11 @@ class MamMessageReceivedEvent(nec.NetworkIncomingEvent, HelperEvent): def get_unique_id(self): stanza_id = self.get_stanza_id(self.result, query=True) + + if self._is_self_message(self.msg_) or self._is_muc_pm(self.msg_): + origin_id = self.msg_.getOriginID() + return stanza_id, origin_id + if self.conn.get_own_jid().bareMatch(self.msg_.getFrom()): # message we sent origin_id = self.msg_.getOriginID() @@ -1217,6 +1241,8 @@ class MessageReceivedEvent(nec.NetworkIncomingEvent, HelperEvent): self.forwarded = False self.sent = False self.encrypted = False + self.self_message = None + self.muc_pm = None account = self.conn.name if self.stanza.getFrom() == self.conn.get_own_jid(warn=True): @@ -1250,11 +1276,16 @@ class MessageReceivedEvent(nec.NetworkIncomingEvent, HelperEvent): self.unique_id = self.get_unique_id() # Check groupchat messages for duplicates, # We do this because of MUC History messages - if self.stanza.getType() == 'groupchat': + type_ = self.stanza.getType() + if type_ == 'groupchat' or self.self_message or self.muc_pm: + if type_ == 'groupchat': + archive_jid = self.stanza.getFrom().getStripped() + else: + archive_jid = self.conn.get_own_jid() if app.logger.find_stanza_id(account, - self.stanza.getFrom().getStripped(), + archive_jid, self.unique_id, - groupchat=True): + groupchat=type_ == 'groupchat'): return address_tag = self.stanza.getTag('addresses', @@ -1406,6 +1437,21 @@ class MessageReceivedEvent(nec.NetworkIncomingEvent, HelperEvent): return True def get_unique_id(self): + ''' + Messages to self: + + Messages to self are stored multiple times in MAM so we cant use + stanza-id to deduplicate. We use origin-id instead. Its not perfect + but there is no better way for now. + We drop "received"-Carbons of Message to self, so we dont have to + parse origin-id in that case. + + MUC PMs: + + MUC PMs are also stored multiple times, we also depend on origin-id + for now. + ''' + if self.stanza.getType() == 'groupchat': # TODO: Disco the MUC check if 'urn:xmpp:mam:2' is announced return self.get_stanza_id(self.stanza) @@ -1424,6 +1470,8 @@ class MessageReceivedEvent(nec.NetworkIncomingEvent, HelperEvent): protocol=True) if sent_carbon is not None: message = self.get_forwarded_message(sent_carbon) + if self._is_self_message(message) or self._is_muc_pm(message): + return message.getOriginID() return self.get_stanza_id(message) # Received Carbon @@ -1432,9 +1480,13 @@ class MessageReceivedEvent(nec.NetworkIncomingEvent, HelperEvent): protocol=True) if received_carbon is not None: message = self.get_forwarded_message(received_carbon) + if self._is_muc_pm(message): + return message.getOriginID() return self.get_stanza_id(message) # Normal Message + if self._is_self_message(self.stanza) or self._is_muc_pm(self.stanza): + return self.stanza.getOriginID() return self.get_stanza_id(self.stanza) class ZeroconfMessageReceivedEvent(MessageReceivedEvent): ===================================== gajim/common/logger.py ===================================== --- a/gajim/common/logger.py +++ b/gajim/common/logger.py @@ -1158,6 +1158,7 @@ class Logger: :param account: The account :param archive_jid: The jid of the archive the stanza-id belongs to + only used if groupchat=True :param stanza_id: The stanza-id @@ -1182,7 +1183,7 @@ class Logger: if groupchat: # Stanza ID is only unique within a specific archive. # So a Stanza ID could be repeated in different MUCs, so we - # filter also for the archive JID + # filter also for the archive JID which is the bare MUC jid. sql = ''' SELECT stanza_id FROM logs WHERE stanza_id IN ({values}) @@ -1193,14 +1194,14 @@ class Logger: else: sql = ''' SELECT stanza_id FROM logs - WHERE stanza_id IN ({values}) AND account_id = ? LIMIT 1 + WHERE stanza_id IN ({values}) AND account_id = ? AND kind != ? LIMIT 1 '''.format(values=', '.join('?' * len(ids))) result = self.con.execute( - sql, tuple(ids) + (account_id,)).fetchone() + sql, tuple(ids) + (account_id, KindConstant.GC_MSG)).fetchone() if result is not None: log.info('Found duplicated message, stanza-id: %s, origin-id: %s, ' - 'archive-jid: %s, account: %s', stanza_id, origin_id, archive_id, account_id) + 'archive-jid: %s, account: %s', stanza_id, origin_id, archive_jid, account_id) return True return False View it on GitLab: https://dev.gajim.org/gajim/gajim/compare/d6bfea1b19f11183edb25a086c3faa0b1… --- View it on GitLab: https://dev.gajim.org/gajim/gajim/compare/d6bfea1b19f11183edb25a086c3faa0b1… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] 2 commits: Fix MessagTextview height
by Philipp Hörist 20 Feb '18

20 Feb '18

Philipp Hörist pushed to branch master at gajim / gajim Commits: 27ffae2a by Philipp Hörist at 2018-02-20T22:03:57+01:00 Fix MessagTextview height On some Desktops eg. Mate, the MessageTextview was to big, because the default height seems to be 82. What influences the default height (compare Windows where it is 46), is unclear. - - - - - d6bfea1b by Philipp Hörist at 2018-02-20T22:51:28+01:00 Add extension point for GC tooltip - - - - - 2 changed files: - gajim/chat_control_base.py - gajim/tooltips.py Changes: ===================================== gajim/chat_control_base.py ===================================== --- a/gajim/chat_control_base.py +++ b/gajim/chat_control_base.py @@ -1380,13 +1380,12 @@ class ScrolledWindow(Gtk.ScrolledWindow): def do_get_preferred_height(self): min_height, natural_height = Gtk.ScrolledWindow.do_get_preferred_height(self) - child = self.get_child() # Gtk Bug: If policy is set to Automatic, the ScrolledWindow - # has a min size of around 46 depending on the System. Because - # we want it smaller, we set policy NEVER if the height is < 50 + # has a min size of around 46-82 depending on the System. Because + # we want it smaller, we set policy NEVER if the height is < 90 # so the ScrolledWindow will shrink to around 26 (1 line heigh). - # Once it gets over 50 its no problem to restore the policy. - if natural_height < 50: + # Once it gets over 90 its no problem to restore the policy. + if natural_height < 90: GLib.idle_add(self.set_policy, Gtk.PolicyType.AUTOMATIC, Gtk.PolicyType.NEVER) ===================================== gajim/tooltips.py ===================================== --- a/gajim/tooltips.py +++ b/gajim/tooltips.py @@ -252,6 +252,9 @@ class GCTooltip(): self.avatar.show() self.fillelement.show() + app.plugin_manager.gui_extension_point( + 'gc_tooltip_populate', self, contact, self.tooltip_grid) + @staticmethod def colorize_affiliation(affiliation): """ View it on GitLab: https://dev.gajim.org/gajim/gajim/compare/64d743de3ee25e9ba4686d0d368a5ba2b… --- View it on GitLab: https://dev.gajim.org/gajim/gajim/compare/64d743de3ee25e9ba4686d0d368a5ba2b… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] 4 commits: Fix avatar ratio
by Philipp Hörist 19 Feb '18

19 Feb '18

Philipp Hörist pushed to branch master at gajim / gajim Commits: f1aceae2 by Philipp Hörist at 2018-02-19T22:02:31+01:00 Fix avatar ratio Fixes #8907 - - - - - c5de08d4 by Philipp Hörist at 2018-02-19T22:02:40+01:00 StartChatDialog: Use HighDPI icons/avatars - - - - - 618b0b87 by Philipp Hörist at 2018-02-19T22:02:40+01:00 Add --start-chat command - - - - - 64d743de by Philipp Hörist at 2018-02-19T22:02:40+01:00 StatusIcon: Add fallback for account label Fixes #8901 - - - - - 8 changed files: - gajim/data/gui/chat_control.ui - gajim/dialogs.py - gajim/gajim.py - gajim/groupchat_control.py - gajim/gtkgui_helpers.py - gajim/gui_interface.py - gajim/roster_window.py - gajim/statusicon.py Changes: ===================================== gajim/data/gui/chat_control.ui ===================================== --- a/gajim/data/gui/chat_control.ui +++ b/gajim/data/gui/chat_control.ui @@ -392,6 +392,8 @@ <property name="visible_window">False</property> <child> <object class="GtkImage" id="avatar_image"> + <property name="width_request">48</property> + <property name="height_request">48</property> <property name="visible">True</property> <property name="can_focus">False</property> <property name="stock">gtk-missing-image</property> ===================================== gajim/dialogs.py ===================================== --- a/gajim/dialogs.py +++ b/gajim/dialogs.py @@ -2755,19 +2755,10 @@ class SynchroniseSelectContactsDialog: class StartChatDialog(Gtk.ApplicationWindow): def __init__(self): - # Must be before ApplicationWindow.__init__ - # or we get our own window - active_window = app.app.get_active_window() - Gtk.ApplicationWindow.__init__(self) self.set_name('StartChatDialog') self.set_application(app.app) - mode = app.config.get('one_message_window') != 'always_with_roster' - if active_window == app.interface.roster.window and mode: - self.set_position(Gtk.WindowPosition.CENTER) - else: - self.set_transient_for(active_window) - self.set_type_hint(Gdk.WindowTypeHint.DIALOG) + self.set_position(Gtk.WindowPosition.CENTER) self.set_show_menubar(False) self.set_title(_('Start new Conversation')) self.set_default_size(-1, 400) @@ -3006,18 +2997,20 @@ class ContactRow(Gtk.Grid): self.new = jid == '' if self.groupchat: - if self.new: - muc_image = app.interface.jabber_state_images['32']['muc_inactive'] - else: - muc_image = app.interface.jabber_state_images['32']['muc_active'] - image = Gtk.Image.new_from_pixbuf(muc_image.get_pixbuf()) + muc_icon = gtkgui_helpers.get_iconset_name_for( + 'muc-inactive' if self.new else 'muc-active') + image = Gtk.Image.new_from_icon_name(muc_icon, Gtk.IconSize.DND) else: - avatar = app.contacts.get_avatar(account, jid, AvatarSize.ROSTER) + scale = self.get_scale_factor() + avatar = app.contacts.get_avatar( + account, jid, AvatarSize.ROSTER, scale) if avatar is None: image = Gtk.Image.new_from_icon_name( 'avatar-default', Gtk.IconSize.DND) else: - image = Gtk.Image.new_from_pixbuf(avatar) + image = Gtk.Image.new_from_surface(avatar) + + image.set_size_request(AvatarSize.ROSTER, AvatarSize.ROSTER) self.add(image) middle_box = Gtk.Box(orientation=Gtk.Orientation.VERTICAL, spacing=0) ===================================== gajim/gajim.py ===================================== --- a/gajim/gajim.py +++ b/gajim/gajim.py @@ -103,6 +103,9 @@ class GajimApplication(Gtk.Application): self.add_main_option('show-next-pending-event', 0, GLib.OptionFlags.NONE, GLib.OptionArg.NONE, _('Pops up a window with the next pending event')) + self.add_main_option('start-chat', 0, GLib.OptionFlags.NONE, + GLib.OptionArg.NONE, + _('Start a new chat')) self.connect('handle-local-options', self._handle_local_options) self.connect('command-line', self._handle_remote_options) @@ -307,6 +310,7 @@ class GajimApplication(Gtk.Application): remote_commands = ['ipython', 'show-next-pending-event', + 'start-chat', ] for cmd in remote_commands: ===================================== gajim/groupchat_control.py ===================================== --- a/gajim/groupchat_control.py +++ b/gajim/groupchat_control.py @@ -114,11 +114,7 @@ def avatar_cell_data_func(column, renderer, model, iter_, has_parent): 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) - else: - renderer.set_property('xalign', 0.5) + renderer.set_property('xalign', 0.5) if has_parent: renderer.set_property('visible', True) renderer.set_property('width', AvatarSize.ROSTER) ===================================== gajim/gtkgui_helpers.py ===================================== --- a/gajim/gtkgui_helpers.py +++ b/gajim/gtkgui_helpers.py @@ -437,6 +437,16 @@ def get_possible_button_event(event): def destroy_widget(widget): widget.destroy() +def scale_with_ratio(size, width, height): + if height == width: + return size, size + if height > width: + ratio = height / float(width) + return int(size / ratio), size + else: + ratio = width / float(height) + return size, int(size / ratio) + def on_avatar_save_as_menuitem_activate(widget, avatar, default_name=''): def on_continue(response, file_path): if response < 0: ===================================== gajim/gui_interface.py ===================================== --- a/gajim/gui_interface.py +++ b/gajim/gui_interface.py @@ -2483,7 +2483,7 @@ class Interface: try: if size is not None: pixbuf = GdkPixbuf.Pixbuf.new_from_file_at_scale( - path, size, size, False) + path, size, size, True) else: pixbuf = GdkPixbuf.Pixbuf.new_from_file(path) except GLib.GError as error: @@ -2504,8 +2504,10 @@ class Interface: array, GdkPixbuf.Colorspace.RGB, True, 8, width, height, width * 4) if size: + width, height = gtkgui_helpers.scale_with_ratio( + size, width, height) pixbuf = pixbuf.scale_simple( - size, size, GdkPixbuf.InterpType.BILINEAR) + width, height, GdkPixbuf.InterpType.BILINEAR) if filename not in app.avatar_cache: app.avatar_cache[filename] = {} ===================================== gajim/roster_window.py ===================================== --- a/gajim/roster_window.py +++ b/gajim/roster_window.py @@ -4864,11 +4864,8 @@ class RosterWindow: app.config.get('avatar_position_in_roster') != 'left': renderer.set_property('visible', False) - if app.config.get('avatar_position_in_roster') == 'left': - renderer.set_property('width', AvatarSize.ROSTER) - renderer.set_property('xalign', 0.5) - else: - renderer.set_property('xalign', 1) # align pixbuf to the right + renderer.set_property('width', AvatarSize.ROSTER) + renderer.set_property('xalign', 0.5) def _fill_padlock_pixbuf_renderer(self, column, renderer, model, titer, data=None): ===================================== gajim/statusicon.py ===================================== --- a/gajim/statusicon.py +++ b/gajim/statusicon.py @@ -245,7 +245,7 @@ class StatusIcon: for account in accounts_list: account_label = app.config.get_per( - 'accounts', account, 'account_label') + 'accounts', account, 'account_label') or account if app.account_is_connected(account): # for chat_with item = Gtk.MenuItem.new_with_label( @@ -291,7 +291,7 @@ class StatusIcon: for account in accounts_list: account_label = app.config.get_per( - 'accounts', account, 'account_label') + 'accounts', account, 'account_label') or account if app.connections[account].is_zeroconf or \ not app.account_is_connected(account): continue View it on GitLab: https://dev.gajim.org/gajim/gajim/compare/481ad882a00de00ce7d702edc868e7e3d… --- View it on GitLab: https://dev.gajim.org/gajim/gajim/compare/481ad882a00de00ce7d702edc868e7e3d… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] Add contribution guide
by Philipp Hörist 18 Feb '18

18 Feb '18

Philipp Hörist pushed to branch master at gajim / gajim Commits: 481ad882 by Philipp Hörist at 2018-02-18T14:42:04+01:00 Add contribution guide - - - - - 1 changed file: - + CONTRIBUTING.md Changes: ===================================== CONTRIBUTING.md ===================================== --- /dev/null +++ b/CONTRIBUTING.md @@ -0,0 +1,6 @@ + +- master - Development branch +- gajim_1.0 - Stable Gajim 1.0.x branch +- gajim_0.16 - Stable Gajim 0.16.x branch + +If you are not familiar with Git please read the [HowTo](https://dev.gajim.org/gajim/gajim/wikis/howtogit) \ No newline at end of file View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/481ad882a00de00ce7d702edc868e7e3df… --- View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/481ad882a00de00ce7d702edc868e7e3df… You're receiving this email because of your account on dev.gajim.org.

1 0

[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

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