rpms/gnome-desktop/devel gnome-desktop-2.24.0-fade.patch, 1.6, 1.7 gnome-desktop.spec, 1.179, 1.180
Ray Strode
rstrode at fedoraproject.org
Fri Oct 24 19:50:50 UTC 2008
Author: rstrode
Update of /cvs/pkgs/rpms/gnome-desktop/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16472
Modified Files:
gnome-desktop-2.24.0-fade.patch gnome-desktop.spec
Log Message:
- properly initialize variable in gnome_bg_get_pixmap_from_root
(bug 460758)
gnome-desktop-2.24.0-fade.patch:
Index: gnome-desktop-2.24.0-fade.patch
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-desktop/devel/gnome-desktop-2.24.0-fade.patch,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- gnome-desktop-2.24.0-fade.patch 20 Oct 2008 18:00:09 -0000 1.6
+++ gnome-desktop-2.24.0-fade.patch 24 Oct 2008 19:50:50 -0000 1.7
@@ -1,6 +1,6 @@
-diff -up gnome-desktop-2.24.0/libgnome-desktop/gnome-bg.c.fade gnome-desktop-2.24.0/libgnome-desktop/gnome-bg.c
---- gnome-desktop-2.24.0/libgnome-desktop/gnome-bg.c.fade 2008-09-22 17:01:45.000000000 -0400
-+++ gnome-desktop-2.24.0/libgnome-desktop/gnome-bg.c 2008-10-15 11:12:56.000000000 -0400
+diff -up gnome-desktop-2.24.1/libgnome-desktop/gnome-bg.c.fade gnome-desktop-2.24.1/libgnome-desktop/gnome-bg.c
+--- gnome-desktop-2.24.1/libgnome-desktop/gnome-bg.c.fade 2008-10-22 05:15:52.000000000 -0400
++++ gnome-desktop-2.24.1/libgnome-desktop/gnome-bg.c 2008-10-24 15:48:54.000000000 -0400
@@ -37,11 +37,15 @@ Author: Soren Sandmann <sandmann at redhat.
#include <X11/Xlib.h>
#include <X11/Xatom.h>
@@ -113,7 +113,7 @@
static void
draw_color (GnomeBG *bg, GdkPixbuf *dest)
{
-@@ -1011,15 +1062,74 @@ gnome_bg_create_thumbnail (GnomeBG
+@@ -1011,15 +1062,75 @@ gnome_bg_create_thumbnail (GnomeBG
return result;
}
@@ -129,6 +129,9 @@
+ Display *display;
+ int screen_num;
+ GdkPixmap *pixmap;
++
++ display = GDK_DISPLAY_XDISPLAY (gdk_screen_get_display (screen));
++ screen_num = gdk_screen_get_number (screen);
-/* Set the root pixmap, and properties pointing to it. We
- * do this atomically with XGrabServer to make sure that
@@ -138,8 +141,6 @@
- */
-void
-gnome_bg_set_pixmap_as_root (GdkScreen *screen, GdkPixmap *pixmap)
-+ display = GDK_DISPLAY_XDISPLAY (gdk_screen_get_display (screen));
-+
+ result = XGetWindowProperty (display,
+ RootWindow (display, screen_num),
+ gdk_x11_get_xatom_by_name ("_XROOTPMAP_ID"),
@@ -196,7 +197,7 @@
{
int result;
gint format;
-@@ -1030,24 +1140,19 @@ gnome_bg_set_pixmap_as_root (GdkScreen *
+@@ -1030,24 +1141,19 @@ gnome_bg_set_pixmap_as_root (GdkScreen *
Atom type;
Display *display;
int screen_num;
@@ -225,7 +226,7 @@
if (data_esetroot != NULL) {
if (result == Success && type == XA_PIXMAP &&
format == 32 &&
-@@ -1059,9 +1164,9 @@ gnome_bg_set_pixmap_as_root (GdkScreen *
+@@ -1059,9 +1165,9 @@ gnome_bg_set_pixmap_as_root (GdkScreen *
}
XFree (data_esetroot);
}
@@ -237,7 +238,7 @@
XChangeProperty (display, RootWindow (display, screen_num),
gdk_x11_get_xatom_by_name ("ESETROOT_PMAP_ID"),
XA_PIXMAP, 32, PropModeReplace,
-@@ -1070,14 +1175,72 @@ gnome_bg_set_pixmap_as_root (GdkScreen *
+@@ -1070,14 +1176,72 @@ gnome_bg_set_pixmap_as_root (GdkScreen *
gdk_x11_get_xatom_by_name ("_XROOTPMAP_ID"), XA_PIXMAP,
32, PropModeReplace,
(guchar *) &pixmap_id, 1);
@@ -254,10 +255,10 @@
+{
+ Display *display;
+ int screen_num;
-
++
+ g_return_if_fail (screen != NULL);
+ g_return_if_fail (pixmap != NULL);
-+
+
+ screen_num = gdk_screen_get_number (screen);
+ display = GDK_DISPLAY_XDISPLAY (gdk_screen_get_display (screen));
+
@@ -314,7 +315,7 @@
}
-@@ -1343,7 +1506,7 @@ on_timeout (gpointer data)
+@@ -1343,7 +1507,7 @@ on_timeout (gpointer data)
bg->timeout_id = 0;
@@ -323,9 +324,9 @@
return FALSE;
}
-diff -up /dev/null gnome-desktop-2.24.0/libgnome-desktop/gnome-bg-crossfade.c
---- /dev/null 2008-10-20 05:51:19.470282574 -0400
-+++ gnome-desktop-2.24.0/libgnome-desktop/gnome-bg-crossfade.c 2008-10-20 13:58:17.000000000 -0400
+diff -up /dev/null gnome-desktop-2.24.1/libgnome-desktop/gnome-bg-crossfade.c
+--- /dev/null 2008-10-24 10:25:06.075282785 -0400
++++ gnome-desktop-2.24.1/libgnome-desktop/gnome-bg-crossfade.c 2008-10-24 15:46:13.000000000 -0400
@@ -0,0 +1,451 @@
+/* gnome-bg-crossfade.h - fade window background between two pixmaps
+ *
@@ -778,9 +779,9 @@
+ g_source_remove (fade->priv->timeout_id);
+ }
+}
-diff -up /dev/null gnome-desktop-2.24.0/libgnome-desktop/libgnomeui/gnome-bg-crossfade.h
---- /dev/null 2008-10-20 05:51:19.470282574 -0400
-+++ gnome-desktop-2.24.0/libgnome-desktop/libgnomeui/gnome-bg-crossfade.h 2008-10-15 08:57:26.000000000 -0400
+diff -up /dev/null gnome-desktop-2.24.1/libgnome-desktop/libgnomeui/gnome-bg-crossfade.h
+--- /dev/null 2008-10-24 10:25:06.075282785 -0400
++++ gnome-desktop-2.24.1/libgnome-desktop/libgnomeui/gnome-bg-crossfade.h 2008-10-24 15:46:13.000000000 -0400
@@ -0,0 +1,76 @@
+/* gnome-bg-crossfade.h - fade window background between two pixmaps
+
@@ -858,9 +859,9 @@
+G_END_DECLS
+
+#endif
-diff -up gnome-desktop-2.24.0/libgnome-desktop/libgnomeui/gnome-bg.h.fade gnome-desktop-2.24.0/libgnome-desktop/libgnomeui/gnome-bg.h
---- gnome-desktop-2.24.0/libgnome-desktop/libgnomeui/gnome-bg.h.fade 2008-09-22 17:01:45.000000000 -0400
-+++ gnome-desktop-2.24.0/libgnome-desktop/libgnomeui/gnome-bg.h 2008-10-14 17:49:44.000000000 -0400
+diff -up gnome-desktop-2.24.1/libgnome-desktop/libgnomeui/gnome-bg.h.fade gnome-desktop-2.24.1/libgnome-desktop/libgnomeui/gnome-bg.h
+--- gnome-desktop-2.24.1/libgnome-desktop/libgnomeui/gnome-bg.h.fade 2008-10-22 05:15:51.000000000 -0400
++++ gnome-desktop-2.24.1/libgnome-desktop/libgnomeui/gnome-bg.h 2008-10-24 15:46:13.000000000 -0400
@@ -33,6 +33,8 @@
#include <gdk/gdk.h>
#include <gconf/gconf-client.h>
@@ -890,9 +891,9 @@
G_END_DECLS
-diff -up gnome-desktop-2.24.0/libgnome-desktop/libgnomeui/Makefile.am.fade gnome-desktop-2.24.0/libgnome-desktop/libgnomeui/Makefile.am
---- gnome-desktop-2.24.0/libgnome-desktop/libgnomeui/Makefile.am.fade 2008-09-22 17:01:45.000000000 -0400
-+++ gnome-desktop-2.24.0/libgnome-desktop/libgnomeui/Makefile.am 2008-10-14 17:49:44.000000000 -0400
+diff -up gnome-desktop-2.24.1/libgnome-desktop/libgnomeui/Makefile.am.fade gnome-desktop-2.24.1/libgnome-desktop/libgnomeui/Makefile.am
+--- gnome-desktop-2.24.1/libgnome-desktop/libgnomeui/Makefile.am.fade 2008-10-22 05:15:51.000000000 -0400
++++ gnome-desktop-2.24.1/libgnome-desktop/libgnomeui/Makefile.am 2008-10-24 15:46:13.000000000 -0400
@@ -3,6 +3,7 @@ libgnomeui_desktop_HEADERS = \
gnome-ditem-edit.h \
gnome-hint.h \
@@ -901,9 +902,9 @@
gnome-rr.h \
gnome-rr-config.h \
gnome-rr-labeler.h
-diff -up gnome-desktop-2.24.0/libgnome-desktop/Makefile.am.fade gnome-desktop-2.24.0/libgnome-desktop/Makefile.am
---- gnome-desktop-2.24.0/libgnome-desktop/Makefile.am.fade 2008-09-22 17:01:45.000000000 -0400
-+++ gnome-desktop-2.24.0/libgnome-desktop/Makefile.am 2008-10-14 17:49:44.000000000 -0400
+diff -up gnome-desktop-2.24.1/libgnome-desktop/Makefile.am.fade gnome-desktop-2.24.1/libgnome-desktop/Makefile.am
+--- gnome-desktop-2.24.1/libgnome-desktop/Makefile.am.fade 2008-10-22 05:15:52.000000000 -0400
++++ gnome-desktop-2.24.1/libgnome-desktop/Makefile.am 2008-10-24 15:46:13.000000000 -0400
@@ -21,6 +21,7 @@ libgnome_desktop_2_la_SOURCES = \
gnome-ditem-edit.c \
gnome-hint.c \
Index: gnome-desktop.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-desktop/devel/gnome-desktop.spec,v
retrieving revision 1.179
retrieving revision 1.180
diff -u -r1.179 -r1.180
--- gnome-desktop.spec 22 Oct 2008 18:34:09 -0000 1.179
+++ gnome-desktop.spec 24 Oct 2008 19:50:50 -0000 1.180
@@ -12,7 +12,7 @@
Summary: Package containing code shared among gnome-panel, gnome-session, nautilus, etc
Name: gnome-desktop
Version: 2.24.1
-Release: 1%{?dist}
+Release: 2%{?dist}
URL: http://www.gnome.org
Source0: http://download.gnome.org/sources/gnome-desktop/2.24/%{name}-%{version}.tar.bz2
License: GPLv2+ and LGPLv2+
@@ -126,6 +126,10 @@
%doc %{_datadir}/gtk-doc/html/gnome-desktop/
%changelog
+* Fri Oct 24 2008 Ray Strode <rstrode at redhat.com> - 2.24.1-2
+- properly initialize variable in gnome_bg_get_pixmap_from_root
+ (bug 460758)
+
* Wed Oct 22 2008 Matthias Clasen <mclasen at redhat.com> - 2.24.1-1
- Update to 2.24.1
More information about the fedora-extras-commits
mailing list