From: Nickolay V. Shmyrev <nshmyrev@src.gnome.org>
Date: Sun, 25 Dec 2005 23:30:36 +0000 (+0000)
Subject: Correct zoom setup and metadata save broken in some locales.
X-Git-Tag: EVINCE_0_5_0~43
X-Git-Url: https://www.fi.muni.cz/~kas/git//home/kas/public_html/git/?a=commitdiff_plain;h=96b7b39d956756ad5e354b67e7da4d2a73415cb3;p=evince.git

Correct zoom setup and metadata save broken in some locales.

	* shell/ev-metadata-manager.c: (parse_value):
	* shell/ev-view.c: (goto_xyz_link):

	Correct zoom setup and metadata save broken in
	some locales.
---

diff --git a/ChangeLog b/ChangeLog
index e7a13a74..229cc1db 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2005-12-26  Nickolay V. Shmyrev  <nshmyrev@yandex.ru>
+
+	* shell/ev-metadata-manager.c: (parse_value):
+	* shell/ev-view.c: (goto_xyz_link):
+	
+	Correct zoom setup and metadata save broken in 
+	some locales.
+
 2005-12-26  Nickolay V. Shmyrev  <nshmyrev@yandex.ru>
 
 	* shell/ev-view-private.h:
diff --git a/shell/ev-application.c b/shell/ev-application.c
index 1b64c3db..eed7be8b 100644
--- a/shell/ev-application.c
+++ b/shell/ev-application.c
@@ -91,9 +91,6 @@ ev_application_register_service (EvApplication *application)
 	dbus_g_object_type_install_info (EV_TYPE_APPLICATION,
 					 &dbus_glib_ev_application_object_info);
 #endif
-#ifdef ENABLE_COMICS
-	GtkFileFilter *comics_filter;
-#endif
 
 	dbus_g_connection_register_g_object (connection,
 					     "/org/gnome/evince/Evince",
diff --git a/shell/ev-metadata-manager.c b/shell/ev-metadata-manager.c
index b6638c95..196f3408 100644
--- a/shell/ev-metadata-manager.c
+++ b/shell/ev-metadata-manager.c
@@ -145,7 +145,7 @@ parse_value (xmlChar *value, xmlChar *type)
 			g_value_set_int (ret, atoi ((char *)value));
 			break;
 		case G_TYPE_DOUBLE:
-			g_value_set_double (ret, atof ((char *)value));
+			g_value_set_double (ret, g_ascii_strtod ((char *)value, NULL));
 			break;
 		case G_TYPE_BOOLEAN:
 			g_value_set_boolean (ret, atoi ((char *)value));
diff --git a/shell/ev-view.c b/shell/ev-view.c
index d8eb8ac2..1f089fcf 100644
--- a/shell/ev-view.c
+++ b/shell/ev-view.c
@@ -1177,8 +1177,8 @@ goto_xyz_link (EvView *view, EvLink *link)
 	page = ev_link_get_page (link);
 	ev_page_cache_get_size (view->page_cache, page, 0, 1.0, NULL, &height);
 
-	ev_view_set_sizing_mode (view, EV_SIZING_FREE);
 	if (zoom != 0) {
+		ev_view_set_sizing_mode (view, EV_SIZING_FREE);
 		ev_view_set_zoom (view, zoom, FALSE);
 	}