GNOME.org
 

patch

Hi,

finally made a patch to clean up the leftover [v]epv externs
from the .h files that works. Any reason why I shouldn't
commit this?


Martijn

? cleanvepv.patch
? bonobo-idl/Makefile.in
? bonobo-idl/Makefile
? doc/api/sgml
? doc/api/html
? doc/api/bonobo-api.html
? libefs/libefs-config
Index: bonobo/bonobo-canvas-component.h
===================================================================
RCS file: /cvs/gnome/bonobo/bonobo/bonobo-canvas-component.h,v
retrieving revision 1.6
diff -u -r1.6 bonobo-canvas-component.h
--- bonobo/bonobo-canvas-component.h	2000/01/25 11:35:41	1.6
+++ bonobo/bonobo-canvas-component.h	2000/06/29 19:47:35
@@ -43,9 +43,6 @@
 
 POA_Bonobo_Canvas_Component__epv *bonobo_canvas_component_get_epv  (void);
 
-/* CORBA default vector methods we provide */
-extern POA_Bonobo_Canvas_Component__vepv bonobo_canvas_component_vepv;
-
 END_GNOME_DECLS
 
 #endif /* */
Index: bonobo/bonobo-client-site.h
===================================================================
RCS file: /cvs/gnome/bonobo/bonobo/bonobo-client-site.h,v
retrieving revision 1.30
diff -u -r1.30 bonobo-client-site.h
--- bonobo/bonobo-client-site.h	2000/06/21 16:07:42	1.30
+++ bonobo/bonobo-client-site.h	2000/06/29 19:47:35
@@ -74,8 +74,6 @@
 void                        bonobo_client_site_free_verbs       (GList              *verb_list);
 POA_Bonobo_ClientSite__epv *bonobo_client_site_get_epv          (void);
 
-extern POA_Bonobo_ClientSite__vepv bonobo_client_site_vepv;
-
 END_GNOME_DECLS
 
 #endif
Index: bonobo/bonobo-container.h
===================================================================
RCS file: /cvs/gnome/bonobo/bonobo/bonobo-container.h,v
retrieving revision 1.18
diff -u -r1.18 bonobo-container.h
--- bonobo/bonobo-container.h	2000/03/02 07:03:43	1.18
+++ bonobo/bonobo-container.h	2000/06/29 19:47:35
@@ -60,12 +60,6 @@
 
 POA_Bonobo_Container__epv *bonobo_container_get_epv (void);
 
-/*
- * Exported vectors
- */
-extern POA_Bonobo_Container__epv bonobo_container_epv;
-extern POA_Bonobo_Container__vepv bonobo_container_vepv;
-
 END_GNOME_DECLS
 
 #endif
Index: bonobo/bonobo-control-frame.h
===================================================================
RCS file: /cvs/gnome/bonobo/bonobo/bonobo-control-frame.h,v
retrieving revision 1.10
diff -u -r1.10 bonobo-control-frame.h
--- bonobo/bonobo-control-frame.h	2000/02/16 10:27:54	1.10
+++ bonobo/bonobo-control-frame.h	2000/06/29 19:47:35
@@ -93,10 +93,6 @@
 					int *desired_width,
 					int *desired_height);
     
-/* The entry point vectors for the server we provide */
-extern POA_Bonobo_ControlFrame__epv  bonobo_control_frame_epv;
-extern POA_Bonobo_ControlFrame__vepv bonobo_control_frame_vepv;
-
 END_GNOME_DECLS
 
 #endif /* _BONOBO_CONTROL_FRAME_H_ */
Index: bonobo/bonobo-control.h
===================================================================
RCS file: /cvs/gnome/bonobo/bonobo/bonobo-control.h,v
retrieving revision 1.14
diff -u -r1.14 bonobo-control.h
--- bonobo/bonobo-control.h	2000/04/06 05:32:33	1.14
+++ bonobo/bonobo-control.h	2000/06/29 19:47:35
@@ -86,10 +86,6 @@
 Bonobo_Control_windowid     bonobo_control_windowid_from_x11       (guint32              x11_id);
 POA_Bonobo_Control__epv    *bonobo_control_get_epv                 (void);
 
-/* CORBA default vector methods we provide */
-extern POA_Bonobo_Control__epv bonobo_control_epv;
-extern POA_Bonobo_Control__vepv bonobo_control_vepv;
-
 END_GNOME_DECLS
 
 #endif /* _BONOBO_CONTROL_H_ */
