Commits

commits@gajim.org

17632 discussions

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

05 Mar '18

Philipp Hörist pushed to branch gajim_1.0 at gajim / gajim Commits: 7cac6432 by Philipp Hörist at 2018-03-05T23:22:29+01:00 Update ChangeLog - - - - - 1 changed file: - ChangeLog Changes: ===================================== ChangeLog ===================================== --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +Gajim 1.0.0 (05 March 2018) + + * More improvements for HiDPI Screens + * Fixed various MAM related issues + * Various other small bugfixes + Gajim 0.99.2 (17 February 2018) * Speed up DB querys on MAM sync View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/7cac6432217cc90db75affa055069d19e2… --- View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/7cac6432217cc90db75affa055069d19e2… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][gajim_1.0] 23 commits: Simplify cellrenderers
by Philipp Hörist 05 Mar '18

05 Mar '18

Philipp Hörist pushed to branch gajim_1.0 at gajim / gajim Commits: a967cf1b by Philipp Hörist at 2018-03-05T23:00:47+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 - - - - - cca8c0c3 by Philipp Hörist at 2018-03-05T23:01:29+01:00 Fix avatar ratio Fixes #8907 - - - - - fa15baf1 by Philipp Hörist at 2018-03-05T23:02:01+01:00 StartChatDialog: Use HighDPI icons/avatars - - - - - 9cc7df89 by Philipp Hörist at 2018-03-05T23:03:23+01:00 StatusIcon: Add fallback for account label Fixes #8901 - - - - - e5dbcc7c by Philipp Hörist at 2018-03-05T23:03:38+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. - - - - - f7e01e43 by Philipp Hörist at 2018-03-05T23:03:58+01:00 Add extension point for GC tooltip - - - - - bbb75570 by Philipp Hörist at 2018-03-05T23:04:09+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 - - - - - c1e482a1 by Philipp Hörist at 2018-03-05T23:08:11+01:00 Fix duplicates for self messages and MUC PMs Fixes #8812 - - - - - 2fdaf391 by Philipp Hörist at 2018-03-05T23:08:26+01:00 Print correct archive jid in log message - - - - - 931d138b by Philipp Hörist at 2018-03-05T23:10:35+01:00 Pass jid as string to find_stanza_id() - - - - - a0c8424f by Philipp Hörist at 2018-03-05T23:10:36+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 - - - - - 843e56a7 by Philipp Hörist at 2018-03-05T23:10:36+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 - - - - - 0ffb4537 by Philipp Hörist at 2018-03-05T23:10:36+01:00 Better emoticon theme fallback strategy Fallback must be happening in init_emoticon() instead of PreferencesWindow - - - - - 6e6d9497 by Philipp Hörist at 2018-03-05T23:10:36+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. - - - - - fb1945e6 by Philipp Hörist at 2018-03-05T23:10:37+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 - - - - - 41828335 by André Apitzsch at 2018-03-05T23:12:26+01:00 setup.py: remove unused function - - - - - 062e69f0 by Philipp Hörist at 2018-03-05T23:12:26+01:00 HistoryManger: Fix window dimensions - - - - - 000ac263 by Philipp Hörist at 2018-03-05T23:12:26+01:00 MAM: Display received mam message in open chats - - - - - 6793aa65 by Philipp Hörist at 2018-03-05T23:12:27+01:00 MAM: Display corrected messages on MAM catchup This shows corrected messages correctly in groupchat when we receive the messages via MAM - - - - - 06759167 by Philipp Hörist at 2018-03-05T23:13:17+01:00 Only use fallback duplicate search on MAM < 2 - - - - - 4a233d87 by Philipp Hörist at 2018-03-05T23:13:17+01:00 Use MessageSentEvent to print to ChatControl Its later than StanzaMessageOutgoingEvent, this allows encryption Plugins to not return the encrypted payload immediatly. For example encrypting may take some time because a password is needed or the load has to be encrypted in another Thread. - - - - - c3ddf476 by Philipp Hörist at 2018-03-05T23:13:18+01:00 Add get_contact_strict() This adds a method that returns only a contact if there is an exact match, instead of a contact where only the barejid matches. We need this when we update the Caps of a contact. - - - - - 3808df05 by Philipp Hörist at 2018-03-05T23:13:18+01:00 Set correct kind on incoming MAM messages - - - - - 21 changed files: - gajim/chat_control.py - gajim/chat_control_base.py - gajim/common/connection.py - gajim/common/connection_handlers_events.py - gajim/common/contacts.py - gajim/common/helpers.py - gajim/common/logger.py - gajim/common/message_archiving.py - gajim/config.py - gajim/data/gui/chat_control.ui - gajim/data/gui/history_manager.ui - gajim/data/gui/preferences_window.ui - gajim/dialogs.py - gajim/groupchat_control.py - gajim/gtkgui_helpers.py - gajim/gui_interface.py - gajim/roster_window.py - gajim/session.py - gajim/statusicon.py - gajim/tooltips.py - setup.py Changes: ===================================== gajim/chat_control.py ===================================== --- a/gajim/chat_control.py +++ b/gajim/chat_control.py @@ -238,8 +238,11 @@ class ChatControl(ChatControlBase): self._nec_chatstate_received) app.ged.register_event_handler('caps-received', ged.GUI1, self._nec_caps_received) - app.ged.register_event_handler('stanza-message-outgoing', ged.OUT_POSTCORE, + app.ged.register_event_handler('message-sent', ged.OUT_POSTCORE, self._message_sent) + app.ged.register_event_handler( + 'mam-decrypted-message-received', + ged.GUI1, self._nec_mam_decrypted_message_received) # PluginSystem: adding GUI extension point for this ChatControl # instance object @@ -817,6 +820,20 @@ class ChatControl(ChatControlBase): app.plugin_manager.extension_point( 'encryption_dialog' + self.encryption, self) + def _nec_mam_decrypted_message_received(self, obj): + if obj.conn.name != self.account: + return + if obj.with_ != self.contact.jid: + return + + kind = '' # incoming + if obj.kind == KindConstant.CHAT_MSG_SENT: + kind = 'outgoing' + + self.print_conversation(obj.msgtxt, kind, tim=obj.timestamp, + encrypted=obj.encrypted, correct_id=obj.correct_id, + msg_stanza_id=obj.message_id, additional_data=obj.additional_data) + def _message_sent(self, obj): if obj.conn.name != self.account: return @@ -1154,7 +1171,7 @@ class ChatControl(ChatControlBase): self._nec_chatstate_received) app.ged.remove_event_handler('caps-received', ged.GUI1, self._nec_caps_received) - app.ged.remove_event_handler('stanza-message-outgoing', ged.OUT_POSTCORE, + app.ged.remove_event_handler('message-sent', ged.OUT_POSTCORE, self._message_sent) self.unsubscribe_events() ===================================== 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/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 @@ -2070,10 +2075,7 @@ class Connection(CommonConnection, ConnectionHandlers): obj.timestamp = time.time() obj.stanza_id = self.connection.send(obj.msg_iq, now=obj.now) - app.nec.push_incoming_event(MessageSentEvent( - None, conn=self, jid=obj.jid, message=obj.message, keyID=obj.keyID, - chatstate=obj.chatstate, automatic_message=obj.automatic_message, - stanza_id=obj.stanza_id, additional_data=obj.additional_data)) + app.nec.push_incoming_event(MessageSentEvent(None, **vars(obj))) if isinstance(obj.jid, list): for j in obj.jid: ===================================== gajim/common/connection_handlers_events.py ===================================== --- a/gajim/common/connection_handlers_events.py +++ b/gajim/common/connection_handlers_events.py @@ -163,6 +163,25 @@ 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 = 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): name = 'http-auth-received' base_network_events = [] @@ -1015,6 +1034,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 @@ -1031,6 +1052,7 @@ class MamMessageReceivedEvent(nec.NetworkIncomingEvent, HelperEvent): # use stanza-id as unique-id self.unique_id, origin_id = self.get_unique_id() + self.message_id = self.msg_.getID() # Check for duplicates if app.logger.find_stanza_id(account, @@ -1081,6 +1103,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() @@ -1101,6 +1128,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 = {} @@ -1123,6 +1152,7 @@ class MamGcMessageReceivedEvent(nec.NetworkIncomingEvent, HelperEvent): return False self.unique_id = self.get_stanza_id(self.result, query=True) + self.message_id = self.msg_.getID() # Check for duplicates if app.logger.find_stanza_id(account, @@ -1171,33 +1201,43 @@ class MamDecryptedMessageReceivedEvent(nec.NetworkIncomingEvent, HelperEvent): base_network_events = [] def generate(self): + self.correct_id = None + if not self.msgtxt: # For example Chatstates, Receipts, Chatmarkers log.debug('Received MAM message without text') return + replace = self.msg_.getTag('replace', namespace=nbxmpp.NS_CORRECT) + if replace is not None: + self.correct_id = replace.getAttr('id') + self.get_oob_data(self.msg_) 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() @@ -1217,6 +1257,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 +1292,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().getStripped() 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 +1453,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 +1486,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 +1496,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): @@ -1547,6 +1615,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/common/contacts.py ===================================== --- a/gajim/common/contacts.py +++ b/gajim/common/contacts.py @@ -509,6 +509,15 @@ class Contacts(): return c return self._contacts[jid][0] + def get_contact_strict(self, jid, resource): + """ + Return the contact instance for the given resource or None + """ + if jid in self._contacts: + for c in self._contacts[jid]: + if c.resource == resource: + return c + def get_avatar(self, jid, size=None, scale=None): if jid not in self._contacts: return None @@ -554,7 +563,7 @@ class Contacts(): Get Contact object for specific resource of given jid """ barejid, resource = common.app.get_room_and_nick_from_fjid(fjid) - return self.get_contact(barejid, resource) + return self.get_contact_strict(barejid, resource) def get_first_contact_from_jid(self, jid): if jid in self._contacts: ===================================== gajim/common/helpers.py ===================================== --- a/gajim/common/helpers.py +++ b/gajim/common/helpers.py @@ -1592,3 +1592,35 @@ 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') + 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, 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/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 ===================================== gajim/common/message_archiving.py ===================================== --- a/gajim/common/message_archiving.py +++ b/gajim/common/message_archiving.py @@ -200,13 +200,19 @@ class ConnectionArchive313: def _nec_mam_decrypted_message_received(self, obj): if obj.conn.name != self.name: return - # if self.archiving_namespace != nbxmpp.NS_MAM_2: - # Fallback duplicate search without stanza-id - duplicate = app.logger.search_for_duplicate( - self.name, obj.with_, obj.timestamp, obj.msgtxt) - if duplicate: - # dont propagate the event further - return True + + namespace = self.archiving_namespace + if obj.groupchat: + namespace = muc_caps_cache.get_mam_namespace(obj.room_jid) + + if namespace != nbxmpp.NS_MAM_2: + # Fallback duplicate search without stanza-id + duplicate = app.logger.search_for_duplicate( + self.name, obj.with_, obj.timestamp, obj.msgtxt) + if duplicate: + # dont propagate the event further + return True + app.logger.insert_into_logs(self.name, obj.with_, obj.timestamp, ===================================== gajim/config.py ===================================== --- a/gajim/config.py +++ b/gajim/config.py @@ -143,29 +143,17 @@ 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: + 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 ===================================== 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/data/gui/history_manager.ui ===================================== --- a/gajim/data/gui/history_manager.ui +++ b/gajim/data/gui/history_manager.ui @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> - + <interface> <requires lib="gtk+" version="3.12"/> <object class="GtkMenu" id="context_menu"> @@ -82,6 +82,9 @@ <action-widget response="-6">cancel_button</action-widget> <action-widget response="-5">save_button</action-widget> </action-widgets> + <child> + <placeholder/> + </child> </object> <object class="GtkImage" id="image1"> <property name="visible">True</property> @@ -136,111 +139,56 @@ <property name="orientation">vertical</property> <child> <object class="GtkBox" id="welcome_vbox"> + <property name="width_request">300</property> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property> + <property name="margin_left">20</property> + <property name="margin_right">20</property> <property name="orientation">vertical</property> + <property name="spacing">10</property> <child> - <object class="GtkLabel" id="welcome_label"> + <object class="GtkLabel"> <property name="visible">True</property> <property name="can_focus">False</property> + <property name="halign">center</property> <property name="label" translatable="yes"><big>Welcome to Gajim History Logs Manager</big></property> <property name="use_markup">True</property> - <property name="justify">center</property> - <property name="wrap">True</property> </object> <packing> - <property name="expand">True</property> + <property name="expand">False</property> <property name="fill">True</property> <property name="position">0</property> </packing> </child> <child> - <object class="GtkBox" id="hbox3"> + <object class="GtkLabel"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property> - <child> - <object class="GtkImage" id="image3"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property> - <property name="xalign">1</property> - <property name="yalign">0</property> - <property name="stock">gtk-info</property> - </object> - <packing> - <property name="expand">True</property> - <property name="fill">True</property> - <property name="position">0</property> - </packing> - </child> - <child> - <object class="GtkLabel" id="info_label"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property> - <property name="label" translatable="yes">This log manager is not intended for log viewing. If you are looking for such functionality, use the history window instead. + <property name="halign">start</property> + <property name="label" translatable="yes">This log manager is not intended for log viewing. If you are looking for such functionality, use the history window instead. Use this program to delete or export logs. You can select logs from the left and/or search database from below.</property> - <property name="use_markup">True</property> - <property name="wrap">True</property> - </object> - <packing> - <property name="expand">True</property> - <property name="fill">True</property> - <property name="position">1</property> - </packing> - </child> + <property name="wrap">True</property> </object> <packing> <property name="expand">False</property> - <property name="fill">False</property> - <property name="padding">20</property> + <property name="fill">True</property> <property name="position">1</property> </packing> </child> <child> - <object class="GtkBox" id="hbox2"> + <object class="GtkLabel"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property> - <child> - <object class="GtkImage" id="warning_image"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property> - <property name="xalign">1</property> - <property name="yalign">0</property> - <property name="stock">gtk-dialog-warning</property> - </object> - <packing> - <property name="expand">True</property> - <property name="fill">True</property> - <property name="position">0</property> - </packing> - </child> - <child> - <object class="GtkLabel" id="warning_label"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property> - <property name="label" translatable="yes">WARNING: + <property name="halign">start</property> + <property name="label" translatable="yes">WARNING: If you plan to do massive deletions, please make sure Gajim is not running. Generally avoid deletions with contacts you currently chat with.</property> - <property name="use_markup">True</property> - <property name="wrap">True</property> - </object> - <packing> - <property name="expand">True</property> - <property name="fill">True</property> - <property name="position">1</property> - </packing> - </child> + <property name="use_markup">True</property> + <property name="wrap">True</property> </object> <packing> <property name="expand">False</property> - <property name="fill">False</property> - <property name="padding">20</property> + <property name="fill">True</property> <property name="position">2</property> </packing> </child> @@ -358,5 +306,8 @@ If you plan to do massive deletions, please make sure Gajim is not running. Gene </child> </object> </child> + <child type="titlebar"> + <placeholder/> + </child> </object> </interface> ===================================== 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> ===================================== gajim/dialogs.py ===================================== --- a/gajim/dialogs.py +++ b/gajim/dialogs.py @@ -3006,18 +3006,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/groupchat_control.py ===================================== --- a/gajim/groupchat_control.py +++ b/gajim/groupchat_control.py @@ -82,60 +82,61 @@ 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) + 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 +439,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) @@ -1109,8 +1110,9 @@ class GroupchatControl(ChatControlBase): return self.print_conversation( obj.msgtxt, contact=obj.nick, - tim=obj.timestamp, encrypted=obj.encrypted, - msg_stanza_id=obj.unique_id, + tim=obj.timestamp, correct_id=obj.correct_id, + encrypted=obj.encrypted, + msg_stanza_id=obj.message_id, additional_data=obj.additional_data) def _nec_gc_message_received(self, obj): ===================================== 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 @@ -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'), @@ -2482,7 +2480,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: @@ -2503,8 +2501,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/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 == \ ===================================== 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 ===================================== 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): """ ===================================== setup.py ===================================== --- a/setup.py +++ b/setup.py @@ -6,8 +6,6 @@ import sys if sys.version_info[0] < 3: sys.exit('Tried to install with Python 2, gajim only supports Python 3.') -import codecs - from setuptools import setup, find_packages from setuptools import Command from setuptools.command.build_py import build_py as _build @@ -129,20 +127,6 @@ def build_intl(build_cmd): data_files.append((target, [base + '/' + filename])) -def substitute_variables(filename_in, filename_out, subst_vars): - ''' - Substitute variables in a file. - ''' - f_in = codecs.open(filename_in, encoding='utf-8') - f_out = codecs.open(filename_out, encoding='utf-8', mode='w') - for line in f_in: - for variable, substitution in subst_vars: - line = line.replace(variable, substitution) - f_out.write(line) - f_in.close() - f_out.close() - - def merge(in_file, out_file, option, po_dir='po'): ''' Run the msgfmt command. @@ -276,7 +260,7 @@ setup( package_data={'gajim': package_data}, data_files=data_files, install_requires=[ - 'nbxmpp>=0.6.1', + 'nbxmpp>=0.6.3', 'pyOpenSSL>=0.12', 'pyasn1', ], View it on GitLab: https://dev.gajim.org/gajim/gajim/compare/84748928d41e11bc57d5b7de7d5f0fb59… --- View it on GitLab: https://dev.gajim.org/gajim/gajim/compare/84748928d41e11bc57d5b7de7d5f0fb59… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] Defer txt record lookup until connection attempt
by Philipp Hörist 05 Mar '18

