callisto-debian/gtk3
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fixed wrongly resolved merge conflicts.

Browse Source 
* Fixed wrongly resolved merge conflicts.

svn path=/trunk/; revision=20633
This commit is contained in:
Tim Janik
2008-06-20 11:11:01 +00:00
parent 870b9c868c
commit de676bf594
5 changed files with 4 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
gtk/gtk.symbols
View File

@ -4770,7 +4770,6 @@ gtk_widget_trigger_tooltip_query
gtk_widget_unmap gtk_widget_unmap
gtk_widget_unparent gtk_widget_unparent
gtk_widget_unrealize gtk_widget_unrealize
gtk_widget_unref
gtk_widget_get_allocation gtk_widget_get_allocation
gtk_widget_get_window gtk_widget_get_window
#endif #endif

2
gtk/gtkliststore.h
View File

@ -58,7 +58,7 @@ struct _GtkListStore
gint GSEAL (length); gint GSEAL (length);
GtkTreeIterCompareFunc GSEAL (default_sort_func); GtkTreeIterCompareFunc GSEAL (default_sort_func);
gpointer GSEAL (default_sort_data); gpointer GSEAL (default_sort_data);
GtkDestroyNotify GSEAL (default_sort_destroy); GDestroyNotify GSEAL (default_sort_destroy);
guint GSEAL (columns_dirty) : 1; guint GSEAL (columns_dirty) : 1;
}; };

2
gtk/gtktreemodelsort.h
View File

@ -59,7 +59,7 @@ struct _GtkTreeModelSort
/* default sort */ /* default sort */
GtkTreeIterCompareFunc GSEAL (default_sort_func); GtkTreeIterCompareFunc GSEAL (default_sort_func);
gpointer GSEAL (default_sort_data); gpointer GSEAL (default_sort_data);
GtkDestroyNotify GSEAL (default_sort_destroy); GDestroyNotify GSEAL (default_sort_destroy);
/* signal ids */ /* signal ids */
guint GSEAL (changed_id); guint GSEAL (changed_id);

2
gtk/gtktreeselection.h
View File

@ -58,7 +58,7 @@ struct _GtkTreeSelection
GtkSelectionMode GSEAL (type); GtkSelectionMode GSEAL (type);
GtkTreeSelectionFunc GSEAL (user_func); GtkTreeSelectionFunc GSEAL (user_func);
gpointer GSEAL (user_data); gpointer GSEAL (user_data);
GtkDestroyNotify GSEAL (destroy); GDestroyNotify GSEAL (destroy);
}; };
struct _GtkTreeSelectionClass struct _GtkTreeSelectionClass

2
gtk/gtktreestore.h
View File

@ -57,7 +57,7 @@ struct _GtkTreeStore
GType *GSEAL (column_headers); GType *GSEAL (column_headers);
GtkTreeIterCompareFunc GSEAL (default_sort_func); GtkTreeIterCompareFunc GSEAL (default_sort_func);
gpointer GSEAL (default_sort_data); gpointer GSEAL (default_sort_data);
GtkDestroyNotify GSEAL (default_sort_destroy); GDestroyNotify GSEAL (default_sort_destroy);
guint GSEAL (columns_dirty) : 1; guint GSEAL (columns_dirty) : 1;
}; };