general: remove desktop support

6 files changed, 2 insertions, 100 deletions

diff --git a/data/.gitignore b/data/.gitignore
index fe14726f1..89808d77c 100644
--- a/data/.gitignore
+++ b/data/.gitignore
@@ -1,7 +1,5 @@
 /lineup-parameters
 /nautilus-autorun-software.desktop
-/nautilus-autostart.desktop
-/nautilus-classic.desktop
 /org.freedesktop.FileManager1.service
 /org.gnome.Nautilus.appdata.xml
 /org.gnome.Nautilus.desktop
diff --git a/data/meson.build b/data/meson.build
index a67999761..e185428f4 100644
--- a/data/meson.build
+++ b/data/meson.build
@@ -22,24 +22,6 @@ desktop_autorun_software = i18n.merge_file ('desktop-autorun-software',
                                             po_dir: po_dir,
                                             type: 'desktop')
 
-desktop_autostart = i18n.merge_file ('desktop-autostart',
-                                     input: 'nautilus-autostart.desktop.in',
-                                     output: 'nautilus-autostart.desktop',
-                                     install: true,
-                                     install_dir: join_paths (sysconfdir, 'xdg', 'autostart'),
-                                     po_dir: po_dir,
-                                     type: 'desktop')
-
-if get_option ('enable-desktop')
-    desktop_classic = i18n.merge_file ('desktop-classic',
-                                       input: 'nautilus-classic.desktop.in',
-                                       output: 'nautilus-classic.desktop',
-                                       install: true,
-                                       install_dir: desktopdir,
-                                       po_dir: po_dir,
-                                       type: 'desktop')
-endif
-
 appdata = i18n.merge_file ('appdata',
                            input: 'org.gnome.Nautilus.appdata.xml.in',
                            output: 'org.gnome.Nautilus.appdata.xml',
@@ -72,12 +54,6 @@ if desktop_file_validate.found ()
           args: [desktop.full_path ()])
     test ('validate-desktop-autorun-software', desktop_file_validate,
           args: [desktop_autorun_software.full_path ()])
-    test ('validate-desktop-autostart', desktop_file_validate,
-          args: [desktop_autostart.full_path ()])
-    if get_option ('enable-desktop')
-        test ('validate-desktop-classic', desktop_file_validate,
-          args: [desktop_classic.full_path ()])
-    endif
 endif
 
 appstream_util = find_program ('appstream-util', required: false)
diff --git a/data/nautilus-autostart.desktop.in b/data/nautilus-autostart.desktop.in
deleted file mode 100644
index 10926da74..000000000
--- a/data/nautilus-autostart.desktop.in
+++ /dev/null
@@ -1,7 +0,0 @@
-[Desktop Entry]
-Type=Application
-Name=Files
-Exec=nautilus-desktop
-OnlyShowIn=GNOME;Unity;
-AutostartCondition=GSettings org.gnome.desktop.background show-desktop-icons
-NoDisplay=true
diff --git a/data/nautilus-classic.desktop.in b/data/nautilus-classic.desktop.in
deleted file mode 100644
index 4da9777b1..000000000
--- a/data/nautilus-classic.desktop.in
+++ /dev/null
@@ -1,11 +0,0 @@
-[Desktop Entry]
-Type=Application
-Name=Desktop Icons
-Comment=Classic session desktop file for desktop icons
-Exec=nautilus-desktop --force
-OnlyShowIn=GNOME;
-NoDisplay=true
-X-GNOME-Autostart-Phase=Desktop
-X-GNOME-Autostart-Notify=true
-X-GNOME-AutoRestart=true
-X-GNOME-Provides=filemanager
diff --git a/data/org.gnome.nautilus.gschema.xml b/data/org.gnome.nautilus.gschema.xml
index 4cbb7647b..d4ca8f2a3 100644
--- a/data/org.gnome.nautilus.gschema.xml
+++ b/data/org.gnome.nautilus.gschema.xml
@@ -68,7 +68,6 @@
     <child schema="org.gnome.nautilus.compression" name="compression"/>
     <child schema="org.gnome.nautilus.icon-view" name="icon-view"/>
     <child schema="org.gnome.nautilus.list-view" name="list-view"/>
-    <child schema="org.gnome.nautilus.desktop" name="desktop"/>
     <child schema="org.gnome.nautilus.window-state" name="window-state"/>
   </schema>
 
