5 files changed, 21 insertions, 23 deletions

diff --git a/widgets/table/e-table-scrolled.c b/widgets/table/e-table-scrolled.c
index 4731ee45bc..1786148c78 100644
--- a/widgets/table/e-table-scrolled.c
+++ b/widgets/table/e-table-scrolled.c
@@ -37,7 +37,7 @@
 
 #define COLUMN_HEADER_HEIGHT 16
 
-#define PARENT_TYPE e_scroll_frame_get_type ()
+#define PARENT_TYPE gtk_scrolled_window_get_type ()
 
 static GtkObjectClass *parent_class;
 
@@ -50,17 +50,17 @@ static void
 e_table_scrolled_init (GtkObject *object)
 {
 	ETableScrolled *ets;
-	EScrollFrame *scroll_frame;
+	GtkScrolledWindow *scrolled_window;
 
-	ets          = E_TABLE_SCROLLED (object);
-	scroll_frame = E_SCROLL_FRAME   (object);
+	ets = E_TABLE_SCROLLED (object);
+	scrolled_window = GTK_SCROLLED_WINDOW (object);
 
 	GTK_WIDGET_SET_FLAGS (ets, GTK_CAN_FOCUS);
 
 	ets->table = g_object_new (E_TABLE_TYPE, NULL);
 
-	e_scroll_frame_set_policy      (scroll_frame, GTK_POLICY_AUTOMATIC, GTK_POLICY_AUTOMATIC);
-	e_scroll_frame_set_shadow_type (scroll_frame, GTK_SHADOW_IN);
+	gtk_scrolled_window_set_policy      (scrolled_window, GTK_POLICY_AUTOMATIC, GTK_POLICY_AUTOMATIC);
+	gtk_scrolled_window_set_shadow_type (scrolled_window, GTK_SHADOW_IN);
 }
 
 static void
diff --git a/widgets/table/e-table-scrolled.h b/widgets/table/e-table-scrolled.h
index 08ba85b4a5..40de97e99e 100644
--- a/widgets/table/e-table-scrolled.h
+++ b/widgets/table/e-table-scrolled.h
@@ -24,7 +24,7 @@
 #ifndef _E_TABLE_SCROLLED_H_
 #define _E_TABLE_SCROLLED_H_
 
-#include <gal/widgets/e-scroll-frame.h>
+#include <gtk/gtkscrolledwindow.h>
 #include <gal/e-table/e-table-model.h>
 #include <gal/e-table/e-table.h>
 
@@ -37,13 +37,13 @@ G_BEGIN_DECLS
 #define E_IS_TABLE_SCROLLED_CLASS(k) (G_TYPE_CHECK_CLASS_TYPE ((k), E_TABLE_SCROLLED_TYPE))
 
 typedef struct {
-	EScrollFrame parent;
+	GtkScrolledWindow parent;
 
 	ETable *table;
 } ETableScrolled;
 
 typedef struct {
-	EScrollFrameClass parent_class;
+	GtkScrolledWindowClass parent_class;
 } ETableScrolledClass;
 
 GType           e_table_scrolled_get_type                  (void);
diff --git a/widgets/table/e-tree-scrolled.c b/widgets/table/e-tree-scrolled.c
index 72d4da70f9..a72a246b69 100644
--- a/widgets/table/e-tree-scrolled.c
+++ b/widgets/table/e-tree-scrolled.c
@@ -37,7 +37,7 @@
 
 #define COLUMN_HEADER_HEIGHT 16
 
-#define PARENT_TYPE e_scroll_frame_get_type ()
+#define PARENT_TYPE gtk_scrolled_window_get_type ()
 
 static GtkObjectClass *parent_class;
 
