X-Git-Url: https://www.fi.muni.cz/~kas/git//home/kas/public_html/git/?a=blobdiff_plain;ds=sidebyside;f=shell%2Fev-window-title.c;h=94dd33315f666c2c718c98618e76ec9cfab44db5;hb=6935cbce7dce37600abe92eec6344ffde0cc6bae;hp=3a7d908dafeb99fec468421fc2e310eaa6cf1f4d;hpb=6af898f7cec050d05fb795310ea184b40db71645;p=evince.git

diff --git a/shell/ev-window-title.c b/shell/ev-window-title.c
index 3a7d908d..94dd3331 100644
--- a/shell/ev-window-title.c
+++ b/shell/ev-window-title.c
@@ -14,20 +14,27 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA.
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
  */
 
+#include <config.h>
 #include "ev-window-title.h"
-#include "ev-document-factory.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"
+#define EV_BACKEND_PDF "pdfdocument"
 
 typedef struct
 {
-	EvBackend backend;
-	const char *ext;
-} BadExtensionEntry;
+	const gchar *backend;
+	const gchar *text;
+} BadTitleEntry;
 
 struct _EvWindowTitle
 {
@@ -37,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" },
@@ -45,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)
 {
@@ -61,36 +73,48 @@ 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 */
+	   Erase the confusing extension of the title */
 static void
-ev_window_title_sanitize_extension (EvWindowTitle *window_title, char **title) {
-	EvBackend backend;
+ev_window_title_sanitize_title (EvWindowTitle *window_title, char **title) {
+	const gchar *backend;
 	int i;
 
-	backend = ev_document_factory_get_backend (window_title->document);
+	backend = ev_backends_manager_get_document_module_name (window_title->document);
+
 	for (i = 0; i < G_N_ELEMENTS (bad_extensions); i++) {
-		if (bad_extensions[i].backend == backend &&
-		    g_str_has_suffix (*title, bad_extensions[i].ext)) {
+		if (g_ascii_strcasecmp (bad_extensions[i].backend, backend) == 0 && 
+		    g_str_has_suffix (*title, bad_extensions[i].text)) {
 			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;
 
 			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
@@ -98,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) {
@@ -115,11 +136,21 @@ 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);
+		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) {
@@ -136,7 +167,7 @@ ev_window_title_update (EvWindowTitle *window_title)
 		gtk_window_set_title (window, title);
 		break;
 	case EV_WINDOW_TITLE_PASSWORD:
-		password_title = g_strdup_printf (_("%s - Password Required"), title);
+		password_title = g_strdup_printf (_("%s — Password Required"), title);
 		gtk_window_set_title (window, password_title);
 		g_free (password_title);
 		break;