/soc/2013/ankitkv/gobjectification: fbb8840b1d71: Revert changes...

[Ankit Vani]

Changeset: fbb8840b1d71995e9a308da21af0a92a53f07f1e
Author:	 Ankit Vani <a at nevitus.org>
Date:	 2014-02-07 01:17 +0530
Branch:	 soc.2013.gobjectification.plugins
URL: https://hg.pidgin.im/soc/2013/ankitkv/gobjectification/rev/fbb8840b1d71

Description:

Revert changes to libgnt/*.h from the prev commit

diffstat:

 finch/libgnt/gntbindable.h |  4 ++--
 finch/libgnt/gntbox.h      |  8 ++++----
 finch/libgnt/gntbutton.h   |  8 ++++----
 finch/libgnt/gntlabel.h    |  8 ++++----
 finch/libgnt/gnttree.h     |  7 ++-----
 finch/libgnt/gntwidget.h   |  8 ++++----
 6 files changed, 20 insertions(+), 23 deletions(-)

diffs (110 lines):

diff --git a/finch/libgnt/gntbindable.h b/finch/libgnt/gntbindable.h
--- a/finch/libgnt/gntbindable.h
+++ b/finch/libgnt/gntbindable.h
@@ -89,8 +89,8 @@ struct _GntBindableAction
 {
 	char *name;        /* The name of the action */
 	union {
-		GntBindableActionCallback action;
-		GntBindableActionCallbackNoParam action_noparam;
+		gboolean (*action)(GntBindable *bindable, GList *params);
+		gboolean (*action_noparam)(GntBindable *bindable);
 	} u;
 };
 
diff --git a/finch/libgnt/gntbox.h b/finch/libgnt/gntbox.h
--- a/finch/libgnt/gntbox.h
+++ b/finch/libgnt/gntbox.h
@@ -72,10 +72,10 @@ struct _GntBox
 	GList *focus;		/* List of widgets to cycle focus (only valid for parent boxes) */
 
 	/*< private >*/
-    void *res1;
-    void *res2;
-    void *res3;
-    void *res4;
+    void (*gnt_reserved1)(void);
+    void (*gnt_reserved2)(void);
+    void (*gnt_reserved3)(void);
+    void (*gnt_reserved4)(void);
 };
 
 struct _GntBoxClass
diff --git a/finch/libgnt/gntbutton.h b/finch/libgnt/gntbutton.h
--- a/finch/libgnt/gntbutton.h
+++ b/finch/libgnt/gntbutton.h
@@ -57,10 +57,10 @@ struct _GntButton
 	GntButtonPriv *priv;
 
 	/*< private >*/
-    void *res1;
-    void *res2;
-    void *res3;
-    void *res4;
+    void (*gnt_reserved1)(void);
+    void (*gnt_reserved2)(void);
+    void (*gnt_reserved3)(void);
+    void (*gnt_reserved4)(void);
 };
 
 struct _GntButtonClass
diff --git a/finch/libgnt/gntlabel.h b/finch/libgnt/gntlabel.h
--- a/finch/libgnt/gntlabel.h
+++ b/finch/libgnt/gntlabel.h
@@ -51,10 +51,10 @@ struct _GntLabel
 	GntTextFormatFlags flags;
 
 	/*< private >*/
-    void *res1;
-    void *res2;
-    void *res3;
-    void *res4;
+    void (*gnt_reserved1)(void);
+    void (*gnt_reserved2)(void);
+    void (*gnt_reserved3)(void);
+    void (*gnt_reserved4)(void);
 };
 
 struct _GntLabelClass
diff --git a/finch/libgnt/gnttree.h b/finch/libgnt/gnttree.h
--- a/finch/libgnt/gnttree.h
+++ b/finch/libgnt/gnttree.h
@@ -42,9 +42,6 @@
 #define GNT_IS_TREE_CLASS(klass)	(G_TYPE_CHECK_CLASS_TYPE((klass), GNT_TYPE_TREE))
 #define GNT_TREE_GET_CLASS(obj)	(G_TYPE_INSTANCE_GET_CLASS((obj), GNT_TYPE_TREE, GntTreeClass))
 
-typedef guint (*GntTreeHashFunc)(gconstpointer);
-typedef gboolean (*GntTreeHashEqualityFunc)(gconstpointer, gconstpointer);
-
 typedef struct _GntTree			GntTree;
 typedef struct _GntTreePriv		GntTreePriv;
 typedef struct _GntTreeClass		GntTreeClass;
@@ -81,8 +78,8 @@ struct _GntTree
 
 	GList *list;            /* List of GntTreeRow s */
 	GHashTable *hash;       /* We need this for quickly referencing the rows */
-	GntTreeHashFunc hash_func;
-	GntTreeHashEqualityFunc hash_eq_func;
+	guint (*hash_func)(gconstpointer);
+	gboolean (*hash_eq_func)(gconstpointer, gconstpointer);
 	GDestroyNotify key_destroy;
 	GDestroyNotify value_destroy;
 
diff --git a/finch/libgnt/gntwidget.h b/finch/libgnt/gntwidget.h
--- a/finch/libgnt/gntwidget.h
+++ b/finch/libgnt/gntwidget.h
@@ -107,10 +107,10 @@ struct _GntWidget
 	WINDOW *window;
 
 	/*< private >*/
-    void *res1;
-    void *res2;
-    void *res3;
-    void *res4;
+    void (*gnt_reserved1)(void);
+    void (*gnt_reserved2)(void);
+    void (*gnt_reserved3)(void);
+    void (*gnt_reserved4)(void);
 };
 
 struct _GntWidgetClass