diff options
| author | Tim Janik <timj@src.gnome.org> | 2008-06-20 11:11:01 +0000 |
|---|---|---|
| committer | Tim Janik <timj@src.gnome.org> | 2008-06-20 11:11:01 +0000 |
| commit | de676bf5944d41cf8522d078d0d6eec348c220e3 (patch) | |
| tree | 147aa8642d30a959f086412bc89aa89b46aa0a20 /gtk/gtktreestore.h | |
| parent | 870b9c868c3b32e0a77590dfc3b4b00b3e7b1629 (diff) | |
| download | gdk-pixbuf-de676bf5944d41cf8522d078d0d6eec348c220e3.tar.gz | |
Fixed wrongly resolved merge conflicts.
* Fixed wrongly resolved merge conflicts.
svn path=/trunk/; revision=20633
Diffstat (limited to 'gtk/gtktreestore.h')
| -rw-r--r-- | gtk/gtktreestore.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/gtk/gtktreestore.h b/gtk/gtktreestore.h index d14de83e9..f9f324001 100644 --- a/gtk/gtktreestore.h +++ b/gtk/gtktreestore.h @@ -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; }; |