From 539414d67713644d272ff9932d508ed30da17d18 Mon Sep 17 00:00:00 2001 From: Michael David Emmel Date: Thu, 14 Sep 2006 02:56:01 +0000 Subject: [PATCH] gdk/directfb/gdkcolor-directfb.c small clean ups include order gdk/directfb/gdkwindow-directfb.c fixed beep compile error gdk/directfb/Makefile.am removed GDK_PIXBUF_DISABLE_DEPRECATED GDK_DISABLE_DEPRECATED to allow compile per Behdad gdk/quartz/Makefile.am same change as directfb Makefile gtk/Makefile.am fixed typo that cause socket stubs not to compile --- ChangeLog | 9 +++++++++ gdk/directfb/Makefile.am | 3 +-- gdk/directfb/gdkcolor-directfb.c | 7 ++----- gdk/directfb/gdkwindow-directfb.c | 2 +- 4 files changed, 13 insertions(+), 8 deletions(-) diff --git a/ChangeLog b/ChangeLog index a854756c45..3d05c276ea 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,12 @@ +2006-09-13 Michael Emmel + + * gdk/directfb/gdkcolor-directfb.c small clean ups include order + * gdk/directfb/gdkwindow-directfb.c fixed beep compile error + * gdk/directfb/Makefile.am removed GDK_PIXBUF_DISABLE_DEPRECATED + GDK_DISABLE_DEPRECATED to allow compile per Behdad + * gdk/quartz/Makefile.am same change as directfb Makefile + * gtk/Makefile.am fixed typo that cause socket stubs not to compile + 2006-09-13 Matthias Clasen * gtk/gtkcolorsel.c: Use a GtkWindow instead of a GtkInvisible diff --git a/gdk/directfb/Makefile.am b/gdk/directfb/Makefile.am index 97a2498dac..3c2ec45027 100644 --- a/gdk/directfb/Makefile.am +++ b/gdk/directfb/Makefile.am @@ -4,12 +4,11 @@ libgdkincludedir = $(includedir)/gtk-2.0/gdk INCLUDES = \ -DG_LOG_DOMAIN=\"Gdk-DirectFB\" \ + -DGDK_COMPILATION \ -I$(top_srcdir) \ -I$(top_srcdir)/gdk \ -I$(top_builddir)/gdk \ -DG_DISABLE_DEPRECATED \ - -DGDK_PIXBUF_DISABLE_DEPRECATED \ - -DGDK_DISABLE_DEPRECATED \ @GTK_DEBUG_FLAGS@ \ @GDK_DEP_CFLAGS@ diff --git a/gdk/directfb/gdkcolor-directfb.c b/gdk/directfb/gdkcolor-directfb.c index 69a9db7e44..6c98f76a7e 100644 --- a/gdk/directfb/gdkcolor-directfb.c +++ b/gdk/directfb/gdkcolor-directfb.c @@ -38,12 +38,10 @@ #include #include +#include "gdkcolor.h" +#include "gdkinternals.h" #include "gdkdirectfb.h" #include "gdkprivate-directfb.h" - -#include "gdkinternals.h" - -#include "gdkcolor.h" #include "gdkalias.h" @@ -618,6 +616,5 @@ gdk_directfb_allocate_color_key (GdkColormap *colormap) private->info[255].ref_count++; } - #define __GDK_COLOR_X11_C__ #include "gdkaliasdef.c" diff --git a/gdk/directfb/gdkwindow-directfb.c b/gdk/directfb/gdkwindow-directfb.c index a374400b32..ffa11e9838 100644 --- a/gdk/directfb/gdkwindow-directfb.c +++ b/gdk/directfb/gdkwindow-directfb.c @@ -2993,7 +2993,7 @@ gdk_window_impl_directfb_paintable_init (GdkPaintableIface *iface) void gdk_window_beep (GdkWindow *window) { - gdk_display_beep (GDK_WINDOW_DISPLAY (window)); + gdk_display_beep (gdk_display_get_default()); } #define __GDK_WINDOW_X11_C__