Merge some stuff from the redhat-outstanding-patches branch

2001-09-04  Alex Larsson  <alexl@redhat.com>

	Merge some stuff from the redhat-outstanding-patches branch

	* libnautilus-private/nautilus-file-utilities.[ch]
	(nautilus_user_main_directory_exists, nautilus_get_user_main_directory):
	Get rid of these. No more ~/Nautilus

	* libnautilus-private/nautilus-global-preferences.c:
	(default_home_location_callback): Always use your normal homedir
	as the home dir.

	* src/nautilus-application.c (check_required_directories): Don't
	create ~/Nautilus.
	(create_starthere_link_callback, nautilus_application_startup):
	Create a start here icon on the desktop.
	Turn of first time druid (by setting first time flag).
	(nautilus_application_startup, check_for_kdesktop, look_for_kdesktop_recursive,
	has_wm_state, get_self_typed_prop)
	Don't manage the desktop if kdesktop is running.

	* src/nautilus-first-time-druid.[ch]:
	Remove ~/Nautilus handling.
	s/druid_set_first_time_file_flag/nautilus_set_first_time_file_flag/

	* src/nautilus-shell-ui.xml:
	* src/nautilus-window-menus.c:
	Add start here to the go menu. Remove leftovers of the "support" menuimem.

	* src/file-manager/fm-directory-view.c:
	Move scripts to ~/.gnome/nautilus-scripts

	* Makefile.am:
	Add starthere icons

	* data/Makefile.am:
	* data/*.desktop.in:
	* data/*.directory.in:
	Add starthere desktop files.

11 files changed, 117 insertions, 5 deletions

diff --git a/data/Makefile.am b/data/Makefile.am
index d2f55afd0..fd76d553b 100644
--- a/data/Makefile.am
+++ b/data/Makefile.am
@@ -1,18 +1,63 @@
 NULL=
 
+@XML_I18N_MERGE_DESKTOP_RULE@
+@XML_I18N_MERGE_DIRECTORY_RULE@
+
+DESKTOP_IN_FILES=	favorites.desktop.in		\
+			programs.desktop.in		\
+			starthere.desktop.in		\
+			sysconfig.desktop.in		\
+			preferences.desktop.in		\
+			serverconfig.desktop.in		\
+			starthere-link.desktop.in	\
+			$(NULL)
+
+DIRECTORY_IN_FILES=	serverconfig.directory.in	\
+			starthere.directory.in		\
+			sysconfig.directory.in		\
+			$(NULL)
+
+DESKTOP_FILES=$(DESKTOP_IN_FILES:.desktop.in=.desktop)
+DIRECTORY_FILES=$(DIRECTORY_IN_FILES:.directory.in=.directory)
+
+startheredir= $(sysconfdir)/X11/starthere
+starthere_DATA= 	favorites.desktop	\
+			programs.desktop	\
+			sysconfig.desktop	\
+			preferences.desktop	\
+			serverconfig.desktop	\
+			$(NULL)
+
+DESKTOP_FILES=$(DESKTOP_IN_FILES:.in=)
+
 nautilusdatadir = $(datadir)/nautilus
 
 nautilusdata_DATA = \
-	browser.xml \
-	static_bookmarks.xml \
-	nautilus-extras.placeholder \
-	nautilus-suggested.placeholder \
+	browser.xml 			\
+	static_bookmarks.xml 		\
+	nautilus-extras.placeholder 	\
+	nautilus-suggested.placeholder 	\
+	starthere.desktop		\
+	starthere-link.desktop		\
 	$(NULL)
 
-EXTRA_DIST = $(nautilusdata_DATA)
+EXTRA_DIST = $(nautilusdata_DATA) \
+	$(DESKTOP_IN_FILES)			\
+	$(DESKTOP_FILES)			\
+	$(DIRECTORY_IN_FILES)			\
+	$(DIRECTORY_FILES)			\
+	$(NULL)
 
 SUBDIRS = \
 	emblems \
 	linksets \
 	patterns \
 	$(NULL)
+
+install-data-local: $(DIRECTORY_FILES)
+	$(mkinstalldirs) $(sysconfdir)/X11/starthere
+	$(mkinstalldirs) $(sysconfdir)/X11/starthere/sysconfig
+	$(mkinstalldirs) $(sysconfdir)/X11/starthere/serverconfig
+	$(INSTALL_DATA) starthere.directory $(sysconfdir)/X11/starthere/.directory
+	$(INSTALL_DATA) sysconfig.directory $(sysconfdir)/X11/starthere/sysconfig/.directory
+	$(INSTALL_DATA) serverconfig.directory $(sysconfdir)/X11/starthere/serverconfig/.directory
diff --git a/data/favorites.desktop.in b/data/favorites.desktop.in
new file mode 100644
index 000000000..96ede889a
--- /dev/null
+++ b/data/favorites.desktop.in
@@ -0,0 +1,7 @@
+[Desktop Entry]
+Type=Link
+_Name=Favorites
+_Comment=Favorite applications
+URL=favorites:
+Icon=gnome-favorites.png
+Terminal=0
diff --git a/data/preferences.desktop.in b/data/preferences.desktop.in
new file mode 100644
index 000000000..a054df109
--- /dev/null
+++ b/data/preferences.desktop.in
@@ -0,0 +1,7 @@
+[Desktop Entry]
+Type=Link
+_Name=Preferences
+_Comment=Adjust your user environment
+URL=preferences:
+Icon=apple-red.png
+Terminal=0
diff --git a/data/programs.desktop.in b/data/programs.desktop.in
new file mode 100644
index 000000000..179efcb7f
--- /dev/null
+++ b/data/programs.desktop.in
@@ -0,0 +1,7 @@
+[Desktop Entry]
+_Name=Programs
+_Comment=Browse available software
+URL=programs:
+Icon=gnome-default-dlg.png
+Terminal=0
+Type=Link
diff --git a/data/serverconfig.desktop.in b/data/serverconfig.desktop.in
new file mode 100644
index 000000000..566bfb974
--- /dev/null
+++ b/data/serverconfig.desktop.in
@@ -0,0 +1,7 @@
+[Desktop Entry]
+Type=Link
+_Name=Server Configuration
+_Comment=Configure network services (web server, DNS server, etc.)
+URL=server-settings:
+Icon=gnome-globe.png
+Terminal=0
diff --git a/data/serverconfig.directory.in b/data/serverconfig.directory.in
new file mode 100644
index 000000000..2cf5eeb93
--- /dev/null
+++ b/data/serverconfig.directory.in
@@ -0,0 +1,5 @@
+[Desktop Entry]
+_Name=Server Configuration
+_Comment=Configure network services
+Icon=gnome-globe.png
+Type=Directory
diff --git a/data/starthere-link.desktop.in b/data/starthere-link.desktop.in
new file mode 100644
index 000000000..7f61ed0a5
--- /dev/null
+++ b/data/starthere-link.desktop.in
@@ -0,0 +1,8 @@
+[Desktop Entry]
+Type=Link
+_Name=Start Here
+_Comment=Start Here
+URL=start-here:
+Icon=gnome-starthere.png
+X-Nautilus-Icon=gnome-starthere
+Terminal=0
diff --git a/data/starthere.desktop.in b/data/starthere.desktop.in
new file mode 100644
index 000000000..0a87659ed
--- /dev/null
+++ b/data/starthere.desktop.in
@@ -0,0 +1,8 @@
+[Desktop Entry]
+_Name=Start Here
+_Comment=Start Here
+Exec=nautilus start-here:
+Icon=gnome-starthere.png
+X-Nautilus-Icon=gnome-starthere
+Terminal=0
+Type=Application
diff --git a/data/starthere.directory.in b/data/starthere.directory.in
new file mode 100644
index 000000000..a70f05dbb
--- /dev/null
+++ b/data/starthere.directory.in
@@ -0,0 +1,6 @@
+[Desktop Entry]
+_Name=Start Here
+_Comment=Start Here
+Icon=gnome-starthere.png
+X-Nautilus-Icon=gnome-starthere
+Type=Directory
diff --git a/data/sysconfig.desktop.in b/data/sysconfig.desktop.in
new file mode 100644
index 000000000..0d5e3cf30
--- /dev/null
+++ b/data/sysconfig.desktop.in
@@ -0,0 +1,7 @@
+[Desktop Entry]
+Type=Link
+_Name=System Settings
+_Comment=Change systemwide settings (affects all users)
+URL=system-settings:
+Icon=gnome-settings.png
+Terminal=0
diff --git a/data/sysconfig.directory.in b/data/sysconfig.directory.in
new file mode 100644
index 000000000..c6301ec40
--- /dev/null
+++ b/data/sysconfig.directory.in
@@ -0,0 +1,5 @@
+[Desktop Entry]
+_Name=System Settings
+_Comment=Change systemwide settings (affects all users)
+Icon=gnome-settings.png
+Type=Directory