diff --git a/gnome-desktop.spec b/gnome-desktop.spec index 24d3e6c..47a574c 100644 --- a/gnome-desktop.spec +++ b/gnome-desktop.spec @@ -12,7 +12,7 @@ Summary: Package containing code shared among gnome-panel, gnome-session, nautilus, etc Name: gnome-desktop Version: 2.21.92 -Release: 1%{?dist} +Release: 2%{?dist} URL: http://www.gnome.org Source0: http://download.gnome.org/sources/gnome-desktop/2.21/%{name}-%{version}.tar.bz2 License: GPLv2+ and LGPLv2+ @@ -121,6 +121,9 @@ rm -rf $RPM_BUILD_ROOT %doc %{_datadir}/gtk-doc/html/gnome-desktop/ %changelog +* Tue Feb 26 2008 Matthias Clasen - 2.21.92-2 +- Fix a bug in the multires patch + * Tue Feb 26 2008 Matthias Clasen - 2.21.92-1 - Update to 2.21.92 diff --git a/multires.patch b/multires.patch index 7b073d9..14b5557 100644 --- a/multires.patch +++ b/multires.patch @@ -1,6 +1,6 @@ diff -up gnome-desktop-2.21.92/libgnome-desktop/gnome-bg.c.multires gnome-desktop-2.21.92/libgnome-desktop/gnome-bg.c --- gnome-desktop-2.21.92/libgnome-desktop/gnome-bg.c.multires 2008-02-26 12:35:16.000000000 -0500 -+++ gnome-desktop-2.21.92/libgnome-desktop/gnome-bg.c 2008-02-26 13:30:53.000000000 -0500 ++++ gnome-desktop-2.21.92/libgnome-desktop/gnome-bg.c 2008-02-26 15:18:37.000000000 -0500 @@ -49,8 +49,17 @@ struct _Slide double duration; /* in seconds */ gboolean fixed; @@ -282,8 +282,8 @@ diff -up gnome-desktop-2.21.92/libgnome-desktop/gnome-bg.c.multires gnome-deskto + fs->width = -1; + fs->height = -1; + fs->file = make_uri (g_strdup (text)); -+ slide->file1 = g_slist_prepend (slide->file1, fs); -+ if (slide->file1->next != NULL) ++ slide->file2 = g_slist_prepend (slide->file2, fs); ++ if (slide->file2->next != NULL) + parser->changes_with_size = TRUE; + } + else if (stack_is (parser, "size", "to", "transition", "background", NULL)) { @@ -323,7 +323,17 @@ diff -up gnome-desktop-2.21.92/libgnome-desktop/gnome-bg.c.multires gnome-deskto g_free (slide); } -@@ -1706,9 +1865,19 @@ dump_bg (SlideShow *show) +@@ -1698,17 +1857,28 @@ slideshow_free (SlideShow *show) + static void + dump_bg (SlideShow *show) + { +-#if 0 ++#if 0 + GList *list; ++ GSList *slist; + + for (list = show->slides->head; list != NULL; list = list->next) + { Slide *slide = list->data; g_print ("\nSlide: %s\n", slide->fixed? "fixed" : "transition"); @@ -346,7 +356,7 @@ diff -up gnome-desktop-2.21.92/libgnome-desktop/gnome-bg.c.multires gnome-deskto } #endif } -@@ -1771,8 +1940,8 @@ read_slideshow_file (const char *uri, +@@ -1771,8 +1941,8 @@ read_slideshow_file (const char *uri, show = NULL; } @@ -357,7 +367,7 @@ diff -up gnome-desktop-2.21.92/libgnome-desktop/gnome-bg.c.multires gnome-deskto slideshow_free (show); show = NULL; } -@@ -1863,3 +2032,10 @@ get_thumb_annotations (GdkPixbuf *thumb, +@@ -1863,3 +2033,10 @@ get_thumb_annotations (GdkPixbuf *thumb, return FALSE; }