From 38280f8b8d57eab543d244ff74ba2092db032f86 Mon Sep 17 00:00:00 2001 From: maxkadushkin Date: Sun, 2 Feb 2025 15:03:30 +0300 Subject: [PATCH 1/9] [start] fix bug 61938 --- common/loginpage/src/dialogconnect.js | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/common/loginpage/src/dialogconnect.js b/common/loginpage/src/dialogconnect.js index b6c9637a9..0b7ea8670 100644 --- a/common/loginpage/src/dialogconnect.js +++ b/common/loginpage/src/dialogconnect.js @@ -276,8 +276,12 @@ window.DialogConnect = function(params) { // A connection attempt was refused. // NET_ERROR(CONNECTION_REFUSED, -102) - if ( e.statusCode == -102 ) e.statusCode = 404; - reject({status:status, response:e}); + if ( e.responseStatus == 302) + resolve({status:'success', response:e}); + else { + if ( e.statusCode == -102 ) e.statusCode = 404; + reject({status:status, response:e}); + } } }); } From 54c68ad86b730be439af2ac8bb605ef494b2ec64 Mon Sep 17 00:00:00 2001 From: maxkadushkin Date: Mon, 3 Feb 2025 14:03:38 +0300 Subject: [PATCH 2/9] [start] for bug 71421 --- common/loginpage/src/paneltemplates.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/common/loginpage/src/paneltemplates.js b/common/loginpage/src/paneltemplates.js index 02c32f0fc..0fe4c13e5 100644 --- a/common/loginpage/src/paneltemplates.js +++ b/common/loginpage/src/paneltemplates.js @@ -83,8 +83,8 @@

${_lang.actTemplates}

From dc86ef2ffd1c18475a60dd8805a41f2203f653c2 Mon Sep 17 00:00:00 2001 From: Maria-Sukhova Date: Mon, 3 Feb 2025 14:24:37 +0300 Subject: [PATCH 3/9] added cs, nl, pl, pt-PT --- win-linux/langs/cs.ts | 24 ++++++++++++------------ win-linux/langs/nl.ts | 24 ++++++++++++------------ win-linux/langs/pl.ts | 24 ++++++++++++------------ win-linux/langs/pt_PT.ts | 24 ++++++++++++------------ 4 files changed, 48 insertions(+), 48 deletions(-) diff --git a/win-linux/langs/cs.ts b/win-linux/langs/cs.ts index 1c4f73e41..f8ed7fcef 100644 --- a/win-linux/langs/cs.ts +++ b/win-linux/langs/cs.ts @@ -528,7 +528,7 @@ Visio diagram - + Diagram Visio @@ -619,7 +619,7 @@ Main Window - + Hlavní okno @@ -691,47 +691,47 @@ Close - + Zavřít Close saved - + Zavřít uložený Close all - + Zavřít vše Show in folder - Zobrazit ve složce + Zobrazit ve složce Move to start - + Přesunout na začátek Move to end - + Přesun na konec Unpin tab to window - + Zrušení připnutí karty k oknu Pin to tab - + Připnout na kartu Create new - + Vytvořit nový @@ -1225,7 +1225,7 @@ There are unsaved documents SingleApplication - + Existují neuložené dokumenty diff --git a/win-linux/langs/nl.ts b/win-linux/langs/nl.ts index 873256adf..1e9110aa6 100644 --- a/win-linux/langs/nl.ts +++ b/win-linux/langs/nl.ts @@ -512,7 +512,7 @@ Visio diagram - + Visio diagram @@ -603,7 +603,7 @@ Main Window - + Hoofdvenster @@ -675,47 +675,47 @@ Close - + Sluiten Close saved - + Sluit opgeslagen Close all - + Alles sluiten Show in folder - Weergeven in map + Weergeven in map Move to start - + Verplaats naar start Move to end - + Verplaats naar einde Unpin tab to window - + Tabblad loskoppelen van venster Pin to tab - + Vastkoppelen aan tabblad Create new - + Nieuw maken @@ -1181,7 +1181,7 @@ There are unsaved documents SingleApplication - + Er zijn niet-opgeslagen documenten diff --git a/win-linux/langs/pl.ts b/win-linux/langs/pl.ts index 87d77640a..8363e987b 100644 --- a/win-linux/langs/pl.ts +++ b/win-linux/langs/pl.ts @@ -512,7 +512,7 @@ Visio diagram - + Diagram Visio @@ -603,7 +603,7 @@ Main Window - + Okno główne @@ -675,47 +675,47 @@ Close - + Zamknij Close saved - + Zamknij zapisane Close all - + Zamknij wszystko Show in folder - Pokaż w folderze + Pokaż w folderze Move to start - + Przenieś na początek Move to end - + Przenieś na koniec Unpin tab to window - + Odepnij kartę do okna Pin to tab - + Przypnij do karty Create new - + Utwórz nowy @@ -1181,7 +1181,7 @@ There are unsaved documents SingleApplication - + Masz niezapisane dokumenty diff --git a/win-linux/langs/pt_PT.ts b/win-linux/langs/pt_PT.ts index 0c3dfa8f3..99e7c5395 100644 --- a/win-linux/langs/pt_PT.ts +++ b/win-linux/langs/pt_PT.ts @@ -512,7 +512,7 @@ Visio diagram - + Diagrama Visio @@ -603,7 +603,7 @@ Main Window - + Janela principal @@ -675,47 +675,47 @@ Close - + Fechar Close saved - + Fechar guardado Close all - + Fechar tudo Show in folder - Mostrar na pasta + Mostrar na pasta Move to start - + Desloque-se para o início Move to end - + Desloque-se para o fim Unpin tab to window - + Solte o separador na janela Pin to tab - + Fixar no separador Create new - + Criar novo @@ -1181,7 +1181,7 @@ There are unsaved documents SingleApplication - + Existem documentos não guardados From 8b943a8a198ec8fee0658eece44ff20871fbbcd5 Mon Sep 17 00:00:00 2001 From: Maria-Sukhova Date: Wed, 5 Feb 2025 13:40:45 +0300 Subject: [PATCH 4/9] added zh-Hant --- common/loginpage/locale/zh-TW.js | 1 + win-linux/langs/zh_TW.ts | 68 ++++++++++++++++---------------- 2 files changed, 35 insertions(+), 34 deletions(-) diff --git a/common/loginpage/locale/zh-TW.js b/common/loginpage/locale/zh-TW.js index 32d0d3e74..1172ca440 100644 --- a/common/loginpage/locale/zh-TW.js +++ b/common/loginpage/locale/zh-TW.js @@ -112,6 +112,7 @@ l10n.zh_TW = { settOptDescAUpdateSilent: "於背景中下載並安裝更新檔", settOptDescAUpdateAsk: "您將收到所有更新步驟的相關通知", settRtlMode: "RTL介面", + settGpuUseMode: "當可用時使用圖形加速", tplPanelLocal: "本地", tplPanelCloud: "雲", } diff --git a/win-linux/langs/zh_TW.ts b/win-linux/langs/zh_TW.ts index ade39e67d..8db73612e 100644 --- a/win-linux/langs/zh_TW.ts +++ b/win-linux/langs/zh_TW.ts @@ -27,7 +27,7 @@ You must restart the application for the settings to take effect. - + 您必須重新啟動應用程式，設定變更才會生效。 @@ -159,7 +159,7 @@ Downloads - + 下載 @@ -175,7 +175,7 @@ kBps - + kBps @@ -190,7 +190,7 @@ Show in folder - + 在資料夾中顯示 @@ -381,7 +381,7 @@ ONLYOFFICE Form Document (*.pdf) - PDF 表格 (*.pdf) + PDF 表格 (*.pdf) @@ -396,7 +396,7 @@ XLSB File (*.xlsb) - + Excel 二進位檔案（.xlsb） @@ -436,32 +436,32 @@ VSDX File - + Visio 繪圖（.vsdx） VSDM File - + Visio 啟用巨集的繪圖（.vsdm） VSSX File - + Visio 模具（.vssx） VSSM File - + Visio 啟用巨集的模具（.vssm） VSTX File - + Visio 範本（.vstx） VSTM File - + Visio 啟用巨集的範本（*.vstm） @@ -528,7 +528,7 @@ Visio diagram - + Visio 圖表 @@ -584,7 +584,7 @@ Jpeg (*.jpeg *.jpg);;Png (*.png);;Gif (*.gif);;Bmp (*.bmp);;Tiff (*.tiff *.tif) - + Jpeg (*.jpeg *.jpg);;Png (*.png);;Gif (*.gif);;Bmp (*.bmp);;Tiff (*.tiff *.tif) @@ -619,7 +619,7 @@ Main Window - + 主視窗 @@ -691,47 +691,47 @@ Close - + 關閉 Close saved - + 關閉已儲存 Close all - + 關閉所有 Show in folder - + 在資料夾中顯示 Move to start - + 移至開頭 Move to end - + 移至結尾 Unpin tab to window - + 取消固定分頁到視窗 Pin to tab - + 固定至分頁 Create new - + 建立新項目 @@ -913,7 +913,7 @@ Preparing update (%1%) - + 正在準備更新 (%1%) @@ -938,7 +938,7 @@ The current version does not support installing this update directly. To install updates, you can download the required package from the official website. - + 目前版本不支援直接安裝此更新。若要安裝更新，請從官方網站下載所需的安裝套件。 @@ -1095,7 +1095,7 @@ An error occurred while start install updates: Update Service not found! - + 啟動安裝更新時發生錯誤：找不到更新服務！ @@ -1192,40 +1192,40 @@ Printing... CPrintProgress - 列印中... + 列印中... Document is preparing CPrintProgress - 文件準備中 + 文件準備中 &Cancel CPrintProgress - &取消 + &取消 Do you want to make %1 your default application for extension: %2? - + 您要將 %1 設為副檔名 %2 的預設應用程式嗎？ Do you want to make %1 your default application for all supported extensions? - + 您要將 %1 設為所有支援的副檔名的預設應用程式嗎？ Do not show this message again - + 不要再顯示此訊息 There are unsaved documents SingleApplication - + 有未儲存的文件 From c05ac033b1f052734a835571c53b21c4832a50a7 Mon Sep 17 00:00:00 2001 From: SimplestStudio Date: Mon, 10 Feb 2025 11:36:25 +0200 Subject: [PATCH 5/9] [win] fix bug 73143 --- win-linux/extras/projicons/res/icons/menu.ico | Bin 44278 -> 13746 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/win-linux/extras/projicons/res/icons/menu.ico b/win-linux/extras/projicons/res/icons/menu.ico index 871946d2f3ba7037169ee76ee108de2bd6a3cbc8..6b84cebf98ea8d88f1e04ca0b048c7346ecd167e 100644 GIT binary patch literal 13746 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 Date: Tue, 11 Feb 2025 15:47:13 +0300 Subject: [PATCH 6/9] [macos] fix bug 73099 --- .../Resources/ONLYOFFICE-arm/Info.plist | 24 +++++++++++++++++++ .../Resources/ONLYOFFICE-v8/Info.plist | 24 +++++++++++++++++++ .../Resources/ONLYOFFICE-x86_64/Info.plist | 24 +++++++++++++++++++ 3 files changed, 72 insertions(+) diff --git a/macos/ONLYOFFICE/Resources/ONLYOFFICE-arm/Info.plist b/macos/ONLYOFFICE/Resources/ONLYOFFICE-arm/Info.plist index 714ffecd6..1d35c52e5 100644 --- a/macos/ONLYOFFICE/Resources/ONLYOFFICE-arm/Info.plist +++ b/macos/ONLYOFFICE/Resources/ONLYOFFICE-arm/Info.plist @@ -568,6 +568,30 @@ CFBundleTypeRole Editor + + CFBundleTypeExtensions + + hwpx + + CFBundleTypeIconFile + file-hwpx + CFBundleTypeName + Hangul Word Processor 2010 Document + CFBundleTypeRole + Editor + + + CFBundleTypeExtensions + + hwp + + CFBundleTypeIconFile + file-hwp + CFBundleTypeName + Hangul Document + CFBundleTypeRole + Editor + CFBundleExecutable $(EXECUTABLE_NAME) diff --git a/macos/ONLYOFFICE/Resources/ONLYOFFICE-v8/Info.plist b/macos/ONLYOFFICE/Resources/ONLYOFFICE-v8/Info.plist index f9cd36603..9cb296d02 100644 --- a/macos/ONLYOFFICE/Resources/ONLYOFFICE-v8/Info.plist +++ b/macos/ONLYOFFICE/Resources/ONLYOFFICE-v8/Info.plist @@ -572,6 +572,30 @@ CFBundleTypeRole Editor + + CFBundleTypeExtensions + + hwpx + + CFBundleTypeIconFile + file-hwpx + CFBundleTypeName + Hangul Word Processor 2010 Document + CFBundleTypeRole + Editor + + + CFBundleTypeExtensions + + hwp + + CFBundleTypeIconFile + file-hwp + CFBundleTypeName + Hangul Document + CFBundleTypeRole + Editor + CFBundleExecutable $(EXECUTABLE_NAME) diff --git a/macos/ONLYOFFICE/Resources/ONLYOFFICE-x86_64/Info.plist b/macos/ONLYOFFICE/Resources/ONLYOFFICE-x86_64/Info.plist index ef158abd6..163d41ef2 100644 --- a/macos/ONLYOFFICE/Resources/ONLYOFFICE-x86_64/Info.plist +++ b/macos/ONLYOFFICE/Resources/ONLYOFFICE-x86_64/Info.plist @@ -568,6 +568,30 @@ CFBundleTypeRole Editor + + CFBundleTypeExtensions + + hwpx + + CFBundleTypeIconFile + file-hwpx + CFBundleTypeName + Hangul Word Processor 2010 Document + CFBundleTypeRole + Editor + + + CFBundleTypeExtensions + + hwp + + CFBundleTypeIconFile + file-hwp + CFBundleTypeName + Hangul Document + CFBundleTypeRole + Editor + CFBundleExecutable $(EXECUTABLE_NAME) From 8bdd701a2edd3d2573db056269a8cbf77db9ca38 Mon Sep 17 00:00:00 2001 From: maxkadushkin Date: Tue, 11 Feb 2025 16:07:08 +0300 Subject: [PATCH 7/9] [macos] for bug 73099 --- macos/ONLYOFFICE.xcodeproj/project.pbxproj | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/macos/ONLYOFFICE.xcodeproj/project.pbxproj b/macos/ONLYOFFICE.xcodeproj/project.pbxproj index a8aab0b54..64248e102 100644 --- a/macos/ONLYOFFICE.xcodeproj/project.pbxproj +++ b/macos/ONLYOFFICE.xcodeproj/project.pbxproj @@ -57,6 +57,12 @@ 5AA06CBD27AC3BA000D67BEE /* ASCLinguist.m in Sources */ = {isa = PBXBuildFile; fileRef = 5AA06CBC27AC3BA000D67BEE /* ASCLinguist.m */; }; 5AA06CC027B1267200D67BEE /* ASCLinguist.m in Sources */ = {isa = PBXBuildFile; fileRef = 5AA06CBC27AC3BA000D67BEE /* ASCLinguist.m */; }; 5AA06CC127B1267600D67BEE /* ASCLinguist.m in Sources */ = {isa = PBXBuildFile; fileRef = 5AA06CBC27AC3BA000D67BEE /* ASCLinguist.m */; }; + 5AA2F5842D5B824300C9DDC9 /* file-hwpx.icns in Resources */ = {isa = PBXBuildFile; fileRef = 5AA2F5822D5B824300C9DDC9 /* file-hwpx.icns */; }; + 5AA2F5852D5B824300C9DDC9 /* file-hwpx.icns in Resources */ = {isa = PBXBuildFile; fileRef = 5AA2F5822D5B824300C9DDC9 /* file-hwpx.icns */; }; + 5AA2F5862D5B824300C9DDC9 /* file-hwpx.icns in Resources */ = {isa = PBXBuildFile; fileRef = 5AA2F5822D5B824300C9DDC9 /* file-hwpx.icns */; }; + 5AA2F5872D5B824300C9DDC9 /* file-hwp.icns in Resources */ = {isa = PBXBuildFile; fileRef = 5AA2F5832D5B824300C9DDC9 /* file-hwp.icns */; }; + 5AA2F5882D5B824300C9DDC9 /* file-hwp.icns in Resources */ = {isa = PBXBuildFile; fileRef = 5AA2F5832D5B824300C9DDC9 /* file-hwp.icns */; }; + 5AA2F5892D5B824300C9DDC9 /* file-hwp.icns in Resources */ = {isa = PBXBuildFile; fileRef = 5AA2F5832D5B824300C9DDC9 /* file-hwp.icns */; }; 5AAE526D28B53B9A001E31F4 /* ASCThemesController.m in Sources */ = {isa = PBXBuildFile; fileRef = 5AAE526C28B53B9A001E31F4 /* ASCThemesController.m */; }; 5AAE526E28B53B9A001E31F4 /* ASCThemesController.m in Sources */ = {isa = PBXBuildFile; fileRef = 5AAE526C28B53B9A001E31F4 /* ASCThemesController.m */; }; 5AAE526F28B53B9A001E31F4 /* ASCThemesController.m in Sources */ = {isa = PBXBuildFile; fileRef = 5AAE526C28B53B9A001E31F4 /* ASCThemesController.m */; }; @@ -849,6 +855,8 @@ 5A9F8D382848AA06007CA93F /* file-xlsm.icns */ = {isa = PBXFileReference; lastKnownFileType = image.icns; path = "file-xlsm.icns"; sourceTree = ""; }; 5AA06CBB27AC3BA000D67BEE /* ASCLinguist.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = ASCLinguist.h; sourceTree = ""; }; 5AA06CBC27AC3BA000D67BEE /* ASCLinguist.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = ASCLinguist.m; sourceTree = ""; }; + 5AA2F5822D5B824300C9DDC9 /* file-hwpx.icns */ = {isa = PBXFileReference; lastKnownFileType = image.icns; path = "file-hwpx.icns"; sourceTree = ""; }; + 5AA2F5832D5B824300C9DDC9 /* file-hwp.icns */ = {isa = PBXFileReference; lastKnownFileType = image.icns; path = "file-hwp.icns"; sourceTree = ""; }; 5AAE526C28B53B9A001E31F4 /* ASCThemesController.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = ASCThemesController.m; sourceTree = ""; }; 5AAE527028B53C1F001E31F4 /* ASCThemesController.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = ASCThemesController.h; sourceTree = ""; }; 5AAFF09E2989B70400D433B5 /* si */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = si; path = "si.lproj/Document-Sign.strings"; sourceTree = ""; }; @@ -1257,6 +1265,8 @@ FC081EBC1C325E8400F9881C /* file-formats */ = { isa = PBXGroup; children = ( + 5AA2F5832D5B824300C9DDC9 /* file-hwp.icns */, + 5AA2F5822D5B824300C9DDC9 /* file-hwpx.icns */, 5A54B9332D0353A8008FA596 /* file-vsdx.icns */, 5AB89E292CFD1441000972EF /* file-key.icns */, 5AB89E282CFD1441000972EF /* file-numbers.icns */, @@ -2070,6 +2080,7 @@ FC0BD6CB258B63F700C47F95 /* file-epub.icns in Resources */, FC0BD6CC258B63F700C47F95 /* file-htm.icns in Resources */, FC0BD6CD258B63F700C47F95 /* file-odt.icns in Resources */, + 5AA2F5892D5B824300C9DDC9 /* file-hwp.icns in Resources */, FC0BD6CE258B63F700C47F95 /* file-rtf.icns in Resources */, FC0BD6CF258B63F700C47F95 /* file-odp.icns in Resources */, FC0BD6D0258B63F700C47F95 /* file-pdf.icns in Resources */, @@ -2099,6 +2110,7 @@ 5A02295A2CCFC02B0011C6EC /* file-oxps.icns in Resources */, 5A0229672CCFC05C0011C6EC /* file-pptm.icns in Resources */, FC0BD6E4258B63F700C47F95 /* Images.xcassets in Resources */, + 5AA2F5862D5B824300C9DDC9 /* file-hwpx.icns in Resources */, 5AB89E2C2CFD1441000972EF /* file-pages.icns in Resources */, 5AB20F60274D35F3003732A0 /* file-docxf.icns in Resources */, FC0BD6E5258B63F700C47F95 /* Localizable.strings in Resources */, @@ -2133,6 +2145,7 @@ FCB4C70726DD018B0012C20D /* file-epub.icns in Resources */, FCB4C70826DD018B0012C20D /* file-htm.icns in Resources */, 5AB20F62274D360A003732A0 /* file-oform.icns in Resources */, + 5AA2F5872D5B824300C9DDC9 /* file-hwp.icns in Resources */, FCB4C70926DD018B0012C20D /* file-odt.icns in Resources */, FCB4C70A26DD018B0012C20D /* file-rtf.icns in Resources */, FCB4C70B26DD018B0012C20D /* file-odp.icns in Resources */, @@ -2162,6 +2175,7 @@ 5A0229582CCFC02B0011C6EC /* file-oxps.icns in Resources */, 5A0229652CCFC05C0011C6EC /* file-pptm.icns in Resources */, FCB4C71E26DD018B0012C20D /* converter in Resources */, + 5AA2F5842D5B824300C9DDC9 /* file-hwpx.icns in Resources */, 5AB89E2A2CFD1441000972EF /* file-pages.icns in Resources */, FCB4C71F26DD018B0012C20D /* file-ods.icns in Resources */, FCB4C72026DD018B0012C20D /* Images.xcassets in Resources */, @@ -2196,6 +2210,7 @@ FCA3F30C2570EC9500DCAB12 /* file-fb2.icns in Resources */, FCA3F3102570EC9500DCAB12 /* file-epub.icns in Resources */, FCA3F30F2570EC9500DCAB12 /* file-htm.icns in Resources */, + 5AA2F5882D5B824300C9DDC9 /* file-hwp.icns in Resources */, FC98AF231E94E16A00718A12 /* file-odt.icns in Resources */, FC98AF351E94E16A00718A12 /* file-rtf.icns in Resources */, FC98AF1D1E94E16A00718A12 /* file-odp.icns in Resources */, @@ -2225,6 +2240,7 @@ 5A0229592CCFC02B0011C6EC /* file-oxps.icns in Resources */, 5A0229662CCFC05C0011C6EC /* file-pptm.icns in Resources */, FC0907411C186A7A00D9E881 /* converter in Resources */, + 5AA2F5852D5B824300C9DDC9 /* file-hwpx.icns in Resources */, 5AB89E2B2CFD1441000972EF /* file-pages.icns in Resources */, FC98AF201E94E16A00718A12 /* file-ods.icns in Resources */, FCBC42761B9D650500405301 /* Images.xcassets in Resources */, From 7370325f4c1e6c4c6790144e2a0d4b6624e253ab Mon Sep 17 00:00:00 2001 From: SimplestStudio Date: Sun, 16 Feb 2025 13:00:14 +0200 Subject: [PATCH 8/9] [linux] fix bug 73233 --- win-linux/src/platform_linux/singleapplication.cpp | 3 +++ 1 file changed, 3 insertions(+) diff --git a/win-linux/src/platform_linux/singleapplication.cpp b/win-linux/src/platform_linux/singleapplication.cpp index 7c3aba8f3..9d15fa9b0 100644 --- a/win-linux/src/platform_linux/singleapplication.cpp +++ b/win-linux/src/platform_linux/singleapplication.cpp @@ -58,6 +58,7 @@ static std::string registerClient() { std::string result; GVariant *args = g_variant_new("(ss)", DESKTOP_FILE_NAME, ""); + g_variant_ref_sink(args); if (GVariant *ret = callMethod(GNOME_SESSION_PATH, GNOME_SESSION_ITF, "RegisterClient", args)) { gchar *client_id = nullptr; g_variant_get(ret, "(o)", &client_id); @@ -74,6 +75,7 @@ static std::string registerClient() static void unregisterClient(const std::string &client_id) { GVariant *args = g_variant_new("(o)", client_id.c_str()); + g_variant_ref_sink(args); if (GVariant *ret = callMethod(GNOME_SESSION_PATH, GNOME_SESSION_ITF, "UnregisterClient", args)) { g_variant_unref(ret); } @@ -83,6 +85,7 @@ static void unregisterClient(const std::string &client_id) static void endSessionResponse(const std::string &client_id, gboolean is_ok, const std::string &reason) { GVariant *args = g_variant_new("(bs)", is_ok, reason.c_str()); + g_variant_ref_sink(args); if (GVariant *ret = callMethod(client_id.c_str(), GNOME_SESSION_CLNT_ITF, "EndSessionResponse", args)) { g_variant_unref(ret); } From 120cea088102da20bee1da3e44636242a7ad25a0 Mon Sep 17 00:00:00 2001 From: SimplestStudio Date: Thu, 20 Feb 2025 17:15:42 +0200 Subject: [PATCH 9/9] [win] fix bug 73166 --- win-linux/src/windows/cmainwindow.cpp | 2 ++ 1 file changed, 2 insertions(+) diff --git a/win-linux/src/windows/cmainwindow.cpp b/win-linux/src/windows/cmainwindow.cpp index 0ff2d22f7..0b1b09f4b 100644 --- a/win-linux/src/windows/cmainwindow.cpp +++ b/win-linux/src/windows/cmainwindow.cpp @@ -1164,6 +1164,8 @@ void CMainWindow::onDocumentReady(int uid) menu->setSectionEnabled(CMenu::ActionCreateNew, true); } } + if (m_pTabs->isActiveWidget()) + m_pTabs->setFocusedView(); } AscAppManager::getInstance().onDocumentReady(uid); }