Move nautilus view component interface definition into libnautilus.

9 files changed, 58 insertions, 43 deletions

diff --git a/ChangeLog-20000414 b/ChangeLog-20000414
index 570dba64d..fa34cea3f 100644
--- a/ChangeLog-20000414
+++ b/ChangeLog-20000414
@@ -1,5 +1,15 @@
 2000-04-13  Ramiro Estrugo  <ramiro@eazel.com>
 
+	* idl/nautilus.idl,
+	  idl/Makefile.am,
+	  libnautilus/nautilus-view-component.idl,
+	  libnautilus/Makefile.am,
+	  libnautilus/.cvsignore:
+	
+	  Move nautilus view component interface definition into libnautilus.
+	
+2000-04-13  Ramiro Estrugo  <ramiro@eazel.com>
+
 	* librsvg/.cvsignore:
 	.cvsignore file for new rsvg directory.
 	
diff --git a/idl/Makefile.am b/idl/Makefile.am
index 708315f06..c3ad1b097 100644
--- a/idl/Makefile.am
+++ b/idl/Makefile.am
@@ -1,4 +1,3 @@
 EXTRA_DIST=					\
 	GNOME_Desktop_FileOperationService.idl	\
-	nautilus.idl				\
 	fsextension.idl
diff --git a/libnautilus-extensions/.cvsignore b/libnautilus-extensions/.cvsignore
index 143258f4f..143a40611 100644
--- a/libnautilus-extensions/.cvsignore
+++ b/libnautilus-extensions/.cvsignore
@@ -9,8 +9,8 @@ fsextension_idl_stamp
 fsextension-skels.c
 fsextension-stubs.c
 libnautilus.la
-nautilus-common.c
-nautilus.h
-nautilus_idl_stamp
-nautilus-skels.c
-nautilus-stubs.c
+nautilus-view-component-stubs.c
+nautilus-view-component-skels.c
+nautilus-view-component-common.c
+nautilus-view-component.h
+nautilus_view_component_idl_stamp
diff --git a/libnautilus-extensions/Makefile.am b/libnautilus-extensions/Makefile.am
index bbd8c05ea..262c3f544 100644
--- a/libnautilus-extensions/Makefile.am
+++ b/libnautilus-extensions/Makefile.am
@@ -21,9 +21,9 @@ libnautilus_la_LDFLAGS=\
 	$(XML_LIBS) \
 	$(LIBPNG)
 
-nautilus_idl_sources=nautilus-stubs.c nautilus-skels.c nautilus.h nautilus-common.c
+nautilus_view_component_idl_sources=nautilus-view-component-stubs.c nautilus-view-component-skels.c nautilus-view-component.h nautilus-view-component-common.c
 fsextension_idl_sources=fsextension-stubs.c fsextension-skels.c fsextension-common.c fsextension.h
-BUILT_SOURCES=$(nautilus_idl_sources)
+BUILT_SOURCES=$(nautilus_view_component_idl_sources)
 
 libnautilusincludedir=$(includedir)/libnautilus
 libnautilusinclude_HEADERS=			\
@@ -57,13 +57,13 @@ libnautilusinclude_HEADERS=			\
 	nautilus-string.h			\
 	nautilus-xml-extensions.h		\
 	nautilus-zoomable.h			\
-	nautilus.h				\
+	nautilus-view-component.h		\
 	ntl-content-view-frame.h		\
 	ntl-meta-view-frame.h			\
 	ntl-view-frame.h			\
 	$(NULL)
 
-libnautilus_la_SOURCES=$(nautilus_idl_sources)	\
+libnautilus_la_SOURCES=$(nautilus_view_component_idl_sources)	\
 	bonobo-stream-vfs.c			\
 	gtkscrollframe.c			\
 	nautilus-background-canvas-group.c	\
@@ -104,15 +104,17 @@ libnautilus_la_SOURCES=$(nautilus_idl_sources)	\
 	$(fsextension_idl_sources)		\
 	$(NULL)
 
-$(nautilus_idl_sources): nautilus_idl_stamp
+$(nautilus_view_component_idl_sources): nautilus_view_component_idl_stamp
 $(fsextension_idl_sources): fsextension_idl_stamp
 
