updated for e scroll frame --> gtk scrolled window

svn path=/trunk/; revision=19736

5 files changed, 48 insertions, 51 deletions

diff --git a/shell/e-shell-config-offline.c b/shell/e-shell-config-offline.c
index ab97b5204a..1342abbbb2 100644
--- a/shell/e-shell-config-offline.c
+++ b/shell/e-shell-config-offline.c
@@ -34,8 +34,7 @@
 
 #include <gconf/gconf-client.h>
 
-#include <gal/widgets/e-scroll-frame.h>
-
+#include <gtk/gtkscrolledwindow.h>
 #include <gtk/gtkwidget.h>
 #include <gtk/gtksignal.h>
 
@@ -135,7 +134,7 @@ GtkWidget *
 e_shell_config_offline_create_widget (EShell *shell, EvolutionConfigControl *control)
 {
 	PageData *page_data;
-	GtkWidget *scroll_frame;
+	GtkWidget *scrolled_window;
 
 	g_return_val_if_fail (E_IS_SHELL (shell), NULL);
 
@@ -151,12 +150,12 @@ e_shell_config_offline_create_widget (EShell *shell, EvolutionConfigControl *con
 	g_signal_connect (page_data->storage_set_view, "checkboxes_changed",
 			  G_CALLBACK (storage_set_view_checkboxes_changed_callback), page_data);
 
-	scroll_frame = e_scroll_frame_new (NULL, NULL);
-	e_scroll_frame_set_shadow_type (E_SCROLL_FRAME (scroll_frame), GTK_SHADOW_IN);
-	e_scroll_frame_set_policy (E_SCROLL_FRAME (scroll_frame),
-				   GTK_POLICY_AUTOMATIC, GTK_POLICY_AUTOMATIC);
-	gtk_container_add (GTK_CONTAINER (scroll_frame), page_data->storage_set_view);
-	gtk_widget_show (scroll_frame);
+	scrolled_window = gtk_scrolled_window_new (NULL, NULL);
+	gtk_scrolled_window_set_shadow_type (GTK_SCROLLED_WINDOW (scrolled_window), GTK_SHADOW_IN);
+	gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (scrolled_window),
+					GTK_POLICY_AUTOMATIC, GTK_POLICY_AUTOMATIC);
+	gtk_container_add (GTK_CONTAINER (scrolled_window), page_data->storage_set_view);
+	gtk_widget_show (scrolled_window);
 
 	page_data->config_control = control;
 
@@ -165,5 +164,5 @@ e_shell_config_offline_create_widget (EShell *shell, EvolutionConfigControl *con
 
 	g_object_weak_ref (G_OBJECT (page_data->config_control), config_control_destroy_notify, page_data);
 
-	return scroll_frame;
+	return scrolled_window;
 }
diff --git a/shell/e-shell-folder-creation-dialog.c b/shell/e-shell-folder-creation-dialog.c
index 0ba0dfe2be..9fe4f1efec 100644
--- a/shell/e-shell-folder-creation-dialog.c
+++ b/shell/e-shell-folder-creation-dialog.c
@@ -32,14 +32,13 @@
 #include <gtk/gtkdialog.h>
 #include <gtk/gtkoptionmenu.h>
 #include <gtk/gtkmenuitem.h>
+#include <gtk/gtkscrolledwindow.h>
 
 #include <glade/glade-xml.h>
 
 #include <gal/util/e-util.h>
 #include <gal/widgets/e-gui-utils.h>
 
-#include <gal/widgets/e-scroll-frame.h>
-
 #include "e-storage-set.h"
 #include "e-storage-set-view.h"
 #include "e-shell-utils.h"
@@ -313,7 +312,7 @@ add_storage_set_view (GtkWidget *dialog,
 {
 	EStorageSet *storage_set;
 	GtkWidget *storage_set_view;
-	GtkWidget *scroll_frame;
+	GtkWidget *scrolled_window;
 	GtkWidget *vbox;
 
 	storage_set = e_shell_get_storage_set (shell);
@@ -329,14 +328,14 @@ add_storage_set_view (GtkWidget *dialog,
 
 	vbox = glade_xml_get_widget (gui, "main_vbox");
 
-	scroll_frame = e_scroll_frame_new (NULL, NULL);
-	e_scroll_frame_set_policy (E_SCROLL_FRAME (scroll_frame), GTK_POLICY_AUTOMATIC, GTK_POLICY_AUTOMATIC);
-	e_scroll_frame_set_shadow_type (E_SCROLL_FRAME (scroll_frame), GTK_SHADOW_IN);
-	gtk_box_pack_start (GTK_BOX (vbox), scroll_frame, TRUE, TRUE, 0);
+	scrolled_window = gtk_scrolled_window_new (NULL, NULL);
+	gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (scrolled_window), GTK_POLICY_AUTOMATIC, GTK_POLICY_AUTOMATIC);
+	gtk_scrolled_window_set_shadow_type (GTK_SCROLLED_WINDOW (scrolled_window), GTK_SHADOW_IN);
+	gtk_box_pack_start (GTK_BOX (vbox), scrolled_window, TRUE, TRUE, 0);
 
-	gtk_container_add (GTK_CONTAINER (scroll_frame), storage_set_view);
+	gtk_container_add (GTK_CONTAINER (scrolled_window), storage_set_view);
 
-	gtk_widget_show (scroll_frame);
+	gtk_widget_show (scrolled_window);
 	gtk_widget_show (storage_set_view);
 
 	return storage_set_view;
diff --git a/shell/e-shell-folder-selection-dialog.c b/shell/e-shell-folder-selection-dialog.c
index c744f237c9..56b993ccf1 100644
--- a/shell/e-shell-folder-selection-dialog.c
+++ b/shell/e-shell-folder-selection-dialog.c
@@ -36,12 +36,12 @@
 #include <libgnome/gnome-i18n.h>
 
 #include <gal/util/e-util.h>
-#include <gal/widgets/e-scroll-frame.h>
 #include <gal/widgets/e-gui-utils.h>
 
 #include <gtk/gtksignal.h>
 #include <gtk/gtklabel.h>
 #include <gtk/gtkstock.h>
+#include <gtk/gtkscrolledwindow.h>
 
 #include <string.h>
 
@@ -384,7 +384,7 @@ e_shell_folder_selection_dialog_construct (EShellFolderSelectionDialog *folder_s
 					   gboolean allow_creation)
 {
 	EShellFolderSelectionDialogPrivate *priv;
-	GtkWidget *scroll_frame;
+	GtkWidget *scrolled_window;
 	GtkWidget *caption_label;
 	int i;
 	char *filename;
@@ -468,18 +468,18 @@ e_shell_folder_selection_dialog_construct (EShellFolderSelectionDialog *folder_s
 	if (default_uri != NULL)
 		set_default_folder (folder_selection_dialog, default_uri);
 
-	scroll_frame = e_scroll_frame_new (NULL, NULL);
-	e_scroll_frame_set_shadow_type (E_SCROLL_FRAME (scroll_frame), GTK_SHADOW_IN);
-	e_scroll_frame_set_policy (E_SCROLL_FRAME (scroll_frame),
-				   GTK_POLICY_AUTOMATIC, GTK_POLICY_AUTOMATIC);
+	scrolled_window = gtk_scrolled_window_new (NULL, NULL);
+	gtk_scrolled_window_set_shadow_type (GTK_SCROLLED_WINDOW (scrolled_window), GTK_SHADOW_IN);
+	gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (scrolled_window),
+					GTK_POLICY_AUTOMATIC, GTK_POLICY_AUTOMATIC);
 
-	gtk_container_add (GTK_CONTAINER (scroll_frame), priv->storage_set_view);
+	gtk_container_add (GTK_CONTAINER (scrolled_window), priv->storage_set_view);
 
 	gtk_box_pack_start (GTK_BOX (GTK_DIALOG (folder_selection_dialog)->vbox),
-			    scroll_frame, TRUE, TRUE, 2);
+			    scrolled_window, TRUE, TRUE, 2);
 
 	gtk_widget_show (priv->storage_set_view);
-	gtk_widget_show (scroll_frame);
+	gtk_widget_show (scrolled_window);
 
 	GTK_WIDGET_SET_FLAGS (priv->storage_set_view, GTK_CAN_FOCUS);
 	gtk_widget_grab_focus (priv->storage_set_view);
diff --git a/shell/e-shell-view.c b/shell/e-shell-view.c
index 0710189fc3..69e26e77ba 100644
--- a/shell/e-shell-view.c
+++ b/shell/e-shell-view.c
@@ -64,6 +64,7 @@
 #include <libgnomeui/gnome-window-icon.h>
 #include <libgnomeui/gnome-app.h>
 
+#include <gtk/gtkscrolledwindow.h>
 #include <gconf/gconf-client.h>
 
 #include <bonobo/bonobo-socket.h>
@@ -75,9 +76,7 @@
 
 #include <gal/util/e-util.h>
 #include <gal/widgets/e-gui-utils.h>
-#include <gal/widgets/e-scroll-frame.h>
 
-
 static BonoboWindowClass *parent_class = NULL;
 
 struct _View {
@@ -1108,7 +1107,7 @@ setup_storage_set_subwindow (EShellView *shell_view)
 	EShellViewPrivate *priv;
 	GtkWidget *storage_set_view;
 	GtkWidget *vbox;
-	GtkWidget *scroll_frame;
+	GtkWidget *scrolled_window;
 
 	priv = shell_view->priv;
 
@@ -1121,28 +1120,28 @@ setup_storage_set_subwindow (EShellView *shell_view)
 	g_signal_connect (storage_set_view, "folder_context_menu_popped_down",
 			  G_CALLBACK (folder_context_menu_popped_down_cb), shell_view);
 
-	scroll_frame = e_scroll_frame_new (NULL, NULL);
-	e_scroll_frame_set_policy (E_SCROLL_FRAME (scroll_frame),
-				   GTK_POLICY_AUTOMATIC,
-				   GTK_POLICY_AUTOMATIC);
-	e_scroll_frame_set_shadow_type (E_SCROLL_FRAME (scroll_frame),
-					GTK_SHADOW_IN);
+	scrolled_window = gtk_scrolled_window_new (NULL, NULL);
+	gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (scrolled_window),
+					GTK_POLICY_AUTOMATIC,
+					GTK_POLICY_AUTOMATIC);
+	gtk_scrolled_window_set_shadow_type (GTK_SCROLLED_WINDOW (scrolled_window),
+					     GTK_SHADOW_IN);
 
-	gtk_container_add (GTK_CONTAINER (scroll_frame), storage_set_view);
+	gtk_container_add (GTK_CONTAINER (scrolled_window), storage_set_view);
 
 	vbox = gtk_vbox_new (FALSE, 0);
 
 	priv->storage_set_title_bar = e_title_bar_new (_("Folders"));
 
 	gtk_box_pack_start (GTK_BOX (vbox), priv->storage_set_title_bar, FALSE, FALSE, 0);
-	gtk_box_pack_start (GTK_BOX (vbox), scroll_frame, TRUE, TRUE, 0);
+	gtk_box_pack_start (GTK_BOX (vbox), scrolled_window, TRUE, TRUE, 0);
 
 	g_signal_connect (priv->storage_set_title_bar, "button_clicked",
 			  G_CALLBACK (storage_set_view_button_clicked_cb), shell_view);
 
 	gtk_widget_show (storage_set_view);
 	gtk_widget_show (priv->storage_set_title_bar);
-	gtk_widget_show (scroll_frame);
+	gtk_widget_show (scrolled_window);
 
 	priv->storage_set_view_box = vbox;
 	priv->storage_set_view = storage_set_view;
diff --git a/shell/evolution-storage-set-view-factory.c b/shell/evolution-storage-set-view-factory.c
index 38f5a72f38..7782d4cb5e 100644
--- a/shell/evolution-storage-set-view-factory.c
+++ b/shell/evolution-storage-set-view-factory.c
@@ -30,7 +30,7 @@
 
 #include "evolution-storage-set-view-factory.h"
 
-#include <gal/widgets/e-scroll-frame.h>
+#include <gtk/gtkscrolledwindow.h>
 
 
 BonoboControl *
@@ -40,7 +40,7 @@ evolution_storage_set_view_factory_new_view (EShell *shell)
 	GtkWidget *storage_set_view;
 	BonoboControl *control;
 	EvolutionStorageSetView *storage_set_view_interface;
-	GtkWidget *scroll_frame;
+	GtkWidget *scrolled_window;
 
 	g_return_val_if_fail (shell != NULL, NULL);
 	g_return_val_if_fail (E_IS_SHELL (shell), NULL);
@@ -55,19 +55,19 @@ evolution_storage_set_view_factory_new_view (EShell *shell)
 		return NULL;
 	}
 
-	scroll_frame = e_scroll_frame_new (NULL, NULL);
-	e_scroll_frame_set_policy (E_SCROLL_FRAME (scroll_frame),
-				   GTK_POLICY_AUTOMATIC,
-				   GTK_POLICY_AUTOMATIC);
-	e_scroll_frame_set_shadow_type (E_SCROLL_FRAME (scroll_frame),
-					GTK_SHADOW_IN);
+	scrolled_window = gtk_scrolled_window_new (NULL, NULL);
+	gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (scrolled_window),
+					GTK_POLICY_AUTOMATIC,
+					GTK_POLICY_AUTOMATIC);
+	gtk_scrolled_window_set_shadow_type (GTK_SCROLLED_WINDOW (scrolled_window),
+					     GTK_SHADOW_IN);
 
-	gtk_container_add (GTK_CONTAINER (scroll_frame), storage_set_view);
+	gtk_container_add (GTK_CONTAINER (scrolled_window), storage_set_view);
 
-	gtk_widget_show (scroll_frame);
+	gtk_widget_show (scrolled_window);
 	gtk_widget_show (storage_set_view);
 
-	control = bonobo_control_new (scroll_frame);
+	control = bonobo_control_new (scrolled_window);
 	bonobo_object_add_interface (BONOBO_OBJECT (control), BONOBO_OBJECT (storage_set_view_interface));
 
 	return control;