Correct FSF address. Bug #409075, patch by John Millikin.RELEASE_2_18_0GNOME_2_18_BRANCHPOINT

2007-03-11  Christian Persch  <chpe@gnome.org>

	* *:

	Correct FSF address. Bug #409075, patch by John Millikin.

svn path=/trunk/; revision=6952

1 files changed, 135 insertions, 135 deletions

diff --git a/src/ephy-link.c b/src/ephy-link.c
index 54d842352..396fa0452 100644
--- a/src/ephy-link.c
+++ b/src/ephy-link.c
@@ -1,135 +1,135 @@
-/*

- *  Copyright © 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-type-builtins.h"

-#include "ephy-marshal.h"

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

-#include "ephy-gui.h"

-#include "ephy-debug.h"

-

-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_LAST,

-			 G_STRUCT_OFFSET (EphyLinkIface, open_link),

-			 ephy_signal_accumulator_object, ephy_tab_get_type,

-			 ephy_marshal_OBJECT__STRING_OBJECT_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))

-	{

-		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;

-}

-

-EphyLinkFlags

-ephy_link_flags_from_current_event (void)

-{

-	GdkEventType type = GDK_NOTHING;

-	guint state = 0, button = (guint) -1;

-	EphyLinkFlags flags = 0;

-

-	ephy_gui_get_current_event (&type, &state, &button);

-

-	if (button == 2 && (type == GDK_BUTTON_PRESS || type == GDK_BUTTON_RELEASE))

-	{

-		if (state == GDK_SHIFT_MASK)

-		{

-			flags = EPHY_LINK_NEW_WINDOW;

-		}

-		else if (state == 0 || state == GDK_CONTROL_MASK)

-		{

-			flags = EPHY_LINK_NEW_TAB;

-		}

-	}

-	else

-	{

-		if (state == (GDK_CONTROL_MASK | GDK_SHIFT_MASK))

-		{

-			flags = EPHY_LINK_NEW_WINDOW;

-		}

-		else if (state == GDK_CONTROL_MASK)

-		{

-			flags = EPHY_LINK_NEW_TAB;

-		}

-	}

-

-	return flags;

-}

+/*
+ *  Copyright © 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., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ *
+ *  $Id$
+ */
+
+#include "config.h"
+
+#include "ephy-link.h"
+
+#include "ephy-type-builtins.h"
+#include "ephy-marshal.h"
+#include "ephy-signal-accumulator.h"
+#include "ephy-gui.h"
+#include "ephy-debug.h"
+
+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_LAST,
+			 G_STRUCT_OFFSET (EphyLinkIface, open_link),
+			 ephy_signal_accumulator_object, ephy_tab_get_type,
+			 ephy_marshal_OBJECT__STRING_OBJECT_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))
+	{
+		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;
+}
+
+EphyLinkFlags
+ephy_link_flags_from_current_event (void)
+{
+	GdkEventType type = GDK_NOTHING;
+	guint state = 0, button = (guint) -1;
+	EphyLinkFlags flags = 0;
+
+	ephy_gui_get_current_event (&type, &state, &button);
+
+	if (button == 2 && (type == GDK_BUTTON_PRESS || type == GDK_BUTTON_RELEASE))
+	{
+		if (state == GDK_SHIFT_MASK)
+		{
+			flags = EPHY_LINK_NEW_WINDOW;
+		}
+		else if (state == 0 || state == GDK_CONTROL_MASK)
+		{
+			flags = EPHY_LINK_NEW_TAB;
+		}
+	}
+	else
+	{
+		if (state == (GDK_CONTROL_MASK | GDK_SHIFT_MASK))
+		{
+			flags = EPHY_LINK_NEW_WINDOW;
+		}
+		else if (state == GDK_CONTROL_MASK)
+		{
+			flags = EPHY_LINK_NEW_TAB;
+		}
+	}
+
+	return flags;
+}