[epiphany] ephy-web-view: Remove ephy_web_view_get_title_composite()
- From: Carlos Garcia Campos <carlosgc src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [epiphany] ephy-web-view: Remove ephy_web_view_get_title_composite()
- Date: Mon, 10 Mar 2014 10:17:30 +0000 (UTC)
commit 97bc1360c944234fa336e7fa36f792e52f3f49c4
Author: Carlos Garcia Campos <cgarcia igalia com>
Date: Tue Mar 4 10:23:14 2014 +0100
ephy-web-view: Remove ephy_web_view_get_title_composite()
This is currently only used to set the window title and it's not
actually needed, since we don't show Loading string in title anymore,
only in the status bar. This is consistent with the title box and tabs
title.
https://bugzilla.gnome.org/show_bug.cgi?id=725649
embed/ephy-web-view.c | 35 -----------------------------------
embed/ephy-web-view.h | 1 -
src/ephy-window.c | 2 +-
3 files changed, 1 insertions(+), 37 deletions(-)
---
diff --git a/embed/ephy-web-view.c b/embed/ephy-web-view.c
index 649c727..7889167 100644
--- a/embed/ephy-web-view.c
+++ b/embed/ephy-web-view.c
@@ -2775,41 +2775,6 @@ ephy_web_view_print (EphyWebView *view)
g_object_unref (settings);
}
-/**
- * ephy_web_view_get_title_composite:
- * @view: an #EphyView
- *
- * Returns the title of the web page loaded in @view.
- *
- * This differs from #ephy_web_view_get_title in that this function
- * will return a special title while the page is still loading.
- *
- * Return value: @view's web page's title. Will never be %NULL.
- **/
-const char *
-ephy_web_view_get_title_composite (EphyWebView *view)
-{
- const char *title = "";
- const char *loading_title;
- gboolean is_loading;
-
- g_return_val_if_fail (EPHY_IS_WEB_VIEW (view), NULL);
-
- is_loading = ephy_web_view_is_loading (view);
- loading_title = ephy_web_view_get_loading_title (view);
- title = ephy_web_view_get_title (view);
-
- if (view->priv->is_blank)
- {
- if (is_loading)
- title = loading_title;
- else
- title = _("Blank page");
- }
-
- return title != NULL ? title : "";
-}
-
static void
web_resource_get_data_cb (WebKitWebResource *resource,
GAsyncResult *result,
diff --git a/embed/ephy-web-view.h b/embed/ephy-web-view.h
index 73f740a..910ef81 100644
--- a/embed/ephy-web-view.h
+++ b/embed/ephy-web-view.h
@@ -150,7 +150,6 @@ void ephy_web_view_get_security_level (EphyWebView
void ephy_web_view_print (EphyWebView *view);
const char * ephy_web_view_get_title (EphyWebView *view);
const char * ephy_web_view_get_address (EphyWebView *view);
-const char * ephy_web_view_get_title_composite (EphyWebView *view);
void ephy_web_view_set_placeholder (EphyWebView *view,
const char *uri,
diff --git a/src/ephy-window.c b/src/ephy-window.c
index 9a3204c..8315750 100644
--- a/src/ephy-window.c
+++ b/src/ephy-window.c
@@ -1523,7 +1523,7 @@ sync_tab_title (EphyWebView *view,
if (priv->closing) return;
gtk_window_set_title (GTK_WINDOW(window),
- ephy_web_view_get_title_composite (view));
+ ephy_web_view_get_title (view));
}
static gboolean
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]