Commit de676bf5 authored by Tim Janik's avatar Tim Janik

Fixed wrongly resolved merge conflicts.

* Fixed wrongly resolved merge conflicts.

svn path=/trunk/; revision=20633
parent 870b9c86
......@@ -4770,7 +4770,6 @@ gtk_widget_trigger_tooltip_query
gtk_widget_unmap
gtk_widget_unparent
gtk_widget_unrealize
gtk_widget_unref
gtk_widget_get_allocation
gtk_widget_get_window
#endif
......
......@@ -58,7 +58,7 @@ struct _GtkListStore
gint GSEAL (length);
GtkTreeIterCompareFunc GSEAL (default_sort_func);
gpointer GSEAL (default_sort_data);
GtkDestroyNotify GSEAL (default_sort_destroy);
GDestroyNotify GSEAL (default_sort_destroy);
guint GSEAL (columns_dirty) : 1;
};
......
......@@ -59,7 +59,7 @@ struct _GtkTreeModelSort
/* default sort */
GtkTreeIterCompareFunc GSEAL (default_sort_func);
gpointer GSEAL (default_sort_data);
GtkDestroyNotify GSEAL (default_sort_destroy);
GDestroyNotify GSEAL (default_sort_destroy);
/* signal ids */
guint GSEAL (changed_id);
......
......@@ -58,7 +58,7 @@ struct _GtkTreeSelection
GtkSelectionMode GSEAL (type);
GtkTreeSelectionFunc GSEAL (user_func);
gpointer GSEAL (user_data);
GtkDestroyNotify GSEAL (destroy);
GDestroyNotify GSEAL (destroy);
};
struct _GtkTreeSelectionClass
......
......@@ -57,7 +57,7 @@ struct _GtkTreeStore
GType *GSEAL (column_headers);
GtkTreeIterCompareFunc GSEAL (default_sort_func);
gpointer GSEAL (default_sort_data);
GtkDestroyNotify GSEAL (default_sort_destroy);
GDestroyNotify GSEAL (default_sort_destroy);
guint GSEAL (columns_dirty) : 1;
};
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment