X-Git-Url: https://www.fi.muni.cz/~kas/git//home/kas/public_html/git/?a=blobdiff_plain;ds=sidebyside;f=shell%2Fev-window.c;h=4cd8b6423735b2842b985eb5d8564af8bc534106;hb=206bc8045e1d217e09f0e640d14791f2669a92ac;hp=a1dadb7fc84298d4ddef5329fa0252b19fbcc240;hpb=51d4c0c6de63d78e9df04df525df35351b8bb454;p=evince.git

diff --git a/shell/ev-window.c b/shell/ev-window.c
index a1dadb7f..4cd8b642 100644
--- a/shell/ev-window.c
+++ b/shell/ev-window.c
@@ -5,7 +5,7 @@
  *  Copyright (C) 2004 Martin Kretzschmar
  *  Copyright (C) 2004 Red Hat, Inc.
  *  Copyright (C) 2000, 2001, 2002, 2003, 2004 Marco Pesenti Gritti
- *  Copyright (C) 2003, 2004, 2005 Christian Persch
+ *  Copyright © 2003, 2004, 2005, 2009 Christian Persch
  *
  *  Author:
  *    Martin Kretzschmar <martink@gnome.org>
@@ -1216,6 +1216,8 @@ ev_window_setup_document (EvWindow *ev_window)
 	info = ev_page_cache_get_info (ev_window->priv->page_cache);
 	update_document_mode (ev_window, info->mode);
 
+	gtk_widget_grab_focus (ev_window->priv->view);
+
 	return FALSE;
 }
 
@@ -2989,6 +2991,11 @@ ev_window_print_range (EvWindow *ev_window,
 		ev_window->priv->print_queue = g_queue_new ();
 
 	op = ev_print_operation_new (ev_window->priv->document);
+	if (!op) {
+		g_warning ("%s", "Printing is not supported for document\n");
+		return;
+	}
+
 	g_signal_connect (op, "begin_print",
 			  G_CALLBACK (ev_window_print_operation_begin_print),
 			  (gpointer)ev_window);
@@ -4140,6 +4147,7 @@ ev_window_cmd_help_about (GtkAction *action, EvWindow *ev_window)
 		"Bryan Clark <clarkbw@gnome.org>",
 		"Carlos Garcia Campos <carlosgc@gnome.org>",
 		"Wouter Bolsterlee <wbolster@gnome.org>",
+                "Christian Persch <chpe" "\100" "gnome.org>",
 		NULL
 	};
 
@@ -4184,7 +4192,7 @@ ev_window_cmd_help_about (GtkAction *action, EvWindow *ev_window)
 		"name", _("Evince"),
 		"version", VERSION,
 		"copyright",
-		_("\xc2\xa9 1996-2007 The Evince authors"),
+		_("© 1996–2009 The Evince authors"),
 		"license", license_trans,
 		"website", "http://www.gnome.org/projects/evince",
 		"comments", comments,
@@ -5883,6 +5891,7 @@ ev_window_init (EvWindow *ev_window)
 	GError *error = NULL;
 	GtkWidget *sidebar_widget;
 	GObject *mpkeys;
+	gchar *ui_path;
 
 	g_signal_connect (ev_window, "configure_event",
 			  G_CALLBACK (window_configure_event_cb), NULL);
@@ -5937,12 +5946,15 @@ ev_window_init (EvWindow *ev_window)
 	gtk_ui_manager_insert_action_group (ev_window->priv->ui_manager,
 					    action_group, 0);
 
-	if (!gtk_ui_manager_add_ui_from_file (ev_window->priv->ui_manager,
-					      DATADIR"/evince-ui.xml",
-					      &error)) {
+	ui_path = g_build_filename (ev_application_get_data_dir (EV_APP),
+				    "evince-ui.xml", NULL);
+	if (!gtk_ui_manager_add_ui_from_file (
+		ev_window->priv->ui_manager, ui_path, &error))
+	{
 		g_warning ("building menus failed: %s", error->message);
 		g_error_free (error);
 	}
+	g_free (ui_path);
 	
 	ev_window->priv->recent_manager = gtk_recent_manager_get_default ();
 	ev_window->priv->recent_action_group = NULL;