ekiga r7372 - in trunk: . lib/gui lib/toolbox src/gui

[dsandras svn gnome org]

Author: dsandras
Date: Sun Nov 16 19:29:59 2008
New Revision: 7372
URL: http://svn.gnome.org/viewvc/ekiga?rev=7372&view=rev

Log:
Compile by default with the deprecated flags to make sure we do not 
reintroduce deprecated behaviors.


Modified:
   trunk/ChangeLog
   trunk/configure.ac
   trunk/lib/gui/gmpreferences.c
   trunk/lib/toolbox/toolbox-gnome.c
   trunk/src/gui/callbacks.cpp

Modified: trunk/configure.ac
==============================================================================
--- trunk/configure.ac	(original)
+++ trunk/configure.ac	Sun Nov 16 19:29:59 2008
@@ -178,6 +178,7 @@
 dnl   Mandatory GTK support
 dnl ###############################
 PKG_CHECK_MODULES([GTK], [gtk+-2.0 >= 2.12.0])
+GTK_CFLAGS="$GTK_CFLAGS -DGDK_PIXBUF_DISABLE_DEPRECATED -DGDK_DISABLE_DEPRECATED -DGTK_DISABLE_DEPRECATED -DGDK_PIXBUF_DISABLE_SINGLE_INCLUDES -DGTK_DISABLE_SINGLE_INCLUDES"
 AC_SUBST(GTK_CFLAGS)
 AC_SUBST(GTK_LIBS)
 
@@ -186,6 +187,7 @@
 dnl   Mandatory GLIB support
 dnl ###############################
 PKG_CHECK_MODULES([GLIB], [glib-2.0 >= 2.8.0 gmodule-2.0 gobject-2.0 gthread-2.0])
+GLIB_CFLAGS="$GLIB_CFLAGS -DG_DISABLE_SINGLE_INCLUDES"
 AC_SUBST(GLIB_CFLAGS)
 AC_SUBST(GLIB_LIBS)
 

Modified: trunk/lib/gui/gmpreferences.c
==============================================================================
--- trunk/lib/gui/gmpreferences.c	(original)
+++ trunk/lib/gui/gmpreferences.c	Sun Nov 16 19:29:59 2008
@@ -41,6 +41,8 @@
 #include "gmconfwidgets.h"
 
 #include <string.h>
+#include <libintl.h>
+#include <gdk/gdkcolor.h>
 
 enum {
   COLUMN_STRING_RAW = 0, /* must be zero because it's used in gmconfwidgets */

Modified: trunk/lib/toolbox/toolbox-gnome.c
==============================================================================
--- trunk/lib/toolbox/toolbox-gnome.c	(original)
+++ trunk/lib/toolbox/toolbox-gnome.c	Sun Nov 16 19:29:59 2008
@@ -37,6 +37,7 @@
 #include "toolbox.h"
 #include "toolbox-internal.h"
 
+#undef GTK_DISABLE_DEPRECATED
 #include <gnome.h>
 
 void

Modified: trunk/src/gui/callbacks.cpp
==============================================================================
--- trunk/src/gui/callbacks.cpp	(original)
+++ trunk/src/gui/callbacks.cpp	Sun Nov 16 19:29:59 2008
@@ -59,6 +59,7 @@
 #define WIN32_HELP_FILE "index.html"
 #endif
 
+#undef GTK_DISABLE_DEPRECATED
 #ifdef HAVE_GNOME
 #include <gnome.h>
 #endif