[yelp/wip/amigadave/webkit2-port: 10/23] yelp-view: Replace "script-alert" signal by "script-dialog" signal
- From: David King <davidk src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [yelp/wip/amigadave/webkit2-port: 10/23] yelp-view: Replace "script-alert" signal by "script-dialog" signal
- Date: Mon, 16 Feb 2015 11:55:16 +0000 (UTC)
commit d2536b8ae69a3d2fc70db61a674ac5ed3b37cc21
Author: Marcos ChavarrÃa Teijeiro <chavarria1991 gmail com>
Date: Tue Oct 21 11:11:15 2014 +0200
yelp-view: Replace "script-alert" signal by "script-dialog" signal
libyelp/yelp-view.c | 26 +++++++++++++++-----------
1 files changed, 15 insertions(+), 11 deletions(-)
---
diff --git a/libyelp/yelp-view.c b/libyelp/yelp-view.c
index 30e2632..2916669 100644
--- a/libyelp/yelp-view.c
+++ b/libyelp/yelp-view.c
@@ -82,9 +82,8 @@ static void popup_save_code (GtkMenuItem *item,
static void view_populate_popup (YelpView *view,
GtkMenu *menu,
gpointer data);
-static void view_script_alert (YelpView *view,
- WebKitWebFrame *frame,
- gchar *message,
+static gboolean view_script_dialog (YelpView *view,
+ WebKitScriptDialog *dialog,
gpointer data);
static gboolean view_policy_decision_requested (YelpView *view,
WebKitPolicyDecision *decision,
@@ -260,8 +259,8 @@ yelp_view_init (YelpView *view)
G_CALLBACK (view_set_vadjustment), NULL);
g_signal_connect (view, "populate-popup",
G_CALLBACK (view_populate_popup), NULL);
- g_signal_connect (view, "script-alert",
- G_CALLBACK (view_script_alert), NULL);
+ g_signal_connect (view, "script-dialog",
+ G_CALLBACK (view_script_dialog), NULL);
priv->print_action = g_simple_action_new ("yelp-view-print", NULL);
g_signal_connect (priv->print_action,
@@ -1431,13 +1430,18 @@ view_populate_popup (YelpView *view,
gtk_widget_show_all (GTK_WIDGET (menu));
}
-static void
-view_script_alert (YelpView *view,
- WebKitWebFrame *frame,
- gchar *message,
- gpointer data)
+static gboolean
+view_script_dialog (YelpView *view,
+ WebKitScriptDialog *dialog,
+ gpointer data)
{
- printf ("\n\n===ALERT===\n%s\n\n", message);
+ WebKitScriptDialogType type = webkit_script_dialog_get_dialog_type (dialog);
+
+ if (type != WEBKIT_SCRIPT_DIALOG_ALERT)
+ return FALSE;
+
+ printf ("\n\n===ALERT===\n%s\n\n", webkit_script_dialog_get_message (dialog));
+ return TRUE;
}
static gboolean
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]