Index: bonobo/bonobo-desktop-window.h
===================================================================
RCS file: /cvs/gnome/bonobo/bonobo/bonobo-desktop-window.h,v
retrieving revision 1.5
diff -u -r1.5 bonobo-desktop-window.h
--- bonobo/bonobo-desktop-window.h	2000/01/25 11:35:42	1.5
+++ bonobo/bonobo-desktop-window.h	2000/06/29 19:47:35
@@ -40,9 +40,6 @@
 
 POA_Bonobo_Desktop_Window__epv *bonobo_desktop_window_get_epv   (void);
 
-/* CORBA default vector methods we provide */
-extern POA_Bonobo_Desktop_Window__vepv bonobo_desktop_window_vepv;
-
 END_GNOME_DECLS
 
 #endif /* _BONOBO_DESKTOP_WINDOW_H_ */
Index: bonobo/bonobo-generic-factory.h
===================================================================
RCS file: /cvs/gnome/bonobo/bonobo/bonobo-generic-factory.h,v
retrieving revision 1.7
diff -u -r1.7 bonobo-generic-factory.h
--- bonobo/bonobo-generic-factory.h	2000/01/25 11:35:43	1.7
+++ bonobo/bonobo-generic-factory.h	2000/06/29 19:47:35
@@ -82,8 +82,6 @@
 
 POA_Bonobo_GenericFactory__epv *bonobo_generic_factory_get_epv (void);
 
-extern POA_Bonobo_GenericFactory__vepv bonobo_generic_factory_vepv;
-
 END_GNOME_DECLS
 
 #endif
Index: bonobo/bonobo-object.h
===================================================================
RCS file: /cvs/gnome/bonobo/bonobo/bonobo-object.h,v
retrieving revision 1.39
diff -u -r1.39 bonobo-object.h
--- bonobo/bonobo-object.h	2000/06/21 13:37:52	1.39
+++ bonobo/bonobo-object.h	2000/06/29 19:47:35
@@ -89,9 +89,6 @@
  */
 gboolean  gnome_unknown_ping (Bonobo_Unknown object);
 
-/* CORBA default vector methods we provide */
-extern POA_Bonobo_Unknown__vepv          bonobo_object_vepv;
-
 END_GNOME_DECLS
 
 #endif
Index: bonobo/bonobo-persist-file.h
===================================================================
RCS file: /cvs/gnome/bonobo/bonobo/bonobo-persist-file.h,v
retrieving revision 1.10
diff -u -r1.10 bonobo-persist-file.h
--- bonobo/bonobo-persist-file.h	2000/01/25 11:35:43	1.10
+++ bonobo/bonobo-persist-file.h	2000/06/29 19:47:35
@@ -61,7 +61,6 @@
 
 POA_Bonobo_PersistFile__epv *bonobo_persist_file_get_epv (void);
 
-extern POA_Bonobo_PersistFile__vepv bonobo_persist_file_vepv;
 END_GNOME_DECLS
 
 #endif /* _BONOBO_PERSIST_FILE_H_ */
Index: bonobo/bonobo-persist-stream.h
===================================================================
RCS file: /cvs/gnome/bonobo/bonobo/bonobo-persist-stream.h,v
retrieving revision 1.15
diff -u -r1.15 bonobo-persist-stream.h
--- bonobo/bonobo-persist-stream.h	2000/05/26 14:10:42	1.15
+++ bonobo/bonobo-persist-stream.h	2000/06/29 19:47:35
@@ -89,7 +89,6 @@
 
 POA_Bonobo_PersistStream__epv *bonobo_persist_stream_get_epv (void);
 
-extern POA_Bonobo_PersistStream__vepv bonobo_persist_stream_vepv;
 END_GNOME_DECLS
 
 #endif /* _BONOBO_PERSIST_STREAM_H_ */
Index: bonobo/bonobo-persist.h
===================================================================
RCS file: /cvs/gnome/bonobo/bonobo/bonobo-persist.h,v
retrieving revision 1.15
diff -u -r1.15 bonobo-persist.h
--- bonobo/bonobo-persist.h	2000/05/26 14:10:42	1.15
+++ bonobo/bonobo-persist.h	2000/06/29 19:47:35
@@ -36,7 +36,6 @@
 
 POA_Bonobo_Persist__epv *bonobo_persist_get_epv (void);
 
