Commits February 2018

commits@gajim.org

1 participants
76 discussions

[Git][gajim/gajim][master] Make file transfer labels sound less technical
by Philipp Hörist 22 Feb '18

22 Feb '18

Philipp Hörist pushed to branch master at gajim / gajim Commits: a94276f6 by Philipp Hörist at 2018-02-22T22:45:15+01:00 Make file transfer labels sound less technical - - - - - 3 changed files: - gajim/chat_control.py - gajim/groupchat_control.py - gajim/gui_menu_builder.py Changes: ===================================== gajim/chat_control.py ===================================== --- a/gajim/chat_control.py +++ b/gajim/chat_control.py @@ -314,20 +314,9 @@ class ChatControl(ChatControlBase): jingle.get_enabled() or httpupload.get_enabled()) # Set File Transfer Button tooltip - ft_pref = app.config.get_per('accounts', self.account, - 'filetransfer_preference') - - tooltip_text = None - if httpupload.get_enabled() and jingle.get_enabled(): - if ft_pref == 'httpupload': - tooltip_text = _('HTTP File Upload') - else: - tooltip_text = _('Jingle File Transfer') - elif httpupload.get_enabled(): - tooltip_text = _('HTTP File Upload') - elif jingle.get_enabled(): - tooltip_text = _('Jingle File Transfer') - elif online: + if online and (httpupload.get_enabled() or jingle.get_enabled()): + tooltip_text = _('Send File…') + else: tooltip_text = _('No File Transfer available') self.sendfile_button.set_tooltip_text(tooltip_text) ===================================== gajim/groupchat_control.py ===================================== --- a/gajim/groupchat_control.py +++ b/gajim/groupchat_control.py @@ -631,13 +631,10 @@ class GroupchatControl(ChatControlBase): win.lookup_action('send-file-' + self.control_id).set_enabled( httpupload.get_enabled()) - tooltip_text = None - if online: - if httpupload.get_enabled(): - tooltip_text = _('HTTP File Upload') - else: - tooltip_text = _('HTTP File Upload not supported ' - 'by your server') + if online and httpupload.get_enabled(): + tooltip_text = _('Send File…') + else: + tooltip_text = _('No File Transfer available') self.sendfile_button.set_tooltip_text(tooltip_text) # Actions ===================================== gajim/gui_menu_builder.py ===================================== --- a/gajim/gui_menu_builder.py +++ b/gajim/gui_menu_builder.py @@ -608,9 +608,9 @@ Build dynamic Application Menus def get_singlechat_menu(control_id): singlechat_menu = [ - (_('Send File...'), [ - ('win.send-file-httpupload-', 'HTTP Upload'), - ('win.send-file-jingle-', 'Jingle'), + (_('Send File…'), [ + ('win.send-file-httpupload-', _('Upload File…')), + ('win.send-file-jingle-', _('Send File Directly…')), ]), ('win.invite-contacts-', _('Invite Contacts')), ('win.add-to-roster-', _('Add to Roster')), View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/a94276f6e9e3a79da2c86b7e9218d7e5c4… --- View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/a94276f6e9e3a79da2c86b7e9218d7e5c4… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] 2 commits: Dont notify about PMs from MUCs we are not joined
by Philipp Hörist 22 Feb '18

22 Feb '18

