Remove support for multiple Linux shell extensions

owncloud · Jul 17, 2024 · d47f789 · d47f789
1 parent 0c6005b
commit d47f789
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 6 deletions.
diff --git a/changelog/unreleased/11743 b/changelog/unreleased/11743
@@ -0,0 +1,6 @@
+Change: Remove support for branded shell extensions on Linux
+
+From now on user will have to install dolphin-owncloud nautilus-owncloud
+instead of a braned version.
+
+https://github.com/owncloud/client/issues/11743
diff --git a/src/gui/guiutility_unix.cpp b/src/gui/guiutility_unix.cpp
@@ -25,7 +25,7 @@ void Utility::startShellIntegration()
 
 QString Utility::socketApiSocketPath()
 {
-    return QStringLiteral("%1/%2/socket").arg(QStandardPaths::writableLocation(QStandardPaths::RuntimeLocation), Theme::instance()->appName());
+    return QStringLiteral("%1/ownCloud/socket").arg(QStandardPaths::writableLocation(QStandardPaths::RuntimeLocation));
 }
 
 } // namespace OCC
diff --git a/src/gui/guiutility_win.cpp b/src/gui/guiutility_win.cpp
@@ -25,11 +25,7 @@ void Utility::startShellIntegration()
 
 QString Utility::socketApiSocketPath()
 {
-    return QLatin1String("\\\\.\\pipe\\") + QLatin1String("ownCloud-") + qEnvironmentVariable("USERNAME");
-    // TODO: once the windows extension supports multiple
-    // client connections, switch back to the theme name
-    // See issue #2388
-    // + Theme::instance()->appName();
+    return QStringLiteral(R"(\\.\pipe\ownCloud-%1)").arg(qEnvironmentVariable("USERNAME"));
 }
 
 } // namespace OCC