Commits

commits@gajim.org

17632 discussions

[Git][gajim/python-nbxmpp][master] Receipts: Use a copy of JID for building the receipt
by Philipp Hörist 02 Nov '19

02 Nov '19

Philipp Hörist pushed to branch master at gajim / python-nbxmpp Commits: 1eb1b504 by Philipp Hörist at 2019-11-02T15:03:28Z Receipts: Use a copy of JID for building the receipt - - - - - 1 changed file: - nbxmpp/modules/receipts.py Changes: ===================================== nbxmpp/modules/receipts.py ===================================== @@ -70,7 +70,7 @@ def build_receipt(stanza): is_muc_pm = isMucPM(stanza) - jid = stanza.getFrom() + jid = stanza.getFrom().copy() typ = stanza.getType() if typ == 'groupchat' or not is_muc_pm: jid.setBare() View it on GitLab: https://dev.gajim.org/gajim/python-nbxmpp/commit/1eb1b5049546a839657e6344cb… -- View it on GitLab: https://dev.gajim.org/gajim/python-nbxmpp/commit/1eb1b5049546a839657e6344cb… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] 2 commits: Zeroconf: Fix message handler
by Philipp Hörist 01 Nov '19

01 Nov '19

Philipp Hörist pushed to branch master at gajim / gajim Commits: 3d094aff by Philipp Hörist at 2019-11-01T18:15:32Z Zeroconf: Fix message handler - Fix checking wrong attribute - Add nbxmpp properties to event - - - - - fd75817f by Philipp Hörist at 2019-11-01T20:19:44Z ChatControl: Set message_id on restored conversation lines Fixes #9879 - - - - - 3 changed files: - gajim/chat_control.py - gajim/common/logger.py - gajim/common/zeroconf/connection_handlers_zeroconf.py Changes: ===================================== gajim/chat_control.py ===================================== @@ -1259,6 +1259,7 @@ class ChatControl(ChatControlBase): old_kind=local_old_kind, xhtml=xhtml, additional_data=additional_data, + message_id=row.message_id, marker=row.marker, error=row.error) if row.message.startswith('/me ') or row.message.startswith('/me\n'): ===================================== gajim/common/logger.py ===================================== @@ -789,7 +789,8 @@ class Logger: sql = ''' SELECT time, kind, message, error as "error [common_error]", - subject, additional_data, marker as "marker [marker]" + subject, additional_data, marker as "marker [marker]", + message_id FROM logs NATURAL JOIN jids WHERE jid IN ({jids}) AND kind IN ({kinds}) AND time > get_timeout() ORDER BY time DESC, log_line_id DESC LIMIT ? OFFSET ? ===================================== gajim/common/zeroconf/connection_handlers_zeroconf.py ===================================== @@ -47,7 +47,7 @@ class ConnectionHandlersZeroconf(connection_handlers.ConnectionHandlersBase): """ Called when we receive a message """ - if properties.is_error: + if properties.type.is_error: return log.info('Zeroconf MessageCB') @@ -119,6 +119,7 @@ class ConnectionHandlersZeroconf(connection_handlers.ConnectionHandlersBase): 'msg_log_id': None, 'displaymarking': None, 'stanza_id': id_, + 'properties': properties, } app.nec.push_incoming_event( View it on GitLab: https://dev.gajim.org/gajim/gajim/compare/96f9fbc25f24bbdf40fbcbe0c790f44df… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/compare/96f9fbc25f24bbdf40fbcbe0c790f44df… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] Database: Add index on the message_id column
by Philipp Hörist 01 Nov '19

01 Nov '19