-extern POA_Bonobo_Persist__vepv bonobo_persist_vepv;
 END_GNOME_DECLS
 
 #endif /* _BONOBO_PERSIST_H_ */
Index: bonobo/bonobo-print.h
===================================================================
RCS file: /cvs/gnome/bonobo/bonobo/bonobo-print.h,v
retrieving revision 1.3
diff -u -r1.3 bonobo-print.h
--- bonobo/bonobo-print.h	2000/04/13 18:33:54	1.3
+++ bonobo/bonobo-print.h	2000/06/29 19:47:35
@@ -32,8 +32,6 @@
 
 POA_Bonobo_Print__epv *bonobo_print_get_epv (void);
 
-extern POA_Bonobo_Print__vepv bonobo_print_vepv;
-
 GtkType         bonobo_print_get_type (void);
 
 BonoboPrint    *bonobo_print_new      (BonoboPrintRenderFn *render,
Index: bonobo/bonobo-progressive.h
===================================================================
RCS file: /cvs/gnome/bonobo/bonobo/bonobo-progressive.h,v
retrieving revision 1.13
diff -u -r1.13 bonobo-progressive.h
--- bonobo/bonobo-progressive.h	2000/01/25 11:35:44	1.13
+++ bonobo/bonobo-progressive.h	2000/06/29 19:47:36
@@ -80,7 +80,6 @@
 
 POA_Bonobo_ProgressiveDataSink__epv *bonobo_progressive_get_epv (void);
 
-extern POA_Bonobo_ProgressiveDataSink__vepv bonobo_progressive_data_sink_vepv;
 END_GNOME_DECLS
 
 #endif /* _BONOBO_PROGRESSIVE_DATA_SINK_H_ */
Index: bonobo/bonobo-storage.c
===================================================================
RCS file: /cvs/gnome/bonobo/bonobo/bonobo-storage.c,v
retrieving revision 1.35
diff -u -r1.35 bonobo-storage.c
--- bonobo/bonobo-storage.c	2000/06/23 14:30:42	1.35
+++ bonobo/bonobo-storage.c	2000/06/29 19:47:36
@@ -13,7 +13,7 @@
 
 static BonoboObjectClass *bonobo_storage_parent_class;
 
-POA_Bonobo_Storage__vepv bonobo_storage_vepv;
+static POA_Bonobo_Storage__vepv bonobo_storage_vepv;
 
 #define CLASS(o) BONOBO_STORAGE_CLASS(GTK_OBJECT(o)->klass)
 
@@ -241,6 +241,7 @@
 	char *path;
 	gpointer driver;
 	
+	g_warning (STORAGE_LIB);
 	path = g_module_build_path (STORAGE_LIB, driver_name);
 	m = g_module_open (path, G_MODULE_BIND_LAZY);
 	g_free (path);
@@ -299,4 +300,35 @@
 
 	return (*driver_ptr) (path, flags, mode);
 }
+
+/**
+ * bonobo_storage_corba_object_create:
+ * @object: the GtkObject that will wrap the CORBA object
+ *
+ * Creates and activates the CORBA object that is wrapped by the
+ * @object BonoboObject.
+ *
+ * Returns: An activated object reference to the created object
+ * or %CORBA_OBJECT_NIL in case of failure.
+ */
+Bonobo_Stream
+bonobo_storage_corba_object_create (BonoboObject *object)
+{
+        POA_Bonobo_Stream *servant;
+        CORBA_Environment ev;
+
+        servant = (POA_Bonobo_Stream *) g_new0 (BonoboObjectServant, 1);
+        servant->vepv = &bonobo_storage_vepv;
+
+        CORBA_exception_init (&ev);
+
+        POA_Bonobo_Stream__init ((PortableServer_Servant) servant, &ev);
+        if (ev._major != CORBA_NO_EXCEPTION){
+                g_free (servant);
+                CORBA_exception_free (&ev);
+                return CORBA_OBJECT_NIL;
+        }
+
+        CORBA_exception_free (&ev);
+        return (Bonobo_Stream) bonobo_object_activate_servant (object, servant);}
 
