- Use gobject private data, fixing bug #140632.

2005-05-16  Christian Persch  <chpe@cvs.gnome.org>

	* src/yelp-base.c: (yelp_base_init), (yelp_base_class_init):
	* src/yelp-db-pager.c: (db_pager_class_init), (db_pager_init):
	* src/yelp-index-model.c: (yim_class_init), (yim_init):
	* src/yelp-info-pager.c: (info_pager_class_init),
	(info_pager_init):
	* src/yelp-man-pager.c: (man_pager_class_init), (man_pager_init):
	* src/yelp-pager.c: (pager_class_init), (pager_init):
	* src/yelp-toc-pager.c: (toc_pager_class_init), (toc_pager_init):
	* src/yelp-xslt-pager.c: (xslt_pager_class_init),
	(xslt_pager_init):
	- Use gobject private data, fixing bug #140632.

8 files changed, 40 insertions, 20 deletions

diff --git a/src/yelp-base.c b/src/yelp-base.c
index d463a809..d18cf80b 100644
--- a/src/yelp-base.c
+++ b/src/yelp-base.c
@@ -37,6 +37,8 @@
 
 gboolean main_running;
 
+#define YELP_BASE_GET_PRIVATE(object)(G_TYPE_INSTANCE_GET_PRIVATE ((object), YELP_TYPE_BASE, YelpBasePriv))
+
 struct _YelpBasePriv {
 	GNode  *toc_tree;
 
@@ -106,12 +108,11 @@ yelp_base_init (YelpBase *base)
 {
         YelpBasePriv *priv;
 
-        priv = g_new0 (YelpBasePriv, 1);
+        base->priv = priv = YELP_BASE_GET_PRIVATE (base);
         
 	priv->toc_tree = g_node_new (NULL);
 	priv->index    = NULL;
 	priv->windows  = NULL;
-        base->priv     = priv;
 
 	yelp_bookmarks_init ();
 	yelp_cache_init ();
@@ -129,6 +130,8 @@ yelp_base_class_init (YelpBaseClass *klass)
 	epv->getWindows = impl_Yelp_getWindows;
 
 	main_running = TRUE;
+
+	g_type_class_add_private (klass, sizeof (YelpBasePriv));
 }
 
 static void
diff --git a/src/yelp-db-pager.c b/src/yelp-db-pager.c
index 6be37bed..a07057f3 100644
--- a/src/yelp-db-pager.c
+++ b/src/yelp-db-pager.c
@@ -59,6 +59,8 @@
 
 extern gboolean main_running;
 
+#define YELP_DB_PAGER_GET_PRIVATE(object)(G_TYPE_INSTANCE_GET_PRIVATE ((object), YELP_TYPE_DB_PAGER, YelpDBPagerPriv))
+
 struct _YelpDBPagerPriv {
     GtkTreeModel   *sects;
     GHashTable     *frags_hash;
@@ -147,6 +149,8 @@ db_pager_class_init (YelpDBPagerClass *klass)
     xslt_class->params = db_pager_params;
 
     xslt_class->stylesheet = DB_STYLESHEET;
+
+    g_type_class_add_private (klass, sizeof (YelpDBPagerPriv));
 }
 
 static void
@@ -154,8 +158,7 @@ db_pager_init (YelpDBPager *pager)
 {
     YelpDBPagerPriv *priv;
 
-    priv = g_new0 (YelpDBPagerPriv, 1);
-    pager->priv = priv;
+    pager->priv = priv = YELP_DB_PAGER_GET_PRIVATE (pager);
 
     pager->priv->sects = NULL;
 
diff --git a/src/yelp-index-model.c b/src/yelp-index-model.c
index 739d62b7..d972e5db 100644
--- a/src/yelp-index-model.c
+++ b/src/yelp-index-model.c
@@ -27,6 +27,8 @@
 #include "yelp-section.h"
 #include "yelp-index-model.h"
 
+#define YELP_INDEX_MODEL_GET_PRIVATE(object)(G_TYPE_INSTANCE_GET_PRIVATE ((object), YELP_TYPE_INDEX_MODEL,YelpIndexModelPriv))
+
 struct _YelpIndexModelPriv {
 	GList *original_list;
 
@@ -123,6 +125,8 @@ yim_class_init (YelpIndexModelClass *class)
         object_class = (GObjectClass*) class;
 
         object_class->finalize = yim_finalize;
+
+	g_type_class_add_private (klass, sizeof (YelpIndexModelPriv));
 }
 
 static void
@@ -146,7 +150,7 @@ yim_init (YelpIndexModel *model)
 {
         YelpIndexModelPriv *priv;
         
-        priv = g_new0 (YelpIndexModelPriv, 1);
+        priv = YELP_INDEX_MODEL_GET_PRIVATE (model);
         
 	do {
 		priv->stamp = g_random_int ();
diff --git a/src/yelp-info-pager.c b/src/yelp-info-pager.c
index 97d9e997..2aa8f6ca 100644
--- a/src/yelp-info-pager.c
+++ b/src/yelp-info-pager.c
@@ -44,6 +44,8 @@
 #define STYLESHEET_PATH DATADIR"/yelp/xslt/"
 #define INFO_STYLESHEET STYLESHEET_PATH"info2html.xsl"
 
+#define YELP_INFO_PAGER_GET_PRIVATE(object)(G_TYPE_INSTANCE_GET_PRIVATE ((object), YELP_TYPE_INFO_PAGER, YelpInfoPagerPriv))
+
 struct _YelpInfoPagerPriv {
     GtkTreeStore  *tree;
     GHashTable    *frags_hash;
@@ -109,6 +111,8 @@ info_pager_class_init (YelpInfoPagerClass *klass)
     xslt_class->params = info_pager_params;
 
     xslt_class->stylesheet = INFO_STYLESHEET;
+
+    g_type_class_add_private (klass, sizeof (YelpInfoPagerPriv));
 }
 
 static void
@@ -116,12 +120,10 @@ info_pager_init (YelpInfoPager *pager)
 {
     YelpInfoPagerPriv *priv;
 
-    priv = g_new0 (YelpInfoPagerPriv, 1);
+    pager->priv = priv = YELP_INFO_PAGER_GET_PRIVATE (pager);
 
     /* In this hash, key == value */
     priv->frags_hash = g_hash_table_new_full (g_str_hash, g_str_equal, g_free, NULL);
-
-    pager->priv = priv;
 }
 
 static void
diff --git a/src/yelp-man-pager.c b/src/yelp-man-pager.c
index 0f4c5602..feac6690 100644
--- a/src/yelp-man-pager.c
+++ b/src/yelp-man-pager.c
@@ -43,6 +43,8 @@
 #define STYLESHEET_PATH DATADIR"/yelp/xslt/"
 #define MAN_STYLESHEET  STYLESHEET_PATH"man2html.xsl"
 
+#define YELP_MAN_PAGER_GET_PRIVATE(object)(G_TYPE_INSTANCE_GET_PRIVATE ((object), YELP_TYPE_MAN_PAGER, YelpManPagerPriv))
+
 struct _YelpManPagerPriv {
     gpointer unused;
 };
@@ -102,15 +104,14 @@ man_pager_class_init (YelpManPagerClass *klass)
     xslt_class->params = man_pager_params;
 
     xslt_class->stylesheet = MAN_STYLESHEET;
+
+    g_type_class_add_private (klass, sizeof (YelpManPagerPriv));
 }
 
 static void
 man_pager_init (YelpManPager *pager)
 {
-    YelpManPagerPriv *priv;
-
-    priv = g_new0 (YelpManPagerPriv, 1);
-    pager->priv = priv;
+    pager->priv = YELP_MAN_PAGER_GET_PRIVATE (pager);
 }
 
 static void
diff --git a/src/yelp-pager.c b/src/yelp-pager.c
index cb508be4..a8be347a 100644
--- a/src/yelp-pager.c
+++ b/src/yelp-pager.c
@@ -38,6 +38,8 @@
 #define d(x)
 #endif
 
+#define YELP_PAGER_GET_PRIVATE(object)(G_TYPE_INSTANCE_GET_PRIVATE ((object), YELP_TYPE_PAGER, YelpPagerPriv))
+
 struct _YelpPagerPriv {
     YelpDocInfo     *doc_info;
     YelpPagerState   state;
@@ -169,6 +171,8 @@ pager_class_init (YelpPagerClass *klass)
 	 NULL, NULL,
 	 yelp_marshal_VOID__VOID,
 	 G_TYPE_NONE, 0);
+
+    g_type_class_add_private (klass, sizeof (YelpPagerPriv));
 }
 
 static void
@@ -176,8 +180,7 @@ pager_init (YelpPager *pager)
 {
     YelpPagerPriv *priv;
 
-    priv = g_new0 (YelpPagerPriv, 1);
-    pager->priv = priv;
+    pager->priv = priv = YELP_PAGER_GET_PRIVATE (pager);
 
     priv->doc_info = NULL;
     priv->state = YELP_PAGER_STATE_NEW;
diff --git a/src/yelp-toc-pager.c b/src/yelp-toc-pager.c
index 2b760c03..055d1582 100644
--- a/src/yelp-toc-pager.c
+++ b/src/yelp-toc-pager.c
@@ -61,6 +61,8 @@ typedef gboolean      (*ProcessFunction)        (YelpTocPager      *pager);
 
 typedef struct _YelpListing YelpListing;
 
+#define YELP_TOC_PAGER_GET_PRIVATE(object)(G_TYPE_INSTANCE_GET_PRIVATE ((object), YELP_TYPE_TOC_PAGER, YelpTocPagerPriv))
+
 struct _YelpTocPagerPriv {
     gboolean      sk_docomf;
     GSList       *omf_pending;
@@ -191,6 +193,8 @@ toc_pager_class_init (YelpTocPagerClass *klass)
     pager_class->cancel       = toc_pager_cancel;
     pager_class->resolve_frag = toc_pager_resolve_frag;
     pager_class->get_sections = toc_pager_get_sections;
+
+    g_type_class_add_private (klass, sizeof (YelpTocPagerPriv));
 }
 
 static void
@@ -198,8 +202,7 @@ toc_pager_init (YelpTocPager *pager)
 {
     YelpTocPagerPriv *priv;
 
-    priv = g_new0 (YelpTocPagerPriv, 1);
-    pager->priv = priv;
+    pager->priv = priv = YELP_TOC_PAGER_GET_PRIVATE (pager);
 
     priv->parser = xmlNewParserCtxt ();
 
diff --git a/src/yelp-xslt-pager.c b/src/yelp-xslt-pager.c
index 858e7ca3..b6e5475a 100644
--- a/src/yelp-xslt-pager.c
+++ b/src/yelp-xslt-pager.c
@@ -53,6 +53,8 @@
 
 extern gboolean main_running;
 
+#define YELP_XSLT_PAGER_GET_PRIVATE(object)(G_TYPE_INSTANCE_GET_PRIVATE ((object), YELP_TYPE_XSLT_PAGER, YelpXsltPagerPriv))
+
 struct _YelpXsltPagerPriv {
     xmlDocPtr               inputDoc;
     xmlDocPtr               outputDoc;
@@ -120,15 +122,14 @@ xslt_pager_class_init (YelpXsltPagerClass *klass)
     pager_class->finish       = xslt_pager_finish;
 
     pager_class->process      = xslt_pager_process;
+
+    g_type_class_add_private (klass, sizeof (YelpXsltPagerPriv));
 }
 
 static void
 xslt_pager_init (YelpXsltPager *pager)
 {
-    YelpXsltPagerPriv *priv;
-
-    priv = g_new0 (YelpXsltPagerPriv, 1);
-    pager->priv = priv;
+    pager->priv = YELP_XSLT_PAGER_GET_PRIVATE (pager);
 }
 
 static void