[goobox] fixed compilation when GSEAL and *DEPRECATED* macros are enabled

[Paolo Bacchilega <paobac src gnome org>]

commit a2688e9921726e48630dfcc5b835a19f6210d849
Author: Paolo Bacchilega <paobac src gnome org>
Date:   Thu Jul 15 10:22:49 2010 +0200

    fixed compilation when GSEAL and *DEPRECATED* macros are enabled

 configure.ac          |    2 +-
 src/dlg-preferences.c |    6 +++---
 src/goo-window.c      |   12 ++++++------
 src/gtk-utils.c       |    6 +++---
 src/main.c            |    2 +-
 5 files changed, 14 insertions(+), 14 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index 59168f3..6f35a6d 100644
--- a/configure.ac
+++ b/configure.ac
@@ -152,7 +152,7 @@ dnl ===========================================================================
 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"
+	DISABLE_DEPRECATED="-DGSEAL_ENABLE -DG_DISABLE_DEPRECATED -DGDK_DISABLE_DEPRECATED -DGDK_PIXBUF_DISABLE_DEPRECATED -DGTK_DISABLE_DEPRECATED"
 fi
 AC_SUBST(DISABLE_DEPRECATED)
 
diff --git a/src/dlg-preferences.c b/src/dlg-preferences.c
index 7615abb..3863f3a 100644
--- a/src/dlg-preferences.c
+++ b/src/dlg-preferences.c
@@ -127,9 +127,9 @@ filetype_properties_clicked_cb (GtkWidget  *widget,
 
 
 static void
-drive_selector_device_changed_cb (GtkOptionMenu *option_menu,
-				  const char    *device_path,
-				  DialogData    *data)
+drive_selector_device_changed_cb (GtkWidget   *drive_selector,
+				  const char  *device_path,
+				  DialogData  *data)
 {
 	apply_button_clicked_cb (NULL, data);
 }
diff --git a/src/goo-window.c b/src/goo-window.c
index d0dd7af..4c44ad8 100644
--- a/src/goo-window.c
+++ b/src/goo-window.c
@@ -353,7 +353,7 @@ goo_window_update_list (GooWindow *window)
 	GdkPixbuf *icon;
 	GList     *scan;
 
-	if (GTK_WIDGET_REALIZED (window->priv->list_view))
+	if (gtk_widget_get_realized (window->priv->list_view))
 		gtk_tree_view_scroll_to_point (GTK_TREE_VIEW (window->priv->list_view), 0, 0);
 
 	/**/
@@ -624,7 +624,7 @@ menu_item_select_cb (GtkMenuItem *proxy,
         GtkAction *action;
         char      *message;
 
-        action = gtk_widget_get_action (GTK_WIDGET (proxy));
+        action = gtk_activatable_get_related_action (GTK_ACTIVATABLE (proxy));
         g_return_if_fail (action != NULL);
 
         g_object_get (G_OBJECT (action), "tooltip", &message, NULL);
@@ -839,7 +839,7 @@ static void
 play_track (GooWindow *window,
 	    int        track_number)
 {
-	if (! GTK_WIDGET_VISIBLE (window))
+	if (! gtk_widget_get_visible (GTK_WIDGET (window)))
 		window->priv->notify_action = TRUE;
 	goo_player_seek_track (window->priv->player, track_number);
 }
@@ -1868,7 +1868,7 @@ update_ui_from_expander_state (GooWindow *window)
 		GdkGeometry hints;
 
 		gtk_expander_set_label (expander, _(HIDE_TRACK_LIST));
-		if (GTK_WIDGET_REALIZED (window))
+		if (gtk_widget_get_realized (GTK_WIDGET (window)))
 			gtk_window_resize (GTK_WINDOW (window), 
 					   eel_gconf_get_integer (PREF_UI_WINDOW_WIDTH, DEFAULT_WIN_WIDTH),
 					   eel_gconf_get_integer (PREF_UI_WINDOW_HEIGHT, DEFAULT_WIN_HEIGHT));
@@ -1884,7 +1884,7 @@ update_ui_from_expander_state (GooWindow *window)
 	else {
 		GdkGeometry hints;
 
-		if (GTK_WIDGET_REALIZED (window))
+		if (gtk_widget_get_realized (GTK_WIDGET (window)))
 			save_window_size (window);
 		gtk_statusbar_set_has_resize_grip (GTK_STATUSBAR (window->priv->statusbar), FALSE);
 		gtk_expander_set_label (expander, _(SHOW_TRACK_LIST));
@@ -3095,7 +3095,7 @@ goo_window_remove_cover (GooWindow *window)
 void
 goo_window_toggle_visibility (GooWindow *window)
 {
-	if (GTK_WIDGET_VISIBLE (window)) {
+	if (gtk_widget_get_visible (GTK_WIDGET (window))) {
 		gtk_window_get_position (GTK_WINDOW (window),
 					 &window->priv->pos_x,
 					 &window->priv->pos_y);
diff --git a/src/gtk-utils.c b/src/gtk-utils.c
index e10a557..c15049b 100644
--- a/src/gtk-utils.c
+++ b/src/gtk-utils.c
@@ -507,8 +507,8 @@ _gtk_ok_dialog_with_checkbutton_new (GtkWindow        *parent,
 			    FALSE, FALSE, 0);
 	gtk_widget_show (check_button);
 
-	gtk_toggle_button_set_state (GTK_TOGGLE_BUTTON (check_button),
-				     eel_gconf_get_boolean (gconf_key, FALSE));
+	gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (check_button),
+				      eel_gconf_get_boolean (gconf_key, FALSE));
 
 	gtk_widget_show_all (hbox);
 
@@ -1160,7 +1160,7 @@ _gtk_paned_get_position2 (GtkPaned *paned)
 	int            pos;
 	int            size;
 
-	if (! GTK_WIDGET_VISIBLE (paned))
+	if (! gtk_widget_get_visible (GTK_WIDGET (paned)))
 		return 0;
 
 	pos = gtk_paned_get_position (paned);
diff --git a/src/main.c b/src/main.c
index 02f0a42..56cea1c 100644
--- a/src/main.c
+++ b/src/main.c
@@ -234,7 +234,7 @@ unique_app_message_received_cb (UniqueApp         *unique_app,
 		break;
 
 	case COMMAND_PRESENT:
-		if (GTK_WIDGET_VISIBLE (main_window))
+		if (gtk_widget_get_visible (GTK_WIDGET (main_window)))
 			gtk_window_present (GTK_WINDOW (main_window));
 		else
 			goo_window_toggle_visibility (GOO_WINDOW (main_window));