GNOME.org
 

[ekiga] Modernized the GmTextBufferEnhancerHelperInterface code

commit 2dcad6f6ae54eb5a0cc7305e15609780a860d703
Author: Snark <jpuydt gnome org>
Date:   Mon Nov 8 22:23:44 2010 +0100

    Modernized the GmTextBufferEnhancerHelperInterface code
    
    That lead to much broader changes than what I had in mind, but still
    it should help in the long run to rely on glib-maintained macros.

 lib/Makefile.am                                    |    4 +-
 lib/engine/gui/gtk-frontend/chat-area.cpp          |    4 +-
 lib/gui/gm-text-anchored-tag.c                     |   40 +++++++---------
 lib/gui/gm-text-anchored-tag.h                     |    8 ++--
 ... => gm-text-buffer-enhancer-helper-interface.c} |   51 +++++---------------
 ... => gm-text-buffer-enhancer-helper-interface.h} |   35 +++++++-------
 lib/gui/gm-text-buffer-enhancer.c                  |   10 ++--
 lib/gui/gm-text-buffer-enhancer.h                  |    5 +-
 lib/gui/gm-text-extlink.c                          |   29 +++++-------
 lib/gui/gm-text-extlink.h                          |    6 +-
 lib/gui/gm-text-smiley.c                           |   25 ++++------
 lib/gui/gm-text-smiley.h                           |    4 +-
 12 files changed, 89 insertions(+), 132 deletions(-)
---
diff --git a/lib/Makefile.am b/lib/Makefile.am
index cc98d0b..3d43a70 100644
--- a/lib/Makefile.am
+++ b/lib/Makefile.am
@@ -185,8 +185,8 @@ libekiga_la_SOURCES += \
 	$(top_srcdir)/lib/gui/gmcellrendererexpander.h \
 	$(top_srcdir)/lib/gui/gm-cell-renderer-bitext.c \
 	$(top_srcdir)/lib/gui/gm-cell-renderer-bitext.h \
-	$(top_srcdir)/lib/gui/gm-text-buffer-enhancer-helper-iface.c \
-	$(top_srcdir)/lib/gui/gm-text-buffer-enhancer-helper-iface.h \
+	$(top_srcdir)/lib/gui/gm-text-buffer-enhancer-helper-interface.c \
+	$(top_srcdir)/lib/gui/gm-text-buffer-enhancer-helper-interface.h \
 	$(top_srcdir)/lib/gui/gm-text-anchored-tag.c \
 	$(top_srcdir)/lib/gui/gm-text-anchored-tag.h \
 	$(top_srcdir)/lib/gui/gm-text-smiley.c \
