From de676bf5944d41cf8522d078d0d6eec348c220e3 Mon Sep 17 00:00:00 2001
From: Tim Janik <timj@src.gnome.org>
Date: Fri, 20 Jun 2008 11:11:01 +0000
Subject: [PATCH] Fixed wrongly resolved merge conflicts.

* Fixed wrongly resolved merge conflicts.

svn path=/trunk/; revision=20633
---
 gtk/gtk.symbols        | 1 -
 gtk/gtkliststore.h     | 2 +-
 gtk/gtktreemodelsort.h | 2 +-
 gtk/gtktreeselection.h | 2 +-
 gtk/gtktreestore.h     | 2 +-
 5 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/gtk/gtk.symbols b/gtk/gtk.symbols
index 3bf67ca8e8..4f4c2d00fc 100644
--- a/gtk/gtk.symbols
+++ b/gtk/gtk.symbols
@@ -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
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;
 };
 
diff --git a/gtk/gtktreemodelsort.h b/gtk/gtktreemodelsort.h
index 55f7c8268f..cc39aa5316 100644
--- a/gtk/gtktreemodelsort.h
+++ b/gtk/gtktreemodelsort.h
@@ -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);
diff --git a/gtk/gtktreeselection.h b/gtk/gtktreeselection.h
index 04320e4b3c..885b144e92 100644
--- a/gtk/gtktreeselection.h
+++ b/gtk/gtktreeselection.h
@@ -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
diff --git a/gtk/gtktreestore.h b/gtk/gtktreestore.h
index d14de83e9f..f9f324001a 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;
 };