[epiphany] ephy-embed-single: remove open_window method
- From: Xan Lopez <xan src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [epiphany] ephy-embed-single: remove open_window method
- Date: Wed, 13 Feb 2013 19:56:51 +0000 (UTC)
commit 1aa183817b46cb7ab130e8d8803cf4e7ca3713f3
Author: Xan Lopez <xan igalia com>
Date: Wed Feb 13 20:56:01 2013 +0100
ephy-embed-single: remove open_window method
It's also been a no-op for a long time. The problem of allowing the
popup manager to create windows from embed/ is still left to be
solved.
embed/ephy-embed-single.c | 49 ---------------------------------------------
embed/ephy-embed-single.h | 12 -----------
embed/ephy-web-view.c | 8 ++----
3 files changed, 3 insertions(+), 66 deletions(-)
---
diff --git a/embed/ephy-embed-single.c b/embed/ephy-embed-single.c
index 04ed1c2..190beae 100644
--- a/embed/ephy-embed-single.c
+++ b/embed/ephy-embed-single.c
@@ -230,27 +230,6 @@ ephy_embed_single_class_init (EphyEmbedSingleClass *klass)
object_class->finalize = ephy_embed_single_finalize;
object_class->dispose = ephy_embed_single_dispose;
- /**
- * EphyEmbedSingle::new-window:
- * @parent_embed: the #EphyEmbed requesting the new window, or %NULL
- * @mask: a #EphyEmbedChrome
- *
- * The ::new_window signal is emitted when a new window needs to be opened.
- * For example, when a JavaScript popup window was opened.
- *
- * Returns: (transfer none): a new #EphyEmbed.
- **/
- g_signal_new ("new-window",
- EPHY_TYPE_EMBED_SINGLE,
- G_SIGNAL_RUN_FIRST | G_SIGNAL_RUN_LAST,
- G_STRUCT_OFFSET (EphyEmbedSingleClass, new_window),
- ephy_signal_accumulator_object, ephy_embed_get_type,
- g_cclosure_marshal_generic,
- GTK_TYPE_WIDGET,
- 2,
- GTK_TYPE_WIDGET,
- EPHY_TYPE_WEB_VIEW_CHROME);
-
g_type_class_add_private (object_class, sizeof (EphyEmbedSinglePrivate));
}
@@ -489,34 +468,6 @@ ephy_embed_single_clear_cache (EphyEmbedSingle *single)
}
/**
- * ephy_embed_single_open_window:
- * @single: the #EphyEmbedSingle
- * @parent: the requested window's parent #EphyEmbed
- * @address: the URL to load
- * @name: a name for the window
- * @features: a Javascript features string
- *
- * Opens a new window, as if it were opened in @parent using the Javascript
- * method and arguments: <code>window.open("@address",
- * "_blank", "@features");</code>.
- *
- * Returns: (transfer none): the new embed. This is either a #EphyEmbed, or,
- * when @features specified "chrome", a #GtkMozEmbed.
- *
- * NOTE: Use ephy_shell_new_tab() unless this handling of the @features string
- * is required.
- */
-GtkWidget *
-ephy_embed_single_open_window (EphyEmbedSingle *single,
- EphyEmbed *parent,
- const char *address,
- const char *name,
- const char *features)
-{
- return NULL;
-}
-
-/**
* ephy_embed_single_get_form_auth:
* @single: an #EphyEmbedSingle
* @uri: the URI of a web page
diff --git a/embed/ephy-embed-single.h b/embed/ephy-embed-single.h
index c8ba770..f620cdb 100644
--- a/embed/ephy-embed-single.h
+++ b/embed/ephy-embed-single.h
@@ -57,24 +57,12 @@ struct _EphyEmbedSingle {
struct _EphyEmbedSingleClass
{
GObjectClass parent_class;
-
- /* Signals */
-
- EphyEmbed * (* new_window) (EphyEmbedSingle *single,
- EphyEmbed *parent_embed,
- EphyWebViewChrome chromemask);
};
GType ephy_embed_single_get_type (void);
gboolean ephy_embed_single_initialize (EphyEmbedSingle *single);
-GtkWidget *ephy_embed_single_open_window (EphyEmbedSingle *single,
- EphyEmbed *parent,
- const char *address,
- const char *name,
- const char *features);
-
void ephy_embed_single_clear_cache (EphyEmbedSingle *single);
GSList * ephy_embed_single_get_form_auth (EphyEmbedSingle *single,
diff --git a/embed/ephy-web-view.c b/embed/ephy-web-view.c
index a765aec..a2e6ce9 100644
--- a/embed/ephy-web-view.c
+++ b/embed/ephy-web-view.c
@@ -162,11 +162,9 @@ popups_manager_show (PopupInfo *popup,
/* Only show popup with non NULL url */
if (popup->url != NULL) {
- single = EPHY_EMBED_SINGLE
- (ephy_embed_shell_get_embed_single (ephy_embed_shell_get_default ()));
-
- ephy_embed_single_open_window (single, EPHY_EMBED (view), popup->url,
- popup->name, popup->features);
+ /* FIXME: we need a way of opening windows in here. This used to
+ * be implemented in EphyEmbedSingle open_window method, but it's
+ * been a no-op for a while. */
}
popups_manager_free_info (popup);
}
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]