Merging bookmarksbar-separation branch.

2004-06-10  Christian Persch  <chpe@cvs.gnome.org>

	Merging bookmarksbar-separation branch.

1 files changed, 59 insertions, 55 deletions

diff --git a/src/bookmarks/ephy-bookmarks.h b/src/bookmarks/ephy-bookmarks.h
index 14b352e0a..26c83832e 100644
--- a/src/bookmarks/ephy-bookmarks.h
+++ b/src/bookmarks/ephy-bookmarks.h
@@ -1,5 +1,6 @@
 /*
- *  Copyright (C) 2000, 2001, 2002 Marco Pesenti Gritti
+ *  Copyright (C) 2000-2004 Marco Pesenti Gritti
+ *  Copyright (C) 2003, 2004 Christian Persch
  *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
@@ -24,6 +25,7 @@
 #include <glib-object.h>
 
 #include "ephy-node.h"
+#include "egg-toolbars-model.h"
 
 G_BEGIN_DECLS
 
@@ -34,103 +36,105 @@ G_BEGIN_DECLS
 #define EPHY_IS_BOOKMARKS_CLASS(k)	(G_TYPE_CHECK_CLASS_TYPE ((k), EPHY_TYPE_BOOKMARKS))
 #define EPHY_BOOKMARKS_GET_CLASS(o)	(G_TYPE_INSTANCE_GET_CLASS ((o), EPHY_TYPE_BOOKMARKS, EphyBookmarksClass))
 
-typedef struct EphyBookmarksClass EphyBookmarksClass;
-typedef struct EphyBookmarks EphyBookmarks;
-typedef struct EphyBookmarksPrivate EphyBookmarksPrivate;
+typedef struct EphyBookmarksClass	EphyBookmarksClass;
+typedef struct EphyBookmarks		EphyBookmarks;
+typedef struct EphyBookmarksPrivate	EphyBookmarksPrivate;
 
 enum
 {
-	EPHY_NODE_BMK_PROP_TITLE = 2,
-	EPHY_NODE_BMK_PROP_LOCATION = 3,
-	EPHY_NODE_BMK_PROP_KEYWORDS = 4,
-	EPHY_NODE_KEYWORD_PROP_NAME = 5,
-	EPHY_NODE_BMK_PROP_ICON = 7,
-	EPHY_NODE_KEYWORD_PROP_PRIORITY = 8
+	EPHY_NODE_BMK_PROP_TITLE	= 2,
+	EPHY_NODE_BMK_PROP_LOCATION	= 3,
+	EPHY_NODE_BMK_PROP_KEYWORDS	= 4,
+	EPHY_NODE_KEYWORD_PROP_NAME	= 5,
+	EPHY_NODE_BMK_PROP_ICON		= 7,
+	EPHY_NODE_KEYWORD_PROP_PRIORITY	= 8
 };
 
 struct EphyBookmarks
 {
-        GObject parent;
+	GObject parent;
 
 	/*< private >*/
-        EphyBookmarksPrivate *priv;
+	EphyBookmarksPrivate *priv;
 };
 
 struct EphyBookmarksClass
 {
-        GObjectClass parent_class;
+	GObjectClass parent_class;
 
-	void (* tree_changed) (EphyBookmarks *eb);
+	void	(* tree_changed)	(EphyBookmarks *eb);
 };
 
-GType		ephy_bookmarks_get_type		(void);
+GType		  ephy_bookmarks_get_type		(void);
 
-EphyBookmarks  *ephy_bookmarks_new		(void);
+EphyBookmarks    *ephy_bookmarks_new			(void);
 
-EphyNode	*ephy_bookmarks_get_from_id     (EphyBookmarks *eb,
-						 long id);
+EphyNode	 *ephy_bookmarks_get_from_id		(EphyBookmarks *eb,
+							 long id);
+
+EggToolbarsModel *ephy_bookmarks_get_toolbars_model	(EphyBookmarks *eb);
 
 /* Bookmarks */
 
-EphyNode        *ephy_bookmarks_add		(EphyBookmarks *eb,
-						 const char *title,
-						 const char *url);
+EphyNode	 *ephy_bookmarks_add			(EphyBookmarks *eb,
+							 const char *title,
+							 const char *url);
 
