[Gnucash-changes] r12075 - gnucash/trunk - Finish converting type creation over from gtk_type_unique() to

[David Hampton]

Author: hampton
Date: 2005-11-30 20:14:03 -0500 (Wed, 30 Nov 2005)
New Revision: 12075
Trac: http://svn.gnucash.org/trac/changeset/12075

Modified:
   gnucash/trunk/ChangeLog
   gnucash/trunk/src/business/business-gnome/search-owner.c
   gnucash/trunk/src/gnome-utils/gnc-query-list.c
   gnucash/trunk/src/gnome/gnc-split-reg.c
   gnucash/trunk/src/register/register-gnome/gnucash-date-picker.c
Log:
Finish converting type creation over from gtk_type_unique() to
g_type_register_static().


Modified: gnucash/trunk/ChangeLog
===================================================================
--- gnucash/trunk/ChangeLog	2005-12-01 00:45:13 UTC (rev 12074)
+++ gnucash/trunk/ChangeLog	2005-12-01 01:14:03 UTC (rev 12075)
@@ -1,5 +1,11 @@
 2005-11-30  David Hampton  <hampton at employees.org>
 
+	* src/register/register-gnome/gnucash-date-picker.c:
+	* src/business/business-gnome/search-owner.c:
+	* src/gnome-utils/gnc-query-list.c:
+	* src/gnome/gnc-split-reg.c: Finish converting type creation over
+	from gtk_type_unique() to g_type_register_static().
+
 	* various: More trivial conversions from deprecated gtk/gnome
 	functions to supported functions.
 