Index: bonobo/bonobo-storage.h
===================================================================
RCS file: /cvs/gnome/bonobo/bonobo/bonobo-storage.h,v
retrieving revision 1.23
diff -u -r1.23 bonobo-storage.h
--- bonobo/bonobo-storage.h	2000/05/08 21:48:12	1.23
+++ bonobo/bonobo-storage.h	2000/06/29 19:47:36
@@ -65,6 +65,8 @@
 					      gint flags,
 					      gint mode);
 
+Bonobo_Storage   bonobo_storage_corba_object_create (BonoboObject *object);
+
 /*
  * Functions to open storages and streams from and existing.
  * Storage
@@ -83,8 +85,6 @@
 						char *class_id);
 
 POA_Bonobo_Storage__epv *bonobo_storage_get_epv (void);
-
-extern POA_Bonobo_Storage__vepv bonobo_storage_vepv;
 
 /* Open modes */
 
Index: bonobo/bonobo-stream-fs.c
===================================================================
RCS file: /cvs/gnome/bonobo/bonobo/bonobo-stream-fs.c,v
retrieving revision 1.29
diff -u -r1.29 bonobo-stream-fs.c
--- bonobo/bonobo-stream-fs.c	2000/06/26 16:49:27	1.29
+++ bonobo/bonobo-stream-fs.c	2000/06/29 19:47:36
@@ -276,28 +276,6 @@
 	return BONOBO_STREAM (stream);
 }
 
-static Bonobo_Stream
-create_bonobo_stream_fs (BonoboObject *object)
-{
-	POA_Bonobo_Stream *servant;
-	CORBA_Environment ev;
-
-	servant = (POA_Bonobo_Stream *) g_new0 (BonoboObjectServant, 1);
-	servant->vepv = &bonobo_stream_vepv;
-
-	CORBA_exception_init (&ev);
-
-	POA_Bonobo_Stream__init ((PortableServer_Servant) servant, &ev);
-	if (ev._major != CORBA_NO_EXCEPTION){
-                g_free (servant);
-		CORBA_exception_free (&ev);
-                return CORBA_OBJECT_NIL;
-        }
-
-	CORBA_exception_free (&ev);
-	return (Bonobo_Stream) bonobo_object_activate_servant (object, servant);
-}
-
 static BonoboStream *
 bonobo_stream_create (int fd)
 {
@@ -310,7 +288,7 @@
 	
 	stream_fs->fd = fd;
 	
-	corba_stream = create_bonobo_stream_fs (
+	corba_stream = bonobo_stream_corba_object_create (
 		BONOBO_OBJECT (stream_fs));
 
 	if (corba_stream == CORBA_OBJECT_NIL){
Index: bonobo/bonobo-stream-memory.c
===================================================================
RCS file: /cvs/gnome/bonobo/bonobo/bonobo-stream-memory.c,v
retrieving revision 1.23
diff -u -r1.23 bonobo-stream-memory.c
--- bonobo/bonobo-stream-memory.c	2000/06/03 14:28:21	1.23
+++ bonobo/bonobo-stream-memory.c	2000/06/29 19:47:36
@@ -232,28 +232,6 @@
 	return type;
 }
 
-static Bonobo_Stream
-create_bonobo_stream_mem (BonoboObject *object)
-{
-	POA_Bonobo_Stream *servant;
-	CORBA_Environment ev;
-
-	servant = (POA_Bonobo_Stream *) g_new0 (BonoboObjectServant, 1);
-	servant->vepv = &bonobo_stream_vepv;
-
-	CORBA_exception_init (&ev);
-
-	POA_Bonobo_Stream__init ((PortableServer_Servant) servant, &ev);
-	if (ev._major != CORBA_NO_EXCEPTION){
-                g_free (servant);
-		CORBA_exception_free (&ev);
-                return CORBA_OBJECT_NIL;
-        }
-
-	CORBA_exception_free (&ev);
-	return (Bonobo_Stream) bonobo_object_activate_servant (object, servant);
-}
-
 /**
  * bonobo_stream_mem_create:
  * @buffer: The data for which a BonoboStreamMem object is to be created.
@@ -298,7 +276,8 @@
 	stream_mem->read_only = read_only;
 	stream_mem->resizable = resizable;
 
-	corba_stream = create_bonobo_stream_mem (BONOBO_OBJECT (stream_mem));
+	corba_stream = bonobo_stream_corba_object_create (
+		BONOBO_OBJECT (stream_mem));
 
 	if (corba_stream == CORBA_OBJECT_NIL){
 		gtk_object_destroy (GTK_OBJECT (stream_mem));
Index: bonobo/bonobo-stream.c
===================================================================
RCS file: /cvs/gnome/bonobo/bonobo/bonobo-stream.c,v
retrieving revision 1.20
diff -u -r1.20 bonobo-stream.c
--- bonobo/bonobo-stream.c	2000/04/08 11:45:18	1.20
+++ bonobo/bonobo-stream.c	2000/06/29 19:47:36
@@ -175,4 +175,35 @@
 	return type;
 }
 
+/**
+ * bonobo_stream_corba_object_create:
+ * @object: the GtkObject that will wrap the CORBA object
+ *
+ * Creates and activates the CORBA object that is wrapped by the
+ * @object BonoboObject.
+ *
+ * Returns: An activated object reference to the created object
+ * or %CORBA_OBJECT_NIL in case of failure.
+ */
+Bonobo_Stream
+bonobo_stream_corba_object_create (BonoboObject *object)
+{
+	POA_Bonobo_Stream *servant;
+	CORBA_Environment ev;
+
+	servant = (POA_Bonobo_Stream *) g_new0 (BonoboObjectServant, 1);
+	servant->vepv = &bonobo_stream_vepv;
+
+	CORBA_exception_init (&ev);
+
+	POA_Bonobo_Stream__init ((PortableServer_Servant) servant, &ev);
+	if (ev._major != CORBA_NO_EXCEPTION){
+                g_free (servant);
+		CORBA_exception_free (&ev);
+                return CORBA_OBJECT_NIL;
+        }
+
+	CORBA_exception_free (&ev);
+	return (Bonobo_Stream) bonobo_object_activate_servant (object, servant);
+}
 
Index: bonobo/bonobo-stream.h
===================================================================
RCS file: /cvs/gnome/bonobo/bonobo/bonobo-stream.h,v
retrieving revision 1.14
diff -u -r1.14 bonobo-stream.h
--- bonobo/bonobo-stream.h	2000/01/25 11:35:45	1.14
+++ bonobo/bonobo-stream.h	2000/06/29 19:47:36
@@ -50,11 +50,10 @@
 				   CORBA_Environment *ev);
 } BonoboStreamClass;
 
