6 files changed, 2 insertions, 171 deletions
diff --git a/data/.cvsignore b/data/.cvsignore
index bbc091564..181c80d45 100644
--- a/data/.cvsignore
+++ b/data/.cvsignore
@@ -1,5 +1,4 @@
 GNOME_Epiphany_Automation.server
-GNOME_Epiphany_NautilusView.server
 Makefile
 Makefile.in
 *.schemas
diff --git a/data/GNOME_Epiphany_NautilusView.server.in b/data/GNOME_Epiphany_NautilusView.server.in
deleted file mode 100644
index 15ab31674..000000000
--- a/data/GNOME_Epiphany_NautilusView.server.in
+++ /dev/null
@@ -1,22 +0,0 @@
-<oaf_info>
-
-<oaf_server iid="OAFIID:GNOME_Epiphany_NautilusView" type="factory" location="OAFIID:GNOME_Epiphany_Automation_Factory">
-	<oaf_attribute name="repo_ids" type="stringv">
-		<item value="IDL:Bonobo/Unknown:1.0"/>
-		<item value="IDL:Bonobo/Control:1.0"/>
-		<item value="IDL:Nautilus/View:1.0"/>
-	</oaf_attribute>
-	<oaf_attribute name="name" type="string" _value="Epiphany Nautilus view"/>
-	<oaf_attribute name="description" type="string" _value="Epiphany content view component"/>
-	<oaf_attribute name="bonobo:supported_mime_types" type="stringv">
-		<item value="text/html"/>
-		<item value="text/xml"/>
-		<item value="x-directory/webdav"/>
-		<item value="x-directory/webdav-prefer-directory"/>
-	</oaf_attribute>
-	<oaf_attribute name="nautilus:view_as_name" type="string" _value="Web Page"/>
-	<oaf_attribute name="nautilus:view_as_label" type="string" _value="View as Web Page"/>
-	<oaf_attribute name="nautilus:viewer_label" type="string" _value="Web Page Viewer"/>
-</oaf_server>
-
-</oaf_info>
diff --git a/data/Makefile.am b/data/Makefile.am
index 0fc440e85..74b20670c 100644
--- a/data/Makefile.am
+++ b/data/Makefile.am
@@ -6,14 +6,6 @@ SUBDIRS = ui art glade
 
 dist_pkgdata_DATA = default-prefs.js
 
-NAUTILUS_VIEW_SERVER = GNOME_Epiphany_NautilusView.server.in
-
-if ENABLE_NAUTILUS_VIEW
-nautilus_server_in_files = $(NAUTILUS_VIEW_SERVER)
-nautilus_server_DATA = GNOME_Epiphany_NautilusView.server
-nautilus_serverdir = $(libdir)/bonobo/servers
-endif
-
 server_in_files = GNOME_Epiphany_Automation.server.in
 server_DATA = GNOME_Epiphany_Automation.server
 serverdir = $(libdir)/bonobo/servers
@@ -49,7 +41,7 @@ if GCONF_SCHEMAS_INSTALL
         fi
 endif
 
-EXTRA_DIST = $(NAUTILUS_VIEW_SERVER)	\
+EXTRA_DIST = \
 	     $(server_in_files)     	\
 	     $(schema_in_files)         \
 	     $(DESKTOP_IN_FILES)	\
@@ -60,7 +52,6 @@ EXTRA_DIST = $(NAUTILUS_VIEW_SERVER)	\
 	     check-mime.py
 
 DISTCLEANFILES = \
-	$(nautilus_server_DATA) \
 	$(server_DATA)		\
 	$(Applications_DATA)	\
 	$(schema_DATA)		\
diff --git a/data/ui/.cvsignore b/data/ui/.cvsignore
index 9139f3c9c..282522db0 100644
--- a/data/ui/.cvsignore
+++ b/data/ui/.cvsignore
@@ -1,8 +1,2 @@
 Makefile
 Makefile.in
-epiphany-ui.xml
-nautilus-epiphany-view.xml
-epiphany-toolbar.xml
-epiphany-bookmark-editor-ui.xml
-epiphany-toolbar-popup-ui.xml
-epiphany-history-window-ui.xml
diff --git a/data/ui/Makefile.am b/data/ui/Makefile.am
index ea2da5f20..f834511cd 100644
--- a/data/ui/Makefile.am
+++ b/data/ui/Makefile.am
@@ -1,6 +1,3 @@
-uixmldir = $(pkgdatadir)
-uixml_DATA = nautilus-epiphany-view.xml
-
 xmldir = $(pkgdatadir)
 xml_DATA = \
 	epiphany-fs-toolbar.xml		\
@@ -9,4 +6,4 @@ xml_DATA = \
 	epiphany-toolbar.xml		\
 	epiphany-history-window-ui.xml
 
