[Xfce4-commits] <midori:master> Don't mixup window title and app name

[Christian Dywan]

Updating branch refs/heads/master
         to 83194abe8f7c53588549f83c95b518b966f7a00d (commit)
       from 951885c1f5d36d282e59f4fdc601f0fa4f96590d (commit)

commit 83194abe8f7c53588549f83c95b518b966f7a00d
Author: Christian Dywan <christian at twotoasts.de>
Date:   Tue May 17 22:15:11 2011 +0200

    Don't mixup window title and app name
    
    Fixes: https://bugs.launchpad.net/midori/+bug/778402

 midori/main.c           |    1 -
 midori/midori-browser.c |    4 +---
 2 files changed, 1 insertions(+), 4 deletions(-)

diff --git a/midori/main.c b/midori/main.c
index b6d501f..007b03f 100644
--- a/midori/main.c
+++ b/midori/main.c
@@ -1994,7 +1994,6 @@ main (int    argc,
     /* Private browsing, window title, default config folder */
     if (private)
     {
-        g_set_application_name (_("Private Browsing"));
         if (!config && !webapp)
             config = g_build_filename (g_get_user_config_dir (), PACKAGE_NAME, NULL);
         /* Mask the timezone, which can be read by Javascript */
diff --git a/midori/midori-browser.c b/midori/midori-browser.c
index fe15920..9bc80aa 100644
--- a/midori/midori-browser.c
+++ b/midori/midori-browser.c
@@ -579,8 +579,7 @@ midori_browser_set_title (MidoriBrowser* browser,
     #if WEBKIT_CHECK_VERSION (1, 1, 2)
     if (katze_object_get_boolean (browser->settings, "enable-private-browsing"))
     {
-        gchar* window_title = g_strconcat (title, " - ",
-                                           g_get_application_name (), NULL);
+        gchar* window_title = g_strdup_printf (_("%s (Private Browsing)"), title);
         gtk_window_set_title (GTK_WINDOW (browser), window_title);
         g_free (window_title);
     }
@@ -5785,7 +5784,6 @@ midori_browser_init (MidoriBrowser* browser)
                       G_CALLBACK (midori_browser_destroy_cb), NULL);
     gtk_window_set_role (GTK_WINDOW (browser), "browser");
     gtk_window_set_icon_name (GTK_WINDOW (browser), "web-browser");
-    gtk_window_set_title (GTK_WINDOW (browser), g_get_application_name ());
     vbox = gtk_vbox_new (FALSE, 0);
     gtk_container_add (GTK_CONTAINER (browser), vbox);
     gtk_widget_show (vbox);