-POA_Bonobo_Stream__epv *bonobo_stream_get_epv (void);
+GtkType                 bonobo_stream_get_type            (void);
+POA_Bonobo_Stream__epv *bonobo_stream_get_epv             (void);
+Bonobo_Stream           bonobo_stream_corba_object_create (BonoboObject *object);
 
-extern POA_Bonobo_Stream__vepv bonobo_stream_vepv;
-
-GtkType         bonobo_stream_get_type     (void);
 
 END_GNOME_DECLS
 
Index: bonobo/bonobo-ui-handler.h
===================================================================
RCS file: /cvs/gnome/bonobo/bonobo/bonobo-ui-handler.h,v
retrieving revision 1.42
diff -u -r1.42 bonobo-ui-handler.h
--- bonobo/bonobo-ui-handler.h	2000/06/28 15:58:35	1.42
+++ bonobo/bonobo-ui-handler.h	2000/06/29 19:47:36
@@ -486,7 +486,6 @@
 gboolean  bonobo_ui_handler_dock_get_sensitive  (BonoboUIHandler       *uih,
 						 const char            *name);
 
-extern POA_Bonobo_UIHandler__vepv bonobo_ui_handler_vepv;
 POA_Bonobo_UIHandler__epv *bonobo_ui_handler_get_epv (void);
 
 #endif /* _BONOBO_UI_HANDLER_H_ */
Index: bonobo/bonobo-view-frame.h
===================================================================
RCS file: /cvs/gnome/bonobo/bonobo/bonobo-view-frame.h,v
retrieving revision 1.27
diff -u -r1.27 bonobo-view-frame.h
--- bonobo/bonobo-view-frame.h	2000/02/16 05:26:56	1.27
+++ bonobo/bonobo-view-frame.h	2000/06/29 19:47:36
@@ -66,9 +66,6 @@
 							       double            zoom);
 POA_Bonobo_ViewFrame__epv *bonobo_view_frame_get_epv          (void);
 
