File nemo-instead-of-nautilus.patch of Package budgie-desktop

Overview Repositories Revisions Requests Users Attributes Meta

File nemo-instead-of-nautilus.patch of Package budgie-desktop (Revision 9e2eb9b1f7f26acd4804a669ae945db6)

Currently displaying revision 9e2eb9b1f7f26acd4804a669ae945db6 , Show latest

From 39b046fb57d744ac33244aacb53fdb15096860d6 Mon Sep 17 00:00:00 2001
From: Callum Farmer <callumjfarmer13@gmail.com>
Date: Mon, 2 Nov 2020 19:14:07 +0000
Subject: [PATCH] patch update

diff --git a/meson.build b/meson.build
index dea589fc..655b22f4 100644
--- a/meson.build
+++ b/meson.build
@@ -101,8 +101,8 @@ cdata.set_quoted('LOCALEDIR', localedir)
 cdata.set_quoted('PACKAGE_URL', 'https://budgie-desktop.org')
 
 with_desktop_icons = get_option('with-desktop-icons')
-if with_desktop_icons ==  'nautilus'
-    warning('You must have Nautilus 3.26 or older for desktop icons with Budgie')
+if with_desktop_icons ==  'nemo'
+    warning('You must have Nemo for desktop icons with Budgie')
 endif
 
 with_stateless = get_option('with-stateless')
diff --git a/meson_options.txt b/meson_options.txt
index e6ac4d36..ae8ad40c 100644
--- a/meson_options.txt
+++ b/meson_options.txt
@@ -1,5 +1,5 @@
 option('with-stateless', type: 'boolean', value: false, description: 'Enable stateless XDG paths')
 option('with-polkit', type: 'boolean', value: true, description: 'Enable PolKit support')
 option('with-gtk-doc', type: 'boolean', value: true, description: 'Build gtk-doc documentation')
-option('with-desktop-icons', type: 'combo', choices: ['nautilus', 'none'], value: 'nautilus', description: 'Desktop icon handling')
+option('with-desktop-icons', type: 'combo', choices: ['nemo', 'none'], value: 'nemo', description: 'Desktop icon handling')
 option('xdg-appdir', type: 'string', description: 'XDG autostart path')
diff --git a/src/applets/icon-tasklist/IconTasklistApplet.vala b/src/applets/icon-tasklist/IconTasklistApplet.vala
index e23610e6..d2962257 100644
--- a/src/applets/icon-tasklist/IconTasklistApplet.vala
+++ b/src/applets/icon-tasklist/IconTasklistApplet.vala
@@ -255,7 +255,7 @@ public class IconTasklistApplet : Budgie.Applet {
 		var app_id = (string)selection_data.get_data();
 		ButtonWrapper? original_button = null;
 
-		if (app_id.has_prefix("x-nautilus-desktop")) { // Someone is trying to drag a desktop icon to an application tasklist for some reason
+		if (app_id.has_prefix("x-nemo-desktop")) { // Someone is trying to drag a desktop icon to an application tasklist for some reason
 			return;
 		}
 
diff --git a/src/panel/meson.build b/src/panel/meson.build
index 51ad315f..a8f75234 100644
--- a/src/panel/meson.build
+++ b/src/panel/meson.build
@@ -72,8 +72,8 @@ budgie_panel_vala_args = [
         '--gresources=' + gresource,
 ]
 
-if with_desktop_icons == 'nautilus'
-    budgie_panel_vala_args += ['-D', 'HAVE_NAUTILUS']
+if with_desktop_icons == 'nemo'
+    budgie_panel_vala_args += ['-D', 'HAVE_NEMO']
 endif
 
 budgie_panel_c_args = [
diff --git a/src/panel/settings/settings_desktop.vala b/src/panel/settings/settings_desktop.vala
index 633923cd..c8713951 100644
--- a/src/panel/settings/settings_desktop.vala
+++ b/src/panel/settings/settings_desktop.vala
@@ -17,9 +17,9 @@ namespace Budgie {
 		private Settings wm_pref_settings;
 		private Gtk.SpinButton? workspace_count;
 
-	#if HAVE_NAUTILUS
+	#if HAVE_NEMO
 		private Settings bg_settings;
-		private Settings nautilus_settings;
+		private Settings nemo_settings;
 		private Gtk.Switch switch_icons;
 		private Gtk.Switch switch_home;
 		private Gtk.Switch switch_network;
@@ -39,7 +39,7 @@ namespace Budgie {
 
 			wm_pref_settings = new Settings("org.gnome.desktop.wm.preferences"); // Set up our wm preferences Settings
 
-	#if HAVE_NAUTILUS
+	#if HAVE_NEMO
 			/* Allow icons */
 			switch_icons = new Gtk.Switch();
 			grid.add_row(new SettingsRow(switch_icons,
@@ -47,7 +47,7 @@ namespace Budgie {
 				_("Control whether to allow launchers and icons on the desktop.")));
 
 			/* Hook up settings */
-			bg_settings = new Settings("org.gnome.desktop.background");
+			bg_settings = new Settings("org.nemo.desktop");
 			bg_settings.bind("show-desktop-icons", switch_icons, "active", SettingsBindFlags.DEFAULT);
 			bg_settings.changed["show-desktop-icons"].connect(this.update_switches);
 
@@ -76,11 +76,11 @@ namespace Budgie {
 				_("Mounted volumes & drives will appear on the desktop.")));
 
 
-			nautilus_settings = new Settings("org.gnome.nautilus.desktop");
-			nautilus_settings.bind("home-icon-visible", switch_home, "active", SettingsBindFlags.DEFAULT);
-			nautilus_settings.bind("network-icon-visible", switch_network, "active", SettingsBindFlags.DEFAULT);
-			nautilus_settings.bind("trash-icon-visible", switch_trash, "active", SettingsBindFlags.DEFAULT);
-			nautilus_settings.bind("volumes-visible", switch_mounts, "active", SettingsBindFlags.DEFAULT);
+			nemo_settings = new Settings("org.nemo.desktop");
+			nemo_settings.bind("home-icon-visible", switch_home, "active", SettingsBindFlags.DEFAULT);
+			nemo_settings.bind("network-icon-visible", switch_network, "active", SettingsBindFlags.DEFAULT);
+			nemo_settings.bind("trash-icon-visible", switch_trash, "active", SettingsBindFlags.DEFAULT);
+			nemo_settings.bind("volumes-visible", switch_mounts, "active", SettingsBindFlags.DEFAULT);
 
 			update_switches();
 	#endif
@@ -108,7 +108,7 @@ namespace Budgie {
 			));
 		}
 
-	#if HAVE_NAUTILUS
+	#if HAVE_NEMO
 		void update_switches() {
 			bool b = bg_settings.get_boolean("show-desktop-icons");
 			switch_home.sensitive = b;
diff --git a/src/panel/settings/settings_main.vala b/src/panel/settings/settings_main.vala
index dc68ae99..f73542aa 100644
--- a/src/panel/settings/settings_main.vala
+++ b/src/panel/settings/settings_main.vala
@@ -125,8 +125,8 @@ namespace Budgie {
 		void build_content() {
 			this.add_page(new Budgie.StylePage());
 
-	#if HAVE_NAUTILUS
-			if (Environment.find_program_in_path("nautilus") != null) {
+	#if HAVE_NEMO
+			if (Environment.find_program_in_path("nemo") != null) {
 				this.add_page(new Budgie.DesktopPage());
 			}
 	#endif

Places

File nemo-instead-of-nautilus.patch of Package budgie-desktop (Revision 9e2eb9b1f7f26acd4804a669ae945db6)

Places