Factor out the helper to select a treeview row by column and use it also

2004-06-21  Marco Pesenti Gritti  <marco@gnome.org>

        * lib/ephy-gui.c: (ephy_gui_help), (ephy_gui_select_row_by_key):
        * lib/widgets/ephy-node-view.c: (ephy_node_view_key_press_cb):
        * src/bookmarks/ephy-topics-selector.c: (topic_key_pressed):

        Factor out the helper to select a treeview row by column and
        use it also in the topic selector.

        * lib/ephy-gui.h:
        * src/bookmarks/ephy-bookmarks-editor.c:
        * src/bookmarks/ephy-new-bookmark.c:
        * src/ephy-history-window.c:
        * src/pdm-dialog.c:
        * src/ppview-toolbar.c:
        * src/prefs-dialog.c:
        * src/window-commands.c:
        * embed/downloader-view.c:

        Remove braindead gtk.h inclusion and deal with
        fallout headers.

8 files changed, 37 insertions, 2 deletions

diff --git a/src/bookmarks/ephy-bookmarks-editor.c b/src/bookmarks/ephy-bookmarks-editor.c
index 0cc0158a0..810bb9cb2 100644
--- a/src/bookmarks/ephy-bookmarks-editor.c
+++ b/src/bookmarks/ephy-bookmarks-editor.c
@@ -30,9 +30,17 @@
 #include <gtk/gtkhbox.h>
 #include <gtk/gtkvbox.h>
 #include <gtk/gtkactiongroup.h>
-#include <gtk/gtktoggleaction.h>
+#include <gtk/gtkcombobox.h>
 #include <gtk/gtkuimanager.h>
 #include <gtk/gtktoggleaction.h>
+#include <gtk/gtktreeselection.h>
+#include <gtk/gtktreemodelsort.h>
+#include <gtk/gtkcelllayout.h>
+#include <gtk/gtkcellrenderertext.h>
+#include <gtk/gtkradioaction.h>
+#include <gtk/gtkclipboard.h>
+#include <gtk/gtkmain.h>
+#include <gtk/gtktreemodelsort.h>
 #include <gdk/gdkkeysyms.h>
 #include <glib/gi18n.h>
 #include <libgnomeui/gnome-stock-icons.h>
diff --git a/src/bookmarks/ephy-new-bookmark.c b/src/bookmarks/ephy-new-bookmark.c
index 341fdd2c5..9723690b9 100644
--- a/src/bookmarks/ephy-new-bookmark.c
+++ b/src/bookmarks/ephy-new-bookmark.c
@@ -28,6 +28,7 @@
 #include <gtk/gtkhbox.h>
 #include <gtk/gtkvbox.h>
 #include <gtk/gtkstock.h>
+#include <gtk/gtkimage.h>
 #include <gtk/gtkscrolledwindow.h>
 #include <gtk/gtkeditable.h>
 #include <glib/gi18n.h>
diff --git a/src/bookmarks/ephy-topics-selector.c b/src/bookmarks/ephy-topics-selector.c
index 8d15a59b2..007a3a05d 100644
--- a/src/bookmarks/ephy-topics-selector.c
+++ b/src/bookmarks/ephy-topics-selector.c
@@ -25,6 +25,7 @@
 #include "ephy-topics-selector.h"
 #include "ephy-debug.h"
 #include "ephy-node-view.h"
+#include "ephy-gui.h"
 
 #include <glib/gi18n.h>
 #include <gtk/gtkliststore.h>
@@ -325,6 +326,7 @@ topic_key_pressed (GtkTreeView *tree_view,
 	GtkTreeSelection *sel = NULL;
 	GtkTreeIter iter;
 	GtkTreePath *path;
+	guint32 unicode;
 
 	switch (event->keyval)
 	{
@@ -347,6 +349,12 @@ topic_key_pressed (GtkTreeView *tree_view,
 		break;
 	}
 
+	unicode = gdk_keyval_to_unicode (event->keyval);
+	if (unicode)
+	{
+		return ephy_gui_select_row_by_key (tree_view, COL_TOPIC, unicode);
+	}
+
 	return FALSE;
 }
 
diff --git a/src/ephy-history-window.c b/src/ephy-history-window.c
index 98914f857..76da44ec3 100644
--- a/src/ephy-history-window.c
+++ b/src/ephy-history-window.c
@@ -24,6 +24,14 @@
 
 #include <gtk/gtktable.h>
 #include <gtk/gtklabel.h>
+#include <gtk/gtkradioaction.h>
+#include <gtk/gtkmain.h>
+#include <gtk/gtkalignment.h>
+#include <gtk/gtktreeselection.h>
+#include <gtk/gtkhpaned.h>
+#include <gtk/gtkbutton.h>
+#include <gtk/gtkimage.h>
+#include <gtk/gtkclipboard.h>
 #include <gtk/gtkstock.h>
 #include <gtk/gtkscrolledwindow.h>
 #include <gtk/gtkhbox.h>
diff --git a/src/pdm-dialog.c b/src/pdm-dialog.c
index 89eda8f8c..60ec410a3 100755
--- a/src/pdm-dialog.c
+++ b/src/pdm-dialog.c
@@ -34,6 +34,11 @@
 #include "ephy-debug.h"
 #include "ephy-state.h"
 
+#include <gtk/gtkbox.h>
+#include <gtk/gtkstock.h>
+#include <gtk/gtktable.h>
+#include <gtk/gtktreeselection.h>
+#include <gtk/gtkdialog.h>
 #include <gtk/gtktreeview.h>
 #include <gtk/gtkliststore.h>
 #include <gtk/gtkcellrenderertext.h>
diff --git a/src/ppview-toolbar.c b/src/ppview-toolbar.c
index f3f93f7a5..70603ea67 100755
--- a/src/ppview-toolbar.c
+++ b/src/ppview-toolbar.c
@@ -25,12 +25,12 @@
 #include "ppview-toolbar.h"
 #include "ephy-window.h"
 #include "ephy-string.h"
-#include "ephy-gui.h"
 
 #include <string.h>
 #include <glib/gi18n.h>
 #include <gtk/gtkentry.h>
 #include <gtk/gtkmenu.h>
+#include <gtk/gtkstock.h>
 #include <gtk/gtkuimanager.h>
 
 static void ppview_toolbar_class_init (PPViewToolbarClass *klass);
diff --git a/src/prefs-dialog.c b/src/prefs-dialog.c
index 1f14b3c8c..8b715692e 100644
--- a/src/prefs-dialog.c
+++ b/src/prefs-dialog.c
@@ -44,6 +44,9 @@
 #include "ephy-tree-model-sort.h"
 
 #include <glib/gi18n.h>
+#include <gtk/gtkcellrenderertext.h>
+#include <gtk/gtkcelllayout.h>
+#include <gtk/gtktreeselection.h>
 #include <gtk/gtkframe.h>
 #include <gtk/gtkhbox.h>
 #include <gtk/gtkvbox.h>
diff --git a/src/window-commands.c b/src/window-commands.c
index 41f0c481b..4a6528cda 100644
--- a/src/window-commands.c
+++ b/src/window-commands.c
@@ -53,6 +53,8 @@
 #include <libgnomeui/gnome-stock-icons.h>
 #include <libgnomevfs/gnome-vfs-mime-handlers.h>
 #include <gtk/gtkeditable.h>
+#include <gtk/gtkmain.h>
+#include <gtk/gtkicontheme.h>
 #include <gtk/gtktoggleaction.h>
 #include <libgnomeui/gnome-about.h>
 #include <glib/gi18n.h>