Skip to content

Commit 2fcd4f6

Browse files
authored
Merge pull request #6418 from mammo0/fix_3803
fix: Nautilus integration conflicts with ownCloud
2 parents 8f6ed83 + 5fad9da commit 2fcd4f6

File tree

1 file changed

+11
-11
lines changed

1 file changed

+11
-11
lines changed

shell_integration/nautilus/syncstate.py

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@
2828

2929
from gi.repository import GObject, Nautilus
3030

31-
# Note: setappname.sh will search and replace 'ownCloud' on this file to update this line and other
31+
# Note: setappname.sh will search and replace 'Nextcloud' on this file to update this line and other
3232
# occurrences of the name
3333
appname = 'Nextcloud'
3434

@@ -175,7 +175,7 @@ def _get_version(self, action, args):
175175
socketConnect = SocketConnect()
176176

177177

178-
class MenuExtension_ownCloud(GObject.GObject, Nautilus.MenuProvider):
178+
class MenuExtension_Nextcloud(GObject.GObject, Nautilus.MenuProvider):
179179
def __init__(self):
180180
GObject.GObject.__init__(self)
181181

@@ -270,18 +270,18 @@ def ask_for_menu_items(self, files):
270270
if len(menu_items) == 0:
271271
return []
272272

273-
# Set up the 'ownCloud...' submenu
274-
item_owncloud = Nautilus.MenuItem(
273+
# Set up the 'Nextcloud...' submenu
274+
item_nextcloud = Nautilus.MenuItem(
275275
name='IntegrationMenu', label=self.strings.get('CONTEXT_MENU_TITLE', appname))
276276
menu = Nautilus.Menu()
277-
item_owncloud.set_submenu(menu)
277+
item_nextcloud.set_submenu(menu)
278278

279279
for action, enabled, label in menu_items:
280280
item = Nautilus.MenuItem(name=action, label=label, sensitive=enabled)
281281
item.connect("activate", self.context_menu_action, action, filesstring)
282282
menu.append_item(item)
283283

284-
return [item_owncloud]
284+
return [item_nextcloud]
285285

286286

287287
def legacy_menu_items(self, files):
@@ -315,11 +315,11 @@ def legacy_menu_items(self, files):
315315
if not shareable:
316316
return []
317317

318-
# Set up the 'ownCloud...' submenu
319-
item_owncloud = Nautilus.MenuItem(
318+
# Set up the 'Nextcloud...' submenu
319+
item_nextcloud = Nautilus.MenuItem(
320320
name='IntegrationMenu', label=self.strings.get('CONTEXT_MENU_TITLE', appname))
321321
menu = Nautilus.Menu()
322-
item_owncloud.set_submenu(menu)
322+
item_nextcloud.set_submenu(menu)
323323

324324
# Add share menu option
325325
item = Nautilus.MenuItem(
@@ -342,15 +342,15 @@ def legacy_menu_items(self, files):
342342
item_emailprivatelink.connect("activate", self.context_menu_action, 'EMAIL_PRIVATE_LINK', filename)
343343
menu.append_item(item_emailprivatelink)
344344

345-
return [item_owncloud]
345+
return [item_nextcloud]
346346

347347

348348
def context_menu_action(self, menu, action, filename):
349349
# print("Context menu: " + action + ' ' + filename)
350350
socketConnect.sendCommand(action + ":" + filename + "\n")
351351

352352

353-
class SyncStateExtension_ownCloud(GObject.GObject, Nautilus.InfoProvider):
353+
class SyncStateExtension_Nextcloud(GObject.GObject, Nautilus.InfoProvider):
354354
def __init__(self):
355355
GObject.GObject.__init__(self)
356356

0 commit comments

Comments
 (0)