@@ -50,17 +50,17 @@ static void
 e_tree_scrolled_init (GtkObject *object)
 {
 	ETreeScrolled *ets;
-	EScrollFrame *scroll_frame;
+	GtkScrolledWindow *scrolled_window;
 
-	ets          = E_TREE_SCROLLED (object);
-	scroll_frame = E_SCROLL_FRAME   (object);
+	ets = E_TREE_SCROLLED (object);
+	scrolled_window = GTK_SCROLLED_WINDOW (object);
 
 	GTK_WIDGET_SET_FLAGS (ets, GTK_CAN_FOCUS);
 
 	ets->tree = g_object_new (E_TREE_TYPE, NULL);
 
-	e_scroll_frame_set_policy      (scroll_frame, GTK_POLICY_AUTOMATIC, GTK_POLICY_AUTOMATIC);
-	e_scroll_frame_set_shadow_type (scroll_frame, GTK_SHADOW_IN);
+	gtk_scrolled_window_set_policy      (scrolled_window, GTK_POLICY_AUTOMATIC, GTK_POLICY_AUTOMATIC);
+	gtk_scrolled_window_set_shadow_type (scrolled_window, GTK_SHADOW_IN);
 }
 
 static void
diff --git a/widgets/table/e-tree-scrolled.h b/widgets/table/e-tree-scrolled.h
index 5802562d14..f861b71138 100644
--- a/widgets/table/e-tree-scrolled.h
+++ b/widgets/table/e-tree-scrolled.h
@@ -24,7 +24,7 @@
 #ifndef _E_TREE_SCROLLED_H_
 #define _E_TREE_SCROLLED_H_
 
-#include <gal/widgets/e-scroll-frame.h>
+#include <gtk/gtkscrolledwindow.h>
 #include <gal/e-table/e-tree-model.h>
 #include <gal/e-table/e-tree.h>
 
@@ -37,13 +37,13 @@ G_BEGIN_DECLS
 #define E_IS_TREE_SCROLLED_CLASS(k) (G_TYPE_CHECK_CLASS_TYPE ((k), E_TREE_SCROLLED_TYPE))
 
 typedef struct {
-	EScrollFrame parent;
+	GtkScrolledWindow parent;
 
 	ETree *tree;
 } ETreeScrolled;
 
 typedef struct {
-	EScrollFrameClass parent_class;
+	GtkScrolledWindowClass parent_class;
 } ETreeScrolledClass;
 
 GType           e_tree_scrolled_get_type                  (void);
@@ -73,4 +73,3 @@ ETree         *e_tree_scrolled_get_tree                 (ETreeScrolled *ets);
 G_END_DECLS
 
 #endif /* _E_TREE_SCROLLED_H_ */
-
diff --git a/widgets/text/e-completion-view.c b/widgets/text/e-completion-view.c
index cfee21aae9..774e73cd17 100644
--- a/widgets/text/e-completion-view.c
+++ b/widgets/text/e-completion-view.c
@@ -381,7 +381,7 @@ e_completion_view_set_cursor_row (ECompletionView *cv, gint r)
 	}
 #endif
 
-	adj = e_scroll_frame_get_vadjustment (E_SCROLL_FRAME (cv->table));	
+	adj = gtk_scrolled_window_get_vadjustment (GTK_SCROLLED_WINDOW (cv->table));	
 
 	table = e_completion_view_table (cv);
 
@@ -801,9 +801,8 @@ e_completion_view_construct (ECompletionView *cv, ECompletion *completion)
 	cv->table = e_table_scrolled_new (cv->model, NULL, simple_spec, NULL);
 	g_object_unref (cv->model);
 
-	e_scroll_frame_set_shadow_type (E_SCROLL_FRAME (cv->table), GTK_SHADOW_NONE);
-	e_scroll_frame_set_scrollbar_spacing (E_SCROLL_FRAME (cv->table), 0);
-	e_scroll_frame_set_policy (E_SCROLL_FRAME (cv->table), GTK_POLICY_NEVER, GTK_POLICY_AUTOMATIC);
+	gtk_scrolled_window_set_shadow_type (GTK_SCROLLED_WINDOW (cv->table), GTK_SHADOW_NONE);
+	gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (cv->table), GTK_POLICY_NEVER, GTK_POLICY_AUTOMATIC);
 
 	gtk_container_add (GTK_CONTAINER (cv), cv->table);
 	gtk_widget_show_all (cv->table);