X-Git-Url: https://www.fi.muni.cz/~kas/git//home/kas/public_html/git/?a=blobdiff_plain;ds=inline;f=shell%2Fev-window.c;h=b4e87394b2768c25b0b16980af3562adcdbeee0d;hb=d52ff81f97f4bd3794e1517443096846baee068b;hp=030a86dd27dfdb98e90db15b8b16018abba8186f;hpb=1c3f73e333d92b56e95aad6f67ad0a315a106b6c;p=evince.git

diff --git a/shell/ev-window.c b/shell/ev-window.c
index 030a86dd..b4e87394 100644
--- a/shell/ev-window.c
+++ b/shell/ev-window.c
@@ -223,13 +223,12 @@ struct _EvWindowPrivate {
 #define NAVIGATION_ACTION	"Navigation"
 
 #define GCONF_LOCKDOWN_DIR          "/desktop/gnome/lockdown"
-#define GCONF_OVERRIDE_RESTRICTIONS "/apps/evince/override_restrictions"
 #define GCONF_LOCKDOWN_SAVE         "/desktop/gnome/lockdown/disable_save_to_disk"
 #define GCONF_LOCKDOWN_PRINT        "/desktop/gnome/lockdown/disable_printing"
 #define GCONF_LOCKDOWN_PRINT_SETUP  "/desktop/gnome/lockdown/disable_print_setup"
 
 #define GS_SCHEMA_NAME           "org.gnome.Evince"
-#define GS_OVERRIDE_RESTRICTIONS "override_restrictions"
+#define GS_OVERRIDE_RESTRICTIONS "override-restrictions"
 
 #define SIDEBAR_DEFAULT_SIZE    132
 #define LINKS_SIDEBAR_ID "links"
@@ -1090,7 +1089,7 @@ setup_document_from_metadata (EvWindow *window)
 		screen = gtk_window_get_screen (GTK_WINDOW (window));
 		if (screen) {
 			request_width = MIN (request_width, gdk_screen_get_width (screen));
-			request_height = MIN (request_width, gdk_screen_get_height (screen));
+			request_height = MIN (request_height, gdk_screen_get_height (screen));
 		}
 
 		if (request_width > 0 && request_height > 0) {
@@ -4874,6 +4873,7 @@ ev_window_dispose (GObject *object)
 	}
 
 	if (priv->last_settings) {
+		g_settings_apply (priv->last_settings);
 		g_object_unref (priv->last_settings);
 		priv->last_settings = NULL;
 	}
@@ -6460,6 +6460,7 @@ ev_window_init (EvWindow *ev_window)
 	gtk_widget_grab_focus (ev_window->priv->view);
 
 	ev_window->priv->last_settings = g_settings_new (GS_SCHEMA_NAME".Default");
+	g_settings_delay (ev_window->priv->last_settings);
 
 	/* Set it user interface params */
 	ev_window_setup_recent (ev_window);