callisto-debian/gtk3
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

clean up code in gtk_list_store_set_n_columns()

Browse Source 
Previous code's messiness noted by Francisco Javier Taboada Aguado
in http://mail.gnome.org/archives/gtk-devel-list/2009-June/msg00001.html
This commit is contained in:
Benjamin Otte 2009-06-30 13:22:51 +02:00
parent 89e3a9bc08
commit 3c97f037a9
1 changed files with 5 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
gtk/gtkliststore.c
View File

@ -338,29 +338,19 @@ gtk_list_store_set_n_columns (GtkListStore *list_store,
gint n_columns) gint n_columns)
{ {
GType *new_columns; GType *new_columns;
int i;
if (list_store->n_columns == n_columns) if (list_store->n_columns == n_columns)
return; return;
new_columns = g_new0 (GType, n_columns); list_store->column_headers = g_renew (GType, list_store->column_headers, n_columns);
if (list_store->column_headers) for (i = list_store->n_columns; i < n_columns; i++)
{ list_store->column_headers[i] = G_TYPE_INVALID;
/* copy the old header orders over */ list_store->n_columns = n_columns;
if (n_columns >= list_store->n_columns)
memcpy (new_columns, list_store->column_headers, list_store->n_columns * sizeof (gchar *));
else
memcpy (new_columns, list_store->column_headers, n_columns * sizeof (GType));
g_free (list_store->column_headers);
}
if (list_store->sort_list) if (list_store->sort_list)
_gtk_tree_data_list_header_free (list_store->sort_list); _gtk_tree_data_list_header_free (list_store->sort_list);
list_store->sort_list = _gtk_tree_data_list_header_new (n_columns, list_store->column_headers); list_store->sort_list = _gtk_tree_data_list_header_new (n_columns, list_store->column_headers);
list_store->column_headers = new_columns;
list_store->n_columns = n_columns;
} }
static void static void