diff options
| author | David Zeuthen <davidz@redhat.com> | 2011-08-18 17:07:13 -0400 |
|---|---|---|
| committer | David Zeuthen <davidz@redhat.com> | 2011-08-18 17:49:40 -0400 |
| commit | c68eeaa966d7ff64ee08e1ece1b162a92ed91893 (patch) | |
| tree | b31b57583530605370633a1296ffd69d97e31abf | |
| parent | d539ebbf5be7636399e5f33766b1039b151629ae (diff) | |
| download | gtk+-c68eeaa966d7ff64ee08e1ece1b162a92ed91893.tar.gz | |
Bug 656851 – Allow use of GVariant in GtkListStore
Signed-off-by: David Zeuthen <davidz@redhat.com>
| -rw-r--r-- | gtk/gtktreedatalist.c | 18 |
1 files changed, 18 insertions, 0 deletions
diff --git a/gtk/gtktreedatalist.c b/gtk/gtktreedatalist.c index 8e644f32fb..b9c4de0dfa 100644 --- a/gtk/gtktreedatalist.c +++ b/gtk/gtktreedatalist.c @@ -54,6 +54,8 @@ _gtk_tree_data_list_free (GtkTreeDataList *list, g_object_unref (tmp->data.v_pointer); else if (g_type_is_a (column_headers [i], G_TYPE_BOXED) && tmp->data.v_pointer != NULL) g_boxed_free (column_headers [i], (gpointer) tmp->data.v_pointer); + else if (g_type_is_a (column_headers [i], G_TYPE_VARIANT) && tmp->data.v_pointer != NULL) + g_variant_unref ((gpointer) tmp->data.v_pointer); g_slice_free (GtkTreeDataList, tmp); i++; @@ -84,6 +86,7 @@ _gtk_tree_data_list_check_type (GType type) G_TYPE_POINTER, G_TYPE_BOXED, G_TYPE_OBJECT, + G_TYPE_VARIANT, G_TYPE_INVALID }; @@ -172,6 +175,9 @@ _gtk_tree_data_list_node_to_value (GtkTreeDataList *list, case G_TYPE_BOXED: g_value_set_boxed (value, (gpointer) list->data.v_pointer); break; + case G_TYPE_VARIANT: + g_value_set_variant (value, (gpointer) list->data.v_pointer); + break; case G_TYPE_OBJECT: g_value_set_object (value, (GObject *) list->data.v_pointer); break; @@ -243,6 +249,11 @@ _gtk_tree_data_list_value_to_node (GtkTreeDataList *list, g_boxed_free (G_VALUE_TYPE (value), list->data.v_pointer); list->data.v_pointer = g_value_dup_boxed (value); break; + case G_TYPE_VARIANT: + if (list->data.v_pointer) + g_variant_unref (list->data.v_pointer); + list->data.v_pointer = g_value_dup_variant (value); + break; default: g_warning ("%s: Unsupported type (%s) stored.", G_STRLOC, g_type_name (G_VALUE_TYPE (value))); break; @@ -293,6 +304,12 @@ _gtk_tree_data_list_node_copy (GtkTreeDataList *list, else new_list->data.v_pointer = NULL; break; + case G_TYPE_VARIANT: + if (list->data.v_pointer) + new_list->data.v_pointer = g_variant_ref (list->data.v_pointer); + else + new_list->data.v_pointer = NULL; + break; default: g_warning ("Unsupported node type (%s) copied.", g_type_name (type)); break; @@ -432,6 +449,7 @@ _gtk_tree_data_list_compare_func (GtkTreeModel *model, if (strb == NULL) strb = ""; retval = g_utf8_collate (stra, strb); break; + case G_TYPE_VARIANT: case G_TYPE_POINTER: case G_TYPE_BOXED: case G_TYPE_OBJECT: |