[dualscreen] fix crash on ctrl+w and fix control window closing

[evince.git] / shell / ev-window-title.c

diff --git a/shell/ev-window-title.c b/shell/ev-window-title.c
index 250498e3619fd03b03298df680b57d6d688830a9..94dd33315f666c2c718c98618e76ec9cfab44db5 100644 (file)
--- a/shell/ev-window-title.c
+++ b/shell/ev-window-title.c
@@ -83,7 +83,7 @@ get_filename_from_uri (const char *uri)
 }
 
 /* Some docs report titles with confusing extensions (ex. .doc for pdf).
-   Let's show the filename in this case */
+          Erase the confusing extension of the title */
 static void
 ev_window_title_sanitize_title (EvWindowTitle *window_title, char **title) {
        const gchar *backend;
@@ -97,7 +97,7 @@ ev_window_title_sanitize_title (EvWindowTitle *window_title, char **title) {
                        char *new_title;
                        char *filename = get_filename_from_uri (window_title->uri);
 
-                       new_title = g_strdup_printf ("%s (%s)", *title, filename);
+                       new_title = g_strndup (*title, strlen(*title) - strlen(bad_extensions[i].text));
                        g_free (*title);
                        *title = new_title;
 
@@ -142,7 +142,15 @@ ev_window_title_update (EvWindowTitle *window_title)
        }
 
        if (title && window_title->uri) {
+               char *tmp_title;
+               char *filename = get_filename_from_uri (window_title->uri);
+
                ev_window_title_sanitize_title (window_title, &title);
+               tmp_title = g_strdup_printf ("%s — %s", filename, title);
+                g_free (title);
+                g_free (filename);
+
+                title = tmp_title;
        } else if (window_title->uri) {
                title = get_filename_from_uri (window_title->uri);
        } else if (!title) {