Merge lp:~noskcaj/ubuntu/wily/epiphany-browser/merge2 into lp:ubuntu/wily/epiphany-browser

[Jackson Doak]

Merge from debian

[Robert Ancell (robert-ancell)]

This already seems to have been done.

=== added directory '.pc/00_epiphany-browser.patch'
=== removed directory '.pc/00_epiphany-browser.patch'
=== added file '.pc/00_epiphany-browser.patch/.timestamp'
=== added file '.pc/00_epiphany-browser.patch/configure.ac'
--- .pc/00_epiphany-browser.patch/configure.ac	1970-01-01 00:00:00 +0000
+++ .pc/00_epiphany-browser.patch/configure.ac	2015-07-11 21:08:34 +0000
@@ -0,0 +1,261 @@
+# Copyright © 2000-2004 Marco Pesenti Gritti
+# Copyright © 2003, 2004, 2005, 2006, 2007 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 of the License, 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
+
+m4_define([epiphany_version_major],[3])
+m4_define([epiphany_version_minor],[16])
+m4_define([epiphany_version_micro],[3])
+m4_define([epiphany_version],[epiphany_version_major.epiphany_version_minor.epiphany_version_micro])
+
+AC_INIT([GNOME Web Browser],[epiphany_version],[http://bugzilla.gnome.org/enter_bug.cgi?product=epiphany],[epiphany])
+
+AC_PREREQ([2.59])
+
+AC_CONFIG_MACRO_DIR([m4])
+AC_CONFIG_HEADERS([config.h])
+AC_CONFIG_SRCDIR([configure.ac])
+
+AC_SUBST([EPIPHANY_MAJOR],[epiphany_version_major.epiphany_version_minor])
+
+# for EPHY_CHECK_VERSION
+AC_SUBST([EPIPHANY_MAJOR_VERSION], [epiphany_version_major])
+AC_SUBST([EPIPHANY_MINOR_VERSION], [epiphany_version_minor])
+AC_SUBST([EPIPHANY_MICRO_VERSION], [epiphany_version_micro])
+
+AM_INIT_AUTOMAKE([1.11 foreign dist-xz no-dist-gzip tar-ustar])
+
+# Use AM_SILENT_RULES if present
+m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])])
+
+AM_MAINTAINER_MODE([enable])
+
+# Initialize libtool
+LT_PREREQ(2.2)
+LT_INIT([dlopen disable-static])
+
+AC_PROG_CC
+
+AC_PATH_PROG([GLIB_GENMARSHAL], [glib-genmarshal])
+AC_PATH_PROG([GLIB_MKENUMS],[glib-mkenums])
+
+IT_PROG_INTLTOOL([0.50.0])
+
+GLIB_GSETTINGS
+
+PKG_PROG_PKG_CONFIG
+
+GNOME_DEBUG_CHECK
+GNOME_COMPILE_WARNINGS([maximum])
+GNOME_MAINTAINER_MODE_DEFINES
+
+GNOME_CODE_COVERAGE
+
+WARN_CFLAGS="$WARN_CFLAGS -Wdeclaration-after-statement -Wno-deprecated-declarations -Wno-missing-prototypes"
+
+GLIB_REQUIRED=2.38.0
+GTK_REQUIRED=3.13.0
+LIBXML_REQUIRED=2.6.12
+LIBXSLT_REQUIRED=1.1.7
+WEBKIT_GTK_REQUIRED=2.7.4
+LIBSOUP_REQUIRED=2.48.0
+GNOME_DESKTOP_REQUIRED=2.91.2
+LIBSECRET_REQUIRED=0.14
+GSETTINGS_DESKTOP_SCHEMAS_REQUIRED=0.0.1
+LIBNOTIFY_REQUIRED=0.5.1
+GCR_REQUIRED=3.5.5
+AVAHI_REQUIRED=0.6.22
+
+# Tests
+
+AC_MSG_CHECKING([whether to build tests])
+AC_ARG_ENABLE([tests],
+	AS_HELP_STRING([--enable-tests],[Whether to build tests (default: yes)]),
+	[], [enable_tests=yes])
+AC_MSG_RESULT([$enable_tests])
+
+AM_CONDITIONAL([ENABLE_TESTS],[test "$enable_tests" = "yes"])
+
+PKG_CHECK_MODULES([DEPENDENCIES], [
+		  glib-2.0 >= $GLIB_REQUIRED
+		  gthread-2.0
+		  gio-unix-2.0 >= $GLIB_REQUIRED
+		  gtk+-3.0 >= $GTK_REQUIRED
+		  gtk+-unix-print-3.0 >= $GTK_REQUIRED
+		  x11
+		  libwnck-3.0
+		  libxml-2.0 >= $LIBXML_REQUIRED
+		  libxslt >= $LIBXSLT_REQUIRED
+		  webkit2gtk-4.0 >= $WEBKIT_GTK_REQUIRED
+		  libsoup-2.4 >= $LIBSOUP_REQUIRED
+		  libsecret-1 >= $LIBSECRET_REQUIRED
+		  gnome-desktop-3.0 >= $GNOME_DESKTOP_REQUIRED
+		  gsettings-desktop-schemas >= $GSETTINGS_DESKTOP_SCHEMAS_REQUIRED
+		  libnotify >= $LIBNOTIFY_REQUIRED
+		  sqlite3
+		  gcr-3 >= $GCR_REQUIRED
+		  avahi-gobject >= $AVAHI_REQUIRED
+		  avahi-client >= $AVAHI_REQUIRED
+		  ])
+
+PKG_CHECK_MODULES(WEB_EXTENSION, [
+                  webkit2gtk-web-extension-4.0 >= $WEBKIT_GTK_REQUIRED
+                  libsecret-1 >= $LIBSECRET_REQUIRED
+                  ])
+AC_SUBST(WEB_EXTENSION_CFLAGS)
+AC_SUBST(WEB_EXTENSION_LIBS)
+
+# ******************
+# Portability checks
+# ******************
+
+AC_CHECK_FUNCS([localtime_r memchr memmove memset mkdir mkdtemp realpath sqrt strchr strcspn strdup strerror strrchr strtol strtoul strstr])
+
+# for backtrace()
+AC_CHECK_HEADERS([execinfo.h fcntl.h])
+AC_SEARCH_LIBS([backtrace], [c execinfo])
+AC_C_INLINE
+AC_FUNC_MKTIME
+AC_FUNC_STRTOD
+AC_TYPE_SIZE_T
+
+# ***************
+# Multimedia keys
+# ***************
+
+AC_CHECK_HEADERS([X11/XF86keysym.h])
+
+# ***
+# NSS
+# ***
+
+AC_MSG_CHECKING([whether NSS support is requested])
+AC_ARG_ENABLE([nss],
+        [AS_HELP_STRING([--enable-nss], [Enable NSS support (default: enabled)])],
+        [], [enable_nss=yes])
+AC_MSG_RESULT([$enable_nss])
+
+if test "$enable_nss" = "yes"; then
+   PKG_CHECK_MODULES([NSS], [nss])
+
+   AC_DEFINE([ENABLE_NSS], [1], [Define to compile with NSS support])
+fi
+
+AM_CONDITIONAL([ENABLE_NSS],[test "$enable_nss" = "yes"])
+
+# *******************************
+# Internationalization
+# ******************************* 
+
+ISO_CODES_REQUIRED=0.35
+
+PKG_CHECK_EXISTS([iso-codes >= $ISO_CODES_REQUIRED],
+	[have_iso_codes=yes],[have_iso_codes=no])
+
+if test "$have_iso_codes" = "yes"; then
+	AC_MSG_CHECKING([whether iso-codes has iso-639 and iso-3166 domains])
+	if $PKG_CONFIG --variable=domains iso-codes | grep -q 639 && \
+	   $PKG_CONFIG --variable=domains iso-codes | grep -q 3166 ; then
+		result=yes
+	else
+		result=no
+		have_iso_codes=no
+	fi
+	AC_MSG_RESULT([$result])
+fi
+
+if test "$have_iso_codes" = "yes"; then
+	AC_DEFINE_UNQUOTED([ISO_CODES_PREFIX],["`$PKG_CONFIG --variable=prefix iso-codes`"],[ISO codes prefix])
+	AC_DEFINE([HAVE_ISO_CODES],[1],[Define if you have the iso-codes package])
+else
+	AC_MSG_ERROR([iso-codes is required])
+fi
+
+GETTEXT_PACKAGE=epiphany
+AC_SUBST([GETTEXT_PACKAGE])
+AC_DEFINE_UNQUOTED([GETTEXT_PACKAGE],["$GETTEXT_PACKAGE"],[Gettext package])
+AM_GLIB_GNU_GETTEXT
+
+# *******************************
+# User help
+# *******************************
+
+YELP_HELP_INIT
+
+# ****************
+# Distributor name
+# ****************
+
+AC_ARG_WITH([distributor-name],
+  AS_HELP_STRING([--with-distributor-name=name],[Set the distributor name]),
+  [LSB_DISTRIBUTOR="$withval"])
+
+if test -z "$LSB_DISTRIBUTOR"; then
+	AC_CHECK_PROGS([LSB_RELEASE], [lsb_release],)
+	if test -n "$LSB_RELEASE"; then
+		# Fallback on lsb_release if available
+		LSB_DISTRIBUTOR=$($LSB_RELEASE -i -s)
+	else
+		# Fallback on the product name
+		LSB_DISTRIBUTOR="Epiphany"
+	fi
+fi
+
+AC_DEFINE_UNQUOTED([LSB_DISTRIBUTOR],["$LSB_DISTRIBUTOR"],[Distributor name])
+
+# ************
+# Output files
+# ************
+
+AC_DEFINE([EPIPHANY_COMPILATION],[1],[Compiling epiphany])
+
+AC_CONFIG_FILES([
+Makefile
+data/Makefile
+data/epiphany.desktop.in
+data/pages/Makefile
+doc/Makefile
+help/Makefile
+lib/Makefile
+lib/egg/Makefile
+lib/history/Makefile
+lib/widgets/Makefile
+embed/Makefile
+embed/web-extension/Makefile
+src/Makefile
+src/bookmarks/Makefile
+po/Makefile.in
+tests/Makefile
+tests/data/Makefile
+],
+[])
+
+AC_OUTPUT
+
+# *************************************
+# *************************************
+
+echo "
+Epiphany was configured with the following options:
+        
+	Source code location	   : $srcdir
+	Compiler		   : $CC
+	Prefix			   : $prefix
+	Extra debugging support	   : $enable_debug
+	Build tests		   : $enable_tests
+	Code coverage		   : $enable_code_coverage
+
+	NSS support		   : $enable_nss
+"
 
=== removed file '.pc/00_epiphany-browser.patch/configure.ac'
--- .pc/00_epiphany-browser.patch/configure.ac	2015-06-25 06:50:45 +0000
+++ .pc/00_epiphany-browser.patch/configure.ac	1970-01-01 00:00:00 +0000
@@ -1,261 +0,0 @@
-# Copyright © 2000-2004 Marco Pesenti Gritti
-# Copyright © 2003, 2004, 2005, 2006, 2007 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 of the License, 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
-
-m4_define([epiphany_version_major],[3])
-m4_define([epiphany_version_minor],[16])
-m4_define([epiphany_version_micro],[2])
-m4_define([epiphany_version],[epiphany_version_major.epiphany_version_minor.epiphany_version_micro])
-
-AC_INIT([GNOME Web Browser],[epiphany_version],[http://bugzilla.gnome.org/enter_bug.cgi?product=epiphany],[epiphany])
-
-AC_PREREQ([2.59])
-
-AC_CONFIG_MACRO_DIR([m4])
-AC_CONFIG_HEADERS([config.h])
-AC_CONFIG_SRCDIR([configure.ac])
-
-AC_SUBST([EPIPHANY_MAJOR],[epiphany_version_major.epiphany_version_minor])
-
-# for EPHY_CHECK_VERSION
-AC_SUBST([EPIPHANY_MAJOR_VERSION], [epiphany_version_major])
-AC_SUBST([EPIPHANY_MINOR_VERSION], [epiphany_version_minor])
-AC_SUBST([EPIPHANY_MICRO_VERSION], [epiphany_version_micro])
-
-AM_INIT_AUTOMAKE([1.11 foreign dist-xz no-dist-gzip tar-ustar])
-
-# Use AM_SILENT_RULES if present
-m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])])
-
-AM_MAINTAINER_MODE([enable])
-
-# Initialize libtool
-LT_PREREQ(2.2)
-LT_INIT([dlopen disable-static])
-
-AC_PROG_CC
-
-AC_PATH_PROG([GLIB_GENMARSHAL], [glib-genmarshal])
-AC_PATH_PROG([GLIB_MKENUMS],[glib-mkenums])
-
-IT_PROG_INTLTOOL([0.50.0])
-
-GLIB_GSETTINGS
-
-PKG_PROG_PKG_CONFIG
-
-GNOME_DEBUG_CHECK
-GNOME_COMPILE_WARNINGS([maximum])
-GNOME_MAINTAINER_MODE_DEFINES
-
-GNOME_CODE_COVERAGE
-
-WARN_CFLAGS="$WARN_CFLAGS -Wdeclaration-after-statement -Wno-deprecated-declarations -Wno-missing-prototypes"
-
-GLIB_REQUIRED=2.38.0
-GTK_REQUIRED=3.13.0
-LIBXML_REQUIRED=2.6.12
-LIBXSLT_REQUIRED=1.1.7
-WEBKIT_GTK_REQUIRED=2.7.4
-LIBSOUP_REQUIRED=2.48.0
-GNOME_DESKTOP_REQUIRED=2.91.2
-LIBSECRET_REQUIRED=0.14
-GSETTINGS_DESKTOP_SCHEMAS_REQUIRED=0.0.1
-LIBNOTIFY_REQUIRED=0.5.1
-GCR_REQUIRED=3.5.5
-AVAHI_REQUIRED=0.6.22
-
-# Tests
-
-AC_MSG_CHECKING([whether to build tests])
-AC_ARG_ENABLE([tests],
-	AS_HELP_STRING([--enable-tests],[Whether to build tests (default: yes)]),
-	[], [enable_tests=yes])
-AC_MSG_RESULT([$enable_tests])
-
-AM_CONDITIONAL([ENABLE_TESTS],[test "$enable_tests" = "yes"])
-
-PKG_CHECK_MODULES([DEPENDENCIES], [
-		  glib-2.0 >= $GLIB_REQUIRED
-		  gthread-2.0
-		  gio-unix-2.0 >= $GLIB_REQUIRED
-		  gtk+-3.0 >= $GTK_REQUIRED
-		  gtk+-unix-print-3.0 >= $GTK_REQUIRED
-		  x11
-		  libwnck-3.0
-		  libxml-2.0 >= $LIBXML_REQUIRED
-		  libxslt >= $LIBXSLT_REQUIRED
-		  webkit2gtk-4.0 >= $WEBKIT_GTK_REQUIRED
-		  libsoup-2.4 >= $LIBSOUP_REQUIRED
-		  libsecret-1 >= $LIBSECRET_REQUIRED
-		  gnome-desktop-3.0 >= $GNOME_DESKTOP_REQUIRED
-		  gsettings-desktop-schemas >= $GSETTINGS_DESKTOP_SCHEMAS_REQUIRED
-		  libnotify >= $LIBNOTIFY_REQUIRED
-		  sqlite3
-		  gcr-3 >= $GCR_REQUIRED
-		  avahi-gobject >= $AVAHI_REQUIRED
-		  avahi-client >= $AVAHI_REQUIRED
-		  ])
-
-PKG_CHECK_MODULES(WEB_EXTENSION, [
-                  webkit2gtk-web-extension-4.0 >= $WEBKIT_GTK_REQUIRED
-                  libsecret-1 >= $LIBSECRET_REQUIRED
-                  ])
-AC_SUBST(WEB_EXTENSION_CFLAGS)
-AC_SUBST(WEB_EXTENSION_LIBS)
-
-# ******************
-# Portability checks
-# ******************
-
-AC_CHECK_FUNCS([localtime_r memchr memmove memset mkdir mkdtemp realpath sqrt strchr strcspn strdup strerror strrchr strtol strtoul strstr])
-
-# for backtrace()
-AC_CHECK_HEADERS([execinfo.h fcntl.h])
-AC_SEARCH_LIBS([backtrace], [c execinfo])
-AC_C_INLINE
-AC_FUNC_MKTIME
-AC_FUNC_STRTOD
-AC_TYPE_SIZE_T
-
-# ***************
-# Multimedia keys
-# ***************
-
-AC_CHECK_HEADERS([X11/XF86keysym.h])
-
-# ***
-# NSS
-# ***
-
-AC_MSG_CHECKING([whether NSS support is requested])
-AC_ARG_ENABLE([nss],
-        [AS_HELP_STRING([--enable-nss], [Enable NSS support (default: enabled)])],
-        [], [enable_nss=yes])
-AC_MSG_RESULT([$enable_nss])
-
-if test "$enable_nss" = "yes"; then
-   PKG_CHECK_MODULES([NSS], [nss])
-
-   AC_DEFINE([ENABLE_NSS], [1], [Define to compile with NSS support])
-fi
-
-AM_CONDITIONAL([ENABLE_NSS],[test "$enable_nss" = "yes"])
-
-# *******************************
-# Internationalization
-# ******************************* 
-
-ISO_CODES_REQUIRED=0.35
-
-PKG_CHECK_EXISTS([iso-codes >= $ISO_CODES_REQUIRED],
-	[have_iso_codes=yes],[have_iso_codes=no])
-
-if test "$have_iso_codes" = "yes"; then
-	AC_MSG_CHECKING([whether iso-codes has iso-639 and iso-3166 domains])
-	if $PKG_CONFIG --variable=domains iso-codes | grep -q 639 && \
-	   $PKG_CONFIG --variable=domains iso-codes | grep -q 3166 ; then
-		result=yes
-	else
-		result=no
-		have_iso_codes=no
-	fi
-	AC_MSG_RESULT([$result])
-fi
-
-if test "$have_iso_codes" = "yes"; then
-	AC_DEFINE_UNQUOTED([ISO_CODES_PREFIX],["`$PKG_CONFIG --variable=prefix iso-codes`"],[ISO codes prefix])
-	AC_DEFINE([HAVE_ISO_CODES],[1],[Define if you have the iso-codes package])
-else
-	AC_MSG_ERROR([iso-codes is required])
-fi
-
-GETTEXT_PACKAGE=epiphany
-AC_SUBST([GETTEXT_PACKAGE])
-AC_DEFINE_UNQUOTED([GETTEXT_PACKAGE],["$GETTEXT_PACKAGE"],[Gettext package])
-AM_GLIB_GNU_GETTEXT
-
-# *******************************
-# User help
-# *******************************
-
-YELP_HELP_INIT
-
-# ****************
-# Distributor name
-# ****************
-
-AC_ARG_WITH([distributor-name],
-  AS_HELP_STRING([--with-distributor-name=name],[Set the distributor name]),
-  [LSB_DISTRIBUTOR="$withval"])
-
-if test -z "$LSB_DISTRIBUTOR"; then
-	AC_CHECK_PROGS([LSB_RELEASE], [lsb_release],)
-	if test -n "$LSB_RELEASE"; then
-		# Fallback on lsb_release if available
-		LSB_DISTRIBUTOR=$($LSB_RELEASE -i -s)
-	else
-		# Fallback on the product name
-		LSB_DISTRIBUTOR="Epiphany"
-	fi
-fi
-
-AC_DEFINE_UNQUOTED([LSB_DISTRIBUTOR],["$LSB_DISTRIBUTOR"],[Distributor name])
-
-# ************
-# Output files
-# ************
-
-AC_DEFINE([EPIPHANY_COMPILATION],[1],[Compiling epiphany])
-
-AC_CONFIG_FILES([
-Makefile
-data/Makefile
-data/epiphany.desktop.in
-data/pages/Makefile
-doc/Makefile
-help/Makefile
-lib/Makefile
-lib/egg/Makefile
-lib/history/Makefile
-lib/widgets/Makefile
-embed/Makefile
-embed/web-extension/Makefile
-src/Makefile
-src/bookmarks/Makefile
-po/Makefile.in
-tests/Makefile
-tests/data/Makefile
-],
-[])
-
-AC_OUTPUT
-
-# *************************************
-# *************************************
-
-echo "
-Epiphany was configured with the following options:
-        
-	Source code location	   : $srcdir
-	Compiler		   : $CC
-	Prefix			   : $prefix
-	Extra debugging support	   : $enable_debug
-	Build tests		   : $enable_tests
-	Code coverage		   : $enable_code_coverage
-
-	NSS support		   : $enable_nss
-"
 
=== added directory '.pc/07_bookmarks.patch'
=== removed directory '.pc/07_bookmarks.patch'
=== added file '.pc/07_bookmarks.patch/.timestamp'
=== added directory '.pc/07_bookmarks.patch/data'
=== removed directory '.pc/07_bookmarks.patch/data'
=== added file '.pc/07_bookmarks.patch/data/default-bookmarks.rdf.in'
--- .pc/07_bookmarks.patch/data/default-bookmarks.rdf.in	1970-01-01 00:00:00 +0000
+++ .pc/07_bookmarks.patch/data/default-bookmarks.rdf.in	2015-07-11 21:08:34 +0000
@@ -0,0 +1,37 @@
+<?xml version="1.0"?>
+<rdf:RDF xmlns="http://purl.org/rss/1.0/" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:ephy="http://gnome.org/ns/epiphany#" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#">
+  <channel rdf:about="file://@pkgdatadir@/default-bookmarks.rdf">
+    <title>Web bookmarks</title>
+    <link>https://wiki.gnome.org/Apps/Web</link>
+    <items>
+      <rdf:Seq>
+        <rdf:li rdf:resource="https://duckduckgo.com"/>
+      </rdf:Seq>
+    </items>
+  </channel>
+  <item rdf:about="https://duckduckgo.com">
+    <_title>Search the web</_title>
+    <!-- Translators: you can use the regions listed in
+         https://duckduckgo.com/params to boost a particular region
+         associated with your language. For instance, for translators
+         to Finnish, it might make sense to add kl=fi-fi to the search
+         URL in order to boost results from Finland. Additionally, the
+         'kad' parameter can be used to specify the locale in which
+         duckduckgo must be translated. So, for a Finnish localized
+         version of duckduckgo that will render results tailored for
+         Finland, the string would be:
+         https://duckduckgo.com/?t=epiphany&amp;kl=fi-fi&amp;kad=fi_FI
+    -->
+    <_link>https://duckduckgo.com/?t=epiphany</_link>
+    <!-- Translators: you can use the regions listed in
+         https://duckduckgo.com/params to boost a particular region
+         associated with your language. For instance, for translators
+         to Finnish, it might make sense to add kl=fi-fi to the search
+         URL in order to boost results from Finland. Additionally, the
+         'kad' parameter can be used to specify the locale in which
+         duckduckgo must be translated. For such case, the search url
+         would be
+         https://duckduckgo.com/?q=%s&amp;t=epiphany&amp;kl=fi-fi&amp;kad=fi_FI -->
+    <_ephy:smartlink>https://duckduckgo.com/?q=%s&amp;t=epiphany</_ephy:smartlink>
+  </item>
+</rdf:RDF>
 
=== removed file '.pc/07_bookmarks.patch/data/default-bookmarks.rdf.in'
--- .pc/07_bookmarks.patch/data/default-bookmarks.rdf.in	2014-04-11 23:16:25 +0000
+++ .pc/07_bookmarks.patch/data/default-bookmarks.rdf.in	1970-01-01 00:00:00 +0000
@@ -1,37 +0,0 @@
-<?xml version="1.0"?>
-<rdf:RDF xmlns="http://purl.org/rss/1.0/" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:ephy="http://gnome.org/ns/epiphany#" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#">
-  <channel rdf:about="file://@pkgdatadir@/default-bookmarks.rdf">
-    <title>Web bookmarks</title>
-    <link>https://wiki.gnome.org/Apps/Web</link>
-    <items>
-      <rdf:Seq>
-        <rdf:li rdf:resource="https://duckduckgo.com"/>
-      </rdf:Seq>
-    </items>
-  </channel>
-  <item rdf:about="https://duckduckgo.com">
-    <_title>Search the web</_title>
-    <!-- Translators: you can use the regions listed in
-         https://duckduckgo.com/params to boost a particular region
-         associated with your language. For instance, for translators
-         to Finnish, it might make sense to add kl=fi-fi to the search
-         URL in order to boost results from Finland. Additionally, the
-         'kad' parameter can be used to specify the locale in which
-         duckduckgo must be translated. So, for a Finnish localized
-         version of duckduckgo that will render results tailored for
-         Finland, the string would be:
-         https://duckduckgo.com/?t=epiphany&amp;kl=fi-fi&amp;kad=fi_FI
-    -->
-    <_link>https://duckduckgo.com/?t=epiphany</_link>
-    <!-- Translators: you can use the regions listed in
-         https://duckduckgo.com/params to boost a particular region
-         associated with your language. For instance, for translators
-         to Finnish, it might make sense to add kl=fi-fi to the search
-         URL in order to boost results from Finland. Additionally, the
-         'kad' parameter can be used to specify the locale in which
-         duckduckgo must be translated. For such case, the search url
-         would be
-         https://duckduckgo.com/?q=%s&amp;t=epiphany&amp;kl=fi-fi&amp;kad=fi_FI -->
-    <_ephy:smartlink>https://duckduckgo.com/?q=%s&amp;t=epiphany</_ephy:smartlink>
-  </item>
-</rdf:RDF>
 
