From 1333ad2ce4bd541815ef503781b56b910d6a9d8b Mon Sep 17 00:00:00 2001 From: Michael Natterer Date: Tue, 17 Jun 2008 21:00:28 +0000 Subject: [PATCH] gail.c s/gtk_type_class/g_type_class_ref/ 2008-06-17 Michael Natterer * gail.c * gailtoplevel.c: s/gtk_type_class/g_type_class_ref/ * Makefile.am: add GDK_DISABLE_DEPRECATED to CPPFLAGS. svn path=/trunk/; revision=20437 --- modules/other/gail/ChangeLog | 7 +++++++ modules/other/gail/Makefile.am | 15 ++++++++------- modules/other/gail/gail.c | 8 ++++---- modules/other/gail/gailtoplevel.c | 2 +- 4 files changed, 20 insertions(+), 12 deletions(-) diff --git a/modules/other/gail/ChangeLog b/modules/other/gail/ChangeLog index 8dc252ff80..0c064d8380 100644 --- a/modules/other/gail/ChangeLog +++ b/modules/other/gail/ChangeLog @@ -1,3 +1,10 @@ +2008-06-17 Michael Natterer + + * gail.c + * gailtoplevel.c: s/gtk_type_class/g_type_class_ref/ + + * Makefile.am: add GDK_DISABLE_DEPRECATED to CPPFLAGS. + 2008-06-10 Li Yuan * gailtextview.c: (gail_text_view_set_caret_offset): diff --git a/modules/other/gail/Makefile.am b/modules/other/gail/Makefile.am index 75256c7ca6..00a18fc0ab 100644 --- a/modules/other/gail/Makefile.am +++ b/modules/other/gail/Makefile.am @@ -138,15 +138,16 @@ libgailinclude_HEADERS = \ $(gail_public_h_sources) libgail_la_CPPFLAGS = \ - -I$(top_srcdir) \ + -I$(top_srcdir) \ -I$(top_srcdir)/modules/other \ - -I$(top_srcdir)/gdk \ - -I$(top_builddir)/gdk \ - -I$(top_srcdir)/gtk \ - -I$(top_builddir)/gtk \ - -DGTK_VERSION=\"$(GTK_VERSION)\" \ + -I$(top_srcdir)/gdk \ + -I$(top_builddir)/gdk \ + -I$(top_srcdir)/gtk \ + -I$(top_builddir)/gtk \ + -DGTK_VERSION=\"$(GTK_VERSION)\"\ + -DGDK_DISABLE_DEPRECATED \ $(AM_CPPFLAGS) - + libgail_la_CFLAGS = \ $(GTK_DEP_CFLAGS) \ $(GTK_DEBUG_FLAGS) \ diff --git a/modules/other/gail/gail.c b/modules/other/gail/gail.c index 66055607d8..da25873dea 100644 --- a/modules/other/gail/gail.c +++ b/modules/other/gail/gail.c @@ -711,10 +711,10 @@ gail_focus_tracker_init (void) /* * We cannot be sure that the classes exist so we make sure that they do. */ - gtk_type_class (GTK_TYPE_WIDGET); - gtk_type_class (GTK_TYPE_ITEM); - gtk_type_class (GTK_TYPE_MENU_SHELL); - gtk_type_class (GTK_TYPE_NOTEBOOK); + g_type_class_ref (GTK_TYPE_WIDGET); + g_type_class_ref (GTK_TYPE_ITEM); + g_type_class_ref (GTK_TYPE_MENU_SHELL); + g_type_class_ref (GTK_TYPE_NOTEBOOK); /* * We listen for event_after signal and then check that the diff --git a/modules/other/gail/gailtoplevel.c b/modules/other/gail/gailtoplevel.c index 0284a9df5b..5d793e061c 100644 --- a/modules/other/gail/gailtoplevel.c +++ b/modules/other/gail/gailtoplevel.c @@ -110,7 +110,7 @@ gail_toplevel_init (GailToplevel *toplevel) } } - gtk_type_class (GTK_TYPE_WINDOW); + g_type_class_ref (GTK_TYPE_WINDOW); signal_id = g_signal_lookup ("show", GTK_TYPE_WINDOW); g_signal_add_emission_hook (signal_id, 0,