From feb660129b8dd68ac02a7c72e53aff134bf55ffb Mon Sep 17 00:00:00 2001
From: ellson <devnull@localhost>
Date: Wed, 29 Aug 2007 19:39:49 +0000
Subject: [PATCH] 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.

---
 plugin/gtk/gvdevice_gtk.c   | 3 ++-
 plugin/ming/gvrender_ming.c | 9 ++++++---
 2 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/plugin/gtk/gvdevice_gtk.c b/plugin/gtk/gvdevice_gtk.c
index d601721fe..2d97eb52d 100644
--- 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 baedf6d44..fb42cf5f3 100644
--- 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}
 };
-- 
2.40.0