diff options
| author | Alex Larsson <alexl@redhat.com> | 2001-09-05 17:12:22 +0000 |
|---|---|---|
| committer | Alexander Larsson <alexl@src.gnome.org> | 2001-09-05 17:12:22 +0000 |
| commit | 47a2fa6e4c4269205d3fa8f0eb40c99991536477 (patch) | |
| tree | 5835eb7d55e73ef127a60670f919022b79199c54 /Makefile.am | |
| parent | a4cea258532fafc95ce07ff00193589c9ca757bc (diff) | |
| download | nautilus-47a2fa6e4c4269205d3fa8f0eb40c99991536477.tar.gz | |
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.
Diffstat (limited to 'Makefile.am')
| -rw-r--r-- | Makefile.am | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/Makefile.am b/Makefile.am index 52fa50a8f..be853d4ca 100644 --- a/Makefile.am +++ b/Makefile.am @@ -42,6 +42,8 @@ EXTRA_DIST= \ nautilus-help.desktop \ nautilus-help.desktop.in \ nautilus-launch-icon.png \ + gnome-starthere-96.png \ + gnome-starthere.png \ nautilusConf.sh.in \ nautilus-config.in \ ChangeLog-20000414 \ @@ -57,7 +59,9 @@ EXTRA_DIST= \ $(NULL) appicondir = $(datadir)/pixmaps -appicon_DATA = nautilus-launch-icon.png +appicon_DATA = nautilus-launch-icon.png \ + gnome-starthere-96.png \ + gnome-starthere.png Applicationsdir = $(datadir)/gnome/apps/Applications Applications_DATA = $(DESKTOP_FILES) |