=== added directory '.pc/12_safetypes.patch'
=== removed directory '.pc/12_safetypes.patch'
=== added file '.pc/12_safetypes.patch/.timestamp'
=== added directory '.pc/12_safetypes.patch/data'
=== removed directory '.pc/12_safetypes.patch/data'
=== added file '.pc/12_safetypes.patch/data/mime-types-permissions.xml'
--- .pc/12_safetypes.patch/data/mime-types-permissions.xml	1970-01-01 00:00:00 +0000
+++ .pc/12_safetypes.patch/data/mime-types-permissions.xml	2015-07-11 21:08:34 +0000
@@ -0,0 +1,482 @@
+<mime-types-permissions>
+<safe>
+<mime-type type="application/andrew-inset"/>
+<mime-type type="application/dicom"/>
+<mime-type type="application/illustrator"/>
+<mime-type type="application/mathematica"/>
+<mime-type type="application/msexcel"/>
+<mime-type type="application/msword"/>
+<mime-type type="application/octet-stream"/>
+<mime-type type="application/oda"/>
+<mime-type type="application/ogg"/>
+<mime-type type="application/pdf"/>
+<mime-type type="application/pgp"/>
+<mime-type type="application/pgp-encrypted"/>
+<mime-type type="application/pgp-keys"/>
+<mime-type type="application/pgp-signature"/>
+<mime-type type="application/pkcs7-mime"/>
+<mime-type type="application/pkcs7-signature"/>
+<mime-type type="application/postscript"/>
+<mime-type type="application/ram"/>
+<mime-type type="application/rdf+xml"/>
+<mime-type type="application/rtf"/>
+<mime-type type="application/sdp"/>
+<mime-type type="application/smil"/>
+<mime-type type="application/stuffit"/>
+<mime-type type="application/vlc"/>
+<mime-type type="application/vnd.corel-draw"/>
+<mime-type type="application/vnd.emusic-emusic_package"/>
+<mime-type type="application/vnd.lotus-1-2-3"/>
+<mime-type type="application/vnd.ms-excel"/>
+<mime-type type="application/vnd.ms-powerpoint"/>
+<mime-type type="application/vnd.ms-word"/>
+<mime-type type="application/vnd.oasis.opendocument.text"/>
+<mime-type type="application/vnd.oasis.opendocument.text-template"/>
+<mime-type type="application/vnd.oasis.opendocument.text-web"/>
+<mime-type type="application/vnd.oasis.opendocument.text-master"/>
+<mime-type type="application/vnd.oasis.opendocument.graphics"/>
+<mime-type type="application/vnd.oasis.opendocument.graphics-template"/>
+<mime-type type="application/vnd.oasis.opendocument.presentation"/>
+<mime-type type="application/vnd.oasis.opendocument.presentation-template"/>
+<mime-type type="application/vnd.oasis.opendocument.spreadsheet"/>
+<mime-type type="application/vnd.oasis.opendocument.spreadsheet-template"/>
+<mime-type type="application/vnd.oasis.opendocument.chart"/>
+<mime-type type="application/vnd.oasis.opendocument.formula"/>
+<mime-type type="application/vnd.oasis.opendocument.database"/>
+<mime-type type="application/vnd.oasis.opendocument.image"/>
+<mime-type type="application/vnd.rn-realmedia"/>
+<mime-type type="application/vnd.stardivision.calc"/>
+<mime-type type="application/vnd.stardivision.chart"/>
+<mime-type type="application/vnd.stardivision.draw"/>
+<mime-type type="application/vnd.stardivision.impress"/>
+<mime-type type="application/vnd.stardivision.mail"/>
+<mime-type type="application/vnd.stardivision.math"/>
+<mime-type type="application/vnd.stardivision.writer"/>
+<mime-type type="application/vnd.sun.xml.calc"/>
+<mime-type type="application/vnd.sun.xml.calc.template"/>
+<mime-type type="application/vnd.sun.xml.draw"/>
+<mime-type type="application/vnd.sun.xml.draw.template"/>
+<mime-type type="application/vnd.sun.xml.impress"/>
+<mime-type type="application/vnd.sun.xml.impress.template"/>
+<mime-type type="application/vnd.sun.xml.math"/>
+<mime-type type="application/vnd.sun.xml.writer"/>
+<mime-type type="application/vnd.sun.xml.writer.global"/>
+<mime-type type="application/vnd.sun.xml.writer.template"/>
+<mime-type type="application/vnd.wordperfect"/>
+<mime-type type="application/wordperfect"/>
+<mime-type type="application/x-7z-compressed"/>
+<mime-type type="application/x-abiword"/>
+<mime-type type="application/x-amipro"/>
+<mime-type type="application/x-applix-spreadsheet"/>
+<mime-type type="application/x-applix-word"/>
+<mime-type type="application/x-archive"/>
+<mime-type type="application/x-arj"/>
+<mime-type type="application/x-asp"/>
+<mime-type type="application/x-bcpio"/>
+<mime-type type="application/x-bittorrent"/>
+<mime-type type="application/x-blender"/>
+<mime-type type="application/x-bzip"/>
+<mime-type type="application/x-bzip2"/>
+<mime-type type="application/x-bzip-compressed-tar"/>
+<mime-type type="application/x-cd-image"/>
+<mime-type type="application/x-cgi"/>
+<mime-type type="application/x-chess-pgn"/>
+<mime-type type="application/x-chm"/>
+<mime-type type="application/x-compress"/>
+<mime-type type="application/x-compressed-tar"/>
+<mime-type type="application/x-cpio"/>
+<mime-type type="application/x-cpio-compressed"/>
+<mime-type type="application/x-dbase"/>
+<mime-type type="application/x-dbm"/>
+<mime-type type="application/x-designer"/>
+<mime-type type="application/x-desktop"/>
+<mime-type type="application/x-dia-diagram"/>
+<mime-type type="application/x-dvi"/>
+<mime-type type="application/x-e-theme"/>
+<mime-type type="application/x-egon"/>
+<mime-type type="application/x-excellon"/>
+<mime-type type="application/x-flash-video"/>
+<mime-type type="application/x-font"/>
+<mime-type type="application/x-font-afm"/>
+<mime-type type="application/x-font-bdf"/>
+<mime-type type="application/x-font-dos"/>
+<mime-type type="application/x-font-framemaker"/>
+<mime-type type="application/x-font-libgrx"/>
+<mime-type type="application/x-font-linux-psf"/>
+<mime-type type="application/x-font-otf"/>
+<mime-type type="application/x-font-pcf"/>
+<mime-type type="application/x-font-speedo"/>
+<mime-type type="application/x-font-sunos-news"/>
+<mime-type type="application/x-font-tex"/>
+<mime-type type="application/x-font-tex-tfm"/>
+<mime-type type="application/x-font-ttf"/>
+<mime-type type="application/x-font-type1"/>
+<mime-type type="application/x-font-vfont"/>
+<mime-type type="application/x-frame"/>
+<mime-type type="application/x-gdbm"/>
+<mime-type type="application/x-geda-gsch2pcb-project"/>
+<mime-type type="application/x-geda-schematic"/>
+<mime-type type="application/x-geda-symbol"/>
+<mime-type type="application/x-gerber"/>
+<mime-type type="application/x-gettext-translation"/>
+<mime-type type="application/x-glade"/>
+<mime-type type="application/x-gmc-link"/>
+<mime-type type="application/x-gnome-app-info"/>
+<mime-type type="application/x-gnucash"/>
+<mime-type type="application/x-gnumeric"/>
+<mime-type type="application/x-graphite"/>
+<mime-type type="application/x-gtar"/>
+<mime-type type="application/x-gtktalog"/>
+<mime-type type="application/x-gzip"/>
+<mime-type type="application/x-gzpostscript"/>
+<mime-type type="application/x-hdf"/>
+<mime-type type="application/x-jar"/>
+<mime-type type="application/x-java"/>
+<mime-type type="application/x-java-jnlp-file"/>
+<mime-type type="application/x-jbuilder-project"/>
+<mime-type type="application/x-karbon"/>
+<mime-type type="application/x-kchart"/>
+<mime-type type="application/x-kformula"/>
+<mime-type type="application/x-killustrator"/>
+<mime-type type="application/x-kivio"/>
+<mime-type type="application/x-kontour"/>
+<mime-type type="application/x-kpovmodeler"/>
+<mime-type type="application/x-kpresenter"/>
+<mime-type type="application/x-krita"/>
+<mime-type type="application/x-kspread"/>
+<mime-type type="application/x-kspread-crypt"/>
+<mime-type type="application/x-ksysv-package"/>
+<mime-type type="application/x-kugar"/>
+<mime-type type="application/x-kword"/>
+<mime-type type="application/x-kword-crypt"/>
+<mime-type type="application/x-lha"/>
+<mime-type type="application/x-lhz"/>
+<mime-type type="application/x-linguist"/>
+<mime-type type="application/x-lyx"/>
+<mime-type type="application/x-lzop"/>
+<mime-type type="application/x-magicpoint"/>
+<mime-type type="application/x-matroska"/>
+<mime-type type="application/x-mif"/>
+<mime-type type="application/x-mozilla-bookmarks"/>
+<mime-type type="application/x-mswinurl"/>
+<mime-type type="application/x-mswrite"/>
+<mime-type type="application/x-nautilus-link"/>
+<mime-type type="application/x-netcdf"/>
+<mime-type type="application/x-netscape-bookmarks"/>
+<mime-type type="application/x-netshow-channel"/>
+<mime-type type="application/x-ogg"/>
+<mime-type type="application/x-oleo"/>
+<mime-type type="application/x-palm-database"/>
+<mime-type type="application/x-pcb-layout"/>
+<mime-type type="application/x-pcb-footprint"/>
+<mime-type type="application/x-pcb-netlist"/>
+<mime-type type="application/x-pdf"/>
+<mime-type type="application/x-php"/>
+<mime-type type="application/x-pkcs12"/>
+<mime-type type="application/x-profile"/>
+<mime-type type="application/x-pw"/>
+<mime-type type="application/x-quattropro"/>
+<mime-type type="application/x-quicktime-media-link"/>
+<mime-type type="application/x-quicktimeplayer"/>
+<mime-type type="application/x-qw"/>
+<mime-type type="application/x-rar"/>
+<mime-type type="application/x-reject"/>
+<mime-type type="application/x-rpm"/>
+<mime-type type="application/x-sc"/>
+<mime-type type="application/x-shar"/>
+<mime-type type="application/x-shared-library-la"/>
+<mime-type type="application/x-shockwave-flash"/>
+<mime-type type="application/x-siag"/>
+<mime-type type="application/x-sit"/>
+<mime-type type="application/x-slp"/>
+<mime-type type="application/x-smil"/>
+<mime-type type="application/x-stuffit"/>
+<mime-type type="application/x-sv4cpio"/>
+<mime-type type="application/x-sv4crc"/>
+<mime-type type="application/x-tar"/>
+<mime-type type="application/x-tarz"/>
+<mime-type type="application/x-tex-gf"/>
+<mime-type type="application/x-tex-pk"/>
+<mime-type type="application/x-tgif"/>
+<mime-type type="application/x-theme"/>
+<mime-type type="application/x-toutdoux"/>
+<mime-type type="application/x-trash"/>
+<mime-type type="application/x-troff"/>
+<mime-type type="application/x-troff-man"/>
+<mime-type type="application/x-troff-man-compressed"/>
+<mime-type type="application/x-tzo"/>
+<mime-type type="application/x-ustar"/>
+<mime-type type="application/x-wais-source"/>
+<mime-type type="application/x-wordperfect"/>
+<mime-type type="application/x-wpg"/>
+<mime-type type="application/x-x509-ca-cert"/>
+<mime-type type="application/x-xbel"/>
+<mime-type type="application/x-zerosize"/>
+<mime-type type="application/x-zip-compressed"/>
+<mime-type type="application/x-zoo"/>
+<mime-type type="application/xhtml+xml"/>
+<mime-type type="application/zip"/>
+<mime-type type="audio/ac3"/>
+<mime-type type="audio/AMR"/>
+<mime-type type="audio/AMR-WB"/>
+<mime-type type="audio/basic"/>
+<mime-type type="audio/midi"/>
+<mime-type type="audio/mpeg"/>
+<mime-type type="audio/mpegurl"/>
+<mime-type type="audio/ogg"/>
+<mime-type type="audio/playlist"/>
+<mime-type type="audio/prs.sid"/>
+<mime-type type="audio/vnd.rn-realaudio"/>
+<mime-type type="audio/vnd.wave"/>
+<mime-type type="audio/x-vorbis"/>
+<mime-type type="audio/wav"/>
+<mime-type type="audio/x-adpcm"/>
+<mime-type type="audio/x-aifc"/>
+<mime-type type="audio/x-aiff"/>
+<mime-type type="audio/x-aiffc"/>
+<mime-type type="audio/x-ape"/>
+<mime-type type="audio/x-flac"/>
+<mime-type type="audio/x-it"/>
+<mime-type type="audio/x-m4a"/>
+<mime-type type="audio/x-matroska"/>
+<mime-type type="audio/x-midi"/>
+<mime-type type="audio/x-mod"/>
+<mime-type type="audio/x-mp3"/>
+<mime-type type="audio/x-mp3-playlist"/>
+<mime-type type="audio/x-mpeg"/>
+<mime-type type="audio/x-mpegurl"/>
+<mime-type type="audio/x-ms-asx"/>
+<mime-type type="audio/x-ms-wax"/>
+<mime-type type="audio/x-musepack"/>
+<mime-type type="audio/x-pn-realaudio"/>
+<mime-type type="audio/x-pn-realaudio-plugin"/>
+<mime-type type="audio/x-realaudio"/>
+<mime-type type="audio/x-real-audio"/>
+<mime-type type="audio/x-riff"/>
+<mime-type type="audio/x-s3m"/>
+<mime-type type="audio/x-sbc"/>
+<mime-type type="audio/x-scpls"/>
+<mime-type type="audio/x-stm"/>
+<mime-type type="audio/x-tta"/>
+<mime-type type="audio/x-voc"/>
+<mime-type type="audio/x-wav"/>
+<mime-type type="audio/x-wavpack"/>
+<mime-type type="audio/x-xi"/>
+<mime-type type="audio/x-xm"/>
+<mime-type type="image/bmp"/>
+<mime-type type="image/cgm"/>
+<mime-type type="image/dpx"/>
+<mime-type type="image/fax-g3"/>
+<mime-type type="image/g3fax"/>
+<mime-type type="image/gif"/>
+<mime-type type="image/ief"/>
+<mime-type type="image/jpeg"/>
+<mime-type type="image/jpeg2000"/>
+<mime-type type="image/png"/>
+<mime-type type="image/rle"/>
+<mime-type type="image/svg+xml"/>
+<mime-type type="image/tiff"/>
+<mime-type type="image/vnd.djvu"/>
+<mime-type type="image/vnd.dwg"/>
+<mime-type type="image/vnd.dxf"/>
+<mime-type type="image/x-3ds"/>
+<mime-type type="image/x-applix-graphics"/>
+<mime-type type="image/x-cmu-raster"/>
+<mime-type type="image/x-compressed-xcf"/>
+<mime-type type="image/x-dcm"/>
+<mime-type type="image/x-dib"/>
+<mime-type type="image/x-djvu"/>
+<mime-type type="image/x-eps"/>
+<mime-type type="image/x-fits"/>
+<mime-type type="image/x-fpx"/>
+<mime-type type="image/x-icb"/>
+<mime-type type="image/x-ico"/>
+<mime-type type="image/x-iff"/>
+<mime-type type="image/x-ilbm"/>
+<mime-type type="image/x-jng"/>
+<mime-type type="image/x-lwo"/>
+<mime-type type="image/x-lws"/>
+<mime-type type="image/x-msod"/>
+<mime-type type="image/x-niff"/>
+<mime-type type="image/x-pcx"/>
+<mime-type type="image/x-photo-cd"/>
+<mime-type type="image/x-pict"/>
+<mime-type type="image/x-png"/>
+<mime-type type="image/x-portable-anymap"/>
+<mime-type type="image/x-portable-bitmap"/>
+<mime-type type="image/x-portable-graymap"/>
+<mime-type type="image/x-portable-pixmap"/>
+<mime-type type="image/x-psd"/>
+<mime-type type="image/x-rgb"/>
+<mime-type type="image/x-sgi"/>
+<mime-type type="image/x-sun-raster"/>
+<mime-type type="image/x-tga"/>
+<mime-type type="image/x-win-bitmap"/>
+<mime-type type="image/x-wmf"/>
+<mime-type type="image/x-xbitmap"/>
+<mime-type type="image/x-xcf"/>
+<mime-type type="image/x-xfig"/>
+<mime-type type="image/x-xpixmap"/>
+<mime-type type="image/x-xwindowdump"/>
+<mime-type type="message/delivery-status"/>
+<mime-type type="message/disposition-notification"/>
+<mime-type type="message/external-body"/>
+<mime-type type="message/news"/>
+<mime-type type="message/partial"/>
+<mime-type type="message/rfc822"/>
+<mime-type type="message/x-gnu-rmail"/>
+<mime-type type="model/vrml"/>
+<mime-type type="multipart/alternative"/>
+<mime-type type="multipart/appledouble"/>
+<mime-type type="multipart/digest"/>
+<mime-type type="multipart/encrypted"/>
+<mime-type type="multipart/mixed"/>
+<mime-type type="multipart/related"/>
+<mime-type type="multipart/report"/>
+<mime-type type="multipart/signed"/>
+<mime-type type="multipart/x-mixed-replace"/>
+<mime-type type="text/calendar"/>
+<mime-type type="text/css"/>
+<mime-type type="text/csv"/>
+<mime-type type="text/directory"/>
+<mime-type type="text/enriched"/>
+<mime-type type="text/google-video-pointer"/>
+<mime-type type="text/html"/>
+<mime-type type="text/htmlh"/>
+<mime-type type="text/mathml"/>
+<mime-type type="text/plain"/>
+<mime-type type="text/rdf"/>
+<mime-type type="text/rfc822-headers"/>
+<mime-type type="text/richtext"/>
+<mime-type type="text/rss"/>
+<mime-type type="text/rtf"/>
+<mime-type type="text/sgml"/>
+<mime-type type="text/spreadsheet"/>
+<mime-type type="text/tab-separated-values"/>
+<mime-type type="text/vnd.wap.wml"/>
+<mime-type type="text/x-adasrc"/>
+<mime-type type="text/x-authors"/>
+<mime-type type="text/x-bibtex"/>
+<mime-type type="text/x-c++hdr"/>
+<mime-type type="text/x-c++src"/>
+<mime-type type="text/x-chdr"/>
+<mime-type type="text/x-comma-separated-values"/>
+<mime-type type="text/x-copying"/>
+<mime-type type="text/x-credits"/>
+<mime-type type="text/x-csharp"/>
+<mime-type type="text/x-csrc"/>
+<mime-type type="text/x-dcl"/>
+<mime-type type="text/x-diff"/>
+<mime-type type="text/x-dsl"/>
+<mime-type type="text/x-dsrc"/>
+<mime-type type="text/x-dtd"/>
+<mime-type type="text/x-emacs-lisp"/>
+<mime-type type="text/x-fortran"/>
+<mime-type type="text/x-gettext-translation"/>
+<mime-type type="text/x-gettext-translation-template"/>
+<mime-type type="text/x-google-video-pointer"/>
+<mime-type type="text/x-gtkrc"/>
+<mime-type type="text/x-haskell"/>
+<mime-type type="text/x-idl"/>
+<mime-type type="text/x-install"/>
+<mime-type type="text/x-java"/>
+<mime-type type="text/x-ksysv-log"/>
+<mime-type type="text/x-literate-haskell"/>
+<mime-type type="text/x-log"/>
+<mime-type type="text/x-makefile"/>
+<mime-type type="text/x-moc"/>
+<mime-type type="text/x-objcsrc"/>
+<mime-type type="text/x-pascal"/>
+<mime-type type="text/x-patch"/>
+<mime-type type="text/x-python"/>
+<mime-type type="text/x-readme"/>
+<mime-type type="text/x-scheme"/>
+<mime-type type="text/x-setext"/>
+<mime-type type="text/x-speech"/>
+<mime-type type="text/x-sql"/>
+<mime-type type="text/x-tcl"/>
+<mime-type type="text/x-tex"/>
+<mime-type type="text/x-texinfo"/>
+<mime-type type="text/x-troff-me"/>
+<mime-type type="text/x-troff-mm"/>
+<mime-type type="text/x-troff-ms"/>
+<mime-type type="text/x-uil"/>
+<mime-type type="text/x-uri"/>
+<mime-type type="text/x-vcalendar"/>
+<mime-type type="text/x-vcard"/>
+<mime-type type="text/x-xmi"/>
+<mime-type type="text/x-xslfo"/>
+<mime-type type="text/x-xslt"/>
+<mime-type type="text/xmcd"/>
+<mime-type type="text/xml"/>
+<mime-type type="video/flv"/>
+<mime-type type="video/isivideo"/>
+<mime-type type="video/mp4"/>
+<mime-type type="video/mpeg"/>
+<mime-type type="video/quicktime"/>
+<mime-type type="video/vivo"/>
+<mime-type type="video/wavelet"/>
+<mime-type type="video/x-anim"/>
+<mime-type type="video/x-avi"/>
+<mime-type type="video/x-flic"/>
+<mime-type type="video/x-flv"/>
+<mime-type type="video/x-m4v"/>
+<mime-type type="video/x-matroska"/>
+<mime-type type="video/x-mng"/>
+<mime-type type="video/x-ms-asf"/>
+<mime-type type="video/x-ms-asf-plugin"/>
+<mime-type type="video/x-ms-wmv"/>
+<mime-type type="video/x-ms-wvx"/>
+<mime-type type="video/x-msvideo"/>
+<mime-type type="video/x-nsv"/>
+<mime-type type="video/x-ogm+ogg"/>
+<mime-type type="video/x-real-video"/>
+<mime-type type="video/x-theora+ogg"/>
+<mime-type type="video/x-sgi-movie"/>
+</safe>
+<unsafe>
+<mime-type type="application/mac-binhex40"/>
+<mime-type type="application/vnd.hp-hpgl"/>
+<mime-type type="application/vnd.hp-pcl"/>
+<mime-type type="application/vnd.mozilla.xul+xml"/>
+<mime-type type="application/vnd.palm"/>
+<mime-type type="application/x-arc"/>
+<mime-type type="application/x-awk"/>
+<mime-type type="application/x-class-file"/>
+<mime-type type="application/x-core"/>
+<mime-type type="application/x-csh"/>
+<mime-type type="application/x-dc-rom"/>
+<mime-type type="application/x-deb"/>
+<mime-type type="application/x-executable"/>
+<mime-type type="application/x-gameboy-rom"/>
+<mime-type type="application/x-genesis-rom"/>
+<mime-type type="application/x-ipod-firmware"/>
+<mime-type type="application/x-javascript"/>
+<mime-type type="application/x-macbinary"/>
+<mime-type type="application/x-mplayer2"/>
+<mime-type type="application/x-ms-dos-executable"/>
+<mime-type type="application/x-msx-rom"/>
+<mime-type type="application/x-n64-rom"/>
+<mime-type type="application/x-nes-rom"/>
+<mime-type type="application/x-object"/>
+<mime-type type="application/x-ole-storage"/>
+<mime-type type="application/x-par2"/>
+<mime-type type="application/x-pef-executable"/>
+<mime-type type="application/x-perl"/>
+<mime-type type="application/x-python"/>
+<mime-type type="application/x-python-bytecode"/>
+<mime-type type="application/x-ruby"/>
+<mime-type type="application/x-sharedlib"/>
+<mime-type type="application/x-shellscript"/>
+<mime-type type="application/x-sms-rom"/>
+<mime-type type="application/x-xpinstall"/>
+<mime-type type="inode/blockdevice"/>
+<mime-type type="inode/chardevice"/>
+<mime-type type="inode/directory"/>
+<mime-type type="inode/fifo"/>
+<mime-type type="inode/mount-point"/>
+<mime-type type="inode/socket"/>
+<mime-type type="inode/symlink"/>
+<mime-type type="text/x-ksh"/>
+</unsafe>
+</mime-types-permissions>
 