-nautilus_idl_stamp: $(top_srcdir)/idl/nautilus.idl
-	orbit-idl `gnome-config --cflags idl` $(top_srcdir)/idl/nautilus.idl
-	touch nautilus_idl_stamp
+nautilus_view_component_idl_stamp: nautilus-view-component.idl
+	orbit-idl `gnome-config --cflags idl` nautilus-view-component.idl
+	touch nautilus_view_component_idl_stamp
 
 fsextension_idl_stamp: $(top_srcdir)/idl/fsextension.idl
 	orbit-idl `gnome-config --cflags idl` $(top_srcdir)/idl/fsextension.idl
 	touch fsextension_idl_stamp
 
-CLEANFILES=nautilus_idl_stamp fsextension_idl_stamp
+CLEANFILES=nautilus_view_component_idl_stamp fsextension_idl_stamp
+
+EXTRA_DIST = nautilus-view-component.idl
diff --git a/libnautilus-private/.cvsignore b/libnautilus-private/.cvsignore
index 143258f4f..143a40611 100644
--- a/libnautilus-private/.cvsignore
+++ b/libnautilus-private/.cvsignore
@@ -9,8 +9,8 @@ fsextension_idl_stamp
 fsextension-skels.c
 fsextension-stubs.c
 libnautilus.la
-nautilus-common.c
-nautilus.h
-nautilus_idl_stamp
-nautilus-skels.c
-nautilus-stubs.c
+nautilus-view-component-stubs.c
+nautilus-view-component-skels.c
+nautilus-view-component-common.c
+nautilus-view-component.h
+nautilus_view_component_idl_stamp
diff --git a/libnautilus-private/Makefile.am b/libnautilus-private/Makefile.am
index bbd8c05ea..262c3f544 100644
--- a/libnautilus-private/Makefile.am
+++ b/libnautilus-private/Makefile.am
@@ -21,9 +21,9 @@ libnautilus_la_LDFLAGS=\
 	$(XML_LIBS) \
 	$(LIBPNG)
 
-nautilus_idl_sources=nautilus-stubs.c nautilus-skels.c nautilus.h nautilus-common.c
+nautilus_view_component_idl_sources=nautilus-view-component-stubs.c nautilus-view-component-skels.c nautilus-view-component.h nautilus-view-component-common.c
 fsextension_idl_sources=fsextension-stubs.c fsextension-skels.c fsextension-common.c fsextension.h
-BUILT_SOURCES=$(nautilus_idl_sources)
+BUILT_SOURCES=$(nautilus_view_component_idl_sources)
 
 libnautilusincludedir=$(includedir)/libnautilus
 libnautilusinclude_HEADERS=			\
@@ -57,13 +57,13 @@ libnautilusinclude_HEADERS=			\
 	nautilus-string.h			\
 	nautilus-xml-extensions.h		\
 	nautilus-zoomable.h			\
-	nautilus.h				\
+	nautilus-view-component.h		\
 	ntl-content-view-frame.h		\
 	ntl-meta-view-frame.h			\
 	ntl-view-frame.h			\
 	$(NULL)
 
-libnautilus_la_SOURCES=$(nautilus_idl_sources)	\
+libnautilus_la_SOURCES=$(nautilus_view_component_idl_sources)	\
 	bonobo-stream-vfs.c			\
 	gtkscrollframe.c			\
 	nautilus-background-canvas-group.c	\
@@ -104,15 +104,17 @@ libnautilus_la_SOURCES=$(nautilus_idl_sources)	\
 	$(fsextension_idl_sources)		\
 	$(NULL)
 
-$(nautilus_idl_sources): nautilus_idl_stamp
+$(nautilus_view_component_idl_sources): nautilus_view_component_idl_stamp
 $(fsextension_idl_sources): fsextension_idl_stamp
 
-nautilus_idl_stamp: $(top_srcdir)/idl/nautilus.idl
-	orbit-idl `gnome-config --cflags idl` $(top_srcdir)/idl/nautilus.idl
-	touch nautilus_idl_stamp
+nautilus_view_component_idl_stamp: nautilus-view-component.idl
+	orbit-idl `gnome-config --cflags idl` nautilus-view-component.idl
+	touch nautilus_view_component_idl_stamp
 
 fsextension_idl_stamp: $(top_srcdir)/idl/fsextension.idl
 	orbit-idl `gnome-config --cflags idl` $(top_srcdir)/idl/fsextension.idl
 	touch fsextension_idl_stamp
 
