editable-label: rename copy/pasted fill renderer to 'eel' prefix

To avoid library clashes with the GTK+ internal one.

1 files changed, 39 insertions, 39 deletions

diff --git a/eel/eel-editable-label.c b/eel/eel-editable-label.c
index f2465fe79..db4e091ca 100644
--- a/eel/eel-editable-label.c
+++ b/eel/eel-editable-label.c
@@ -39,66 +39,66 @@
 
 
 /* copy-paste from gtk/gtkpango.c */
-#define GTK_TYPE_FILL_LAYOUT_RENDERER            (_gtk_fill_layout_renderer_get_type())
-#define GTK_FILL_LAYOUT_RENDERER(object)         (G_TYPE_CHECK_INSTANCE_CAST ((object), GTK_TYPE_FILL_LAYOUT_RENDERER, GtkFillLayoutRenderer))
-#define GTK_IS_FILL_LAYOUT_RENDERER(object)      (G_TYPE_CHECK_INSTANCE_TYPE ((object), GTK_TYPE_FILL_LAYOUT_RENDERER))
-#define GTK_FILL_LAYOUT_RENDERER_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass), GTK_TYPE_FILL_LAYOUT_RENDERER, GtkFillLayoutRendererClass))
-#define GTK_IS_FILL_LAYOUT_RENDERER_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GTK_TYPE_FILL_LAYOUT_RENDERER))
-#define GTK_FILL_LAYOUT_RENDERER_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj), GTK_TYPE_FILL_LAYOUT_RENDERER, GtkFillLayoutRendererClass))
+#define EEL_TYPE_FILL_LAYOUT_RENDERER            (_eel_fill_layout_renderer_get_type())
+#define EEL_FILL_LAYOUT_RENDERER(object)         (G_TYPE_CHECK_INSTANCE_CAST ((object), EEL_TYPE_FILL_LAYOUT_RENDERER, EelFillLayoutRenderer))
+#define EEL_IS_FILL_LAYOUT_RENDERER(object)      (G_TYPE_CHECK_INSTANCE_TYPE ((object), EEL_TYPE_FILL_LAYOUT_RENDERER))
+#define EEL_FILL_LAYOUT_RENDERER_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass), EEL_TYPE_FILL_LAYOUT_RENDERER, EelFillLayoutRendererClass))
+#define EEL_IS_FILL_LAYOUT_RENDERER_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), EEL_TYPE_FILL_LAYOUT_RENDERER))
+#define EEL_FILL_LAYOUT_RENDERER_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj), EEL_TYPE_FILL_LAYOUT_RENDERER, EelFillLayoutRendererClass))
 
-typedef struct _GtkFillLayoutRenderer      GtkFillLayoutRenderer;
-typedef struct _GtkFillLayoutRendererClass GtkFillLayoutRendererClass;
+typedef struct _EelFillLayoutRenderer      EelFillLayoutRenderer;
+typedef struct _EelFillLayoutRendererClass EelFillLayoutRendererClass;
 
-struct _GtkFillLayoutRenderer
+struct _EelFillLayoutRenderer
 {
   PangoRenderer parent_instance;
 
   cairo_t *cr;
 };
 
-struct _GtkFillLayoutRendererClass
+struct _EelFillLayoutRendererClass
 {
   PangoRendererClass parent_class;
 };
 
-static GType _gtk_fill_layout_renderer_get_type (void);
-G_DEFINE_TYPE (GtkFillLayoutRenderer, _gtk_fill_layout_renderer, PANGO_TYPE_RENDERER)
+static GType _eel_fill_layout_renderer_get_type (void);
+G_DEFINE_TYPE (EelFillLayoutRenderer, _eel_fill_layout_renderer, PANGO_TYPE_RENDERER)
 
 static void
