mirrors/nextcloud-desktop
3
0
Fork 0
mirror of https://github.com/nextcloud/desktop.git synced 2025-10-26 11:17:43 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #6418 from mammo0/fix_3803

Browse Source 
fix: Nautilus integration conflicts with ownCloud
This commit is contained in:
Matthieu Gallien 2025-02-10 17:20:05 +01:00 committed by GitHub
commit 2fcd4f65bf
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
shell_integration/nautilus/syncstate.py
View File

@ -28,7 +28,7 @@ import time
from gi.repository import GObject, Nautilus
# Note: setappname.sh will search and replace 'ownCloud' on this file to update this line and other
# Note: setappname.sh will search and replace 'Nextcloud' on this file to update this line and other
# occurrences of the name
appname = 'Nextcloud'
@ -175,7 +175,7 @@ class SocketConnect(GObject.GObject):
socketConnect = SocketConnect()
class MenuExtension_ownCloud(GObject.GObject, Nautilus.MenuProvider):
class MenuExtension_Nextcloud(GObject.GObject, Nautilus.MenuProvider):
def __init__(self):
GObject.GObject.__init__(self)
@ -270,18 +270,18 @@ class MenuExtension_ownCloud(GObject.GObject, Nautilus.MenuProvider):
if len(menu_items) == 0:
return []
# Set up the 'ownCloud...' submenu
item_owncloud = Nautilus.MenuItem(
# Set up the 'Nextcloud...' submenu
item_nextcloud = Nautilus.MenuItem(
name='IntegrationMenu', label=self.strings.get('CONTEXT_MENU_TITLE', appname))
menu = Nautilus.Menu()
item_owncloud.set_submenu(menu)
item_nextcloud.set_submenu(menu)
for action, enabled, label in menu_items:
item = Nautilus.MenuItem(name=action, label=label, sensitive=enabled)
item.connect("activate", self.context_menu_action, action, filesstring)
menu.append_item(item)
return [item_owncloud]
return [item_nextcloud]
def legacy_menu_items(self, files):
@ -315,11 +315,11 @@ class MenuExtension_ownCloud(GObject.GObject, Nautilus.MenuProvider):
if not shareable:
return []
# Set up the 'ownCloud...' submenu
item_owncloud = Nautilus.MenuItem(
# Set up the 'Nextcloud...' submenu
item_nextcloud = Nautilus.MenuItem(
name='IntegrationMenu', label=self.strings.get('CONTEXT_MENU_TITLE', appname))
menu = Nautilus.Menu()
item_owncloud.set_submenu(menu)
item_nextcloud.set_submenu(menu)
# Add share menu option
item = Nautilus.MenuItem(
@ -342,7 +342,7 @@ class MenuExtension_ownCloud(GObject.GObject, Nautilus.MenuProvider):
item_emailprivatelink.connect("activate", self.context_menu_action, 'EMAIL_PRIVATE_LINK', filename)
menu.append_item(item_emailprivatelink)
return [item_owncloud]
return [item_nextcloud]
def context_menu_action(self, menu, action, filename):
@ -350,7 +350,7 @@ class MenuExtension_ownCloud(GObject.GObject, Nautilus.MenuProvider):
socketConnect.sendCommand(action + ":" + filename + "\n")
class SyncStateExtension_ownCloud(GObject.GObject, Nautilus.InfoProvider):
class SyncStateExtension_Nextcloud(GObject.GObject, Nautilus.InfoProvider):
def __init__(self):
GObject.GObject.__init__(self)