05 Mar '18

Philipp Hörist pushed to branch master at gajim / gajim Commits: e740d127 by Sebastian Wagner at 2018-03-05T22:55:25+01:00 Defer txt record lookup until connection attempt Don't try to resolve _xmppconnect records for servers before trying to connect. Prevent warnings from gajim.c.resolver for accounts with "connect on startup" disabled. - - - - - 1 changed file: - gajim/common/connection.py Changes: ===================================== gajim/common/connection.py ===================================== --- a/gajim/common/connection.py +++ b/gajim/common/connection.py @@ -709,11 +709,6 @@ class Connection(CommonConnection, ConnectionHandlers): self._nec_gc_stanza_message_outgoing) app.ged.register_event_handler('stanza-message-outgoing', ged.OUT_CORE, self._nec_stanza_message_outgoing) - - h = app.config.get_per('accounts', self.name, 'hostname') - if h: - app.resolver.resolve('_xmppconnect.' + helpers.idn_to_ascii(h), - self._on_resolve_txt, type_='txt') # END __init__ def cleanup(self): @@ -1093,6 +1088,10 @@ class Connection(CommonConnection, ConnectionHandlers): ] self._hostname = hostname + if h: + app.resolver.resolve('_xmppconnect.' + helpers.idn_to_ascii(h), + self._on_resolve_txt, type_='txt') + if use_srv and self._proxy is None: self._srv_hosts = [] View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/e740d12727032bc4bd382c1a128394cac9… --- View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/e740d12727032bc4bd382c1a128394cac9… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] Set label of link context menu according to kind mail OR jid
by Philipp Hörist 03 Mar '18