-gtk_fill_layout_renderer_draw_glyphs (PangoRenderer     *renderer,
+eel_fill_layout_renderer_draw_glyphs (PangoRenderer     *renderer,
                                       PangoFont         *font,
                                       PangoGlyphString  *glyphs,
                                       int                x,
                                       int                y)
 {
-  GtkFillLayoutRenderer *text_renderer = GTK_FILL_LAYOUT_RENDERER (renderer);
+  EelFillLayoutRenderer *text_renderer = EEL_FILL_LAYOUT_RENDERER (renderer);
 
   cairo_move_to (text_renderer->cr, (double)x / PANGO_SCALE, (double)y / PANGO_SCALE);
   pango_cairo_show_glyph_string (text_renderer->cr, font, glyphs);
 }
 
 static void
-gtk_fill_layout_renderer_draw_glyph_item (PangoRenderer     *renderer,
+eel_fill_layout_renderer_draw_glyph_item (PangoRenderer     *renderer,
                                           const char        *text,
                                           PangoGlyphItem    *glyph_item,
                                           int                x,
                                           int                y)
 {
-  GtkFillLayoutRenderer *text_renderer = GTK_FILL_LAYOUT_RENDERER (renderer);
+  EelFillLayoutRenderer *text_renderer = EEL_FILL_LAYOUT_RENDERER (renderer);
 
   cairo_move_to (text_renderer->cr, (double)x / PANGO_SCALE, (double)y / PANGO_SCALE);
   pango_cairo_show_glyph_item (text_renderer->cr, text, glyph_item);
 }
 
 static void
-gtk_fill_layout_renderer_draw_rectangle (PangoRenderer     *renderer,
+eel_fill_layout_renderer_draw_rectangle (PangoRenderer     *renderer,
                                          PangoRenderPart    part,
                                          int                x,
                                          int                y,
                                          int                width,
                                          int                height)
 {
-  GtkFillLayoutRenderer *text_renderer = GTK_FILL_LAYOUT_RENDERER (renderer);
+  EelFillLayoutRenderer *text_renderer = EEL_FILL_LAYOUT_RENDERER (renderer);
 
   if (part == PANGO_RENDER_PART_BACKGROUND)
     return;
@@ -110,7 +110,7 @@ gtk_fill_layout_renderer_draw_rectangle (PangoRenderer     *renderer,
 }
 
 static void
-gtk_fill_layout_renderer_draw_trapezoid (PangoRenderer     *renderer,
+eel_fill_layout_renderer_draw_trapezoid (PangoRenderer     *renderer,
                                          PangoRenderPart    part,
                                          double             y1_,
                                          double             x11,
@@ -119,7 +119,7 @@ gtk_fill_layout_renderer_draw_trapezoid (PangoRenderer     *renderer,
                                          double             x12,
                                          double             x22)
 {
-  GtkFillLayoutRenderer *text_renderer = GTK_FILL_LAYOUT_RENDERER (renderer);
+  EelFillLayoutRenderer *text_renderer = EEL_FILL_LAYOUT_RENDERER (renderer);
   cairo_matrix_t matrix;
   cairo_t *cr;
 
@@ -145,13 +145,13 @@ gtk_fill_layout_renderer_draw_trapezoid (PangoRenderer     *renderer,
 }
 
 static void
-gtk_fill_layout_renderer_draw_error_underline (PangoRenderer *renderer,
+eel_fill_layout_renderer_draw_error_underline (PangoRenderer *renderer,
                                                int            x,
                                                int            y,
                                                int            width,
                                                int            height)
 {
-  GtkFillLayoutRenderer *text_renderer = GTK_FILL_LAYOUT_RENDERER (renderer);
+  EelFillLayoutRenderer *text_renderer = EEL_FILL_LAYOUT_RENDERER (renderer);
 
   pango_cairo_show_error_underline (text_renderer->cr,
                                     (double)x / PANGO_SCALE, (double)y / PANGO_SCALE,
@@ -159,12 +159,12 @@ gtk_fill_layout_renderer_draw_error_underline (PangoRenderer *renderer,
 }
 
 static void
-gtk_fill_layout_renderer_draw_shape (PangoRenderer   *renderer,
+eel_fill_layout_renderer_draw_shape (PangoRenderer   *renderer,
                                      PangoAttrShape  *attr,
                                      int              x,
                                      int              y)
 {
-  GtkFillLayoutRenderer *text_renderer = GTK_FILL_LAYOUT_RENDERER (renderer);
+  EelFillLayoutRenderer *text_renderer = EEL_FILL_LAYOUT_RENDERER (renderer);
   cairo_t *cr = text_renderer->cr;
   PangoLayout *layout;
   PangoCairoShapeRendererFunc shape_renderer;
@@ -191,38 +191,38 @@ gtk_fill_layout_renderer_draw_shape (PangoRenderer   *renderer,
 }
 
 static void
-gtk_fill_layout_renderer_finalize (GObject *object)
+eel_fill_layout_renderer_finalize (GObject *object)
 {
-  G_OBJECT_CLASS (_gtk_fill_layout_renderer_parent_class)->finalize (object);
+  G_OBJECT_CLASS (_eel_fill_layout_renderer_parent_class)->finalize (object);
 }
 
 static void
-_gtk_fill_layout_renderer_init (GtkFillLayoutRenderer *renderer)
+_eel_fill_layout_renderer_init (EelFillLayoutRenderer *renderer)
 {
 }
 
 static void
-_gtk_fill_layout_renderer_class_init (GtkFillLayoutRendererClass *klass)
+_eel_fill_layout_renderer_class_init (EelFillLayoutRendererClass *klass)
 {
   GObjectClass *object_class = G_OBJECT_CLASS (klass);
   
   PangoRendererClass *renderer_class = PANGO_RENDERER_CLASS (klass);
   
-  renderer_class->draw_glyphs = gtk_fill_layout_renderer_draw_glyphs;
-  renderer_class->draw_glyph_item = gtk_fill_layout_renderer_draw_glyph_item;
-  renderer_class->draw_rectangle = gtk_fill_layout_renderer_draw_rectangle;
-  renderer_class->draw_trapezoid = gtk_fill_layout_renderer_draw_trapezoid;
-  renderer_class->draw_error_underline = gtk_fill_layout_renderer_draw_error_underline;
-  renderer_class->draw_shape = gtk_fill_layout_renderer_draw_shape;
+  renderer_class->draw_glyphs = eel_fill_layout_renderer_draw_glyphs;
+  renderer_class->draw_glyph_item = eel_fill_layout_renderer_draw_glyph_item;
+  renderer_class->draw_rectangle = eel_fill_layout_renderer_draw_rectangle;
+  renderer_class->draw_trapezoid = eel_fill_layout_renderer_draw_trapezoid;
+  renderer_class->draw_error_underline = eel_fill_layout_renderer_draw_error_underline;
+  renderer_class->draw_shape = eel_fill_layout_renderer_draw_shape;
 
-  object_class->finalize = gtk_fill_layout_renderer_finalize;
+  object_class->finalize = eel_fill_layout_renderer_finalize;
 }
 
 static void
-_gtk_pango_fill_layout (cairo_t     *cr,
+_eel_pango_fill_layout (cairo_t     *cr,
                         PangoLayout *layout)
 {
-  static GtkFillLayoutRenderer *renderer = NULL;
+  static EelFillLayoutRenderer *renderer = NULL;
   gboolean has_current_point;
   double current_x, current_y;
 
@@ -230,7 +230,7 @@ _gtk_pango_fill_layout (cairo_t     *cr,
   cairo_get_current_point (cr, &current_x, &current_y);
 
   if (renderer == NULL)
-    renderer = g_object_new (GTK_TYPE_FILL_LAYOUT_RENDERER, NULL);
+    renderer = g_object_new (EEL_TYPE_FILL_LAYOUT_RENDERER, NULL);
 
   cairo_save (cr);
   cairo_translate (cr, current_x, current_y);
@@ -1819,7 +1819,7 @@ eel_editable_label_draw (GtkWidget *widget,
 
           cairo_save (cr);
           gdk_cairo_set_source_rgba (cr, &color);
-          _gtk_pango_fill_layout (cr, label->layout);
+          _eel_pango_fill_layout (cr, label->layout);
 
           cairo_restore (cr);