GNOME.org
 

[epiphany] Revert "Updated FSF's address"

commit 5c05542d12d51b4884b2840382bb9dffce9f82ea
Author: Claudio Saavedra <csaavedra igalia com>
Date:   Fri Jan 31 16:59:40 2014 +0200

    Revert "Updated FSF's address"
    
    This reverts commit d1a500a86767210ebae8150f0713c602141e2477.

 embed/ephy-embed.c                  |   97 ++++++++++++++++++++++++++++++++++-
 embed/uri-tester.c                  |    3 +-
 embed/uri-tester.h                  |    3 +-
 lib/egg/eggtreemultidnd.c           |    4 +-
 lib/egg/eggtreemultidnd.h           |    4 +-
 lib/widgets/nautilus-floating-bar.c |    4 +-
 lib/widgets/nautilus-floating-bar.h |    4 +-
 7 files changed, 112 insertions(+), 7 deletions(-)
---
diff --git a/embed/ephy-embed.c b/embed/ephy-embed.c
index 1b5b638..34bb0c6 100644
--- a/embed/ephy-embed.c
+++ b/embed/ephy-embed.c
@@ -18,7 +18,102 @@
  *  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, see <http://www.gnu.org/licenses/>.
+ *  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.
  *
  * 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 aa0125b..ab701c4 100644
--- a/embed/uri-tester.c
+++ b/embed/uri-tester.c
@@ -18,7 +18,8 @@
  *  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, see <http://www.gnu.org/licenses/>.
+ *  along with this program; if not, write to the Free Software
+ *  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  */
 
 #include "config.h"
diff --git a/embed/uri-tester.h b/embed/uri-tester.h
index 0d85401..ebbd964 100644
--- a/embed/uri-tester.h
+++ b/embed/uri-tester.h
@@ -12,7 +12,8 @@
  *  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, see <http://www.gnu.org/licenses/>.
+ *  along with this program; if not, write to the Free Software
+ *  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  */
 
 #ifndef URI_TESTER_H
diff --git a/lib/egg/eggtreemultidnd.c b/lib/egg/eggtreemultidnd.c
index 0610bd7..070f5c4 100644
--- a/lib/egg/eggtreemultidnd.c
+++ b/lib/egg/eggtreemultidnd.c
@@ -12,7 +12,9 @@
  * Library General Public License for more details.
  *
  * You should have received a copy of the GNU Library General Public
- * License along with this library; if not, see <http://www.gnu.org/licenses/>.
+ * License along with this library; if not, write to the
+ * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+ * Boston, MA 02111-1307, USA.
  */
 
 #include <config.h>
diff --git a/lib/egg/eggtreemultidnd.h b/lib/egg/eggtreemultidnd.h
index 9570476..3df69fb 100644
--- a/lib/egg/eggtreemultidnd.h
+++ b/lib/egg/eggtreemultidnd.h
@@ -12,7 +12,9 @@
  * Library General Public License for more details.
  *
  * You should have received a copy of the GNU Library General Public
- * License along with this library; if not, see <http://www.gnu.org/licenses/>.
+ * License along with this library; if not, write to the
+ * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+ * Boston, MA 02111-1307, USA.
  */
 
 #ifndef __EGG_TREE_MULTI_DND_H__
diff --git a/lib/widgets/nautilus-floating-bar.c b/lib/widgets/nautilus-floating-bar.c
index d107e8c..40090f1 100644
--- a/lib/widgets/nautilus-floating-bar.c
+++ b/lib/widgets/nautilus-floating-bar.c
@@ -15,7 +15,9 @@
  * Library General Public License for more details.
  *
  * You should have received a copy of the GNU Library General Public
- * License along with this library; if not, see <http://www.gnu.org/licenses/>.
+ * License along with this library; if not, write to the
+ * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+ * Boston, MA 02111-1307, USA.
  *
  * Authors: Cosimo Cecchi <cosimoc redhat com>
  *
diff --git a/lib/widgets/nautilus-floating-bar.h b/lib/widgets/nautilus-floating-bar.h
index 59fd1ab..ba31ac5 100644
--- a/lib/widgets/nautilus-floating-bar.h
+++ b/lib/widgets/nautilus-floating-bar.h
@@ -15,7 +15,9 @@
  * Library General Public License for more details.
  *
  * You should have received a copy of the GNU Library General Public
- * License along with this library; if not, see <http://www.gnu.org/licenses/>.
+ * License along with this library; if not, write to the
+ * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+ * Boston, MA 02111-1307, USA.
  *
  * Authors: Cosimo Cecchi <cosimoc redhat com>
  *
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]