Title: [223355] releases/WebKitGTK/webkit-2.18/Tools
Revision
223355
Author
carlo...@webkit.org
Date
2017-10-16 02:34:29 -0700 (Mon, 16 Oct 2017)

Log Message

Merge r221827 - [GTK] Unreviewed, fix typo forwad -> forward

* MiniBrowser/gtk/BrowserWindow.c:
(browserWindowUpdateNavigationActions):
(backForwardlistChanged):
(browserWindowSwitchTab):
(backForwadlistChanged): Deleted.

Modified Paths

Diff

Modified: releases/WebKitGTK/webkit-2.18/Tools/ChangeLog (223354 => 223355)


--- releases/WebKitGTK/webkit-2.18/Tools/ChangeLog	2017-10-16 09:33:10 UTC (rev 223354)
+++ releases/WebKitGTK/webkit-2.18/Tools/ChangeLog	2017-10-16 09:34:29 UTC (rev 223355)
@@ -1,5 +1,15 @@
 2017-09-09  Michael Catanzaro  <mcatanz...@igalia.com>
 
+        [GTK] Unreviewed, fix typo forwad -> forward
+
+        * MiniBrowser/gtk/BrowserWindow.c:
+        (browserWindowUpdateNavigationActions):
+        (backForwardlistChanged):
+        (browserWindowSwitchTab):
+        (backForwadlistChanged): Deleted.
+
+2017-09-09  Michael Catanzaro  <mcatanz...@igalia.com>
+
         MiniBrowser closes tab instead of window on close signal
         https://bugs.webkit.org/show_bug.cgi?id=176587
 

Modified: releases/WebKitGTK/webkit-2.18/Tools/MiniBrowser/gtk/BrowserWindow.c (223354 => 223355)


--- releases/WebKitGTK/webkit-2.18/Tools/MiniBrowser/gtk/BrowserWindow.c	2017-10-16 09:33:10 UTC (rev 223354)
+++ releases/WebKitGTK/webkit-2.18/Tools/MiniBrowser/gtk/BrowserWindow.c	2017-10-16 09:34:29 UTC (rev 223355)
@@ -237,26 +237,26 @@
     return menu;
 }
 
-static void browserWindowUpdateNavigationActions(BrowserWindow *window, WebKitBackForwardList *backForwadlist)
+static void browserWindowUpdateNavigationActions(BrowserWindow *window, WebKitBackForwardList *backForwardlist)
 {
     WebKitWebView *webView = browser_tab_get_web_view(window->activeTab);
     gtk_widget_set_sensitive(window->backItem, webkit_web_view_can_go_back(webView));
     gtk_widget_set_sensitive(window->forwardItem, webkit_web_view_can_go_forward(webView));
 
-    GList *list = g_list_reverse(webkit_back_forward_list_get_back_list_with_limit(backForwadlist, 10));
+    GList *list = g_list_reverse(webkit_back_forward_list_get_back_list_with_limit(backForwardlist, 10));
     gtk_menu_tool_button_set_menu(GTK_MENU_TOOL_BUTTON(window->backItem),
         browserWindowCreateBackForwardMenu(window, list));
     g_list_free(list);
 
-    list = webkit_back_forward_list_get_forward_list_with_limit(backForwadlist, 10);
+    list = webkit_back_forward_list_get_forward_list_with_limit(backForwardlist, 10);
     gtk_menu_tool_button_set_menu(GTK_MENU_TOOL_BUTTON(window->forwardItem),
         browserWindowCreateBackForwardMenu(window, list));
     g_list_free(list);
 }
 
-static void backForwadlistChanged(WebKitBackForwardList *backForwadlist, WebKitBackForwardListItem *itemAdded, GList *itemsRemoved, BrowserWindow *window)
+static void backForwardlistChanged(WebKitBackForwardList *backForwardlist, WebKitBackForwardListItem *itemAdded, GList *itemsRemoved, BrowserWindow *window)
 {
-    browserWindowUpdateNavigationActions(window, backForwadlist);
+    browserWindowUpdateNavigationActions(window, backForwardlist);
 }
 
 static void webViewClose(WebKitWebView *webView, BrowserWindow *window)
@@ -823,8 +823,8 @@
         /* We always want close to be connected even for not active tabs */
         g_signal_connect(webView, "close", G_CALLBACK(webViewClose), window);
 
-        WebKitBackForwardList *backForwadlist = webkit_web_view_get_back_forward_list(webView);
-        g_signal_handlers_disconnect_by_data(backForwadlist, window);
+        WebKitBackForwardList *backForwardlist = webkit_web_view_get_back_forward_list(webView);
+        g_signal_handlers_disconnect_by_data(backForwardlist, window);
     }
 
     window->activeTab = tab;
@@ -857,9 +857,9 @@
     g_signal_connect(webView, "leave-fullscreen", G_CALLBACK(webViewLeaveFullScreen), window);
     g_signal_connect(webView, "scroll-event", G_CALLBACK(scrollEventCallback), window);
 
-    WebKitBackForwardList *backForwadlist = webkit_web_view_get_back_forward_list(webView);
-    browserWindowUpdateNavigationActions(window, backForwadlist);
-    g_signal_connect(backForwadlist, "changed", G_CALLBACK(backForwadlistChanged), window);
+    WebKitBackForwardList *backForwardlist = webkit_web_view_get_back_forward_list(webView);
+    browserWindowUpdateNavigationActions(window, backForwardlist);
+    g_signal_connect(backForwardlist, "changed", G_CALLBACK(backForwardlistChanged), window);
 }
 
 static void browserWindowTabAddedOrRemoved(GtkNotebook *notebook, BrowserTab *tab, guint tabIndex, BrowserWindow *window)
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to