From: Ben Pfaff Date: Tue, 17 Jul 2012 05:28:44 +0000 (-0700) Subject: var-type-dialog: Use G_TYPE_INT to store an int. X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b49a1e914091def9823df400fe5d97a6d4222c2a;p=pspp var-type-dialog: Use G_TYPE_INT to store an int. It seems more straightforward to store an int by value than by pointer. --- diff --git a/src/ui/gui/var-type-dialog.c b/src/ui/gui/var-type-dialog.c index aa46ca446d..4ed27f06b2 100644 --- a/src/ui/gui/var-type-dialog.c +++ b/src/ui/gui/var-type-dialog.c @@ -314,7 +314,7 @@ set_format_type_from_treeview (GtkTreeView *treeview, gpointer data) gtk_tree_model_get_value (model, &iter, 1, &the_value); dialog->fmt_l = custom_format; - dialog->fmt_l.type = *(int*) g_value_get_pointer (&the_value); + dialog->fmt_l.type = g_value_get_int (&the_value); g_value_unset (&the_value); } @@ -500,8 +500,7 @@ var_type_dialog_create (GtkWindow *toplevel) column); - list_store = gtk_list_store_new (2, G_TYPE_STRING, - G_TYPE_POINTER); + list_store = gtk_list_store_new (2, G_TYPE_STRING, G_TYPE_INT); for ( i = 0 ; i < 5 ; ++i ) { @@ -509,7 +508,7 @@ var_type_dialog_create (GtkWindow *toplevel) gtk_list_store_append (list_store, &iter); gtk_list_store_set (list_store, &iter, 0, fmt_name (cc_fmts[i]), - 1, &cc_format[i], + 1, cc_format[i], -1); } @@ -640,7 +639,7 @@ select_treeview_from_format_type (GtkTreeView *treeview, gtk_tree_model_get_value (model, &iter, 1, &value); - spec = * ((int *) g_value_get_pointer (&value)); + spec = g_value_get_int (&value); g_value_unset (&value);