Add error checking for factory registration.

1999-08-22  Miguel de Icaza  <miguel@gnu.org>

	* bonobo-image-x-pdf.cc (main): Add error checking for factory
	registration.

diff --git a/pdf/xpdf/ChangeLog b/pdf/xpdf/ChangeLog
index a3b727d4549466b656567dc70929e5c0725dea3f..9f4772c7c0f6d7be6ce518caf37e2d9d38047ba0 100644 (file)
--- a/pdf/xpdf/ChangeLog
+++ b/pdf/xpdf/ChangeLog
@@ -1,3 +1,8 @@
+1999-08-22  Miguel de Icaza  <miguel@gnu.org>
+
+       * bonobo-image-x-pdf.cc (main): Add error checking for factory
+       registration. 
+
 1999-08-22  Michael Meeks  <michael@imaginator.com>
 
        * bonobo-image-x-pdf.cc: Add zoom.

diff --git a/pdf/xpdf/bonobo-image-x-pdf.cc b/pdf/xpdf/bonobo-image-x-pdf.cc
index 678a7242a8a6fffd7c365635bf8aca0e7e1468c5..2881532edd3f76d464f68a368a89f01ca1292345 100644 (file)
--- a/pdf/xpdf/bonobo-image-x-pdf.cc
+++ b/pdf/xpdf/bonobo-image-x-pdf.cc
@@ -726,14 +726,19 @@ embeddable_factory (GnomeEmbeddableFactory *This, void *data)
        return (GnomeObject *) embeddable;
 }
 
-static void
-init_bonobo_image_x_png_factory (void)
+static gboolean
+init_bonobo_image_x_pdf_factory (void)
 {
        GnomeEmbeddableFactory *factory;
        
        factory = gnome_embeddable_factory_new (
                "bonobo-object-factory:image-x-pdf",
                embeddable_factory, NULL);
+
+       if (factory == NULL)
+               return FALSE;
+       else
+               return TRUE;
 }
 
 static void
@@ -753,7 +758,11 @@ main (int argc, char *argv [])
   CORBA_exception_init (&ev);
   
   init_server_factory (argc, argv);
-  init_bonobo_image_x_png_factory ();
+  if (!init_bonobo_image_x_pdf_factory ()){
+    fprintf (stderr, "Could not initialize the Bonobo PDF factory\n"
+                    "probably a server is already running?");
+    exit (1);
+  }
   
   errorInit();
   
@@ -761,6 +770,7 @@ main (int argc, char *argv [])
   
   gtk_widget_set_default_colormap (gdk_rgb_get_cmap ());
   gtk_widget_set_default_visual (gdk_rgb_get_visual ());
+  bonobo_activate ();
   gtk_main ();
   
   CORBA_exception_free (&ev);

diff --git a/pdf/xpdf/gpdf.cc b/pdf/xpdf/gpdf.cc
index 8dcdd6a5ad75b54be879a16c2dc702b66f880b41..d7e91347f44c710667421dc9dc0ed8de11f641a6 100644 (file)
--- a/pdf/xpdf/gpdf.cc
+++ b/pdf/xpdf/gpdf.cc
@@ -703,7 +703,8 @@ main (int argc, char **argv)
     container_new (NULL);
   
   poptFreeContext (ctx);
-  
+
+  bonobo_activate ();  
   gtk_main ();
        
   return 0;