summaryrefslogtreecommitdiff
path: root/Makefile.am
diff options
context:
space:
mode:
authorAlexander Larsson <alexl@redhat.com>2008-10-02 14:31:52 +0000
committerAlexander Larsson <alexl@src.gnome.org>2008-10-02 14:31:52 +0000
commit9c068ad3e649beec2b237ee5696fae0280b80a23 (patch)
treeeaa1dfdf9e7a7d02edc65d692b7ac3d77be5bc9d /Makefile.am
parent31d3fc91d88afa3c8f3d167f7910ed129e1d4980 (diff)
downloadnautilus-9c068ad3e649beec2b237ee5696fae0280b80a23.tar.gz
Renamed nautilus.desktop to nautilus-browser.desktop (this is what it
2008-10-02 Alexander Larsson <alexl@redhat.com> * Makefile.am: * nautilus-browser.desktop.in.in: * nautilus.desktop.in.in: Renamed nautilus.desktop to nautilus-browser.desktop (this is what it does, launch a browser window with no desktop) Created new NoDisplay nautilus.desktop file that is used for autostarting nautilus from gnome-session. * configure.in: Pull in the right cflags/libs for libegg Add nautilus-browser.desktop.in to output * cut-n-paste-code/libegg/Makefile.am: * cut-n-paste-code/libegg/eggdesktopfile.[ch]: Added. * cut-n-paste-code/libegg/eggsmclient-private.h: Added. * cut-n-paste-code/libegg/eggsmclient-xsmp.c: Added. * cut-n-paste-code/libegg/eggsmclient.[ch]: Added. Import eggsmclient from libegg. Save data in desktop file instead of a separate file as per the new gnome-session. * cut-n-paste-code/libegg/eggtreemultidnd.c: Minor update from libegg * src/nautilus-application.[ch]: Use eggsmclient for session handling instead of gnome-client. * src/nautilus-main.c: Don't use gnome_program, instead use eggsmsession and g_option_context_parse directly. This removes support for some internal commandline arguments that are not used anymore. svn path=/trunk/; revision=14680
Diffstat (limited to 'Makefile.am')
-rw-r--r--Makefile.am1
1 files changed, 1 insertions, 0 deletions
diff --git a/Makefile.am b/Makefile.am
index b5571975a..cfd3d90df 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -10,6 +10,7 @@ desktop_in_files = \
nautilus-computer.desktop.in \
nautilus-folder-handler.desktop.in \
nautilus-file-management-properties.desktop.in \
+ nautilus-browser.desktop.in \
nautilus-autorun-software.desktop.in
SUBDIRS = \