debian/midori
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Don't mixup window title and app name

Browse source 
Fixes: https://bugs.launchpad.net/midori/+bug/778402
This commit is contained in:
Christian Dywan 2011-05-17 22:15:11 +02:00
parent 951885c1f5
commit 83194abe8f
2 changed files with 1 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
midori/main.c
View file

@ -1994,7 +1994,6 @@ main (int argc,
/* Private browsing, window title, default config folder */ /* Private browsing, window title, default config folder */
if (private) if (private)
{ {
g_set_application_name (_("Private Browsing"));
if (!config && !webapp) if (!config && !webapp)
config = g_build_filename (g_get_user_config_dir (), PACKAGE_NAME, NULL); config = g_build_filename (g_get_user_config_dir (), PACKAGE_NAME, NULL);
/* Mask the timezone, which can be read by Javascript */ /* Mask the timezone, which can be read by Javascript */

4
midori/midori-browser.c
View file

@ -579,8 +579,7 @@ midori_browser_set_title (MidoriBrowser* browser,
#if WEBKIT_CHECK_VERSION (1, 1, 2) #if WEBKIT_CHECK_VERSION (1, 1, 2)
if (katze_object_get_boolean (browser->settings, "enable-private-browsing")) if (katze_object_get_boolean (browser->settings, "enable-private-browsing"))
{ {
gchar* window_title = g_strconcat (title, " - ", gchar* window_title = g_strdup_printf (_("%s (Private Browsing)"), title);
g_get_application_name (), NULL);
gtk_window_set_title (GTK_WINDOW (browser), window_title); gtk_window_set_title (GTK_WINDOW (browser), window_title);
g_free (window_title); g_free (window_title);
} }
@ -5785,7 +5784,6 @@ midori_browser_init (MidoriBrowser* browser)
G_CALLBACK (midori_browser_destroy_cb), NULL); G_CALLBACK (midori_browser_destroy_cb), NULL);
gtk_window_set_role (GTK_WINDOW (browser), "browser"); gtk_window_set_role (GTK_WINDOW (browser), "browser");
gtk_window_set_icon_name (GTK_WINDOW (browser), "web-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); vbox = gtk_vbox_new (FALSE, 0);
gtk_container_add (GTK_CONTAINER (browser), vbox); gtk_container_add (GTK_CONTAINER (browser), vbox);
gtk_widget_show (vbox); gtk_widget_show (vbox);