Add copyright notice.

2002-05-17  Alexander Larsson  <alexl@redhat.com>

	* components/history/nautilus-history-view.h:
	Add copyright notice.

	* components/notes/Makefile.am:
	* components/notes/Nautilus_View_notes.server.in:
	* components/notes/nautilus-notes.c:
	Make the notes component a shlib component.

5 files changed, 64 insertions, 37 deletions

diff --git a/components/history/nautilus-history-view.h b/components/history/nautilus-history-view.h
index 0d35100d7..8061814df 100644
--- a/components/history/nautilus-history-view.h
+++ b/components/history/nautilus-history-view.h
@@ -1,3 +1,29 @@
+/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
+
+/*
+ *  Nautilus
+ *
+ *  Copyright (C) 1999, 2000 Red Hat, Inc.
+ *  Copyright (C) 2000, 2001 Eazel, Inc.
+ *
+ *  This library is free software; you can redistribute it and/or
+ *  modify it under the terms of the GNU General Public License as
+ *  published by the Free Software Foundation; either version 2 of the
+ *  License, or (at your option) any later version.
+ *
+ *  This library is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ *  General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with this library; if not, write to the Free Software
+ *  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ *
+ *  Authors: Elliot Lee <sopwith@redhat.com>
+ *           Darin Adler <darin@bentspoon.com>
+ *
+ */
 #ifndef _NAUTILUS_HISTORY_VIEW_H
 #define _NAUTILUS_HISTORY_VIEW_H
 
diff --git a/components/notes/Makefile.am b/components/notes/Makefile.am
index 703fb7eef..e27dd9999 100644
--- a/components/notes/Makefile.am
+++ b/components/notes/Makefile.am
@@ -1,7 +1,5 @@
 NULL =
 
-bin_PROGRAMS=nautilus-notes
-
 INCLUDES=\
 	-DG_LOG_DOMAIN=\"Nautilus-Notes\" \
 	-I$(top_srcdir)		\
@@ -10,13 +8,18 @@ INCLUDES=\
 	$(NULL)	\
 	-DGTK_ENABLE_BROKEN
 
-LDADD=\
+lib_LTLIBRARIES = libnautilus-notes-view.la
+
+libnautilus_notes_view_la_SOURCES = nautilus-notes.c
+
+libnautilus_notes_view_la_LIBADD =               \
 	$(top_builddir)/libnautilus/libnautilus.la \
 	$(top_builddir)/libnautilus-private/libnautilus-private.la	\
 	$(COMPONENT_LIBS) \
 	$(NULL)
 
-nautilus_notes_SOURCES=nautilus-notes.c
+libnautilus_notes_view_la_LDFLAGS = -module -avoid-version
+
 
 serverdir = $(libdir)/bonobo/servers
 server_in_files = Nautilus_View_notes.server.in
diff --git a/components/notes/Nautilus_View_notes.server.in b/components/notes/Nautilus_View_notes.server.in
index bbe9130fe..d00ce060c 100644
--- a/components/notes/Nautilus_View_notes.server.in
+++ b/components/notes/Nautilus_View_notes.server.in
@@ -1,13 +1,6 @@
 <oaf_info>
 
-<oaf_server iid="OAFIID:Nautilus_Notes_View_Factory" type="exe" location="nautilus-notes">
-	<oaf_attribute name="repo_ids" type="stringv">
-		<item value="IDL:GNOME/ObjectFactory:1.0"/>
-	</oaf_attribute>
-	<oaf_attribute name="description" type="string" _value="Factory for annotation view"/>
-</oaf_server>
-
-<oaf_server iid="OAFIID:Nautilus_Notes_View" type="factory" location="OAFIID:Nautilus_Notes_View_Factory">
+<oaf_server iid="OAFIID:Nautilus_Notes_View" type="shlib" location="libnautilus-notes-view.so">
 	<oaf_attribute name="repo_ids" type="stringv">
 		<item value="IDL:Bonobo/Unknown:1.0"/>
 		<item value="IDL:Bonobo/Control:1.0"/>