Philipp Hörist pushed to branch master at gajim / gajim Commits: 96f9fbc2 by Philipp Hörist at 2019-11-01T09:14:07Z Database: Add index on the message_id column - - - - - 1 changed file: - gajim/common/logger.py Changes: ===================================== gajim/common/logger.py ===================================== @@ -95,7 +95,8 @@ LOGS_SQL_STATEMENT = ''' ); CREATE INDEX idx_logs_jid_id_time ON logs (jid_id, time DESC); CREATE INDEX idx_logs_stanza_id ON logs (stanza_id); - PRAGMA user_version=4; + CREATE INDEX idx_logs_message_id ON logs (message_id); + PRAGMA user_version=5; ''' CACHE_SQL_STATEMENT = ''' @@ -328,6 +329,13 @@ class Logger: ] self._execute_multiple(con, statements) + if self._get_user_version(con) < 5: + statements = [ + 'CREATE INDEX idx_logs_message_id ON logs (message_id)', + 'PRAGMA user_version=5' + ] + self._execute_multiple(con, statements) + def _migrate_cache(self, con): if self._get_user_version(con) == 0: # All migrations from 0.16.9 until 1.0.0 View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/96f9fbc25f24bbdf40fbcbe0c790f44df7… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/96f9fbc25f24bbdf40fbcbe0c790f44df7… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] MAM: Add nbxmpp properties to event
by Philipp Hörist 31 Oct '19

31 Oct '19

Philipp Hörist pushed to branch master at gajim / gajim Commits: 5aff9fb0 by Philipp Hörist at 2019-10-31T05:04:00Z MAM: Add nbxmpp properties to event Fixes #9876 - - - - - 1 changed file: - gajim/common/modules/mam.py Changes: ===================================== gajim/common/modules/mam.py ===================================== @@ -245,6 +245,7 @@ class MAM(BaseModule): 'message': stanza, 'stanza': stanza, 'namespace': properties.mam.namespace, + 'properties': properties, }) app.logger.insert_into_logs(self._account, View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/5aff9fb0bc4325b843ba4d11e90af0770b… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/5aff9fb0bc4325b843ba4d11e90af0770b… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] MacOS: remove debug line from makebundle.py
by Philipp Hörist 31 Oct '19

31 Oct '19

Philipp Hörist pushed to branch master at gajim / gajim Commits: 1f5d81d1 by Sebastiaan Lokhorst at 2019-10-30T23:10:59Z MacOS: remove debug line from makebundle.py - - - - - 1 changed file: - mac/makebundle.py Changes: ===================================== mac/makebundle.py ===================================== @@ -15,7 +15,6 @@ if __name__ == '__main__': args = parser.parse_args() if args.version: - print("args.version:", version) version = args.version else: try: View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/1f5d81d10326ee5dd2dca549ff58091616… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/1f5d81d10326ee5dd2dca549ff58091616… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] MacOS: Use PyInstaller to build app
by Philipp Hörist 30 Oct '19

30 Oct '19

Philipp Hörist pushed to branch master at gajim / gajim Commits: 21dafc3c by Sebastiaan Lokhorst at 2019-10-30T19:52:48Z MacOS: Use PyInstaller to build app - - - - - 4 changed files: - − mac/Info.plist.template - + mac/gajim.spec - − mac/launch.sh.template - mac/makebundle.py Changes: ===================================== mac/Info.plist.template deleted ===================================== @@ -1,37 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd"> -<plist version="1.0"> -<dict> - <key>CFBundleExecutable</key> - <string>launch.sh</string> - <key>CFBundleIdentifier</key> - <string>org.gajim.mac</string> - <key>CFBundleInfoDictionaryVersion</key> - <string>6.0</string> - <key>CFBundleName</key> - <string>Gajim</string> - <key>CFBundlePackageType</key> - <string>APPL</string> - <key>CFBundleShortVersionString</key> - <string>${short_version_string}</string> - <key>CFBundleSignature</key> - <string>DASH</string> - <key>CFBundleVersion</key> - <string>${version}</string> - <key>CFBundleIconFile</key> - <string>Gajim</string> - <key>CFBundleURLTypes</key> - <array> - <dict> - <key>CFBundleTypeRole</key> - <string>Viewer</string> - <key>CFBundleURLName</key> - <string>XMPP</string> - <key>CFBundleURLSchemes</key> - <array> - <string>xmpp</string> - </array> - </dict> - </array> -</dict> -</plist> ===================================== mac/gajim.spec ===================================== @@ -0,0 +1,54 @@ +# -*- mode: python -*- + +block_cipher = None + +cwd = os.getcwd() +icon = os.path.join(cwd, "mac", "Gajim.icns") + +info_plist = { + "CFBundleDisplayName": "Gajim", + "NSHighResolutionCapable": True, +} + +import sys +sys.path.insert(0, os.path.join(cwd)) +from gajim.common.modules import MODULES +hiddenimports = ['gajim.common.modules.' + m for m in MODULES] +sys.path.pop(0) + +a = Analysis(['launch.py'], + pathex=[cwd], + binaries=[], + datas=[('gajim', 'gajim')], + hiddenimports=hiddenimports, + hookspath=[], + runtime_hooks=[], + excludes=[], + win_no_prefer_redirects=False, + win_private_assemblies=False, + cipher=block_cipher, + noarchive=False) +pyz = PYZ(a.pure, a.zipped_data, + cipher=block_cipher) +exe = EXE(pyz, + a.scripts, + [], + exclude_binaries=True, + name='launch', + debug=False, + bootloader_ignore_signals=False, + strip=False, + upx=True, + console=False ) +coll = COLLECT(exe, + a.binaries, + a.zipfiles, + a.datas, + strip=False, + upx=True, + name='launch') +app = BUNDLE(coll, + name='Gajim.app', + icon=icon, + info_plist=info_plist, + bundle_identifier='org.gajim.gajim') ===================================== mac/launch.sh.template deleted ===================================== @@ -1,3 +0,0 @@ -#!/bin/sh - -${bin_path} ===================================== mac/makebundle.py ===================================== @@ -1,58 +1,30 @@ #!/usr/bin/env python3 import os -import shutil import sys -from string import Template -from os.path import join -import argparse - -EXEC_TEMPLATE = 'mac/launch.sh.template' -PLIST_TEMPLATE = 'mac/Info.plist.template' -ICNS_FILE = 'mac/Gajim.icns' - - -def fill_template(in_path, out_path, vars): - with open(in_path, 'r') as f: - templ = Template(f.read()) - filled_templ = templ.substitute(vars) - with open(out_path, 'w') as f: - f.write(filled_templ) - - -def create_executable(exec_path, bin_path): - fill_template(EXEC_TEMPLATE, exec_path, { - 'bin_path': bin_path - }) - os.chmod(exec_path, 0o755) - - -def create_plist(plist_path, version): - fill_template(PLIST_TEMPLATE, plist_path, { - 'version': version, - 'short_version_string': version - }) - +from argparse import ArgumentParser +from subprocess import run, check_output, CalledProcessError if __name__ == '__main__': if not os.path.isdir('mac'): sys.exit("can't find the 'mac' directory. make sure you run " "this script from the project root") - parser = argparse.ArgumentParser(description='Create a macOS .app bundle.') - parser.add_argument('bundle', help='bundle output location') - parser.add_argument('--version', default='0.0.1', - help='version number of the .app bundle') - parser.add_argument('--bin-path', default='/usr/local/bin/gajim', - help='location of the actual executable') + parser = ArgumentParser(description='Create a macOS .app bundle. ' + 'Requires PyInstaller and hdiutil (macOS).') + parser.add_argument('--version', help='version number of the .app bundle') args = parser.parse_args() - bundle = args.bundle - - os.mkdir(bundle) - os.mkdir(join(bundle, 'Contents')) - os.mkdir(join(bundle, 'Contents/MacOS')) - os.mkdir(join(bundle, 'Contents/Resources')) - - create_executable(join(bundle, 'Contents/MacOS/launch.sh'), bin_path=args.bin_path) - create_plist(join(bundle, 'Contents/Info.plist'), version=args.version) - shutil.copy(ICNS_FILE, join(bundle, 'Contents/Resources/Gajim.icns')) + if args.version: + print("args.version:", version) + version = args.version + else: + try: + version = check_output(['git', 'describe', '--tags']).decode().strip() + except CalledProcessError: + version = 'unknown' + dmg_name = 'gajim-{}.dmg'.format(version) + + run(['cp', 'mac/gajim.spec', 'gajim.spec'], check=True) # the .spec has to be in the project root + run(['pyinstaller', 'gajim.spec'], check=True) + run(['rm', '-rf', 'dist/launch']) # we only want Gajim.app in the dmg + run(['hdiutil', 'create', '-volname', 'Gajim', '-srcfolder', 'dist', '-ov', '-format', 'UDZO', dmg_name], check=True) View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/21dafc3cc3fa5c57b03054330679cf250b… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/21dafc3cc3fa5c57b03054330679cf250b… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] Zeroconf: Don't show self contact
by Philipp Hörist 29 Oct '19

29 Oct '19

Philipp Hörist pushed to branch master at gajim / gajim Commits: 7101378b by Philipp Hörist at 2019-10-29T21:05:13Z Zeroconf: Don't show self contact Fixes #9090 - - - - - 1 changed file: - gajim/roster_window.py Changes: ===================================== gajim/roster_window.py ===================================== @@ -1843,9 +1843,11 @@ class RosterWindow: self_jid = app.get_jid_from_account(account) if app.connections[account].server_resource: self_jid += '/' + app.connections[account].server_resource - array[self_jid] = {'name': app.nicks[account], - 'groups': ['self_contact'], 'subscription': 'both', - 'ask': 'none'} + if account != app.ZEROCONF_ACC_NAME: + array[self_jid] = {'name': app.nicks[account], + 'groups': ['self_contact'], + 'subscription': 'both', + 'ask': 'none'} # .keys() is needed for jid in list(array.keys()): View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/7101378ba6429bf79c6c804b6acae3c92a… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/7101378ba6429bf79c6c804b6acae3c92a… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] Zeroconf: Fix name conflict
by Philipp Hörist 29 Oct '19

29 Oct '19

Philipp Hörist pushed to branch master at gajim / gajim Commits: 31f34991 by Philipp Hörist at 2019-10-29T20:25:23Z Zeroconf: Fix name conflict Pass kDNSServiceFlagsNoAutoRename to pybonjour so we dont end up with invalid names like `user@machine (2)` Refactor alternativ name suggestion into own method - - - - - 1 changed file: - gajim/common/zeroconf/zeroconf_bonjour.py Changes: ===================================== gajim/common/zeroconf/zeroconf_bonjour.py ===================================== @@ -240,17 +240,19 @@ class Zeroconf: elif errorCode == pybonjour.kDNSServiceErr_NameConflict: log.error('Error while adding service. %s', errorCode) - parts = self.username.split(' ') + self.name_conflictCB(self._get_alternativ_name(self.username)) + else: + self.error_CB(_('Error while adding service. %s') % str(errorCode)) - # check if last part is a number and if, increment it + @staticmethod + def _get_alternativ_name(name): + if name[-2] == '-': try: - stripped = str(int(parts[-1])) + number = int(name[-1]) except Exception: - stripped = 1 - alternative_name = self.username + str(stripped + 1) - self.name_conflictCB(alternative_name) - else: - self.error_CB(_('Error while adding service. %s') % str(errorCode)) + return '%s-1' % name + return '%s-%s' % (name[:-2], number + 1) + return '%s-1' % name # make zeroconf-valid names def replace_show(self, show): @@ -280,6 +282,7 @@ class Zeroconf: self.txt = txt try: self.service_sdRef = pybonjour.DNSServiceRegister( + flags=pybonjour.kDNSServiceFlagsNoAutoRename, name=self.name, regtype=self.stype, port=self.port, View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/31f3499118fb09c39fda6150bcf0d27c4e… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/31f3499118fb09c39fda6150bcf0d27c4e… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] 4 commits: Use nbxmpp properties attributes
by Philipp Hörist 28 Oct '19

28 Oct '19

Philipp Hörist pushed to branch master at gajim / gajim Commits: df7fd262 by Philipp Hörist at 2019-10-28T21:46:47Z Use nbxmpp properties attributes - - - - - 493d00bc by Philipp Hörist at 2019-10-28T21:53:02Z Remove unused method - - - - - ff9bc4f9 by Philipp Hörist at 2019-10-28T22:35:35Z Treat type normal messages as chat - - - - - 55cded2e by Philipp Hörist at 2019-10-28T22:43:20Z Remove unused code Code was not working for years, seems nobody missed it - - - - - 17 changed files: - gajim/chat_control.py - gajim/common/app.py - gajim/common/config.py - gajim/common/connection_handlers_events.py - gajim/common/events.py - gajim/common/logger.py - gajim/common/modules/mam.py - gajim/common/modules/message.py - gajim/common/zeroconf/connection_handlers_zeroconf.py - gajim/data/gui/roster_window.ui - − gajim/data/icons/hicolor/48x48/status/gajim-single_msg_recv.png - − gajim/data/icons/hicolor/scalable/status/gajim-single_msg_recv.svg - gajim/gtk/notification.py - gajim/gui_interface.py - gajim/remote_control.py - gajim/roster_window.py - gajim/session.py Changes: ===================================== gajim/chat_control.py ===================================== @@ -789,7 +789,7 @@ class ChatControl(ChatControlBase): if obj.conn.name != self.account: return - if obj.muc_pm: + if obj.properties.is_muc_pm: if not obj.with_ == self.contact.get_full_jid(): return else: @@ -810,14 +810,11 @@ class ChatControl(ChatControlBase): return True if obj.conn.name != self.account: return - if obj.mtype != 'chat': - return + if obj.session.control != self: return typ = '' - if obj.mtype == 'error': - typ = 'error' if obj.forwarded and obj.sent: typ = 'out' @@ -1286,10 +1283,7 @@ class ChatControl(ChatControlBase): for event in events: if event.type_ != self.type_id: continue - if event.kind == 'error': - kind = 'info' - else: - kind = 'print_queue' + kind = 'print_queue' if event.sent_forwarded: kind = 'out' self.add_message(event.message, kind, tim=event.time, ===================================== gajim/common/app.py ===================================== @@ -130,8 +130,6 @@ sleeper_state = {} # type: Dict[str, str] status_before_autoaway = {} # type: Dict[str, str] -# Is Gnome configured to activate on single click ? -single_click = False SHOW_LIST = ['offline', 'connecting', 'online', 'chat', 'away', 'xa', 'dnd', 'invisible', 'error'] ===================================== gajim/common/config.py ===================================== @@ -246,7 +246,6 @@ class Config: 'confirm_block': [opt_str, '', _('Show a confirmation dialog to block a contact? Empty string means never show the dialog.')], 'enable_negative_priority': [opt_bool, False, _('If enabled, you will be able to set a negative priority to your account in the Accounts window. BE CAREFUL, when you are logged in with a negative priority, you will NOT receive any message from your server.')], 'show_contacts_number': [opt_bool, True, _('If enabled, Gajim will show both the number of online and total contacts in account rows as well as in group rows.')], - 'treat_incoming_messages': [opt_str, 'chat', _('Can be empty, \'chat\' or \'normal\'. If not empty, all incoming messages are treated as if they were of this type.')], 'scroll_roster_to_last_message': [opt_bool, True, _('If enabled, Gajim will scroll and select the contact who sent you the last message, if the chat window is not already opened.')], 'change_status_window_timeout': [opt_int, 15, _('Time of inactivity needed before the change status window closes down.')], 'max_conversation_lines': [opt_int, 500, _('Maximum number of lines that are printed in conversations. Oldest lines are cleared.')], ===================================== gajim/common/connection_handlers_events.py ===================================== @@ -330,20 +330,23 @@ class NotificationEvent(nec.NetworkIncomingEvent): if not msg_obj.msgtxt: return self.jid = msg_obj.jid - if msg_obj.mtype == 'pm': + if msg_obj.properties.is_muc_pm: self.jid = msg_obj.fjid self.control = app.interface.msg_win_mgr.search_control( msg_obj.jid, self.account, msg_obj.resource) if self.control is None: + event_type = msg_obj.properties.type.value + if msg_obj.properties.is_muc_pm: + event_type = 'pm' if len(app.events.get_events( - self.account, msg_obj.jid, [msg_obj.mtype])) <= 1: + self.account, msg_obj.jid, [event_type])) <= 1: self.first_unread = True else: self.control_focused = self.control.has_focus() - if msg_obj.mtype == 'pm': + if msg_obj.properties.is_muc_pm: nick = msg_obj.resource else: nick = app.get_name_from_jid(self.conn.name, self.jid) @@ -364,10 +367,7 @@ class NotificationEvent(nec.NetworkIncomingEvent): # We don't want message preview, do_preview = False self.popup_text = '' - if msg_obj.mtype == 'normal': # single message - self.popup_msg_type = 'normal' - self.popup_event_type = _('New Single Message') - elif msg_obj.mtype == 'pm': + if msg_obj.properties.is_muc_pm: self.popup_msg_type = 'pm' self.popup_event_type = _('New Private Message') else: # chat message ===================================== gajim/common/events.py ===================================== @@ -85,9 +85,6 @@ class ChatEvent(Event): additional_data = AdditionalDataDict() self.additional_data = additional_data -class NormalEvent(ChatEvent): - type_ = 'normal' - class PmEvent(ChatEvent): type_ = 'pm' ===================================== gajim/common/logger.py ===================================== @@ -568,29 +568,6 @@ class Logger: self._timeout_commit() return lastrowid - def convert_kind_values_to_db_api_values(self, kind): - """ - Convert from string style to constant ints for db - """ - if kind == 'status': - kind_col = KindConstant.STATUS - elif kind == 'gcstatus': - kind_col = KindConstant.GCSTATUS - elif kind == 'gc_msg': - kind_col = KindConstant.GC_MSG - elif kind == 'single_msg_recv': - kind_col = KindConstant.SINGLE_MSG_RECV - elif kind == 'single_msg_sent': - kind_col = KindConstant.SINGLE_MSG_SENT - elif kind == 'chat_msg_recv': - kind_col = KindConstant.CHAT_MSG_RECV - elif kind == 'chat_msg_sent': - kind_col = KindConstant.CHAT_MSG_SENT - elif kind == 'error': - kind_col = KindConstant.ERROR - - return kind_col - def convert_show_values_to_db_api_values(self, show): """ Convert from string style to constant ints for db ===================================== gajim/common/modules/mam.py ===================================== @@ -236,7 +236,6 @@ class MAM(BaseModule): 'timestamp': properties.mam.timestamp, 'self_message': properties.is_self_message, 'groupchat': groupchat, - 'muc_pm': properties.is_muc_pm, 'stanza_id': stanza_id, 'origin_id': message_id, 'message_id': properties.id, ===================================== gajim/common/modules/message.py ===================================== @@ -189,14 +189,12 @@ class Message(BaseModule): 'unique_id': stanza_id or message_id, 'message_id': properties.id, 'correct_id': parse_correction(properties), - 'mtype': type_.value, 'msgtxt': msgtxt, 'thread_id': thread_id, 'session': session, 'self_message': properties.is_self_message, 'timestamp': properties.timestamp, 'delayed': properties.user_timestamp is not None, - 'muc_pm': properties.is_muc_pm, 'gc_control': gc_control, 'attention': properties.attention, 'xhtml': xhtml, @@ -205,6 +203,7 @@ class Message(BaseModule): 'popup': False, 'msg_log_id': None, 'displaymarking': parse_securitylabel(stanza), + 'properties': properties, } if type_.is_groupchat: @@ -247,9 +246,6 @@ class Message(BaseModule): error=properties.error)) def _log_muc_message(self, event): - if event.mtype == 'error': - return - self._check_for_mam_compliance(event.room_jid, event.stanza_id) if (app.config.should_log(self._account, event.jid) and ===================================== gajim/common/zeroconf/connection_handlers_zeroconf.py ===================================== @@ -106,12 +106,10 @@ class ConnectionHandlersZeroconf(connection_handlers.ConnectionHandlersBase): 'unique_id': id_, 'message_id': properties.id, 'correct_id': parse_correction(properties), - 'mtype': type_, 'msgtxt': msgtxt, 'thread_id': thread_id, 'session': session, 'self_message': False, - 'muc_pm': False, 'gc_control': None, 'attention': properties.attention, 'xhtml': parse_xhtml(properties), ===================================== gajim/data/gui/roster_window.ui ===================================== @@ -141,7 +141,6 @@ <property name="headers_visible">False</property> <property name="reorderable">True</property> <signal name="button-press-event" handler="on_roster_treeview_button_press_event" swapped="no"/> - <signal name="button-release-event" handler="on_roster_treeview_button_release_event" swapped="no"/> <signal name="key-press-event" handler="on_roster_treeview_key_press_event" swapped="no"/> <signal name="row-activated" handler="on_roster_treeview_row_activated" swapped="no"/> <signal name="row-collapsed" handler="on_roster_treeview_row_collapsed" swapped="no"/> ===================================== gajim/data/icons/hicolor/48x48/status/gajim-single_msg_recv.png deleted ===================================== Binary files a/gajim/data/icons/hicolor/48x48/status/gajim-single_msg_recv.png and /dev/null differ ===================================== gajim/data/icons/hicolor/scalable/status/gajim-single_msg_recv.svg deleted ===================================== @@ -1,433 +0,0 @@ -<?xml version="1.0" encoding="UTF-8" standalone="no"?> - -<svg - xmlns:dc="http://purl.org/dc/elements/1.1/" - xmlns:cc="http://web.resource.org/cc/" - xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" - xmlns:svg="http://www.w3.org/2000/svg" - xmlns="http://www.w3.org/2000/svg" - xmlns:xlink="http://www.w3.org/1999/xlink" - xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" - xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" - width="48" - height="48" - id="svg5868" - sodipodi:version="0.32" - inkscape:version="0.44+devel" - sodipodi:docbase="/home/cornelius/Desktop/GAJIM iconset/sources" - sodipodi:docname="single_msg_recv.svg" - inkscape:output_extension="org.inkscape.output.svg.inkscape" - version="1.0" - inkscape:export-filename="/home/cornelius/Desktop/GAJIM iconset/data/pixmaps/events/single_msg_recv.png" - inkscape:export-xdpi="90" - inkscape:export-ydpi="90" - sodipodi:modified="TRUE"> - <defs - id="defs5870"> - <linearGradient - inkscape:collect="always" - id="linearGradient6166"> - <stop - style="stop-color:#73d216;stop-opacity:1" - offset="0" - id="stop6168" /> - <stop - style="stop-color:#66ba13;stop-opacity:1" - offset="1" - id="stop6170" /> - </linearGradient> - <linearGradient - gradientUnits="userSpaceOnUse" - y2="24.999996" - x2="10.000471" - y1="24.999996" - x1="8.8586321" - id="linearGradient3811" - xlink:href="#linearGradient3805" - inkscape:collect="always" /> - <linearGradient - gradientUnits="userSpaceOnUse" - y2="13.072449" - x2="15.5" - y1="0.10591315" - x1="15.5" - id="linearGradient3173" - xlink:href="#linearGradient3167" - inkscape:collect="always" /> - <linearGradient - gradientUnits="userSpaceOnUse" - y2="15.460861" - x2="11.313708" - y1="10.041267" - x1="11.313708" - id="linearGradient3142" - xlink:href="#linearGradient3136" - inkscape:collect="always" /> - <linearGradient - y2="38.184418" - x2="19.293913" - y1="14.866997" - x1="19.293913" - gradientTransform="matrix(1,0,0,1.019549,-31.40102,-3.714102)" - gradientUnits="userSpaceOnUse" - id="linearGradient3122" - xlink:href="#linearGradient3124" - inkscape:collect="always" /> - <linearGradient - gradientTransform="matrix(0.876811,0,0,0.884616,2.431162,6.557698)" - y2="38.184418" - x2="19.293913" - y1="14.866997" - x1="19.293913" - gradientUnits="userSpaceOnUse" - id="linearGradient3095" - xlink:href="#linearGradient3058" - inkscape:collect="always" /> - <linearGradient - gradientTransform="matrix(0.876811,0,0,0.937062,2.431162,6.381118)" - y2="38.184418" - x2="19.293913" - y1="14.866997" - x1="19.293913" - gradientUnits="userSpaceOnUse" - id="linearGradient3093" - xlink:href="#linearGradient3058" - inkscape:collect="always" /> - <linearGradient - id="linearGradient3058" - inkscape:collect="always"> - <stop - id="stop3060" - offset="0" - style="stop-color:#fafaf9;stop-opacity:1;" /> - <stop - id="stop3062" - offset="1" - style="stop-color:#ececec;stop-opacity:1" /> - </linearGradient> - <linearGradient - inkscape:collect="always" - id="linearGradient3124"> - <stop - style="stop-color:#fafaf9;stop-opacity:1;" - offset="0" - id="stop3126" /> - <stop - style="stop-color:#d7d7d7;stop-opacity:1" - offset="1" - id="stop3128" /> - </linearGradient> - <linearGradient - id="linearGradient3136" - inkscape:collect="always"> - <stop - id="stop3138" - offset="0" - style="stop-color:#ef2929;stop-opacity:1" /> - <stop - id="stop3140" - offset="1" - style="stop-color:#ba0000;stop-opacity:1" /> - </linearGradient> - <linearGradient - id="linearGradient3167" - inkscape:collect="always"> - <stop - id="stop3169" - offset="0" - style="stop-color:white;stop-opacity:1;" /> - <stop - id="stop3171" - offset="1" - style="stop-color:white;stop-opacity:0;" /> - </linearGradient> - <linearGradient - y2="609.5199" - x2="512.28497" - y1="365.21631" - x1="512.28497" - gradientTransform="matrix(3.659125,0,0,1.892176,-1492.258,-825.6305)" - gradientUnits="userSpaceOnUse" - id="linearGradient3255" - xlink:href="#linearGradient5048" - inkscape:collect="always" /> - <linearGradient - id="linearGradient5048"> - <stop - id="stop5050" - offset="0" - style="stop-color:black;stop-opacity:0;" /> - <stop - style="stop-color:black;stop-opacity:1;" - offset="0.5" - id="stop5056" /> - <stop - id="stop5052" - offset="1" - style="stop-color:black;stop-opacity:0;" /> - </linearGradient> - <radialGradient - r="117.14286" - fy="488.07959" - fx="602.65948" - cy="488.07959" - cx="602.65948" - gradientTransform="matrix(2.746819,0,0,1.900281,-941.7278,-828.6181)" - gradientUnits="userSpaceOnUse" - id="radialGradient3257" - xlink:href="#linearGradient5060" - inkscape:collect="always" /> - <linearGradient - id="linearGradient5060" - inkscape:collect="always"> - <stop - id="stop5062" - offset="0" - style="stop-color:black;stop-opacity:1;" /> - <stop - id="stop5064" - offset="1" - style="stop-color:black;stop-opacity:0;" /> - </linearGradient> - <radialGradient - r="117.14286" - fy="486.64789" - fx="605.71429" - cy="486.64789" - cx="605.71429" - gradientTransform="matrix(-2.74682,0,0,1.900281,602.2346,-828.6181)" - gradientUnits="userSpaceOnUse" - id="radialGradient3259" - xlink:href="#linearGradient5060" - inkscape:collect="always" /> - <linearGradient - id="linearGradient3805" - inkscape:collect="always"> - <stop - id="stop3807" - offset="0" - style="stop-color:white;stop-opacity:1;" /> - <stop - id="stop3809" - offset="1" - style="stop-color:white;stop-opacity:0;" /> - </linearGradient> - <linearGradient - inkscape:collect="always" - xlink:href="#linearGradient3167" - id="linearGradient6126" - gradientUnits="userSpaceOnUse" - x1="15.5" - y1="0.10591315" - x2="15.5" - y2="13.072449" - gradientTransform="translate(-19.999995,-21)" /> - <linearGradient - inkscape:collect="always" - xlink:href="#linearGradient3136" - id="linearGradient6131" - gradientUnits="userSpaceOnUse" - x1="11.313708" - y1="10.041267" - x2="11.313708" - y2="15.460861" - gradientTransform="translate(-19.999995,-21)" /> - <linearGradient - inkscape:collect="always" - xlink:href="#linearGradient3805" - id="linearGradient6134" - gradientUnits="userSpaceOnUse" - x1="8.8586321" - y1="24.999996" - x2="10.000471" - y2="24.999996" - gradientTransform="translate(-19.999995,-21)" /> - <linearGradient - inkscape:collect="always" - xlink:href="#linearGradient3124" - id="linearGradient6137" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(1,0,0,1.019549,-51.401015,-24.714102)" - x1="19.293913" - y1="14.866997" - x2="19.293913" - y2="38.184418" /> - <linearGradient - inkscape:collect="always" - xlink:href="#linearGradient3058" - id="linearGradient6142" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(0.876811,0,0,0.937062,3.4311673,1.381118)" - x1="19.293913" - y1="14.866997" - x2="19.293913" - y2="38.184418" /> - <linearGradient - inkscape:collect="always" - xlink:href="#linearGradient3058" - id="linearGradient6146" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(0.876811,0,0,0.884616,3.4311673,1.557698)" - x1="19.293913" - y1="14.866997" - x2="19.293913" - y2="38.184418" /> - <linearGradient - inkscape:collect="always" - xlink:href="#linearGradient5048" - id="linearGradient6152" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(3.659125,0,0,1.892176,-1492.258,-825.6305)" - x1="512.28497" - y1="365.21631" - x2="512.28497" - y2="609.5199" /> - <radialGradient - inkscape:collect="always" - xlink:href="#linearGradient5060" - id="radialGradient6154" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(2.746819,0,0,1.900281,-941.7278,-828.6181)" - cx="602.65948" - cy="488.07959" - fx="602.65948" - fy="488.07959" - r="117.14286" /> - <radialGradient - inkscape:collect="always" - xlink:href="#linearGradient5060" - id="radialGradient6156" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(-2.74682,0,0,1.900281,602.2346,-828.6181)" - cx="605.71429" - cy="486.64789" - fx="605.71429" - fy="486.64789" - r="117.14286" /> - <linearGradient - inkscape:collect="always" - xlink:href="#linearGradient6166" - id="linearGradient6172" - x1="21.213203" - y1="14.47671" - x2="30.598438" - y2="16.501608" - gradientUnits="userSpaceOnUse" - gradientTransform="translate(0,1)" /> - <linearGradient - inkscape:collect="always" - xlink:href="#linearGradient6166" - id="linearGradient6178" - gradientUnits="userSpaceOnUse" - gradientTransform="translate(0,1)" - x1="21.213203" - y1="14.47671" - x2="30.598438" - y2="16.501608" /> - </defs> - <sodipodi:namedview - id="base" - pagecolor="#ffffff" - bordercolor="#666666" - borderopacity="1.0" - inkscape:pageopacity="0.0" - inkscape:pageshadow="2" - inkscape:zoom="15.556349" - inkscape:cx="31.303969" - inkscape:cy="18.925734" - inkscape:current-layer="layer1" - showgrid="true" - inkscape:document-units="px" - inkscape:grid-bbox="true" - inkscape:window-width="947" - inkscape:window-height="907" - inkscape:window-x="10" - inkscape:window-y="26" - width="48px" - height="48px" /> - <metadata - id="metadata5873"> - <rdf:RDF> - <cc:Work - rdf:about=""> - <dc:format>image/svg+xml</dc:format> - <dc:type - rdf:resource="http://purl.org/dc/dcmitype/StillImage" /> - </cc:Work> - </rdf:RDF> - </metadata> - <g - id="layer1" - inkscape:label="Layer 1" - inkscape:groupmode="layer"> - <g - style="opacity:0.6157205;display:inline" - transform="matrix(1.754551e-2,0,0,1.733565e-2,27.478325,34.28602)" - id="g3197"> - <rect - style="opacity:0.40206185;color:#000000;fill:url(#linearGradient6152);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;stroke-linecap:round;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible" - id="rect3199" - width="1766.8337" - height="459.52847" - x="-1053.1652" - y="-131.86813" /> - <path - style="opacity:0.40200004;color:#000000;fill:url(#radialGradient6154);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;stroke-linecap:round;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible" - d="M 713.66862,-131.86814 C 713.66862,-131.86814 713.66862,329.60325 713.66862,329.60325 C 855.12298,330.47196 1055.6366,226.21092 1055.6365,98.837854 C 1055.6365,-28.535234 897.78402,-131.86813 713.66862,-131.86814 z " - id="path3201" - sodipodi:nodetypes="cccc" /> - <path - sodipodi:nodetypes="cccc" - id="path3203" - d="M -1053.1653,-131.86814 C -1053.1653,-131.86814 -1053.1653,329.60325 -1053.1653,329.60325 C -1194.6198,330.47196 -1395.1333,226.21093 -1395.1333,98.837855 C -1395.1333,-28.535231 -1237.2808,-131.86812 -1053.1653,-131.86814 z " - style="opacity:0.40200004;color:#000000;fill:url(#radialGradient6156);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;stroke-linecap:round;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible" /> - </g> - <rect - style="color:#000000;fill:url(#linearGradient6146);fill-opacity:1;fill-rule:evenodd;stroke:#555753;stroke-width:1.00000024px;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" - id="rect3056" - width="35.949223" - height="22.999994" - x="6.5000052" - y="13.500002" - rx="2.0101535" - ry="2.0101528" /> - <path - sodipodi:nodetypes="ccc" - id="path3090" - d="M 6.9384114,35.500015 L 24.069424,22.322619 L 41.959676,35.312354" - style="fill:none;fill-rule:evenodd;stroke:#888a85;stroke-width:1.00000083px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:0.40540538" /> - <path - style="color:#000000;fill:url(#linearGradient6142);fill-opacity:1;fill-rule:evenodd;stroke:#888a85;stroke-width:0.99999964px;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" - d="M 6.9384114,14.499997 L 23.090611,28.146213 C 23.656428,28.546486 24.278528,28.684233 25.045452,28.146453 L 41.959676,14.707768" - id="path3066" - sodipodi:nodetypes="cccc" /> - <rect - ry="0.9877466" - rx="0.9877466" - y="14.499983" - x="7.5000095" - height="20.999998" - width="34.000004" - id="rect3086" - style="color:#000000;fill:none;fill-opacity:1;fill-rule:evenodd;stroke:#ffffff;stroke-width:0.99999994px;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" /> - <path - sodipodi:nodetypes="cccc" - id="path3790" - d="M 8.5000066,14.382261 L 23.213307,27.032174 C 23.73031,27.407223 24.026015,27.53629 24.726777,27.032398 L 40.499998,14.576939" - style="color:#000000;fill:none;fill-opacity:1;fill-rule:evenodd;stroke:#ffffff;stroke-width:0.99999994px;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" /> - <g - id="g6174" - transform="translate(13,20)"> - <path - sodipodi:nodetypes="cccccccccc" - id="rect6158" - d="M 20.398189,6.496401 C 19.899589,6.496401 19.498189,6.897801 19.498189,7.396401 L 19.498189,14.483907 L 16.174966,14.5 L 23.46875,21.307153 L 30.857176,14.5 L 27.509846,14.483907 L 27.509846,7.396401 C 27.509846,6.897801 27.108446,6.496401 26.609846,6.496401 L 20.398189,6.496401 z " - style="opacity:1;color:#000000;fill:url(#linearGradient6178);fill-opacity:1;fill-rule:nonzero;stroke:#4e9a06;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" /> - <path - style="opacity:0.5414847;color:#000000;fill:none;fill-opacity:1;fill-rule:nonzero;stroke:#ffffff;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" - d="M 20.988352,7.4999998 C 20.553569,7.4999998 20.492815,7.5263842 20.492815,7.9584005 L 20.492815,15.481505 L 18.6777,15.495448 L 23.473063,19.985741 L 28.322928,15.495448 L 26.514819,15.481505 L 26.514819,7.9905417 C 26.514819,7.5585254 26.421924,7.4999998 25.98714,7.4999998 L 20.988352,7.4999998 z " - id="path6164" - sodipodi:nodetypes="cccccccccc" /> - </g> - </g> -</svg> ===================================== gajim/gtk/notification.py ===================================== @@ -123,10 +123,8 @@ class Notification: @staticmethod def _get_icon_name(obj): if obj.notif_type == 'msg': - if obj.base_event.mtype == 'pm': + if obj.base_event.properties.is_muc_pm: return 'gajim-priv_msg_recv' - if obj.base_event.mtype == 'normal': - return 'gajim-single_msg_recv' elif obj.notif_type == 'pres': if obj.transport_name is not None: @@ -167,7 +165,7 @@ class Notification: notif_id = None if event_type in ( _('Contact Signed In'), _('Contact Signed Out'), - _('New Message'), _('New Single Message'), _('New Private Message'), + _('New Message'), _('New Private Message'), _('New Group Chat Message'), _('Contact Changed Status'), _('File Transfer Request'), _('File Transfer Error'), _('File Transfer Completed'), @@ -197,7 +195,6 @@ class Notification: elif event_type == _('Connection Failed'): notif_id = self._make_id('connection-failed', account) elif event_type in (_('New Message'), - _('New Single Message'), _('New Private Message'), _('New Group Chat Message')): if app.desktop_env == 'gnome': @@ -268,7 +265,7 @@ class PopupNotification(Gtk.Window): bg_color = app.config.get('notif_signin_color') elif event_type == _('Contact Signed Out'): bg_color = app.config.get('notif_signout_color') - elif event_type in (_('New Message'), _('New Single Message'), + elif event_type in (_('New Message'), _('New Private Message'), _('New E-mail')): bg_color = app.config.get('notif_message_color') elif event_type == _('File Transfer Request'): ===================================== gajim/gui_interface.py ===================================== @@ -1238,7 +1238,7 @@ class Interface: ctrl = self.new_private_chat(gc_contact, account) w = ctrl.parent_win - elif type_ in ('normal', 'file-request', 'file-request-error', + elif type_ in ('file-request', 'file-request-error', 'file-send-error', 'file-error', 'file-stopped', 'file-completed', 'file-hash-error', 'jingle-incoming'): # Get the first single message event @@ -2076,17 +2076,7 @@ class Interface: if app.config.get_per('accounts', account, 'is_zeroconf'): app.ZEROCONF_ACC_NAME = account break - # Is gnome configured to activate row on single click ? -# try: -# gi.require_version('GConf', '2.0') -# from gi.repository import GConf -# client = GConf.Client.get_default() -# click_policy = client.get_string( -# '/apps/nautilus/preferences/click_policy') -# if click_policy == 'single': -# app.single_click = True -# except Exception: -# pass + # add default status messages if there is not in the config file if not app.config.get_per('statusmsg'): default = app.config.statusmsg_default ===================================== gajim/remote_control.py ===================================== @@ -373,9 +373,12 @@ class GajimRemote(Server): obj.displaymarking, obj.needs_highlight])) def _nec_decrypted_message_received(self, obj): + event_type = obj.properties.type.value + if obj.properties.is_muc_pm: + event_type = 'pm' self.raise_signal('NewMessage', ( obj.conn.name, [obj.fjid, obj.msgtxt, obj.timestamp, - obj.encrypted, obj.mtype, obj.subject, + obj.encrypted, event_type, obj.subject, obj.msg_log_id, obj.user_nick, obj.xhtml])) def on_our_status(self, obj): ===================================== gajim/roster_window.py ===================================== @@ -2652,23 +2652,17 @@ class RosterWindow: def _nec_decrypted_message_received(self, obj): if not obj.msgtxt: return True - if obj.mtype not in ('normal', 'chat'): - return - if obj.mtype == 'normal' and obj.popup: - # it's single message to be autopopuped - SingleMessageWindow(obj.conn.name, obj.jid, - action='receive', from_whom=obj.jid, subject=obj.subject, - message=obj.msgtxt, resource=obj.resource, session=obj.session) + if obj.properties.type.value not in ('normal', 'chat'): return - if obj.popup and obj.mtype == 'chat' and not obj.session.control: + if obj.popup and not obj.session.control: contact = app.contacts.get_contact(obj.conn.name, obj.jid) obj.session.control = app.interface.new_chat(contact, obj.conn.name, session=obj.session) if app.events.get_events(obj.conn.name, obj.fjid): obj.session.control.read_queue() - if obj.show_in_roster: + if not obj.properties.is_muc_pm and obj.show_in_roster: self.draw_contact(obj.jid, obj.conn.name) self.show_title() # we show the * or [n] # Select the big brother contact in roster, it's visible because it @@ -3143,20 +3137,6 @@ class RosterWindow: self.tree.expand_row(path, False) return True - def on_roster_treeview_button_release_event(self, widget, event): - try: - path = self.tree.get_path_at_pos(int(event.x), int(event.y))[0] - except TypeError: - return False - - if event.button == 1: # Left click - if app.single_click and not event.get_state() & Gdk.ModifierType.SHIFT_MASK and \ - not event.get_state() & Gdk.ModifierType.CONTROL_MASK: - # Check if button has been pressed on the same row - if self.clicked_path == path: - self.on_row_activated(widget, path) - self.clicked_path = None - def accel_group_func(self, accel_group, acceleratable, keyval, modifier): # CTRL mask if modifier & Gdk.ModifierType.CONTROL_MASK: @@ -3241,23 +3221,6 @@ class RosterWindow: x_min = AvatarSize.ROSTER else: x_min = 0 - if (app.single_click and - not event.get_state() & Gdk.ModifierType.SHIFT_MASK and - not event.get_state() & Gdk.ModifierType.CONTROL_MASK): - # Don't handle double click if we press icon of a metacontact - titer = model.get_iter(path) - if x_min < x < x_min + 27 and type_ == 'contact' and \ - model.iter_has_child(titer): - if self.tree.row_expanded(path): - self.tree.collapse_row(path) - else: - self.tree.expand_row(path, False) - return - # We just save on which row we press button, and open chat - # window on button release to be able to do DND without opening - # chat window - self.clicked_path = path - return if type_ == 'group' and x < 27: # first cell in 1st column (the arrow SINGLE clicked) @@ -3686,8 +3649,7 @@ class RosterWindow: """ When an iter is double clicked: open the first event window """ - if not app.single_click: - self.on_row_activated(widget, path) + self.on_row_activated(widget, path) def on_roster_treeview_row_expanded(self, widget, titer, path): """ ===================================== gajim/session.py ===================================== @@ -28,7 +28,6 @@ from gajim.common import contacts from gajim.common import ged from gajim.common.helpers import AdditionalDataDict from gajim.common.const import KindConstant -from gajim.gtk.single_message import SingleMessageWindow from gajim.gtk.util import get_show_in_roster from gajim.gtk.util import get_show_in_systray @@ -83,7 +82,7 @@ class ChatControlSession: if obj.session != self: return - if obj.muc_pm: + if obj.properties.is_muc_pm: contact = app.contacts.get_gc_contact( self.conn.name, obj.jid, obj.resource) else: @@ -100,26 +99,12 @@ class ChatControlSession: if self.control.resource: self.control.change_resource(self.resource) - if obj.mtype == 'chat': - if not obj.msgtxt: - return + if not obj.msgtxt: + return - log_type = KindConstant.CHAT_MSG_RECV - if obj.forwarded and obj.sent: - log_type = KindConstant.CHAT_MSG_SENT - else: - log_type = KindConstant.SINGLE_MSG_RECV - if obj.forwarded and obj.sent: - log_type = KindConstant.SINGLE_MSG_SENT - - treat_as = app.config.get('treat_incoming_messages') - if treat_as: - obj.mtype = treat_as - pm = False - if obj.muc_pm or (obj.gc_control and obj.resource): - # It's a Private message - pm = True - obj.mtype = 'pm' + log_type = KindConstant.CHAT_MSG_RECV + if obj.forwarded and obj.sent: + log_type = KindConstant.CHAT_MSG_SENT if self.is_loggable() and obj.msgtxt: if obj.xhtml and app.config.get('log_xhtml_messages'): @@ -128,7 +113,7 @@ class ChatControlSession: msg_to_log = obj.msgtxt jid = obj.fjid - if not pm: + if not obj.properties.is_muc_pm: jid = obj.jid obj.msg_log_id = app.logger.insert_into_logs( @@ -139,7 +124,7 @@ class ChatControlSession: stanza_id=obj.unique_id, message_id=obj.message_id) - if obj.muc_pm and not obj.gc_control: + if obj.properties.is_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 @@ -159,7 +144,7 @@ class ChatControlSession: else: self.control.contact = contact - if not pm: + if not obj.properties.is_muc_pm: self.roster_message2(obj) def roster_message2(self, obj): @@ -216,11 +201,7 @@ class ChatControlSession: event_t = events.ChatEvent event_type = 'message_received' - if obj.mtype == 'normal': - event_t = events.NormalEvent - event_type = 'single_message_received' - - if self.control and obj.mtype != 'normal': + if self.control: # We have a ChatControl open obj.show_in_roster = False obj.show_in_systray = False @@ -241,12 +222,10 @@ class ChatControlSession: # Everything else obj.show_in_roster = get_show_in_roster(event_type, self) obj.show_in_systray = get_show_in_systray(event_type, contact.jid) - if obj.mtype == 'normal' and obj.popup: - do_event = False - else: - do_event = True + do_event = True if do_event: - event = event_t(obj.msgtxt, obj.subject, obj.mtype, obj.timestamp, + kind = obj.properties.type.value + event = event_t(obj.msgtxt, obj.subject, kind, obj.timestamp, obj.encrypted, obj.resource, obj.msg_log_id, correct_id=obj.correct_id, message_id=obj.message_id, @@ -317,14 +296,8 @@ class ChatControlSession: popup = helpers.allow_popup_window(self.conn.name) - if msg_type == 'normal' and popup: # it's single message to be autopopuped - SingleMessageWindow(self.conn.name, contact.jid, - action='receive', from_whom=jid, subject=subject, message=msg, - resource=resource, session=self) - return - # We print if window is opened and it's not a single message - if self.control and msg_type != 'normal': + if self.control: typ = '' if msg_type == 'error': @@ -343,10 +316,6 @@ class ChatControlSession: event_t = events.ChatEvent event_type = 'message_received' - if msg_type == 'normal': - event_t = events.NormalEvent - event_type = 'single_message_received' - show_in_roster = get_show_in_roster(event_type, self) show_in_systray = get_show_in_systray(event_type, contact.jid) View it on GitLab: https://dev.gajim.org/gajim/gajim/compare/cf55edfc4219f6eb07cfc9efa1e08b3e8… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/compare/cf55edfc4219f6eb07cfc9efa1e08b3e8… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] Windows: Upgrade build to python 3.8
by Philipp Hörist 27 Oct '19

27 Oct '19

Philipp Hörist pushed to branch master at gajim / gajim Commits: cf55edfc by Philipp Hörist at 2019-10-27T20:20:23Z Windows: Upgrade build to python 3.8 - - - - - 1 changed file: - win/_base.sh Changes: ===================================== win/_base.sh ===================================== @@ -11,13 +11,15 @@ DIR="$( cd "$( dirname "$0" )" && pwd )" cd "${DIR}" # CONFIG START -PYTHON_VERSION="3" +MAJOR_PY_VERSION="3" +MINOR_PY_VERSION="8" +PYTHON_VERSION="${MAJOR_PY_VERSION}.${MINOR_PY_VERSION}" BUILD_VERSION="0" # CONFIG END MISC="${DIR}"/misc -PYTHON_ID="python${PYTHON_VERSION}" +PYTHON_ID="python${MAJOR_PY_VERSION}" MINGW="mingw32" QL_VERSION="0.0.0" @@ -34,7 +36,7 @@ function set_build_root { BUILD_ROOT="${DIR}/_build_root" REPO_CLONE="${BUILD_ROOT}/${MINGW}"/gajim MINGW_ROOT="${BUILD_ROOT}/${MINGW}" - PACKAGE_DIR="${BUILD_ROOT}/${MINGW}/lib/python3.7/site-packages" + PACKAGE_DIR="${BUILD_ROOT}/${MINGW}/lib/python${PYTHON_VERSION}/site-packages" } function build_pacman { @@ -55,7 +57,8 @@ function build_compileall { function install_pre_deps { pacman -S --needed --noconfirm p7zip \ - mingw-w64-"${ARCH}"-nsis wget intltool mingw-w64-"${ARCH}"-toolchain + mingw-w64-"${ARCH}"-nsis wget intltool mingw-w64-"${ARCH}"-toolchain \ + mingw-w64-"${ARCH}"-"${PYTHON_ID}" } function create_root { View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/cf55edfc4219f6eb07cfc9efa1e08b3e84… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/cf55edfc4219f6eb07cfc9efa1e08b3e84… 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