debian/midori
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Show infobars instead of dialogues for alerts

Browse source 
Also limit the number of alerts to 5 at any one time.
This commit is contained in:
Christian Dywan 2011-04-04 02:59:16 +02:00
parent b299608352
commit 8134789973
1 changed files with 38 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

38
midori/midori-view.c
View file

@ -96,6 +96,7 @@ struct _MidoriView
gboolean close_buttons_on_tabs; gboolean close_buttons_on_tabs;
MidoriNewPage open_new_pages_in; MidoriNewPage open_new_pages_in;
gint find_links; gint find_links;
gint alerts;
GtkWidget* menu_item; GtkWidget* menu_item;
GtkWidget* tab_label; GtkWidget* tab_label;
@ -1193,6 +1194,10 @@ midori_view_add_info_bar (MidoriView* view,
GtkWidget* content_area; GtkWidget* content_area;
va_list args; va_list args;
const gchar* button_text; const gchar* button_text;
g_return_val_if_fail (message != NULL, NULL);
g_return_val_if_fail (response_cb != NULL, NULL);
va_start (args, first_button_text); va_start (args, first_button_text);
#if HAVE_GTK_INFO_BAR #if HAVE_GTK_INFO_BAR
@ -3048,6 +3053,36 @@ webkit_web_view_console_message_cb (GtkWidget* web_view,
return TRUE; return TRUE;
} }
static void
midori_view_script_response_cb (GtkWidget* infobar,
gint response,
MidoriView* view)
{
view->alerts--;
}
static gboolean
midori_view_web_view_script_alert_cb (GtkWidget* web_view,
WebKitWebFrame* web_frame,
const gchar* message,
MidoriView* view)
{
gchar* text;
/* Allow a maximum of 5 alerts */
if (view->alerts > 4)
return TRUE;
view->alerts++;
/* i18n: The text of an infobar for JavaScript alert messages */
text = g_strdup_printf ("JavaScript: %s", message);
midori_view_add_info_bar (view, GTK_MESSAGE_WARNING, text,
G_CALLBACK (midori_view_script_response_cb), view,
GTK_STOCK_CLOSE, GTK_RESPONSE_CLOSE, NULL);
g_free (text);
return TRUE;
}
#if WEBKIT_CHECK_VERSION (1, 1, 5) #if WEBKIT_CHECK_VERSION (1, 1, 5)
static gboolean static gboolean
midori_view_web_view_print_requested_cb (GtkWidget* web_view, midori_view_web_view_print_requested_cb (GtkWidget* web_view,
@ -3147,6 +3182,7 @@ midori_view_init (MidoriView* view)
view->selected_text = NULL; view->selected_text = NULL;
view->news_feeds = katze_array_new (KATZE_TYPE_ITEM); view->news_feeds = katze_array_new (KATZE_TYPE_ITEM);
view->find_links = -1; view->find_links = -1;
view->alerts = 0;
view->item = katze_item_new (); view->item = katze_item_new ();
@ -3680,6 +3716,8 @@ midori_view_construct_web_view (MidoriView* view)
webkit_web_view_populate_popup_cb, view, webkit_web_view_populate_popup_cb, view,
"signal::console-message", "signal::console-message",
webkit_web_view_console_message_cb, view, webkit_web_view_console_message_cb, view,
"signal::script-alert",
midori_view_web_view_script_alert_cb, view,
"signal::window-object-cleared", "signal::window-object-cleared",
webkit_web_view_window_object_cleared_cb, view, webkit_web_view_window_object_cleared_cb, view,
"signal::create-web-view", "signal::create-web-view",