Philipp Hörist pushed to branch master at gajim / gajim Commits: f30564c1 by Philipp Hörist at 2018-02-22T21:42:49+01:00 Dont notify about PMs from MUCs we are not joined The server sends us carbons if one of our other resources has a conversation in a muc we are not joined. Instead we log the messages silently. - - - - - 994244c9 by Philipp Hörist at 2018-02-22T22:03:55+01:00 MAM: Check muc#user namespace before we disco 1. Check if the message has the muc#user namespace 2. Check if we have this jid already in the DB 3. Last resort disco the jid - - - - - 2 changed files: - gajim/common/connection_handlers_events.py - gajim/session.py Changes: ===================================== gajim/common/connection_handlers_events.py ===================================== --- a/gajim/common/connection_handlers_events.py +++ b/gajim/common/connection_handlers_events.py @@ -176,8 +176,10 @@ class HelperEvent: 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 + self.muc_pm = False + muc_user = message.getTag('x', namespace=nbxmpp.NS_MUC_USER) + if muc_user is not None: + self.muc_pm = muc_user.getChildren() == [] return self.muc_pm class HttpAuthReceivedEvent(nec.NetworkIncomingEvent): @@ -1125,6 +1127,8 @@ class MamGcMessageReceivedEvent(nec.NetworkIncomingEvent, HelperEvent): :stanza: Complete stanza Node :forwarded: Forwarded Node :result: Result Node + :muc_pm: True, if this is a MUC PM + propagated to MamDecryptedMessageReceivedEvent ''' self._set_base_event_vars_as_attributes(base_event) self.additional_data = {} @@ -1205,23 +1209,27 @@ class MamDecryptedMessageReceivedEvent(nec.NetworkIncomingEvent, HelperEvent): if self.groupchat: return True - self.is_pm = app.logger.jid_is_room_jid(self.with_.getStripped()) - if self.is_pm is None: - # Check if this event is triggered after a disco, so we dont - # run into an endless loop - if hasattr(self, 'disco'): - log.error('JID not known even after sucessful disco') + if not self.muc_pm: + # muc_pm = False, means only there was no muc#user namespace + # This could still be a muc pm, we check the database if we + # know this jid. If not we disco it. + self.muc_pm = app.logger.jid_is_room_jid(self.with_.getStripped()) + if self.muc_pm is None: + # Check if this event is triggered after a disco, so we dont + # run into an endless loop + if hasattr(self, 'disco'): + log.error('JID not known even after sucessful disco') + return + # we don't know this JID, we need to disco it. + server = self.with_.getDomain() + if server not in self.conn.mam_awaiting_disco_result: + self.conn.mam_awaiting_disco_result[server] = [self] + self.conn.discoverInfo(server) + else: + self.conn.mam_awaiting_disco_result[server].append(self) return - # we don't know this JID, we need to disco it. - server = self.with_.getDomain() - if server not in self.conn.mam_awaiting_disco_result: - self.conn.mam_awaiting_disco_result[server] = [self] - self.conn.discoverInfo(server) - else: - self.conn.mam_awaiting_disco_result[server].append(self) - return - if self.is_pm: + if self.muc_pm: self.with_ = str(self.with_) else: self.with_ = self.with_.getStripped() @@ -1599,6 +1607,7 @@ class DecryptedMessageReceivedEvent(nec.NetworkIncomingEvent, HelperEvent): self.forwarded = self.msg_obj.forwarded self.sent = self.msg_obj.sent self.conn = self.msg_obj.conn + self.muc_pm = self.msg_obj.muc_pm self.popup = False self.msg_log_id = None # id in log database self.attention = False # XEP-0224 ===================================== gajim/session.py ===================================== --- a/gajim/session.py +++ b/gajim/session.py @@ -101,7 +101,7 @@ class ChatControlSession(stanza_session.EncryptedStanzaSession): if treat_as: obj.mtype = treat_as pm = False - if obj.gc_control and obj.resource: + if obj.muc_pm or (obj.gc_control and obj.resource): # It's a Private message pm = True obj.mtype = 'pm' @@ -123,6 +123,11 @@ class ChatControlSession(stanza_session.EncryptedStanzaSession): additional_data=obj.additional_data, stanza_id=obj.unique_id) + if obj.muc_pm and not obj.gc_control: + # This is a carbon of a PM from a MUC we are not currently + # joined. We log it silently without notification. + return True + # Handle chat states if contact and (not obj.forwarded or not obj.sent): if self.control and self.control.type_id == \ View it on GitLab: https://dev.gajim.org/gajim/gajim/compare/52fa57795ac04fb273c3686f05adb3d76… --- View it on GitLab: https://dev.gajim.org/gajim/gajim/compare/52fa57795ac04fb273c3686f05adb3d76… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] Better emoticon theme fallback strategy
by Philipp Hörist 21 Feb '18

