Use an unique factory for both interfaces.

2003-11-14  Marco Pesenti Gritti  <marco@gnome.org>

        * data/GNOME_Epiphany_Automation.server.in:
        * data/GNOME_Epiphany_NautilusView.server.in:

        Use an unique factory for both interfaces.

        * data/ui/Makefile.am:

        Do not try to merge translations in nautilus xml.

        * src/ephy-nautilus-view.c: (disconnected_idle),
        (control_disconnected_cb), (ephy_nautilus_view_instance_init),
        (ephy_nautilus_view_finalize):

        Unref the view on control disconnected, not on finalize.

        * src/ephy-main.c: (main):

        Add a server mode argument, used internally by bonobo interface.
        Free popt context only when no more necessary.

        * src/ephy-automation.c:
        * src/ephy-automation.h:
        * src/ephy-shell.c: (ephy_nautilus_view_new),
        (ephy_automation_factory_cb), (ephy_automation_factory_new),
        (ephy_shell_init), (path_from_command_line_arg), (open_urls),
        (server_timeout), (ephy_shell_startup), (ephy_shell_finalize),
        (ephy_shell_new_tab):
        * src/ephy-shell.h:

        When running in server mode unref (and so exit) on a timeout.

        Expand args passed to the command line.

1 files changed, 0 insertions, 25 deletions

diff --git a/src/ephy-automation.c b/src/ephy-automation.c
index 182e785bb..33f5dc822 100644
--- a/src/ephy-automation.c
+++ b/src/ephy-automation.c
@@ -36,31 +36,6 @@ static void ephy_automation_class_init (EphyAutomationClass *klass);
 
 static GObjectClass *parent_class = NULL;
 
-static BonoboObject *
-ephy_automation_factory_cb (BonoboGenericFactory *this_factory,
-			    const char *iid,
-			    gpointer user_data)
-{
-	return BONOBO_OBJECT (g_object_new (EPHY_TYPE_AUTOMATION, NULL));
-}
-
-BonoboGenericFactory *
-ephy_automation_factory_new (void)
-{
-	BonoboGenericFactory *factory;
-	GClosure *factory_closure;
-
-	factory = g_object_new (bonobo_generic_factory_get_type (), NULL);
-
-	factory_closure = g_cclosure_new
-		(G_CALLBACK (ephy_automation_factory_cb), NULL, NULL);
-
-	bonobo_generic_factory_construct_noreg
-		(factory, AUTOMATION_FACTORY_IID, factory_closure);
-
-	return factory;
-}
-
 static void
 impl_ephy_automation_loadurl (PortableServer_Servant _servant,
 			      const CORBA_char *url,