renamed from YelpViewHome.

2002-01-14  Mikael Hallendal  <micke@codefactory.se>

	* src/yelp-view-toc.[ch]: renamed from YelpViewHome.

	* src/yelp-window.c: use YelpViewTOC instead of YelpViewHome.

5 files changed, 60 insertions, 57 deletions

diff --git a/ChangeLog b/ChangeLog
index 2715378f..33aea126 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,9 @@
 2002-01-14  Mikael Hallendal  <micke@codefactory.se>
 
+	* src/yelp-view-toc.[ch]: renamed from YelpViewHome.
+
+	* src/yelp-window.c: use YelpViewTOC instead of YelpViewHome.
+
 	* AUTHORS: added Alexander Larsson
 
 	* src/yelp-window.c (yw_about_cb): added Alexander Larsson to
diff --git a/src/Makefile.am b/src/Makefile.am
index af12c4f3..efc13ebf 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -23,8 +23,8 @@ yelp_SOURCES =								\
 	yelp-scrollkeeper.c	yelp-scrollkeeper.h			\
 	yelp-util.c		yelp-util.h				\
 	yelp-view-content.c	yelp-view-content.h			\
-	yelp-view-home.c	yelp-view-home.h			\
 	yelp-view-index.c	yelp-view-index.h			\
+	yelp-view-toc.c		yelp-view-toc.h				\
 	yelp-window.c 		yelp-window.h
 
 yelp_LDADD =								\
diff --git a/src/yelp-view-home.c b/src/yelp-view-toc.c
index 97bbbecb..270ba5d6 100644
--- a/src/yelp-view-home.c
+++ b/src/yelp-view-toc.c
@@ -28,15 +28,15 @@
 #include <libgnome/gnome-i18n.h>
 #include <libgtkhtml/gtkhtml.h>
 #include <stdio.h>
-#include "yelp-view-home.h"
+#include "yelp-view-toc.h"
 
 #define d(x) x
 