21 Feb '18

Philipp Hörist pushed to branch master at gajim / gajim Commits: 52fa5779 by Philipp Hörist at 2018-02-22T00:37:54+01:00 Better emoticon theme fallback strategy Fallback must be happening in init_emoticon() instead of PreferencesWindow - - - - - 3 changed files: - gajim/common/helpers.py - gajim/config.py - gajim/gui_interface.py Changes: ===================================== gajim/common/helpers.py ===================================== --- a/gajim/common/helpers.py +++ b/gajim/common/helpers.py @@ -1596,15 +1596,31 @@ def version_condition(current_version, required_version): def get_available_emoticon_themes(): emoticons_themes = [] emoticons_data_path = os.path.join(app.DATA_DIR, 'emoticons') + font_theme_path = os.path.join( + app.DATA_DIR, 'emoticons', 'font-emoticons', 'emoticons_theme.py') folders = os.listdir(emoticons_data_path) if os.path.isdir(app.MY_EMOTS_PATH): folders += os.listdir(app.MY_EMOTS_PATH) + file = 'emoticons_theme.py' + if os.name == 'nt' and not os.path.exists(font_theme_path): + # When starting Gajim from source .py files are available + # We test this with font-emoticons and fallback to .pyc files otherwise + file = 'emoticons_theme.pyc' + for theme in folders: - theme_path = os.path.join( - emoticons_data_path, theme, 'emoticons_theme.py') + theme_path = os.path.join(emoticons_data_path, theme, file) if os.path.exists(theme_path): emoticons_themes.append(theme) emoticons_themes.sort() return emoticons_themes + +def get_emoticon_theme_path(theme): + emoticons_data_path = os.path.join(app.DATA_DIR, 'emoticons', theme) + if os.path.exists(emoticons_data_path): + return emoticons_data_path + + emoticons_user_path = os.path.join(app.MY_EMOTS_PATH, theme) + if os.path.exists(emoticons_user_path): + return emoticons_user_path ===================================== gajim/config.py ===================================== --- a/gajim/config.py +++ b/gajim/config.py @@ -151,13 +151,10 @@ class PreferencesWindow: config_theme = app.config.get('emoticons_theme') if config_theme not in emoticon_themes: - # Fallback theme - config_theme = 'font-emoticons' - app.config.set('emoticons_theme', 'font-emoticons') + config_theme = _('Disabled') emoticons_combobox.set_id_column(0) emoticons_combobox.set_active_id(config_theme) - # Set default for single window type choices = c_config.opt_one_window_types type_ = app.config.get('one_message_window') ===================================== gajim/gui_interface.py ===================================== --- a/gajim/gui_interface.py +++ b/gajim/gui_interface.py @@ -1996,18 +1996,16 @@ class Interface: if 'preferences' in app.interface.instances: transient_for = app.interface.instances['preferences'].window - path = os.path.join(app.DATA_DIR, 'emoticons', emot_theme) - if not os.path.exists(path): - # It's maybe a user theme - path = os.path.join(app.MY_EMOTS_PATH, emot_theme) - if not os.path.exists(path): - # theme doesn't exist, disable emoticons - dialogs.WarningDialog(_('Emoticons disabled'), - _('Your configured emoticons theme has not been found, so ' - 'emoticons have been disabled.'), - transient_for=transient_for) + themes = helpers.get_available_emoticon_themes() + if emot_theme not in themes: + if 'font-emoticons' in themes: + emot_theme = 'font-emoticons' + app.config.set('emoticons_theme', 'font-emoticons') + else: app.config.set('emoticons_theme', '') return + + path = helpers.get_emoticon_theme_path(emot_theme) if not emoticons.load(path, ascii_emoticons): dialogs.WarningDialog( _('Emoticons disabled'), View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/52fa57795ac04fb273c3686f05adb3d766… --- View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/52fa57795ac04fb273c3686f05adb3d766… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] Refactor emoticon theme combobox
by Philipp Hörist 21 Feb '18