03 Mar '18

Philipp Hörist pushed to branch master at gajim / gajim Commits: 113cd51c by Daniel at 2018-03-03T18:38:33+01:00 Set label of link context menu according to kind mail OR jid - - - - - 1 changed file: - gajim/conversation_textview.py Changes: ===================================== gajim/conversation_textview.py ===================================== --- a/gajim/conversation_textview.py +++ b/gajim/conversation_textview.py @@ -703,7 +703,7 @@ class ConversationTextview(GObject.GObject): id_ = childs[1].connect('activate', self.on_open_link_activate, kind, text) self.handlers[id_] = childs[1] - childs[2].hide() # copy mail address + childs[2].hide() # copy mail/jid address childs[3].hide() # open mail composer childs[4].hide() # jid section separator childs[5].hide() # start chat @@ -740,10 +740,12 @@ class ConversationTextview(GObject.GObject): id_ = childs[0].connect('activate', self.on_copy_link_activate, 'xmpp:' + text) self.handlers[id_] = childs[0] - childs[2].hide() # copy mail address + childs[0].set_label(_('Copy JID')) + childs[2].hide() # copy mail/jid address childs[3].hide() # open mail composer childs[4].hide() # jid section separator elif kind == 'mail': + childs[2].set_label(_('Copy Email Address')) childs[4].hide() # jid section separator childs[5].hide() # start chat childs[6].hide() # join group chat View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/113cd51c11301d110c050b71d8c8b92a78… --- View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/113cd51c11301d110c050b71d8c8b92a78… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] Remove old config migrations
by Philipp Hörist 28 Feb '18

28 Feb '18

