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/gtkliststore.h | |
| parent | 870b9c868c3b32e0a77590dfc3b4b00b3e7b1629 (diff) | |
| download | gtk+-de676bf5944d41cf8522d078d0d6eec348c220e3.tar.gz | |
Fixed wrongly resolved merge conflicts.
* Fixed wrongly resolved merge conflicts.
svn path=/trunk/; revision=20633
Diffstat (limited to 'gtk/gtkliststore.h')
| -rw-r--r-- | gtk/gtkliststore.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/gtk/gtkliststore.h b/gtk/gtkliststore.h index 0d893b8484..e03c3bccfc 100644 --- a/gtk/gtkliststore.h +++ b/gtk/gtkliststore.h @@ -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; }; |