-CLEANFILES=nautilus_idl_stamp fsextension_idl_stamp
+CLEANFILES=nautilus_view_component_idl_stamp fsextension_idl_stamp
+
+EXTRA_DIST = nautilus-view-component.idl
diff --git a/libnautilus/.cvsignore b/libnautilus/.cvsignore
index 143258f4f..143a40611 100644
--- a/libnautilus/.cvsignore
+++ b/libnautilus/.cvsignore
@@ -9,8 +9,8 @@ fsextension_idl_stamp
 fsextension-skels.c
 fsextension-stubs.c
 libnautilus.la
-nautilus-common.c
-nautilus.h
-nautilus_idl_stamp
-nautilus-skels.c
-nautilus-stubs.c
+nautilus-view-component-stubs.c
+nautilus-view-component-skels.c
+nautilus-view-component-common.c
+nautilus-view-component.h
+nautilus_view_component_idl_stamp
diff --git a/libnautilus/Makefile.am b/libnautilus/Makefile.am
index bbd8c05ea..262c3f544 100644
--- a/libnautilus/Makefile.am
+++ b/libnautilus/Makefile.am
@@ -21,9 +21,9 @@ libnautilus_la_LDFLAGS=\
 	$(XML_LIBS) \
 	$(LIBPNG)
 
-nautilus_idl_sources=nautilus-stubs.c nautilus-skels.c nautilus.h nautilus-common.c
+nautilus_view_component_idl_sources=nautilus-view-component-stubs.c nautilus-view-component-skels.c nautilus-view-component.h nautilus-view-component-common.c
 fsextension_idl_sources=fsextension-stubs.c fsextension-skels.c fsextension-common.c fsextension.h
-BUILT_SOURCES=$(nautilus_idl_sources)
+BUILT_SOURCES=$(nautilus_view_component_idl_sources)
 
 libnautilusincludedir=$(includedir)/libnautilus
 libnautilusinclude_HEADERS=			\
@@ -57,13 +57,13 @@ libnautilusinclude_HEADERS=			\
 	nautilus-string.h			\
 	nautilus-xml-extensions.h		\
 	nautilus-zoomable.h			\
-	nautilus.h				\
+	nautilus-view-component.h		\
 	ntl-content-view-frame.h		\
 	ntl-meta-view-frame.h			\
 	ntl-view-frame.h			\
 	$(NULL)
 
-libnautilus_la_SOURCES=$(nautilus_idl_sources)	\
+libnautilus_la_SOURCES=$(nautilus_view_component_idl_sources)	\
 	bonobo-stream-vfs.c			\
 	gtkscrollframe.c			\
 	nautilus-background-canvas-group.c	\
@@ -104,15 +104,17 @@ libnautilus_la_SOURCES=$(nautilus_idl_sources)	\
 	$(fsextension_idl_sources)		\
 	$(NULL)
 
-$(nautilus_idl_sources): nautilus_idl_stamp
+$(nautilus_view_component_idl_sources): nautilus_view_component_idl_stamp
 $(fsextension_idl_sources): fsextension_idl_stamp
 
-nautilus_idl_stamp: $(top_srcdir)/idl/nautilus.idl
-	orbit-idl `gnome-config --cflags idl` $(top_srcdir)/idl/nautilus.idl
-	touch nautilus_idl_stamp
+nautilus_view_component_idl_stamp: nautilus-view-component.idl
+	orbit-idl `gnome-config --cflags idl` nautilus-view-component.idl
+	touch nautilus_view_component_idl_stamp
 
 fsextension_idl_stamp: $(top_srcdir)/idl/fsextension.idl
 	orbit-idl `gnome-config --cflags idl` $(top_srcdir)/idl/fsextension.idl
 	touch fsextension_idl_stamp
 
-CLEANFILES=nautilus_idl_stamp fsextension_idl_stamp
+CLEANFILES=nautilus_view_component_idl_stamp fsextension_idl_stamp
+
+EXTRA_DIST = nautilus-view-component.idl
diff --git a/idl/nautilus.idl b/libnautilus/nautilus-view-component.idl
index ae73d693d..ae73d693d 100644
--- a/idl/nautilus.idl
+++ b/libnautilus/nautilus-view-component.idl