some naming cleanup

diff --git a/plugin/gd/gvtextlayout_gd.c b/plugin/gd/gvtextlayout_gd.c
index 240e655c8a426edb2a2b0291b6fe6770d89d1a4a..ae3938c5358542221055ba5bd56f6645bbd71dee 100644 (file)
--- a/plugin/gd/gvtextlayout_gd.c
+++ b/plugin/gd/gvtextlayout_gd.c
@@ -33,7 +33,7 @@
 /* fontsize at which text is rendered by a simple line */
 #define FONTSIZE_TOO_SMALL 1.5
 
-void textlayout(textpara_t * para, char **fontpath)
+static void gd_textlayout(textpara_t * para, char **fontpath)
 {
     static char *fntpath;
     char *err;
@@ -93,15 +93,15 @@ void textlayout(textpara_t * para, char **fontpath)
     }
 }
 
-static gvtextlayout_engine_t textlayout_engine = {
-    textlayout,
+static gvtextlayout_engine_t gd_textlayout_engine = {
+    gd_textlayout,
 };
 #endif
 #endif
 
 gvplugin_installed_t gvtextlayout_gd_types[] = {
 #if defined(HAVE_LIBGD) && defined(HAVE_LIBFREETYPE) && defined(HAVE_GD_FREETYPE) && defined(HAVE_LIBFONTCONFIG) && defined(HAVE_GD_FONTCONFIG)
-    {0, "textlayout", 2, &textlayout_engine, NULL},
+    {0, "textlayout", 2, &gd_textlayout_engine, NULL},
 #endif
     {0, NULL, 0, NULL, NULL}
 };

diff --git a/plugin/pango/gvplugin_pango.c b/plugin/pango/gvplugin_pango.c
index b26640585dd986c406237a0b396f458a31c4f572..10feaff1f5700ff14222d3f8cb2ac8ea1611198b 100644 (file)
--- a/plugin/pango/gvplugin_pango.c
+++ b/plugin/pango/gvplugin_pango.c
@@ -16,12 +16,12 @@
 
 #include "gvplugin.h"
 
-extern gvplugin_installed_t gvrender_pangogen_types;
-extern gvplugin_installed_t gvtextlayout_pangogen_types;
+extern gvplugin_installed_t gvrender_pango_types;
+extern gvplugin_installed_t gvtextlayout_pango_types;
 
 static gvplugin_api_t apis[] = {
-    {API_render, &gvrender_pangogen_types},
-    {API_textlayout, &gvtextlayout_pangogen_types},
+    {API_render, &gvrender_pango_types},
+    {API_textlayout, &gvtextlayout_pango_types},
     {(api_t)0, NULL},
 };
 

diff --git a/plugin/pango/gvrender_pango.c b/plugin/pango/gvrender_pango.c
index dba9cb0f2d10e6dc4f233d7a60b1452af0b7596b..17d308a2f31815984f0a8cf53ec5a90729b1eae7 100644 (file)
--- a/plugin/pango/gvrender_pango.c
+++ b/plugin/pango/gvrender_pango.c
@@ -549,7 +549,7 @@ static gvrender_features_t cairogen_features_gtk = {
 #endif
 #endif
 
-gvplugin_installed_t gvrender_pangogen_types[] = {
+gvplugin_installed_t gvrender_pango_types[] = {
 #ifdef HAVE_PANGOCAIRO
 #ifdef CAIRO_HAS_PNG_FUNCTIONS
     {FORMAT_PNG, "png", 10, &cairogen_engine, &cairogen_features},

diff --git a/plugin/pango/gvtextlayout_pango.c b/plugin/pango/gvtextlayout_pango.c
index 04fcf74104ccd0d8936ec75284a8e57fe1eb4fa2..04b821eaec8dcac8284ca924768d025f47ddec2e 100644 (file)
--- a/plugin/pango/gvtextlayout_pango.c
+++ b/plugin/pango/gvtextlayout_pango.c
@@ -24,12 +24,12 @@
 #ifdef HAVE_PANGOCAIRO
 #include <pango/pangocairo.h>
 
-static void pangocairo_free_layout (void *layout)
+static void pango_free_layout (void *layout)
 {
     g_object_unref((PangoLayout*)layout);
 }
 
-static void pangocairo_textlayout(textpara_t * para, char **fontpath)
+static void pango_textlayout(textpara_t * para, char **fontpath)
 {
     static PangoFontMap *fontmap;
     static PangoContext *context;
@@ -65,7 +65,7 @@ static void pangocairo_textlayout(textpara_t * para, char **fontpath)
 
     layout = pango_layout_new (context);
     para->layout = (void *)layout;    /* layout free with textpara - see labels.c */
-    para->free_layout = pangocairo_free_layout;    /* function for freeing pango layout */
+    para->free_layout = pango_free_layout;    /* function for freeing pango layout */
 
     pango_layout_set_text (layout, text, -1);
     pango_layout_set_font_description (layout, desc);
@@ -95,14 +95,14 @@ static void pangocairo_textlayout(textpara_t * para, char **fontpath)
     *fontpath = "[pango]";
 }
 
-static gvtextlayout_engine_t pangocairo_textlayout_engine = {
-    pangocairo_textlayout,
+static gvtextlayout_engine_t pango_textlayout_engine = {
+    pango_textlayout,
 };
 #endif
 
-gvplugin_installed_t gvtextlayout_pangocairogen_types[] = {
+gvplugin_installed_t gvtextlayout_pango_types[] = {
 #ifdef HAVE_PANGOCAIRO
-    {0, "textlayout", 10, &pangocairo_textlayout_engine, NULL},
+    {0, "textlayout", 10, &pango_textlayout_engine, NULL},
 #endif
     {0, NULL, 0, NULL, NULL}
 };