aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorXan Lopez <xan@igalia.com>2012-03-14 23:26:30 +0800
committerXan Lopez <xan@igalia.com>2012-03-14 23:26:30 +0800
commit0ea81088cf97aee3d5bbb1f0ec470b8c805a746d (patch)
treead0e0b3e131c4dcf692703af5fd10fdc2697987f
parent3b6eaf03d1bb27ef42bd500a34799b82acf47c61 (diff)
downloadgsoc2013-epiphany-0ea81088cf97aee3d5bbb1f0ec470b8c805a746d.tar
gsoc2013-epiphany-0ea81088cf97aee3d5bbb1f0ec470b8c805a746d.tar.gz
gsoc2013-epiphany-0ea81088cf97aee3d5bbb1f0ec470b8c805a746d.tar.bz2
gsoc2013-epiphany-0ea81088cf97aee3d5bbb1f0ec470b8c805a746d.tar.lz
gsoc2013-epiphany-0ea81088cf97aee3d5bbb1f0ec470b8c805a746d.tar.xz
gsoc2013-epiphany-0ea81088cf97aee3d5bbb1f0ec470b8c805a746d.tar.zst
gsoc2013-epiphany-0ea81088cf97aee3d5bbb1f0ec470b8c805a746d.zip
Revert "ephy-embed-single: remove some dead code"
This reverts commit 08956cf8cd8040f8500c40b646a52b6f03ae5275. Bleh, the mostly useless popup code in EphyWebView needs this even if it's a no-op, so bring it back.
-rw-r--r--embed/ephy-embed-single.c54
1 files changed, 53 insertions, 1 deletions
diff --git a/embed/ephy-embed-single.c b/embed/ephy-embed-single.c
index 5192156fb..bf815ed19 100644
--- a/embed/ephy-embed-single.c
+++ b/embed/ephy-embed-single.c
@@ -31,6 +31,7 @@
#include "ephy-debug.h"
#include "ephy-file-helpers.h"
#include "ephy-signal-accumulator.h"
+#include "ephy-permission-manager.h"
#include "ephy-profile-utils.h"
#include "ephy-prefs.h"
#include "ephy-settings.h"
@@ -52,8 +53,11 @@ struct _EphyEmbedSinglePrivate {
static void ephy_embed_single_init (EphyEmbedSingle *single);
static void ephy_embed_single_class_init (EphyEmbedSingleClass *klass);
+static void ephy_permission_manager_iface_init (EphyPermissionManagerIface *iface);
-G_DEFINE_TYPE (EphyEmbedSingle, ephy_embed_single, G_TYPE_OBJECT)
+G_DEFINE_TYPE_WITH_CODE (EphyEmbedSingle, ephy_embed_single, G_TYPE_OBJECT,
+ G_IMPLEMENT_INTERFACE (EPHY_TYPE_PERMISSION_MANAGER,
+ ephy_permission_manager_iface_init))
static void
form_auth_data_free (EphyEmbedSingleFormAuthData *data)
@@ -275,6 +279,54 @@ ephy_embed_single_class_init (EphyEmbedSingleClass *klass)
}
static void
+impl_permission_manager_add (EphyPermissionManager *manager,
+ const char *host,
+ const char *type,
+ EphyPermission permission)
+{
+}
+
+static void
+impl_permission_manager_remove (EphyPermissionManager *manager,
+ const char *host,
+ const char *type)
+{
+}
+
+static void
+impl_permission_manager_clear (EphyPermissionManager *manager)
+{
+}
+
+static EphyPermission
+impl_permission_manager_test (EphyPermissionManager *manager,
+ const char *host,
+ const char *type)
+{
+ g_return_val_if_fail (type != NULL && type[0] != '\0', EPHY_PERMISSION_DEFAULT);
+
+ return (EphyPermission)0;
+}
+
+static GList *
+impl_permission_manager_list (EphyPermissionManager *manager,
+ const char *type)
+{
+ GList *list = NULL;
+ return list;
+}
+
+static void
+ephy_permission_manager_iface_init (EphyPermissionManagerIface *iface)
+{
+ iface->add = impl_permission_manager_add;
+ iface->remove = impl_permission_manager_remove;
+ iface->clear = impl_permission_manager_clear;
+ iface->test = impl_permission_manager_test;
+ iface->list = impl_permission_manager_list;
+}
+
+static void
cache_size_cb (GSettings *settings,
char *key,
EphyEmbedSingle *single)