diff options
author | Xan Lopez <xan@igalia.com> | 2012-01-02 00:41:44 +0800 |
---|---|---|
committer | Xan Lopez <xan@igalia.com> | 2012-01-02 00:41:44 +0800 |
commit | ee242d6d63a2ca592e36db3f7c90beaed84663c2 (patch) | |
tree | 503b8182c77ce9155d813bd3d01c3f35c9de8619 | |
parent | d5b4f4ba1d31e368e23ddd77774e285a13908622 (diff) | |
download | gsoc2013-epiphany-ee242d6d63a2ca592e36db3f7c90beaed84663c2.tar gsoc2013-epiphany-ee242d6d63a2ca592e36db3f7c90beaed84663c2.tar.gz gsoc2013-epiphany-ee242d6d63a2ca592e36db3f7c90beaed84663c2.tar.bz2 gsoc2013-epiphany-ee242d6d63a2ca592e36db3f7c90beaed84663c2.tar.lz gsoc2013-epiphany-ee242d6d63a2ca592e36db3f7c90beaed84663c2.tar.xz gsoc2013-epiphany-ee242d6d63a2ca592e36db3f7c90beaed84663c2.tar.zst gsoc2013-epiphany-ee242d6d63a2ca592e36db3f7c90beaed84663c2.zip |
Remove EphyGoAction, it's unused
-rw-r--r-- | doc/reference/Makefile.am | 1 | ||||
-rw-r--r-- | po/POTFILES.in | 1 | ||||
-rw-r--r-- | src/Makefile.am | 2 | ||||
-rw-r--r-- | src/ephy-go-action.c | 100 | ||||
-rw-r--r-- | src/ephy-go-action.h | 51 | ||||
-rw-r--r-- | src/ephy-window.c | 1 |
6 files changed, 0 insertions, 156 deletions
diff --git a/doc/reference/Makefile.am b/doc/reference/Makefile.am index 9b5de964f..dc2a29ae4 100644 --- a/doc/reference/Makefile.am +++ b/doc/reference/Makefile.am @@ -81,7 +81,6 @@ IGNORE_HFILES = \ ephy-extension.h \ ephy-favicon-action.h \ ephy-favorites-menu.h \ - ephy-go-action.h \ ephy-history-window.h \ ephy-navigation-action.h \ ephy-notebook.h \ diff --git a/po/POTFILES.in b/po/POTFILES.in index 01eefdc57..2e248602b 100644 --- a/po/POTFILES.in +++ b/po/POTFILES.in @@ -51,7 +51,6 @@ src/ephy-encoding-dialog.c src/ephy-encoding-menu.c src/ephy-find-toolbar.c src/ephy-fullscreen-popup.c -src/ephy-go-action.c src/ephy-history-window.c src/ephy-main.c src/ephy-notebook.c diff --git a/src/Makefile.am b/src/Makefile.am index 14705e0a5..57267d8d9 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -20,7 +20,6 @@ NOINST_H_FILES = \ ephy-encoding-menu.h \ ephy-find-toolbar.h \ ephy-fullscreen-popup.h \ - ephy-go-action.h \ ephy-history-window.h \ ephy-home-action.h \ ephy-link-action.h \ @@ -57,7 +56,6 @@ libephymain_la_SOURCES = \ ephy-extensions-manager.c \ ephy-find-toolbar.c \ ephy-fullscreen-popup.c \ - ephy-go-action.c \ ephy-home-action.c \ ephy-history-window.c \ ephy-link.c \ diff --git a/src/ephy-go-action.c b/src/ephy-go-action.c deleted file mode 100644 index 5c5b52e62..000000000 --- a/src/ephy-go-action.c +++ /dev/null @@ -1,100 +0,0 @@ -/* - * Copyright © 2003 Marco Pesenti Gritti - * Copyright © 2003 David Bordoley - * - * 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. - * - */ - -#include "config.h" - -#include "ephy-go-action.h" -#include "ephy-debug.h" - -#include <glib/gi18n.h> -#include <gtk/gtk.h> - -static void ephy_go_action_class_init (EphyGoActionClass *class); - -G_DEFINE_TYPE (EphyGoAction, ephy_go_action, EPHY_TYPE_LINK_ACTION) - -static GtkWidget * -create_tool_item (GtkAction *action) -{ - GtkWidget *button; - GtkWidget *item; - - item = GTK_WIDGET (gtk_tool_item_new ()); - - button = gtk_button_new_with_label (_("Go")); - gtk_button_set_relief(GTK_BUTTON (button), GTK_RELIEF_NONE); - gtk_button_set_focus_on_click (GTK_BUTTON (button), FALSE); - - gtk_container_add (GTK_CONTAINER (item), button); - gtk_widget_show (button); - - return item; -} - -static gboolean -button_clicked_cb (GtkWidget *widget, - GdkEventButton *event, - gpointer user_data) -{ - if (event->button == 1 || event->button == 2) - gtk_action_activate (GTK_ACTION (user_data)); - - return FALSE; -} - -static void -connect_proxy (GtkAction *action, - GtkWidget *proxy) -{ - GTK_ACTION_CLASS (ephy_go_action_parent_class)->connect_proxy (action, proxy); - - if (GTK_IS_TOOL_ITEM (proxy)) - { - g_signal_connect (gtk_bin_get_child (GTK_BIN (proxy)), "button-release-event", - G_CALLBACK (button_clicked_cb), action); - } -} - -static void -disconnect_proxy (GtkAction *action, - GtkWidget *proxy) -{ - g_signal_handlers_disconnect_by_func - (proxy, G_CALLBACK (gtk_action_activate), action); - - GTK_ACTION_CLASS (ephy_go_action_parent_class)->disconnect_proxy (action, proxy); -} - -static void -ephy_go_action_class_init (EphyGoActionClass *class) -{ - GtkActionClass *action_class = GTK_ACTION_CLASS (class); - - action_class->create_tool_item = create_tool_item; - action_class->connect_proxy = connect_proxy; - action_class->disconnect_proxy = disconnect_proxy; -} - -static void -ephy_go_action_init (EphyGoAction *action) -{ - /* Empty, needed for G_DEFINE_TYPE macro */ -} - diff --git a/src/ephy-go-action.h b/src/ephy-go-action.h deleted file mode 100644 index 310f99671..000000000 --- a/src/ephy-go-action.h +++ /dev/null @@ -1,51 +0,0 @@ -/* - * Copyright © 2003 Marco Pesenti Gritti - * - * 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. - * - */ - -#if !defined (__EPHY_EPIPHANY_H_INSIDE__) && !defined (EPIPHANY_COMPILATION) -#error "Only <epiphany/epiphany.h> can be included directly." -#endif - -#ifndef EPHY_GO_ACTION_H -#define EPHY_GO_ACTION_H - -#include "ephy-link-action.h" - -#define EPHY_TYPE_GO_ACTION (ephy_go_action_get_type ()) -#define EPHY_GO_ACTION(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), EPHY_TYPE_GO_ACTION, EphyGoAction)) -#define EPHY_GO_ACTION_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), EPHY_TYPE_GO_ACTION, EphyGoActionClass)) -#define EPHY_IS_GO_ACTION(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), EPHY_TYPE_GO_ACTION)) -#define EPHY_IS_GO_ACTION_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((obj), EPHY_TYPE_GO_ACTION)) -#define EPHY_GO_ACTION_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS((obj), EPHY_TYPE_GO_ACTION, EphyGoActionClass)) - -typedef struct _EphyGoAction EphyGoAction; -typedef struct _EphyGoActionClass EphyGoActionClass; - -struct _EphyGoAction -{ - EphyLinkAction parent; -}; - -struct _EphyGoActionClass -{ - EphyLinkActionClass parent_class; -}; - -GType ephy_go_action_get_type (void); - -#endif diff --git a/src/ephy-window.c b/src/ephy-window.c index f83f4890a..488cf315c 100644 --- a/src/ephy-window.c +++ b/src/ephy-window.c @@ -40,7 +40,6 @@ #include "ephy-file-helpers.h" #include "ephy-find-toolbar.h" #include "ephy-fullscreen-popup.h" -#include "ephy-go-action.h" #include "ephy-gui.h" #include "ephy-home-action.h" #include "ephy-link.h" |