-EphyNode*	 ephy_bookmarks_find_bookmark   (EphyBookmarks *eb,
-						 const char *url);
+EphyNode*	  ephy_bookmarks_find_bookmark		(EphyBookmarks *eb,
+							 const char *url);
 
-void		 ephy_bookmarks_set_icon	(EphyBookmarks *eb,
-						 const char *url,
-						 const char *icon);
+void		  ephy_bookmarks_set_icon		(EphyBookmarks *eb,
+							 const char *url,
+							 const char *icon);
 
-void		 ephy_bookmarks_set_address     (EphyBookmarks *eb,
-			                         EphyNode *bookmark,
-			                         const char *address);
+void		  ephy_bookmarks_set_address    	(EphyBookmarks *eb,
+							 EphyNode *bookmark,
+							 const char *address);
 
-char		*ephy_bookmarks_solve_smart_url (EphyBookmarks *eb,
-						 const char *smart_url,
-						 const char *content);
+char		 *ephy_bookmarks_solve_smart_url	 (EphyBookmarks *eb,
+							 const char *smart_url,
+							 const char *content);
 
 /* Keywords */
 
-EphyNode       *ephy_bookmarks_add_keyword	(EphyBookmarks *eb,
-						 const char *name);
+EphyNode	 *ephy_bookmarks_add_keyword		(EphyBookmarks *eb,
+							 const char *name);
 
-EphyNode       *ephy_bookmarks_find_keyword     (EphyBookmarks *eb,
-			                         const char *name,
-						 gboolean partial_match);
+EphyNode	 *ephy_bookmarks_find_keyword		(EphyBookmarks *eb,
+							 const char *name,
+							 gboolean partial_match);
 
-void            ephy_bookmarks_remove_keyword   (EphyBookmarks *eb,
-						 EphyNode *keyword);
+void		  ephy_bookmarks_remove_keyword		(EphyBookmarks *eb,
+							 EphyNode *keyword);
 
-gboolean        ephy_bookmarks_has_keyword      (EphyBookmarks *eb,
-						 EphyNode *keyword,
-						 EphyNode *bookmark);
+gboolean	  ephy_bookmarks_has_keyword		(EphyBookmarks *eb,
+							 EphyNode *keyword,
+							 EphyNode *bookmark);
 
-void            ephy_bookmarks_set_keyword      (EphyBookmarks *eb,
-						 EphyNode *keyword,
-						 EphyNode *bookmark);
+void		  ephy_bookmarks_set_keyword		(EphyBookmarks *eb,
+							 EphyNode *keyword,
+							 EphyNode *bookmark);
 
-void            ephy_bookmarks_unset_keyword    (EphyBookmarks *eb,
-						 EphyNode *keyword,
-						 EphyNode *bookmark);
+void		  ephy_bookmarks_unset_keyword		(EphyBookmarks *eb,
+							 EphyNode *keyword,
+							 EphyNode *bookmark);
 
-char           *ephy_bookmarks_get_topic_uri    (EphyBookmarks *eb,
-			                         EphyNode *node);
+char		 *ephy_bookmarks_get_topic_uri		(EphyBookmarks *eb,
+							 EphyNode *node);
 
 /* Favorites */
 
-EphyNode       *ephy_bookmarks_get_favorites	(EphyBookmarks *eb);
+EphyNode	 *ephy_bookmarks_get_favorites		(EphyBookmarks *eb);
 
 /* Root */
 
-EphyNode       *ephy_bookmarks_get_keywords	(EphyBookmarks *eb);
+EphyNode	 *ephy_bookmarks_get_keywords		(EphyBookmarks *eb);
 
-EphyNode       *ephy_bookmarks_get_bookmarks	(EphyBookmarks *eb);
+EphyNode	 *ephy_bookmarks_get_bookmarks		(EphyBookmarks *eb);
 
-EphyNode       *ephy_bookmarks_get_not_categorized (EphyBookmarks *eb);
+EphyNode	 *ephy_bookmarks_get_not_categorized	(EphyBookmarks *eb);
 
-EphyNode       *ephy_bookmarks_get_smart_bookmarks (EphyBookmarks *eb);
+EphyNode	 *ephy_bookmarks_get_smart_bookmarks	(EphyBookmarks *eb);
 
 G_END_DECLS