=== removed file '.pc/12_safetypes.patch/data/mime-types-permissions.xml'
--- .pc/12_safetypes.patch/data/mime-types-permissions.xml	2010-07-03 01:38:24 +0000
+++ .pc/12_safetypes.patch/data/mime-types-permissions.xml	1970-01-01 00:00:00 +0000
@@ -1,482 +0,0 @@
-<mime-types-permissions>
-<safe>
-<mime-type type="application/andrew-inset"/>
-<mime-type type="application/dicom"/>
-<mime-type type="application/illustrator"/>
-<mime-type type="application/mathematica"/>
-<mime-type type="application/msexcel"/>
-<mime-type type="application/msword"/>
-<mime-type type="application/octet-stream"/>
-<mime-type type="application/oda"/>
-<mime-type type="application/ogg"/>
-<mime-type type="application/pdf"/>
-<mime-type type="application/pgp"/>
-<mime-type type="application/pgp-encrypted"/>
-<mime-type type="application/pgp-keys"/>
-<mime-type type="application/pgp-signature"/>
-<mime-type type="application/pkcs7-mime"/>
-<mime-type type="application/pkcs7-signature"/>
-<mime-type type="application/postscript"/>
-<mime-type type="application/ram"/>
-<mime-type type="application/rdf+xml"/>
-<mime-type type="application/rtf"/>
-<mime-type type="application/sdp"/>
-<mime-type type="application/smil"/>
-<mime-type type="application/stuffit"/>
-<mime-type type="application/vlc"/>
-<mime-type type="application/vnd.corel-draw"/>
-<mime-type type="application/vnd.emusic-emusic_package"/>
-<mime-type type="application/vnd.lotus-1-2-3"/>
-<mime-type type="application/vnd.ms-excel"/>
-<mime-type type="application/vnd.ms-powerpoint"/>
-<mime-type type="application/vnd.ms-word"/>
-<mime-type type="application/vnd.oasis.opendocument.text"/>
-<mime-type type="application/vnd.oasis.opendocument.text-template"/>
-<mime-type type="application/vnd.oasis.opendocument.text-web"/>
-<mime-type type="application/vnd.oasis.opendocument.text-master"/>
-<mime-type type="application/vnd.oasis.opendocument.graphics"/>
-<mime-type type="application/vnd.oasis.opendocument.graphics-template"/>
-<mime-type type="application/vnd.oasis.opendocument.presentation"/>
-<mime-type type="application/vnd.oasis.opendocument.presentation-template"/>
-<mime-type type="application/vnd.oasis.opendocument.spreadsheet"/>
-<mime-type type="application/vnd.oasis.opendocument.spreadsheet-template"/>
-<mime-type type="application/vnd.oasis.opendocument.chart"/>
-<mime-type type="application/vnd.oasis.opendocument.formula"/>
-<mime-type type="application/vnd.oasis.opendocument.database"/>
-<mime-type type="application/vnd.oasis.opendocument.image"/>
-<mime-type type="application/vnd.rn-realmedia"/>
-<mime-type type="application/vnd.stardivision.calc"/>
-<mime-type type="application/vnd.stardivision.chart"/>
-<mime-type type="application/vnd.stardivision.draw"/>
-<mime-type type="application/vnd.stardivision.impress"/>
-<mime-type type="application/vnd.stardivision.mail"/>
-<mime-type type="application/vnd.stardivision.math"/>
-<mime-type type="application/vnd.stardivision.writer"/>
-<mime-type type="application/vnd.sun.xml.calc"/>
-<mime-type type="application/vnd.sun.xml.calc.template"/>
-<mime-type type="application/vnd.sun.xml.draw"/>
-<mime-type type="application/vnd.sun.xml.draw.template"/>
-<mime-type type="application/vnd.sun.xml.impress"/>
-<mime-type type="application/vnd.sun.xml.impress.template"/>
-<mime-type type="application/vnd.sun.xml.math"/>
-<mime-type type="application/vnd.sun.xml.writer"/>
-<mime-type type="application/vnd.sun.xml.writer.global"/>
-<mime-type type="application/vnd.sun.xml.writer.template"/>
-<mime-type type="application/vnd.wordperfect"/>
-<mime-type type="application/wordperfect"/>
-<mime-type type="application/x-7z-compressed"/>
-<mime-type type="application/x-abiword"/>
-<mime-type type="application/x-amipro"/>
-<mime-type type="application/x-applix-spreadsheet"/>
-<mime-type type="application/x-applix-word"/>
-<mime-type type="application/x-archive"/>
-<mime-type type="application/x-arj"/>
-<mime-type type="application/x-asp"/>
-<mime-type type="application/x-bcpio"/>
-<mime-type type="application/x-bittorrent"/>
-<mime-type type="application/x-blender"/>
-<mime-type type="application/x-bzip"/>
-<mime-type type="application/x-bzip2"/>
-<mime-type type="application/x-bzip-compressed-tar"/>
-<mime-type type="application/x-cd-image"/>
-<mime-type type="application/x-cgi"/>
-<mime-type type="application/x-chess-pgn"/>
-<mime-type type="application/x-chm"/>
-<mime-type type="application/x-compress"/>
-<mime-type type="application/x-compressed-tar"/>
-<mime-type type="application/x-cpio"/>
-<mime-type type="application/x-cpio-compressed"/>
-<mime-type type="application/x-dbase"/>
-<mime-type type="application/x-dbm"/>
-<mime-type type="application/x-designer"/>
-<mime-type type="application/x-desktop"/>
-<mime-type type="application/x-dia-diagram"/>
-<mime-type type="application/x-dvi"/>
-<mime-type type="application/x-e-theme"/>
-<mime-type type="application/x-egon"/>
-<mime-type type="application/x-excellon"/>
-<mime-type type="application/x-flash-video"/>
-<mime-type type="application/x-font"/>
-<mime-type type="application/x-font-afm"/>
-<mime-type type="application/x-font-bdf"/>
-<mime-type type="application/x-font-dos"/>
-<mime-type type="application/x-font-framemaker"/>
-<mime-type type="application/x-font-libgrx"/>
-<mime-type type="application/x-font-linux-psf"/>
-<mime-type type="application/x-font-otf"/>
-<mime-type type="application/x-font-pcf"/>
-<mime-type type="application/x-font-speedo"/>
-<mime-type type="application/x-font-sunos-news"/>
-<mime-type type="application/x-font-tex"/>
-<mime-type type="application/x-font-tex-tfm"/>
-<mime-type type="application/x-font-ttf"/>
-<mime-type type="application/x-font-type1"/>
-<mime-type type="application/x-font-vfont"/>
-<mime-type type="application/x-frame"/>
-<mime-type type="application/x-gdbm"/>
-<mime-type type="application/x-geda-gsch2pcb-project"/>
-<mime-type type="application/x-geda-schematic"/>
-<mime-type type="application/x-geda-symbol"/>
-<mime-type type="application/x-gerber"/>
-<mime-type type="application/x-gettext-translation"/>
-<mime-type type="application/x-glade"/>
-<mime-type type="application/x-gmc-link"/>
-<mime-type type="application/x-gnome-app-info"/>
-<mime-type type="application/x-gnucash"/>
-<mime-type type="application/x-gnumeric"/>
-<mime-type type="application/x-graphite"/>
-<mime-type type="application/x-gtar"/>
-<mime-type type="application/x-gtktalog"/>
-<mime-type type="application/x-gzip"/>
-<mime-type type="application/x-gzpostscript"/>
-<mime-type type="application/x-hdf"/>
-<mime-type type="application/x-jar"/>
-<mime-type type="application/x-java"/>
-<mime-type type="application/x-java-jnlp-file"/>
-<mime-type type="application/x-jbuilder-project"/>
-<mime-type type="application/x-karbon"/>
-<mime-type type="application/x-kchart"/>
-<mime-type type="application/x-kformula"/>
-<mime-type type="application/x-killustrator"/>
-<mime-type type="application/x-kivio"/>
-<mime-type type="application/x-kontour"/>
-<mime-type type="application/x-kpovmodeler"/>
-<mime-type type="application/x-kpresenter"/>
-<mime-type type="application/x-krita"/>
-<mime-type type="application/x-kspread"/>
-<mime-type type="application/x-kspread-crypt"/>
-<mime-type type="application/x-ksysv-package"/>
-<mime-type type="application/x-kugar"/>
-<mime-type type="application/x-kword"/>
-<mime-type type="application/x-kword-crypt"/>
-<mime-type type="application/x-lha"/>
-<mime-type type="application/x-lhz"/>
-<mime-type type="application/x-linguist"/>
-<mime-type type="application/x-lyx"/>
-<mime-type type="application/x-lzop"/>
-<mime-type type="application/x-magicpoint"/>
-<mime-type type="application/x-matroska"/>
-<mime-type type="application/x-mif"/>
-<mime-type type="application/x-mozilla-bookmarks"/>
-<mime-type type="application/x-mswinurl"/>
-<mime-type type="application/x-mswrite"/>
-<mime-type type="application/x-nautilus-link"/>
-<mime-type type="application/x-netcdf"/>
-<mime-type type="application/x-netscape-bookmarks"/>
-<mime-type type="application/x-netshow-channel"/>
-<mime-type type="application/x-ogg"/>
-<mime-type type="application/x-oleo"/>
-<mime-type type="application/x-palm-database"/>
-<mime-type type="application/x-pcb-layout"/>
-<mime-type type="application/x-pcb-footprint"/>
-<mime-type type="application/x-pcb-netlist"/>
-<mime-type type="application/x-pdf"/>
-<mime-type type="application/x-php"/>
-<mime-type type="application/x-pkcs12"/>
-<mime-type type="application/x-profile"/>
-<mime-type type="application/x-pw"/>
-<mime-type type="application/x-quattropro"/>
-<mime-type type="application/x-quicktime-media-link"/>
-<mime-type type="application/x-quicktimeplayer"/>
-<mime-type type="application/x-qw"/>
-<mime-type type="application/x-rar"/>
-<mime-type type="application/x-reject"/>
-<mime-type type="application/x-rpm"/>
-<mime-type type="application/x-sc"/>
-<mime-type type="application/x-shar"/>
-<mime-type type="application/x-shared-library-la"/>
-<mime-type type="application/x-shockwave-flash"/>
-<mime-type type="application/x-siag"/>
-<mime-type type="application/x-sit"/>
-<mime-type type="application/x-slp"/>
-<mime-type type="application/x-smil"/>
-<mime-type type="application/x-stuffit"/>
-<mime-type type="application/x-sv4cpio"/>
-<mime-type type="application/x-sv4crc"/>
-<mime-type type="application/x-tar"/>
-<mime-type type="application/x-tarz"/>
-<mime-type type="application/x-tex-gf"/>
-<mime-type type="application/x-tex-pk"/>
-<mime-type type="application/x-tgif"/>
-<mime-type type="application/x-theme"/>
-<mime-type type="application/x-toutdoux"/>
-<mime-type type="application/x-trash"/>
-<mime-type type="application/x-troff"/>
-<mime-type type="application/x-troff-man"/>
-<mime-type type="application/x-troff-man-compressed"/>
-<mime-type type="application/x-tzo"/>
-<mime-type type="application/x-ustar"/>
-<mime-type type="application/x-wais-source"/>
-<mime-type type="application/x-wordperfect"/>
-<mime-type type="application/x-wpg"/>
-<mime-type type="application/x-x509-ca-cert"/>
-<mime-type type="application/x-xbel"/>
-<mime-type type="application/x-zerosize"/>
-<mime-type type="application/x-zip-compressed"/>
-<mime-type type="application/x-zoo"/>
-<mime-type type="application/xhtml+xml"/>
-<mime-type type="application/zip"/>
-<mime-type type="audio/ac3"/>
-<mime-type type="audio/AMR"/>
-<mime-type type="audio/AMR-WB"/>
-<mime-type type="audio/basic"/>
-<mime-type type="audio/midi"/>
-<mime-type type="audio/mpeg"/>
-<mime-type type="audio/mpegurl"/>
-<mime-type type="audio/ogg"/>
-<mime-type type="audio/playlist"/>
-<mime-type type="audio/prs.sid"/>
-<mime-type type="audio/vnd.rn-realaudio"/>
-<mime-type type="audio/vnd.wave"/>
-<mime-type type="audio/x-vorbis"/>
-<mime-type type="audio/wav"/>
-<mime-type type="audio/x-adpcm"/>
-<mime-type type="audio/x-aifc"/>
-<mime-type type="audio/x-aiff"/>
-<mime-type type="audio/x-aiffc"/>
-<mime-type type="audio/x-ape"/>
-<mime-type type="audio/x-flac"/>
-<mime-type type="audio/x-it"/>
-<mime-type type="audio/x-m4a"/>
-<mime-type type="audio/x-matroska"/>
-<mime-type type="audio/x-midi"/>
-<mime-type type="audio/x-mod"/>
-<mime-type type="audio/x-mp3"/>
-<mime-type type="audio/x-mp3-playlist"/>
-<mime-type type="audio/x-mpeg"/>
-<mime-type type="audio/x-mpegurl"/>
-<mime-type type="audio/x-ms-asx"/>
-<mime-type type="audio/x-ms-wax"/>
-<mime-type type="audio/x-musepack"/>
-<mime-type type="audio/x-pn-realaudio"/>
-<mime-type type="audio/x-pn-realaudio-plugin"/>
-<mime-type type="audio/x-realaudio"/>
-<mime-type type="audio/x-real-audio"/>
-<mime-type type="audio/x-riff"/>
-<mime-type type="audio/x-s3m"/>
-<mime-type type="audio/x-sbc"/>
-<mime-type type="audio/x-scpls"/>
-<mime-type type="audio/x-stm"/>
-<mime-type type="audio/x-tta"/>
-<mime-type type="audio/x-voc"/>
-<mime-type type="audio/x-wav"/>
-<mime-type type="audio/x-wavpack"/>
-<mime-type type="audio/x-xi"/>
-<mime-type type="audio/x-xm"/>
-<mime-type type="image/bmp"/>
-<mime-type type="image/cgm"/>
-<mime-type type="image/dpx"/>
-<mime-type type="image/fax-g3"/>
-<mime-type type="image/g3fax"/>
-<mime-type type="image/gif"/>
-<mime-type type="image/ief"/>
-<mime-type type="image/jpeg"/>
-<mime-type type="image/jpeg2000"/>
-<mime-type type="image/png"/>
-<mime-type type="image/rle"/>
-<mime-type type="image/svg+xml"/>
-<mime-type type="image/tiff"/>
-<mime-type type="image/vnd.djvu"/>
-<mime-type type="image/vnd.dwg"/>
-<mime-type type="image/vnd.dxf"/>
-<mime-type type="image/x-3ds"/>
-<mime-type type="image/x-applix-graphics"/>
-<mime-type type="image/x-cmu-raster"/>
-<mime-type type="image/x-compressed-xcf"/>
-<mime-type type="image/x-dcm"/>
-<mime-type type="image/x-dib"/>
-<mime-type type="image/x-djvu"/>
-<mime-type type="image/x-eps"/>
-<mime-type type="image/x-fits"/>
-<mime-type type="image/x-fpx"/>
-<mime-type type="image/x-icb"/>
-<mime-type type="image/x-ico"/>
-<mime-type type="image/x-iff"/>
-<mime-type type="image/x-ilbm"/>
-<mime-type type="image/x-jng"/>
-<mime-type type="image/x-lwo"/>
-<mime-type type="image/x-lws"/>
-<mime-type type="image/x-msod"/>
-<mime-type type="image/x-niff"/>
-<mime-type type="image/x-pcx"/>
-<mime-type type="image/x-photo-cd"/>
-<mime-type type="image/x-pict"/>
-<mime-type type="image/x-png"/>
-<mime-type type="image/x-portable-anymap"/>
-<mime-type type="image/x-portable-bitmap"/>
-<mime-type type="image/x-portable-graymap"/>
-<mime-type type="image/x-portable-pixmap"/>
-<mime-type type="image/x-psd"/>
-<mime-type type="image/x-rgb"/>
-<mime-type type="image/x-sgi"/>
-<mime-type type="image/x-sun-raster"/>
-<mime-type type="image/x-tga"/>
-<mime-type type="image/x-win-bitmap"/>
-<mime-type type="image/x-wmf"/>
-<mime-type type="image/x-xbitmap"/>
-<mime-type type="image/x-xcf"/>
-<mime-type type="image/x-xfig"/>
-<mime-type type="image/x-xpixmap"/>
-<mime-type type="image/x-xwindowdump"/>
-<mime-type type="message/delivery-status"/>
-<mime-type type="message/disposition-notification"/>
-<mime-type type="message/external-body"/>
-<mime-type type="message/news"/>
-<mime-type type="message/partial"/>
-<mime-type type="message/rfc822"/>
-<mime-type type="message/x-gnu-rmail"/>
-<mime-type type="model/vrml"/>
-<mime-type type="multipart/alternative"/>
-<mime-type type="multipart/appledouble"/>
-<mime-type type="multipart/digest"/>
-<mime-type type="multipart/encrypted"/>
-<mime-type type="multipart/mixed"/>
-<mime-type type="multipart/related"/>
-<mime-type type="multipart/report"/>
-<mime-type type="multipart/signed"/>
-<mime-type type="multipart/x-mixed-replace"/>
-<mime-type type="text/calendar"/>
-<mime-type type="text/css"/>
-<mime-type type="text/csv"/>
-<mime-type type="text/directory"/>
-<mime-type type="text/enriched"/>
-<mime-type type="text/google-video-pointer"/>
-<mime-type type="text/html"/>
-<mime-type type="text/htmlh"/>
-<mime-type type="text/mathml"/>
-<mime-type type="text/plain"/>
-<mime-type type="text/rdf"/>
-<mime-type type="text/rfc822-headers"/>
-<mime-type type="text/richtext"/>
-<mime-type type="text/rss"/>
-<mime-type type="text/rtf"/>
-<mime-type type="text/sgml"/>
-<mime-type type="text/spreadsheet"/>
-<mime-type type="text/tab-separated-values"/>
-<mime-type type="text/vnd.wap.wml"/>
-<mime-type type="text/x-adasrc"/>
-<mime-type type="text/x-authors"/>
-<mime-type type="text/x-bibtex"/>
-<mime-type type="text/x-c++hdr"/>
-<mime-type type="text/x-c++src"/>
-<mime-type type="text/x-chdr"/>
-<mime-type type="text/x-comma-separated-values"/>
-<mime-type type="text/x-copying"/>
-<mime-type type="text/x-credits"/>
-<mime-type type="text/x-csharp"/>
-<mime-type type="text/x-csrc"/>
-<mime-type type="text/x-dcl"/>
-<mime-type type="text/x-diff"/>
-<mime-type type="text/x-dsl"/>
-<mime-type type="text/x-dsrc"/>
-<mime-type type="text/x-dtd"/>
-<mime-type type="text/x-emacs-lisp"/>
-<mime-type type="text/x-fortran"/>
-<mime-type type="text/x-gettext-translation"/>
-<mime-type type="text/x-gettext-translation-template"/>
-<mime-type type="text/x-google-video-pointer"/>
-<mime-type type="text/x-gtkrc"/>
-<mime-type type="text/x-haskell"/>
-<mime-type type="text/x-idl"/>
-<mime-type type="text/x-install"/>
-<mime-type type="text/x-java"/>
-<mime-type type="text/x-ksysv-log"/>
-<mime-type type="text/x-literate-haskell"/>
-<mime-type type="text/x-log"/>
-<mime-type type="text/x-makefile"/>
-<mime-type type="text/x-moc"/>
-<mime-type type="text/x-objcsrc"/>
-<mime-type type="text/x-pascal"/>
-<mime-type type="text/x-patch"/>
-<mime-type type="text/x-python"/>
-<mime-type type="text/x-readme"/>
-<mime-type type="text/x-scheme"/>
-<mime-type type="text/x-setext"/>
-<mime-type type="text/x-speech"/>
-<mime-type type="text/x-sql"/>
-<mime-type type="text/x-tcl"/>
-<mime-type type="text/x-tex"/>
-<mime-type type="text/x-texinfo"/>
-<mime-type type="text/x-troff-me"/>
-<mime-type type="text/x-troff-mm"/>
-<mime-type type="text/x-troff-ms"/>
-<mime-type type="text/x-uil"/>
-<mime-type type="text/x-uri"/>
-<mime-type type="text/x-vcalendar"/>
-<mime-type type="text/x-vcard"/>
-<mime-type type="text/x-xmi"/>
-<mime-type type="text/x-xslfo"/>
-<mime-type type="text/x-xslt"/>
-<mime-type type="text/xmcd"/>
-<mime-type type="text/xml"/>
-<mime-type type="video/flv"/>
-<mime-type type="video/isivideo"/>
-<mime-type type="video/mp4"/>
-<mime-type type="video/mpeg"/>
-<mime-type type="video/quicktime"/>
-<mime-type type="video/vivo"/>
-<mime-type type="video/wavelet"/>
-<mime-type type="video/x-anim"/>
-<mime-type type="video/x-avi"/>
-<mime-type type="video/x-flic"/>
-<mime-type type="video/x-flv"/>
-<mime-type type="video/x-m4v"/>
-<mime-type type="video/x-matroska"/>
-<mime-type type="video/x-mng"/>
-<mime-type type="video/x-ms-asf"/>
-<mime-type type="video/x-ms-asf-plugin"/>
-<mime-type type="video/x-ms-wmv"/>
-<mime-type type="video/x-ms-wvx"/>
-<mime-type type="video/x-msvideo"/>
-<mime-type type="video/x-nsv"/>
-<mime-type type="video/x-ogm+ogg"/>
-<mime-type type="video/x-real-video"/>
-<mime-type type="video/x-theora+ogg"/>
-<mime-type type="video/x-sgi-movie"/>
-</safe>
-<unsafe>
-<mime-type type="application/mac-binhex40"/>
-<mime-type type="application/vnd.hp-hpgl"/>
-<mime-type type="application/vnd.hp-pcl"/>
-<mime-type type="application/vnd.mozilla.xul+xml"/>
-<mime-type type="application/vnd.palm"/>
-<mime-type type="application/x-arc"/>
-<mime-type type="application/x-awk"/>
-<mime-type type="application/x-class-file"/>
-<mime-type type="application/x-core"/>
-<mime-type type="application/x-csh"/>
-<mime-type type="application/x-dc-rom"/>
-<mime-type type="application/x-deb"/>
-<mime-type type="application/x-executable"/>
-<mime-type type="application/x-gameboy-rom"/>
-<mime-type type="application/x-genesis-rom"/>
-<mime-type type="application/x-ipod-firmware"/>
-<mime-type type="application/x-javascript"/>
-<mime-type type="application/x-macbinary"/>
-<mime-type type="application/x-mplayer2"/>
-<mime-type type="application/x-ms-dos-executable"/>
-<mime-type type="application/x-msx-rom"/>
-<mime-type type="application/x-n64-rom"/>
-<mime-type type="application/x-nes-rom"/>
-<mime-type type="application/x-object"/>
-<mime-type type="application/x-ole-storage"/>
-<mime-type type="application/x-par2"/>
-<mime-type type="application/x-pef-executable"/>
-<mime-type type="application/x-perl"/>
-<mime-type type="application/x-python"/>
-<mime-type type="application/x-python-bytecode"/>
-<mime-type type="application/x-ruby"/>
-<mime-type type="application/x-sharedlib"/>
-<mime-type type="application/x-shellscript"/>
-<mime-type type="application/x-sms-rom"/>
-<mime-type type="application/x-xpinstall"/>
-<mime-type type="inode/blockdevice"/>
-<mime-type type="inode/chardevice"/>
-<mime-type type="inode/directory"/>
-<mime-type type="inode/fifo"/>
-<mime-type type="inode/mount-point"/>
-<mime-type type="inode/socket"/>
-<mime-type type="inode/symlink"/>
-<mime-type type="text/x-ksh"/>
-</unsafe>
-</mime-types-permissions>
 