-/* The entry point vectors for the server we provide */
-extern POA_Bonobo_ViewFrame__vepv bonobo_view_frame_vepv;
-
 END_GNOME_DECLS
 
 #endif /* _BONOBO_VIEW_FRAME_H_ */
Index: bonobo/bonobo-view.h
===================================================================
RCS file: /cvs/gnome/bonobo/bonobo/bonobo-view.h,v
retrieving revision 1.37
diff -u -r1.37 bonobo-view.h
--- bonobo/bonobo-view.h	2000/02/16 10:27:55	1.37
+++ bonobo/bonobo-view.h	2000/06/29 19:47:36
@@ -72,9 +72,6 @@
 char                 *bonobo_view_popup_verbs            (BonoboView         *view);
 POA_Bonobo_View__epv *bonobo_view_get_epv                (void);
 
-/* CORBA default vector methods we provide */
-extern POA_Bonobo_View__vepv bonobo_view_vepv;
-
 END_GNOME_DECLS
 
 #endif /* _BONOBO_VIEW_H_ */
Index: po/Makefile.in.in
===================================================================
RCS file: /cvs/gnome/bonobo/po/Makefile.in.in,v
retrieving revision 1.7
diff -u -r1.7 Makefile.in.in
--- po/Makefile.in.in	1999/08/20 07:32:45	1.7
+++ po/Makefile.in.in	2000/06/29 19:47:37
@@ -62,7 +62,7 @@
 	$(COMPILE) $<
 
 .po.pox:
-	$(MAKE) $(PACKAGE).pot
+	$(MAKE) $(srcdir)/$(PACKAGE).pot
 	$(MSGMERGE) $< $(srcdir)/$(PACKAGE).pot -o $*.pox
 
 .po.mo:
@@ -79,7 +79,7 @@
 
 all: all-@USE_NLS@
 
-all-yes: cat-id-tbl.c $(CATALOGS)
+all-yes: $(srcdir)/cat-id-tbl.c $(CATALOGS)
 all-no:
 
 $(srcdir)/$(PACKAGE).pot: $(POTFILES)
@@ -90,8 +90,8 @@
 	   || ( rm -f $(srcdir)/$(PACKAGE).pot \
 		&& mv $(PACKAGE).po $(srcdir)/$(PACKAGE).pot )
 
-$(srcdir)/cat-id-tbl.c: stamp-cat-id; @:
-$(srcdir)/stamp-cat-id: $(PACKAGE).pot
+$(srcdir)/cat-id-tbl.c: $(srcdir)/stamp-cat-id; @:
+$(srcdir)/stamp-cat-id: $(srcdir)/$(PACKAGE).pot
 	rm -f cat-id-tbl.tmp
 	sed -f ../intl/po2tbl.sed $(srcdir)/$(PACKAGE).pot \
 		| sed -e "s/@PACKAGE NAME@/$(PACKAGE)/" > cat-id-tbl.tmp
@@ -180,7 +180,8 @@
 
 check: all
 
-cat-id-tbl.o: ../intl/libgettext.h
+cat-id-tbl.o: $(srcdir)/cat-id-tbl.c $(top_srcdir)/intl/libgettext.h
+	$(COMPILE) $(srcdir)/cat-id-tbl.c
 
 dvi info tags TAGS ID:
 
@@ -196,7 +197,7 @@
 maintainer-clean: distclean
 	@echo "This command is intended for maintainers to use;"
 	@echo "it deletes files that may require special tools to rebuild."
-	rm -f $(GMOFILES)
+	rm -f $(GMOFILES) cat-id-tbl.c stamp-cat-id
 
 distdir = ../$(PACKAGE)-$(VERSION)/$(subdir)
 dist distdir: update-po $(DISTFILES)
@@ -207,7 +208,7 @@
 	done
 
 update-po: Makefile
-	$(MAKE) $(PACKAGE).pot
+	$(MAKE) $(srcdir)/$(PACKAGE).pot
 	PATH=`pwd`/../src:$$PATH; \
 	cd $(srcdir); \
 	catalogs='$(CATALOGS)'; \
