X-Git-Url: https://www.fi.muni.cz/~kas/git//home/kas/public_html/git/?a=blobdiff_plain;f=shell%2Fev-window-title.c;h=ca2429b5656b6edb563e74dde5a80d2d9957c9ca;hb=7ffaa3a0083d1f59a721f9f22f23d29d3cfc52aa;hp=ac1be65cd38a55cada141f6cb058f3164588feb7;hpb=31e16bd8f386dc292e60489d4a17227804bdc2e6;p=evince.git

diff --git a/shell/ev-window-title.c b/shell/ev-window-title.c
index ac1be65c..ca2429b5 100644
--- a/shell/ev-window-title.c
+++ b/shell/ev-window-title.c
@@ -17,11 +17,14 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA.
  */
 
+#include <config.h>
 #include "ev-window-title.h"
 #include "ev-backends-manager.h"
+#include "ev-utils.h"
 
+#include <string.h>
+#include <gio/gio.h>
 #include <glib/gi18n.h>
-#include <libgnomevfs/gnome-vfs-utils.h>
 
 /* Known backends (for bad extensions fix) */
 #define EV_BACKEND_PS  "psdocument"
@@ -30,8 +33,8 @@
 typedef struct
 {
 	const gchar *backend;
-	const gchar *ext;
-} BadExtensionEntry;
+	const gchar *text;
+} BadTitleEntry;
 
 struct _EvWindowTitle
 {
@@ -41,7 +44,7 @@ struct _EvWindowTitle
 	char *uri;
 };
 
-static const BadExtensionEntry bad_extensions[] = {
+static const BadTitleEntry bad_extensions[] = {
 	{ EV_BACKEND_PS, ".dvi" },
 	{ EV_BACKEND_PDF, ".doc" },
 	{ EV_BACKEND_PDF, ".dvi" },
@@ -49,6 +52,11 @@ static const BadExtensionEntry bad_extensions[] = {
 	{ EV_BACKEND_PDF, ".rtf" }
 };
 
+static const BadTitleEntry bad_prefixes[] = {
+	{ EV_BACKEND_PDF, "Microsoft Word - " },
+	{ EV_BACKEND_PDF, "Microsoft PowerPoint - " }
+};
+
 EvWindowTitle *
 ev_window_title_new (EvWindow *window)
 {
@@ -65,19 +73,19 @@ static char *
 get_filename_from_uri (const char *uri)
 {
 	char *filename;
-	char *display_name;
-
-	display_name = gnome_vfs_format_uri_for_display (uri);
-	filename = g_path_get_basename (display_name);
-	g_free (display_name);
+	char *basename;
+	
+	filename = g_uri_unescape_string (uri, NULL);
+	basename = g_path_get_basename (filename);
+	g_free(filename);
 
-	return filename;
+	return basename;
 }
 
 /* Some docs report titles with confusing extensions (ex. .doc for pdf).
    Let's show the filename in this case */
 static void
-ev_window_title_sanitize_extension (EvWindowTitle *window_title, char **title) {
+ev_window_title_sanitize_title (EvWindowTitle *window_title, char **title) {
 	const gchar *backend;
 	int i;
 
@@ -85,7 +93,7 @@ ev_window_title_sanitize_extension (EvWindowTitle *window_title, char **title) {
 
 	for (i = 0; i < G_N_ELEMENTS (bad_extensions); i++) {
 		if (g_ascii_strcasecmp (bad_extensions[i].backend, backend) == 0 && 
-		    g_str_has_suffix (*title, bad_extensions[i].ext)) {
+		    g_str_has_suffix (*title, bad_extensions[i].text)) {
 			char *new_title;
 			char *filename = get_filename_from_uri (window_title->uri);
 
@@ -96,6 +104,17 @@ ev_window_title_sanitize_extension (EvWindowTitle *window_title, char **title) {
 			g_free (filename);
 		}
 	}
+	for (i = 0; i < G_N_ELEMENTS (bad_prefixes); i++) {
+		if (g_ascii_strcasecmp (bad_prefixes[i].backend, backend) == 0 &&
+		    g_str_has_prefix (*title, bad_prefixes[i].text)) {
+			char *new_title;
+			int len = strlen(bad_prefixes[i].text);
+			
+			new_title = g_strdup_printf ("%s", (*title) + len);
+			g_free (*title);
+			*title = new_title;
+		}
+	}
 }
 
 static void
@@ -103,14 +122,11 @@ ev_window_title_update (EvWindowTitle *window_title)
 {
 	GtkWindow *window = GTK_WINDOW (window_title->window);
 	char *title = NULL, *password_title, *p;
-	EvPageCache *page_cache;
 
 	if (window_title->document != NULL) {
-		char *doc_title;
+		gchar *doc_title;
 
-		page_cache = ev_page_cache_get (window_title->document);
-		g_return_if_fail (page_cache != NULL);
-		doc_title = (char *)ev_page_cache_get_title (page_cache);
+		doc_title = g_strdup (ev_document_get_title (window_title->document));
 
 		/* Make sure we get a valid title back */
 		if (doc_title != NULL) {
@@ -120,11 +136,13 @@ ev_window_title_update (EvWindowTitle *window_title)
 			    g_utf8_validate (doc_title, -1, NULL)) {
 				title = g_strdup (doc_title);
 			}
+
+			g_free (doc_title);
 		}
 	}
 
 	if (title && window_title->uri) {
-		ev_window_title_sanitize_extension (window_title, &title);
+		ev_window_title_sanitize_title (window_title, &title);
 	} else if (window_title->uri) {
 		title = get_filename_from_uri (window_title->uri);
 	} else if (!title) {