diff --git a/ChangeLog b/ChangeLog index 138e1af570..610010398d 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +Tue Jun 4 19:18:20 2002 Kristian Rietveld + + * gtk/gtktreemodel.[ch]: add gtk_tree_model_get_string_from_iter + (#74667). + 2002-06-04 Daniel Elstner [ merge from stable ] @@ -17,7 +22,6 @@ Sat Jun 1 10:43:28 2002 Jonathan Blandford * gtk/gtkcellrenderertoggle.c (gtk_cell_renderer_toggle_render): add missing flag, #83796 - 2002-05-30 Michael Meeks * gtk/gtkmenu.c (gtk_menu_popup): destroy the transfer diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index 138e1af570..610010398d 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,3 +1,8 @@ +Tue Jun 4 19:18:20 2002 Kristian Rietveld + + * gtk/gtktreemodel.[ch]: add gtk_tree_model_get_string_from_iter + (#74667). + 2002-06-04 Daniel Elstner [ merge from stable ] @@ -17,7 +22,6 @@ Sat Jun 1 10:43:28 2002 Jonathan Blandford * gtk/gtkcellrenderertoggle.c (gtk_cell_renderer_toggle_render): add missing flag, #83796 - 2002-05-30 Michael Meeks * gtk/gtkmenu.c (gtk_menu_popup): destroy the transfer diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2 index 138e1af570..610010398d 100644 --- a/ChangeLog.pre-2-2 +++ b/ChangeLog.pre-2-2 @@ -1,3 +1,8 @@ +Tue Jun 4 19:18:20 2002 Kristian Rietveld + + * gtk/gtktreemodel.[ch]: add gtk_tree_model_get_string_from_iter + (#74667). + 2002-06-04 Daniel Elstner [ merge from stable ] @@ -17,7 +22,6 @@ Sat Jun 1 10:43:28 2002 Jonathan Blandford * gtk/gtkcellrenderertoggle.c (gtk_cell_renderer_toggle_render): add missing flag, #83796 - 2002-05-30 Michael Meeks * gtk/gtkmenu.c (gtk_menu_popup): destroy the transfer diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4 index 138e1af570..610010398d 100644 --- a/ChangeLog.pre-2-4 +++ b/ChangeLog.pre-2-4 @@ -1,3 +1,8 @@ +Tue Jun 4 19:18:20 2002 Kristian Rietveld + + * gtk/gtktreemodel.[ch]: add gtk_tree_model_get_string_from_iter + (#74667). + 2002-06-04 Daniel Elstner [ merge from stable ] @@ -17,7 +22,6 @@ Sat Jun 1 10:43:28 2002 Jonathan Blandford * gtk/gtkcellrenderertoggle.c (gtk_cell_renderer_toggle_render): add missing flag, #83796 - 2002-05-30 Michael Meeks * gtk/gtkmenu.c (gtk_menu_popup): destroy the transfer diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6 index 138e1af570..610010398d 100644 --- a/ChangeLog.pre-2-6 +++ b/ChangeLog.pre-2-6 @@ -1,3 +1,8 @@ +Tue Jun 4 19:18:20 2002 Kristian Rietveld + + * gtk/gtktreemodel.[ch]: add gtk_tree_model_get_string_from_iter + (#74667). + 2002-06-04 Daniel Elstner [ merge from stable ] @@ -17,7 +22,6 @@ Sat Jun 1 10:43:28 2002 Jonathan Blandford * gtk/gtkcellrenderertoggle.c (gtk_cell_renderer_toggle_render): add missing flag, #83796 - 2002-05-30 Michael Meeks * gtk/gtkmenu.c (gtk_menu_popup): destroy the transfer diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8 index 138e1af570..610010398d 100644 --- a/ChangeLog.pre-2-8 +++ b/ChangeLog.pre-2-8 @@ -1,3 +1,8 @@ +Tue Jun 4 19:18:20 2002 Kristian Rietveld + + * gtk/gtktreemodel.[ch]: add gtk_tree_model_get_string_from_iter + (#74667). + 2002-06-04 Daniel Elstner [ merge from stable ] @@ -17,7 +22,6 @@ Sat Jun 1 10:43:28 2002 Jonathan Blandford * gtk/gtkcellrenderertoggle.c (gtk_cell_renderer_toggle_render): add missing flag, #83796 - 2002-05-30 Michael Meeks * gtk/gtkmenu.c (gtk_menu_popup): destroy the transfer diff --git a/gtk/gtktreemodel.c b/gtk/gtktreemodel.c index d09f56c7e9..37f782e439 100644 --- a/gtk/gtktreemodel.c +++ b/gtk/gtktreemodel.c @@ -721,6 +721,36 @@ gtk_tree_model_get_iter_from_string (GtkTreeModel *tree_model, return retval; } +/** + * gtk_tree_model_get_string_from_iter: + * @tree_model: A #GtkTreeModel. + * @iter: An #GtkTreeIter. + * + * Generates a string representation of the iter. This string is a ':' + * separated list of numbers. For example, "4:10:0:3" would be an + * acceptable return value for this string. + * + * Return value: A newly-allocated string. Must be freed with g_free(). + **/ +gchar * +gtk_tree_model_get_string_from_iter (GtkTreeModel *tree_model, + GtkTreeIter *iter) +{ + GtkTreePath *path; + gchar *ret; + + g_return_val_if_fail (GTK_IS_TREE_MODEL (tree_model), NULL); + g_return_val_if_fail (iter != NULL, NULL); + + path = gtk_tree_model_get_path (tree_model, iter); + + g_return_val_if_fail (path != NULL, NULL); + + ret = gtk_tree_path_to_string (path); + gtk_tree_path_free (path); + + return ret; +} /** * gtk_tree_model_get_iter_first: diff --git a/gtk/gtktreemodel.h b/gtk/gtktreemodel.h index e498a14605..a3f5e93cf9 100644 --- a/gtk/gtktreemodel.h +++ b/gtk/gtktreemodel.h @@ -183,6 +183,8 @@ gboolean gtk_tree_model_get_iter (GtkTreeModel *tree_model, gboolean gtk_tree_model_get_iter_from_string (GtkTreeModel *tree_model, GtkTreeIter *iter, const gchar *path_string); +gchar * gtk_tree_model_get_string_from_iter (GtkTreeModel *tree_model, + GtkTreeIter *iter); #define gtk_tree_model_get_iter_root(tree_model, iter) gtk_tree_model_get_iter_first(tree_model, iter) gboolean gtk_tree_model_get_iter_first (GtkTreeModel *tree_model, GtkTreeIter *iter);