=== added directory '.pc/81_ubuntu_force_update_bookmarks_menu.patch'
=== removed directory '.pc/81_ubuntu_force_update_bookmarks_menu.patch'
=== added file '.pc/81_ubuntu_force_update_bookmarks_menu.patch/.timestamp'
=== added directory '.pc/81_ubuntu_force_update_bookmarks_menu.patch/src'
=== removed directory '.pc/81_ubuntu_force_update_bookmarks_menu.patch/src'
=== added directory '.pc/81_ubuntu_force_update_bookmarks_menu.patch/src/bookmarks'
=== removed directory '.pc/81_ubuntu_force_update_bookmarks_menu.patch/src/bookmarks'
=== added file '.pc/81_ubuntu_force_update_bookmarks_menu.patch/src/bookmarks/ephy-bookmarks-ui.c'
--- .pc/81_ubuntu_force_update_bookmarks_menu.patch/src/bookmarks/ephy-bookmarks-ui.c	1970-01-01 00:00:00 +0000
+++ .pc/81_ubuntu_force_update_bookmarks_menu.patch/src/bookmarks/ephy-bookmarks-ui.c	2015-07-11 21:08:34 +0000
@@ -0,0 +1,363 @@
+/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
+/*
+ *  Copyright © 2005 Peter Harvey
+ *  Copyright © 2006 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.
+ *
+ */
+
+#include "config.h"
+#include "ephy-bookmarks-ui.h"
+
+#include "ephy-bookmark-action-group.h"
+#include "ephy-bookmark-action.h"
+#include "ephy-bookmark-properties.h"
+#include "ephy-bookmarks-menu.h"
+#include "ephy-bookmarks.h"
+#include "ephy-debug.h"
+#include "ephy-dnd.h"
+#include "ephy-embed-shell.h"
+#include "ephy-file-helpers.h"
+#include "ephy-gui.h"
+#include "ephy-link.h"
+#include "ephy-node-common.h"
+#include "ephy-open-tabs-action.h"
+#include "ephy-prefs.h"
+#include "ephy-settings.h"
+#include "ephy-shell.h"
+#include "ephy-string.h"
+#include "ephy-topic-action-group.h"
+#include "ephy-topic-action.h"
+
+#include <string.h>
+#include <glib/gi18n.h>
+#include <gtk/gtk.h>
+
+#define BM_WINDOW_DATA_KEY "bookmarks-window-data"
+
+typedef struct
+{
+	guint bookmarks_menu;
+	guint toolbar_menu;
+} BookmarksWindowData;
+
+enum
+{
+	RESPONSE_SHOW_PROPERTIES = 1,
+	RESPONSE_NEW_BOOKMARK = 2
+};
+
+static GString * bookmarks_menu_string = 0;
+static GHashTable *properties_dialogs = 0;
+
+static GtkAction *
+find_action (GtkUIManager *manager, const char *name)
+{
+	GList *l = gtk_ui_manager_get_action_groups (manager);
+	GtkAction *action;
+	
+	while (l != NULL)
+	{
+		action = gtk_action_group_get_action (GTK_ACTION_GROUP (l->data), name);
+		if (action) return action;
+		l = l->next;
+	}
+
+	return NULL;
+}
+
+static void
+activate_bookmarks_menu (GtkAction *action, EphyWindow *window)
+{
+	BookmarksWindowData *data = g_object_get_data (G_OBJECT (window), BM_WINDOW_DATA_KEY);
+	if (data && !data->bookmarks_menu)
+	{
+		GtkUIManager *manager = ephy_window_get_ui_manager (window);
+		gtk_ui_manager_ensure_update (manager);
+
+		if (!bookmarks_menu_string->len)
+		{
+			g_string_append (bookmarks_menu_string,
+					 "<ui><popup name=\"PagePopup\" action=\"PagePopupAction\"><menu name=\"BookmarksMenu\" action=\"Bookmarks\">");
+			ephy_bookmarks_menu_build (bookmarks_menu_string, 0);
+			g_string_append (bookmarks_menu_string, "</menu></popup></ui>");
+		}
+
+		data->bookmarks_menu = gtk_ui_manager_add_ui_from_string
+		  (manager, bookmarks_menu_string->str, bookmarks_menu_string->len, 0);
+		
+		gtk_ui_manager_ensure_update (manager);
+	}
+}
+
+static void
+erase_bookmarks_menu (EphyWindow *window)
+{
+	BookmarksWindowData *data;
+	GtkUIManager *manager;
+
+	manager = ephy_window_get_ui_manager (window);
+	data = g_object_get_data (G_OBJECT (window), BM_WINDOW_DATA_KEY);
+
+	if (data != NULL && data->bookmarks_menu != 0)
+	{
+		gtk_ui_manager_remove_ui (manager, data->bookmarks_menu);
+		data->bookmarks_menu = 0;
+	}
+
+	g_string_truncate (bookmarks_menu_string, 0);
+}
+
+static void
+tree_changed_cb (EphyBookmarks *bookmarks,
+		 EphyWindow *window)
+{
+	erase_bookmarks_menu (window);
+}
+
+static void
+node_added_cb (EphyNode *parent,
+	       EphyNode *child,
+	       EphyWindow *window)
+{
+	erase_bookmarks_menu (window);
+}
+
+static void
+node_changed_cb (EphyNode *parent,
+		 EphyNode *child,
+		 guint property_id,
+		 EphyWindow *window)
+{
+	if (property_id == EPHY_NODE_KEYWORD_PROP_NAME ||
+	    property_id == EPHY_NODE_BMK_PROP_TITLE)
+	{
+		erase_bookmarks_menu (window);
+	}
+}
+
+static void
+node_removed_cb (EphyNode *parent,
+		 EphyNode *child,
+		 guint index,
+		 EphyWindow *window)
+{
+	erase_bookmarks_menu (window);
+}
+
+void
+ephy_bookmarks_ui_attach_window (EphyWindow *window)
+{
+	EphyBookmarks *eb;
+	EphyNode *bookmarks;
+	EphyNode *topics;
+	BookmarksWindowData *data;
+	GtkUIManager *manager;
+	GtkActionGroup *actions;
+	GtkAction *action;
+
+	eb = ephy_shell_get_bookmarks (ephy_shell_get_default ());
+	bookmarks = ephy_bookmarks_get_bookmarks (eb);
+	topics = ephy_bookmarks_get_keywords (eb);
+	data = g_object_get_data (G_OBJECT (window), BM_WINDOW_DATA_KEY);
+	g_return_if_fail (data == NULL);
+
+	manager = ephy_window_get_ui_manager (window);
+
+	data = g_new0 (BookmarksWindowData, 1);
+	g_object_set_data_full (G_OBJECT (window), BM_WINDOW_DATA_KEY, data, g_free);
+
+	/* Create the self-maintaining action groups for bookmarks and topics */
+	actions = ephy_bookmark_group_new (bookmarks);
+	gtk_ui_manager_insert_action_group (manager, actions, -1);
+	g_signal_connect_object (actions, "open-link",
+				 G_CALLBACK (ephy_link_open), G_OBJECT (window),
+				 G_CONNECT_SWAPPED | G_CONNECT_AFTER);
+	g_object_unref (actions);
+	
+	actions = ephy_topic_action_group_new (topics, manager);
+	gtk_ui_manager_insert_action_group (manager, actions, -1);
+	g_object_unref (actions);
+
+	actions = ephy_open_tabs_group_new (topics);
+	gtk_ui_manager_insert_action_group (manager, actions, -1);
+	g_signal_connect_object (actions, "open-link",
+				 G_CALLBACK (ephy_link_open), G_OBJECT (window),
+				 G_CONNECT_SWAPPED | G_CONNECT_AFTER);
+	g_object_unref (actions);
+	
+	/* Add signal handlers for the bookmark database */
+	ephy_node_signal_connect_object (bookmarks, EPHY_NODE_CHILD_ADDED,
+					 (EphyNodeCallback)node_added_cb,
+					 G_OBJECT (window));
+	ephy_node_signal_connect_object (topics, EPHY_NODE_CHILD_ADDED,
+					 (EphyNodeCallback)node_added_cb,
+					 G_OBJECT (window));
+
+	ephy_node_signal_connect_object (bookmarks, EPHY_NODE_CHILD_REMOVED,
+					 (EphyNodeCallback)node_removed_cb,
+					 G_OBJECT (window));
+	ephy_node_signal_connect_object (topics, EPHY_NODE_CHILD_REMOVED,
+					 (EphyNodeCallback)node_removed_cb,
+					 G_OBJECT (window));
+
+	ephy_node_signal_connect_object (bookmarks, EPHY_NODE_CHILD_CHANGED,
+					 (EphyNodeCallback)node_changed_cb,
+					 G_OBJECT (window));        
+	ephy_node_signal_connect_object (topics, EPHY_NODE_CHILD_CHANGED,
+					 (EphyNodeCallback)node_changed_cb,
+					 G_OBJECT (window));
+
+	g_signal_connect_object (eb, "tree_changed",
+				 G_CALLBACK (tree_changed_cb),
+				 G_OBJECT (window), 0);
+
+	/* Setup empty menu strings and add signal handlers to build the menus on demand */
+	if (!bookmarks_menu_string)
+            bookmarks_menu_string = g_string_new ("");
+
+	action = find_action (manager, "Bookmarks");
+	g_signal_connect_object (action, "activate",
+				 G_CALLBACK (activate_bookmarks_menu),
+				 G_OBJECT (window), 0);
+}
+
+void
+ephy_bookmarks_ui_detach_window (EphyWindow *window)
+{
+	EphyBookmarks *eb = ephy_shell_get_bookmarks (ephy_shell_get_default ());
+	EphyNode *bookmarks = ephy_bookmarks_get_bookmarks (eb);
+	EphyNode *topics = ephy_bookmarks_get_keywords (eb);
+
+	BookmarksWindowData *data = g_object_get_data (G_OBJECT (window), BM_WINDOW_DATA_KEY);
+	GtkUIManager *manager = ephy_window_get_ui_manager (window);
+	GtkAction *action;
+
+	g_return_if_fail (data != 0);
+
+	if (data->bookmarks_menu)
+		gtk_ui_manager_remove_ui (manager, data->bookmarks_menu);
+
+	g_object_set_data (G_OBJECT (window), BM_WINDOW_DATA_KEY, 0);
+	
+	ephy_node_signal_disconnect_object (bookmarks, EPHY_NODE_CHILD_ADDED,
+					    (EphyNodeCallback)node_added_cb,
+					    G_OBJECT (window));
+	ephy_node_signal_disconnect_object (topics, EPHY_NODE_CHILD_ADDED,
+					    (EphyNodeCallback)node_added_cb,
+					    G_OBJECT (window));
+	
+	ephy_node_signal_disconnect_object (bookmarks, EPHY_NODE_CHILD_REMOVED,
+					    (EphyNodeCallback)node_removed_cb,
+					    G_OBJECT (window));
+	ephy_node_signal_disconnect_object (topics, EPHY_NODE_CHILD_REMOVED,
+					    (EphyNodeCallback)node_removed_cb,
+					    G_OBJECT (window));
+	
+	ephy_node_signal_disconnect_object (bookmarks, EPHY_NODE_CHILD_CHANGED,
+					    (EphyNodeCallback)node_changed_cb,
+					    G_OBJECT (window));        
+	ephy_node_signal_disconnect_object (topics, EPHY_NODE_CHILD_CHANGED,
+					    (EphyNodeCallback)node_changed_cb,
+					    G_OBJECT (window));
+	
+	g_signal_handlers_disconnect_by_func
+	  (G_OBJECT (eb), G_CALLBACK (tree_changed_cb), G_OBJECT (window));
+	
+	action = find_action (manager, "Bookmarks");
+	g_signal_handlers_disconnect_by_func
+	  (G_OBJECT (action), G_CALLBACK (activate_bookmarks_menu), G_OBJECT (window));
+}
+
+static void
+properties_dialog_destroy_cb (EphyBookmarkProperties *dialog,
+			      EphyNode *bookmark)
+{
+	g_hash_table_remove (properties_dialogs, bookmark);
+}
+
+void
+ephy_bookmarks_ui_add_bookmark (GtkWindow *parent,
+				const char *location, 
+				const char *title)
+{
+	EphyBookmarks *bookmarks;
+	EphyNode *bookmark;
+	GtkWidget *dialog;
+
+	if (g_settings_get_boolean (EPHY_SETTINGS_LOCKDOWN,
+				    EPHY_PREFS_LOCKDOWN_BOOKMARK_EDITING))
+		return;
+	
+	bookmarks = ephy_shell_get_bookmarks (ephy_shell_get_default ());
+	bookmark = ephy_bookmarks_add (bookmarks, title, location);
+	
+	if (properties_dialogs == 0)
+	{
+		properties_dialogs = g_hash_table_new (g_direct_hash, g_direct_equal);
+	}
+	
+	dialog = ephy_bookmark_properties_new (bookmarks, bookmark, TRUE);
+
+	g_assert (parent != NULL);
+
+	gtk_window_group_add_window (ephy_gui_ensure_window_group (parent),
+				     GTK_WINDOW (dialog));
+	gtk_window_set_transient_for (GTK_WINDOW (dialog), parent);
+
+	g_signal_connect (dialog, "destroy",
+			  G_CALLBACK (properties_dialog_destroy_cb), bookmark);
+	g_hash_table_insert (properties_dialogs,
+			     bookmark, dialog);
+	
+	gtk_window_present_with_time (GTK_WINDOW (dialog),
+				      gtk_get_current_event_time ());
+}
+
+void
+ephy_bookmarks_ui_show_bookmark (EphyNode *bookmark)
+{
+	EphyBookmarks *bookmarks;
+	GtkWidget *dialog;
+
+	bookmarks = ephy_shell_get_bookmarks (ephy_shell_get_default ());
+
+	g_return_if_fail (EPHY_IS_BOOKMARKS (bookmarks));
+	g_return_if_fail (EPHY_IS_NODE (bookmark));
+
+	if (properties_dialogs == 0)
+	{
+		properties_dialogs = g_hash_table_new (g_direct_hash, g_direct_equal);
+	}
+	
+	dialog = g_hash_table_lookup (properties_dialogs, bookmark);
+
+	if (dialog == NULL)
+	{
+		dialog = ephy_bookmark_properties_new (bookmarks, bookmark, FALSE);
+		
+		g_signal_connect (dialog, "destroy",
+				  G_CALLBACK (properties_dialog_destroy_cb), bookmark);
+		g_hash_table_insert (properties_dialogs,
+				     bookmark, dialog);
+	}
+
+	gtk_window_present_with_time (GTK_WINDOW (dialog),
+				      gtk_get_current_event_time ());
+}
+
+
+
 
=== removed file '.pc/81_ubuntu_force_update_bookmarks_menu.patch/src/bookmarks/ephy-bookmarks-ui.c'
--- .pc/81_ubuntu_force_update_bookmarks_menu.patch/src/bookmarks/ephy-bookmarks-ui.c	2013-11-13 11:39:29 +0000
+++ .pc/81_ubuntu_force_update_bookmarks_menu.patch/src/bookmarks/ephy-bookmarks-ui.c	1970-01-01 00:00:00 +0000
@@ -1,363 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/*
- *  Copyright © 2005 Peter Harvey
- *  Copyright © 2006 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.
- *
- */
-
-#include "config.h"
-#include "ephy-bookmarks-ui.h"
-
-#include "ephy-bookmark-action-group.h"
-#include "ephy-bookmark-action.h"
-#include "ephy-bookmark-properties.h"
-#include "ephy-bookmarks-menu.h"
-#include "ephy-bookmarks.h"
-#include "ephy-debug.h"
-#include "ephy-dnd.h"
-#include "ephy-embed-shell.h"
-#include "ephy-file-helpers.h"
-#include "ephy-gui.h"
-#include "ephy-link.h"
-#include "ephy-node-common.h"
-#include "ephy-open-tabs-action.h"
-#include "ephy-prefs.h"
-#include "ephy-settings.h"
-#include "ephy-shell.h"
-#include "ephy-string.h"
-#include "ephy-topic-action-group.h"
-#include "ephy-topic-action.h"
-
-#include <string.h>
-#include <glib/gi18n.h>
-#include <gtk/gtk.h>
-
-#define BM_WINDOW_DATA_KEY "bookmarks-window-data"
-
-typedef struct
-{
-	guint bookmarks_menu;
-	guint toolbar_menu;
-} BookmarksWindowData;
-
-enum
-{
-	RESPONSE_SHOW_PROPERTIES = 1,
-	RESPONSE_NEW_BOOKMARK = 2
-};
-
-static GString * bookmarks_menu_string = 0;
-static GHashTable *properties_dialogs = 0;
-
-static GtkAction *
-find_action (GtkUIManager *manager, const char *name)
-{
-	GList *l = gtk_ui_manager_get_action_groups (manager);
-	GtkAction *action;
-	
-	while (l != NULL)
-	{
-		action = gtk_action_group_get_action (GTK_ACTION_GROUP (l->data), name);
-		if (action) return action;
-		l = l->next;
-	}
-
-	return NULL;
-}
-
-static void
-activate_bookmarks_menu (GtkAction *action, EphyWindow *window)
-{
-	BookmarksWindowData *data = g_object_get_data (G_OBJECT (window), BM_WINDOW_DATA_KEY);
-	if (data && !data->bookmarks_menu)
-	{
-		GtkUIManager *manager = ephy_window_get_ui_manager (window);
-		gtk_ui_manager_ensure_update (manager);
-
-		if (!bookmarks_menu_string->len)
-		{
-			g_string_append (bookmarks_menu_string,
-					 "<ui><popup name=\"PagePopup\" action=\"PagePopupAction\"><menu name=\"BookmarksMenu\" action=\"Bookmarks\">");
-			ephy_bookmarks_menu_build (bookmarks_menu_string, 0);
-			g_string_append (bookmarks_menu_string, "</menu></popup></ui>");
-		}
-
-		data->bookmarks_menu = gtk_ui_manager_add_ui_from_string
-		  (manager, bookmarks_menu_string->str, bookmarks_menu_string->len, 0);
-		
-		gtk_ui_manager_ensure_update (manager);
-	}
-}
-
-static void
-erase_bookmarks_menu (EphyWindow *window)
-{
-	BookmarksWindowData *data;
-	GtkUIManager *manager;
-
-	manager = ephy_window_get_ui_manager (window);
-	data = g_object_get_data (G_OBJECT (window), BM_WINDOW_DATA_KEY);
-
-	if (data != NULL && data->bookmarks_menu != 0)
-	{
-		gtk_ui_manager_remove_ui (manager, data->bookmarks_menu);
-		data->bookmarks_menu = 0;
-	}
-
-	g_string_truncate (bookmarks_menu_string, 0);
-}
-
-static void
-tree_changed_cb (EphyBookmarks *bookmarks,
-		 EphyWindow *window)
-{
-	erase_bookmarks_menu (window);
-}
-
-static void
-node_added_cb (EphyNode *parent,
-	       EphyNode *child,
-	       EphyWindow *window)
-{
-	erase_bookmarks_menu (window);
-}
-
-static void
-node_changed_cb (EphyNode *parent,
-		 EphyNode *child,
-		 guint property_id,
-		 EphyWindow *window)
-{
-	if (property_id == EPHY_NODE_KEYWORD_PROP_NAME ||
-	    property_id == EPHY_NODE_BMK_PROP_TITLE)
-	{
-		erase_bookmarks_menu (window);
-	}
-}
-
-static void
-node_removed_cb (EphyNode *parent,
-		 EphyNode *child,
-		 guint index,
-		 EphyWindow *window)
-{
-	erase_bookmarks_menu (window);
-}
-
-void
-ephy_bookmarks_ui_attach_window (EphyWindow *window)
-{
-	EphyBookmarks *eb;
-	EphyNode *bookmarks;
-	EphyNode *topics;
-	BookmarksWindowData *data;
-	GtkUIManager *manager;
-	GtkActionGroup *actions;
-	GtkAction *action;
-
-	eb = ephy_shell_get_bookmarks (ephy_shell_get_default ());
-	bookmarks = ephy_bookmarks_get_bookmarks (eb);
-	topics = ephy_bookmarks_get_keywords (eb);
-	data = g_object_get_data (G_OBJECT (window), BM_WINDOW_DATA_KEY);
-	g_return_if_fail (data == NULL);
-
-	manager = ephy_window_get_ui_manager (window);
-
-	data = g_new0 (BookmarksWindowData, 1);
-	g_object_set_data_full (G_OBJECT (window), BM_WINDOW_DATA_KEY, data, g_free);
-
-	/* Create the self-maintaining action groups for bookmarks and topics */
-	actions = ephy_bookmark_group_new (bookmarks);
-	gtk_ui_manager_insert_action_group (manager, actions, -1);
-	g_signal_connect_object (actions, "open-link",
-				 G_CALLBACK (ephy_link_open), G_OBJECT (window),
-				 G_CONNECT_SWAPPED | G_CONNECT_AFTER);
-	g_object_unref (actions);
-	
-	actions = ephy_topic_action_group_new (topics, manager);
-	gtk_ui_manager_insert_action_group (manager, actions, -1);
-	g_object_unref (actions);
-
-	actions = ephy_open_tabs_group_new (topics);
-	gtk_ui_manager_insert_action_group (manager, actions, -1);
-	g_signal_connect_object (actions, "open-link",
-				 G_CALLBACK (ephy_link_open), G_OBJECT (window),
-				 G_CONNECT_SWAPPED | G_CONNECT_AFTER);
-	g_object_unref (actions);
-	
-	/* Add signal handlers for the bookmark database */
-	ephy_node_signal_connect_object (bookmarks, EPHY_NODE_CHILD_ADDED,
-					 (EphyNodeCallback)node_added_cb,
-					 G_OBJECT (window));
-	ephy_node_signal_connect_object (topics, EPHY_NODE_CHILD_ADDED,
-					 (EphyNodeCallback)node_added_cb,
-					 G_OBJECT (window));
-
-	ephy_node_signal_connect_object (bookmarks, EPHY_NODE_CHILD_REMOVED,
-					 (EphyNodeCallback)node_removed_cb,
-					 G_OBJECT (window));
-	ephy_node_signal_connect_object (topics, EPHY_NODE_CHILD_REMOVED,
-					 (EphyNodeCallback)node_removed_cb,
-					 G_OBJECT (window));
-
-	ephy_node_signal_connect_object (bookmarks, EPHY_NODE_CHILD_CHANGED,
-					 (EphyNodeCallback)node_changed_cb,
-					 G_OBJECT (window));        
-	ephy_node_signal_connect_object (topics, EPHY_NODE_CHILD_CHANGED,
-					 (EphyNodeCallback)node_changed_cb,
-					 G_OBJECT (window));
-
-	g_signal_connect_object (eb, "tree_changed",
-				 G_CALLBACK (tree_changed_cb),
-				 G_OBJECT (window), 0);
-
-	/* Setup empty menu strings and add signal handlers to build the menus on demand */
-	if (!bookmarks_menu_string)
-            bookmarks_menu_string = g_string_new ("");
-
-	action = find_action (manager, "Bookmarks");
-	g_signal_connect_object (action, "activate",
-				 G_CALLBACK (activate_bookmarks_menu),
-				 G_OBJECT (window), 0);
-}
-
-void
-ephy_bookmarks_ui_detach_window (EphyWindow *window)
-{
-	EphyBookmarks *eb = ephy_shell_get_bookmarks (ephy_shell_get_default ());
-	EphyNode *bookmarks = ephy_bookmarks_get_bookmarks (eb);
-	EphyNode *topics = ephy_bookmarks_get_keywords (eb);
-
-	BookmarksWindowData *data = g_object_get_data (G_OBJECT (window), BM_WINDOW_DATA_KEY);
-	GtkUIManager *manager = ephy_window_get_ui_manager (window);
-	GtkAction *action;
-
-	g_return_if_fail (data != 0);
-
-	if (data->bookmarks_menu)
-		gtk_ui_manager_remove_ui (manager, data->bookmarks_menu);
-
-	g_object_set_data (G_OBJECT (window), BM_WINDOW_DATA_KEY, 0);
-	
-	ephy_node_signal_disconnect_object (bookmarks, EPHY_NODE_CHILD_ADDED,
-					    (EphyNodeCallback)node_added_cb,
-					    G_OBJECT (window));
-	ephy_node_signal_disconnect_object (topics, EPHY_NODE_CHILD_ADDED,
-					    (EphyNodeCallback)node_added_cb,
-					    G_OBJECT (window));
-	
-	ephy_node_signal_disconnect_object (bookmarks, EPHY_NODE_CHILD_REMOVED,
-					    (EphyNodeCallback)node_removed_cb,
-					    G_OBJECT (window));
-	ephy_node_signal_disconnect_object (topics, EPHY_NODE_CHILD_REMOVED,
-					    (EphyNodeCallback)node_removed_cb,
-					    G_OBJECT (window));
-	
-	ephy_node_signal_disconnect_object (bookmarks, EPHY_NODE_CHILD_CHANGED,
-					    (EphyNodeCallback)node_changed_cb,
-					    G_OBJECT (window));        
-	ephy_node_signal_disconnect_object (topics, EPHY_NODE_CHILD_CHANGED,
-					    (EphyNodeCallback)node_changed_cb,
-					    G_OBJECT (window));
-	
-	g_signal_handlers_disconnect_by_func
-	  (G_OBJECT (eb), G_CALLBACK (tree_changed_cb), G_OBJECT (window));
-	
-	action = find_action (manager, "Bookmarks");
-	g_signal_handlers_disconnect_by_func
-	  (G_OBJECT (action), G_CALLBACK (activate_bookmarks_menu), G_OBJECT (window));
-}
-
-static void
-properties_dialog_destroy_cb (EphyBookmarkProperties *dialog,
-			      EphyNode *bookmark)
-{
-	g_hash_table_remove (properties_dialogs, bookmark);
-}
-
-void
-ephy_bookmarks_ui_add_bookmark (GtkWindow *parent,
-				const char *location, 
-				const char *title)
-{
-	EphyBookmarks *bookmarks;
-	EphyNode *bookmark;
-	GtkWidget *dialog;
-
-	if (g_settings_get_boolean (EPHY_SETTINGS_LOCKDOWN,
-				    EPHY_PREFS_LOCKDOWN_BOOKMARK_EDITING))
-		return;
-	
-	bookmarks = ephy_shell_get_bookmarks (ephy_shell_get_default ());
-	bookmark = ephy_bookmarks_add (bookmarks, title, location);
-	
-	if (properties_dialogs == 0)
-	{
-		properties_dialogs = g_hash_table_new (g_direct_hash, g_direct_equal);
-	}
-	
-	dialog = ephy_bookmark_properties_new (bookmarks, bookmark, TRUE);
-
-	g_assert (parent != NULL);
-
-	gtk_window_group_add_window (ephy_gui_ensure_window_group (parent),
-				     GTK_WINDOW (dialog));
-	gtk_window_set_transient_for (GTK_WINDOW (dialog), parent);
-
-	g_signal_connect (dialog, "destroy",
-			  G_CALLBACK (properties_dialog_destroy_cb), bookmark);
-	g_hash_table_insert (properties_dialogs,
-			     bookmark, dialog);
-	
-	gtk_window_present_with_time (GTK_WINDOW (dialog),
-				      gtk_get_current_event_time ());
-}
-
-void
-ephy_bookmarks_ui_show_bookmark (EphyNode *bookmark)
-{
-	EphyBookmarks *bookmarks;
-	GtkWidget *dialog;
-
-	bookmarks = ephy_shell_get_bookmarks (ephy_shell_get_default ());
-
-	g_return_if_fail (EPHY_IS_BOOKMARKS (bookmarks));
-	g_return_if_fail (EPHY_IS_NODE (bookmark));
-
-	if (properties_dialogs == 0)
-	{
-		properties_dialogs = g_hash_table_new (g_direct_hash, g_direct_equal);
-	}
-	
-	dialog = g_hash_table_lookup (properties_dialogs, bookmark);
-
-	if (dialog == NULL)
-	{
-		dialog = ephy_bookmark_properties_new (bookmarks, bookmark, FALSE);
-		
-		g_signal_connect (dialog, "destroy",
-				  G_CALLBACK (properties_dialog_destroy_cb), bookmark);
-		g_hash_table_insert (properties_dialogs,
-				     bookmark, dialog);
-	}
-
-	gtk_window_present_with_time (GTK_WINDOW (dialog),
-				      gtk_get_current_event_time ());
-}
-
-
-
 
=== added file '.pc/applied-patches'
--- .pc/applied-patches	1970-01-01 00:00:00 +0000
+++ .pc/applied-patches	2015-07-11 21:08:34 +0000
@@ -0,0 +1,5 @@
+00_epiphany-browser.patch
+07_bookmarks.patch
+12_safetypes.patch
+81_ubuntu_force_update_bookmarks_menu.patch
+ubuntu_titlebars.patch
 
=== removed file '.pc/applied-patches'
--- .pc/applied-patches	2014-12-21 10:19:27 +0000
+++ .pc/applied-patches	1970-01-01 00:00:00 +0000
@@ -1,5 +0,0 @@
-00_epiphany-browser.patch
-07_bookmarks.patch
-12_safetypes.patch
-81_ubuntu_force_update_bookmarks_menu.patch
-ubuntu_titlebars.patch
 
