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

Fix make check:

Browse Source 
2008-07-04  Michael Natterer  <mitch@imendio.com>

	Fix make check:

	* gtk/Makefile.am: remove GTK_DISABLE_DEPRECATED from INCLUDES
	again :-(

	* gtk/gtkclist.c
	* gtk/gtkcombo.c
	* gtk/gtkctree.c
	* gtk/gtklist.c
	* gtk/gtklistitem.c
	* gtk/gtknotebook.c
	* gtk/gtkobject.c
	* gtk/gtkoldeditable.c
	* gtk/gtkpixmap.c
	* gtk/gtktext.c
	* gtk/gtktree.c
	* gtk/gtktreeitem.c: don't #define it again before including
	gtkalias.h after it has been #undef'ed before.


svn path=/trunk/; revision=20763
This commit is contained in:
Michael Natterer
2008-07-04 18:38:36 +00:00
committed by Michael Natterer
parent a63ba82b64
commit 05a6983f62
14 changed files with 49 additions and 49 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
gtk/gtktext.c
View File

@ -48,7 +48,6 @@
#include "gtkprivate.h"
#include "gtkintl.h"
#define GTK_DISABLE_DEPRECATED
#include "gtkalias.h"
@ -797,13 +796,13 @@ gtk_text_set_adjustments (GtkText *text,
if (text->hadj && (text->hadj != hadj))
{
gtk_signal_disconnect_by_data (GTK_OBJECT (text->hadj), text);
gtk_object_unref (GTK_OBJECT (text->hadj));
g_object_unref (text->hadj);
}
if (text->vadj && (text->vadj != vadj))
{
gtk_signal_disconnect_by_data (GTK_OBJECT (text->vadj), text);
gtk_object_unref (GTK_OBJECT (text->vadj));
g_object_unref (text->vadj);
}
g_object_freeze_notify (G_OBJECT (text));
@ -1175,13 +1174,13 @@ gtk_text_destroy (GtkObject *object)
if (text->hadj)
{
gtk_signal_disconnect_by_data (GTK_OBJECT (text->hadj), text);
gtk_object_unref (GTK_OBJECT (text->hadj));
g_object_unref (text->hadj);
text->hadj = NULL;
}
if (text->vadj)
{
gtk_signal_disconnect_by_data (GTK_OBJECT (text->vadj), text);
gtk_object_unref (GTK_OBJECT (text->vadj));
g_object_unref (text->vadj);
text->vadj = NULL;
}