Philipp Hörist pushed to branch master at gajim / gajim Commits: 882be87a by Philipp Hörist at 2018-02-28T22:38:40+01:00 Remove old config migrations No one will ever update from these versions anymore - - - - - 1 changed file: - gajim/common/optparser.py Changes: ===================================== gajim/common/optparser.py ===================================== --- a/gajim/common/optparser.py +++ b/gajim/common/optparser.py @@ -138,87 +138,6 @@ class OptionsParser: while len(new_version_list): new.append(int(new_version_list.pop(0))) - if old < [0, 9] and new >= [0, 9]: - self.update_config_x_to_09() - if old < [0, 10] and new >= [0, 10]: - self.update_config_09_to_010() - if old < [0, 10, 1, 1] and new >= [0, 10, 1, 1]: - self.update_config_to_01011() - if old < [0, 10, 1, 2] and new >= [0, 10, 1, 2]: - self.update_config_to_01012() - if old < [0, 10, 1, 3] and new >= [0, 10, 1, 3]: - self.update_config_to_01013() - if old < [0, 10, 1, 4] and new >= [0, 10, 1, 4]: - self.update_config_to_01014() - if old < [0, 10, 1, 5] and new >= [0, 10, 1, 5]: - self.update_config_to_01015() - if old < [0, 10, 1, 6] and new >= [0, 10, 1, 6]: - self.update_config_to_01016() - if old < [0, 10, 1, 7] and new >= [0, 10, 1, 7]: - self.update_config_to_01017() - if old < [0, 10, 1, 8] and new >= [0, 10, 1, 8]: - self.update_config_to_01018() - if old < [0, 11, 0, 1] and new >= [0, 11, 0, 1]: - self.update_config_to_01101() - if old < [0, 11, 0, 2] and new >= [0, 11, 0, 2]: - self.update_config_to_01102() - if old < [0, 11, 1, 1] and new >= [0, 11, 1, 1]: - self.update_config_to_01111() - if old < [0, 11, 1, 2] and new >= [0, 11, 1, 2]: - self.update_config_to_01112() - if old < [0, 11, 1, 3] and new >= [0, 11, 1, 3]: - self.update_config_to_01113() - if old < [0, 11, 1, 4] and new >= [0, 11, 1, 4]: - self.update_config_to_01114() - if old < [0, 11, 1, 5] and new >= [0, 11, 1, 5]: - self.update_config_to_01115() - if old < [0, 11, 2, 1] and new >= [0, 11, 2, 1]: - self.update_config_to_01121() - if old < [0, 11, 4, 1] and new >= [0, 11, 4, 1]: - self.update_config_to_01141() - if old < [0, 11, 4, 2] and new >= [0, 11, 4, 2]: - self.update_config_to_01142() - if old < [0, 11, 4, 3] and new >= [0, 11, 4, 3]: - self.update_config_to_01143() - if old < [0, 11, 4, 4] and new >= [0, 11, 4, 4]: - self.update_config_to_01144() - if old < [0, 12, 0, 1] and new >= [0, 12, 0, 1]: - self.update_config_to_01201() - if old < [0, 12, 1, 1] and new >= [0, 12, 1, 1]: - self.update_config_to_01211() - if old < [0, 12, 1, 2] and new >= [0, 12, 1, 2]: - self.update_config_to_01212() - if old < [0, 12, 1, 3] and new >= [0, 12, 1, 3]: - self.update_config_to_01213() - if old < [0, 12, 1, 4] and new >= [0, 12, 1, 4]: - self.update_config_to_01214() - if old < [0, 12, 1, 5] and new >= [0, 12, 1, 5]: - self.update_config_to_01215() - if old < [0, 12, 3, 1] and new >= [0, 12, 3, 1]: - self.update_config_to_01231() - if old < [0, 12, 5, 1] and new >= [0, 12, 5, 1]: - self.update_config_from_0125() - self.update_config_to_01251() - if old < [0, 12, 5, 2] and new >= [0, 12, 5, 2]: - self.update_config_to_01252() - if old < [0, 12, 5, 3] and new >= [0, 12, 5, 3]: - self.update_config_to_01253() - if old < [0, 12, 5, 4] and new >= [0, 12, 5, 4]: - self.update_config_to_01254() - if old < [0, 12, 5, 5] and new >= [0, 12, 5, 5]: - self.update_config_to_01255() - if old < [0, 12, 5, 6] and new >= [0, 12, 5, 6]: - self.update_config_to_01256() - if old < [0, 12, 5, 7] and new >= [0, 12, 5, 7]: - self.update_config_to_01257() - if old < [0, 12, 5, 8] and new >= [0, 12, 5, 8]: - self.update_config_to_01258() - if old < [0, 13, 10, 0] and new >= [0, 13, 10, 0]: - self.update_config_to_013100() - if old < [0, 13, 10, 1] and new >= [0, 13, 10, 1]: - self.update_config_to_013101() - if old < [0, 13, 90, 1] and new >= [0, 13, 90, 1]: - self.update_config_to_013901() if old < [0, 14, 0, 1] and new >= [0, 14, 0, 1]: self.update_config_to_01401() if old < [0, 14, 90, 0] and new >= [0, 14, 90, 0]: @@ -313,514 +232,6 @@ class OptionsParser: log.exception('Error') con.close() - def update_config_x_to_09(self): - # Var name that changed: - # avatar_width /height -> chat_avatar_width / height - if 'avatar_width' in self.old_values: - app.config.set('chat_avatar_width', self.old_values['avatar_width']) - if 'avatar_height' in self.old_values: - app.config.set('chat_avatar_height', self.old_values['avatar_height']) - if 'use_dbus' in self.old_values: - app.config.set('remote_control', self.old_values['use_dbus']) - # always_compact_view -> always_compact_view_chat / _gc - if 'always_compact_view' in self.old_values: - app.config.set('always_compact_view_chat', - self.old_values['always_compact_view']) - app.config.set('always_compact_view_gc', - self.old_values['always_compact_view']) - # new theme: grocery, plain - d = ['accounttextcolor', 'accountbgcolor', 'accountfont', - 'accountfontattrs', 'grouptextcolor', 'groupbgcolor', 'groupfont', - 'groupfontattrs', 'contacttextcolor', 'contactbgcolor', 'contactfont', - 'contactfontattrs', 'bannertextcolor', 'bannerbgcolor', 'bannerfont', - 'bannerfontattrs'] - for theme_name in (_('grocery'), _('default')): - if theme_name not in app.config.get_per('themes'): - app.config.add_per('themes', theme_name) - theme = app.config.themes_default[theme_name] - for o in d: - app.config.set_per('themes', theme_name, o, theme[d.index(o)]) - # Remove cyan theme if it's not the current theme - if 'cyan' in app.config.get_per('themes'): - app.config.del_per('themes', 'cyan') - if _('cyan') in app.config.get_per('themes'): - app.config.del_per('themes', _('cyan')) - # If we removed our roster_theme, choose the default green one or another - # one if doesn't exists in config - if app.config.get('roster_theme') not in app.config.get_per('themes'): - theme = _('green') - if theme not in app.config.get_per('themes'): - theme = app.config.get_per('themes')[0] - app.config.set('roster_theme', theme) - # new proxies in accounts.name.file_transfer_proxies - self.update_ft_proxies(to_add=['proxy.netlab.cz']) - - app.config.set('version', '0.9') - - def update_config_09_to_010(self): - if 'usetabbedchat' in self.old_values and not \ - self.old_values['usetabbedchat']: - app.config.set('one_message_window', 'never') - if 'autodetect_browser_mailer' in self.old_values and \ - self.old_values['autodetect_browser_mailer'] is True: - app.config.set('autodetect_browser_mailer', False) - if 'useemoticons' in self.old_values and \ - not self.old_values['useemoticons']: - app.config.set('emoticons_theme', '') - if 'always_compact_view_chat' in self.old_values and \ - self.old_values['always_compact_view_chat'] != 'False': - app.config.set('always_hide_chat_buttons', True) - if 'always_compact_view_gc' in self.old_values and \ - self.old_values['always_compact_view_gc'] != 'False': - app.config.set('always_hide_groupchat_buttons', True) - - self.update_ft_proxies(to_remove=['proxy65.jabber.autocom.pl', - 'proxy65.jabber.ccc.de'], to_add=['transfer.jabber.freenet.de']) - # create unread_messages table if needed - self.assert_unread_msgs_table_exists() - - app.config.set('version', '0.10') - - def update_config_to_01011(self): - if 'print_status_in_muc' in self.old_values and \ - self.old_values['print_status_in_muc'] in (True, False): - app.config.set('print_status_in_muc', 'in_and_out') - app.config.set('version', '0.10.1.1') - - def update_config_to_01012(self): - # See [6456] - if 'emoticons_theme' in self.old_values and \ - self.old_values['emoticons_theme'] == 'Disabled': - app.config.set('emoticons_theme', '') - app.config.set('version', '0.10.1.2') - - def update_config_to_01013(self): - """ - Create table transports_cache if there is no such table - """ - self.call_sql(logger.LOG_DB_PATH, - ''' - CREATE TABLE IF NOT EXISTS transports_cache ( - transport TEXT UNIQUE, - type INTEGER - ); - ''' - ) - app.config.set('version', '0.10.1.3') - - def update_config_to_01014(self): - """ - Apply indeces to the logs database - """ - print(_('migrating logs database to indices')) - self.call_sql(logger.LOG_DB_PATH, - ''' - CREATE INDEX idx_logs_jid_id_kind ON logs (jid_id, kind); - CREATE INDEX idx_unread_messages_jid_id ON unread_messages (jid_id); - ''' - ) - app.config.set('version', '0.10.1.4') - - def update_config_to_01015(self): - """ - Clean show values in logs database - """ - con = sqlite.connect(logger.LOG_DB_PATH) - cur = con.cursor() - status = dict((i[5:].lower(), logger.constants.__dict__[i]) for i in \ - logger.constants.__dict__.keys() if i.startswith('SHOW_')) - for show in status: - cur.execute('update logs set show = ? where show = ?;', (status[show], - show)) - cur.execute('update logs set show = NULL where show not in (0, 1, 2, 3, 4, 5);') - con.commit() - cur.close() # remove this in 2007 [pysqlite old versions need this] - con.close() - app.config.set('version', '0.10.1.5') - - def update_config_to_01016(self): - """ - #2494 : Now we play gc_received_message sound even if - notify_on_all_muc_messages is false. Keep precedent behaviour - """ - if 'notify_on_all_muc_messages' in self.old_values and \ - self.old_values['notify_on_all_muc_messages'] == 'False' and \ - app.config.get_per('soundevents', 'muc_message_received', 'enabled'): - app.config.set_per('soundevents',\ - 'muc_message_received', 'enabled', False) - app.config.set('version', '0.10.1.6') - - def update_config_to_01017(self): - """ - trayicon_notification_on_new_messages -> trayicon_notification_on_events - """ - if 'trayicon_notification_on_new_messages' in self.old_values: - app.config.set('trayicon_notification_on_events', - self.old_values['trayicon_notification_on_new_messages']) - app.config.set('version', '0.10.1.7') - - def update_config_to_01018(self): - """ - chat_state_notifications -> outgoing_chat_state_notifications - """ - if 'chat_state_notifications' in self.old_values: - app.config.set('outgoing_chat_state_notifications', - self.old_values['chat_state_notifications']) - app.config.set('version', '0.10.1.8') - - def update_config_to_01101(self): - """ - Fill time_stamp from before_time and after_time - """ - if 'before_time' in self.old_values: - app.config.set('time_stamp', '%s%%X%s ' % ( - self.old_values['before_time'], self.old_values['after_time'])) - app.config.set('version', '0.11.0.1') - - def update_config_to_01102(self): - """ - Fill time_stamp from before_time and after_time - """ - if 'ft_override_host_to_send' in self.old_values: - app.config.set('ft_add_hosts_to_send', - self.old_values['ft_override_host_to_send']) - app.config.set('version', '0.11.0.2') - - def update_config_to_01111(self): - """ - Always_hide_chatbuttons -> compact_view - """ - if 'always_hide_groupchat_buttons' in self.old_values and \ - 'always_hide_chat_buttons' in self.old_values: - app.config.set('compact_view', self.old_values['always_hide_groupchat_buttons'] and \ - self.old_values['always_hide_chat_buttons']) - app.config.set('version', '0.11.1.1') - - def update_config_to_01112(self): - """ - GTK+ theme is renamed to default - """ - if 'roster_theme' in self.old_values and \ - self.old_values['roster_theme'] == 'gtk+': - app.config.set('roster_theme', _('default')) - app.config.set('version', '0.11.1.2') - - def update_config_to_01113(self): - self.call_sql(logger.LOG_DB_PATH, - ''' - CREATE TABLE IF NOT EXISTS caps_cache ( - node TEXT, - ver TEXT, - ext TEXT, - data BLOB - ); - ''' - ) - app.config.set('version', '0.11.1.3') - - def update_config_to_01114(self): - # add default theme if it doesn't exist - d = ['accounttextcolor', 'accountbgcolor', 'accountfont', - 'accountfontattrs', 'grouptextcolor', 'groupbgcolor', 'groupfont', - 'groupfontattrs', 'contacttextcolor', 'contactbgcolor', 'contactfont', - 'contactfontattrs', 'bannertextcolor', 'bannerbgcolor', 'bannerfont', - 'bannerfontattrs'] - theme_name = _('default') - if theme_name not in app.config.get_per('themes'): - app.config.add_per('themes', theme_name) - if app.config.get_per('themes', 'gtk+'): - # copy from old gtk+ theme - for o in d: - val = app.config.get_per('themes', 'gtk+', o) - app.config.set_per('themes', theme_name, o, val) - app.config.del_per('themes', 'gtk+') - else: - # copy from default theme - theme = app.config.themes_default[theme_name] - for o in d: - app.config.set_per('themes', theme_name, o, theme[d.index(o)]) - app.config.set('version', '0.11.1.4') - - def update_config_to_01115(self): - self.call_sql(logger.LOG_DB_PATH, '''DELETE FROM caps_cache;''') - app.config.set('version', '0.11.1.5') - - def update_config_to_01121(self): - # remove old unencrypted secrets file - from gajim.common.configpaths import gajimpaths - - new_file = gajimpaths['SECRETS_FILE'] - - old_file = os.path.dirname(new_file) + '/secrets' - - if os.path.exists(old_file): - os.remove(old_file) - - app.config.set('version', '0.11.2.1') - - def update_config_to_01141(self): - self.call_sql(logger.LOG_DB_PATH, - ''' - CREATE TABLE IF NOT EXISTS caps_cache ( - node TEXT, - ver TEXT, - ext TEXT, - data BLOB - ); - ''' - ) - app.config.set('version', '0.11.4.1') - - def update_config_to_01142(self): - """ - next_message_received sound event is splittedin 2 events - """ - app.config.add_per('soundevents', 'next_message_received_focused') - app.config.add_per('soundevents', 'next_message_received_unfocused') - if app.config.get_per('soundevents', 'next_message_received'): - enabled = app.config.get_per('soundevents', 'next_message_received', - 'enabled') - path = app.config.get_per('soundevents', 'next_message_received', - 'path') - app.config.del_per('soundevents', 'next_message_received') - app.config.set_per('soundevents', 'next_message_received_focused', - 'enabled', enabled) - app.config.set_per('soundevents', 'next_message_received_focused', - 'path', path) - app.config.set('version', '0.11.1.2') - - def update_config_to_01143(self): - self.call_sql(logger.LOG_DB_PATH, - ''' - CREATE TABLE IF NOT EXISTS rooms_last_message_time( - jid_id INTEGER PRIMARY KEY UNIQUE, - time INTEGER - ); - ''' - ) - app.config.set('version', '0.11.4.3') - - def update_config_to_01144(self): - back = os.getcwd() - os.chdir(logger.LOG_DB_FOLDER) - con = sqlite.connect(logger.LOG_DB_FILE) - os.chdir(back) - cur = con.cursor() - try: - cur.executescript('DROP TABLE caps_cache;') - con.commit() - except sqlite.OperationalError: - pass - try: - cur.executescript( - ''' - CREATE TABLE IF NOT EXISTS caps_cache ( - hash_method TEXT, - hash TEXT, - data BLOB - ); - ''' - ) - con.commit() - except sqlite.OperationalError: - pass - con.close() - app.config.set('version', '0.11.4.4') - - def update_config_to_01201(self): - if 'uri_schemes' in self.old_values: - new_values = self.old_values['uri_schemes'].replace(' mailto', '').\ - replace(' xmpp', '') - app.config.set('uri_schemes', new_values) - app.config.set('version', '0.12.0.1') - - def update_config_to_01211(self): - if 'trayicon' in self.old_values: - if self.old_values['trayicon'] == 'False': - app.config.set('trayicon', 'never') - else: - app.config.set('trayicon', 'always') - app.config.set('version', '0.12.1.1') - - def update_config_to_01212(self): - for opt in ('ignore_unknown_contacts', 'send_os_info', - 'log_encrypted_sessions'): - if opt in self.old_values: - val = self.old_values[opt] - for account in app.config.get_per('accounts'): - app.config.set_per('accounts', account, opt, val) - app.config.set('version', '0.12.1.2') - - def update_config_to_01213(self): - msgs = app.config.statusmsg_default - for msg_name in app.config.get_per('statusmsg'): - if msg_name in msgs: - app.config.set_per('statusmsg', msg_name, 'activity', - msgs[msg_name][1]) - app.config.set_per('statusmsg', msg_name, 'subactivity', - msgs[msg_name][2]) - app.config.set_per('statusmsg', msg_name, 'activity_text', - msgs[msg_name][3]) - app.config.set_per('statusmsg', msg_name, 'mood', - msgs[msg_name][4]) - app.config.set_per('statusmsg', msg_name, 'mood_text', - msgs[msg_name][5]) - app.config.set('version', '0.12.1.3') - - def update_config_to_01214(self): - for status in ['online', 'chat', 'away', 'xa', 'dnd', 'invisible', - 'offline']: - if 'last_status_msg_' + status in self.old_values: - app.config.add_per('statusmsg', '_last_' + status) - app.config.set_per('statusmsg', '_last_' + status, 'message', - self.old_values['last_status_msg_' + status]) - app.config.set('version', '0.12.1.4') - - def update_config_to_01215(self): - """ - Remove hardcoded ../data/sounds from config - """ - dirs = ['../data', app.gajimpaths.data_root, app.DATA_DIR] - if os.name != 'nt': - dirs.append(os.path.expanduser('~/.gajim')) - for evt in app.config.get_per('soundevents'): - path = app.config.get_per('soundevents', evt, 'path') - # absolute and relative passes are necessary - path = helpers.strip_soundfile_path(path, dirs, abs=False) - path = helpers.strip_soundfile_path(path, dirs, abs=True) - app.config.set_per('soundevents', evt, 'path', path) - app.config.set('version', '0.12.1.5') - - def update_config_to_01231(self): - self.call_sql(logger.LOG_DB_PATH, - ''' - CREATE TABLE IF NOT EXISTS roster_entry( - account_jid_id INTEGER, - jid_id INTEGER, - name TEXT, - subscription INTEGER, - ask BOOLEAN, - PRIMARY KEY (account_jid_id, jid_id) - ); - - CREATE TABLE IF NOT EXISTS roster_group( - account_jid_id INTEGER, - jid_id INTEGER, - group_name TEXT, - PRIMARY KEY (account_jid_id, jid_id, group_name) - ); - ''' - ) - app.config.set('version', '0.12.3.1') - - def update_config_from_0125(self): - # All those functions need to be called for 0.12.5 to 0.13 transition - self.update_config_to_01211() - self.update_config_to_01213() - self.update_config_to_01214() - self.update_config_to_01215() - self.update_config_to_01231() - - def update_config_to_01251(self): - self.call_sql(logger.LOG_DB_PATH, - '''ALTER TABLE unread_messages - ADD COLUMN 'shown' BOOLEAN default 0;''' - ) - app.config.set('version', '0.12.5.1') - - def update_config_to_01252(self): - if 'alwaysauth' in self.old_values: - val = self.old_values['alwaysauth'] - for account in app.config.get_per('accounts'): - app.config.set_per('accounts', account, 'autoauth', val) - app.config.set('version', '0.12.5.2') - - def update_config_to_01253(self): - if 'enable_zeroconf' in self.old_values: - val = self.old_values['enable_zeroconf'] - for account in app.config.get_per('accounts'): - if app.config.get_per('accounts', account, 'is_zeroconf'): - app.config.set_per('accounts', account, 'active', val) - else: - app.config.set_per('accounts', account, 'active', True) - app.config.set('version', '0.12.5.3') - - def update_config_to_01254(self): - vals = {'inmsgcolor': ['#a34526', '#a40000'], - 'outmsgcolor': ['#164e6f', '#3465a4'], - 'restored_messages_color': ['grey', '#555753'], - 'statusmsgcolor': ['#1eaa1e', '#73d216'], - 'urlmsgcolor': ['#0000ff', '#204a87'], - 'gc_nicknames_colors': ['#a34526:#c000ff:#0012ff:#388a99:#045723:#7c7c7c:#ff8a00:#94452d:#244b5a:#32645a', '#4e9a06:#f57900:#ce5c00:#3465a4:#204a87:#75507b:#5c3566:#c17d11:#8f5902:#ef2929:#cc0000:#a40000']} - for c in vals: - if c not in self.old_values: - continue - val = self.old_values[c] - if val == vals[c][0]: - # We didn't change default value, so update it with new default - app.config.set(c, vals[c][1]) - app.config.set('version', '0.12.5.4') - - def update_config_to_01255(self): - vals = {'statusmsgcolor': ['#73d216', '#4e9a06'], - 'outmsgtxtcolor': ['#a2a2a2', '#555753']} - for c in vals: - if c not in self.old_values: - continue - val = self.old_values[c] - if val == vals[c][0]: - # We didn't change default value, so update it with new default - app.config.set(c, vals[c][1]) - app.config.set('version', '0.12.5.5') - - def update_config_to_01256(self): - vals = {'gc_nicknames_colors': ['#4e9a06:#f57900:#ce5c00:#3465a4:#204a87:#75507b:#5c3566:#c17d11:#8f5902:#ef2929:#cc0000:#a40000', '#f57900:#ce5c00:#204a87:#75507b:#5c3566:#c17d11:#8f5902:#ef2929:#cc0000:#a40000']} - for c in vals: - if c not in self.old_values: - continue - val = self.old_values[c] - if val == vals[c][0]: - # We didn't change default value, so update it with new default - app.config.set(c, vals[c][1]) - app.config.set('version', '0.12.5.6') - - def update_config_to_01257(self): - if 'iconset' in self.old_values: - if self.old_values['iconset'] in ('nuvola', 'crystal', 'gossip', - 'simplebulb', 'stellar'): - app.config.set('iconset', app.config.DEFAULT_ICONSET) - app.config.set('version', '0.12.5.7') - - def update_config_to_01258(self): - self.update_ft_proxies(to_remove=['proxy65.talkonaut.com', - 'proxy.jabber.org', 'proxy.netlab.cz', 'transfer.jabber.freenet.de', - 'proxy.jabber.cd.chalmers.se'], to_add=['proxy.eu.jabber.org', - 'proxy.jabber.ru', 'proxy.jabbim.cz']) - app.config.set('version', '0.12.5.8') - - def update_config_to_013100(self): - self.call_sql(logger.LOG_DB_PATH, - '''ALTER TABLE caps_cache - ADD COLUMN 'last_seen' INTEGER default %d;''' % int(time()) - ) - app.config.set('version', '0.13.10.0') - - def update_config_to_013101(self): - self.call_sql(logger.LOG_DB_PATH, - ''' - DROP INDEX IF EXISTS idx_logs_jid_id_kind; - - CREATE INDEX IF NOT EXISTS - idx_logs_jid_id_time ON logs (jid_id, time DESC); - ''' - ) - app.config.set('version', '0.13.10.1') - - def update_config_to_013901(self): - schemes = 'aaa:// aaas:// acap:// cap:// cid: crid:// data: dav: dict:// dns: fax: file:/ ftp:// geo: go: gopher:// h323: http:// https:// iax: icap:// im: imap:// info: ipp:// iris: iris.beep: iris.xpc: iris.xpcs: iris.lwz: ldap:// mid: modem: msrp:// msrps:// mtqp:// mupdate:// news: nfs:// nntp:// opaquelocktoken: pop:// pres: prospero:// rtsp:// service: shttp:// sip: sips: sms: snmp:// soap.beep:// soap.beeps:// tag: tel: telnet:// tftp:// thismessage:/ tip:// tv: urn:// vemmi:// xmlrpc.beep:// xmlrpc.beeps:// z39.50r:// z39.50s:// about: apt: cvs:// daap:// ed2k:// feed: fish:// git:// iax2: irc:// ircs:// ldaps:// magnet: mms:// rsync:// ssh:// svn:// sftp:// smb:// webcal://' - app.config.set('uri_schemes', schemes) - app.config.set('version', '0.13.90.1') - def update_config_to_01401(self): if 'autodetect_browser_mailer' not in self.old_values or 'openwith' \ not in self.old_values or \ View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/882be87a3b39df481caa1e15ddb578bf24… --- View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/882be87a3b39df481caa1e15ddb578bf24… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] Set correct kind on incoming MAM messages
by Philipp Hörist 28 Feb '18

