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

depend on glib-2.10.1.

Browse Source 
Tue Mar  7 17:16:34 2006  Tim Janik  <timj@gtk.org>

        * configure.in: depend on glib-2.10.1.

        * gtk/gtkobject.c: fixed up messing with non-GtkObject floating flags.
        this requires glib-2.10.1.
This commit is contained in:
Tim Janik
2006-03-07 16:18:25 +00:00
committed by Tim Janik
parent 6c1d990adc
commit 11ca120a44
4 changed files with 23 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
ChangeLog
View File

@ -1,3 +1,10 @@
Tue Mar 7 17:16:34 2006 Tim Janik <timj@gtk.org>
* configure.in: depend on glib-2.10.1.
* gtk/gtkobject.c: fixed up messing with non-GtkObject floating flags.
this requires glib-2.10.1.
2006-03-07 Michael Natterer <mitch@imendio.com> 2006-03-07 Michael Natterer <mitch@imendio.com>
Add infrastructure for copy/paste and DND of rich text for Add infrastructure for copy/paste and DND of rich text for

7
ChangeLog.pre-2-10
View File

@ -1,3 +1,10 @@
Tue Mar 7 17:16:34 2006 Tim Janik <timj@gtk.org>
* configure.in: depend on glib-2.10.1.
* gtk/gtkobject.c: fixed up messing with non-GtkObject floating flags.
this requires glib-2.10.1.
2006-03-07 Michael Natterer <mitch@imendio.com> 2006-03-07 Michael Natterer <mitch@imendio.com>
Add infrastructure for copy/paste and DND of rich text for Add infrastructure for copy/paste and DND of rich text for

2
configure.in
View File

@ -31,7 +31,7 @@ m4_define([gtk_api_version], [2.0])
m4_define([gtk_binary_version], [2.4.0]) m4_define([gtk_binary_version], [2.4.0])
# required versions of other packages # required versions of other packages
m4_define([glib_required_version], [2.9.2]) m4_define([glib_required_version], [2.10.1])
m4_define([pango_required_version], [1.9.0]) m4_define([pango_required_version], [1.9.0])
m4_define([atk_required_version], [1.0.1]) m4_define([atk_required_version], [1.0.1])
m4_define([cairo_required_version], [0.9.2]) m4_define([cairo_required_version], [0.9.2])

8
gtk/gtkobject.c
View File

@ -314,11 +314,15 @@ gtk_object_add_arg_type (const gchar *arg_name,
g_object_class_install_property (oclass, arg_id, pspec); g_object_class_install_property (oclass, arg_id, pspec);
} }
static guint (*gobject_floating_flag_handler) (GtkObject*,gint) = NULL;
static guint static guint
gtk_object_floating_flag_handler (GtkObject *object, gtk_object_floating_flag_handler (GtkObject *object,
gint job) gint job)
{ {
/* FIXME: remove this whole thing once GTK+ breaks ABI */ /* FIXME: remove this whole thing once GTK+ breaks ABI */
if (!GTK_IS_OBJECT (object))
return gobject_floating_flag_handler (object, job);
switch (job) switch (job)
{ {
guint32 oldvalue; guint32 oldvalue;
@ -341,9 +345,13 @@ static void
gtk_object_class_init (GtkObjectClass *class) gtk_object_class_init (GtkObjectClass *class)
{ {
GObjectClass *gobject_class = G_OBJECT_CLASS (class); GObjectClass *gobject_class = G_OBJECT_CLASS (class);
gboolean is_glib_2_10_1;
parent_class = g_type_class_ref (G_TYPE_OBJECT); parent_class = g_type_class_ref (G_TYPE_OBJECT);
is_glib_2_10_1 = g_object_compat_control (3, &gobject_floating_flag_handler);
if (!is_glib_2_10_1)
g_error ("this version of Gtk+ requires GLib-2.10.1");
g_object_compat_control (2, gtk_object_floating_flag_handler); g_object_compat_control (2, gtk_object_floating_flag_handler);
gobject_class->set_property = gtk_object_set_property; gobject_class->set_property = gtk_object_set_property;