diff --git a/components/notes/Nautilus_View_notes.server.in.in b/components/notes/Nautilus_View_notes.server.in.in
index bbe9130fe..d00ce060c 100644
--- a/components/notes/Nautilus_View_notes.server.in.in
+++ b/components/notes/Nautilus_View_notes.server.in.in
@@ -1,13 +1,6 @@
 <oaf_info>
 
-<oaf_server iid="OAFIID:Nautilus_Notes_View_Factory" type="exe" location="nautilus-notes">
-	<oaf_attribute name="repo_ids" type="stringv">
-		<item value="IDL:GNOME/ObjectFactory:1.0"/>
-	</oaf_attribute>
-	<oaf_attribute name="description" type="string" _value="Factory for annotation view"/>
-</oaf_server>
-
-<oaf_server iid="OAFIID:Nautilus_Notes_View" type="factory" location="OAFIID:Nautilus_Notes_View_Factory">
+<oaf_server iid="OAFIID:Nautilus_Notes_View" type="shlib" location="libnautilus-notes-view.so">
 	<oaf_attribute name="repo_ids" type="stringv">
 		<item value="IDL:Bonobo/Unknown:1.0"/>
 		<item value="IDL:Bonobo/Control:1.0"/>
diff --git a/components/notes/nautilus-notes.c b/components/notes/nautilus-notes.c
index 6493499cf..4e586201d 100644
--- a/components/notes/nautilus-notes.c
+++ b/components/notes/nautilus-notes.c
@@ -25,6 +25,8 @@
 
 /* notes sidebar panel -- allows editing per-directory notes */
 
+#define VIEW_IID "OAFIID:Nautilus_Notes_View"
+
 #include <config.h>
 
 #include <eel/eel-background.h>
@@ -352,7 +354,7 @@ notes_get_indicator_image (const char *notes_text)
 }
 
 static BonoboObject *
-make_notes_view (const char *iid, void *callback_data)
+make_notes_view ()
 {
         GtkWidget *vbox;
         Notes *notes;
@@ -419,22 +421,32 @@ make_notes_view (const char *iid, void *callback_data)
         return BONOBO_OBJECT (notes->view);
 }
 
-int
-main(int argc, char *argv[])
+
+static CORBA_Object
+notes_shlib_make_object (PortableServer_POA poa,
+			 const char *iid,
+			 gpointer impl_ptr,
+			 CORBA_Environment *ev)
 {
-	if (g_getenv ("NAUTILUS_DEBUG") != NULL) {
-		eel_make_warnings_and_criticals_stop_in_debugger ();
+	BonoboObject *view;
+
+	if (strcmp (iid, VIEW_IID) != 0) {
+		return CORBA_OBJECT_NIL;
 	}
-	
-        return nautilus_view_standard_main ("nautilus-notes",
-                                            VERSION,
-                                            GETTEXT_PACKAGE,
-                                            GNOMELOCALEDIR,
-                                            argc,
-                                            argv,
-                                            "OAFIID:Nautilus_Notes_View_Factory",
-                                            "OAFIID:Nautilus_Notes_View",
-                                            make_notes_view,
-                                            nautilus_global_preferences_init,
-                                            NULL);
+
+	view = make_notes_view ();
+
+	bonobo_activation_plugin_use (poa, impl_ptr);
+
+	return CORBA_Object_duplicate (BONOBO_OBJREF (view), ev);
 }
+
+static const BonoboActivationPluginObject notes_plugin_list[] = {
+	{ VIEW_IID, notes_shlib_make_object },
+	{ NULL }
+};
+
+const BonoboActivationPlugin Bonobo_Plugin_info = {
+	notes_plugin_list,
+	"Nautilus Notes Sidebar Panel"
+};