From d2f7b84a4e0a9231eceeef792c00814ded9ead64 Mon Sep 17 00:00:00 2001 From: David Hampton Date: Fri, 6 Apr 2007 01:15:15 +0000 Subject: [PATCH] Remove some deprecated functions. Bump version numbers were GnuCash sets the "disable deprecated" flags. git-svn-id: svn+ssh://svn.gnucash.org/repo/gnucash/trunk@15834 57a11ea4-9604-0410-9ed3-97b8803252fd --- configure.in | 16 +++++++++++----- src/gnome-utils/dialog-utils.c | 11 +++++------ src/gnome-utils/gnc-dense-cal.c | 2 +- src/gnome-utils/gnc-icons.c | 4 ++-- src/gnome/dialog-print-check.c | 2 +- 5 files changed, 20 insertions(+), 15 deletions(-) diff --git a/configure.in b/configure.in index 5d0f34c2de..72dc398f2c 100644 --- a/configure.in +++ b/configure.in @@ -286,8 +286,8 @@ else 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 @@ then 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 @@ then 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 diff --git a/src/gnome-utils/dialog-utils.c b/src/gnome-utils/dialog-utils.c index 2761e0167d..f4bf165a35 100644 --- a/src/gnome-utils/dialog-utils.c +++ b/src/gnome-utils/dialog-utils.c @@ -612,16 +612,14 @@ check_realize (GtkWidget *widget, gpointer user_data) 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); - - font_height = font->ascent + font->descent; - check_size = (font_height > 0) ? font_height - 3 : 9; + 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; check_info->mask = gdk_pixmap_new (NULL, check_size, check_size, 1); @@ -631,6 +629,7 @@ check_realize (GtkWidget *widget, gpointer user_data) 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); diff --git a/src/gnome-utils/gnc-dense-cal.c b/src/gnome-utils/gnc-dense-cal.c index d8771bb066..77fb547279 100644 --- a/src/gnome-utils/gnc-dense-cal.c +++ b/src/gnome-utils/gnc-dense-cal.c @@ -891,7 +891,7 @@ gnc_dense_cal_draw_to_buffer(GncDenseCal *dcal) g_list_free(mcList); } - gdk_gc_destroy(gc); + g_object_unref(gc); } /* Hilight the marked days. */ diff --git a/src/gnome-utils/gnc-icons.c b/src/gnome-utils/gnc-icons.c index 0ac19c4cf9..2e18120d50 100644 --- a/src/gnome-utils/gnc-icons.c +++ b/src/gnome-utils/gnc-icons.c @@ -87,8 +87,8 @@ gnc_add_stock_icon_pair (GtkIconFactory *factory, 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); diff --git a/src/gnome/dialog-print-check.c b/src/gnome/dialog-print-check.c index 75a4dfe314..6be5016b76 100644 --- a/src/gnome/dialog-print-check.c +++ b/src/gnome/dialog-print-check.c @@ -1423,7 +1423,7 @@ read_image (const gchar *filename) 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);