Index: storage-modules/bonobo-storage-vfs.c
===================================================================
RCS file: /cvs/gnome/bonobo/storage-modules/bonobo-storage-vfs.c,v
retrieving revision 1.3
diff -u -r1.3 bonobo-storage-vfs.c
--- storage-modules/bonobo-storage-vfs.c	2000/06/24 22:01:47	1.3
+++ storage-modules/bonobo-storage-vfs.c	2000/06/29 19:47:37
@@ -52,27 +52,6 @@
 	return stream;
 }
 
-static Bonobo_Storage
-create_bonobo_storage_vfs (BonoboObject *object)
-{
-	POA_Bonobo_Storage *servant;
-	CORBA_Environment ev;
-
-	servant = (POA_Bonobo_Storage *) g_new0 (BonoboObjectServant, 1);
-	servant->vepv = &bonobo_storage_vepv;
-
-	CORBA_exception_init (&ev);
-	POA_Bonobo_Storage__init ((PortableServer_Servant) servant, &ev);
-	if (ev._major != CORBA_NO_EXCEPTION){
-                g_free (servant);
-		CORBA_exception_free (&ev);
-		return CORBA_OBJECT_NIL;
-        }
-	CORBA_exception_free (&ev);
-
-	return (Bonobo_Storage) bonobo_object_activate_servant (object, servant);
-}
-
 /*
  * Creates the Gtk object and the corba server bound to it
  */
@@ -85,7 +64,7 @@
 	storage_vfs = gtk_type_new (bonobo_storage_vfs_get_type ());
 	storage_vfs->path = g_strdup (path);
 	
