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 e7a13a747cf07b25a536e80bd244f24748c05e2f..229cc1db25dfd0bd259085646d906f10528cb00b 100644 (file)
--- 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 1b64c3dbc7701616470dd399faca4dc64cb4fa9e..eed7be8b7cfd5596af9f9452f0a8150f71effc96 100644 (file)
--- 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 b6638c95b862b6089bfc03d1ebd666f080d9c5f9..196f3408638adff16442c7a867017ec001a302cb 100644 (file)
--- 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 d8eb8ac2b2d1aad5d98c7423db4eae11f243b5f0..1f089fcf3ed41a95ddcdcbfb9de9352cfb887235 100644 (file)
--- 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);
        }