=== added directory '.pc/ubuntu_titlebars.patch'
=== removed directory '.pc/ubuntu_titlebars.patch'
=== added file '.pc/ubuntu_titlebars.patch/.timestamp'
=== added directory '.pc/ubuntu_titlebars.patch/src'
=== removed directory '.pc/ubuntu_titlebars.patch/src'
=== added file '.pc/ubuntu_titlebars.patch/src/ephy-window.c'
--- .pc/ubuntu_titlebars.patch/src/ephy-window.c	1970-01-01 00:00:00 +0000
+++ .pc/ubuntu_titlebars.patch/src/ephy-window.c	2015-07-11 21:08:34 +0000
@@ -0,0 +1,4026 @@
+/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
+/*
+ *  Copyright © 2000, 2001, 2002, 2003, 2004 Marco Pesenti Gritti
+ *  Copyright © 2003, 2004 Christian Persch
+ *  Copyright © 2011 Igalia S.L.
+ *
+ *  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-window.h"
+
+#include "ephy-action-helper.h"
+#include "ephy-bookmarks-ui.h"
+#include "ephy-certificate-popover.h"
+#include "ephy-combined-stop-reload-action.h"
+#include "ephy-debug.h"
+#include "ephy-download-widget.h"
+#include "ephy-embed-container.h"
+#include "ephy-embed-prefs.h"
+#include "ephy-embed-shell.h"
+#include "ephy-embed-type-builtins.h"
+#include "ephy-embed-utils.h"
+#include "ephy-encoding-menu.h"
+#include "ephy-file-helpers.h"
+#include "ephy-find-toolbar.h"
+#include "ephy-gui.h"
+#include "ephy-home-action.h"
+#include "ephy-initial-state.h"
+#include "ephy-link.h"
+#include "ephy-location-entry.h"
+#include "ephy-navigation-history-action.h"
+#include "ephy-notebook.h"
+#include "ephy-prefs.h"
+#include "ephy-private.h"
+#include "ephy-session.h"
+#include "ephy-settings.h"
+#include "ephy-shell.h"
+#include "ephy-title-box.h"
+#include "ephy-toolbar.h"
+#include "ephy-type-builtins.h"
+#include "ephy-web-view.h"
+#include "ephy-zoom-action.h"
+#include "ephy-zoom.h"
+#include "popup-commands.h"
+#include "window-commands.h"
+
+#include <gdk/gdkkeysyms.h>
+#include <gdk/gdkx.h>
+#include <gio/gio.h>
+#include <glib/gi18n.h>
+#include <gtk/gtk.h>
+#include <libsoup/soup.h>
+
+#define WNCK_I_KNOW_THIS_IS_UNSTABLE
+#include <libwnck/libwnck.h>
+
+#include <webkit2/webkit2.h>
+
+#ifdef HAVE_X11_XF86KEYSYM_H
+#include <X11/XF86keysym.h>
+#endif
+
+/**
+ * SECTION:ephy-window
+ * @short_description: Epiphany's main #GtkWindow widget
+ *
+ * #EphyWindow is Epiphany's main widget.
+ */
+
+static void ephy_window_view_popup_windows_cb	(GtkAction *action,
+						 EphyWindow *window);
+
+static const GtkActionEntry ephy_menu_entries [] = {
+
+	/* Toplevel */
+
+	{ "Bookmarks", NULL, N_("_Bookmarks") },
+	{ "PopupAction", NULL, "" },
+	{ "PagePopupAction", NULL, "" },
+	{ "NotebookPopupAction", NULL, "" },
+
+	/* File actions. */
+
+	{ "FileNewWindow", NULL, N_("_New Window"), "<control>N", NULL,
+	  G_CALLBACK (window_cmd_file_new_window) },
+	{ "FileNewWindowIncognito", NULL, N_("New _Incognito Window"), "<control><shift>N", NULL,
+	  G_CALLBACK (window_cmd_file_new_incognito_window) },
+	{ "FileOpen", NULL, N_("_Open…"), "<control>O", NULL,
+	  G_CALLBACK (window_cmd_file_open) },
+	{ "FileSaveAs", NULL, N_("Save _As…"), "<shift><control>S", NULL,
+	  G_CALLBACK (window_cmd_file_save_as) },
+	{ "FileSaveAsApplication", NULL, N_("Save As _Web Application…"), "<shift><control>A", NULL,
+	  G_CALLBACK (window_cmd_file_save_as_application) },
+	{ "FilePrint", NULL, N_("_Print…"), "<control>P", NULL,
+	  G_CALLBACK (window_cmd_file_print) },
+	{ "FileSendTo", NULL, N_("S_end Link by Email…"), NULL, NULL,
+	  G_CALLBACK (window_cmd_file_send_to) },
+	{ "FileCloseTab", NULL, N_("_Close"), "<control>W", NULL,
+	  G_CALLBACK (window_cmd_file_close_window) },
+	{ "FileQuit", NULL, N_("_Quit"), "<control>Q", NULL,
+	  G_CALLBACK (window_cmd_file_quit) },
+
+	/* Edit actions. */
+
+	{ "EditUndo", NULL, N_("_Undo"), "<control>Z", NULL,
+	  G_CALLBACK (window_cmd_edit_undo) },
+	{ "EditRedo", NULL, N_("Re_do"), "<shift><control>Z", NULL,
+	  G_CALLBACK (window_cmd_edit_redo) },
+	{ "EditCut", NULL, N_("Cu_t"), "<control>X", NULL,
+	  G_CALLBACK (window_cmd_edit_cut) },
+	{ "EditCopy", NULL, N_("_Copy"), "<control>C", NULL,
+	  G_CALLBACK (window_cmd_edit_copy) },
+	{ "EditPaste", NULL, N_("_Paste"), "<control>V", NULL,
+	  G_CALLBACK (window_cmd_edit_paste) },
+	{ "EditDelete", NULL, NULL, NULL, NULL,
+	  G_CALLBACK (window_cmd_edit_delete) },
+	{ "EditSelectAll", NULL, N_("Select _All"), "<control>A", NULL,
+	  G_CALLBACK (window_cmd_edit_select_all) },
+	{ "EditFind", NULL, N_("_Find…"), "<control>F", NULL,
+	  G_CALLBACK (window_cmd_edit_find) },
+	{ "EditFindNext", NULL, N_("Find Ne_xt"), "<control>G", NULL,
+	  G_CALLBACK (window_cmd_edit_find_next) },
+	{ "EditFindPrev", NULL, N_("Find Pre_vious"), "<shift><control>G", NULL,
+	  G_CALLBACK (window_cmd_edit_find_prev) },
+	{ "EditBookmarks", NULL, N_("Edit _Bookmarks"), "<control>B", NULL,
+	  G_CALLBACK (window_cmd_edit_bookmarks) },
+	{ "EditHistory", NULL, N_("_History"), "<control>H", NULL,
+	  G_CALLBACK (window_cmd_edit_history) },
+	{ "EditPreferences", NULL, N_("Pr_eferences"), "<control>e", NULL,
+	  G_CALLBACK (window_cmd_edit_preferences) },
+
+	/* View actions. */
+
+	{ "ViewStop", NULL, N_("_Stop"), "Escape", NULL,
+	  G_CALLBACK (window_cmd_view_stop) },
+	{ "ViewAlwaysStop", NULL, N_("_Stop"), "Escape",
+	  NULL, G_CALLBACK (window_cmd_view_stop) },
+	{ "ViewReload", NULL, N_("_Reload"), "<control>R", NULL,
+	  G_CALLBACK (window_cmd_view_reload) },
+	{ "ViewZoomIn", NULL, N_("Zoom _In"), "<control>plus", NULL,
+	  G_CALLBACK (window_cmd_view_zoom_in) },
+	{ "ViewZoomOut", NULL, N_("Zoom O_ut"), "<control>minus", NULL,
+	  G_CALLBACK (window_cmd_view_zoom_out) },
+	{ "ViewZoomNormal", NULL, N_("_Normal Size"), "<control>0", NULL,
+	  G_CALLBACK (window_cmd_view_zoom_normal) },
+	{ "ViewEncoding", NULL, N_("Text _Encoding"), NULL, NULL, NULL },
+	{ "ViewPageSource", NULL, N_("_Page Source"), "<control>U", NULL,
+	  G_CALLBACK (window_cmd_view_page_source) },
+
+	/* Bookmarks actions. */
+
+	{ "FileBookmarkPage", NULL, N_("_Add Bookmark…"), "<control>D", NULL,
+	  G_CALLBACK (window_cmd_file_bookmark_page) },
+
+	/* Go actions. */
+
+	{ "GoLocation", NULL, N_("_Location…"), "<control>L", NULL,
+	  G_CALLBACK (window_cmd_go_location) },
+
+	/* Tabs actions. */
+
+	{ "TabsPrevious", NULL, N_("_Previous Tab"), "<control>Page_Up", NULL,
+	  G_CALLBACK (window_cmd_tabs_previous) },
+	{ "TabsNext", NULL, N_("_Next Tab"), "<control>Page_Down", NULL,
+	  G_CALLBACK (window_cmd_tabs_next) },
+	{ "TabsMoveLeft", NULL, N_("Move Tab _Left"), "<shift><control>Page_Up", NULL,
+	  G_CALLBACK (window_cmd_tabs_move_left) },
+	{ "TabsMoveRight", NULL, N_("Move Tab _Right"), "<shift><control>Page_Down", NULL,
+	  G_CALLBACK (window_cmd_tabs_move_right) },
+        { "TabsDetach", NULL, N_("_Detach Tab"), NULL, NULL,
+          G_CALLBACK (window_cmd_tabs_detach) },
+
+	/* Help. */
+
+	{ "HelpContents", NULL, N_("_Help"), NULL, NULL,
+	  G_CALLBACK (window_cmd_help_contents) },
+	{ "HelpAbout", NULL, N_("_About"), NULL, NULL,
+	  G_CALLBACK (window_cmd_help_about) }
+};
+
+static const GtkToggleActionEntry ephy_menu_toggle_entries [] =
+{
+	/* View actions. */
+
+	{ "ViewDownloadsBar", NULL, N_("_Downloads Bar"), NULL, NULL,
+	  NULL, FALSE },
+
+	{ "ViewFullscreen", NULL, N_("_Fullscreen"), "F11", NULL,
+	  G_CALLBACK (window_cmd_view_fullscreen), FALSE },
+	{ "ViewPopupWindows", NULL, N_("Popup _Windows"), NULL, NULL,
+	  G_CALLBACK (ephy_window_view_popup_windows_cb), FALSE },
+	{ "BrowseWithCaret", NULL, N_("Selection Caret"), "F7", NULL,
+	  G_CALLBACK (window_cmd_browse_with_caret), FALSE }
+};
+
+static const GtkActionEntry ephy_popups_entries [] = {
+        /* Document. */
+
+	{ "ContextBookmarkPage", NULL, N_("Add Boo_kmark…"), "<control>D", NULL,
+	  G_CALLBACK (window_cmd_file_bookmark_page) },
+	
+	/* Links. */
+
+	{ "OpenLinkInNewWindow", NULL, N_("Open Link in New _Window"), NULL, NULL,
+	  G_CALLBACK (popup_cmd_link_in_new_window) },
+	{ "OpenLinkInNewTab", NULL, N_("Open Link in New _Tab"), NULL, NULL,
+	  G_CALLBACK (popup_cmd_link_in_new_tab) },
+	{ "DownloadLinkAs", NULL, N_("_Save Link As…"), NULL, NULL,
+	  G_CALLBACK (popup_cmd_download_link_as) },
+	{ "CopyLinkAddress", NULL, N_("_Copy Link Address"), NULL,
+	  NULL, G_CALLBACK (popup_cmd_copy_link_address) },
+	{ "CopyEmailAddress", NULL, N_("_Copy E-mail Address"), NULL,
+	  NULL, G_CALLBACK (popup_cmd_copy_link_address) },
+
+	/* Images. */
+
+	{ "ViewImage", NULL, N_("View _Image in New Tab"), NULL,
+	  NULL, G_CALLBACK (popup_cmd_view_image_in_new_tab) },
+	{ "CopyImageLocation", NULL, N_("Copy I_mage Address"), NULL,
+	  NULL, G_CALLBACK (popup_cmd_copy_image_location) },
+	{ "SaveImageAs", NULL, N_("_Save Image As…"), NULL,
+	  NULL, G_CALLBACK (popup_cmd_save_image_as) },
+	{ "SetImageAsBackground", NULL, N_("Set as _Wallpaper"), NULL,
+	  NULL, G_CALLBACK (popup_cmd_set_image_as_background) },
+
+	/* Video. */
+
+	{ "OpenVideoInNewWindow", NULL, N_("Open Video in New _Window"), NULL, NULL,
+	  G_CALLBACK (popup_cmd_media_in_new_window) },
+	{ "OpenVideoInNewTab", NULL, N_("Open Video in New _Tab"), NULL, NULL,
+	  G_CALLBACK (popup_cmd_media_in_new_tab) },
+	{ "SaveVideoAs", NULL, N_("_Save Video As…"), NULL,
+	  NULL, G_CALLBACK (popup_cmd_save_media_as) },
+	{ "CopyVideoLocation", NULL, N_("_Copy Video Address"), NULL,
+	  NULL, G_CALLBACK (popup_cmd_copy_media_location) },
+
+	/* Audio. */
+
+	{ "OpenAudioInNewWindow", NULL, N_("Open Audio in New _Window"), NULL, NULL,
+	  G_CALLBACK (popup_cmd_media_in_new_window) },
+	{ "OpenAudioInNewTab", NULL, N_("Open Audio in New _Tab"), NULL, NULL,
+	  G_CALLBACK (popup_cmd_media_in_new_tab) },
+	{ "SaveAudioAs", NULL, N_("_Save Audio As…"), NULL,
+	  NULL, G_CALLBACK (popup_cmd_save_media_as) },
+	{ "CopyAudioLocation", NULL, N_("_Copy Audio Address"), NULL,
+	  NULL, G_CALLBACK (popup_cmd_copy_media_location) },
+};
+
+static const struct
+{
+	guint keyval;
+	GdkModifierType modifier;
+	const gchar *action;
+	gboolean fromToolbar;
+} extra_keybindings [] = {
+	/* FIXME: PageMenu should have its accel without being in the
+	 * extra keybindings, but does not seem to work for some
+	 * reason. */
+	{ GDK_KEY_F10,		0,			"PageMenu",		 TRUE },
+	{ GDK_KEY_Home,		GDK_MOD1_MASK,	        "FileHome",		 TRUE },
+	/* FIXME: these are not in any menu for now, so add them here. */
+	{ GDK_KEY_F11,          0,                      "ViewFullscreen",        FALSE },
+	{ GDK_KEY_plus,         GDK_CONTROL_MASK,       "ViewZoomIn",            FALSE },
+	{ GDK_KEY_minus,        GDK_CONTROL_MASK,       "ViewZoomOut",           FALSE },
+	{ GDK_KEY_0,            GDK_CONTROL_MASK,       "ViewZoomNormal",        FALSE },
+	{ GDK_KEY_g,            GDK_CONTROL_MASK,       "EditFindNext",          FALSE },
+	{ GDK_KEY_G,            GDK_CONTROL_MASK |
+	                        GDK_SHIFT_MASK,         "EditFindPrev",          FALSE },
+
+	{ GDK_KEY_s,		GDK_CONTROL_MASK,	"FileSaveAs",		 FALSE },
+	{ GDK_KEY_r,		GDK_CONTROL_MASK,	"ViewReload",		 FALSE },
+	{ GDK_KEY_R,		GDK_CONTROL_MASK,	"ViewReload",		 FALSE },
+	{ GDK_KEY_R,		GDK_CONTROL_MASK |
+				GDK_SHIFT_MASK,		"ViewReload",		 FALSE },
+	/* Tab navigation */
+	{ GDK_KEY_Page_Up,      GDK_CONTROL_MASK,       "TabsPrevious",          FALSE },
+	{ GDK_KEY_Page_Down,    GDK_CONTROL_MASK,       "TabsNext",              FALSE },
+	{ GDK_KEY_Page_Up,      GDK_CONTROL_MASK |
+	                        GDK_SHIFT_MASK,         "TabsMoveLeft",          FALSE },
+	{ GDK_KEY_Page_Down,    GDK_CONTROL_MASK |
+	                        GDK_SHIFT_MASK,         "TabsMoveRight",         FALSE },
+	/* Go */
+	{ GDK_KEY_l,            GDK_CONTROL_MASK,       "GoLocation",            FALSE },
+	{ GDK_KEY_F6,           0,			"GoLocation",            FALSE },
+	/* Support all the MSIE tricks as well ;) */
+	{ GDK_KEY_F5,		0,			"ViewReload",		 FALSE },
+	{ GDK_KEY_F5,		GDK_CONTROL_MASK,	"ViewReload",		 FALSE },
+	{ GDK_KEY_F5,		GDK_SHIFT_MASK,		"ViewReload",		 FALSE },
+	{ GDK_KEY_F5,		GDK_CONTROL_MASK |
+				GDK_SHIFT_MASK,		"ViewReload",		 FALSE },
+	{ GDK_KEY_KP_Add,	GDK_CONTROL_MASK,	"ViewZoomIn",		 FALSE },
+	{ GDK_KEY_KP_Subtract,	GDK_CONTROL_MASK,	"ViewZoomOut",		 FALSE },
+	{ GDK_KEY_equal,	GDK_CONTROL_MASK,	"ViewZoomIn",		 FALSE },
+	{ GDK_KEY_KP_0,		GDK_CONTROL_MASK,	"ViewZoomNormal",	 FALSE },
+	/* These keys are a bit strange: when pressed with no modifiers, they emit
+	 * KP_PageUp/Down Control; when pressed with Control+Shift they are KP_9/3,
+	 * when NumLock is on they are KP_9/3 and with NumLock and Control+Shift
+	 * They're KP_PageUp/Down again!
+	 */
+	{ GDK_KEY_Left,		GDK_MOD1_MASK /*Alt*/,	"NavigationBack",	TRUE },
+	{ GDK_KEY_KP_Left,	GDK_MOD1_MASK /*Alt*/,	"NavigationBack",	TRUE },
+	{ GDK_KEY_KP_4,		GDK_MOD1_MASK /*Alt*/,	"NavigationBack",	TRUE },
+	{ GDK_KEY_Right,	GDK_MOD1_MASK /*Alt*/,	"NavigationForward",	TRUE },
+	{ GDK_KEY_KP_Right,	GDK_MOD1_MASK /*Alt*/,	"NavigationForward",	TRUE },
+	{ GDK_KEY_KP_6,		GDK_MOD1_MASK /*Alt*/,	"NavigationForward",	TRUE },
+	{ GDK_KEY_KP_Page_Up,	GDK_CONTROL_MASK,	"TabsPrevious",		FALSE },
+	{ GDK_KEY_KP_9,		GDK_CONTROL_MASK,	"TabsPrevious",		FALSE },
+	{ GDK_KEY_KP_Page_Down,	GDK_CONTROL_MASK,	"TabsNext",		FALSE },
+	{ GDK_KEY_KP_3,		GDK_CONTROL_MASK,	"TabsNext",		FALSE },
+	{ GDK_KEY_KP_Page_Up,	GDK_SHIFT_MASK | GDK_CONTROL_MASK,	"TabsMoveLeft",		FALSE },
+	{ GDK_KEY_KP_9,		GDK_SHIFT_MASK | GDK_CONTROL_MASK,	"TabsMoveLeft",		FALSE },
+	{ GDK_KEY_KP_Page_Down,	GDK_SHIFT_MASK | GDK_CONTROL_MASK,	"TabsMoveRight",	FALSE },
+	{ GDK_KEY_KP_3,		GDK_SHIFT_MASK | GDK_CONTROL_MASK,	"TabsMoveRight",	FALSE },
+#ifdef HAVE_X11_XF86KEYSYM_H
+	{ XF86XK_Back,		0,			"NavigationBack",	TRUE  },
+	{ XF86XK_Forward,	0,			"NavigationForward",	TRUE  },
+	{ XF86XK_Go,	 	0,			"GoLocation",		FALSE },
+	{ XF86XK_OpenURL, 	0,			"GoLocation",		FALSE },
+	{ XF86XK_AddFavorite, 	0,			"FileBookmarkPage",	FALSE },
+	{ XF86XK_Refresh, 	0,			"ViewReload",		FALSE },
+	{ XF86XK_Reload,	0, 			"ViewReload",		FALSE },
+	{ XF86XK_Search,	0,			"EditFind",		FALSE },
+	{ XF86XK_Send,	 	0,			"FileSendTo",		FALSE },
+	{ XF86XK_Stop,		0,			"ViewStop",		FALSE },
+	{ XF86XK_ZoomIn,	0, 			"ViewZoomIn",		FALSE },
+	{ XF86XK_ZoomOut,	0, 			"ViewZoomOut",		FALSE }
+	/* FIXME: what about ScrollUp, ScrollDown, Menu*, Option, LogOff, Save,.. any others? */
+#endif /* HAVE_X11_XF86KEYSYM_H */
+};
+
+#define SETTINGS_CONNECTION_DATA_KEY	"EphyWindowSettings"
+
+#define EPHY_WINDOW_GET_PRIVATE(object)(G_TYPE_INSTANCE_GET_PRIVATE ((object), EPHY_TYPE_WINDOW, EphyWindowPrivate))
+
+struct _EphyWindowPrivate
+{
+	GtkWidget *main_vbox;
+	GtkWidget *toolbar;
+	GtkUIManager *manager;
+	GtkActionGroup *action_group;
+	GtkActionGroup *popups_action_group;
+	GtkActionGroup *toolbar_action_group;
+	GtkActionGroup *tab_accels_action_group;
+	EphyEncodingMenu *enc_menu;
+	GtkNotebook *notebook;
+	EphyEmbed *active_embed;
+	EphyWindowChrome chrome;
+	EphyEmbedEvent *context_event;
+	WebKitHitTestResult *hit_test_result;
+	guint idle_worker;
+	GtkWidget *downloads_box;
+
+	EphyLocationController *location_controller;
+
+	gulong app_menu_visibility_handler;
+
+	guint closing : 1;
+	guint has_size : 1;
+	guint fullscreen_mode : 1;
+	guint is_popup : 1;
+	guint present_on_insert : 1;
+	guint key_theme_is_emacs : 1;
+	guint updating_address : 1;
+	guint force_close : 1;
+	guint checking_modified_forms : 1;
+};
+
+enum
+{
+	PROP_0,
+	PROP_ACTIVE_CHILD,
+	PROP_CHROME,
+	PROP_SINGLE_TAB_MODE
+};
+
+/* Make sure not to overlap with those in ephy-lockdown.c */
+enum
+{
+	SENS_FLAG_CHROME	= 1 << 0,
+	SENS_FLAG_CONTEXT	= 1 << 1,
+	SENS_FLAG_DOCUMENT	= 1 << 2,
+	SENS_FLAG_LOADING	= 1 << 3,
+	SENS_FLAG_NAVIGATION	= 1 << 4,
+	SENS_FLAG_IS_BLANK	= 1 << 5
+};
+
+static gint
+impl_add_child (EphyEmbedContainer *container,
+		EphyEmbed *child,
+		gint position,
+		gboolean jump_to)
+{
+	EphyWindow *window = EPHY_WINDOW (container);
+
+	g_return_val_if_fail (!window->priv->is_popup ||
+			      gtk_notebook_get_n_pages (GTK_NOTEBOOK (window->priv->notebook)) < 1, -1);
+
+	return ephy_notebook_add_tab (EPHY_NOTEBOOK (window->priv->notebook),
+				      child, position, jump_to);
+}
+
+static void
+impl_set_active_child (EphyEmbedContainer *container,
+		       EphyEmbed *child)
+{
+	int page;
+	EphyWindow *window;
+
+	window = EPHY_WINDOW (container);
+
+	page = gtk_notebook_page_num
+		(window->priv->notebook, GTK_WIDGET (child));
+	gtk_notebook_set_current_page
+		(window->priv->notebook, page);
+}
+
+static GtkWidget *
+construct_confirm_close_dialog (EphyWindow *window,
+				const char *title,
+				const char *info,
+				const char *action)
+{
+	GtkWidget *dialog;
+
+	dialog = gtk_message_dialog_new (GTK_WINDOW (window),
+					 GTK_DIALOG_MODAL,
+					 GTK_MESSAGE_WARNING,
+					 GTK_BUTTONS_CANCEL,
+					 "%s", title);
+
+	gtk_message_dialog_format_secondary_text
+		(GTK_MESSAGE_DIALOG (dialog), "%s", info);
+	
+	gtk_dialog_add_button (GTK_DIALOG (dialog),
+			       action, GTK_RESPONSE_ACCEPT);
+
+	gtk_dialog_set_default_response (GTK_DIALOG (dialog), GTK_RESPONSE_CANCEL);
+
+	/* FIXME gtk_window_set_title (GTK_WINDOW (dialog), _("Close Document?")); */
+	gtk_window_group_add_window (gtk_window_get_group (GTK_WINDOW (window)),
+				     GTK_WINDOW (dialog));
+
+	return dialog;
+}
+
+static gboolean
+confirm_close_with_modified_forms (EphyWindow *window)
+{
+	GtkWidget *dialog;
+	int response;
+
+	dialog = construct_confirm_close_dialog (window,
+						 _("There are unsubmitted changes to form elements"),
+						 _("If you close the document anyway, "
+						   "you will lose that information."),
+						 _("Close _Document"));
+	response = gtk_dialog_run (GTK_DIALOG (dialog));
+
+	gtk_widget_destroy (dialog);
+
+	return response == GTK_RESPONSE_ACCEPT;
+}
+
+static gboolean
+confirm_close_with_downloads (EphyWindow *window)
+{
+	GtkWidget *dialog;
+	int response;
+
+	dialog = construct_confirm_close_dialog (window,
+			_("There are ongoing downloads in this window"),
+			_("If you close this window, the downloads will be cancelled"),
+			_("Close window and cancel downloads"));
+	response = gtk_dialog_run (GTK_DIALOG (dialog));
+
+	gtk_widget_destroy (dialog);
+
+	return response == GTK_RESPONSE_ACCEPT;
+}
+
+static void
+impl_remove_child (EphyEmbedContainer *container,
+		   EphyEmbed *child)
+{
+	EphyWindow *window;
+
+	window = EPHY_WINDOW (container);
+	g_signal_emit_by_name (window->priv->notebook,
+			       "tab-close-request",
+			       child, window);
+}
+
+static EphyEmbed *
+impl_get_active_child (EphyEmbedContainer *container)
+{
+	return EPHY_WINDOW (container)->priv->active_embed;
+}
+
+static GList *
+impl_get_children (EphyEmbedContainer *container)
+{
+	EphyWindow *window = EPHY_WINDOW (container);
+
+	return gtk_container_get_children (GTK_CONTAINER (window->priv->notebook));
+}
+
+static gboolean
+impl_get_is_popup (EphyEmbedContainer *container)
+{
+	return EPHY_WINDOW (container)->priv->is_popup;
+}
+
+static void
+ephy_window_embed_container_iface_init (EphyEmbedContainerIface *iface)
+{
+	iface->add_child = impl_add_child;
+	iface->set_active_child = impl_set_active_child;
+	iface->remove_child = impl_remove_child;
+	iface->get_active_child = impl_get_active_child;
+	iface->get_children = impl_get_children;
+	iface->get_is_popup = impl_get_is_popup;
+}
+
+static EphyEmbed *
+ephy_window_open_link (EphyLink *link,
+		       const char *address,
+		       EphyEmbed *embed,
+		       EphyLinkFlags flags)
+{
+	EphyWindow *window = EPHY_WINDOW (link);
+	EphyWindowPrivate *priv = window->priv;
+	EphyEmbed *new_embed;
+
+	g_return_val_if_fail (address != NULL, NULL);
+
+	if (embed == NULL)
+	{
+		embed = window->priv->active_embed;
+	}
+
+	if (flags & EPHY_LINK_BOOKMARK)
+		ephy_web_view_set_visit_type (ephy_embed_get_web_view (embed),
+					      EPHY_PAGE_VISIT_BOOKMARK);
+	else if (flags & EPHY_LINK_TYPED)
+		ephy_web_view_set_visit_type (ephy_embed_get_web_view (embed),
+					      EPHY_PAGE_VISIT_TYPED);
+		
+	if (flags  & (EPHY_LINK_JUMP_TO | 
+		      EPHY_LINK_NEW_TAB | 
+		      EPHY_LINK_NEW_WINDOW))
+	{
+		EphyNewTabFlags ntflags = 0;
+		EphyWindow *target_window = EPHY_WINDOW (gtk_widget_get_toplevel (GTK_WIDGET (embed)));
+
+		if (flags & EPHY_LINK_JUMP_TO)
+		{
+			ntflags |= EPHY_NEW_TAB_JUMP;
+		}
+
+		if (flags & EPHY_LINK_NEW_WINDOW ||
+		    (flags & EPHY_LINK_NEW_TAB && priv->is_popup))
+		{
+			target_window = ephy_window_new ();
+		}
+
+		if (flags & EPHY_LINK_NEW_TAB_APPEND_AFTER)
+			ntflags |= EPHY_NEW_TAB_APPEND_AFTER;
+
+		new_embed = ephy_shell_new_tab
+				(ephy_shell_get_default (),
+				 target_window,
+				 embed, ntflags);
+		if (flags & EPHY_LINK_HOME_PAGE)
+		{
+			ephy_web_view_load_homepage (ephy_embed_get_web_view (new_embed));
+			ephy_window_activate_location (window);
+		}
+		else
+		{
+			ephy_web_view_load_url (ephy_embed_get_web_view (new_embed), address);
+			if (flags & EPHY_LINK_JUMP_TO)
+			{
+				gtk_widget_grab_focus (GTK_WIDGET (new_embed));
+			}
+		}
+	}
+	else
+	{
+		ephy_web_view_load_url (ephy_embed_get_web_view (embed), address);
+
+		if (address == NULL || address[0] == '\0' || g_str_equal (address, "about:blank"))
+		{
+			ephy_window_activate_location (window);
+		}
+		else
+		{
+			gtk_widget_grab_focus (GTK_WIDGET (embed));
+		}
+
+		new_embed = embed;
+	}
+
+	return new_embed;
+}
+
+static void
+ephy_window_link_iface_init (EphyLinkIface *iface)
+{
+	iface->open_link = ephy_window_open_link;
+}
+
+G_DEFINE_TYPE_WITH_CODE (EphyWindow, ephy_window, GTK_TYPE_APPLICATION_WINDOW,
+			 G_IMPLEMENT_INTERFACE (EPHY_TYPE_LINK,
+						ephy_window_link_iface_init)
+			 G_IMPLEMENT_INTERFACE (EPHY_TYPE_EMBED_CONTAINER,
+						ephy_window_embed_container_iface_init))
+
+static void
+settings_change_notify (GtkSettings *settings,
+			EphyWindow  *window)
+{
+	EphyWindowPrivate *priv = window->priv;
+	char *key_theme_name;
+
+	g_object_get (settings,
+		      "gtk-key-theme-name", &key_theme_name,
+		      NULL);
+
+	priv->key_theme_is_emacs =
+		key_theme_name &&
+		g_ascii_strcasecmp (key_theme_name, "Emacs") == 0;
+
+	g_free (key_theme_name);
+}
+
+static void
+settings_changed_cb (GtkSettings *settings)
+{
+	GList *list, *l;
+
+	/* FIXME: multi-head */
+	list = gtk_window_list_toplevels ();
+
+	for (l = list; l != NULL; l = l->next)
+	{
+		if (EPHY_IS_WINDOW (l->data))
+		{
+			settings_change_notify (settings, l->data);
+		}
+	}
+
+	g_list_free (list);
+}
+
+static void
+sync_chromes_visibility (EphyWindow *window)
+{
+	EphyWindowPrivate *priv = window->priv;
+	gboolean show_tabsbar, show_downloads_box;
+
+	if (priv->closing)
+		return;
+
+	show_tabsbar = (priv->chrome & EPHY_WINDOW_CHROME_TABSBAR);
+	show_downloads_box = (priv->chrome & EPHY_WINDOW_CHROME_DOWNLOADS_BOX);
+
+	ephy_notebook_set_tabs_allowed (EPHY_NOTEBOOK (priv->notebook),
+					show_tabsbar && !(priv->is_popup || priv->fullscreen_mode));
+	gtk_widget_set_visible (priv->downloads_box,
+				show_downloads_box && !priv->fullscreen_mode);
+}
+
+static void
+ephy_window_set_chrome (EphyWindow *window,
+			EphyWindowChrome chrome)
+{
+	if (window->priv->chrome == chrome)
+		return;
+
+	window->priv->chrome = chrome;
+	if (window->priv->closing)
+		return;
+
+	g_object_notify (G_OBJECT (window), "chrome");
+	sync_chromes_visibility (window);
+}
+
+static void
+sync_tab_load_status (EphyWebView *view,
+		      WebKitLoadEvent load_event,
+		      EphyWindow *window)
+{
+	EphyWindowPrivate *priv = window->priv;
+	GtkActionGroup *action_group = priv->action_group;
+	GtkAction *action;
+	gboolean loading;
+
+	if (window->priv->closing) return;
+
+	loading = ephy_web_view_is_loading (view);
+
+	action = gtk_action_group_get_action (action_group, "ViewStop");
+	gtk_action_set_sensitive (action, loading);
+
+	/* disable print while loading, see bug #116344 */
+	action = gtk_action_group_get_action (action_group, "FilePrint");
+	ephy_action_change_sensitivity_flags (action, SENS_FLAG_LOADING, loading);
+
+	action = gtk_action_group_get_action (priv->toolbar_action_group,
+					      "ViewCombinedStopReload");
+	ephy_combined_stop_reload_action_set_loading (EPHY_COMBINED_STOP_RELOAD_ACTION (action),
+						      loading);
+}
+
+static void
+sync_tab_security (EphyWebView *view,
+		   GParamSpec *pspec,
+		   EphyWindow *window)
+{
+	EphyWindowPrivate *priv = window->priv;
+	EphyTitleBox *title_box;
+	EphySecurityLevel security_level;
+
+	if (priv->closing) return;
+
+	ephy_web_view_get_security_level (view, &security_level, NULL, NULL);
+	title_box = ephy_toolbar_get_title_box (EPHY_TOOLBAR (priv->toolbar));
+	ephy_title_box_set_security_level (title_box, security_level);
+}
+
+static void
+ephy_window_fullscreen (EphyWindow *window)
+{
+	EphyWindowPrivate *priv = window->priv;
+	EphyEmbed *embed;
+
+	priv->fullscreen_mode = TRUE;
+
+	/* sync status */
+	embed = window->priv->active_embed;
+	sync_tab_load_status (ephy_embed_get_web_view (embed), WEBKIT_LOAD_STARTED, window);
+	sync_tab_security (ephy_embed_get_web_view (embed), NULL, window);
+
+	sync_chromes_visibility (window);
+	gtk_widget_hide (priv->toolbar);
+	ephy_embed_entering_fullscreen (embed);
+}
+
+static void
+ephy_window_unfullscreen (EphyWindow *window)
+{
+	window->priv->fullscreen_mode = FALSE;
+
+	gtk_widget_show (window->priv->toolbar);
+	sync_chromes_visibility (window);
+	ephy_embed_leaving_fullscreen (window->priv->active_embed);
+}
+
+static gboolean 
+ephy_window_key_press_event (GtkWidget *widget,
+			     GdkEventKey *event)
+{
+	EphyWindow *window = EPHY_WINDOW (widget);
+	EphyWindowPrivate *priv = window->priv;
+	GtkWidget *focus_widget;
+	gboolean shortcircuit = FALSE, force_chain = FALSE, handled = FALSE;
+	guint modifier = event->state & gtk_accelerator_get_default_mod_mask ();
+	guint i;
+
+	/* In an attempt to get the mozembed playing nice with things like emacs keybindings
+	 * we are passing important events to the focused child widget before letting the window's
+	 * base handler see them. This is *completely against* stated gtk2 policy but the 
+	 * 'correct' behaviour is exceptionally useless. We need to keep an eye out for 
+	 * unexpected consequences of this decision. IME's should be a high concern, but 
+	 * considering that the IME folks complained about the upside-down event propagation
+	 * rules, we might be doing them a favour.
+	 *
+	 * We achieve this by first evaluating the event to see if it's important, and if
+	 * so, we get the focus widget and attempt to get the widget to handle that event.
+	 * If the widget does handle it, we're done (unless force_chain is true, in which
+	 * case the event is handled as normal in addition to being sent to the focus
+	 * widget), otherwise the event follows the normal handling path.
+	 */
+
+	if (event->keyval == GDK_KEY_Escape && modifier == 0)
+	{
+		/* Always pass Escape to both the widget, and the parent */
+		shortcircuit = TRUE;
+		force_chain = TRUE;
+	}
+	else if (priv->key_theme_is_emacs && 
+		 (modifier == GDK_CONTROL_MASK) &&
+		 event->length > 0 &&
+		 /* But don't pass Ctrl+Enter twice */
+		 event->keyval != GDK_KEY_Return &&
+		 event->keyval != GDK_KEY_KP_Enter &&
+		 event->keyval != GDK_KEY_ISO_Enter)
+	{
+		/* Pass CTRL+letter characters to the widget */
+		shortcircuit = TRUE;
+	}
+
+	if (shortcircuit)
+	{
+		focus_widget = gtk_window_get_focus (GTK_WINDOW (window));
+
+		if (GTK_IS_WIDGET (focus_widget))
+		{
+			handled = gtk_widget_event (focus_widget,
+						    (GdkEvent*) event);
+		}
+
+		if (handled && !force_chain)
+		{
+			return handled;
+		}
+	}
+
+	/* Handle accelerators that we want bound, but aren't associated with
+	 * an action */
+	for (i = 0; i < G_N_ELEMENTS (extra_keybindings); i++)
+	{
+		if (event->keyval == extra_keybindings[i].keyval &&
+		    modifier == extra_keybindings[i].modifier)
+		{
+			GtkAction * action = gtk_action_group_get_action
+				(extra_keybindings[i].fromToolbar ? 
+					priv->toolbar_action_group :
+					priv->action_group,
+				extra_keybindings[i].action);
+			if (gtk_action_is_sensitive (action))
+			{
+				gtk_action_activate (action);
+				return TRUE;
+			}
+			break;
+		}
+	}
+
+	return GTK_WIDGET_CLASS (ephy_window_parent_class)->key_press_event (widget, event);
+}
+
+static gboolean
+window_has_ongoing_downloads (EphyWindow *window)
+{
+	GList *l, *downloads;
+	gboolean downloading = FALSE;
+
+	downloads = gtk_container_get_children (GTK_CONTAINER (window->priv->downloads_box));
+
+	for (l = downloads; l != NULL; l = l->next)
+	{
+		if (EPHY_IS_DOWNLOAD_WIDGET (l->data) != TRUE)
+			continue;
+
+		if (!ephy_download_widget_download_is_finished (EPHY_DOWNLOAD_WIDGET (l->data)))
+		{
+			downloading = TRUE;
+			break;
+		}
+	}
+	g_list_free (downloads);
+
+	return downloading;
+}
+
+static gboolean
+ephy_window_delete_event (GtkWidget *widget,
+			  GdkEventAny *event)
+{
+	if (!ephy_window_close (EPHY_WINDOW (widget)))
+	    return TRUE;
+
+	/* proceed with window close */
+	if (GTK_WIDGET_CLASS (ephy_window_parent_class)->delete_event)
+	{
+		return GTK_WIDGET_CLASS (ephy_window_parent_class)->delete_event (widget, event);
+	}
+
+	return FALSE;
+}
+
+#define MAX_SPELL_CHECK_GUESSES 4
+
+static void
+update_link_actions_sensitivity (EphyWindow *window,
+				 gboolean link_has_web_scheme)
+{
+	GtkAction *action;
+	GtkActionGroup *action_group;
+
+	action_group = window->priv->popups_action_group;
+
+	action = gtk_action_group_get_action (action_group, "OpenLinkInNewWindow");
+	gtk_action_set_sensitive (action, link_has_web_scheme);
+
+	action = gtk_action_group_get_action (action_group, "OpenLinkInNewTab");
+	ephy_action_change_sensitivity_flags (action, SENS_FLAG_CONTEXT, !link_has_web_scheme);
+}
+
+static void
+update_edit_action_sensitivity (EphyWindow *window, const gchar *action_name, gboolean sensitive, gboolean hide)
+{
+	GtkAction *action;
+
+	action = gtk_action_group_get_action (window->priv->action_group, action_name);
+	gtk_action_set_sensitive (action, sensitive);
+	gtk_action_set_visible (action, !hide || sensitive);
+}
+
+typedef struct
+{
+	EphyWindow *window;
+	const gchar *action_name;
+	gboolean hide;
+} CanEditCommandAsyncData;
+
+static CanEditCommandAsyncData *
+can_edit_command_async_data_new (EphyWindow *window, const gchar *action_name, gboolean hide)
+{
+	CanEditCommandAsyncData *data;
+
+	data = g_slice_new (CanEditCommandAsyncData);
+	data->window = g_object_ref (window);
+	data->action_name = action_name;
+	data->hide = hide;
+
+	return data;
+}
+
+static void
+can_edit_command_async_data_free (CanEditCommandAsyncData *data)
+{
+	if (G_UNLIKELY (!data))
+		return;
+
+	g_object_unref (data->window);
+	g_slice_free (CanEditCommandAsyncData, data);
+}
+
+static void
+can_edit_command_callback (GObject *object, GAsyncResult *result, CanEditCommandAsyncData *data)
+{
+	gboolean sensitive;
+	GError *error = NULL;
+
+	sensitive = webkit_web_view_can_execute_editing_command_finish (WEBKIT_WEB_VIEW (object), result, &error);
+	if (!error)
+	{
+		update_edit_action_sensitivity (data->window, data->action_name, sensitive, data->hide);
+
+	}
+	else
+	{
+		g_error_free (error);
+	}
+
+	can_edit_command_async_data_free (data);
+}
+
+static void
+update_edit_actions_sensitivity (EphyWindow *window, gboolean hide)
+{
+	GtkWidget *widget = gtk_window_get_focus (GTK_WINDOW (window));
+	gboolean can_copy, can_cut, can_undo, can_redo, can_paste;
+
+	if (GTK_IS_EDITABLE (widget))
+	{
+		GtkWidget *entry;
+		gboolean has_selection;
+
+		entry = ephy_toolbar_get_location_entry (EPHY_TOOLBAR (window->priv->toolbar));
+		
+		has_selection = gtk_editable_get_selection_bounds
+			(GTK_EDITABLE (widget), NULL, NULL);
+
+		can_copy = has_selection;
+		can_cut = has_selection;
+		can_paste = TRUE;
+		can_undo = ephy_location_entry_get_can_undo (EPHY_LOCATION_ENTRY (entry));
+		can_redo = ephy_location_entry_get_can_redo (EPHY_LOCATION_ENTRY (entry));
+	}
+	else
+	{
+		EphyEmbed *embed;
+		WebKitWebView *view;
+		CanEditCommandAsyncData *data;
+
+		embed = window->priv->active_embed;
+		g_return_if_fail (embed != NULL);
+
+		view = EPHY_GET_WEBKIT_WEB_VIEW_FROM_EMBED (embed);
+
+		data = can_edit_command_async_data_new (window, "EditCopy", hide);
+		webkit_web_view_can_execute_editing_command (view, WEBKIT_EDITING_COMMAND_COPY, NULL,
+							     (GAsyncReadyCallback)can_edit_command_callback,
+							     data);
+		data = can_edit_command_async_data_new (window, "EditCut", hide);
+		webkit_web_view_can_execute_editing_command (view, WEBKIT_EDITING_COMMAND_CUT, NULL,
+							     (GAsyncReadyCallback)can_edit_command_callback,
+							     data);
+		data = can_edit_command_async_data_new (window, "EditPaste", hide);
+		webkit_web_view_can_execute_editing_command (view, WEBKIT_EDITING_COMMAND_PASTE, NULL,
+							     (GAsyncReadyCallback)can_edit_command_callback,
+							     data);
+		data = can_edit_command_async_data_new (window, "EditUndo", hide);
+		webkit_web_view_can_execute_editing_command (view, "Undo", NULL,
+							     (GAsyncReadyCallback)can_edit_command_callback,
+							     data);
+		data = can_edit_command_async_data_new (window, "EditRedo", hide);
+		webkit_web_view_can_execute_editing_command (view, "Redo", NULL,
+							     (GAsyncReadyCallback)can_edit_command_callback,
+							     data);
+		return;
+	}
+
+	update_edit_action_sensitivity (window, "EditCopy", can_copy, hide);
+	update_edit_action_sensitivity (window, "EditCut", can_cut, hide);
+	update_edit_action_sensitivity (window, "EditPaste", can_paste, hide);
+	update_edit_action_sensitivity (window, "EditUndo", can_undo, hide);
+	update_edit_action_sensitivity (window, "EditRedo", can_redo, hide);
+}
+
+static void
+enable_edit_actions_sensitivity (EphyWindow *window)
+{
+	GtkActionGroup *action_group;
+	GtkAction *action;
+
+	action_group = window->priv->action_group;
+
+	action = gtk_action_group_get_action (action_group, "EditCopy");
+	gtk_action_set_sensitive (action, TRUE);
+	gtk_action_set_visible (action, TRUE);
+	action = gtk_action_group_get_action (action_group, "EditCut");
+	gtk_action_set_sensitive (action, TRUE);
+	gtk_action_set_visible (action, TRUE);
+	action = gtk_action_group_get_action (action_group, "EditPaste");
+	gtk_action_set_sensitive (action, TRUE);
+	gtk_action_set_visible (action, TRUE);
+	action = gtk_action_group_get_action (action_group, "EditUndo");
+	gtk_action_set_sensitive (action, TRUE);
+	gtk_action_set_visible (action, TRUE);
+	action = gtk_action_group_get_action (action_group, "EditRedo");
+	gtk_action_set_sensitive (action, TRUE);
+	gtk_action_set_visible (action, TRUE);
+}
+
+static void
+edit_menu_show_cb (GtkWidget *menu,
+                  EphyWindow *window)
+{
+       update_edit_actions_sensitivity (window, FALSE);
+}
+
+static void
+edit_menu_hide_cb (GtkWidget *menu,
+                  EphyWindow *window)
+{
+       enable_edit_actions_sensitivity (window);
+}
+
+static void
+init_menu_updaters (EphyWindow *window)
+{
+       GtkWidget *edit_menu;
+
+       edit_menu = gtk_ui_manager_get_widget
+               (window->priv->manager, "/ui/PagePopup");
+
+       g_signal_connect (edit_menu, "show",
+                         G_CALLBACK (edit_menu_show_cb), window);
+       g_signal_connect (edit_menu, "hide",
+                         G_CALLBACK (edit_menu_hide_cb), window);
+}
+
+static void
+setup_ui_manager (EphyWindow *window)
+{
+	GtkActionGroup *action_group;
+	GtkAccelGroup *accel_group;
+	GtkAction *action;
+	GtkUIManager *manager;
+
+	window->priv->main_vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 0);
+	gtk_widget_show (window->priv->main_vbox);
+	gtk_container_add (GTK_CONTAINER (window),
+			   window->priv->main_vbox);
+
+	manager = gtk_ui_manager_new ();
+	accel_group = gtk_ui_manager_get_accel_group (manager);
+
+	action_group = gtk_action_group_new ("WindowActions");
+	gtk_action_group_set_translation_domain (action_group, NULL);
+	gtk_action_group_add_actions (action_group, ephy_menu_entries,
+				      G_N_ELEMENTS (ephy_menu_entries), window);
+	gtk_action_group_add_toggle_actions (action_group,
+					     ephy_menu_toggle_entries,
+					     G_N_ELEMENTS (ephy_menu_toggle_entries),
+					     window);
+	gtk_action_group_set_accel_group (action_group, accel_group);
+	gtk_ui_manager_insert_action_group (manager, action_group, 0);
+	window->priv->action_group = action_group;
+	g_object_unref (action_group);
+
+	action = gtk_action_group_get_action (action_group, "FileOpen");
+	g_object_set (action, "short_label", _("Open"), NULL);
+	action = gtk_action_group_get_action (action_group, "FileSaveAs");
+	g_object_set (action, "short_label", _("Save As"), NULL);
+	action = gtk_action_group_get_action (action_group, "FileSaveAsApplication");
+	g_object_set (action, "short_label", _("Save As Application"), NULL);
+	action = gtk_action_group_get_action (action_group, "FilePrint");
+	g_object_set (action, "short_label", _("Print"), NULL);
+	action = gtk_action_group_get_action (action_group, "FileBookmarkPage");
+	g_object_set (action, "short_label", _("Bookmark"), NULL);
+	action = gtk_action_group_get_action (action_group, "EditFind");
+	g_object_set (action, "short_label", _("Find"), NULL);
+
+	action = gtk_action_group_get_action (action_group, "EditFind");
+	g_object_set (action, "is_important", TRUE, NULL);
+
+	action = gtk_action_group_get_action (action_group, "ViewEncoding");
+	g_object_set (action, "hide_if_empty", FALSE, NULL);
+	action = gtk_action_group_get_action (action_group, "ViewZoomIn");
+	/* Translators: This refers to text size */
+	g_object_set (action, "short-label", _("Larger"), NULL);
+	action = gtk_action_group_get_action (action_group, "ViewZoomOut");
+	/* Translators: This refers to text size */
+	g_object_set (action, "short-label", _("Smaller"), NULL);
+
+	action_group = gtk_action_group_new ("PopupsActions");
+	gtk_action_group_set_translation_domain (action_group, NULL);
+	gtk_action_group_add_actions (action_group, ephy_popups_entries,
+				      G_N_ELEMENTS (ephy_popups_entries), window);
+	gtk_action_group_set_accel_group (action_group, accel_group);
+	gtk_ui_manager_insert_action_group (manager, action_group, 0);
+	window->priv->popups_action_group = action_group;
+	g_object_unref (action_group);
+
+	/* Tab accels */
+	action_group = gtk_action_group_new ("TabAccelsActions");
+	gtk_action_group_set_accel_group (action_group, accel_group);
+	gtk_ui_manager_insert_action_group (manager, action_group, 0);
+	window->priv->tab_accels_action_group = action_group;
+	g_object_unref (action_group);
+
+	action_group = gtk_action_group_new ("SpecialToolbarActions");
+	action =
+		g_object_new (EPHY_TYPE_NAVIGATION_HISTORY_ACTION,
+			      "name", "NavigationBack",
+			      "label", _("Back"),
+			      "icon-name", "go-previous-symbolic",
+			      "window", window,
+			      "direction", EPHY_NAVIGATION_HISTORY_DIRECTION_BACK,
+			      NULL);
+	gtk_action_group_add_action_with_accel (action_group, action,
+						"<alt>Left");
+	g_object_unref (action);
+
+	action =
+		g_object_new (EPHY_TYPE_NAVIGATION_HISTORY_ACTION,
+			      "name", "NavigationForward",
+			      "label", _("Forward"),
+			      "icon-name", "go-next-symbolic",
+			      "window", window,
+			      "direction", EPHY_NAVIGATION_HISTORY_DIRECTION_FORWARD,
+			      NULL);
+	gtk_action_group_add_action_with_accel (action_group, action,
+						"<alt>Right");
+	g_object_unref (action);
+
+	action =
+		g_object_new (EPHY_TYPE_ZOOM_ACTION,
+			      "name", "Zoom",
+			      "label", _("Zoom"),
+			      "zoom", 1.0,
+			      NULL);
+	gtk_action_group_add_action (action_group, action);
+	g_object_unref (action);
+
+	action = g_object_new (EPHY_TYPE_HOME_ACTION,
+			       "name", "FileNewTab",
+			       "icon-name", "tab-new-symbolic",
+			       "label", _("New _Tab"),
+			       NULL);
+	gtk_action_group_add_action_with_accel (action_group, action, "<control>T");
+	g_object_unref (action);
+
+	action =
+		g_object_new (EPHY_TYPE_HOME_ACTION,
+			      "name", "FileHome",
+			      "label", _("Go to most visited"),
+			      NULL);
+	gtk_action_group_add_action_with_accel (action_group, action, "<alt>Home");
+	g_signal_connect_swapped (action, "open-link",
+				  G_CALLBACK (ephy_link_open), window);
+	g_object_unref (action);
+
+	action = g_object_new (EPHY_TYPE_COMBINED_STOP_RELOAD_ACTION,
+			       "name", "ViewCombinedStopReload",
+			       "loading", FALSE,
+			       "window", window,
+			       NULL);
+	gtk_action_group_add_action (action_group, action);
+	g_object_unref (action);
+
+	gtk_action_group_set_accel_group (action_group, accel_group);
+	gtk_ui_manager_insert_action_group (manager, action_group, 0);
+	window->priv->toolbar_action_group = action_group;
+	g_object_unref (action_group);
+
+	window->priv->manager = manager;
+	gtk_window_add_accel_group (GTK_WINDOW (window), accel_group);
+}
+
+static char *
+calculate_location (const char *typed_address, const char *address)
+{
+	const char *location;
+
+	/* If there's a typed address, use that over address. Never
+	 * show URIs in the 'do_not_show_address' array. */
+	location = typed_address ? typed_address : address;
+	location = ephy_embed_utils_is_no_show_address (location) ? NULL : location;
+
+	return g_strdup (location);
+}
+
+static void
+_ephy_window_set_default_actions_sensitive (EphyWindow *window,
+					    guint flags,
+					    gboolean set)
+{
+	EphyWindowPrivate *priv = window->priv;
+	GtkActionGroup *action_group;
+	GtkAction *action;
+	int i;
+	const char *action_group_actions[] = { "FileSaveAs", "FileSaveAsApplication", "FilePrint",
+					       "FileSendTo", "FileBookmarkPage", "EditFind",
+					       "EditFindPrev", "EditFindNext", "ViewEncoding",
+					       "ViewZoomIn", "ViewZoomOut", "ViewPageSource",
+					       NULL };
+
+	action_group = priv->action_group;
+
+	/* Page menu */
+	for (i = 0; action_group_actions[i] != NULL; i++)
+	{
+		action = gtk_action_group_get_action (action_group,
+						      action_group_actions[i]);
+		ephy_action_change_sensitivity_flags (action,
+						      flags, set);
+	}
+
+	/* Page context popup */
+	action = gtk_action_group_get_action (priv->popups_action_group,
+					      "ContextBookmarkPage");
+	ephy_action_change_sensitivity_flags (action,
+					      flags, set);
+
+	/* Toolbar */
+	action = gtk_action_group_get_action (priv->toolbar_action_group,
+					      "ViewCombinedStopReload");
+	ephy_action_change_sensitivity_flags (action,
+					      flags, set);
+}
+
+static void
+sync_tab_address (EphyWebView *view,
+	          GParamSpec *pspec,
+		  EphyWindow *window)
+{
+	EphyWindowPrivate *priv = window->priv;
+	const char *address;
+	const char *typed_address;
+	char *location;
+
+	if (priv->closing) return;
+
+	address = ephy_web_view_get_address (view);
+	typed_address = ephy_web_view_get_typed_address (view);
+
+	_ephy_window_set_default_actions_sensitive (window,
+						    SENS_FLAG_IS_BLANK,
+						    ephy_web_view_is_overview (view));
+
+	location = calculate_location (typed_address, address);
+	ephy_window_set_location (window, location);
+	g_free (location);
+}
+
+static void
+sync_tab_zoom (WebKitWebView *web_view, GParamSpec *pspec, EphyWindow *window)
+{
+	GtkActionGroup *action_group;
+	GtkAction *action;
+	gboolean can_zoom_in = TRUE, can_zoom_out = TRUE, can_zoom_normal = FALSE;
+	double zoom;
+
+	if (window->priv->closing) return;
+
+	zoom = webkit_web_view_get_zoom_level (web_view);
+
+	if (zoom >= ZOOM_MAXIMAL)
+	{
+		can_zoom_in = FALSE;
+	}
+
+	if (zoom <= ZOOM_MINIMAL)
+	{
+		can_zoom_out = FALSE;
+	}
+
+	if (zoom != 1.0)
+	{
+		can_zoom_normal = TRUE;
+	}
+
+	action_group = window->priv->action_group;
+	action = gtk_action_group_get_action (action_group, "ViewZoomIn");
+	gtk_action_set_sensitive (action, can_zoom_in);
+	action = gtk_action_group_get_action (action_group, "ViewZoomOut");
+	gtk_action_set_sensitive (action, can_zoom_out);
+	action = gtk_action_group_get_action (action_group, "ViewZoomNormal");
+	gtk_action_set_sensitive (action, can_zoom_normal);
+}
+
+static void
+sync_tab_document_type (EphyWebView *view,
+			GParamSpec *pspec,
+			EphyWindow *window)
+{
+	EphyWindowPrivate *priv = window->priv;
+	GtkActionGroup *action_group = priv->action_group;
+	GtkAction *action;
+	EphyWebViewDocumentType type;
+	gboolean can_find, disable, is_image;
+
+	if (priv->closing) return;
+
+	/* update zoom actions */
+	sync_tab_zoom (WEBKIT_WEB_VIEW (view), NULL, window);
+	
+	type = ephy_web_view_get_document_type (view);
+	can_find = (type != EPHY_WEB_VIEW_DOCUMENT_IMAGE);
+	is_image = type == EPHY_WEB_VIEW_DOCUMENT_IMAGE;
+	disable = (type != EPHY_WEB_VIEW_DOCUMENT_HTML);
+
+	action = gtk_action_group_get_action (action_group, "ViewEncoding");
+	ephy_action_change_sensitivity_flags (action, SENS_FLAG_DOCUMENT, disable);
+	action = gtk_action_group_get_action (action_group, "ViewPageSource");
+	ephy_action_change_sensitivity_flags (action, SENS_FLAG_DOCUMENT, is_image);
+	action = gtk_action_group_get_action (action_group, "EditFind");
+	ephy_action_change_sensitivity_flags (action, SENS_FLAG_DOCUMENT, !can_find);
+	action = gtk_action_group_get_action (action_group, "EditFindNext");
+	ephy_action_change_sensitivity_flags (action, SENS_FLAG_DOCUMENT, !can_find);
+	action = gtk_action_group_get_action (action_group, "EditFindPrev");
+	ephy_action_change_sensitivity_flags (action, SENS_FLAG_DOCUMENT, !can_find);
+
+	if (!can_find)
+	{
+		ephy_find_toolbar_request_close (ephy_embed_get_find_toolbar (priv->active_embed));
+	}
+}
+
+static void
+_ephy_window_action_set_favicon (EphyWindow *window,
+				 GdkPixbuf *icon)
+{
+	EphyWindowPrivate *priv = window->priv;
+
+	g_object_set (priv->location_controller, "icon", icon, NULL);
+}
+
+static void
+sync_tab_icon (EphyWebView *view,
+	       GParamSpec *pspec,
+	       EphyWindow *window)
+{
+	EphyWindowPrivate *priv = window->priv;
+	GdkPixbuf *icon;
+
+	if (priv->closing) return;
+
+	icon = ephy_web_view_get_icon (view);
+
+	_ephy_window_action_set_favicon (window, icon);
+}
+
+static void
+_ephy_window_set_navigation_flags (EphyWindow *window,
+				   EphyWebViewNavigationFlags flags)
+{
+	GtkAction *action;
+
+	action = gtk_action_group_get_action (window->priv->toolbar_action_group, "NavigationBack");
+	gtk_action_set_sensitive (action, flags & EPHY_WEB_VIEW_NAV_BACK);
+	action = gtk_action_group_get_action (window->priv->toolbar_action_group, "NavigationForward");
+	gtk_action_set_sensitive (action, flags & EPHY_WEB_VIEW_NAV_FORWARD);
+}
+
+static void
+sync_tab_navigation (EphyWebView *view,
+		     GParamSpec *pspec,
+		     EphyWindow *window)
+{
+	if (window->priv->closing) return;
+
+	_ephy_window_set_navigation_flags (window,
+					   ephy_web_view_get_navigation_flags (view));
+}
+
+static void
+sync_tab_is_blank (EphyWebView *view,
+		   GParamSpec *pspec,
+		   EphyWindow *window)
+{
+	if (window->priv->closing) return;
+
+	_ephy_window_set_default_actions_sensitive (window,
+						    SENS_FLAG_IS_BLANK,
+						    ephy_web_view_get_is_blank (view));
+}
+
+static void
+sync_tab_popup_windows (EphyWebView *view,
+			GParamSpec *pspec,
+			EphyWindow *window)
+{
+	/* FIXME: show popup count somehow */
+}
+
+static void
+sync_tab_popups_allowed (EphyWebView *view,
+			 GParamSpec *pspec,
+			 EphyWindow *window)
+{
+	GtkAction *action;
+	gboolean allow;
+
+	g_return_if_fail (EPHY_IS_WEB_VIEW (view));
+	g_return_if_fail (EPHY_IS_WINDOW (window));
+
+	action = gtk_action_group_get_action (window->priv->action_group,
+					      "ViewPopupWindows");
+	g_return_if_fail (GTK_IS_ACTION (action));
+
+	g_object_get (view, "popups-allowed", &allow, NULL);
+
+	g_signal_handlers_block_by_func
+		(G_OBJECT (action),
+		 G_CALLBACK (ephy_window_view_popup_windows_cb),
+		 window);
+
+	gtk_toggle_action_set_active (GTK_TOGGLE_ACTION (action), allow);
+
+	g_signal_handlers_unblock_by_func
+		(G_OBJECT (action),
+		 G_CALLBACK (ephy_window_view_popup_windows_cb),
+		 window);
+}
+
+static void
+sync_tab_title (EphyEmbed *embed,
+		GParamSpec *pspec,
+		EphyWindow *window)
+{
+	EphyWindowPrivate *priv = window->priv;
+
+	if (priv->closing) return;
+
+	gtk_window_set_title (GTK_WINDOW(window),
+			      ephy_embed_get_title (embed));
+}
+
+static gboolean
+idle_unref_context_event (EphyWindow *window)
+{
+	EphyWindowPrivate *priv = window->priv;
+
+	LOG ("Idle unreffing context event %p", priv->context_event);
+
+	if (priv->context_event != NULL)
+	{
+		g_object_unref (priv->context_event);
+		priv->context_event = NULL;
+	}
+
+	priv->idle_worker = 0;
+	return FALSE;
+}
+
+static void
+_ephy_window_set_context_event (EphyWindow *window,
+				EphyEmbedEvent *event)
+{
+	EphyWindowPrivate *priv = window->priv;
+
+	if (priv->idle_worker != 0)
+	{
+		g_source_remove (priv->idle_worker);
+		priv->idle_worker = 0;
+	}
+
+	if (priv->context_event != NULL)
+	{
+		g_object_unref (priv->context_event);
+	}
+
+	priv->context_event = event != NULL ? g_object_ref (event) : NULL;
+}
+
+static void
+_ephy_window_unset_context_event (EphyWindow *window)
+{
+	EphyWindowPrivate *priv = window->priv;
+
+	/* Unref the event from idle since we still need it
+	 * from the action callbacks which will run before idle.
+	 */
+	if (priv->idle_worker == 0 && priv->context_event != NULL)
+	{
+		priv->idle_worker =
+			g_idle_add ((GSourceFunc) idle_unref_context_event, window);
+	}
+}
+
+static void
+context_menu_dismissed_cb (WebKitWebView *webView,
+			   EphyWindow *window)
+{
+	LOG ("Deactivating popup menu");
+
+	enable_edit_actions_sensitivity (window);
+
+	g_signal_handlers_disconnect_by_func
+		(webView, G_CALLBACK (context_menu_dismissed_cb), window);
+
+	_ephy_window_unset_context_event (window);
+}
+
+static void
+add_action_to_context_menu (WebKitContextMenu *context_menu,
+			    GtkActionGroup *action_group,
+			    const char *action_name)
+{
+	GtkAction *action;
+
+	action = gtk_action_group_get_action (action_group, action_name);
+	webkit_context_menu_append (context_menu, webkit_context_menu_item_new (action));
+}
+
+static void
+add_item_to_context_menu (WebKitContextMenu *context_menu,
+			  WebKitContextMenuItem *item)
+{
+	if (!item)
+		return;
+
+	webkit_context_menu_append (context_menu, item);
+	g_object_unref (item);
+}
+
+/* FIXME: Add webkit_context_menu_find() ? */
+static WebKitContextMenuItem *
+find_item_in_context_menu (WebKitContextMenu *context_menu,
+			   WebKitContextMenuAction action)
+{
+	GList *items, *iter;
+
+	items = webkit_context_menu_get_items (context_menu);
+	for (iter = items; iter; iter = g_list_next (iter))
+	{
+		WebKitContextMenuItem *item = (WebKitContextMenuItem *)iter->data;
+
+		if (webkit_context_menu_item_get_stock_action (item) == action)
+			return g_object_ref (item);
+	}
+
+	return NULL;
+}
+
+static GList *
+find_spelling_guess_context_menu_items (WebKitContextMenu *context_menu)
+{
+	GList *items, *iter;
+	guint i;
+	GList *retval = NULL;
+
+	items = webkit_context_menu_get_items (context_menu);
+	for (iter = items, i = 0; iter && i < MAX_SPELL_CHECK_GUESSES; iter = g_list_next (iter), i++)
+	{
+		WebKitContextMenuItem *item = (WebKitContextMenuItem *)iter->data;
+
+		if (webkit_context_menu_item_get_stock_action (item) == WEBKIT_CONTEXT_MENU_ACTION_SPELLING_GUESS)
+		{
+			retval = g_list_prepend (retval, g_object_ref (item));
+		}
+		else
+		{
+			/* Spelling guesses are always at the beginning of the context menu, so
+			 * we can break the loop as soon as we find the first item that is not
+			 * spelling guess.
+			 */
+			break;
+		}
+	}
+
+	return g_list_reverse (retval);
+}
+
+static gboolean
+populate_context_menu (WebKitWebView *web_view,
+		       WebKitContextMenu *context_menu,
+		       GdkEvent *event,
+		       WebKitHitTestResult *hit_test_result,
+		       EphyWindow *window)
+{
+	EphyWindowPrivate *priv = window->priv;
+	WebKitContextMenuItem *input_methods_item = NULL;
+	WebKitContextMenuItem *unicode_item = NULL;
+	WebKitContextMenuItem *play_pause_item = NULL;
+	WebKitContextMenuItem *mute_item = NULL;
+	WebKitContextMenuItem *toggle_controls_item = NULL;
+	WebKitContextMenuItem *toggle_loop_item = NULL;
+	WebKitContextMenuItem *fullscreen_item = NULL;
+	GList *spelling_guess_items = NULL;
+	EphyEmbedEvent *embed_event;
+	gboolean is_document = FALSE;
+	gboolean app_mode;
+	gboolean is_image;
+	gboolean is_media = FALSE;
+	gboolean is_video = FALSE;
+	gboolean is_audio = FALSE;
+
+	is_image = webkit_hit_test_result_context_is_image (hit_test_result);
+
+	if (webkit_hit_test_result_context_is_editable (hit_test_result)) {
+		input_methods_item = find_item_in_context_menu (context_menu, WEBKIT_CONTEXT_MENU_ACTION_INPUT_METHODS);
+		unicode_item = find_item_in_context_menu (context_menu, WEBKIT_CONTEXT_MENU_ACTION_UNICODE);
+		spelling_guess_items = find_spelling_guess_context_menu_items (context_menu);
+	}
+
+	if (webkit_hit_test_result_context_is_media (hit_test_result))
+	{
+		WebKitContextMenuItem *item;
+
+		is_media = TRUE;
+		play_pause_item = find_item_in_context_menu (context_menu, WEBKIT_CONTEXT_MENU_ACTION_MEDIA_PLAY);
+		if (!play_pause_item)
+			play_pause_item = find_item_in_context_menu (context_menu, WEBKIT_CONTEXT_MENU_ACTION_MEDIA_PAUSE);
+		mute_item = find_item_in_context_menu (context_menu, WEBKIT_CONTEXT_MENU_ACTION_MEDIA_MUTE);
+		toggle_controls_item = find_item_in_context_menu (context_menu, WEBKIT_CONTEXT_MENU_ACTION_TOGGLE_MEDIA_CONTROLS);
+		toggle_loop_item = find_item_in_context_menu (context_menu, WEBKIT_CONTEXT_MENU_ACTION_TOGGLE_MEDIA_LOOP);
+		fullscreen_item = find_item_in_context_menu (context_menu, WEBKIT_CONTEXT_MENU_ACTION_ENTER_VIDEO_FULLSCREEN);
+
+		item = find_item_in_context_menu (context_menu, WEBKIT_CONTEXT_MENU_ACTION_COPY_VIDEO_LINK_TO_CLIPBOARD);
+		if (item)
+		{
+			is_video = TRUE;
+			g_object_unref (item);
+		}
+		else
+		{
+			item = find_item_in_context_menu (context_menu, WEBKIT_CONTEXT_MENU_ACTION_COPY_AUDIO_LINK_TO_CLIPBOARD);
+			if (item)
+			{
+				is_audio = TRUE;
+				g_object_unref (item);
+			}
+		}
+	}
+
+	webkit_context_menu_remove_all (context_menu);
+
+	embed_event = ephy_embed_event_new ((GdkEventButton *)event, hit_test_result);
+	_ephy_window_set_context_event (window, embed_event);
+	g_object_unref (embed_event);
+
+	app_mode = ephy_embed_shell_get_mode (ephy_embed_shell_get_default ()) == EPHY_EMBED_SHELL_MODE_APPLICATION;
+
+	update_edit_actions_sensitivity (window, FALSE);
+
+	if (webkit_hit_test_result_context_is_link (hit_test_result))
+	{
+		const char *uri;
+		gboolean link_has_web_scheme;
+
+		uri = webkit_hit_test_result_get_link_uri (hit_test_result);
+		link_has_web_scheme = ephy_embed_utils_address_has_web_scheme (uri);
+
+		update_edit_actions_sensitivity (window, TRUE);
+		update_link_actions_sensitivity (window, link_has_web_scheme);
+
+		if (!app_mode)
+		{
+			add_action_to_context_menu (context_menu,
+						    priv->popups_action_group, "OpenLinkInNewTab");
+			add_action_to_context_menu (context_menu,
+						    priv->popups_action_group, "OpenLinkInNewWindow");
+			webkit_context_menu_append (context_menu,
+						    webkit_context_menu_item_new_separator ());
+		}
+		add_action_to_context_menu (context_menu,
+					    priv->action_group, "EditCopy");
+		webkit_context_menu_append (context_menu,
+					    webkit_context_menu_item_new_separator ());
+		add_action_to_context_menu (context_menu,
+					    priv->popups_action_group, "DownloadLinkAs");
+
+		if (g_str_has_prefix (uri, "mailto:"))
+		{
+			add_action_to_context_menu (context_menu,
+						    priv->popups_action_group, "CopyEmailAddress");
+		}
+		else
+		{
+			add_action_to_context_menu (context_menu,
+						    priv->popups_action_group, "CopyLinkAddress");
+		}
+	}
+	else if (webkit_hit_test_result_context_is_editable (hit_test_result))
+	{
+		GList *l;
+		gboolean has_guesses = FALSE;
+
+		for (l = spelling_guess_items; l; l = g_list_next (l))
+		{
+			WebKitContextMenuItem *item = WEBKIT_CONTEXT_MENU_ITEM (l->data);
+
+			webkit_context_menu_append (context_menu, item);
+			g_object_unref (item);
+			has_guesses = TRUE;
+		}
+		g_list_free (spelling_guess_items);
+
+		if (has_guesses)
+		{
+			webkit_context_menu_append (context_menu,
+						    webkit_context_menu_item_new_separator ());
+		}
+
+		update_edit_actions_sensitivity (window, FALSE);
+
+		add_action_to_context_menu (context_menu,
+					    priv->action_group, "EditUndo");
+		add_action_to_context_menu (context_menu,
+					    priv->action_group, "EditRedo");
+		webkit_context_menu_append (context_menu,
+					    webkit_context_menu_item_new_separator ());
+		add_action_to_context_menu (context_menu,
+					    priv->action_group, "EditCut");
+		add_action_to_context_menu (context_menu,
+					    priv->action_group, "EditCopy");
+		add_action_to_context_menu (context_menu,
+					    priv->action_group, "EditPaste");
+		webkit_context_menu_append (context_menu,
+					    webkit_context_menu_item_new_separator ());
+		add_action_to_context_menu (context_menu,
+					    priv->action_group, "EditSelectAll");
+		if (input_methods_item || unicode_item)
+			webkit_context_menu_append (context_menu,
+						    webkit_context_menu_item_new_separator ());
+		add_item_to_context_menu (context_menu, input_methods_item);
+		add_item_to_context_menu (context_menu, unicode_item);
+	}
+	else
+	{
+		is_document = TRUE;
+
+		update_edit_actions_sensitivity (window, TRUE);
+
+		if (!is_image && !is_media)
+		{
+			add_action_to_context_menu (context_menu,
+						    priv->toolbar_action_group, "NavigationBack");
+			add_action_to_context_menu (context_menu,
+						    priv->toolbar_action_group, "NavigationForward");
+			add_action_to_context_menu (context_menu,
+						    priv->action_group, "ViewReload");
+			webkit_context_menu_append (context_menu,
+						    webkit_context_menu_item_new_separator ());
+		}
+
+		add_action_to_context_menu (context_menu,
+					    priv->action_group, "EditCopy");
+
+		if (!app_mode && !is_image && !is_media)
+		{
+			webkit_context_menu_append (context_menu,
+						    webkit_context_menu_item_new_separator ());
+			add_action_to_context_menu (context_menu,
+						    priv->popups_action_group, "ContextBookmarkPage");
+		}
+	}
+
+	if (is_image)
+	{
+		webkit_context_menu_append (context_menu,
+					    webkit_context_menu_item_new_separator ());
+		add_action_to_context_menu (context_menu,
+					    priv->popups_action_group, "SaveImageAs");
+		add_action_to_context_menu (context_menu,
+					    priv->popups_action_group, "CopyImageLocation");
+		add_action_to_context_menu (context_menu,
+					    priv->popups_action_group, "ViewImage");
+		add_action_to_context_menu (context_menu,
+					    priv->popups_action_group, "SetImageAsBackground");
+	}
+
+	if (is_media)
+	{
+		add_item_to_context_menu (context_menu, play_pause_item);
+		add_item_to_context_menu (context_menu, mute_item);
+		add_item_to_context_menu (context_menu, toggle_controls_item);
+		add_item_to_context_menu (context_menu, toggle_loop_item);
+		add_item_to_context_menu (context_menu, fullscreen_item);
+		webkit_context_menu_append (context_menu,
+					    webkit_context_menu_item_new_separator ());
+		if (is_video)
+		{
+			add_action_to_context_menu (context_menu, priv->popups_action_group,
+						    "OpenVideoInNewWindow");
+			add_action_to_context_menu (context_menu, priv->popups_action_group,
+						    "OpenVideoInNewTab");
+			add_action_to_context_menu (context_menu, priv->popups_action_group,
+						    "SaveVideoAs");
+			add_action_to_context_menu (context_menu, priv->popups_action_group,
+						    "CopyVideoLocation");
+		}
+		else if (is_audio)
+		{
+			add_action_to_context_menu (context_menu, priv->popups_action_group,
+						    "OpenAudioInNewWindow");
+			add_action_to_context_menu (context_menu, priv->popups_action_group,
+						    "OpenAudioInNewTab");
+			add_action_to_context_menu (context_menu, priv->popups_action_group,
+						    "SaveAudioAs");
+			add_action_to_context_menu (context_menu, priv->popups_action_group,
+						    "CopyAudioLocation");
+		}
+	}
+
+	g_signal_connect (web_view, "context-menu-dismissed",
+			  G_CALLBACK (context_menu_dismissed_cb),
+			  window);
+
+	if (app_mode)
+		return FALSE;
+
+	if (is_document && !is_image && !is_media)
+	{
+		webkit_context_menu_append (context_menu,
+					    webkit_context_menu_item_new_separator ());
+		add_action_to_context_menu (context_menu,
+					    priv->action_group, "FileSendTo");
+	}
+
+	webkit_context_menu_append (context_menu,
+				    webkit_context_menu_item_new_separator ());
+	webkit_context_menu_append (context_menu,
+				    webkit_context_menu_item_new_from_stock_action (WEBKIT_CONTEXT_MENU_ACTION_INSPECT_ELEMENT));
+
+	return FALSE;
+}
+
+static gboolean
+save_target_uri (EphyWindow *window,
+		 WebKitWebView *view,
+		 GdkEventButton *event,
+		 WebKitHitTestResult *hit_test_result)
+{
+	guint context;
+	char *location = NULL;
+	gboolean retval = FALSE;
+
+	g_object_get (hit_test_result, "context", &context, NULL);
+
+	LOG ("ephy_window_dom_mouse_click_cb: button %d, context %d, modifier %d (%d:%d)",
+	     event->button, context, event->state, (int)event->x, (int)event->y);
+
+	/* shift+click saves the link target */
+	if (context & WEBKIT_HIT_TEST_RESULT_CONTEXT_LINK)
+	{
+		g_object_get (G_OBJECT (hit_test_result), "link-uri", &location, NULL);
+	}
+	/* Note: pressing enter to submit a form synthesizes a mouse
+	 * click event
+	 */
+	/* shift+click saves the non-link image */
+	else if (context & WEBKIT_HIT_TEST_RESULT_CONTEXT_IMAGE &&
+		 !(context & WEBKIT_HIT_TEST_RESULT_CONTEXT_EDITABLE))
+	{
+		g_object_get (G_OBJECT (hit_test_result), "image-uri", &location, NULL);
+	}
+
+	if (location)
+	{
+		LOG ("Location: %s", location);
+
+		retval = ephy_embed_utils_address_has_web_scheme (location);
+		if (retval)
+		{
+			EphyDownload *download;
+
+			download = ephy_download_new_for_uri (location, GTK_WINDOW (window));
+			ephy_download_set_action (download, EPHY_DOWNLOAD_ACTION_OPEN);
+			ephy_window_add_download (window, download);
+			g_object_unref (download);
+		}
+
+		g_free (location);
+	}
+
+	return retval;
+}
+
+static gboolean
+ephy_window_dom_mouse_click_cb (WebKitWebView *view,
+				GdkEventButton *event,
+				EphyWindow *window)
+{
+	WebKitHitTestResult *hit_test_result;
+	gboolean handled = FALSE;
+
+	/* Since we're only dealing with shift+click, we can do these
+	   checks early. */
+	if (!(event->state & GDK_SHIFT_MASK) || event->button != GDK_BUTTON_PRIMARY)
+	{
+		return FALSE;
+	}
+
+	hit_test_result = g_object_ref (window->priv->hit_test_result);
+	handled = save_target_uri (window, view, event, hit_test_result);
+	g_object_unref (hit_test_result);
+
+	return handled;
+}
+
+static void
+ephy_window_mouse_target_changed_cb (WebKitWebView *web_view,
+				     WebKitHitTestResult *hit_test_result,
+				     guint modifiers,
+				     EphyWindow *window)
+{
+	EphyWindowPrivate *priv = window->priv;
+
+	if (priv->hit_test_result)
+		g_object_unref (priv->hit_test_result);
+	priv->hit_test_result = g_object_ref (hit_test_result);
+}
+
+static void
+ephy_window_set_is_popup (EphyWindow *window,
+			  gboolean is_popup)
+{
+	EphyWindowPrivate *priv = window->priv;
+
+	priv->is_popup = is_popup;
+
+	g_object_notify (G_OBJECT (window), "is-popup");
+}
+
+static void
+window_properties_geometry_changed (WebKitWindowProperties *properties,
+				    GParamSpec *pspec,
+				    EphyWindow *window)
+{
+	GdkRectangle geometry;
+
+	webkit_window_properties_get_geometry (properties, &geometry);
+	if (geometry.x >= 0 && geometry.y >= 0)
+		gtk_window_move (GTK_WINDOW (window), geometry.x, geometry.y);
+	if (geometry.width > 0 && geometry.height > 0)
+		gtk_window_resize (GTK_WINDOW (window), geometry.width, geometry.height);
+}
+
+static void
+ephy_window_configure_for_view (EphyWindow *window,
+				WebKitWebView *web_view)
+{
+	WebKitWindowProperties *properties;
+	GdkRectangle geometry;
+	EphyWindowChrome chrome = 0;
+
+	properties = webkit_web_view_get_window_properties (web_view);
+
+	if (webkit_window_properties_get_toolbar_visible (properties))
+		chrome |= EPHY_WINDOW_CHROME_TOOLBAR;
+
+	if (ephy_embed_shell_get_mode (ephy_embed_shell_get_default ()) != EPHY_EMBED_SHELL_MODE_APPLICATION)
+	{
+		GtkWidget *entry;
+
+		entry = ephy_toolbar_get_location_entry (EPHY_TOOLBAR (window->priv->toolbar));
+		gtk_editable_set_editable (GTK_EDITABLE (entry), FALSE);
+
+		if (webkit_window_properties_get_menubar_visible (properties))
+			chrome |= EPHY_WINDOW_CHROME_MENU;
+		if (webkit_window_properties_get_locationbar_visible (properties))
+			chrome |= EPHY_WINDOW_CHROME_LOCATION;
+	}
+
+	webkit_window_properties_get_geometry (properties, &geometry);
+	if (geometry.width > 0 && geometry.height > 0)
+		gtk_window_set_default_size (GTK_WINDOW (window), geometry.width, geometry.height);
+
+	if (!webkit_window_properties_get_resizable (properties))
+		gtk_window_set_resizable (GTK_WINDOW (window), FALSE);
+
+	window->priv->is_popup = TRUE;
+	ephy_window_set_chrome (window, chrome);
+	g_signal_connect (properties, "notify::geometry",
+			  G_CALLBACK (window_properties_geometry_changed),
+			  window);
+}
+
+static gboolean
+web_view_ready_cb (WebKitWebView *web_view,
+		   WebKitWebView *parent_web_view)
+{
+	EphyWindow *window, *parent_view_window;
+	gboolean using_new_window;
+
+	window = EPHY_WINDOW (gtk_widget_get_toplevel (GTK_WIDGET (web_view)));
+	parent_view_window = EPHY_WINDOW (gtk_widget_get_toplevel (GTK_WIDGET (parent_web_view)));
+
+	using_new_window = window != parent_view_window;
+
+	if (using_new_window)
+	{
+		ephy_window_configure_for_view (window, web_view);
+		g_signal_emit_by_name (parent_web_view, "new-window", web_view);
+	}
+
+	if (ephy_embed_shell_get_mode (ephy_embed_shell_get_default ()) == EPHY_EMBED_SHELL_MODE_APPLICATION &&
+	    !webkit_web_view_get_uri(web_view))
+	{
+		/* Wait until we have a valid URL to decide whether to show the window
+		 * or load the URL in the default web browser
+		 */
+		g_object_set_data_full (G_OBJECT (window), "referrer",
+					g_strdup (webkit_web_view_get_uri (parent_web_view)),
+					g_free);
+		return TRUE;
+	}
+
+	gtk_widget_show (GTK_WIDGET (window));
+
+	return TRUE;
+}
+
+static WebKitWebView *
+create_web_view_cb (WebKitWebView *web_view,
+		    WebKitNavigationAction *navigation_action,
+		    EphyWindow *window)
+{
+	EphyEmbed *embed;
+	WebKitWebView *new_web_view;
+	EphyNewTabFlags flags;
+	EphyWindow *target_window;
+
+	if ((ephy_embed_shell_get_mode (ephy_embed_shell_get_default ()) != EPHY_EMBED_SHELL_MODE_APPLICATION) &&
+	    (g_settings_get_boolean (EPHY_SETTINGS_MAIN,
+				     EPHY_PREFS_NEW_WINDOWS_IN_TABS) ||
+	     g_settings_get_boolean (EPHY_SETTINGS_LOCKDOWN,
+				     EPHY_PREFS_LOCKDOWN_FULLSCREEN)))
+	{
+		target_window = window;
+		flags = EPHY_NEW_TAB_JUMP |
+			EPHY_NEW_TAB_APPEND_AFTER;
+	}
+	else
+	{
+		target_window = ephy_window_new ();
+		flags = EPHY_NEW_TAB_DONT_SHOW_WINDOW;
+	}
+
+	embed = ephy_shell_new_tab_full (ephy_shell_get_default (),
+					 NULL,
+					 web_view,
+					 target_window,
+					 EPHY_GET_EMBED_FROM_EPHY_WEB_VIEW (web_view),
+					 flags,
+					 0);
+	if (target_window == window)
+		gtk_widget_grab_focus (GTK_WIDGET (embed));
+
+	new_web_view = EPHY_GET_WEBKIT_WEB_VIEW_FROM_EMBED (embed);
+	g_signal_connect (new_web_view, "ready-to-show",
+			  G_CALLBACK (web_view_ready_cb),
+			  web_view);
+
+	return new_web_view;
+}
+
+static gboolean
+decide_policy_cb (WebKitWebView *web_view,
+		  WebKitPolicyDecision *decision,
+		  WebKitPolicyDecisionType decision_type,
+		  EphyWindow *window)
+{
+	WebKitNavigationPolicyDecision *navigation_decision;
+	WebKitNavigationAction *navigation_action;
+	WebKitNavigationType navigation_type;
+	WebKitURIRequest *request;
+	const char *uri;
+	EphyEmbed *embed;
+
+	if (decision_type == WEBKIT_POLICY_DECISION_TYPE_RESPONSE)
+		return FALSE;
+
+	navigation_decision = WEBKIT_NAVIGATION_POLICY_DECISION (decision);
+	navigation_action = webkit_navigation_policy_decision_get_navigation_action (navigation_decision);
+	request = webkit_navigation_action_get_request (navigation_action);
+	uri = webkit_uri_request_get_uri (request);
+
+	if (!ephy_embed_utils_address_has_web_scheme (uri))
+	{
+		GError *error = NULL;
+		GdkScreen *screen;
+
+		screen = gtk_widget_get_screen (GTK_WIDGET (web_view));
+		gtk_show_uri (screen, uri, GDK_CURRENT_TIME, &error);
+
+		if (error)
+		{
+			LOG ("failed to handle non web scheme: %s", error->message);
+			g_error_free (error);
+
+			return FALSE;
+		}
+
+		webkit_policy_decision_ignore (decision);
+
+		return TRUE;
+	}
+
+	if (decision_type == WEBKIT_POLICY_DECISION_TYPE_NEW_WINDOW_ACTION)
+	{
+		const char *frame_name = webkit_navigation_policy_decision_get_frame_name (navigation_decision);
+
+		if (g_strcmp0 (frame_name, "_evince_download") == 0)
+		{
+			/* The Evince Browser Plugin is requesting us to downlod the document */
+			webkit_policy_decision_download (decision);
+			return TRUE;
+		}
+
+		if (!g_settings_get_boolean (EPHY_SETTINGS_WEB, EPHY_PREFS_WEB_ENABLE_POPUPS) &&
+		    !webkit_navigation_action_is_user_gesture (navigation_action))
+		{
+			webkit_policy_decision_ignore (decision);
+			return TRUE;
+		}
+	}
+
+	navigation_type = webkit_navigation_action_get_navigation_type (navigation_action);
+
+	if (ephy_embed_shell_get_mode (ephy_embed_shell_get_default ()) == EPHY_EMBED_SHELL_MODE_APPLICATION)
+	{
+		if (!gtk_widget_is_visible (GTK_WIDGET (window)))
+		{
+			char *referrer;
+
+			referrer = (char *)g_object_get_data (G_OBJECT (window), "referrer");
+
+			if (ephy_embed_utils_urls_have_same_origin (uri, referrer))
+			{
+				gtk_widget_show (GTK_WIDGET (window));
+			}
+			else
+			{
+				ephy_file_open_uri_in_default_browser (uri, GDK_CURRENT_TIME,
+								       gtk_window_get_screen (GTK_WINDOW (window)));
+				webkit_policy_decision_ignore (decision);
+
+				gtk_widget_destroy (GTK_WIDGET (window));
+
+				return TRUE;
+			}
+		}
+
+		if (navigation_type == WEBKIT_NAVIGATION_TYPE_LINK_CLICKED)
+		{
+			if (ephy_embed_utils_urls_have_same_origin (uri, webkit_web_view_get_uri (web_view)))
+			{
+				return FALSE;
+			}
+
+			ephy_file_open_uri_in_default_browser (uri, GDK_CURRENT_TIME,
+							       gtk_window_get_screen (GTK_WINDOW (window)));
+			webkit_policy_decision_ignore (decision);
+
+			return TRUE;
+		}
+	}
+
+	if (navigation_type == WEBKIT_NAVIGATION_TYPE_LINK_CLICKED)
+	{
+		gint button;
+		gint state;
+		EphyEmbed *new_embed;
+		EphyNewTabFlags flags = 0;
+		EphyWindow *target_window = window;
+
+		button = webkit_navigation_action_get_mouse_button (navigation_action);
+		state = webkit_navigation_action_get_modifiers (navigation_action);
+
+		ephy_web_view_set_visit_type (EPHY_WEB_VIEW (web_view),
+					      EPHY_PAGE_VISIT_LINK);
+
+		/* New tab in new window for control+shift+click */
+		if (button == 1 && state == (GDK_SHIFT_MASK | GDK_CONTROL_MASK) &&
+		    !g_settings_get_boolean (EPHY_SETTINGS_LOCKDOWN,
+					     EPHY_PREFS_LOCKDOWN_FULLSCREEN))
+		{
+			target_window = ephy_window_new ();
+		}
+		/* New tab in existing window for middle click and
+		 * control+click */
+		else if (button == 2 || (button == 1 && state == GDK_CONTROL_MASK))
+		{
+			flags |= EPHY_NEW_TAB_APPEND_AFTER;
+		}
+		/* Because we connect to button-press-event *after*
+		 * (G_CONNECT_AFTER) we need to prevent WebKit from browsing to
+		 * a link when you shift+click it. Otherwise when you
+		 * shift+click a link to download it you would also be taken to
+		 * the link destination. */
+		else if (button == 1 && state == GDK_SHIFT_MASK)
+		{
+			webkit_policy_decision_ignore (decision);
+
+			return TRUE;
+		}
+		/* Those were our special cases, we won't handle this */
+		else
+		{
+			return FALSE;
+		}
+
+		embed = ephy_embed_container_get_active_child
+			(EPHY_EMBED_CONTAINER (window));
+
+		new_embed = ephy_shell_new_tab_full (ephy_shell_get_default (),
+						     NULL, NULL,
+						     target_window,
+						     embed,
+						     flags,
+						     0);
+		ephy_web_view_load_request (ephy_embed_get_web_view (new_embed), request);
+
+		webkit_policy_decision_ignore (decision);
+
+		return TRUE;
+	}
+
+	return FALSE;
+}
+
+static void
+ephy_window_connect_active_embed (EphyWindow *window)
+{
+	EphyEmbed *embed;
+	WebKitWebView *web_view;
+	EphyWebView *view;
+
+	g_return_if_fail (window->priv->active_embed != NULL);
+
+	embed = window->priv->active_embed;
+	view = ephy_embed_get_web_view (embed);
+	web_view = EPHY_GET_WEBKIT_WEB_VIEW_FROM_EMBED (embed);
+
+	sync_tab_security	(view, NULL, window);
+	sync_tab_document_type	(view, NULL, window);
+	sync_tab_load_status    (view, WEBKIT_LOAD_STARTED, window);
+	sync_tab_is_blank	(view, NULL, window);
+	sync_tab_navigation	(view, NULL, window);
+	sync_tab_title		(embed, NULL, window);
+	sync_tab_address	(view, NULL, window);
+	sync_tab_icon		(view, NULL, window);
+	sync_tab_popup_windows	(view, NULL, window);
+	sync_tab_popups_allowed	(view, NULL, window);
+
+	sync_tab_zoom		(web_view, NULL, window);
+
+	g_signal_connect_object (web_view, "notify::zoom-level",
+				 G_CALLBACK (sync_tab_zoom),
+				 window, 0);
+
+	g_signal_connect_object (web_view, "create",
+				 G_CALLBACK (create_web_view_cb),
+				 window, 0);
+	g_signal_connect_object (web_view, "decide-policy",
+				 G_CALLBACK (decide_policy_cb),
+				 window, 0);
+	g_signal_connect_object (view, "notify::hidden-popup-count",
+				 G_CALLBACK (sync_tab_popup_windows),
+				 window, 0);
+	g_signal_connect_object (view, "notify::popups-allowed",
+				 G_CALLBACK (sync_tab_popups_allowed),
+				 window, 0);
+	g_signal_connect_object (embed, "notify::title",
+				 G_CALLBACK (sync_tab_title),
+				 window, 0);
+	g_signal_connect_object (view, "notify::address",
+				 G_CALLBACK (sync_tab_address),
+				 window, 0);
+	g_signal_connect_object (view, "notify::icon",
+				 G_CALLBACK (sync_tab_icon),
+				 window, 0);
+	g_signal_connect_object (view, "notify::security-level",
+				 G_CALLBACK (sync_tab_security),
+				 window, 0);
+	g_signal_connect_object (view, "notify::document-type",
+				 G_CALLBACK (sync_tab_document_type),
+				 window, 0);
+	g_signal_connect_object (view, "load-changed",
+				 G_CALLBACK (sync_tab_load_status),
+				 window, 0);
+	g_signal_connect_object (view, "notify::navigation",
+				 G_CALLBACK (sync_tab_navigation),
+				 window, 0);
+	g_signal_connect_object (view, "notify::is-blank",
+				 G_CALLBACK (sync_tab_is_blank),
+				 window, 0);
+	g_signal_connect_object (view, "button-press-event",
+				 G_CALLBACK (ephy_window_dom_mouse_click_cb),
+				 window, 0);
+	g_signal_connect_object (view, "context-menu",
+				 G_CALLBACK (populate_context_menu),
+				 window, 0);
+	g_signal_connect_object (view, "mouse-target-changed",
+				 G_CALLBACK (ephy_window_mouse_target_changed_cb),
+				 window, 0);
+
+	g_object_notify (G_OBJECT (window), "active-child");
+}
+
+static void
+ephy_window_disconnect_active_embed (EphyWindow *window)
+{
+	EphyEmbed *embed;
+	WebKitWebView *web_view;
+	EphyWebView *view;
+
+	g_return_if_fail (window->priv->active_embed != NULL);
+
+	embed = window->priv->active_embed;
+	web_view = EPHY_GET_WEBKIT_WEB_VIEW_FROM_EMBED (embed);
+	view = EPHY_WEB_VIEW (web_view);
+
+	g_signal_handlers_disconnect_by_func (web_view,
+					      G_CALLBACK (sync_tab_zoom),
+					      window);
+	g_signal_handlers_disconnect_by_func (web_view,
+					      G_CALLBACK (create_web_view_cb),
+					      window);
+	g_signal_handlers_disconnect_by_func (view,
+					      G_CALLBACK (decide_policy_cb),
+					      window);
+	g_signal_handlers_disconnect_by_func (view,
+					      G_CALLBACK (sync_tab_popup_windows),
+					      window);
+	g_signal_handlers_disconnect_by_func (view,
+					      G_CALLBACK (sync_tab_popups_allowed),
+					      window);
+	g_signal_handlers_disconnect_by_func (view,
+					      G_CALLBACK (sync_tab_security),
+					      window);
+	g_signal_handlers_disconnect_by_func (view,
+					      G_CALLBACK (sync_tab_document_type),
+					      window);
+	g_signal_handlers_disconnect_by_func (view,
+					      G_CALLBACK (sync_tab_load_status),
+					      window);
+	g_signal_handlers_disconnect_by_func (view,
+					      G_CALLBACK (sync_tab_is_blank),
+					      window);
+	g_signal_handlers_disconnect_by_func (view,
+					      G_CALLBACK (sync_tab_navigation),
+					      window);
+	g_signal_handlers_disconnect_by_func (embed,
+					      G_CALLBACK (sync_tab_title),
+					      window);
+	g_signal_handlers_disconnect_by_func (view,
+					      G_CALLBACK (sync_tab_address),
+					      window);
+	g_signal_handlers_disconnect_by_func (view,
+					      G_CALLBACK (sync_tab_icon),
+					      window);
+
+	g_signal_handlers_disconnect_by_func
+		(view, G_CALLBACK (ephy_window_dom_mouse_click_cb), window);
+	g_signal_handlers_disconnect_by_func (view,
+					      G_CALLBACK (populate_context_menu),
+					      window);
+	g_signal_handlers_disconnect_by_func (view,
+					      G_CALLBACK (ephy_window_mouse_target_changed_cb),
+					      window);
+}
+
+static void
+ephy_window_set_active_tab (EphyWindow *window, EphyEmbed *new_embed)
+{
+	EphyEmbed *old_embed;
+
+	g_return_if_fail (EPHY_IS_WINDOW (window));
+	g_return_if_fail (gtk_widget_get_toplevel (GTK_WIDGET (new_embed)) == GTK_WIDGET (window));
+
+	old_embed = window->priv->active_embed;
+
+	if (old_embed == new_embed) return;
+
+	if (old_embed != NULL)
+		ephy_window_disconnect_active_embed (window);
+
+	window->priv->active_embed = new_embed;
+
+	if (new_embed != NULL)
+		ephy_window_connect_active_embed (window);
+}
+
+static gboolean
+embed_modal_alert_cb (EphyEmbed *embed,
+		      EphyWindow *window)
+{
+	const char *address;
+
+	/* switch the window to the tab, and bring the window to the foreground
+	 * (since the alert is modal, the user won't be able to do anything
+	 * with his current window anyway :|)
+	 */
+	impl_set_active_child (EPHY_EMBED_CONTAINER (window), embed);
+	gtk_window_present (GTK_WINDOW (window));
+
+	/* make sure the location entry shows the real URL of the tab's page */
+	address = ephy_web_view_get_address (ephy_embed_get_web_view (embed));
+	ephy_window_set_location (window, address);
+
+	/* don't suppress alert */
+	return FALSE;
+}
+
+static void
+tab_accels_item_activate (GtkAction *action,
+			  EphyWindow *window)
+{
+	EphyWindowPrivate *priv = window->priv;
+	const char *name;
+	int tab_number;
+
+	name = gtk_action_get_name (action);
+	tab_number = atoi (name + strlen ("TabAccel"));
+
+	gtk_notebook_set_current_page (priv->notebook, tab_number);
+}
+
+static void
+tab_accels_update (EphyWindow *window)
+{
+	EphyWindowPrivate *priv = window->priv;
+	int pages, i = 0;
+	GList *actions, *l;
+
+	actions = gtk_action_group_list_actions (priv->tab_accels_action_group);
+	pages = gtk_notebook_get_n_pages (priv->notebook);
+	for (l = actions; l != NULL; l = l->next)
+	{
+		GtkAction *action = GTK_ACTION (l->data);
+
+		gtk_action_set_sensitive (action, (i < pages));
+
+		i++;
+	}
+	g_list_free (actions);
+}
+
+#define TAB_ACCELS_N 10
+
+static void
+setup_tab_accels (EphyWindow *window)
+{
+	EphyWindowPrivate *priv = window->priv;
+	guint id;
+	int i;
+
+	id = gtk_ui_manager_new_merge_id (priv->manager);
+
+	for (i = 0; i < TAB_ACCELS_N; i++)
+	{
+		GtkAction *action;
+		char *name;
+		char *accel;
+
+		name = g_strdup_printf ("TabAccel%d", i);
+		accel = g_strdup_printf ("<alt>%d", (i + 1) % TAB_ACCELS_N);
+		action = gtk_action_new (name, NULL, NULL, NULL);
+
+		gtk_action_group_add_action_with_accel (priv->tab_accels_action_group,
+							action, accel);
+
+		g_signal_connect (action, "activate",
+				  G_CALLBACK (tab_accels_item_activate), window);
+		gtk_ui_manager_add_ui (priv->manager, id, "/",
+				       name, name,
+				       GTK_UI_MANAGER_ACCELERATOR,
+				       FALSE);
+
+		g_object_unref (action);
+		g_free (accel);
+		g_free (name);
+	}
+}
+
+static gboolean
+show_notebook_popup_menu (GtkNotebook *notebook,
+			  EphyWindow *window,
+			  GdkEventButton *event)
+{
+	GtkWidget *menu, *tab, *tab_label;
+	GtkAction *action;
+
+	menu = gtk_ui_manager_get_widget (window->priv->manager, "/EphyNotebookPopup");
+	g_return_val_if_fail (menu != NULL, FALSE);
+
+	/* allow extensions to sync when showing the popup */
+	action = gtk_action_group_get_action (window->priv->action_group,
+					      "NotebookPopupAction");
+	g_return_val_if_fail (action != NULL, FALSE);
+	gtk_action_activate (action);
+
+	if (event != NULL)
+	{
+		gint n_pages, page_num;
+
+		tab = GTK_WIDGET (window->priv->active_embed);
+		n_pages = gtk_notebook_get_n_pages (notebook);
+		page_num = gtk_notebook_page_num (notebook, tab);
+
+		/* enable/disable move left/right items*/
+		action = gtk_action_group_get_action (window->priv->action_group,
+						      "TabsMoveLeft");
+		gtk_action_set_sensitive (action, page_num > 0);
+
+		action = gtk_action_group_get_action (window->priv->action_group,
+						      "TabsMoveRight");
+		gtk_action_set_sensitive (action, page_num < n_pages - 1);
+
+		gtk_menu_popup (GTK_MENU (menu), NULL, NULL,
+				NULL, NULL,
+				event->button, event->time);
+	}
+	else
+	{
+		tab = GTK_WIDGET (window->priv->active_embed);
+		tab_label = gtk_notebook_get_tab_label (notebook, tab);
+
+		gtk_menu_popup (GTK_MENU (menu), NULL, NULL,
+				ephy_gui_menu_position_under_widget, tab_label,
+				0, gtk_get_current_event_time ());
+		gtk_menu_shell_select_first (GTK_MENU_SHELL (menu), FALSE);
+	}
+
+	return TRUE;
+}
+
+static gboolean
+notebook_button_press_cb (GtkNotebook *notebook,
+			  GdkEventButton *event,
+			  EphyWindow *window)
+{
+	if (GDK_BUTTON_PRESS == event->type && 3 == event->button)
+	{
+		return show_notebook_popup_menu (notebook, window, event);
+	}
+
+	return FALSE;
+}
+
+static gboolean
+notebook_popup_menu_cb (GtkNotebook *notebook,
+			EphyWindow *window)
+{
+	/* Only respond if the notebook is the actual focus */
+	if (EPHY_IS_NOTEBOOK (gtk_window_get_focus (GTK_WINDOW (window))))
+	{
+		return show_notebook_popup_menu (notebook, window, NULL);
+	}
+
+	return FALSE;
+}
+
+static gboolean
+present_on_idle_cb (GtkWindow *window)
+{
+      gtk_window_present (window);
+      return FALSE;
+}
+
+static gboolean
+delayed_remove_child (gpointer data)
+{
+	GtkWidget *widget = GTK_WIDGET (data);
+	EphyEmbedContainer *container = EPHY_EMBED_CONTAINER (gtk_widget_get_toplevel (widget));
+
+	ephy_embed_container_remove_child (container, EPHY_EMBED (widget));
+
+	return FALSE;
+}