Fix compile warnings.

2007-07-29  Carlos Garcia Campos  <carlosgc@gnome.org>
	* shell/ev-navigation-action.c:
	(ev_navigation_action_history_changed),
	(ev_navigation_action_set_history):
	* shell/ev-navigation-action-widget.c:
	(ev_navigation_action_widget_init):
	* shell/ev-sidebar-thumbnails.c: (adjustment_changed_cb):
	Fix compile warnings.

svn path=/trunk/; revision=2596

3 files changed, 14 insertions, 5 deletions

diff --git a/shell/ev-navigation-action-widget.c b/shell/ev-navigation-action-widget.c
index 116ff9c..5a04fd3 100644
--- a/shell/ev-navigation-action-widget.c
+++ b/shell/ev-navigation-action-widget.c
@@ -52,7 +52,7 @@ ev_navigation_action_widget_init (EvNavigationActionWidget *action_widget)
 	toggle_button = gtk_bin_get_child (GTK_BIN (action_widget));
 	
 	g_signal_connect (toggle_button, "button-press-event", 
-			  ev_navigation_action_widget_button_press_event,
+			  G_CALLBACK (ev_navigation_action_widget_button_press_event),
 		          action_widget);
 	return;
 }
diff --git a/shell/ev-navigation-action.c b/shell/ev-navigation-action.c
index 3aa1bea..6a5e3a5 100644
--- a/shell/ev-navigation-action.c
+++ b/shell/ev-navigation-action.c
@@ -60,9 +60,8 @@ ev_navigation_action_history_changed (EvHistory *history,
 {
 	EvNavigationAction *action = EV_NAVIGATION_ACTION (data);
 	
-	gtk_action_set_sensitive (action, ev_history_get_n_links (history) > 0);
-	
-	return;
+	gtk_action_set_sensitive (GTK_ACTION (action),
+				  ev_history_get_n_links (history) > 0);
 }
 
 void
@@ -75,7 +74,7 @@ ev_navigation_action_set_history (EvNavigationAction *action,
 				   (gpointer) &action->priv->history);
 	
 	g_signal_connect_object (history, "changed",
-				 ev_navigation_action_history_changed,
+				 G_CALLBACK (ev_navigation_action_history_changed),
 				 action, 0);
 }
 
diff --git a/shell/ev-sidebar-thumbnails.c b/shell/ev-sidebar-thumbnails.c
index 671569a..192aa6f 100644
--- a/shell/ev-sidebar-thumbnails.c
+++ b/shell/ev-sidebar-thumbnails.c
@@ -333,12 +333,22 @@ adjustment_changed_cb (EvSidebarThumbnails *sidebar_thumbnails)
 		if (! GTK_WIDGET_REALIZED (priv->tree_view))
 			return;
 
+#if GTK_CHECK_VERSION (2, 11, 3)
+		gtk_tree_view_convert_widget_to_bin_window_coords (GTK_TREE_VIEW (priv->tree_view),
+								   0, (int) priv->vadjustment->value,
+								   NULL, &wy1);
+		gtk_tree_view_convert_widget_to_bin_window_coords (GTK_TREE_VIEW (priv->tree_view),
+								   0, (int) (priv->vadjustment->value + priv->vadjustment->page_size),
+								   NULL, &wy2);
+#else
 		gtk_tree_view_tree_to_widget_coords (GTK_TREE_VIEW (priv->tree_view),
 						     0, (int) priv->vadjustment->value,
 						     NULL, &wy1);
 		gtk_tree_view_tree_to_widget_coords (GTK_TREE_VIEW (priv->tree_view),
 						     0, (int) (priv->vadjustment->value + priv->vadjustment->page_size),
 						     NULL, &wy2);
+#endif /* GTK_CHECK_VERSION (2, 11, 3) */
+		
 		gtk_tree_view_get_path_at_pos (GTK_TREE_VIEW (priv->tree_view),
 					       1, wy1 + 1, &path,
 					       NULL, NULL, NULL);