diff --git a/lib/engine/gui/gtk-frontend/chat-area.cpp b/lib/engine/gui/gtk-frontend/chat-area.cpp
index 4e8c228..693b644 100644
--- a/lib/engine/gui/gtk-frontend/chat-area.cpp
+++ b/lib/engine/gui/gtk-frontend/chat-area.cpp
@@ -176,7 +176,7 @@ gm_chat_area_define_simple_text_tag (GtkTextBuffer* buffer,
 {
   va_list args;
   GtkTextTag* tag = NULL;
-  GmTextBufferEnhancerHelperIFace* helper = NULL;
+  GmTextBufferEnhancerHelper* helper = NULL;
   gchar* tmp_tagstring = NULL;
 
   g_return_if_fail (buffer != NULL);
@@ -746,7 +746,7 @@ chat_area_init (GTypeInstance* instance,
 {
   ChatArea* self = NULL;
   GtkTextBuffer* buffer = NULL;
-  GmTextBufferEnhancerHelperIFace* helper = NULL;
+  GmTextBufferEnhancerHelper* helper = NULL;
   GtkTextTag* tag = NULL;
   GtkTextIter iter;
   GtkWidget *frame = NULL;
diff --git a/lib/gui/gm-text-anchored-tag.c b/lib/gui/gm-text-anchored-tag.c
index cccc8e1..0e9d09e 100644
--- a/lib/gui/gm-text-anchored-tag.c
+++ b/lib/gui/gm-text-anchored-tag.c
@@ -37,23 +37,22 @@
 
 #include "gm-text-anchored-tag.h"
 
-#include <string.h>
-
 struct _GmTextAnchoredTagPrivate {
+
   gchar* anchor;
   GtkTextTag* tag;
   gboolean opening;
 };
 
-/* declaration of the GmTextBufferEnhancerHelperIFace code */
+/* declaration of the GmTextBufferEnhancerHelperInterface code */
 
-static void enhancer_helper_check (GmTextBufferEnhancerHelperIFace* self,
+static void enhancer_helper_check (GmTextBufferEnhancerHelper* self,
 				   const gchar* full_text,
 				   gint from,
 				   gint* start,
 				   gint* length);
 
-static void enhancer_helper_enhance (GmTextBufferEnhancerHelperIFace* self,
+static void enhancer_helper_enhance (GmTextBufferEnhancerHelper* self,
 				     GtkTextBuffer* buffer,
 				     GtkTextIter* iter,
 				     GSList** tags,
@@ -61,17 +60,16 @@ static void enhancer_helper_enhance (GmTextBufferEnhancerHelperIFace* self,
 				     gint* start,
 				     gint length);
 
-static void enhancer_helper_iface_init (gpointer g_iface,
-					gpointer iface_data);
+static void enhancer_helper_interface_init (GmTextBufferEnhancerHelperInterface* iface);
 
 G_DEFINE_TYPE_EXTENDED (GmTextAnchoredTag, gm_text_anchored_tag, G_TYPE_OBJECT, 0,
-			G_IMPLEMENT_INTERFACE (GM_TYPE_TEXT_BUFFER_ENHANCER_HELPER_IFACE,
-					       enhancer_helper_iface_init));
+			G_IMPLEMENT_INTERFACE (GM_TYPE_TEXT_BUFFER_ENHANCER_HELPER,
+					       enhancer_helper_interface_init));
 
-/* implementation of the GmTextBufferEnhancerHelperIFace code */
+/* implementation of the GmTextBufferEnhancerHelperInterface code */
 
 static void
-enhancer_helper_check (GmTextBufferEnhancerHelperIFace* self,
+enhancer_helper_check (GmTextBufferEnhancerHelper* self,
 		       const gchar* full_text,
 		       gint from,
 		       gint* start,
@@ -80,18 +78,18 @@ enhancer_helper_check (GmTextBufferEnhancerHelperIFace* self,
   GmTextAnchoredTagPrivate* priv = GM_TEXT_ANCHORED_TAG (self)->priv;
   char* found = NULL;
 
-  found = strstr (full_text + from, priv->anchor);
+  found = g_strstr_len (full_text + from, -1, priv->anchor);
 
   if (found != NULL) {
 
     *start = found - full_text;
-    *length = strlen (priv->anchor);
+    *length = g_utf8_strlen (priv->anchor, -1);
   } else
     *length = 0;
 }
 
 static void
-enhancer_helper_enhance (GmTextBufferEnhancerHelperIFace* self,
+enhancer_helper_enhance (GmTextBufferEnhancerHelper* self,
 			 G_GNUC_UNUSED GtkTextBuffer* buffer,
 			 G_GNUC_UNUSED GtkTextIter* iter,
 			 GSList** tags,
@@ -110,14 +108,10 @@ enhancer_helper_enhance (GmTextBufferEnhancerHelperIFace* self,
 }
 
 static void
-enhancer_helper_iface_init (gpointer g_iface,
-			    G_GNUC_UNUSED gpointer iface_data)
+enhancer_helper_interface_init (GmTextBufferEnhancerHelperInterface* iface)
 {
-  GmTextBufferEnhancerHelperIFaceClass* iface = NULL;
-
-  iface = (GmTextBufferEnhancerHelperIFaceClass*)g_iface;
-  iface->do_check = &enhancer_helper_check;
-  iface->do_enhance = &enhancer_helper_enhance;
+  iface->do_check = enhancer_helper_check;
+  iface->do_enhance = enhancer_helper_enhance;
 }
 
 /* GObject boilerplate */
@@ -174,7 +168,7 @@ gm_text_anchored_tag_init (GmTextAnchoredTag* obj)
 
 /* Implementation of the public api */
 
-GmTextBufferEnhancerHelperIFace*
+GmTextBufferEnhancerHelper*
 gm_text_anchored_tag_new (const gchar* anchor,
 			  GtkTextTag* tag,
 			  gboolean opening)
@@ -192,5 +186,5 @@ gm_text_anchored_tag_new (const gchar* anchor,
 
   result->priv->opening = opening;
 
-  return GM_TEXT_BUFFER_ENHANCER_HELPER_IFACE (result);
+  return GM_TEXT_BUFFER_ENHANCER_HELPER (result);
 }
diff --git a/lib/gui/gm-text-anchored-tag.h b/lib/gui/gm-text-anchored-tag.h
index 3c1b820..20e160c 100644
--- a/lib/gui/gm-text-anchored-tag.h
+++ b/lib/gui/gm-text-anchored-tag.h
@@ -38,7 +38,7 @@
 #ifndef __GM_TEXT_ANCHORED_TAG_H__
 #define __GM_TEXT_ANCHORED_TAG_H__
 
-#include "gm-text-buffer-enhancer-helper-iface.h"
+#include "gm-text-buffer-enhancer-helper-interface.h"
 
 #include <gtk/gtk.h>
 
@@ -62,9 +62,9 @@ G_BEGIN_DECLS
  *  g_object_unref (helper);
  *
  */
-GmTextBufferEnhancerHelperIFace* gm_text_anchored_tag_new (const gchar* anchor,
-							   GtkTextTag* tag,
-							   gboolean opening);
+GmTextBufferEnhancerHelper* gm_text_anchored_tag_new (const gchar* anchor,
+						      GtkTextTag* tag,
+						      gboolean opening);
 
 /* GObject boilerplate */
 
diff --git a/lib/gui/gm-text-buffer-enhancer-helper-iface.c b/lib/gui/gm-text-buffer-enhancer-helper-interface.c
similarity index 64%
rename from lib/gui/gm-text-buffer-enhancer-helper-iface.c
rename to lib/gui/gm-text-buffer-enhancer-helper-interface.c
index 59a940f..fe5c558 100644
--- a/lib/gui/gm-text-buffer-enhancer-helper-iface.c
+++ b/lib/gui/gm-text-buffer-enhancer-helper-interface.c
@@ -27,7 +27,7 @@
 
 
 /*
- *                        gm-text-buffer-enhancer-helper-iface.c  -  description
+ *                        gm-text-buffer-enhancer-helper-interface.c  -  description
  *                         --------------------------------
  *   begin                : written in july 2008 by Julien Puydt
  *   copyright            : (C) 2008 by Julien Puydt
@@ -36,61 +36,34 @@
  *
  */
 
-#include "gm-text-buffer-enhancer-helper-iface.h"
+#include "gm-text-buffer-enhancer-helper-interface.h"
 
 /* GObject code */
 
 static void
-gm_text_buffer_enhancer_helper_iface_base_init (G_GNUC_UNUSED gpointer g_class)
+gm_text_buffer_enhancer_helper_default_init (G_GNUC_UNUSED GmTextBufferEnhancerHelperInterface* iface)
 {
-  static gboolean initialized = FALSE;
-  if (!initialized) {
-    /* nothing */
-    initialized = TRUE;
-  }
+  /* nothing */
 }
-GType
-gm_text_buffer_enhancer_helper_iface_get_type (void)
-{
-  static GType result = 0;
-  if (!result) {
-
-    static const GTypeInfo my_info = {
-      sizeof(GmTextBufferEnhancerHelperIFaceClass),
-      gm_text_buffer_enhancer_helper_iface_base_init,
-      NULL,
-      NULL,
-      NULL,
-      NULL,
-      0,
-      0,
-      NULL,
-      NULL
-    };
-
-    result = g_type_register_static (G_TYPE_INTERFACE,
-				     "GmTextBufferEnhancerHelperIFace",
-				     &my_info, 0);
 
-    g_type_interface_add_prerequisite (result, G_TYPE_OBJECT);
-  }
-  return result;
-}
+G_DEFINE_INTERFACE (GmTextBufferEnhancerHelper, gm_text_buffer_enhancer_helper, G_TYPE_OBJECT);
 
 /* public api */
 
 void
-gm_text_buffer_enhancer_helper_check (GmTextBufferEnhancerHelperIFace* self,
+gm_text_buffer_enhancer_helper_check (GmTextBufferEnhancerHelper* self,
 				      const gchar* full_text,
 				      gint from,
 				      gint* start,
 				      gint* length)
 {
-  GM_TEXT_BUFFER_ENHANCER_HELPER_IFACE_GET_CLASS (self)->do_check (self, full_text, from, start, length);
+  g_return_if_fail (GM_IS_TEXT_BUFFER_ENHANCER_HELPER (self));
+
+  (*GM_TEXT_BUFFER_ENHANCER_HELPER_GET_INTERFACE (self)->do_check) (self, full_text, from, start, length);
 }
 
 void
-gm_text_buffer_enhancer_helper_enhance (GmTextBufferEnhancerHelperIFace* self,
+gm_text_buffer_enhancer_helper_enhance (GmTextBufferEnhancerHelper* self,
 					GtkTextBuffer* buffer,
 					GtkTextIter* iter,
 					GSList** tags,
@@ -98,5 +71,7 @@ gm_text_buffer_enhancer_helper_enhance (GmTextBufferEnhancerHelperIFace* self,
 					gint* start,
 					gint length)
 {
-  GM_TEXT_BUFFER_ENHANCER_HELPER_IFACE_GET_CLASS (self)->do_enhance (self, buffer, iter, tags, full_text, start, length);
+  g_return_if_fail (GM_IS_TEXT_BUFFER_ENHANCER_HELPER (self));
+
+  (*GM_TEXT_BUFFER_ENHANCER_HELPER_GET_INTERFACE (self)->do_enhance) (self, buffer, iter, tags, full_text, start, length);
 }
diff --git a/lib/gui/gm-text-buffer-enhancer-helper-iface.h b/lib/gui/gm-text-buffer-enhancer-helper-interface.h
similarity index 71%
rename from lib/gui/gm-text-buffer-enhancer-helper-iface.h
rename to lib/gui/gm-text-buffer-enhancer-helper-interface.h
index 76dee96..9306ed2 100644
--- a/lib/gui/gm-text-buffer-enhancer-helper-iface.h
+++ b/lib/gui/gm-text-buffer-enhancer-helper-interface.h
@@ -27,7 +27,7 @@
 
 
 /*
- *                        gm-text-buffer-enhancer-helper-iface.h  -  description
+ *                        gm-text-buffer-enhancer-helper-interface.h  -  description
  *                         --------------------------------
  *   begin                : written in july 2008 by Julien Puydt
  *   copyright            : (C) 2008 by Julien Puydt
@@ -36,15 +36,15 @@
  *
  */
 
-#ifndef __GM_TEXT_BUFFER_ENHANCER_HELPER_IFACE_H__
-#define __GM_TEXT_BUFFER_ENHANCER_HELPER_IFACE_H__
+#ifndef __GM_TEXT_BUFFER_ENHANCER_HELPER_INTERFACE_H__
+#define __GM_TEXT_BUFFER_ENHANCER_HELPER_INTERFACE_H__
 
 #include <gtk/gtk.h>
 
 G_BEGIN_DECLS
 
-typedef struct _GmTextBufferEnhancerHelperIFace      GmTextBufferEnhancerHelperIFace;
-typedef struct _GmTextBufferEnhancerHelperIFaceClass GmTextBufferEnhancerHelperIFaceClass;
+typedef struct _GmTextBufferEnhancerHelper GmTextBufferEnhancerHelper;
+typedef struct _GmTextBufferEnhancerHelperInterface GmTextBufferEnhancerHelperInterface;
 
 /* public api */
 
@@ -65,7 +65,7 @@ typedef struct _GmTextBufferEnhancerHelperIFaceClass GmTextBufferEnhancerHelperI
  * - the length allows the enhancer to prefer the helper which saw "fooz" when
  *   compared to the one which saw "foo".
  */
-void gm_text_buffer_enhancer_helper_check (GmTextBufferEnhancerHelperIFace* self,
+void gm_text_buffer_enhancer_helper_check (GmTextBufferEnhancerHelper* self,
 					   const gchar* full_text,
 					   gint from,
 					   gint* start,
@@ -87,7 +87,7 @@ void gm_text_buffer_enhancer_helper_check (GmTextBufferEnhancerHelperIFace* self
  * "the helper said" means those values are those the helper answered in its
  * check method.
  */
-void gm_text_buffer_enhancer_helper_enhance (GmTextBufferEnhancerHelperIFace* self,
+void gm_text_buffer_enhancer_helper_enhance (GmTextBufferEnhancerHelper* self,
 					     GtkTextBuffer* buffer,
 					     GtkTextIter* iter,
 					     GSList** tags,
@@ -97,16 +97,17 @@ void gm_text_buffer_enhancer_helper_enhance (GmTextBufferEnhancerHelperIFace* se
 
 /* GObject boilerplate */
 
-struct _GmTextBufferEnhancerHelperIFaceClass {
+struct _GmTextBufferEnhancerHelperInterface {
+
   GTypeInterface parent;
 
-  void (*do_check) (GmTextBufferEnhancerHelperIFace* self,
+  void (*do_check) (GmTextBufferEnhancerHelper* self,
 		    const gchar* full_text,
 		    gint from,
 		    gint* start,
 		    gint* length);
 
-  void (*do_enhance) (GmTextBufferEnhancerHelperIFace* self,
+  void (*do_enhance) (GmTextBufferEnhancerHelper* self,
 		      GtkTextBuffer* buffer,
 		      GtkTextIter* iter,
 		      GSList** tags,
@@ -115,15 +116,13 @@ struct _GmTextBufferEnhancerHelperIFaceClass {
 		      gint length);
 };
 
-#define GM_TYPE_TEXT_BUFFER_ENHANCER_HELPER_IFACE (gm_text_buffer_enhancer_helper_iface_get_type())
-#define GM_TEXT_BUFFER_ENHANCER_HELPER_IFACE(obj) (G_TYPE_CHECK_INSTANCE_CAST((obj),GM_TYPE_TEXT_BUFFER_ENHANCER_HELPER_IFACE,GmTextBufferEnhancerHelperIFace))
-#define GM_TEXT_BUFFER_ENHANCER_HELPER_IFACE_CLASS(vtable) (G_TYPE_CHECK_CLASS_CAST((vtable),GM_TYPE_TEXT_BUFFER_ENHANCER_HELPER_IFACE,GTypeInterface))
-#define GM_IS_TEXT_BUFFER_ENHANCER_HELPER_IFACE(obj) (G_TYPE_CHECK_INSTANCE_TYPE((obj),GM_TYPE_TEXT_BUFFER_ENHANCER_HELPER_IFACE))
-#define GM_IS_TEXT_BUFFER_ENHANCER_HELPER_IFACE_CLASS(vtable) (G_TYPE_CHECK_CLASS_TYPE((vtable),GM_TYPE_TEXT_BUFFER_ENHANCER_HELPER_IFACE))
-#define GM_TEXT_BUFFER_ENHANCER_HELPER_IFACE_GET_CLASS(inst) (G_TYPE_INSTANCE_GET_INTERFACE((inst),GM_TYPE_TEXT_BUFFER_ENHANCER_HELPER_IFACE,GmTextBufferEnhancerHelperIFaceClass))
+#define GM_TYPE_TEXT_BUFFER_ENHANCER_HELPER (gm_text_buffer_enhancer_helper_get_type())
+#define GM_TEXT_BUFFER_ENHANCER_HELPER(obj) (G_TYPE_CHECK_INSTANCE_CAST((obj),GM_TYPE_TEXT_BUFFER_ENHANCER_HELPER, GmTextBufferEnhancerHelper))
+#define GM_IS_TEXT_BUFFER_ENHANCER_HELPER(obj) (G_TYPE_CHECK_INSTANCE_TYPE((obj),GM_TYPE_TEXT_BUFFER_ENHANCER_HELPER))
+#define GM_TEXT_BUFFER_ENHANCER_HELPER_GET_INTERFACE(obj) (G_TYPE_INSTANCE_GET_INTERFACE((obj),GM_TYPE_TEXT_BUFFER_ENHANCER_HELPER, GmTextBufferEnhancerHelperInterface))
 
-GType gm_text_buffer_enhancer_helper_iface_get_type () G_GNUC_CONST;
+GType gm_text_buffer_enhancer_helper_get_type () G_GNUC_CONST;
 
 G_END_DECLS
 
-#endif /* __GM_TEXT_BUFFER_ENHANCER_HELPER_IFACE_H__ */
+#endif
diff --git a/lib/gui/gm-text-buffer-enhancer.c b/lib/gui/gm-text-buffer-enhancer.c
index 23d5ce7..b67df28 100644
--- a/lib/gui/gm-text-buffer-enhancer.c
+++ b/lib/gui/gm-text-buffer-enhancer.c
@@ -118,12 +118,12 @@ gm_text_buffer_enhancer_new (GtkTextBuffer* buffer)
 
 void
 gm_text_buffer_enhancer_add_helper (GmTextBufferEnhancer* self,
-				    GmTextBufferEnhancerHelperIFace* helper)
+				    GmTextBufferEnhancerHelper* helper)
 {
   GmTextBufferEnhancerPrivate* priv = NULL;
 
   g_return_if_fail (GM_IS_TEXT_BUFFER_ENHANCER (self));
-  g_return_if_fail (GM_IS_TEXT_BUFFER_ENHANCER_HELPER_IFACE (helper));
+  g_return_if_fail (GM_IS_TEXT_BUFFER_ENHANCER_HELPER (helper));
 
   priv = GM_TEXT_BUFFER_ENHANCER_GET_PRIVATE(self);
   g_object_ref (helper);
@@ -140,11 +140,11 @@ gm_text_buffer_enhancer_insert_text (GmTextBufferEnhancer* self,
   gint position = 0;
   gint length = 0;
   GSList* active_tags = NULL;
-  GmTextBufferEnhancerHelperIFace* best_helper = NULL;
+  GmTextBufferEnhancerHelper* best_helper = NULL;
   gint best_start = 0;
   gint best_length = 0;
   GSList* helper_ptr = NULL;
-  GmTextBufferEnhancerHelperIFace* considered_helper = NULL;
+  GmTextBufferEnhancerHelper* considered_helper = NULL;
   gint considered_start = 0;
   gint considered_length = 0;
   GSList* tag_ptr = NULL;
@@ -176,7 +176,7 @@ gm_text_buffer_enhancer_insert_text (GmTextBufferEnhancer* self,
 	 helper_ptr = g_slist_next (helper_ptr)) {
 
       considered_helper
-	= GM_TEXT_BUFFER_ENHANCER_HELPER_IFACE (helper_ptr->data);
+	= GM_TEXT_BUFFER_ENHANCER_HELPER (helper_ptr->data);
       gm_text_buffer_enhancer_helper_check (considered_helper,
 					    text, position,
 					    &considered_start,
diff --git a/lib/gui/gm-text-buffer-enhancer.h b/lib/gui/gm-text-buffer-enhancer.h
index 385ed16..36110d3 100644
--- a/lib/gui/gm-text-buffer-enhancer.h
+++ b/lib/gui/gm-text-buffer-enhancer.h
@@ -4,8 +4,7 @@
 #ifndef __GM_TEXT_BUFFER_ENHANCER_H__
 #define __GM_TEXT_BUFFER_ENHANCER_H__
 
-#include <gtk/gtk.h>
-#include "gm-text-buffer-enhancer-helper-iface.h"
+#include "gm-text-buffer-enhancer-helper-interface.h"
 
 G_BEGIN_DECLS
 
@@ -34,7 +33,7 @@ GType gm_text_buffer_enhancer_get_type () G_GNUC_CONST;
 GmTextBufferEnhancer* gm_text_buffer_enhancer_new (GtkTextBuffer* buffer);
 
 void gm_text_buffer_enhancer_add_helper (GmTextBufferEnhancer* self,
-					 GmTextBufferEnhancerHelperIFace* helper);
+					 GmTextBufferEnhancerHelper* helper);
 
 void gm_text_buffer_enhancer_insert_text (GmTextBufferEnhancer* self,
 					  GtkTextIter* iter,
diff --git a/lib/gui/gm-text-extlink.c b/lib/gui/gm-text-extlink.c
index d240c42..9efb195 100644
--- a/lib/gui/gm-text-extlink.c
+++ b/lib/gui/gm-text-extlink.c
@@ -52,15 +52,15 @@ struct _GmTextExtlinkPrivate {
 
 #define GM_TEXT_EXTLINK_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE((o), GM_TYPE_TEXT_EXTLINK, GmTextExtlinkPrivate))
 
-/* declaration of the GmTextBufferEnhancerHelperIFace code */
+/* declaration of the GmTextBufferEnhancerHelperInterface code */
 
-static void enhancer_helper_check (GmTextBufferEnhancerHelperIFace* self,
+static void enhancer_helper_check (GmTextBufferEnhancerHelper* self,
 				   const gchar* full_text,
 				   gint from,
 				   gint* start,
 				   gint* length);
 
-static void enhancer_helper_enhance (GmTextBufferEnhancerHelperIFace* self,
+static void enhancer_helper_enhance (GmTextBufferEnhancerHelper* self,
 				     GtkTextBuffer* buffer,
 				     GtkTextIter* iter,
 				     GSList** tags,
@@ -68,13 +68,12 @@ static void enhancer_helper_enhance (GmTextBufferEnhancerHelperIFace* self,
 				     gint* start,
 				     gint length);
 
-static void enhancer_helper_iface_init (gpointer g_iface,
-					gpointer iface_data);
+static void enhancer_helper_iface_init (GmTextBufferEnhancerHelperInterface* iface);
 
-/* implementation of the GmTextBufferEnhancerHelperIFace code */
+/* implementation of the GmTextBufferEnhancerHelperInterface code */
 
 static void
-enhancer_helper_check (GmTextBufferEnhancerHelperIFace* self,
+enhancer_helper_check (GmTextBufferEnhancerHelper* self,
 		       const gchar* full_text,
 		       gint from,
 		       gint* start,
@@ -96,7 +95,7 @@ enhancer_helper_check (GmTextBufferEnhancerHelperIFace* self,
 }
 
 static void
-enhancer_helper_enhance (GmTextBufferEnhancerHelperIFace* self,
+enhancer_helper_enhance (GmTextBufferEnhancerHelper* self,
 			 GtkTextBuffer* buffer,
 			 GtkTextIter* iter,
 			 G_GNUC_UNUSED GSList** tags,
@@ -119,12 +118,8 @@ enhancer_helper_enhance (GmTextBufferEnhancerHelperIFace* self,
 }
 
 static void
-enhancer_helper_iface_init (gpointer g_iface,
-			    G_GNUC_UNUSED gpointer iface_data)
+enhancer_helper_iface_init (GmTextBufferEnhancerHelperInterface* iface)
 {
-  GmTextBufferEnhancerHelperIFaceClass* iface = NULL;
-
-  iface = (GmTextBufferEnhancerHelperIFaceClass*)g_iface;
   iface->do_check = &enhancer_helper_check;
   iface->do_enhance = &enhancer_helper_enhance;
 }
@@ -202,7 +197,7 @@ gm_text_extlink_get_type ()
 				     "GmTextExtlink",
 				     &my_info, 0);
     g_type_add_interface_static (result,
-				 GM_TYPE_TEXT_BUFFER_ENHANCER_HELPER_IFACE,
+				 GM_TYPE_TEXT_BUFFER_ENHANCER_HELPER,
 				 &enhancer_helper_info);
   }
   return result;
@@ -210,16 +205,16 @@ gm_text_extlink_get_type ()
 
 /* public api */
 
-GmTextBufferEnhancerHelperIFace*
+GmTextBufferEnhancerHelper*
 gm_text_extlink_new (const gchar* regex,
 		     GtkTextTag* tag)
 {
-  GmTextBufferEnhancerHelperIFace* result = NULL;
+  GmTextBufferEnhancerHelper* result = NULL;
   GmTextExtlinkPrivate* priv = NULL;
 
   g_return_val_if_fail (regex != NULL, NULL);
 
-  result = (GmTextBufferEnhancerHelperIFace*)g_object_new(GM_TYPE_TEXT_EXTLINK, NULL);
+  result = GM_TEXT_BUFFER_ENHANCER_HELPER (g_object_new(GM_TYPE_TEXT_EXTLINK, NULL));
   priv = GM_TEXT_EXTLINK_GET_PRIVATE (result);
 
   g_object_ref (tag);
diff --git a/lib/gui/gm-text-extlink.h b/lib/gui/gm-text-extlink.h
index e56a8d0..9491a20 100644
--- a/lib/gui/gm-text-extlink.h
+++ b/lib/gui/gm-text-extlink.h
@@ -38,14 +38,14 @@
 #ifndef __GM_TEXT_EXTLINK_H__
 #define __GM_TEXT_EXTLINK_H__
 
-#include "gm-text-buffer-enhancer-helper-iface.h"
+#include "gm-text-buffer-enhancer-helper-interface.h"
 
 G_BEGIN_DECLS
 
 /* public api */
 
-GmTextBufferEnhancerHelperIFace* gm_text_extlink_new (const gchar* regex,
-						      GtkTextTag* tag);
+GmTextBufferEnhancerHelper* gm_text_extlink_new (const gchar* regex,
+						 GtkTextTag* tag);
 
 /* GObject boilerplate */
 
diff --git a/lib/gui/gm-text-smiley.c b/lib/gui/gm-text-smiley.c
index 37cc5ac..4c68514 100644
--- a/lib/gui/gm-text-smiley.c
+++ b/lib/gui/gm-text-smiley.c
@@ -45,13 +45,13 @@ static GObjectClass* parent_class = NULL;
 
 /* declaration of the GmTextBufferEnhancerHelperIFace code */
 
-static void enhancer_helper_check (GmTextBufferEnhancerHelperIFace* self,
+static void enhancer_helper_check (GmTextBufferEnhancerHelper* self,
 				   const gchar* full_text,
 				   gint from,
 				   gint* start,
 				   gint* length);
 
-static void enhancer_helper_enhance (GmTextBufferEnhancerHelperIFace* self,
+static void enhancer_helper_enhance (GmTextBufferEnhancerHelper* self,
 				     GtkTextBuffer* buffer,
 				     GtkTextIter* iter,
 				     GSList** tags,
@@ -59,13 +59,12 @@ static void enhancer_helper_enhance (GmTextBufferEnhancerHelperIFace* self,
 				     gint* start,
 				     gint length);
 
-static void enhancer_helper_iface_init (gpointer g_iface,
-					gpointer iface_data);
+static void enhancer_helper_iface_init (GmTextBufferEnhancerHelperInterface* iface);
 
-/* implementation of the GmTextBufferEnhancerHelperIFace code */
+/* implementation of the GmTextBufferEnhancerHelperInterface code */
 
 static void
-enhancer_helper_check (G_GNUC_UNUSED GmTextBufferEnhancerHelperIFace* self,
+enhancer_helper_check (G_GNUC_UNUSED GmTextBufferEnhancerHelper* self,
 		       const gchar* full_text,
 		       gint from,
 		       gint* start,
@@ -111,7 +110,7 @@ enhancer_helper_check (G_GNUC_UNUSED GmTextBufferEnhancerHelperIFace* self,
 }
 
 static void
-enhancer_helper_enhance (G_GNUC_UNUSED GmTextBufferEnhancerHelperIFace* self,
+enhancer_helper_enhance (G_GNUC_UNUSED GmTextBufferEnhancerHelper* self,
 			 GtkTextBuffer* buffer,
 			 GtkTextIter* iter,
 			 G_GNUC_UNUSED GSList** tags,
@@ -150,12 +149,8 @@ enhancer_helper_enhance (G_GNUC_UNUSED GmTextBufferEnhancerHelperIFace* self,
 }
 
 static void
-enhancer_helper_iface_init (gpointer g_iface,
-			    G_GNUC_UNUSED gpointer iface_data)
+enhancer_helper_iface_init (GmTextBufferEnhancerHelperInterface* iface)
 {
-  GmTextBufferEnhancerHelperIFaceClass* iface = NULL;
-
-  iface = (GmTextBufferEnhancerHelperIFaceClass*)g_iface;
   iface->do_check = &enhancer_helper_check;
   iface->do_enhance = &enhancer_helper_enhance;
 }
@@ -197,7 +192,7 @@ gm_text_smiley_get_type ()
 				     "GmTextSmiley",
 				     &my_info, 0);
     g_type_add_interface_static (result,
-				 GM_TYPE_TEXT_BUFFER_ENHANCER_HELPER_IFACE,
+				 GM_TYPE_TEXT_BUFFER_ENHANCER_HELPER,
 				 &enhancer_helper_info);
   }
   return result;
@@ -205,8 +200,8 @@ gm_text_smiley_get_type ()
 
 /* public api */
 
-GmTextBufferEnhancerHelperIFace*
+GmTextBufferEnhancerHelper*
 gm_text_smiley_new (void)
 {
-  return (GmTextBufferEnhancerHelperIFace*)g_object_new(GM_TYPE_TEXT_SMILEY, NULL);
+  return GM_TEXT_BUFFER_ENHANCER_HELPER (g_object_new(GM_TYPE_TEXT_SMILEY, NULL));
 }
diff --git a/lib/gui/gm-text-smiley.h b/lib/gui/gm-text-smiley.h
index fd3ac02..c03d27f 100644
--- a/lib/gui/gm-text-smiley.h
+++ b/lib/gui/gm-text-smiley.h
@@ -38,13 +38,13 @@
 #ifndef __GM_TEXT_SMILEY_H__
 #define __GM_TEXT_SMILEY_H__
 
-#include "gm-text-buffer-enhancer-helper-iface.h"
+#include "gm-text-buffer-enhancer-helper-interface.h"
 
 G_BEGIN_DECLS
 
 /* public api */
 
-GmTextBufferEnhancerHelperIFace* gm_text_smiley_new ();
+GmTextBufferEnhancerHelper* gm_text_smiley_new ();
 
 /* GObject boilerplate */
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]