From d127ec47856ee69466b909af12e5f1020a12cb15 Mon Sep 17 00:00:00 2001
From: Christian Persch <chpe@cvs.gnome.org>
Date: Fri, 24 Dec 2004 00:21:16 +0000
Subject: A src/ephy-home-action.c: (ephy_home_action_activate),

2004-12-24  Christian Persch  <chpe@cvs.gnome.org>

	* lib/ephy-marshal.list:
	* src/Makefile.am:
	* src/bookmarks/ephy-bookmark-action.c:
	(ephy_bookmark_action_get_type), (create_tool_item),
	(open_in_tab_activate_cb), (open_in_window_activate_cb),
	(activate_cb), (connect_proxy), (ephy_bookmark_action_class_init):
	* src/bookmarks/ephy-bookmark-action.h:
	* src/bookmarks/ephy-bookmarks-menu.c:
	(ephy_bookmarks_menu_get_type), (add_action_for_bookmark),
	(ephy_bookmarks_menu_class_init):
	* src/bookmarks/ephy-bookmarks-menu.h:
	* src/bookmarks/ephy-bookmarksbar.c: (ephy_bookmarksbar_get_type),
	(ephy_bookmarksbar_action_request):
	* src/bookmarks/ephy-favorites-menu.c:
	(ephy_favorites_menu_get_type), (ephy_favorites_menu_rebuild):
	* src/bookmarks/ephy-favorites-menu.h:
	* src/bookmarks/ephy-topic-action.c: (ephy_topic_action_get_type),
	(menu_activate_cb), (open_in_tabs_activate_cb),
	(ephy_topic_action_class_init):
	* src/bookmarks/ephy-topic-action.h:
	A src/ephy-home-action.c: (ephy_home_action_activate),
	(ephy_home_action_class_init), (ephy_home_action_get_type):
	A src/ephy-home-action.h:
	A src/ephy-link-action.c: (ephy_link_action_get_type):
	A src/ephy-link-action.h:
	A src/ephy-link.c: (ephy_link_flags_get_type),
	(ephy_link_base_init), (ephy_link_get_type), (ephy_link_open):
	A src/ephy-link.h:
	* src/ephy-location-action.c: (ephy_location_action_get_type),
	(action_activated_cb), (location_url_activate_cb), (connect_proxy),
	(disconnect_proxy), (ephy_location_action_class_init):
	* src/ephy-location-action.h:
	* src/ephy-navigation-action.c: (ephy_navigation_action_get_type),
	(activate_back_or_forward_menu_item_cb),
	(activate_up_menu_item_cb), (build_back_or_forward_menu),
	(build_up_menu):
	* src/ephy-navigation-action.h:
	* src/ephy-shell.c: (ephy_shell_new_tab):
	* src/ephy-window.c: (setup_ui_manager), (open_link_cb),
	(ephy_window_init):
	* src/toolbar.c: (toolbar_get_type), (toolbar_setup_actions):
	* src/window-commands.c:
	* src/window-commands.h:

	Consolidate link opening in one place by introducing an EphyLink interface
	which bookmarks, topics, navigation, location, home, toolbars, bookmarks menu
	and favourites menu implement, forwarding the link opening to the window.
---
 src/ephy-navigation-action.h | 17 +++++++++++------
 1 file changed, 11 insertions(+), 6 deletions(-)

(limited to 'src/ephy-navigation-action.h')

diff --git a/src/ephy-navigation-action.h b/src/ephy-navigation-action.h
index d007c986d..fe440d303 100644
--- a/src/ephy-navigation-action.h
+++ b/src/ephy-navigation-action.h
@@ -1,5 +1,6 @@
 /*
- *  Copyright (C) 2003 Marco Pesenti Gritti
+ *  Copyright (C) 2003, 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
@@ -21,7 +22,9 @@
 #ifndef EPHY_NAVIGATION_ACTION_H
 #define EPHY_NAVIGATION_ACTION_H
 
-#include <gtk/gtkaction.h>
+#include "ephy-link-action.h"
+
+G_BEGIN_DECLS
 
 #define EPHY_TYPE_NAVIGATION_ACTION            (ephy_navigation_action_get_type ())
 #define EPHY_NAVIGATION_ACTION(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), EPHY_TYPE_NAVIGATION_ACTION, EphyNavigationAction))
@@ -31,8 +34,8 @@
 #define EPHY_NAVIGATION_ACTION_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS((obj), EPHY_TYPE_NAVIGATION_ACTION, EphyNavigationActionClass))
 
 typedef struct _EphyNavigationAction		EphyNavigationAction;
-typedef struct _EphyNavigationActionClass	EphyNavigationActionClass;
 typedef struct _EphyNavigationActionPrivate	EphyNavigationActionPrivate;
+typedef struct _EphyNavigationActionClass	EphyNavigationActionClass;
 
 typedef enum
 {
@@ -43,7 +46,7 @@ typedef enum
 
 struct _EphyNavigationAction
 {
-	GtkAction parent;
+	EphyLinkAction parent;
 	
 	/*< private >*/
 	EphyNavigationActionPrivate *priv;
@@ -51,9 +54,11 @@ struct _EphyNavigationAction
 
 struct _EphyNavigationActionClass
 {
-	GtkActionClass parent_class;
+	EphyLinkActionClass parent_class;
 };
 
-GType    ephy_navigation_action_get_type   (void);
+GType ephy_navigation_action_get_type (void);
+
+G_END_DECLS
 
 #endif
-- 
cgit v1.2.3