rpms/gnome-desktop/devel gnome-desktop-2.19.90-gnome-bg.patch, 1.1, 1.2 gnome-desktop.spec, 1.91, 1.92 gnome-desktop-2.10.0-init-i18n.patch, 1.2, NONE gnome-desktop-2.18.0-gnome-bg.patch, 1.3, NONE gnome-desktop-2.8.0-extrapo.tar.bz2, 1.1, NONE gnome-modem.png, 1.1, NONE gnome-money.png, 1.1, NONE
Matthias Clasen (mclasen)
fedora-extras-commits at redhat.com
Fri Aug 17 16:17:05 UTC 2007
Author: mclasen
Update of /cvs/extras/rpms/gnome-desktop/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32392
Modified Files:
gnome-desktop-2.19.90-gnome-bg.patch gnome-desktop.spec
Removed Files:
gnome-desktop-2.10.0-init-i18n.patch
gnome-desktop-2.18.0-gnome-bg.patch
gnome-desktop-2.8.0-extrapo.tar.bz2 gnome-modem.png
gnome-money.png
Log Message:
some more fixes for slide shows
gnome-desktop-2.19.90-gnome-bg.patch:
Index: gnome-desktop-2.19.90-gnome-bg.patch
===================================================================
RCS file: /cvs/extras/rpms/gnome-desktop/devel/gnome-desktop-2.19.90-gnome-bg.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- gnome-desktop-2.19.90-gnome-bg.patch 17 Aug 2007 05:25:22 -0000 1.1
+++ gnome-desktop-2.19.90-gnome-bg.patch 17 Aug 2007 16:17:02 -0000 1.2
@@ -1,6 +1,6 @@
diff -up gnome-desktop-2.19.90/configure.in.gnome-bg gnome-desktop-2.19.90/configure.in
--- gnome-desktop-2.19.90/configure.in.gnome-bg 2007-08-13 20:04:02.000000000 -0400
-+++ gnome-desktop-2.19.90/configure.in 2007-08-17 01:22:39.000000000 -0400
++++ gnome-desktop-2.19.90/configure.in 2007-08-17 02:37:45.000000000 -0400
@@ -51,10 +51,10 @@ AC_SUBST(GNOME_MICRO)
AC_SUBST(GNOME_DISTRIBUTOR)
AC_SUBST(GNOME_DATE)
@@ -18,7 +18,7 @@
diff -up gnome-desktop-2.19.90/libgnome-desktop/libgnomeui/Makefile.am.gnome-bg gnome-desktop-2.19.90/libgnome-desktop/libgnomeui/Makefile.am
--- gnome-desktop-2.19.90/libgnome-desktop/libgnomeui/Makefile.am.gnome-bg 2007-08-13 20:04:00.000000000 -0400
-+++ gnome-desktop-2.19.90/libgnome-desktop/libgnomeui/Makefile.am 2007-08-17 01:22:39.000000000 -0400
++++ gnome-desktop-2.19.90/libgnome-desktop/libgnomeui/Makefile.am 2007-08-17 02:37:45.000000000 -0400
@@ -1,4 +1,5 @@
libgnomeui_desktopdir = $(includedir)/gnome-desktop-2.0/libgnomeui
libgnomeui_desktop_HEADERS = \
@@ -27,8 +27,8 @@
+ gnome-hint.h \
+ gnome-bg.h
diff -up /dev/null gnome-desktop-2.19.90/libgnome-desktop/libgnomeui/gnome-bg.h
---- /dev/null 2007-08-16 21:19:52.668006792 -0400
-+++ gnome-desktop-2.19.90/libgnome-desktop/libgnomeui/gnome-bg.h 2007-08-17 01:22:39.000000000 -0400
+--- /dev/null 2007-08-17 09:34:06.909005733 -0400
++++ gnome-desktop-2.19.90/libgnome-desktop/libgnomeui/gnome-bg.h 2007-08-17 02:37:45.000000000 -0400
@@ -0,0 +1,99 @@
+/* gnome-bg.h -
+
@@ -130,9 +130,9 @@
+
+#endif
diff -up /dev/null gnome-desktop-2.19.90/libgnome-desktop/gnome-bg.c
---- /dev/null 2007-08-16 21:19:52.668006792 -0400
-+++ gnome-desktop-2.19.90/libgnome-desktop/gnome-bg.c 2007-08-17 01:23:31.000000000 -0400
-@@ -0,0 +1,1706 @@
+--- /dev/null 2007-08-17 09:34:06.909005733 -0400
++++ gnome-desktop-2.19.90/libgnome-desktop/gnome-bg.c 2007-08-17 12:13:47.000000000 -0400
+@@ -0,0 +1,1742 @@
+/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*-
+
+gnomebg.c: Object for the desktop background.
@@ -177,6 +177,15 @@
+typedef struct _SlideShow SlideShow;
+typedef struct _Slide Slide;
+
++struct _Slide
++{
++ double duration; /* in seconds */
++ gboolean fixed;
++
++ char *file1;
++ char *file2; /* NULL if fixed is TRUE */
++};
++
+/* This is the size of the GdkRGB dither matrix, in order to avoid
+ * bad dithering when tiling the gradient
+ */
@@ -263,6 +272,10 @@
+ GdkScreen *screen,
+ int dest_width,
+ int dest_height);
++static SlideShow * get_as_slideshow (GnomeBG *bg,
++ const char *uri);
++static Slide * get_current_slide (SlideShow *show,
++ double *alpha);
+
+static void
+gnome_bg_init (GnomeBG *bg)
@@ -741,15 +754,20 @@
+ int *orig_width,
+ int *orig_height)
+{
-+ char *filename = gnome_vfs_get_local_path_from_uri (uri);
-+
-+ if (!filename)
-+ return FALSE;
++ char *filename;
++ gboolean result;
++
++ if (g_str_has_prefix (uri, "file:"))
++ filename = gnome_vfs_get_local_path_from_uri (uri);
++ else
++ filename = uri;
+
-+ if (gdk_pixbuf_get_file_info (filename, orig_width, orig_height))
-+ return TRUE;
++ result = gdk_pixbuf_get_file_info (filename, orig_width, orig_height);
+
-+ return FALSE;
++ if (filename != uri)
++ g_free (filename);
++
++ return result;
+}
+
+gboolean
@@ -760,6 +778,7 @@
+{
+ GdkPixbuf *thumb;
+ gboolean result = FALSE;
++ const gchar *uri;
+
+ g_return_val_if_fail (bg != NULL, FALSE);
+ g_return_val_if_fail (factory != NULL, FALSE);
@@ -767,17 +786,31 @@
+ if (!bg->uri)
+ return FALSE;
+
-+ thumb = get_thumbnail_for_uri (factory, bg->uri);
++ uri = bg->uri;
++ thumb = get_thumbnail_for_uri (factory, uri);
+
++ if (!thumb) {
++ SlideShow *show = get_as_slideshow (bg, bg->uri);
++ if (show) {
++ double alpha;
++ Slide *slide = get_current_slide (show, &alpha);
++ uri = slide->file1;
++ thumb = get_thumbnail_for_uri (factory, uri);
++ }
++ }
++
+ if (thumb) {
+ if (get_thumb_annotations (thumb, width, height))
+ result = TRUE;
-+ else if (get_original_size (bg->uri, width, height))
-+ result = TRUE;
+
+ g_object_unref (thumb);
+ }
-+
++
++ if (!result) {
++ if (get_original_size (uri, width, height))
++ result = TRUE;
++ }
++
+ return result;
+}
+
@@ -896,15 +929,6 @@
+ GQueue *stack;
+};
+
-+struct _Slide
-+{
-+ double duration; /* in seconds */
-+ gboolean fixed;
-+
-+ char *file1;
-+ char *file2; /* NULL if fixed is TRUE */
-+};
-+
+static SlideShow *read_slideshow_file (const char *filename,
+ GError **err);
+static void slideshow_free (SlideShow *show);
@@ -954,9 +978,21 @@
+ double alpha)
+{
+ GdkPixbuf *result = gdk_pixbuf_copy (p1);
++ GdkPixbuf *tmp;
++
++ if (gdk_pixbuf_get_width (p2) != gdk_pixbuf_get_width (p1) ||
++ gdk_pixbuf_get_height (p2) != gdk_pixbuf_get_height (p1))
++ tmp = gdk_pixbuf_scale_simple (p2,
++ gdk_pixbuf_get_width (p1),
++ gdk_pixbuf_get_height (p1),
++ GDK_INTERP_BILINEAR);
++ else
++ tmp = g_object_ref (p2);
++
++ pixbuf_blend (tmp, result, 0, 0, -1, -1, 0, 0, alpha);
++
++ g_object_unref (tmp);
+
-+ pixbuf_blend (p2, result, 0, 0, -1, -1, 0, 0, alpha);
-+
+ return result;
+}
+
@@ -1841,7 +1877,7 @@
+}
diff -up gnome-desktop-2.19.90/libgnome-desktop/Makefile.am.gnome-bg gnome-desktop-2.19.90/libgnome-desktop/Makefile.am
--- gnome-desktop-2.19.90/libgnome-desktop/Makefile.am.gnome-bg 2007-08-13 20:04:00.000000000 -0400
-+++ gnome-desktop-2.19.90/libgnome-desktop/Makefile.am 2007-08-17 01:22:39.000000000 -0400
++++ gnome-desktop-2.19.90/libgnome-desktop/Makefile.am 2007-08-17 02:37:45.000000000 -0400
@@ -18,7 +18,8 @@ noinst_PROGRAMS = test-ditem test-hint t
libgnome_desktop_2_la_SOURCES = \
gnome-desktop-item.c \
Index: gnome-desktop.spec
===================================================================
RCS file: /cvs/extras/rpms/gnome-desktop/devel/gnome-desktop.spec,v
retrieving revision 1.91
retrieving revision 1.92
diff -u -r1.91 -r1.92
--- gnome-desktop.spec 17 Aug 2007 05:25:22 -0000 1.91
+++ gnome-desktop.spec 17 Aug 2007 16:17:02 -0000 1.92
@@ -12,7 +12,7 @@
Summary: Package containing code shared among gnome-panel, gnome-session, nautilus, etc
Name: gnome-desktop
Version: 2.19.90
-Release: 2%{?dist}
+Release: 3%{?dist}
URL: http://www.gnome.org
Source0: http://download.gnome.org/sources/gnome-desktop/2.19/%{name}-%{version}.tar.bz2
License: GPLv2+ and LGPLv2+
@@ -125,6 +125,9 @@
%doc %{_datadir}/gtk-doc/html/gnome-desktop/
%changelog
+* Fri Aug 17 2007 Matthias Clasen <mclasen at redhat.com> - 2.19.90-3
+- Try harder to get size information
+
* Fri Aug 17 2007 Matthias Clasen <mclasen at redhat.com> - 2.19.90-2
- Fix a problem with transitions in thumbnails of slideshows
--- gnome-desktop-2.10.0-init-i18n.patch DELETED ---
--- gnome-desktop-2.18.0-gnome-bg.patch DELETED ---
--- gnome-desktop-2.8.0-extrapo.tar.bz2 DELETED ---
More information about the fedora-extras-commits
mailing list