21 Feb '18

Philipp Hörist pushed to branch master at gajim / gajim Commits: eb3a53c7 by Philipp Hörist at 2018-02-21T23:52:53+01:00 Refactor emoticon theme combobox - Use ComboBoxText, its much simpler - Add a dedicated method that returns all available themes - If the configured Theme is not available fallback to font-emoticons - - - - - 3 changed files: - gajim/common/helpers.py - gajim/config.py - gajim/data/gui/preferences_window.ui Changes: ===================================== gajim/common/helpers.py ===================================== --- a/gajim/common/helpers.py +++ b/gajim/common/helpers.py @@ -1592,3 +1592,19 @@ def version_condition(current_version, required_version): if V(current_version) < V(required_version): return False return True + +def get_available_emoticon_themes(): + emoticons_themes = [] + emoticons_data_path = os.path.join(app.DATA_DIR, 'emoticons') + + folders = os.listdir(emoticons_data_path) + if os.path.isdir(app.MY_EMOTS_PATH): + folders += os.listdir(app.MY_EMOTS_PATH) + + for theme in folders: + theme_path = os.path.join( + emoticons_data_path, theme, 'emoticons_theme.py') + if os.path.exists(theme_path): + emoticons_themes.append(theme) + emoticons_themes.sort() + return emoticons_themes ===================================== gajim/config.py ===================================== --- a/gajim/config.py +++ b/gajim/config.py @@ -143,29 +143,20 @@ class PreferencesWindow: # emoticons emoticons_combobox = self.xml.get_object('emoticons_combobox') - emoticons_list = os.listdir(os.path.join(app.DATA_DIR, 'emoticons')) - # user themes - if os.path.isdir(app.MY_EMOTS_PATH): - emoticons_list += os.listdir(app.MY_EMOTS_PATH) - emoticons_list.sort() - renderer_text = Gtk.CellRendererText() - emoticons_combobox.pack_start(renderer_text, True) - emoticons_combobox.add_attribute(renderer_text, 'text', 0) - model = Gtk.ListStore(str) - emoticons_combobox.set_model(model) - l = [_('Disabled')] - for dir_ in emoticons_list: - if not os.path.isdir(os.path.join(app.DATA_DIR, 'emoticons', dir_)) \ - and not os.path.isdir(os.path.join(app.MY_EMOTS_PATH, dir_)) : - continue - if dir_ != '.svn': - l.append(dir_) - for i in range(len(l)): - model.append([l[i]]) - if app.config.get('emoticons_theme') == l[i]: - emoticons_combobox.set_active(i) - if not app.config.get('emoticons_theme'): - emoticons_combobox.set_active(0) + emoticon_themes = helpers.get_available_emoticon_themes() + + emoticons_combobox.append_text(_('Disabled')) + for theme in emoticon_themes: + emoticons_combobox.append_text(theme) + + config_theme = app.config.get('emoticons_theme') + if config_theme not in emoticon_themes: + # Fallback theme + config_theme = 'font-emoticons' + app.config.set('emoticons_theme', 'font-emoticons') + emoticons_combobox.set_id_column(0) + emoticons_combobox.set_active_id(config_theme) + # Set default for single window type choices = c_config.opt_one_window_types ===================================== gajim/data/gui/preferences_window.ui ===================================== --- a/gajim/data/gui/preferences_window.ui +++ b/gajim/data/gui/preferences_window.ui @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> - + <interface> <requires lib="gtk+" version="3.12"/> <object class="GtkAdjustment" id="adjustment1"> @@ -516,17 +516,6 @@ </packing> </child> <child> - <object class="GtkComboBox" id="emoticons_combobox"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <signal name="changed" handler="on_emoticons_combobox_changed" swapped="no"/> - </object> - <packing> - <property name="left_attach">1</property> - <property name="top_attach">0</property> - </packing> - </child> - <child> <object class="GtkCheckButton" id="show_avatar_in_tabs_checkbutton"> <property name="label" translatable="yes">Show avatar in chat tabs</property> <property name="visible">True</property> @@ -542,6 +531,17 @@ <property name="width">2</property> </packing> </child> + <child> + <object class="GtkComboBoxText" id="emoticons_combobox"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <signal name="changed" handler="on_emoticons_combobox_changed" swapped="no"/> + </object> + <packing> + <property name="left_attach">1</property> + <property name="top_attach">0</property> + </packing> + </child> </object> </child> <child type="label"> @@ -2888,5 +2888,8 @@ to discover one from server.</property> </child> </object> </child> + <child type="titlebar"> + <placeholder/> + </child> </object> </interface> View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/eb3a53c79110c94b7a272cdb2f4ca3e1f2… --- View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/eb3a53c79110c94b7a272cdb2f4ca3e1f2… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] Tag MUC PMs
by Philipp Hörist 21 Feb '18

