diff -Nru --exclude configure --exclude aclocal.m4 --exclude Makefile.in --exclude help --exclude po --exclude debian --exclude gtk-doc.make --exclude 'intltool*' evince-2.22.1.1/backend/impress/iksemel.c evince-2.22.2/backend/impress/iksemel.c --- evince-2.22.1.1/backend/impress/iksemel.c 2008-04-07 23:05:29.000000000 +0200 +++ evince-2.22.2/backend/impress/iksemel.c 2008-05-28 23:13:57.000000000 +0200 @@ -761,11 +761,11 @@ if (prs->attcur >= (prs->attmax * 2)) { void *tmp; prs->attmax += 12; - tmp = iks_malloc (sizeof(char *) * 2 * prs->attmax); + tmp = iks_malloc (sizeof(char *) * (2 * prs->attmax + 1)); if (!tmp) return IKS_NOMEM; - memset (tmp, 0, sizeof(char *) * 2 * prs->attmax); + memset (tmp, 0, sizeof(char *) * (2 * prs->attmax + 1)); memcpy (tmp, prs->atts, sizeof(char *) * prs->attcur); - free (prs->atts); + iks_free (prs->atts); prs->atts = tmp; } } diff -Nru --exclude configure --exclude aclocal.m4 --exclude Makefile.in --exclude help --exclude po --exclude debian --exclude gtk-doc.make --exclude 'intltool*' /tmp/zuNmpGhL43/evince-2.22.1.1/ChangeLog /tmp/QfxjCjx3YY/evince-2.22.2/ChangeLog --- evince-2.22.1.1/ChangeLog 2008-04-08 21:03:32.000000000 +0200 +++ evince-2.22.2/ChangeLog 2008-05-28 23:19:46.000000000 +0200 @@ -1,3 +1,31 @@ +2008-05-29 Nickolay V. Shmyrev + + * NEWS: + * configure.ac: + + Update for release 2.22.2 + +2008-05-19 Matthias Drochner + + * properties/ev-properties-view.c (get_default_user_units): + Fixes check for default units string translation. Bug #533323. + +2008-05-01 Hans Petter Jansson + + * backend/impress/iksemel.c (sax_core): Fix a free() that should + be an iks_free(). Fix an array overflow in the XML parser that + would occur whenever the number of attributes in a tag was greater + than 0 and divisible by 6. Fixes GNOME bug #530852. + +2008-04-19 Carlos Garcia Campos + + * libdocument/ev-document-factory.c: (get_document_from_uri): + + Use the pixbuf backend only when the mime type is not supported by + any of the other backend so that tiff documents, for instance, are + handled by the tiff backend instead of the pixbuf backend. Fixes + bug #520290. + 2008-04-08 Nickolay V. Shmyrev * NEWS: diff -Nru --exclude configure --exclude aclocal.m4 --exclude Makefile.in --exclude help --exclude po --exclude debian --exclude gtk-doc.make --exclude 'intltool*' /tmp/zuNmpGhL43/evince-2.22.1.1/configure.ac /tmp/QfxjCjx3YY/evince-2.22.2/configure.ac --- evince-2.22.1.1/configure.ac 2008-04-08 19:43:23.000000000 +0200 +++ evince-2.22.2/configure.ac 2008-05-28 23:14:35.000000000 +0200 @@ -1,7 +1,7 @@ dnl Process this file with autoconf to produce a configure script. AC_PREREQ(2.57) -AC_INIT([Evince],[2.22.1.1],[http://bugzilla.gnome.org/enter_bug.cgi?product=evince],[evince]) +AC_INIT([Evince],[2.22.2],[http://bugzilla.gnome.org/enter_bug.cgi?product=evince],[evince]) AM_INIT_AUTOMAKE([1.9 dist-bzip2 no-dist-gzip]) EV_API_VERSION=2.20 diff -Nru --exclude configure --exclude aclocal.m4 --exclude Makefile.in --exclude help --exclude po --exclude debian --exclude gtk-doc.make --exclude 'intltool*' /tmp/zuNmpGhL43/evince-2.22.1.1/libdocument/ev-document-factory.c /tmp/QfxjCjx3YY/evince-2.22.2/libdocument/ev-document-factory.c --- evince-2.22.1.1/libdocument/ev-document-factory.c 2008-04-07 23:05:36.000000000 +0200 +++ evince-2.22.2/libdocument/ev-document-factory.c 2008-05-28 23:14:02.000000000 +0200 @@ -180,13 +180,11 @@ return NULL; } + document = ev_backends_manager_get_document (mime_type); + #ifdef ENABLE_PIXBUF - if (mime_type_supported_by_gdk_pixbuf (mime_type)) + if (!document && mime_type_supported_by_gdk_pixbuf (mime_type)) document = ev_backends_manager_get_document ("image/*"); - else - document = ev_backends_manager_get_document (mime_type); -#else - document = ev_backends_manager_get_document (mime_type); #endif /* ENABLE_PIXBUF */ if (document == NULL) { diff -Nru --exclude configure --exclude aclocal.m4 --exclude Makefile.in --exclude help --exclude po --exclude debian --exclude gtk-doc.make --exclude 'intltool*' /tmp/zuNmpGhL43/evince-2.22.1.1/NEWS /tmp/QfxjCjx3YY/evince-2.22.2/NEWS --- evince-2.22.1.1/NEWS 2008-04-08 21:02:54.000000000 +0200 +++ evince-2.22.2/NEWS 2008-05-28 23:18:47.000000000 +0200 @@ -1,3 +1,17 @@ +=============== +Evince 2.22.2 +=============== + +Bug fixes: + + * Fixes warning with gtk-2.10 (#533323, Matthias Drochner) + * Fixes crash in impress backend (#530852, Hans Petter Jansson) + * Handle multipage tiff properly (#520290, Carlos Garcia Campos) + +Translation updates: + + * Ivar Smolin (et) + ================ Evince 2.22.1.1 ================ diff -Nru --exclude configure --exclude aclocal.m4 --exclude Makefile.in --exclude help --exclude po --exclude debian --exclude gtk-doc.make --exclude 'intltool*' /tmp/zuNmpGhL43/evince-2.22.1.1/properties/ev-properties-view.c /tmp/QfxjCjx3YY/evince-2.22.2/properties/ev-properties-view.c --- evince-2.22.1.1/properties/ev-properties-view.c 2008-04-07 23:05:35.000000000 +0200 +++ evince-2.22.2/properties/ev-properties-view.c 2008-05-28 23:14:01.000000000 +0200 @@ -216,10 +216,12 @@ return GTK_UNIT_MM; /* metric */ #endif + if (strcmp (e, "default:mm") == 0) + return GTK_UNIT_MM; if (strcmp (e, "default:inch") == 0) return GTK_UNIT_INCH; - else if (strcmp (e, "default:mm") == 0) - g_warning ("Whoever translated default:mm did so wrongly.\n"); + + g_warning ("Whoever translated default:mm did so wrongly.\n"); return GTK_UNIT_MM; }