Commits

commits@gajim.org

17632 discussions

[Git][gajim/gajim][master] 2 commits: WindowsBuild: Install Gajim as a python package
by Philipp Hörist 19 Aug '17

19 Aug '17

Philipp Hörist pushed to branch master at gajim / gajim Commits: 94324625 by Philipp Hörist at 2017-08-19T02:12:11+02:00 WindowsBuild: Install Gajim as a python package - - - - - ca0a4c98 by Philipp Hörist at 2017-08-19T02:15:06+02:00 Merge branch 'master' into 'master' WindowsBuild: Install Gajim as a python package See merge request !118 - - - - - 3 changed files: - win/_base.sh - win/misc/create-launcher.py - win/misc/gajim-portable.nsi Changes: ===================================== win/_base.sh ===================================== --- a/win/_base.sh +++ b/win/_base.sh @@ -29,6 +29,7 @@ function set_build_root { BUILD_ROOT="$1" REPO_CLONE="${BUILD_ROOT}/${MINGW}"/gajim MINGW_ROOT="${BUILD_ROOT}/${MINGW}" + PACKAGE_DIR="${BUILD_ROOT}/${MINGW}/lib/python3.6/site-packages" } set_build_root "${DIR}/_build_root" @@ -120,8 +121,10 @@ pillow function install_gajim { [ -z "$1" ] && (echo "Missing arg"; exit 1) + rm -Rf "${PACKAGE_DIR}/gajim" rm -Rf "${REPO_CLONE}" git clone "${DIR}"/.. "${REPO_CLONE}" + mv "${REPO_CLONE}/gajim" "${PACKAGE_DIR}" (cd "${REPO_CLONE}" && git checkout "$1") || exit 1 @@ -186,6 +189,7 @@ function cleanup_install { -exec rm -f {} \; rm -Rf "${REPO_CLONE}"/.git + rm -Rf "${REPO_CLONE}"/.gitlab-ci.yml rm -Rf "${REPO_CLONE}"/debian rm -Rf "${REPO_CLONE}"/doc rm -Rf "${REPO_CLONE}"/m4 @@ -313,7 +317,7 @@ function cleanup_install { find "${MINGW_ROOT}"/bin -name "*.pyo" -exec rm -f {} \; find "${MINGW_ROOT}"/bin -name "*.pyc" -exec rm -f {} \; build_compileall -q "${MINGW_ROOT}" - find "${MINGW_ROOT}" -name "*.py" ! -name "gajim.py" ! -name "history_manager.py" ! -name "*theme.py" -exec rm -f {} \; + find "${MINGW_ROOT}" -name "*.py" ! -name "*theme.py" -exec rm -f {} \; find "${MINGW_ROOT}"/bin -name "*.pyc" -exec rm -f {} \; find "${MINGW_ROOT}" -type d -name "__pycache__" -prune -exec rm -rf {} \; ===================================== win/misc/create-launcher.py ===================================== --- a/win/misc/create-launcher.py +++ b/win/misc/create-launcher.py @@ -58,7 +58,7 @@ def build_exe(source_path, resource_path, is_gui, out_path): subprocess.check_call(args) -def get_launcher_code(entry_point): +def get_launcher_code(): template = """\ #include "Python.h" #define WIN32_LEAN_AND_MEAN @@ -87,19 +87,17 @@ int WINAPI WinMain(HINSTANCE hInstance, HINSTANCE hPrevInstance, Py_FrozenFlag = 1; Py_Initialize(); PySys_SetArgvEx(__argc, szArglist, 0); - FILE* file = fopen("../gajim/gajim/%(filename)s", "r"); - PyRun_SimpleString("import sys; import os;" - "os.chdir('../gajim/gajim');" - "sys.path.append(os.getcwd());" - "sys.frozen=True;" - ); - result = PyRun_SimpleFile(file, "../gajim/gajim/%(filename)s"); + result = PyRun_SimpleString("import sys; import os;" + "sys.frozen=True;" + "os.chdir('../gajim');" + "import gajim.gajim as g;" + "g.GajimApplication().run(sys.argv);"); Py_Finalize(); return result; } """ - return template % {"filename": entry_point} + return template def get_resouce_code(filename, file_version, file_desc, icon_path, @@ -150,7 +148,7 @@ END def build_launcher(out_path, icon_path, file_desc, product_name, product_version, - company_name, entry_point, is_gui): + company_name, is_gui): src_ico = os.path.abspath(icon_path) target = os.path.abspath(out_path) @@ -162,7 +160,7 @@ def build_launcher(out_path, icon_path, file_desc, product_name, product_version try: os.chdir(temp) with open("launcher.c", "w") as h: - h.write(get_launcher_code(entry_point)) + h.write(get_launcher_code()) shutil.copyfile(src_ico, "launcher.ico") with open("launcher.rc", "w") as h: h.write(get_resouce_code( @@ -188,17 +186,17 @@ def main(): build_launcher( os.path.join(target, "Gajim.exe"), os.path.join(misc, "gajim.ico"), "Gajim", "Gajim", - version, company_name, 'gajim.py', True) + version, company_name, True) build_launcher( os.path.join(target, "Gajim-Debug.exe"), os.path.join(misc, "gajim.ico"), "Gajim", "Gajim", - version, company_name, 'gajim.py', False) + version, company_name, False) - build_launcher( - os.path.join(target, "history_manager.exe"), - os.path.join(misc, "gajim.ico"), "History Manager", "History Manager", - version, company_name, 'history_manager.py', True) + # build_launcher( + # os.path.join(target, "history_manager.exe"), + # os.path.join(misc, "gajim.ico"), "History Manager", "History Manager", + # version, company_name, 'history_manager.py', True) if __name__ == "__main__": main() ===================================== win/misc/gajim-portable.nsi ===================================== --- a/win/misc/gajim-portable.nsi +++ b/win/misc/gajim-portable.nsi @@ -105,9 +105,9 @@ Section "Gajim" SecGajim SetOutPath "$INSTDIR\bin" CreateShortCut "$INSTDIR\Gajim-Portable.lnk" "$INSTDIR\bin\Gajim.exe" \ - "-c ..\..\UserData" "" "" SW_SHOWNORMAL "" "Gajim Portable" + "-c ..\UserData" "" "" SW_SHOWNORMAL "" "Gajim Portable" CreateShortCut "$INSTDIR\Gajim-Portable-Debug.lnk" "$INSTDIR\bin\Gajim-Debug.exe" \ - "-c ..\..\UserData" "" "" SW_SHOWNORMAL "" "Gajim Portable Debug" + "-c ..\UserData" "" "" SW_SHOWNORMAL "" "Gajim Portable Debug" SectionEnd View it on GitLab: https://dev.gajim.org/gajim/gajim/compare/c4383c16c613f59c2672c1d8c9f0649ec… --- View it on GitLab: https://dev.gajim.org/gajim/gajim/compare/c4383c16c613f59c2672c1d8c9f0649ec… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] Use correct account when opening history window
by Yann Leboulanger 18 Aug '17

18 Aug '17

Yann Leboulanger pushed to branch master at gajim / gajim Commits: c4383c16 by Yann Leboulanger at 2017-08-18T22:05:48+02:00 Use correct account when opening history window - - - - - 1 changed file: - gajim/history_window.py Changes: ===================================== gajim/history_window.py ===================================== --- a/gajim/history_window.py +++ b/gajim/history_window.py @@ -116,7 +116,7 @@ class HistoryWindow: col.set_resizable(True) self.jid = None # The history we are currently viewing - self.account = None + self.account = account self.completion_dict = {} self.accounts_seen_online = [] # Update dict when new accounts connect self.jids_to_search = [] @@ -259,8 +259,7 @@ class HistoryWindow: def on_jid_entry_activate(self, widget): jid = self.jid_entry.get_text() - account = None # we don't know the account, could be any. Search for it! - self._load_history(jid, account) + self._load_history(jid, self.account) self.results_window.set_property('visible', False) def on_jid_entry_focus(self, widget, event): View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/c4383c16c613f59c2672c1d8c9f0649ec9… --- View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/c4383c16c613f59c2672c1d8c9f0649ec9… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] fix some Q_() call
by Yann Leboulanger 18 Aug '17

18 Aug '17

Yann Leboulanger pushed to branch master at gajim / gajim Commits: 9bafd769 by Yann Leboulanger at 2017-08-18T22:05:16+02:00 fix some Q_() call - - - - - 2 changed files: - gajim/message_window.py - gajim/tooltips.py Changes: ===================================== gajim/message_window.py ===================================== --- a/gajim/message_window.py +++ b/gajim/message_window.py @@ -43,6 +43,7 @@ from gajim.chat_control import ChatControl from gajim.common import app from gajim.gtkgui_helpers import get_action +from gajim.common.i18n import Q_ #################### @@ -527,7 +528,7 @@ class MessageWindow(object): if window_mode == MessageWindowMgr.ONE_MSG_WINDOW_PERTYPE: # Show the plural form since number of tabs > 1 if self.type_ == 'chat': - label = _('?Noun:Chats') + label = Q_('?Noun:Chats') elif self.type_ == 'gc': label = _('Groupchats') else: ===================================== gajim/tooltips.py ===================================== --- a/gajim/tooltips.py +++ b/gajim/tooltips.py @@ -776,13 +776,13 @@ class FileTransfersTooltip(BaseTooltip): file_name = file_props.name properties.append((_('Name: '), GLib.markup_escape_text(file_name))) if file_props.type_ == 'r': - type_ = _('?Noun:Download') + type_ = Q_('?Noun:Download') actor = _('Sender: ') sender = file_props.sender.split('/')[0] name = app.contacts.get_first_contact_from_jid( file_props.tt_account, sender).get_shown_name() else: - type_ = _('?Noun:Upload') + type_ = Q_('?Noun:Upload') actor = _('Recipient: ') receiver = file_props.receiver if hasattr(receiver, 'name'): @@ -808,7 +808,7 @@ class FileTransfersTooltip(BaseTooltip): status = _('Completed') else: if file_props.paused == True: - status = _('?transfer status:Paused') + status = Q_('?transfer status:Paused') elif file_props.stalled == True: #stalled is not paused. it is like 'frozen' it stopped alone status = _('Stalled') View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/9bafd7698b4e4b3b26a5d4806d9604019f… --- View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/9bafd7698b4e4b3b26a5d4806d9604019f… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] 13 commits: Use absolute imports
by Philipp Hörist 18 Aug '17

18 Aug '17

Philipp Hörist pushed to branch master at gajim / gajim Commits: efec098a by André Apitzsch at 2017-08-18T19:48:48+02:00 Use absolute imports - - - - - f7e83af2 by André Apitzsch at 2017-08-18T19:48:48+02:00 GajimRemote: Fix invalid filename - - - - - 230739bb by André Apitzsch at 2017-08-18T19:48:48+02:00 Rewrite launch script - - - - - 3b800578 by André Apitzsch at 2017-08-18T19:48:48+02:00 Update bin scripts - - - - - 47c83311 by André Apitzsch at 2017-08-18T19:48:48+02:00 Always install in python3.x/site-packages - - - - - b11b7a4a by André Apitzsch at 2017-08-18T19:48:48+02:00 Check for root only on unix systems - - - - - 675ebe54 by André Apitzsch at 2017-08-18T19:48:48+02:00 Up Gajim version to 0.16.11 - - - - - 67401204 by André Apitzsch at 2017-08-18T19:48:48+02:00 Mark gajim as a python package - - - - - ab041963 by André Apitzsch at 2017-08-18T19:48:48+02:00 Fix start of history manager from gajim - - - - - 6d1c659b by André Apitzsch at 2017-08-18T19:48:48+02:00 Expand Python module search path to work around the issue that the gajim module cannot be found - - - - - 56d002ce by André Apitzsch at 2017-08-18T19:48:48+02:00 Fix test imports - - - - - 89c7eb6e by André Apitzsch at 2017-08-18T20:03:20+02:00 Rename gajim.common.gajim to avoid name conflicts - - - - - 4ffc1cf8 by Philipp Hörist at 2017-08-18T21:38:41+02:00 Merge branch 'absolute_imports' into 'master' Make gajim a python module See merge request !106 - - - - - 23 changed files: - Makefile.am - configure.ac - + gajim/__init__.py - gajim/adhoc_commands.py - gajim/advanced_configuration_window.py - gajim/app_actions.py - gajim/atom_window.py - gajim/chat_control.py - gajim/chat_control_base.py - gajim/command_system/dispatcher.py - gajim/command_system/framework.py - gajim/command_system/implementation/custom.py - gajim/command_system/implementation/execute.py - gajim/command_system/implementation/hosts.py - gajim/command_system/implementation/middleware.py - gajim/command_system/implementation/standard.py - gajim/command_system/mapping.py - gajim/common/gajim.py → gajim/common/app.py - gajim/common/check_X509.py - gajim/common/check_paths.py - gajim/common/commands.py - gajim/common/config.py - gajim/common/configpaths.py The diff was not included because it is too large. View it on GitLab: https://dev.gajim.org/gajim/gajim/compare/10f8fe2bb5f9cf1899cf9b35e5a1ef4a3… --- View it on GitLab: https://dev.gajim.org/gajim/gajim/compare/10f8fe2bb5f9cf1899cf9b35e5a1ef4a3… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] Use unique id as action name instead of jid
by Philipp Hörist 18 Aug '17

18 Aug '17

Philipp Hörist pushed to branch master at gajim / gajim Commits: 10f8fe2b by Philipp Hörist at 2017-08-18T18:58:07+02:00 Use unique id as action name instead of jid A jid can contain characters that are not allowed in an action name. This creates a unique UUID4 for each MessageControl and uses it as action name instead. We can reuse the UUID for other actions that belong to the MessageControl Fixes #8636 - - - - - 5 changed files: - gajim/chat_control.py - gajim/chat_control_base.py - gajim/groupchat_control.py - gajim/gui_menu_builder.py - gajim/message_control.py Changes: ===================================== gajim/chat_control.py ===================================== --- a/gajim/chat_control.py +++ b/gajim/chat_control.py @@ -288,7 +288,7 @@ class ChatControl(ChatControlBase): self.encryption_menu = self.xml.get_object('encryption_menu') self.encryption_menu.set_menu_model( - gui_menu_builder.get_encryption_menu(self.contact, self.type_id)) + gui_menu_builder.get_encryption_menu(self.control_id, self.type_id)) self.set_encryption_menu_icon() # restore previous conversation self.restore_conversation() ===================================== gajim/chat_control_base.py ===================================== --- a/gajim/chat_control_base.py +++ b/gajim/chat_control_base.py @@ -416,7 +416,7 @@ class ChatControlBase(MessageControl, ChatCommandProcessor, CommandTools): def add_window_actions(self): action = Gio.SimpleAction.new_stateful( - "%s-encryptiongroup" % self.contact.jid, + "set-encryption-%s" % self.control_id, GLib.VariantType.new("s"), GLib.Variant("s", self.encryption or 'disabled')) action.connect("change-state", self.change_encryption) ===================================== gajim/groupchat_control.py ===================================== --- a/gajim/groupchat_control.py +++ b/gajim/groupchat_control.py @@ -495,7 +495,7 @@ class GroupchatControl(ChatControlBase): self.encryption_menu = self.xml.get_object('encryption_menu') self.encryption_menu.set_menu_model( - gui_menu_builder.get_encryption_menu(self.contact, self.type_id)) + gui_menu_builder.get_encryption_menu(self.control_id, self.type_id)) self.set_encryption_menu_icon() gajim.ged.register_event_handler('gc-presence-received', ged.GUI1, ===================================== gajim/gui_menu_builder.py ===================================== --- a/gajim/gui_menu_builder.py +++ b/gajim/gui_menu_builder.py @@ -752,11 +752,10 @@ def build_bookmark_menu(account): menu.insert_submenu(1, label, bookmark_menu) -def get_encryption_menu(contact, type_id): +def get_encryption_menu(control_id, type_id): menu = Gio.Menu() menu.append( - 'Disabled', 'win.{}-encryptiongroup::{}'.format(contact.jid, - 'disabled')) + 'Disabled', 'win.set-encryption-{}::{}'.format(control_id, 'disabled')) for name, plugin in gajim.plugin_manager.encryption_plugins.items(): if type_id == 'gc': if not hasattr(plugin, 'allow_groupchat'): @@ -764,8 +763,8 @@ def get_encryption_menu(contact, type_id): if type_id == 'pm': if not hasattr(plugin, 'allow_privatchat'): continue - menu_action = 'win.{}-encryptiongroup::{}'.format( - contact.jid, name) + menu_action = 'win.set-encryption-{}::{}'.format( + control_id, name) menu.append(name, menu_action) if menu.get_n_items() == 1: return None ===================================== gajim/message_control.py ===================================== --- a/gajim/message_control.py +++ b/gajim/message_control.py @@ -27,6 +27,7 @@ ## import gtkgui_helpers +import uuid from common import gajim from common import helpers @@ -58,7 +59,9 @@ class MessageControl(object): self.account = account self.hide_chat_buttons = False self.resource = resource - + # control_id is a unique id for the control, + # its used as action name for actions that belong to a control + self.control_id = str(uuid.uuid4()) self.session = None gajim.last_message_time[self.account][self.get_full_jid()] = 0 View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/10f8fe2bb5f9cf1899cf9b35e5a1ef4a33… --- View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/10f8fe2bb5f9cf1899cf9b35e5a1ef4a33… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] Print error on unhandled commandline arguments
by Philipp Hörist 18 Aug '17

18 Aug '17

Philipp Hörist pushed to branch master at gajim / gajim Commits: d20f2201 by Philipp Hörist at 2017-08-18T17:48:03+02:00 Print error on unhandled commandline arguments - - - - - 1 changed file: - gajim/gajim.py Changes: ===================================== gajim/gajim.py ===================================== --- a/gajim/gajim.py +++ b/gajim/gajim.py @@ -97,6 +97,9 @@ class GajimApplication(Gtk.Application): self.add_main_option('warnings', ord('w'), GLib.OptionFlags.NONE, GLib.OptionArg.NONE, _('Show all warnings')) + self.add_main_option(GLib.OPTION_REMAINING, 0, GLib.OptionFlags.HIDDEN, + GLib.OptionArg.STRING_ARRAY, + "") self.profile = '' self.config_path = None @@ -292,6 +295,10 @@ class GajimApplication(Gtk.Application): logging_helpers.set_loglevels(loglevel) if options.contains('warnings'): self.show_warnings() + if options.contains(GLib.OPTION_REMAINING): + unhandled = options.lookup_value(GLib.OPTION_REMAINING).get_strv() + print('Error: Unhandled arguments: %s' % unhandled) + return 0 return -1 def do_command_line(self, command_line: Gio.ApplicationCommandLine) -> int: View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/d20f2201f2c020cf092f41d29a9c664503… --- View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/d20f2201f2c020cf092f41d29a9c664503… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] remove call to old XEP-0136 function
by Yann Leboulanger 17 Aug '17

17 Aug '17

Yann Leboulanger pushed to branch master at gajim / gajim Commits: 43fbcbf8 by Yann Leboulanger at 2017-08-17T22:18:35+02:00 remove call to old XEP-0136 function - - - - - 1 changed file: - gajim/common/stanza_session.py Changes: ===================================== gajim/common/stanza_session.py ===================================== --- a/gajim/common/stanza_session.py +++ b/gajim/common/stanza_session.py @@ -292,9 +292,6 @@ class ArchivingStanzaSession(StanzaSession): if self.control: self.control.print_archiving_session_details() - def stop_archiving_for_session(self): - self.conn.stop_archiving_session(self.thread_id) - class EncryptedStanzaSession(ArchivingStanzaSession): """ @@ -1063,8 +1060,6 @@ class EncryptedStanzaSession(ArchivingStanzaSession): if self.control: self.control.print_esession_details() - self.stop_archiving_for_session() - def final_steps_alice(self, form): srs = b'' srses = secrets.secrets().retained_secrets(self.conn.name, @@ -1105,8 +1100,6 @@ class EncryptedStanzaSession(ArchivingStanzaSession): if self.control: self.control.print_esession_details() - self.stop_archiving_for_session() - def do_retained_secret(self, k, old_srs): """ Calculate the new retained secret. determine if the user needs to check View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/43fbcbf8cff9c2e0194208e01c8fb2393e… --- View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/43fbcbf8cff9c2e0194208e01c8fb2393e… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] fix error when someone changes nick ina room
by Yann Leboulanger 17 Aug '17

17 Aug '17

Yann Leboulanger pushed to branch master at gajim / gajim Commits: a47bb9f0 by Yann Leboulanger at 2017-08-17T21:40:00+02:00 fix error when someone changes nick ina room - - - - - 1 changed file: - gajim/groupchat_control.py Changes: ===================================== gajim/groupchat_control.py ===================================== --- a/gajim/groupchat_control.py +++ b/gajim/groupchat_control.py @@ -1722,10 +1722,10 @@ class GroupchatControl(ChatControlBase): s = _('%(nick)s is now known as %(new_nick)s') % { 'nick': nick, 'new_nick': obj.new_nick} tv = self.conv_textview - if obj.nick in tv.last_received_message_marks: - tv.last_received_message_marks[obj.new_nick] = \ - tv.last_received_message_marks[obj.nick] - del tv.last_received_message_marks[obj.nick] + if obj.nick in tv.last_received_message_id: + tv.last_received_message_id[obj.new_nick] = \ + tv.last_received_message_id[obj.nick] + del tv.last_received_message_id[obj.nick] if obj.nick in self.last_received_txt: self.last_received_txt[obj.new_nick] = \ self.last_received_txt[obj.nick] View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/a47bb9f03c224cb8ea038ba58c75f9f066… --- View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/a47bb9f03c224cb8ea038ba58c75f9f066… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] add missing config options to save pm position and size
by Yann Leboulanger 17 Aug '17

17 Aug '17

Yann Leboulanger pushed to branch master at gajim / gajim Commits: cfbf45cd by Yann Leboulanger at 2017-08-17T15:03:40+02:00 add missing config options to save pm position and size - - - - - 2 changed files: - gajim/common/config.py - gajim/message_window.py Changes: ===================================== gajim/common/config.py ===================================== --- a/gajim/common/config.py +++ b/gajim/common/config.py @@ -153,6 +153,10 @@ class Config: 'gc-msgwin-y-position': [opt_int, -1], # Default is to let the window manager decide 'gc-msgwin-width': [opt_int, 600], 'gc-msgwin-height': [opt_int, 440], + 'pm-msgwin-x-position': [opt_int, -1], # Default is to let the window manager decide + 'pm-msgwin-y-position': [opt_int, -1], # Default is to let the window manager decide + 'pm-msgwin-width': [opt_int, 480], + 'pm-msgwin-height': [opt_int, 440], 'single-msg-x-position': [opt_int, 0], 'single-msg-y-position': [opt_int, 0], 'single-msg-width': [opt_int, 400], ===================================== gajim/message_window.py ===================================== --- a/gajim/message_window.py +++ b/gajim/message_window.py @@ -1019,8 +1019,6 @@ class MessageWindowMgr(GObject.GObject): size = (gajim.config.get_per('accounts', acct, 'msgwin-width'), gajim.config.get_per('accounts', acct, 'msgwin-height')) elif self.mode in (self.ONE_MSG_WINDOW_NEVER, self.ONE_MSG_WINDOW_PERTYPE): - if type_ == message_control.TYPE_PM: - type_ = message_control.TYPE_CHAT opt_width = type_ + '-msgwin-width' opt_height = type_ + '-msgwin-height' size = (gajim.config.get(opt_width), gajim.config.get(opt_height)) View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/cfbf45cdf7fddf3f73075efa59f2a091d1… --- View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/cfbf45cdf7fddf3f73075efa59f2a091d1… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] 2 commits: Forget all unused streamhosts when we use one of our proposed streamhosts
by Yann Leboulanger 16 Aug '17

16 Aug '17

Yann Leboulanger pushed to branch master at gajim / gajim Commits: 09bcbc0c by Yann Leboulanger at 2017-08-16T23:05:43+02:00 Forget all unused streamhosts when we use one of our proposed streamhosts - - - - - 2bb5ad7b by Yann Leboulanger at 2017-08-16T23:06:05+02:00 fix DnD of files on roster - - - - - 4 changed files: - gajim/common/helpers.py - gajim/common/jingle_ftstates.py - gajim/common/socks5.py - gajim/filetransfers_window.py Changes: ===================================== gajim/common/helpers.py ===================================== --- a/gajim/common/helpers.py +++ b/gajim/common/helpers.py @@ -555,7 +555,7 @@ def build_command(executable, parameter): return command def get_file_path_from_dnd_dropped_uri(uri): - path = urllib.parse.unquote(uri.decode('utf-8')) # escape special chars + path = urllib.parse.unquote(uri) # escape special chars path = path.strip('\r\n\x00') # remove \r\n and NULL # get the path to file if re.match('^file:///[a-zA-Z]:/', path): # windows ===================================== gajim/common/jingle_ftstates.py ===================================== --- a/gajim/common/jingle_ftstates.py +++ b/gajim/common/jingle_ftstates.py @@ -159,8 +159,7 @@ class StateTransfering(JingleFileTransferStates): mode = 'server' streamhost_used = self.jft.nominated_cand['peer-cand'] gajim.socks5queue.remove_client(self.jft.file_props.transport_sid) -# our_cand = self.jft.nominated_cand['our-cand'] -# gajim.socks5queue.remove_receiver(our_cand['idx']) + gajim.socks5queue.remove_other_servers(streamhost_used['host']) if streamhost_used['type'] == 'proxy': self.jft.file_props.is_a_proxy = True if self.jft.file_props.type_ == 's' and self.jft.weinitiate: ===================================== gajim/common/socks5.py ===================================== --- a/gajim/common/socks5.py +++ b/gajim/common/socks5.py @@ -398,12 +398,11 @@ class SocksQueue: sender = self.senders[key] if do_disconnect: sender.disconnect() - else: - self.idlequeue.unplug_idle(sender.fd) - self.idlequeue.remove_timeout(sender.fd) - del(self.senders[key]) - if self.connected > 0: - self.connected -= 1 + self.idlequeue.unplug_idle(sender.fd) + self.idlequeue.remove_timeout(sender.fd) + del(self.senders[key]) + if self.connected > 0: + self.connected -= 1 def remove_receiver(self, idx, do_disconnect=True, remove_all=False): """ @@ -448,6 +447,11 @@ class SocksQueue: def remove_client(self, transport_sid, do_disconnect=True): self.remove_by_mode(transport_sid, 'client') + def remove_other_servers(self, host_to_keep): + for (key, sock) in self.senders.copy().items(): + if sock.host != host_to_keep and sock.mode == 'server': + self.remove_sender_by_key(key) + class Socks5(object): def __init__(self, idlequeue, host, port, initiator, target, sid): if host is not None: ===================================== gajim/filetransfers_window.py ===================================== --- a/gajim/filetransfers_window.py +++ b/gajim/filetransfers_window.py @@ -212,8 +212,8 @@ class FileTransfersWindow: sectext += recipient if file_props.type_ == 'r': sectext += '\n\t' + _('Saved in: %s') % file_path - dialog = dialogs.HigDialog(None, Gtk.MessageType.INFO, Gtk.ButtonsType.NONE, - _('File transfer completed'), sectext) + dialog = dialogs.HigDialog(gajim.interface.roster.window, Gtk.MessageType.INFO, + Gtk.ButtonsType.NONE, _('File transfer completed'), sectext) if file_props.type_ == 'r': button = Gtk.Button.new_with_mnemonic(_('Open _Containing Folder')) button.connect('clicked', on_open, file_props) View it on GitLab: https://dev.gajim.org/gajim/gajim/compare/99b27b448474f91f42687a8302feb261e… --- View it on GitLab: https://dev.gajim.org/gajim/gajim/compare/99b27b448474f91f42687a8302feb261e… 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