@@ -231,7 +230,7 @@
     <key type="as" name="captions">
       <default>[ 'none', 'none', 'none' ]</default>
       <summary>List of possible captions on icons</summary>
-      <description>A list of captions below an icon in the icon view and the desktop. The actual number of captions shown depends on the zoom level. Some possible values are: “size”, “type”, “date_modified”, “owner”, “group”, “permissions”, and “mime_type”.</description>
+      <description>A list of captions below an icon in the icon view. The actual number of captions shown depends on the zoom level. Some possible values are: “size”, “type”, “date_modified”, “owner”, “group”, “permissions”, and “mime_type”.</description>
     </key>
     <key name="default-zoom-level" enum="org.gnome.nautilus.CanvasZoomLevel">
       <default>'large'</default>
@@ -269,59 +268,6 @@
     </key>
   </schema>
 
-  <schema path="/org/gnome/nautilus/desktop/" id="org.gnome.nautilus.desktop" gettext-domain="nautilus">
-    <key type="s" name="font">
-      <default l10n="messages" context="desktop-font">''</default>
-      <summary>Desktop font</summary>
-      <description>The font description used for the icons on the desktop.</description>
-    </key>
-    <key type="b" name="home-icon-visible">
-      <default>true</default>
-      <summary>Home icon visible on desktop</summary>
-      <description>If this is set to true, an icon linking to the home folder will be put on the desktop.</description>
-    </key>
-    <key type="b" name="trash-icon-visible">
-      <default>true</default>
-      <summary>Trash icon visible on desktop</summary>
-      <description>If this is set to true, an icon linking to the Trash will be put on the desktop.</description>
-    </key>
-    <key type="b" name="volumes-visible">
-      <default>true</default>
-      <summary>Show mounted volumes on the desktop</summary>
-      <description>If this is set to true, icons linking to mounted volumes will be put on the desktop.</description>
-    </key>
-    <key type="b" name="network-icon-visible">
-      <default>false</default>
-      <summary>Network Servers icon visible on the desktop</summary>
-      <description>If this is set to true, an icon linking to the Network Servers view will be put on the desktop.</description>
-    </key>
-    <key type="s" name="home-icon-name">
-      <default l10n="messages" context="home-icon-name">'Home'</default>
-      <summary>Desktop home icon name</summary>
-      <description>This name can be set if you want a custom name for the home icon on the desktop.</description>
-    </key>
-    <key type="s" name="trash-icon-name">
-      <default l10n="messages" context="trash-icon-name">'Trash'</default>
-      <summary>Desktop Trash icon name</summary>
-      <description>This name can be set if you want a custom name for the Trash icon on the desktop.</description>
-    </key>
-    <key type="s" name="network-icon-name">
-      <default l10n="messages" context="network-icon-name">'Network Servers'</default>
-      <summary>Network servers icon name</summary>
-      <description>This name can be set if you want a custom name for the network servers icon on the desktop.</description>
-    </key>
-    <key type="i" name="text-ellipsis-limit">
-      <default>3</default>
-      <summary>Text Ellipsis Limit</summary>
-      <description>An integer specifying how parts of overlong file names should be replaced by ellipses on the desktop. If the number is larger than 0, the file name will not exceed the given number of lines. If the number is 0 or smaller, no limit is imposed on the number of displayed lines.</description>
-    </key>
-    <key type="b" name="background-fade">
-      <default>true</default>
-      <summary>Fade the background on change</summary>
-      <description>If set to true, then Nautilus will use a fade effect to change the desktop background.</description>
-    </key>
-  </schema>
-
   <schema path="/org/gnome/nautilus/window-state/" id="org.gnome.nautilus.window-state" gettext-domain="nautilus">
     <key type="s" name="geometry">
       <default>''</default>
diff --git a/data/run-uncrustify.sh b/data/run-uncrustify.sh
index 39bb29006..4f98b5db2 100755
--- a/data/run-uncrustify.sh
+++ b/data/run-uncrustify.sh
@@ -2,7 +2,7 @@
 DATA=$(dirname "$BASH_SOURCE")
 if [ -x "$DATA/lineup-parameters" ];
 then
-    for DIR in "$DATA/../"{src,nautilus-desktop,test,libnautilus-extension,eel,nautilus-sendto-extension}
+    for DIR in "$DATA/../"{src,test,libnautilus-extension,eel,nautilus-sendto-extension}
     do
         for FILE in $(find "$DIR" -name "*.c")
         do