From 6c7b62b543b709055512cc45313127a13a150a76 Mon Sep 17 00:00:00 2001 From: "carlosgc@webkit.org" Date: Fri, 24 Feb 2012 13:32:42 +0000 Subject: [PATCH] [GTK] MiniBrowser should reload the view then the reload button is clicked https://bugs.webkit.org/show_bug.cgi?id=79472 Reviewed by Philippe Normand. * MiniBrowser/gtk/BrowserWindow.c: (reloadCallback): Call webkit_web_view_reload(). (browser_window_init): Connect reload item clicked even to reloadCallback instead of activateUriEntryCallback. git-svn-id: http://svn.webkit.org/repository/webkit/trunk@108777 268f45cc-cd09-0410-ab3c-d52691b4dbfc --- Tools/ChangeLog | 12 ++++++++++++ Tools/MiniBrowser/gtk/BrowserWindow.c | 7 ++++++- 2 files changed, 18 insertions(+), 1 deletion(-) diff --git a/Tools/ChangeLog b/Tools/ChangeLog index 3038e2e..1f4d287 100644 --- a/Tools/ChangeLog +++ b/Tools/ChangeLog @@ -1,3 +1,15 @@ +2012-02-24 Carlos Garcia Campos + + [GTK] MiniBrowser should reload the view then the reload button is clicked + https://bugs.webkit.org/show_bug.cgi?id=79472 + + Reviewed by Philippe Normand. + + * MiniBrowser/gtk/BrowserWindow.c: + (reloadCallback): Call webkit_web_view_reload(). + (browser_window_init): Connect reload item clicked even to + reloadCallback instead of activateUriEntryCallback. + 2012-02-24 Kentaro Hara Add performance tests for DOM attribute getters and setters diff --git a/Tools/MiniBrowser/gtk/BrowserWindow.c b/Tools/MiniBrowser/gtk/BrowserWindow.c index 77d3aa7..7451844 100644 --- a/Tools/MiniBrowser/gtk/BrowserWindow.c +++ b/Tools/MiniBrowser/gtk/BrowserWindow.c @@ -80,6 +80,11 @@ static void activateUriEntryCallback(BrowserWindow *window) webkit_web_view_load_uri(window->webView, gtk_entry_get_text(GTK_ENTRY(window->uriEntry))); } +static void reloadCallback(BrowserWindow *window) +{ + webkit_web_view_reload(window->webView); +} + static void goBackCallback(BrowserWindow *window) { webkit_web_view_go_back(window->webView); @@ -389,7 +394,7 @@ static void browser_window_init(BrowserWindow *window) gtk_widget_show(GTK_WIDGET(item)); item = gtk_tool_button_new_from_stock(GTK_STOCK_OK); - g_signal_connect_swapped(item, "clicked", G_CALLBACK(activateUriEntryCallback), (gpointer)window); + g_signal_connect_swapped(item, "clicked", G_CALLBACK(reloadCallback), window); gtk_toolbar_insert(GTK_TOOLBAR(toolbar), item, -1); gtk_widget_show(GTK_WIDGET(item)); -- 2.7.4