-static void yvh_init               (YelpViewHome          *html);
-static void yvh_class_init         (YelpViewHomeClass     *klass);
+static void yvh_init               (YelpViewTOC          *html);
+static void yvh_class_init         (YelpViewTOCClass     *klass);
 static void yvh_link_clicked_cb    (HtmlDocument          *doc, 
 				    const gchar           *url, 
-				    YelpViewHome          *view);
+				    YelpViewTOC          *view);
 
 enum {
 	PATH_SELECTED,
@@ -45,14 +45,14 @@ enum {
 
 static gint signals[LAST_SIGNAL] = { 0 };
 
-struct _YelpViewHomePriv {
+struct _YelpViewTOCPriv {
 	GtkWidget    *html_view;
 	HtmlDocument *doc;
 	GtkTreeModel *tree_model;
 };
 
 GType
-yelp_view_home_get_type (void)
+yelp_view_toc_get_type (void)
 {
         static GType view_type = 0;
 
@@ -60,19 +60,19 @@ yelp_view_home_get_type (void)
         {
                 static const GTypeInfo view_info =
                         {
-                                sizeof (YelpViewHomeClass),
+                                sizeof (YelpViewTOCClass),
                                 NULL,
                                 NULL,
                                 (GClassInitFunc) yvh_class_init,
                                 NULL,
                                 NULL,
-                                sizeof (YelpViewHome),
+                                sizeof (YelpViewTOC),
                                 0,
                                 (GInstanceInitFunc) yvh_init,
                         };
                 
                 view_type = g_type_register_static (HTML_TYPE_VIEW,
-                                                    "YelpViewHome", 
+                                                    "YelpViewTOC", 
                                                     &view_info, 0);
         }
         
@@ -80,11 +80,11 @@ yelp_view_home_get_type (void)
 }
 
 static void
-yvh_init (YelpViewHome *view)
+yvh_init (YelpViewTOC *view)
 {
-	YelpViewHomePriv *priv;
+	YelpViewTOCPriv *priv;
 	
-	priv = g_new0 (YelpViewHomePriv, 1);
+	priv = g_new0 (YelpViewTOCPriv, 1);
 	view->priv = priv;
 	
 	priv->doc = html_document_new ();
@@ -96,13 +96,13 @@ yvh_init (YelpViewHome *view)
 }
 
 static void
-yvh_class_init (YelpViewHomeClass *klass)
+yvh_class_init (YelpViewTOCClass *klass)
 {
 	signals[PATH_SELECTED] = 
 		g_signal_new ("path_selected",
 			      G_TYPE_FROM_CLASS (klass),
 			      G_SIGNAL_RUN_LAST,
-			      G_STRUCT_OFFSET (YelpViewHomeClass,
+			      G_STRUCT_OFFSET (YelpViewTOCClass,
 					       path_selected),
 			      NULL, NULL,
 			      g_cclosure_marshal_VOID__POINTER,
@@ -111,14 +111,14 @@ yvh_class_init (YelpViewHomeClass *klass)
 }
 
 static void
-yvh_link_clicked_cb (HtmlDocument *doc, const gchar *url, YelpViewHome *view)
+yvh_link_clicked_cb (HtmlDocument *doc, const gchar *url, YelpViewTOC *view)
 {
-	YelpViewHomePriv *priv;
+	YelpViewTOCPriv *priv;
 	GtkTreePath      *path;
 	
 	g_return_if_fail (HTML_IS_DOCUMENT (doc));
 	g_return_if_fail (url != NULL);
-	g_return_if_fail (YELP_IS_VIEW_HOME (view));
+	g_return_if_fail (YELP_IS_VIEW_TOC (view));
 	
 	priv = view->priv;
 
@@ -134,13 +134,13 @@ yvh_link_clicked_cb (HtmlDocument *doc, const gchar *url, YelpViewHome *view)
 }
 
 GtkWidget *
-yelp_view_home_new (GtkTreeModel *tree_model)
+yelp_view_toc_new (GtkTreeModel *tree_model)
 {
-	YelpViewHome     *view;
-	YelpViewHomePriv *priv;
-	GtkTreeIter       iter;
+	YelpViewTOC     *view;
+	YelpViewTOCPriv *priv;
+	GtkTreeIter      iter;
 
-	view = g_object_new (YELP_TYPE_VIEW_HOME, NULL);
+	view = g_object_new (YELP_TYPE_VIEW_TOC, NULL);
 
 	priv = view->priv;
 
@@ -165,7 +165,7 @@ yelp_view_home_new (GtkTreeModel *tree_model)
 <html>
   <head>
     <title>
-      Help Home View
+      Help Toc View
     </title> 
     <style type=\"text/css\">
       A:link { color: #00008b }          /* unvisited link */
diff --git a/src/yelp-view-home.h b/src/yelp-view-toc.h
index 760e908a..d6949bdd 100644
--- a/src/yelp-view-home.h
+++ b/src/yelp-view-toc.h
@@ -20,39 +20,39 @@
  * Author: Mikael Hallendal <micke@codefactory.se>
  */
 
-#ifndef __YELP_VIEW_HOME_H__
-#define __YELP_VIEW_HOME_H__
+#ifndef __YELP_VIEW_TOC_H__
+#define __YELP_VIEW_TOC_H__
 
 #include <gtk/gtktreemodel.h>
 #include <libgtkhtml/gtkhtml.h>
 #include "yelp-section.h"
 
-#define YELP_TYPE_VIEW_HOME    (yelp_view_home_get_type ())
-#define YELP_VIEW_HOME(o)      (GTK_CHECK_CAST ((o), YELP_TYPE_VIEW_HOME, YelpViewHome))
-#define YELP_VIEW_HOME_CLASS(k)(GTK_CHECK_FOR_CAST((k), YELP_TYPE_VIEW_HOME, YelpViewHomeClass))
-#define YELP_IS_VIEW_HOME(o)       (GTK_CHECK_TYPE ((o), YELP_TYPE_VIEW_HOME))
-#define YELP_IS_VIEW_HOME_CLASS(k) (GTK_CHECK_CLASS_TYPE ((k), YELP_TYPE_VIEW_HOME))
+#define YELP_TYPE_VIEW_TOC    (yelp_view_toc_get_type ())
+#define YELP_VIEW_TOC(o)      (GTK_CHECK_CAST ((o), YELP_TYPE_VIEW_TOC, YelpViewTOC))
+#define YELP_VIEW_TOC_CLASS(k)(GTK_CHECK_FOR_CAST((k), YELP_TYPE_VIEW_TOC, YelpViewTOCClass))
+#define YELP_IS_VIEW_TOC(o)       (GTK_CHECK_TYPE ((o), YELP_TYPE_VIEW_TOC))
+#define YELP_IS_VIEW_TOC_CLASS(k) (GTK_CHECK_CLASS_TYPE ((k), YELP_TYPE_VIEW_TOC))
 
-typedef struct _YelpViewHome        YelpViewHome;
-typedef struct _YelpViewHomeClass   YelpViewHomeClass;
-typedef struct _YelpViewHomePriv    YelpViewHomePriv;
+typedef struct _YelpViewTOC        YelpViewTOC;
+typedef struct _YelpViewTOCClass   YelpViewTOCClass;
+typedef struct _YelpViewTOCPriv    YelpViewTOCPriv;
 
-struct _YelpViewHome {
+struct _YelpViewTOC {
 	HtmlView          parent;
 
-	YelpViewHomePriv *priv;
+	YelpViewTOCPriv *priv;
 };
 
-struct _YelpViewHomeClass {
+struct _YelpViewTOCClass {
 	HtmlViewClass parent_class;
 
 	/* Signals */
 	
-	void (*path_selected)   (YelpViewHome   *view,
+	void (*path_selected)   (YelpViewTOC   *view,
 				 GtkTreePath    *path);
 };
 
-GType           yelp_view_home_get_type       (void);
-GtkWidget      *yelp_view_home_new            (GtkTreeModel *tree_model);
+GType           yelp_view_toc_get_type       (void);
+GtkWidget      *yelp_view_toc_new            (GtkTreeModel *tree_model);
 
-#endif /* __YELP_VIEW_HOME__ */
+#endif /* __YELP_VIEW_TOC__ */
diff --git a/src/yelp-window.c b/src/yelp-window.c
index 2170de7c..04f0e4bc 100644
--- a/src/yelp-window.c
+++ b/src/yelp-window.c
@@ -27,7 +27,6 @@
 #include <gdk-pixbuf/gdk-pixbuf.h>
 #include <gtk/gtk.h>
 #include <bonobo/bonobo-main.h>
-/* #include <libgtkhtml/gtkhtml.h> */
 #include <libgnomevfs/gnome-vfs.h>
 #include <libgnomeui/gnome-about.h>
 #include <libgnome/gnome-i18n.h>
@@ -36,8 +35,8 @@
 #include "yelp-section.h"
 #include "yelp-history.h"
 #include "yelp-view-content.h"
-#include "yelp-view-home.h"
 #include "yelp-view-index.h"
+#include "yelp-view-toc.h"
 #include "yelp-window.h"
 
 static void yw_init		      (YelpWindow          *window);
@@ -49,7 +48,7 @@ static void yw_populate               (YelpWindow          *window);
 static void yw_section_selected_cb    (YelpWindow          *window,
 				       YelpSection         *section);
 #endif
-static void yw_home_path_selected_cb  (YelpViewHome        *view,
+static void yw_toc_path_selected_cb   (YelpViewTOC         *view,
 				       GtkTreePath         *path,
 				       YelpWindow          *window);
 static void yw_toggle_history_buttons (GtkWidget           *button,
@@ -76,7 +75,7 @@ static void yw_about_cb               (gpointer             data,
 static GtkWidget * yw_create_toolbar  (YelpWindow          *window);
 
 enum {
-	PAGE_HOME_VIEW,
+	PAGE_TOC_VIEW,
 	PAGE_CONTENT_VIEW,
 	PAGE_INDEX_VIEW
 };
@@ -93,7 +92,7 @@ struct _YelpWindowPriv {
 
 	GtkWidget      *notebook;
 
-	GtkWidget      *home_view;
+	GtkWidget      *toc_view;
 	GtkWidget      *content_view;
 	GtkWidget      *index_view;
 	
@@ -149,7 +148,7 @@ yw_init (YelpWindow *window)
         priv = g_new0 (YelpWindowPriv, 1);
         window->priv = priv;
         
-	priv->home_view    = NULL;
+	priv->toc_view    = NULL;
 	priv->content_view = NULL;
 	priv->index_view   = NULL;
 	priv->view_current = NULL;
@@ -220,10 +219,10 @@ yw_populate (YelpWindow *window)
 					GTK_POLICY_NEVER,
 					GTK_POLICY_NEVER);
 
-	gtk_container_add (GTK_CONTAINER (sw), priv->home_view);
+	gtk_container_add (GTK_CONTAINER (sw), priv->toc_view);
 
 	gtk_notebook_insert_page (GTK_NOTEBOOK (priv->notebook),
-				  sw, NULL, PAGE_HOME_VIEW);
+				  sw, NULL, PAGE_TOC_VIEW);
 	
 	gtk_notebook_insert_page (GTK_NOTEBOOK (priv->notebook),
 				  priv->content_view,
@@ -259,13 +258,13 @@ yw_section_selected_cb (YelpWindow  *window,
 #endif
 
 static void
-yw_home_path_selected_cb (YelpViewHome *view,
-			  GtkTreePath  *path,
-			  YelpWindow   *window)
+yw_toc_path_selected_cb (YelpViewTOC *view,
+			 GtkTreePath  *path,
+			 YelpWindow   *window)
 {
 	YelpWindowPriv *priv;
 	
-	g_return_if_fail (YELP_IS_VIEW_HOME (view));
+	g_return_if_fail (YELP_IS_VIEW_TOC (view));
 	g_return_if_fail (YELP_IS_WINDOW (window));
 	
 	priv = window->priv;
@@ -324,7 +323,7 @@ yw_home_button_clicked (GtkWidget *button, YelpWindow *window)
 	g_print ("Home button clicked\n");
 
 	gtk_notebook_set_current_page (GTK_NOTEBOOK (window->priv->notebook),
-				       PAGE_HOME_VIEW);
+				       PAGE_TOC_VIEW);
 }
 
 static void
@@ -479,10 +478,10 @@ yelp_window_new (GtkTreeModel *tree_model)
 
 	priv->tree_model = tree_model;
 
-	priv->home_view    = yelp_view_home_new (tree_model);
+	priv->toc_view    = yelp_view_toc_new (tree_model);
 
-	g_signal_connect (priv->home_view, "path_selected",
-			  G_CALLBACK (yw_home_path_selected_cb),
+	g_signal_connect (priv->toc_view, "path_selected",
+			  G_CALLBACK (yw_toc_path_selected_cb),
 			  window);
 
 	priv->content_view = yelp_view_content_new (tree_model);