r15834 - gnucash/trunk - Remove some deprecated functions. Bump version numbers were GnuCash

[David Hampton]

Author: hampton
Date: 2007-04-05 21:15:15 -0400 (Thu, 05 Apr 2007)
New Revision: 15834
Trac: http://svn.gnucash.org/trac/changeset/15834

Modified:
   gnucash/trunk/configure.in
   gnucash/trunk/src/gnome-utils/dialog-utils.c
   gnucash/trunk/src/gnome-utils/gnc-dense-cal.c
   gnucash/trunk/src/gnome-utils/gnc-icons.c
   gnucash/trunk/src/gnome/dialog-print-check.c
Log:
Remove some deprecated functions.  Bump version numbers were GnuCash
sets the "disable deprecated" flags.


Modified: gnucash/trunk/configure.in
===================================================================
--- gnucash/trunk/configure.in	2007-04-06 00:54:52 UTC (rev 15833)
+++ gnucash/trunk/configure.in	2007-04-06 01:15:15 UTC (rev 15834)
@@ -286,8 +286,8 @@
 fi
 AM_CONDITIONAL(HAVE_GLIB_2_8, test "x$HAVE_GLIB_2_8" = "xyes")
 
-AC_MSG_CHECKING([for untested GLIB versions (glib >= 2.11.0)])
-if $PKG_CONFIG 'glib-2.0 >= 2.11.0'
+AC_MSG_CHECKING([for untested GLIB versions (glib >= 2.13.0)])
+if $PKG_CONFIG 'glib-2.0 >= 2.13.0'
 then
   AC_MSG_RESULT(yes)
   HAVE_UNTESTED_GLIB=yes
@@ -1059,7 +1059,6 @@
     AS_SCRUB_INCLUDE(GTK_CFLAGS)
     AC_SUBST(GTK_CFLAGS)
     AC_SUBST(GTK_LIBS)
-    HAVE_UNTESTED_GDK=yes
     HAVE_UNTESTED_GTK=yes
 
     AC_MSG_CHECKING(for GTK - version >= 2.10.0)
@@ -1073,13 +1072,20 @@
     fi
     AM_CONDITIONAL(HAVE_GTK_2_10, test "x$HAVE_GTK_2_10" = "xyes" )
 
+    AC_MSG_CHECKING([for untested GDK versions (gdk > 2.11.0)])
+    if $PKG_CONFIG 'gtk+-2.0 > 2.11.0'
+    then
+      AC_MSG_RESULT(yes)
+      HAVE_UNTESTED_GDK=yes
+    fi
+
     PKG_CHECK_MODULES(GNOME, libgnomeui-2.0 >= 2.4)
     AS_SCRUB_INCLUDE(GNOME_CFLAGS)
     AC_SUBST(GNOME_CFLAGS)
     AC_SUBST(GNOME_LIBS)
 
-    AC_MSG_CHECKING([for untested GNOME versions (libgnome >= 2.15.0)])
-    if $PKG_CONFIG 'libgnome-2.0 >= 2.15.0'
+    AC_MSG_CHECKING([for untested GNOME versions (libgnome >= 2.19.0)])
+    if $PKG_CONFIG 'libgnome-2.0 >= 2.19.0'
     then
       AC_MSG_RESULT(yes)
       HAVE_UNTESTED_GNOME=yes

Modified: gnucash/trunk/src/gnome/dialog-print-check.c
===================================================================
--- gnucash/trunk/src/gnome/dialog-print-check.c	2007-04-06 00:54:52 UTC (rev 15833)
+++ gnucash/trunk/src/gnome/dialog-print-check.c	2007-04-06 01:15:15 UTC (rev 15834)
@@ -1423,7 +1423,7 @@
 
     pkgdatadir = gnc_path_get_pkgdatadir();
     tmp_name = g_build_filename(pkgdatadir, CHECK_FMT_DIR, filename, (char *)NULL);
-    if (!g_file_exists(tmp_name)) {
+    if (!g_file_test(tmp_name, G_FILE_TEST_EXISTS)) {
         g_free(tmp_name);
 	dirname = gnc_build_dotgnucash_path(CHECK_FMT_DIR);
 	tmp_name = g_build_filename(dirname, filename, (char *)NULL);

Modified: gnucash/trunk/src/gnome-utils/dialog-utils.c
===================================================================
--- gnucash/trunk/src/gnome-utils/dialog-utils.c	2007-04-06 00:54:52 UTC (rev 15833)
+++ gnucash/trunk/src/gnome-utils/dialog-utils.c	2007-04-06 01:15:15 UTC (rev 15834)
@@ -612,17 +612,15 @@
   GList *list;
   GList *node;
   GdkGC *gc;
-  GdkFont *font;
+  PangoLayout *layout;
 
   if (check_info->mask)
     return;
 
-  style = gtk_widget_get_style (widget);
-  font = gdk_font_from_description(style->font_desc);
+  layout = gtk_widget_create_pango_layout(widget, "sample");
+  pango_layout_get_pixel_size(layout, NULL,  &font_height);
+  check_size = (font_height > 0) ? font_height - 6 : 9;
 
-  font_height = font->ascent + font->descent;
-  check_size = (font_height > 0) ? font_height - 3 : 9;
-
   check_info->mask = gdk_pixmap_new (NULL, check_size, check_size, 1);
 
   check_info->on_pixmap = gdk_pixmap_new (widget->window,
@@ -631,6 +629,7 @@
   check_info->off_pixmap = gdk_pixmap_new (widget->window,
                                            check_size, check_size, -1);
 
+  style = gtk_widget_get_style (widget);
   gc_values.foreground = style->white;
   gc = gtk_gc_get (1, gtk_widget_get_colormap (widget),
                    &gc_values, GDK_GC_FOREGROUND);

Modified: gnucash/trunk/src/gnome-utils/gnc-dense-cal.c
===================================================================
--- gnucash/trunk/src/gnome-utils/gnc-dense-cal.c	2007-04-06 00:54:52 UTC (rev 15833)
+++ gnucash/trunk/src/gnome-utils/gnc-dense-cal.c	2007-04-06 01:15:15 UTC (rev 15834)
@@ -891,7 +891,7 @@
             g_list_free(mcList);
         }
 
-        gdk_gc_destroy(gc);
+        g_object_unref(gc);
     }
 
     /* Hilight the marked days. */

Modified: gnucash/trunk/src/gnome-utils/gnc-icons.c
===================================================================
--- gnucash/trunk/src/gnome-utils/gnc-icons.c	2007-04-06 00:54:52 UTC (rev 15833)
+++ gnucash/trunk/src/gnome-utils/gnc-icons.c	2007-04-06 01:15:15 UTC (rev 15834)
@@ -87,8 +87,8 @@
 	gtk_icon_factory_add (factory, stock, set);
 
 	/* Cleanup */
-	gdk_pixbuf_unref (pixbuf2);
-	gdk_pixbuf_unref (pixbuf1);
+	g_object_unref (pixbuf2);
+	g_object_unref (pixbuf1);
 	g_free(fullname2);
 	g_free(fullname1);
 	gtk_icon_set_unref (set);