diff options
author | Daniel Mustieles <daniel.mustieles@gmail.com> | 2014-01-23 12:51:07 +0100 |
---|---|---|
committer | Daniel Mustieles <daniel.mustieles@gmail.com> | 2014-01-31 14:13:09 +0100 |
commit | d1a500a86767210ebae8150f0713c602141e2477 (patch) | |
tree | 0d9841713cacb661d70ed321c6f4132985651d7b /embed | |
parent | 2ac372c0ba757e15ec379fe992ae477ef53e8ebe (diff) | |
download | epiphany-d1a500a86767210ebae8150f0713c602141e2477.tar.gz |
Updated FSF's address
Diffstat (limited to 'embed')
-rw-r--r-- | embed/ephy-embed.c | 97 | ||||
-rw-r--r-- | embed/uri-tester.c | 3 | ||||
-rw-r--r-- | embed/uri-tester.h | 3 |
3 files changed, 3 insertions, 100 deletions
diff --git a/embed/ephy-embed.c b/embed/ephy-embed.c index 34bb0c6ae..1b5b63896 100644 --- a/embed/ephy-embed.c +++ b/embed/ephy-embed.c @@ -18,102 +18,7 @@ * 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-embed.h" - -#include "ephy-debug.h" -#include "ephy-embed-prefs.h" -#include "ephy-embed-shell.h" -#include "ephy-find-toolbar.h" -#include "ephy-prefs.h" -#include "ephy-settings.h" -#include "ephy-web-view.h" -#include "nautilus-floating-bar.h" - -#include <glib/gi18n.h> -#include <webkit2/webkit2.h> - -static void ephy_embed_constructed (GObject *object); -static void ephy_embed_restored_window_cb (EphyEmbedShell *shell, - EphyEmbed *embed); - -#define EPHY_EMBED_GET_PRIVATE(object)(G_TYPE_INSTANCE_GET_PRIVATE ((object), EPHY_TYPE_EMBED, EphyEmbedPrivate)) - -#define EPHY_EMBED_STATUSBAR_TAB_MESSAGE_CONTEXT_DESCRIPTION "tab_message" - -typedef struct { - gchar *text; - guint context_id; - guint message_id; -} EphyEmbedStatusbarMsg; - -struct _EphyEmbedPrivate -{ - EphyFindToolbar *find_toolbar; - GtkBox *top_widgets_vbox; - GtkPaned *paned; - WebKitWebView *web_view; - GSList *destroy_on_transition_list; - GtkWidget *floating_bar; - GtkWidget *progress; - GtkWidget *fullscreen_message_label; - char *fullscreen_string; - - WebKitURIRequest *delayed_request; - - GtkWidget *overview; - guint overview_mode : 1; - GSList *messages; - GSList *keys; - - guint seq_context_id; - guint seq_message_id; - - guint tab_message_id; - guint pop_statusbar_later_source_id; - - guint fullscreen_message_id; - - guint clear_progress_source_id; - - gulong status_handler_id; - gulong progress_update_handler_id; -}; - -enum -{ - PROP_0, - PROP_OVERVIEW_MODE, -}; - -G_DEFINE_TYPE (EphyEmbed, ephy_embed, GTK_TYPE_BOX) - -/* Portions of the following code based on GTK+. - * License block as follows: - * - * GTK - The GIMP Toolkit - * Copyright (C) 1995-1997 Peter Mattis, Spencer Kimball and Josh MacDonald - * GtkStatusbar Copyright (C) 1998 Shawn T. Amundson - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2 of the License, or (at your option) any later version. - * - * This library 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 - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the - * Free Software Foundation, Inc., 59 Temple Place - Suite 330, - * Boston, MA 02111-1307, USA. + * along with this program; if not, see <http://www.gnu.org/licenses/>. * * Modified by the GTK+ Team and others 1997-2000. See the AUTHORS * file for a list of people on the GTK+ Team. See the ChangeLog diff --git a/embed/uri-tester.c b/embed/uri-tester.c index ab701c457..aa0125b17 100644 --- a/embed/uri-tester.c +++ b/embed/uri-tester.c @@ -18,8 +18,7 @@ * 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. + * along with this program; if not, see <http://www.gnu.org/licenses/>. */ #include "config.h" diff --git a/embed/uri-tester.h b/embed/uri-tester.h index ebbd964b4..0d85401bb 100644 --- a/embed/uri-tester.h +++ b/embed/uri-tester.h @@ -12,8 +12,7 @@ * 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. + * along with this program; if not, see <http://www.gnu.org/licenses/>. */ #ifndef URI_TESTER_H |