Changeset 99275 in webkit

Timestamp:

Nov 4, 2011 6:37:12 AM (12 years ago)

Author:

Carlos Garcia Campos

Message:

[GTK] Use web view title as window title in MiniBrowser
​https://bugs.webkit.org/show_bug.cgi?id=71544

Reviewed by Philippe Normand.

• MiniBrowser/gtk/BrowserWindow.c:

(webViewURIChanged): Removed extra space.
(webViewTitleChanged): Set window title using
webkit_web_view_get_title().
(browser_window_init): Set initial default window title.
(browserWindowConstructed): Connect to WebView notify::title
signal.

Location:

trunk/Tools

Files:

• ChangeLog (modified) (1 diff)
• MiniBrowser/gtk/BrowserWindow.c (modified) (4 diffs)

trunk/Tools/ChangeLog

@@ +1 @@
+2011-11-04  Carlos Garcia Campos  <cgarcia@igalia.com>
+
+        [GTK] Use web view title as window title in MiniBrowser
+        https://bugs.webkit.org/show_bug.cgi?id=71544
+
+        Reviewed by Philippe Normand.
+
+        * MiniBrowser/gtk/BrowserWindow.c:
+        (webViewURIChanged): Removed extra space.
+        (webViewTitleChanged): Set window title using
+        webkit_web_view_get_title().
+        (browser_window_init): Set initial default window title.
+        (browserWindowConstructed): Connect to WebView notify::title
+        signal.
+
 2011-11-04  Tor Arne Vestbø  <tor.arne.vestbo@nokia.com>
 

trunk/Tools/MiniBrowser/gtk/BrowserWindow.c

@@ -50 +50 @@
 };
 
+static const char *defaultWindowTitle = "WebKitGTK+ MiniBrwoser";
 static gint windowCount = 0;
 
@@ -82 +83 @@
 }
 
-static void webViewURIChanged(WebKitWebView *webView,  GParamSpec *pspec, BrowserWindow *window)
+static void webViewURIChanged(WebKitWebView *webView, GParamSpec *pspec, BrowserWindow *window)
 {
     gtk_entry_set_text(GTK_ENTRY(window->uriEntry), webkit_web_view_get_uri(webView));
+}
+
+static void webViewTitleChanged(WebKitWebView *webView, GParamSpec *pspec, BrowserWindow *window)
+{
+    const char *title = webkit_web_view_get_title(webView);
+    gtk_window_set_title(GTK_WINDOW(window), title ? title : defaultWindowTitle);
 }
 
@@ -207 +214 @@
     g_atomic_int_inc(&windowCount);
 
+    gtk_window_set_title(GTK_WINDOW(window), defaultWindowTitle);
     gtk_window_set_default_size(GTK_WINDOW(window), 800, 600);
 
@@ -257 +265 @@
     g_signal_connect(window->webView, "notify::uri", G_CALLBACK(webViewURIChanged), window);
     g_signal_connect(window->webView, "notify::estimated-load-progress", G_CALLBACK(webViewLoadProgressChanged), window);
+    g_signal_connect(window->webView, "notify::title", G_CALLBACK(webViewTitleChanged), window);
 
     WebKitBackForwardList *backForwadlist = webkit_web_view_get_back_forward_list(window->webView);