[Gnucash-changes] r13422 - gnucash/trunk - Set the GNOME_DISABLE_DEPRECATED flag for gnome versions up to 2.13.7.

[David Hampton]

Author: hampton
Date: 2006-02-28 11:16:04 -0500 (Tue, 28 Feb 2006)
New Revision: 13422
Trac: http://svn.gnucash.org/trac/changeset/13422

Modified:
   gnucash/trunk/ChangeLog
   gnucash/trunk/configure.in
   gnucash/trunk/src/gnome-utils/dialog-options.c
Log:
Set the GNOME_DISABLE_DEPRECATED flag for gnome versions up to 2.13.7.


Modified: gnucash/trunk/ChangeLog
===================================================================
--- gnucash/trunk/ChangeLog	2006-02-28 11:51:46 UTC (rev 13421)
+++ gnucash/trunk/ChangeLog	2006-02-28 16:16:04 UTC (rev 13422)
@@ -1,3 +1,13 @@
+2006-02-28  David Hampton  <hampton at employees.org>
+
+	* configure.in: Set the GNOME_DISABLE_DEPRECATED flag for gnome
+	versions up to 2.13.7.
+
+	* src/gnome-utils/dialog-options.c: Allow this one file to use
+	deprecated gnome functions, but only when compiled with gtk 2.4.
+	Later versions of gtk include the needed replacement function and
+	deprecated gnome functions are not allowed.
+
 2006-02-27  David Hampton  <hampton at employees.org>
 
 	* src/gnome-utils/dialog-utils.[ch]: Remove a unused function that

Modified: gnucash/trunk/configure.in
===================================================================
--- gnucash/trunk/configure.in	2006-02-28 11:51:46 UTC (rev 13421)
+++ gnucash/trunk/configure.in	2006-02-28 16:16:04 UTC (rev 13422)
@@ -1006,8 +1006,16 @@
     AS_SCRUB_INCLUDE(GNOME_CFLAGS)
     AC_SUBST(GNOME_CFLAGS)
     AC_SUBST(GNOME_LIBS)
-    HAVE_UNTESTED_GNOME=yes
 
+    AC_MSG_CHECKING([for untested GNOME versions (libgnome > 2.13.7)])
+    if $PKG_CONFIG 'libgnome-2.0 > 2.13.7'
+    then
+      AC_MSG_RESULT(yes)
+      HAVE_UNTESTED_GNOME=yes
+    else
+      AC_MSG_RESULT(no)
+    fi
+
     PKG_CHECK_MODULES(GDK_PIXBUF, gdk-pixbuf-2.0)
     AS_SCRUB_INCLUDE(GDK_PIXBUF_CFLAGS)
     AC_SUBST(GDK_PIXBUF_CFLAGS)

Modified: gnucash/trunk/src/gnome-utils/dialog-options.c
===================================================================
--- gnucash/trunk/src/gnome-utils/dialog-options.c	2006-02-28 11:51:46 UTC (rev 13421)
+++ gnucash/trunk/src/gnome-utils/dialog-options.c	2006-02-28 16:16:04 UTC (rev 13422)
@@ -26,6 +26,7 @@
 #ifdef HAVE_GTK26 
 #include <gtk/gtk.h>
 #else
+#undef GNOME_DISABLE_DEPRECATED
 #include <gnome.h>
 #endif
 #include <gdk/gdk.h>