-	corba_storage = create_bonobo_storage_vfs (
+	corba_storage = bonobo_storage_corba_object_create (
 		BONOBO_OBJECT (storage_vfs));
 	if (corba_storage == CORBA_OBJECT_NIL) {
 		gtk_object_destroy (GTK_OBJECT (storage_vfs));
Index: storage-modules/bonobo-stream-vfs.c
===================================================================
RCS file: /cvs/gnome/bonobo/storage-modules/bonobo-stream-vfs.c,v
retrieving revision 1.1
diff -u -r1.1 bonobo-stream-vfs.c
--- storage-modules/bonobo-stream-vfs.c	2000/06/23 15:58:19	1.1
+++ storage-modules/bonobo-stream-vfs.c	2000/06/29 19:47:37
@@ -307,28 +307,6 @@
 	return BONOBO_STREAM (stream);
 }
 
-static Bonobo_Stream
-create_bonobo_stream_vfs (BonoboObject *object)
-{
-	POA_Bonobo_Stream *servant;
-	CORBA_Environment ev;
-
-	servant = (POA_Bonobo_Stream *) g_new0 (BonoboObjectServant, 1);
-	servant->vepv = &bonobo_stream_vepv;
-
-	CORBA_exception_init (&ev);
-
-	POA_Bonobo_Stream__init ((PortableServer_Servant) servant, &ev);
-	if (ev._major != CORBA_NO_EXCEPTION){
-                g_free (servant);
-		CORBA_exception_free (&ev);
-                return CORBA_OBJECT_NIL;
-        }
-
-	CORBA_exception_free (&ev);
-	return (Bonobo_Stream) bonobo_object_activate_servant (object, servant);
-}
-
 static BonoboStream *
 bonobo_stream_create (GnomeVFSHandle *handle)
 {
@@ -341,7 +319,7 @@
 	
 	stream_vfs->handle = handle;
 	
-	corba_stream = create_bonobo_stream_vfs (
+	corba_stream = bonobo_stream_corba_object_create (
 		BONOBO_OBJECT (stream_vfs));
 
 	if (corba_stream == CORBA_OBJECT_NIL){
Index: storage-modules/gnome-storage-efs.c
===================================================================
RCS file: /cvs/gnome/bonobo/storage-modules/gnome-storage-efs.c,v
retrieving revision 1.9
diff -u -r1.9 gnome-storage-efs.c
--- storage-modules/gnome-storage-efs.c	2000/01/25 11:45:35	1.9
+++ storage-modules/gnome-storage-efs.c	2000/06/29 19:47:37
@@ -28,25 +28,11 @@
 static BonoboStorage *
 create_storage_efs_server (const BonoboStorageEFS *storage_efs)
 {
-	BonoboObject *object = BONOBO_OBJECT(storage_efs);
-	POA_Bonobo_Storage *servant;
 	Bonobo_Storage corba_storage;
-	CORBA_Environment ev;
 
-	servant = (POA_Bonobo_Storage *) g_new0 (BonoboObjectServant, 1);
-	servant->vepv = &bonobo_storage_vepv;
-
-	CORBA_exception_init (&ev);
-	POA_Bonobo_Storage__init ((PortableServer_Servant) servant, 
-				 &ev);
-	if (ev._major != CORBA_NO_EXCEPTION){
-		g_free (servant);
-		CORBA_exception_free (&ev);
-		return NULL;
-	}
-	CORBA_exception_free (&ev);
-
-	corba_storage = bonobo_object_activate_servant(object, servant);
+	corba_storage = bonobo_storage_corba_object_create (
+		BONOBO_OBJECT (storage_efs));
+				 
 	return bonobo_storage_construct(BONOBO_STORAGE(storage_efs), 
 				       corba_storage);
 }
Index: storage-modules/gnome-storage-fs.c
===================================================================
RCS file: /cvs/gnome/bonobo/storage-modules/gnome-storage-fs.c,v
retrieving revision 1.18
diff -u -r1.18 gnome-storage-fs.c
--- storage-modules/gnome-storage-fs.c	2000/06/24 15:52:59	1.18
+++ storage-modules/gnome-storage-fs.c	2000/06/29 19:47:37
@@ -155,27 +155,6 @@
 	return BONOBO_STORAGE (storage);
 }
 
-static Bonobo_Storage
-create_bonobo_storage_fs (BonoboObject *object)
-{
-	POA_Bonobo_Storage *servant;
-	CORBA_Environment ev;
-
-	servant = (POA_Bonobo_Storage *) g_new0 (BonoboObjectServant, 1);
-	servant->vepv = &bonobo_storage_vepv;
-
-	CORBA_exception_init (&ev);
-	POA_Bonobo_Storage__init ((PortableServer_Servant) servant, &ev);
-	if (ev._major != CORBA_NO_EXCEPTION){
-                g_free (servant);
-		CORBA_exception_free (&ev);
-		return CORBA_OBJECT_NIL;
-        }
-	CORBA_exception_free (&ev);
-
-	return (Bonobo_Storage) bonobo_object_activate_servant (object, servant);
-}
-
 /*
  * Creates the Gtk object and the corba server bound to it
  */
@@ -188,7 +167,7 @@
 	storage_fs = gtk_type_new (bonobo_storage_fs_get_type ());
 	storage_fs->path = g_strdup (path);
 	
-	corba_storage = create_bonobo_storage_fs (
+	corba_storage = bonobo_storage_corba_object_create (
 		BONOBO_OBJECT (storage_fs));
 	if (corba_storage == CORBA_OBJECT_NIL){
 		gtk_object_destroy (GTK_OBJECT (storage_fs));
Index: storage-modules/gnome-stream-efs.c
===================================================================
RCS file: /cvs/gnome/bonobo/storage-modules/gnome-stream-efs.c,v
retrieving revision 1.5
diff -u -r1.5 gnome-stream-efs.c
--- storage-modules/gnome-stream-efs.c	2000/01/25 11:45:35	1.5
+++ storage-modules/gnome-stream-efs.c	2000/06/29 19:47:37
@@ -12,24 +12,11 @@
 static BonoboStream *
 create_stream_efs_server (const BonoboStreamEFS *stream_efs)
 {
-	BonoboObject *object = BONOBO_OBJECT(stream_efs);
-	POA_Bonobo_Stream *servant;
 	Bonobo_Stream corba_stream;
-	CORBA_Environment ev;
 
-	servant = (POA_Bonobo_Stream *) g_new0 (BonoboObjectServant, 1);
-	servant->vepv = &bonobo_stream_vepv;
+	corba_stream = bonobo_stream_corba_object_create (
+		BONOBO_OBJECT (stream_efs));
 
-	CORBA_exception_init (&ev);
-	POA_Bonobo_Stream__init ((PortableServer_Servant) servant, &ev);
-	if (ev._major != CORBA_NO_EXCEPTION){
-		g_free (servant);
-		CORBA_exception_free (&ev);
-		return NULL;
-	}
-	CORBA_exception_free (&ev);
-
-	corba_stream = bonobo_object_activate_servant(object, servant);
 	return BONOBO_STREAM(bonobo_object_construct(BONOBO_OBJECT(stream_efs), 
 						   corba_stream));
 }
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]