28 Feb '18

Philipp Hörist pushed to branch master at gajim / gajim Commits: c5f3aa16 by Philipp Hörist at 2018-02-28T17:58:26+01:00 Set correct kind on incoming MAM messages - - - - - 1 changed file: - gajim/chat_control.py Changes: ===================================== gajim/chat_control.py ===================================== --- a/gajim/chat_control.py +++ b/gajim/chat_control.py @@ -815,7 +815,7 @@ class ChatControl(ChatControlBase): if obj.with_ != self.contact.jid: return - kind = 'incoming' + kind = '' # incoming if obj.kind == KindConstant.CHAT_MSG_SENT: kind = 'outgoing' View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/c5f3aa169fd133a6f2c61aa8a226b36afc… --- View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/c5f3aa169fd133a6f2c61aa8a226b36afc… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] Add get_contact_strict()
by Philipp Hörist 26 Feb '18

26 Feb '18

Philipp Hörist pushed to branch master at gajim / gajim Commits: a4bfd2fc by Philipp Hörist at 2018-02-26T22:24:30+01:00 Add get_contact_strict() This adds a method that returns only a contact if there is an exact match, instead of a contact where only the barejid matches. We need this when we update the Caps of a contact. - - - - - 1 changed file: - gajim/common/contacts.py Changes: ===================================== gajim/common/contacts.py ===================================== --- a/gajim/common/contacts.py +++ b/gajim/common/contacts.py @@ -509,6 +509,15 @@ class Contacts(): return c return self._contacts[jid][0] + def get_contact_strict(self, jid, resource): + """ + Return the contact instance for the given resource or None + """ + if jid in self._contacts: + for c in self._contacts[jid]: + if c.resource == resource: + return c + def get_avatar(self, jid, size=None, scale=None): if jid not in self._contacts: return None @@ -554,7 +563,7 @@ class Contacts(): Get Contact object for specific resource of given jid """ barejid, resource = common.app.get_room_and_nick_from_fjid(fjid) - return self.get_contact(barejid, resource) + return self.get_contact_strict(barejid, resource) def get_first_contact_from_jid(self, jid): if jid in self._contacts: View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/a4bfd2fcbbb069bfff116990be91238af9… --- View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/a4bfd2fcbbb069bfff116990be91238af9… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] 2 commits: Only use fallback duplicate search on MAM < 2
by Philipp Hörist 26 Feb '18

26 Feb '18

Philipp Hörist pushed to branch master at gajim / gajim Commits: 77be67f6 by Philipp Hörist at 2018-02-25T22:02:39+01:00 Only use fallback duplicate search on MAM < 2 - - - - - c6e39309 by Philipp Hörist at 2018-02-26T20:49:01+01:00 Use MessageSentEvent to print to ChatControl Its later than StanzaMessageOutgoingEvent, this allows encryption Plugins to not return the encrypted payload immediatly. For example encrypting may take some time because a password is needed or the load has to be encrypted in another Thread. - - - - - 3 changed files: - gajim/chat_control.py - gajim/common/connection.py - gajim/common/message_archiving.py Changes: ===================================== gajim/chat_control.py ===================================== --- a/gajim/chat_control.py +++ b/gajim/chat_control.py @@ -238,7 +238,7 @@ class ChatControl(ChatControlBase): self._nec_chatstate_received) app.ged.register_event_handler('caps-received', ged.GUI1, self._nec_caps_received) - app.ged.register_event_handler('stanza-message-outgoing', ged.OUT_POSTCORE, + app.ged.register_event_handler('message-sent', ged.OUT_POSTCORE, self._message_sent) app.ged.register_event_handler( 'mam-decrypted-message-received', @@ -1160,7 +1160,7 @@ class ChatControl(ChatControlBase): self._nec_chatstate_received) app.ged.remove_event_handler('caps-received', ged.GUI1, self._nec_caps_received) - app.ged.remove_event_handler('stanza-message-outgoing', ged.OUT_POSTCORE, + app.ged.remove_event_handler('message-sent', ged.OUT_POSTCORE, self._message_sent) self.unsubscribe_events() ===================================== gajim/common/connection.py ===================================== --- a/gajim/common/connection.py +++ b/gajim/common/connection.py @@ -2075,10 +2075,7 @@ class Connection(CommonConnection, ConnectionHandlers): obj.timestamp = time.time() obj.stanza_id = self.connection.send(obj.msg_iq, now=obj.now) - app.nec.push_incoming_event(MessageSentEvent( - None, conn=self, jid=obj.jid, message=obj.message, keyID=obj.keyID, - chatstate=obj.chatstate, automatic_message=obj.automatic_message, - stanza_id=obj.stanza_id, additional_data=obj.additional_data)) + app.nec.push_incoming_event(MessageSentEvent(None, **vars(obj))) if isinstance(obj.jid, list): for j in obj.jid: ===================================== gajim/common/message_archiving.py ===================================== --- a/gajim/common/message_archiving.py +++ b/gajim/common/message_archiving.py @@ -200,13 +200,19 @@ class ConnectionArchive313: def _nec_mam_decrypted_message_received(self, obj): if obj.conn.name != self.name: return - # if self.archiving_namespace != nbxmpp.NS_MAM_2: - # Fallback duplicate search without stanza-id - duplicate = app.logger.search_for_duplicate( - self.name, obj.with_, obj.timestamp, obj.msgtxt) - if duplicate: - # dont propagate the event further - return True + + namespace = self.archiving_namespace + if obj.groupchat: + namespace = muc_caps_cache.get_mam_namespace(obj.room_jid) + + if namespace != nbxmpp.NS_MAM_2: + # Fallback duplicate search without stanza-id + duplicate = app.logger.search_for_duplicate( + self.name, obj.with_, obj.timestamp, obj.msgtxt) + if duplicate: + # dont propagate the event further + return True + app.logger.insert_into_logs(self.name, obj.with_, obj.timestamp, View it on GitLab: https://dev.gajim.org/gajim/gajim/compare/c74c888506777ce137688fc58a2b7a429… --- View it on GitLab: https://dev.gajim.org/gajim/gajim/compare/c74c888506777ce137688fc58a2b7a429… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/python-nbxmpp][master] 2 commits: Fix UnicodeDecodeError exceptions when connecting with Socks5 proxy
by Philipp Hörist 25 Feb '18

25 Feb '18

Philipp Hörist pushed to branch master at gajim / python-nbxmpp Commits: 6b52ade8 by l-n-s at 2018-02-25T15:39:18-05:00 Fix UnicodeDecodeError exceptions when connecting with Socks5 proxy - - - - - cc2e4a26 by Philipp Hörist at 2018-02-25T21:44:55+01:00 Merge branch 'fix_socks5_issue' into 'master' Fix UnicodeDecodeError exceptions when connecting with Socks5 proxy Closes #48 See merge request gajim/python-nbxmpp!14 - - - - - 2 changed files: - nbxmpp/proxy_connectors.py - nbxmpp/transports_nb.py Changes: ===================================== nbxmpp/proxy_connectors.py ===================================== --- a/nbxmpp/proxy_connectors.py +++ b/nbxmpp/proxy_connectors.py @@ -234,7 +234,8 @@ class SOCKS5Connector(ProxyConnector): elif reply[3] == '\x01': begin, end = 3, 7 elif reply[3] == '\x03': - begin, end = 4, 4 + reply[4] + # Socks5 is bound to domain name + pass else: log.error('Invalid proxy reply') self.on_failure('Invalid proxy reply') ===================================== nbxmpp/transports_nb.py ===================================== --- a/nbxmpp/transports_nb.py +++ b/nbxmpp/transports_nb.py @@ -655,6 +655,12 @@ class NonBlockingTCP(NonBlockingTransport, IdleObject): try: received = decode_py2(received, 'utf-8') except UnicodeDecodeError: + if received.startswith(str('\x05\x00\x00\x03')): + # Received Socks5 reply with bind domain name + # Changing last 2 bytes (port) to \x00 to decode it correctly, + # since Socks5 bind address and port are not used elsewhere + received = received[:-2] + str('\x00\x00') + for i in range(-1, -4, -1): char = received[i] if sys.version_info[0] < 3: # with py2 we get a str View it on GitLab: https://dev.gajim.org/gajim/python-nbxmpp/compare/0f3e1ba0e442091667c57ca5f… --- View it on GitLab: https://dev.gajim.org/gajim/python-nbxmpp/compare/0f3e1ba0e442091667c57ca5f… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] Silence 'git unavailable' message
by Philipp Hörist 25 Feb '18

25 Feb '18

Philipp Hörist pushed to branch master at gajim / gajim Commits: c74c8885 by André Apitzsch at 2018-02-25T21:35:19+01:00 Silence 'git unavailable' message - - - - - 1 changed file: - gajim/__init__.py Changes: ===================================== gajim/__init__.py ===================================== --- a/gajim/__init__.py +++ b/gajim/__init__.py @@ -3,10 +3,10 @@ import subprocess __version__ = "0.99.2" try: - node = subprocess.Popen('git rev-parse --short=12 HEAD', shell=True, - stdout=subprocess.PIPE).communicate()[0] + p = subprocess.Popen('git rev-parse --short=12 HEAD', shell=True, + stdout=subprocess.PIPE, stderr=subprocess.DEVNULL) + node = p.communicate()[0] if node: __version__ += '+' + node.decode('utf-8').strip() except Exception: pass - View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/c74c888506777ce137688fc58a2b7a4293… --- View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/c74c888506777ce137688fc58a2b7a4293… 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