21 Feb '18

Philipp Hörist pushed to branch master at gajim / gajim Commits: 1fbc6a23 by Philipp Hörist at 2018-02-21T23:09:30+01:00 Tag MUC PMs This gives the server the chance to react accordingly without applying much logic. Also it makes it easier for us to recognize MUC PMs in MAM querys - - - - - 1 changed file: - gajim/common/connection.py Changes: ===================================== gajim/common/connection.py ===================================== --- a/gajim/common/connection.py +++ b/gajim/common/connection.py @@ -64,6 +64,7 @@ from gajim.common import exceptions from gajim.common import check_X509 from gajim.common.connection_handlers import * from gajim.common.helpers import version_condition +from gajim.common.contacts import GC_Contact from gajim.gtkgui_helpers import get_action @@ -373,6 +374,10 @@ class CommonConnection: contact = app.contacts.get_contact_with_highest_priority( self.name, obj.jid) + # Mark Message as MUC PM + if isinstance(contact, GC_Contact): + msg_iq.setTag('x', namespace=nbxmpp.NS_MUC_USER) + # chatstates - if peer supports xep85, send chatstates # please note that the only valid tag inside a message containing a # <body> tag is the active event View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/1fbc6a2304b9066555ac367949bdc2e90d… --- View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/1fbc6a2304b9066555ac367949bdc2e90d… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] Pass jid as string to find_stanza_id()
by Philipp Hörist 21 Feb '18

21 Feb '18

Philipp Hörist pushed to branch master at gajim / gajim Commits: 70e0bcc5 by Philipp Hörist at 2018-02-21T23:01:47+01:00 Pass jid as string to find_stanza_id() - - - - - 1 changed file: - gajim/common/connection_handlers_events.py Changes: ===================================== gajim/common/connection_handlers_events.py ===================================== --- a/gajim/common/connection_handlers_events.py +++ b/gajim/common/connection_handlers_events.py @@ -1281,7 +1281,7 @@ class MessageReceivedEvent(nec.NetworkIncomingEvent, HelperEvent): if type_ == 'groupchat': archive_jid = self.stanza.getFrom().getStripped() else: - archive_jid = self.conn.get_own_jid() + archive_jid = self.conn.get_own_jid().getStripped() if app.logger.find_stanza_id(account, archive_jid, self.unique_id, View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/70e0bcc5db144c2954c7cad077e9083f5f… --- View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/70e0bcc5db144c2954c7cad077e9083f5f… You're receiving this email because of your account on dev.gajim.org.

1 0

[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

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

Commits February 2018