GNOME.org
 

[gthumb/ext] removed deprecated symbols

commit 58cbce0f734cbc81a235ea3b22af10946874146e
Author: Paolo Bacchilega <paobac src gnome org>
Date:   Sun Sep 6 10:41:36 2009 +0200

    removed deprecated symbols
    
    [bug #575017]

 configure.ac              |   28 +++++++++++-----------------
 gthumb/dlg-preferences.c  |    8 ++++----
 gthumb/gth-browser.c      |    6 +++---
 gthumb/gth-image-viewer.c |    8 ++++----
 gthumb/gth-nav-window.c   |   32 +++++++++-----------------------
 5 files changed, 31 insertions(+), 51 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index 820e734..39d65dc 100644
--- a/configure.ac
+++ b/configure.ac
@@ -22,6 +22,7 @@ AC_PATH_PROG(GLIB_MKENUMS, glib-mkenums)
 AM_PROG_LIBTOOL
 GNOME_DOC_INIT
 GNOME_COMPILE_WARNINGS([maximum])
+GNOME_MAINTAINER_MODE_DEFINES
 
 GLIB_REQUIRED=2.16.0
 GTK_REQUIRED=2.16.0
@@ -33,7 +34,7 @@ CLUTTER_GTK_REQUIRED=0.10.0
 dnl ===========================================================================
 
 AC_ARG_ENABLE(debug,
-	      AC_HELP_STRING([--enable-debug], [enable compilation of debugging messages]),
+	      AS_HELP_STRING([--enable-debug], [enable compilation of debugging messages]),
 	      [case "${enableval}" in
 	      yes) ENABLE_DEBUG=yes ;;
 	      no) ENABLE_DEBUG=no ;;
@@ -46,7 +47,7 @@ if test x$ENABLE_DEBUG = xyes; then
 fi
 
 AC_ARG_ENABLE(run_in_place,
-	      AC_HELP_STRING([--enable-run-in-place],[load ui data and extensions from the source tree]),
+	      AS_HELP_STRING([--enable-run-in-place],[load ui data and extensions from the source tree]),
 	      [case "${enableval}" in
 	      yes) enable_run_in_place=yes ;;
 	      no) enable_run_in_place=no ;;
@@ -60,7 +61,7 @@ if test x$enable_run_in_place = xyes; then
 fi
 
 AC_ARG_ENABLE(test-suite,
-	      AC_HELP_STRING([--enable-test-suite], [enable the compilation of the test suite]),
+	      AS_HELP_STRING([--enable-test-suite], [enable the compilation of the test suite]),
 	      [case "${enableval}" in
 	      yes) ENABLE_TEST_SUITE=yes ;;
 	      no) ENABLE_TEST_SUITE=no ;;
@@ -95,7 +96,7 @@ AC_PATH_PROG(GLIB_MKENUMS, glib-mkenums)
 dnl ===========================================================================
 
 AC_ARG_ENABLE([exiv2],
-	      [AC_HELP_STRING([--disable-exiv2],[do not compile code that uses the exiv2 library])],,
+	      [AS_HELP_STRING([--disable-exiv2],[do not compile code that uses the exiv2 library])],,
 	      [enable_exiv2=yes])
 
 if test x$enable_exiv2 = xyes ; then
@@ -111,7 +112,7 @@ AM_CONDITIONAL(ENABLE_EXIV2, test "x$enable_exiv2" = xyes)
 dnl ===========================================================================
 
 AC_ARG_ENABLE([clutter],
-	      [AC_HELP_STRING([--disable-clutter],[do not compile code that uses the clutter library])],,
+	      [AS_HELP_STRING([--disable-clutter],[do not compile code that uses the clutter library])],,
 	      [enable_clutter=yes])
 
 if test x$enable_clutter = xyes ; then
@@ -184,15 +185,10 @@ AC_SUBST(EXTENSION_LIBTOOL_FLAGS)
 
 dnl ===========================================================================
 
-AC_ARG_ENABLE(deprecations,AC_HELP_STRING([--enable-deprecations],[warn about de
-precated usages]))
+AC_ARG_ENABLE(deprecations,
+	      [AS_HELP_STRING([--enable-deprecations],[warn about deprecated usages])])
 if test "x$enable_deprecations" = "xyes"; then
-	DISABLE_DEPRECATED="-DG_DISABLE_DEPRECATED \
-	-DGDK_DISABLE_DEPRECATED \
-	-DGDK_PIXBUF_DISABLE_DEPRECATED \
-	-DGTK_DISABLE_DEPRECATED \
-	-DGNOME_VFS_DISABLE_DEPRECATED \
-	-DGNOME_DISABLE_DEPRECATED"
+	DISABLE_DEPRECATED="-DG_DISABLE_DEPRECATED -DGDK_DISABLE_DEPRECATED -DGDK_PIXBUF_DISABLE_DEPRECATED -DGTK_DISABLE_DEPRECATED"
 fi
 AC_SUBST(DISABLE_DEPRECATED)
 
@@ -204,9 +200,7 @@ for option in $WARN_CFLAGS; do
 	SAVE_CFLAGS="$CFLAGS"
 	CFLAGS="$CFLAGS $option"
 	AC_MSG_CHECKING([whether gcc understands $option])
-	AC_TRY_COMPILE([], [],
-			has_option=yes,
-			has_option=no,)
+	AC_TRY_COMPILE([], [], [has_option=yes], [has_option=no])
 	if test x$has_option = xyes; then
 		WARNINGS="$WARNINGS $option"
 	fi
@@ -223,7 +217,7 @@ dnl ===========================================================================
 
 AC_MSG_CHECKING(JPEG Support)
 AC_ARG_ENABLE([jpeg],
-	      [AC_HELP_STRING([--disable-jpeg],[do not compile code that uses the libjpeg library])],,
+	      [AS_HELP_STRING([--disable-jpeg],[do not compile code that uses the libjpeg library])],,
 	      [enable_jpeg=yes])
 AC_CHECK_LIB(jpeg, jpeg_destroy_decompress,
              [enable_jpeg=yes],
diff --git a/gthumb/dlg-preferences.c b/gthumb/dlg-preferences.c
index cbfb5c0..c2c850c 100644
--- a/gthumb/dlg-preferences.c
+++ b/gthumb/dlg-preferences.c
@@ -152,8 +152,8 @@ set_to_current_cb (GtkWidget  *widget,
 
 
 static void
-toolbar_style_changed_cb (GtkOptionMenu *option_menu,
-			  DialogData    *data)
+toolbar_style_changed_cb (GtkWidget  *widget,
+			  DialogData *data)
 {
 	eel_gconf_set_enum (PREF_UI_TOOLBAR_STYLE, GTH_TYPE_TOOLBAR_STYLE, gtk_combo_box_get_active (GTK_COMBO_BOX (data->toolbar_style_combobox)));
 }
@@ -168,8 +168,8 @@ ask_to_save_toggled_cb (GtkToggleButton *button,
 
 
 static void
-thumbnail_size_changed_cb (GtkOptionMenu *option_menu,
-			   DialogData    *data)
+thumbnail_size_changed_cb (GtkWidget  *widget,
+			   DialogData *data)
 {
 	eel_gconf_set_integer (PREF_THUMBNAIL_SIZE, thumb_size[gtk_combo_box_get_active (GTK_COMBO_BOX (data->thumbnail_size_combobox))]);
 }
diff --git a/gthumb/gth-browser.c b/gthumb/gth-browser.c
index 4edade3..f65ba92 100644
--- a/gthumb/gth-browser.c
+++ b/gthumb/gth-browser.c
@@ -2799,7 +2799,7 @@ add_browser_toolbar_menu_buttons (GthBrowser *browser)
 			  "activate",
 			  G_CALLBACK (gth_browser_activate_action_go_back),
 			  browser);
-	gtk_action_connect_proxy (action, GTK_WIDGET (tool_item));
+	gtk_activatable_set_related_action (GTK_ACTIVATABLE (tool_item), action);
 	gtk_action_group_add_action (browser->priv->actions, action);
 
 	gtk_widget_show (GTK_WIDGET (tool_item));
@@ -2820,7 +2820,7 @@ add_browser_toolbar_menu_buttons (GthBrowser *browser)
 			  "activate",
 			  G_CALLBACK (gth_browser_activate_action_go_forward),
 			  browser);
-	gtk_action_connect_proxy (action, GTK_WIDGET (tool_item));
+	gtk_activatable_set_related_action (GTK_ACTIVATABLE (tool_item), action);
 	gtk_action_group_add_action (browser->priv->actions, action);
 
 	gtk_widget_show (GTK_WIDGET (tool_item));
@@ -2841,7 +2841,7 @@ add_browser_toolbar_menu_buttons (GthBrowser *browser)
 			  "activate",
 			  G_CALLBACK (gth_browser_activate_action_go_up),
 			  browser);
-	gtk_action_connect_proxy (action, GTK_WIDGET (tool_item));
+	gtk_activatable_set_related_action (GTK_ACTIVATABLE (tool_item), action);
 	gtk_action_group_add_action (browser->priv->actions, action);
 
 	gtk_widget_show (GTK_WIDGET (tool_item));
diff --git a/gthumb/gth-image-viewer.c b/gthumb/gth-image-viewer.c
index d253884..1a4f97e 100644
--- a/gthumb/gth-image-viewer.c
+++ b/gthumb/gth-image-viewer.c
@@ -1341,7 +1341,7 @@ set_scroll_adjustments (GtkWidget     *widget,
 	if (viewer->hadj != hadj) {
 		viewer->hadj = hadj;
 		g_object_ref (viewer->hadj);
-		gtk_object_sink (GTK_OBJECT (viewer->hadj));
+		g_object_ref_sink (viewer->hadj);
 
 		g_signal_connect (G_OBJECT (viewer->hadj),
 				  "value_changed",
@@ -1352,7 +1352,7 @@ set_scroll_adjustments (GtkWidget     *widget,
 	if (viewer->vadj != vadj) {
 		viewer->vadj = vadj;
 		g_object_ref (viewer->vadj);
-		gtk_object_sink (GTK_OBJECT (viewer->vadj));
+		g_object_ref_sink (viewer->vadj);
 
 		g_signal_connect (G_OBJECT (viewer->vadj),
 				  "value_changed",
@@ -1827,9 +1827,9 @@ gth_image_viewer_instance_init (GthImageViewer *viewer)
 	viewer->vadj = GTK_ADJUSTMENT (gtk_adjustment_new (0.0, 1.0, 0.0, 1.0, 1.0, 1.0));
 
 	g_object_ref (viewer->hadj);
-	gtk_object_sink (GTK_OBJECT (viewer->hadj));
+	g_object_ref_sink (viewer->hadj);
 	g_object_ref (viewer->vadj);
-	gtk_object_sink (GTK_OBJECT (viewer->vadj));
+	g_object_ref_sink (viewer->vadj);
 
 	g_signal_connect (G_OBJECT (viewer->hadj),
 			  "value_changed",
diff --git a/gthumb/gth-nav-window.c b/gthumb/gth-nav-window.c
index af25725..b128cc3 100644
--- a/gthumb/gth-nav-window.c
+++ b/gthumb/gth-nav-window.c
@@ -290,29 +290,15 @@ nav_window_expose (GtkWidget      *widget,
 	if (nav_win->pixbuf == NULL)
 		return FALSE;
 
-	if (! gdk_pixbuf_get_has_alpha (nav_win->pixbuf))
-		gdk_pixbuf_render_to_drawable (
-		       nav_win->pixbuf,
-		       nav_win->preview->window,
-		       nav_win->preview->style->white_gc,
-		       0, 0,
-		       0, 0,
-		       nav_win->popup_width,
-		       nav_win->popup_height,
-		       GDK_RGB_DITHER_MAX,
-		       0, 0);
-	else
-		gdk_pixbuf_render_to_drawable_alpha (
-			nav_win->pixbuf,
-			nav_win->preview->window,
-			0, 0,
-			0, 0,
-			nav_win->popup_width,
-			nav_win->popup_height,
-			GDK_PIXBUF_ALPHA_BILEVEL,
-			112, /* FIXME */
-			GDK_RGB_DITHER_MAX,
-			0, 0);
+	gdk_draw_pixbuf (nav_win->preview->window,
+			 gdk_pixbuf_get_has_alpha (nav_win->pixbuf) ? NULL : nav_win->preview->style->white_gc,
+			 nav_win->pixbuf,
+			 0, 0,
+			 0, 0,
+			 nav_win->popup_width,
+			 nav_win->popup_height,
+			 GDK_RGB_DITHER_MAX,
+			 0, 0);
 
 	nav_window_draw_sqr (nav_win, FALSE,
 			     nav_win->sqr_x,
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]