gtk+ r20633 - trunk/gtk

[timj svn gnome org]

Author: timj
Date: Fri Jun 20 11:11:01 2008
New Revision: 20633
URL: http://svn.gnome.org/viewvc/gtk+?rev=20633&view=rev

Log:
* Fixed wrongly resolved merge conflicts.


Modified:
   trunk/gtk/gtk.symbols
   trunk/gtk/gtkliststore.h
   trunk/gtk/gtktreemodelsort.h
   trunk/gtk/gtktreeselection.h
   trunk/gtk/gtktreestore.h

Modified: trunk/gtk/gtk.symbols
==============================================================================
--- trunk/gtk/gtk.symbols	(original)
+++ trunk/gtk/gtk.symbols	Fri Jun 20 11:11:01 2008
@@ -4770,7 +4770,6 @@
 gtk_widget_unmap
 gtk_widget_unparent
 gtk_widget_unrealize
-gtk_widget_unref
 gtk_widget_get_allocation
 gtk_widget_get_window
 #endif

Modified: trunk/gtk/gtkliststore.h
==============================================================================
--- trunk/gtk/gtkliststore.h	(original)
+++ trunk/gtk/gtkliststore.h	Fri Jun 20 11:11:01 2008
@@ -58,7 +58,7 @@
   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;
 };
 

Modified: trunk/gtk/gtktreemodelsort.h
==============================================================================
--- trunk/gtk/gtktreemodelsort.h	(original)
+++ trunk/gtk/gtktreemodelsort.h	Fri Jun 20 11:11:01 2008
@@ -59,7 +59,7 @@
   /* 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);

Modified: trunk/gtk/gtktreeselection.h
==============================================================================
--- trunk/gtk/gtktreeselection.h	(original)
+++ trunk/gtk/gtktreeselection.h	Fri Jun 20 11:11:01 2008
@@ -58,7 +58,7 @@
   GtkSelectionMode GSEAL (type);
   GtkTreeSelectionFunc GSEAL (user_func);
   gpointer GSEAL (user_data);
-  GtkDestroyNotify GSEAL (destroy);
+  GDestroyNotify GSEAL (destroy);
 };
 
 struct _GtkTreeSelectionClass

Modified: trunk/gtk/gtktreestore.h
==============================================================================
--- trunk/gtk/gtktreestore.h	(original)
+++ trunk/gtk/gtktreestore.h	Fri Jun 20 11:11:01 2008
@@ -57,7 +57,7 @@
   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;
 };