Merge formatter and device plugin apis.

Selecting device by format, e.g. -Tsvgz, or -Tpng:cairo:gd
Automatically load correct renderer, e.g. cairo, gd, core_dot
Improve plugin listings.
Accurately reflecte available formats.

diff --git a/plugin/gtk/gvdevice_gtk.c b/plugin/gtk/gvdevice_gtk.c
index d601721fe88649664e6bdeaaaddf091964ebcbbd..2d97eb52df3fca803bd10231102ef8da2c10d999 100644 (file)
--- a/plugin/gtk/gvdevice_gtk.c
+++ b/plugin/gtk/gvdevice_gtk.c
@@ -151,6 +151,7 @@ static void finalize_gtk(GVJ_t *firstjob)
 
 static gvdevice_engine_t device_engine_gtk = {
     initialize_gtk,
+    NULL,
     finalize_gtk,
 };
 #endif
@@ -159,7 +160,7 @@ static gvdevice_engine_t device_engine_gtk = {
 gvplugin_installed_t gvdevice_types_gtk[] = {
 #ifdef HAVE_GTK
 #ifdef CAIRO_HAS_XLIB_SURFACE
-    {0, "gtk", 0, &device_engine_gtk, NULL},
+    {0, "gtk:cairox", 0, &device_engine_gtk, NULL},
 #endif
 #endif
     {0, NULL, 0, NULL, NULL}

diff --git a/plugin/ming/gvrender_ming.c b/plugin/ming/gvrender_ming.c
index baedf6d446d6d683f133e67b238094ff64978e53..fb42cf5f34004176f2dd45f60a0e11281b9853f9 100644 (file)
--- a/plugin/ming/gvrender_ming.c
+++ b/plugin/ming/gvrender_ming.c
@@ -291,12 +291,15 @@ static gvrender_features_t ming_features = {
     0,                         /* knowncolors */
     0,                         /* sizeof knowncolors */
     RGBA_BYTE,                 /* color_type */
-    NULL,                      /* device */
     NULL,                      /* imageloader for usershapes */
-    NULL,                      /* formatter */
 };
 
 gvplugin_installed_t gvrender_ming_types[] = {
-    {FORMAT_SWF, "swf", 10, &ming_engine, &ming_features},
+    {FORMAT_SWF, "ming", 10, &ming_engine, NULL},
+    {0, NULL, 0, NULL, NULL}
+};
+
+gvplugin_installed_t gvdevice_ming_types[] = {
+    {FORMAT_SWF, "swf:ming", 10, NULL, &ming_features},
     {0, NULL, 0, NULL, NULL}
 };