-EXTRA_DIST = $(uixml_DATA) $(xml_DATA)
+EXTRA_DIST = $(xml_DATA)
diff --git a/data/ui/nautilus-epiphany-view.xml b/data/ui/nautilus-epiphany-view.xml
deleted file mode 100644
index 4858abd3f..000000000
--- a/data/ui/nautilus-epiphany-view.xml
+++ /dev/null
@@ -1,128 +0,0 @@
-<Root>
-<commands>
-
-        <cmd name="FilePrint" _label="Print"
-	_tip="Print the Current File" pixtype="stock" pixname="gtk-print"
-	accel="*Control*P"/>
-	
-        <cmd name="EditCut" _label="Cut" _tip="Cut the Selection"
-        pixtype="stock" pixname="gtk-cut"/>
-	
-        <cmd name="EditCopy" _label="Copy"
-	_tip="Copy the Selection" pixtype="stock" pixname="gtk-copy"/>
-	
-        <cmd name="EditPaste" _label="Paste"
-	_tip="Paste the Clipboard" pixtype="stock" pixname="gtk-paste"/>
-	
-	<cmd name="EditSelectAll" _label="Select All" _tip="Select the Entire Document"
-	accel="*Control*A"/>     
-
-	<cmd name="EditFind" _label="Find" _tip="Search for a String"
-        pixtype="stock" pixname="gtk-find" accel="*Control*F"/>
-
-
-	<cmd name="EPOpenInNewWindow" _label="Open in New Window"
-	pixtype="stock" pixname="gtk-new"/>
-	
-	<cmd name="EPCopyLinkLocation" _label="Copy Link Address"
-	pixtype="stock" pixname="gtk-copy"/>
-
-	<cmd name="EPDownloadLink" _label="Download Link"/>
-
-	<cmd name="EPOpenImage" _label="Open Image"
-	pixtype="stock" pixname="gtk-open"/>
-
-	<cmd name="EPOpenImageInNewWindow" _label="Open Image in New Window"/>
-	
-	<cmd name="EPSaveImageAs" _label="Save Image As..."
-	pixtype="stock" pixname="gtk-save"/>
-	
-	<cmd name="EPSetImageAsBackground" _label="Use Image As Background"/>
-	
-	<cmd name="EPCopyImageLocation" _label="Copy Image Address"
-	pixtype="stock" pixname="gtk-copy"/>
-
-	<cmd name="DPCopyLocation" _label="Copy Page Address"
-	pixtype="stock" pixname="gtk-copy"/>
-
-	<cmd name="DPOpenFrame" _label="Open Frame"
-	pixtype="stock" pixname="gtk-open"/>
-	
-	<cmd name="DPOpenFrameInNewWindow" _label="Open Frame in New Window"/>
-	
-	<cmd name="DPAddFrameBookmark" _label="Add Bookmark for Frame"
-	pixtype="stock" pixname="gtk-add"/>
-
-	<cmd name="DPSavePageAs" _label="Save Page As..."
-	pixtype="stock" pixname="gtk-save"/>
-	
-	<cmd name="DPSaveBackgroundAs" _label="Save Background As..."/>
-	
-	<cmd name="PPVGotoFirst" _label="First"/>
-	
-	<cmd name="PPVGotoLast" _label="Last"/>
-
-	<cmd name="PPVGoBack" _label="Previous"/>
-
-	<cmd name="PPVGoForward" _label="Next"/>
-
-	<cmd name="EPCopyEmail" _label="Copy Email Address"/>
-        
-</commands>
-
-<menu>
-	<submenu name="File" _label="_File">
-		<menuitem name="FilePrint" verb="" _label="_Print..."/>
-	</submenu>	
-	<submenu name="Edit" _label="_Edit">
-		<menuitem name="EditFind" verb="" _label="_Find..."/>
-	</submenu>
-	<submenu name="View">
-		<menuitem name="ViewEncoding" verb="" _label="Text _Encoding..."/>
-	</submenu>
-</menu>
-
-<popups>
-
-	<popup name="EphyEmbedInputPopup">
-		<menuitem name="EditCut" verb=""/>
-		<menuitem name="EditCopy" verb=""/>
-		<menuitem name="EditPaste" verb=""/>
-	</popup>
-
-        <popup name="EphyEmbedDocumentPopup">
-		<menuitem name="DPSavePageAs" verb=""/>
-		<menuitem name="DPSaveBackgroundAs" verb=""/>
-        	<menuitem name="DPCopyLocation" verb=""/>
-		<placeholder name="FrameItems">
-			<separator/>
-			<menuitem name="DPOpenFrame" verb=""/>
-			<menuitem name="DPOpenFrameInNewWindow" verb=""/>
-		</placeholder>
-	</popup>
-	
-	<popup name="EphyEmbedElementPopup">
-		<placeholder name="LinkItems">
-        		<menuitem name="EPOpenInNewWindow" verb=""/>
-			<menuitem name="EPCopyLinkLocation" verb=""/>
-			<menuitem name="EPDownloadLink" verb=""/>
-		</placeholder>
-		<placeholder name="EmailLinkItems">
-                        <menuitem name="EPCopyEmail" 
-                         pixtype="stock" pixname="gtk-copy"     
-                         verb=""/>
-                </placeholder>
-		<placeholder name="BetweenElements1">
-			<separator/>
-		</placeholder>
-		<placeholder name="ImageItems">
-			<menuitem name="EPOpenImage" verb=""/>
-			<menuitem name="EPOpenImageInNewWindow" verb=""/>
-			<menuitem name="EPSaveImageAs" verb=""/>
-			<menuitem name="EPSetImageAsBackground" verb=""/>
-			<menuitem name="EPCopyImageLocation" verb=""/>
-      		</placeholder>
-	</popup>
-</popups>
-
-</Root>