Modified: gnucash/trunk/src/business/business-gnome/search-owner.c
===================================================================
--- gnucash/trunk/src/business/business-gnome/search-owner.c	2005-12-01 00:45:13 UTC (rev 12074)
+++ gnucash/trunk/src/business/business-gnome/search-owner.c	2005-12-01 01:14:03 UTC (rev 12075)
@@ -71,17 +71,21 @@
   static guint type = 0;
 	
   if (!type) {
-    GtkTypeInfo type_info = {
-      "GNCSearchOwner",
-      sizeof(GNCSearchOwner),
-      sizeof(GNCSearchOwnerClass),
-      (GtkClassInitFunc)gnc_search_owner_class_init,
-      (GtkObjectInitFunc)gnc_search_owner_init,
-      NULL,
-      NULL
+    GTypeInfo type_info = {
+      sizeof(GNCSearchOwnerClass),    /* class_size */
+      NULL,   				/* base_init */
+      NULL,				/* base_finalize */
+      (GClassInitFunc)gnc_search_owner_class_init,
+      NULL,				/* class_finalize */
+      NULL,				/* class_data */
+      sizeof(GNCSearchOwner),		/* */
+      0,				/* n_preallocs */
+      (GInstanceInitFunc)gnc_search_owner_init,
     };
 		
-    type = gtk_type_unique(gnc_search_core_type_get_type (), &type_info);
+    type = g_type_register_static (GNC_TYPE_SEARCH_CORE_TYPE,
+				   "GNCSearchOwner",
+				   &type_info, 0);
   }
 	
   return type;

Modified: gnucash/trunk/src/gnome/gnc-split-reg.c
===================================================================
--- gnucash/trunk/src/gnome/gnc-split-reg.c	2005-12-01 00:45:13 UTC (rev 12074)
+++ gnucash/trunk/src/gnome/gnc-split-reg.c	2005-12-01 01:14:03 UTC (rev 12075)
@@ -206,19 +206,21 @@
 
   if (!gnc_split_reg_type)
     {
-      GtkTypeInfo gnc_split_reg_info =
-      {
-        "GNCSplitReg",
-        sizeof (GNCSplitReg),
-        sizeof (GNCSplitRegClass),
-        (GtkClassInitFunc) gnc_split_reg_class_init,
-        (GtkObjectInitFunc) gnc_split_reg_init,
-        NULL, /* reserved_1 */
-        NULL, /* reserved_2 */
-        (GtkClassInitFunc) NULL
+      GTypeInfo type_info = {
+	sizeof(GNCSplitRegClass),      /* class_size */
+	NULL,   			/* base_init */
+	NULL,				/* base_finalize */
+	(GClassInitFunc)gnc_split_reg_class_init,
+	NULL,				/* class_finalize */
+	NULL,				/* class_data */
+	sizeof(GNCSplitReg),		/* */
+	0,				/* n_preallocs */
+	(GInstanceInitFunc)gnc_split_reg_init,
       };
 
-      gnc_split_reg_type = gtk_type_unique( GTK_TYPE_VBOX, &gnc_split_reg_info );
+      gnc_split_reg_type = g_type_register_static( GTK_TYPE_VBOX,
+						   "GNCSplitReg",
+						   &type_info, 0 );
     }
 
   return gnc_split_reg_type;

Modified: gnucash/trunk/src/gnome-utils/gnc-query-list.c
===================================================================
--- gnucash/trunk/src/gnome-utils/gnc-query-list.c	2005-12-01 00:45:13 UTC (rev 12074)
+++ gnucash/trunk/src/gnome-utils/gnc-query-list.c	2005-12-01 01:14:03 UTC (rev 12075)
@@ -88,20 +88,21 @@
 
   if (!gnc_query_list_type)
   {
-    static const GtkTypeInfo gnc_query_list_info =
-    {
-      "GNCQueryList",
-      sizeof (GNCQueryList),
-      sizeof (GNCQueryListClass),
-      (GtkClassInitFunc) gnc_query_list_class_init,
-      (GtkObjectInitFunc) gnc_query_list_init,
-      /* reserved_1 */ NULL,
-      /* reserved_2 */ NULL,
-      (GtkClassInitFunc) NULL
+    GTypeInfo type_info = {
+      sizeof(GNCQueryListClass),        /* class_size */
+      NULL,   				/* base_init */
+      NULL,				/* base_finalize */
+      (GClassInitFunc)gnc_query_list_class_init,
+      NULL,				/* class_finalize */
+      NULL,				/* class_data */
+      sizeof (GNCQueryList),		/* */
+      0,				/* n_preallocs */
+      (GInstanceInitFunc)gnc_query_list_init,
     };
 
-    gnc_query_list_type = gtk_type_unique(GTK_TYPE_CLIST,
-					      &gnc_query_list_info);
+    gnc_query_list_type = g_type_register_static(GTK_TYPE_CLIST,	
+						 "GNCQueryList",
+						 &type_info, 0);
   }
 
   return gnc_query_list_type;

Modified: gnucash/trunk/src/register/register-gnome/gnucash-date-picker.c
===================================================================
--- gnucash/trunk/src/register/register-gnome/gnucash-date-picker.c	2005-12-01 00:45:13 UTC (rev 12074)
+++ gnucash/trunk/src/register/register-gnome/gnucash-date-picker.c	2005-12-01 01:14:03 UTC (rev 12075)
@@ -167,21 +167,23 @@
 
   if (gnc_date_picker_type == 0)
   {
-    GtkTypeInfo gnc_date_picker_info =
+    GTypeInfo type_info =
     {
-      "GNCDatePicker",
-      sizeof(GNCDatePicker),
-      sizeof(GNCDatePickerClass),
-      (GtkClassInitFunc)  gnc_date_picker_class_init,
-      (GtkObjectInitFunc) gnc_date_picker_init,
-      NULL, /* reserved_1 */
-      NULL, /* reserved_2 */
-      (GtkClassInitFunc) NULL
+      sizeof(GNCDatePickerClass),       /* class_size */
+      NULL,   				/* base_init */
+      NULL,				/* base_finalize */
+      (GClassInitFunc)gnc_date_picker_class_init,
+      NULL,				/* class_finalize */
+      NULL,				/* class_data */
+      sizeof(GNCDatePicker),		/* */
+      0,				/* n_preallocs */
+      (GInstanceInitFunc)gnc_date_picker_init,
     };
 
     gnc_date_picker_type =
-      gtk_type_unique (gnome_canvas_widget_get_type(),
-                       &gnc_date_picker_info);
+      g_type_register_static (gnome_canvas_widget_get_type(),
+			      "GNCDatePicker",
+			      &type_info, 0);
   }
 
   return gnc_date_picker_type;