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.

1 files changed, 119 insertions, 0 deletions

diff --git a/src/ephy-link.c b/src/ephy-link.c
new file mode 100644
index 000000000..05e8afdb7
--- /dev/null
+++ b/src/ephy-link.c
@@ -0,0 +1,119 @@
+/*

+ *  Copyright (C) 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

+ *  the Free Software Foundation; either version 2, or (at your option)

+ *  any later version.

+ *

+ *  This program is distributed in the hope that it will be useful,

+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of

+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the

+ *  GNU General Public License for more details.

+ *

+ *  You should have received a copy of the GNU General Public License

+ *  along with this program; if not, write to the Free Software

+ *  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.

+ *

+ *  $Id$

+ */

+

+#include "config.h"

+

+#include "ephy-link.h"

+

+#include "ephy-marshal.h"

+#include "ephy-signal-accumulator.h"

+#include "ephy-debug.h"

+

+GType

+ephy_link_flags_get_type (void)

+{

+	static GType type = 0;

+

+	if (G_UNLIKELY (type == 0))

+	{

+		static const GFlagsValue values[] =

+		{

+		{ EPHY_LINK_NEW_WINDOW, "EPHY_LINK_NEW_WINDOW", "new-window" },

+		{ EPHY_LINK_NEW_TAB, "EPHY_LINK_NEW_TAB", "new-tab" },

+		{ EPHY_LINK_JUMP_TO, "EPHY_LINK_JUMP_TO", "jump-to" },

+		{ 0, NULL, NULL }

+		};

+

+		type = g_flags_register_static ("EphyLinkFlags", values);

+	}

+

+	return type;

+}

+

+enum

+{

+	OPEN_LINK,

+	LAST_SIGNAL

+};

+

+static guint signals[LAST_SIGNAL] = { 0 };

+

+static void

+ephy_link_base_init (gpointer g_class)

+{

+	static gboolean initialised = FALSE;

+

+	if (!initialised)

+	{

+		signals[OPEN_LINK] = g_signal_new

+			("open-link",

+			 EPHY_TYPE_LINK,

+			 G_SIGNAL_RUN_FIRST | G_SIGNAL_RUN_LAST,

+			 G_STRUCT_OFFSET (EphyLinkIface, open_link),

+			 ephy_signal_accumulator_object, ephy_tab_get_type,

+			 ephy_marshal_OBJECT__OBJECT_STRING_FLAGS,

+			 EPHY_TYPE_TAB,

+			 3,

+			 G_TYPE_STRING,

+			 EPHY_TYPE_TAB,

+			 EPHY_TYPE_LINK_FLAGS);

+

+		initialised = TRUE;

+	}

+}

+

+GType

+ephy_link_get_type (void)

+{

+	static GType type = 0;

+

+	if (G_UNLIKELY (type == 0))

+	{

+		static const GTypeInfo our_info =

+		{

+			sizeof (EphyLinkIface),

+			ephy_link_base_init,

+			NULL,

+		};

+

+		type = g_type_register_static (G_TYPE_INTERFACE,

+					       "EphyLink",

+					       &our_info, (GTypeFlags)0);

+	}

+

+	return type;

+}

+

+EphyTab	*

+ephy_link_open (EphyLink *link,

+		const char *address,

+		EphyTab *tab,

+		EphyLinkFlags flags)

+{

+	EphyTab *new_tab = NULL;

+

+	LOG ("ephy_link_open address \"%s\" parent-tab %p flags %u", address, tab, flags)

+

+	g_signal_emit (link, signals[OPEN_LINK], 0,

+		       address, tab, flags,

+		       &new_tab);

+

+	return new_tab;

+}