interesting
/
andlabs-ui
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Resolved failure conditions in the GTK+ Table GtkTreeModel implementation.

This commit is contained in:
Pietro Gagliardi 2014-08-11 14:22:17 -04:00
parent b1a2ed827b
commit 7d578d2617
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
redo/table_unix.c
View File

@ -85,7 +85,7 @@ bad:
static GtkTreePath *goTableModel_get_path(GtkTreeModel *model, GtkTreeIter *iter) static GtkTreePath *goTableModel_get_path(GtkTreeModel *model, GtkTreeIter *iter)
{ {
if (iter->stamp != GOOD_STAMP) if (iter->stamp != GOOD_STAMP)
return NULL; /* TODO is this right? */ return NULL; /* this is what both GtkListStore and GtkTreeStore do */
return gtk_tree_path_new_from_indices((gint) iter->user_data, -1); return gtk_tree_path_new_from_indices((gint) iter->user_data, -1);
} }
@ -94,7 +94,8 @@ static void goTableModel_get_value(GtkTreeModel *model, GtkTreeIter *iter, gint
goTableModel *t = (goTableModel *) model; goTableModel *t = (goTableModel *) model;
gchar *str; gchar *str;
/* TODO what if iter is invalid? */ if (iter->stamp != GOOD_STAMP)
return; /* this is what both GtkListStore and GtkTreeStore do */
/* we (actually cgo) allocated str with malloc(), not g_malloc(), so let's free it explicitly and give the GValue a copy to be safe */ /* we (actually cgo) allocated str with malloc(), not g_malloc(), so let's free it explicitly and give the GValue a copy to be safe */
str = goTableModel_do_get_value(t->gotable, (gint) iter->user_data, column); str = goTableModel_do_get_value(t->gotable, (gint) iter->user_data, column);
/* value is uninitialized */ /* value is uninitialized */
@ -109,7 +110,7 @@ static gboolean goTableModel_iter_next(GtkTreeModel *model, GtkTreeIter *iter)
gint index; gint index;
if (iter->stamp != GOOD_STAMP) if (iter->stamp != GOOD_STAMP)
return FALSE; /* TODO correct? */ return FALSE; /* this is what both GtkListStore and GtkTreeStore do */
index = (gint) iter->user_data; index = (gint) iter->user_data;
index++; index++;
iter->user_data = (gpointer) index; iter->user_data = (gpointer) index;
@ -126,7 +127,7 @@ static gboolean goTableModel_iter_previous(GtkTreeModel *model, GtkTreeIter *ite
gint index; gint index;
if (iter->stamp != GOOD_STAMP) if (iter->stamp != GOOD_STAMP)
return FALSE; /* TODO correct? */ return FALSE; /* this is what both GtkListStore and GtkTreeStore do */
index = (gint) iter->user_data; index = (gint) iter->user_data;
index--; index--;
iter->user_data = (gpointer) index; iter->user_data = (gpointer) index;