rpms/eel2/devel eel2-2.18.0.1-gnome-bg.patch, 1.1, 1.2 eel2.spec, 1.66, 1.67
fedora-cvs-commits at redhat.com
fedora-cvs-commits at redhat.com
Tue Mar 20 18:59:38 UTC 2007
Author: sandmann
Update of /cvs/dist/rpms/eel2/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv21692a
Modified Files:
eel2-2.18.0.1-gnome-bg.patch eel2.spec
Log Message:
Fix bug where backgrounds would sometimes have the wrong color
eel2-2.18.0.1-gnome-bg.patch:
eel-background.c | 1509 +++++---------------------------------------
eel-background.h | 89 --
eel-gdk-pixbuf-extensions.c | 2
3 files changed, 193 insertions(+), 1407 deletions(-)
Index: eel2-2.18.0.1-gnome-bg.patch
===================================================================
RCS file: /cvs/dist/rpms/eel2/devel/eel2-2.18.0.1-gnome-bg.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- eel2-2.18.0.1-gnome-bg.patch 20 Mar 2007 00:15:32 -0000 1.1
+++ eel2-2.18.0.1-gnome-bg.patch 20 Mar 2007 18:59:36 -0000 1.2
@@ -1,5 +1,5 @@
--- eel-2.18.0.1/eel/eel-background.h.gnome-bg 2007-01-03 03:49:22.000000000 -0500
-+++ eel-2.18.0.1/eel/eel-background.h 2007-03-19 20:04:25.000000000 -0400
++++ eel-2.18.0.1/eel/eel-background.h 2007-03-19 20:10:32.000000000 -0400
@@ -90,83 +90,29 @@
* size. This means that EelBackground can use background pixmaps
* even for backgrounds that otherwise would change when the size
@@ -126,7 +126,7 @@
* was successfully loaded or not.
*/
--- eel-2.18.0.1/eel/eel-gdk-pixbuf-extensions.c.gnome-bg 2007-01-03 03:49:22.000000000 -0500
-+++ eel-2.18.0.1/eel/eel-gdk-pixbuf-extensions.c 2007-03-19 20:04:25.000000000 -0400
++++ eel-2.18.0.1/eel/eel-gdk-pixbuf-extensions.c 2007-03-19 20:10:32.000000000 -0400
@@ -431,7 +431,7 @@
min_width, min_height,
&scaled_width, &scaled_height);
@@ -137,7 +137,7 @@
/**
--- eel-2.18.0.1/eel/eel-background.c.gnome-bg 2007-03-02 06:20:11.000000000 -0500
-+++ eel-2.18.0.1/eel/eel-background.c 2007-03-19 20:04:25.000000000 -0400
++++ eel-2.18.0.1/eel/eel-background.c 2007-03-20 14:54:06.000000000 -0400
@@ -37,71 +37,31 @@
#include <gtk/gtkprivate.h>
#include <gtk/gtkselection.h>
@@ -1077,7 +1077,7 @@
g_free (start_color_spec);
/* If the pixmap doesn't change with the window size, never update
-@@ -975,44 +338,36 @@
+@@ -975,44 +338,38 @@
}
changed = FALSE;
@@ -1100,6 +1100,8 @@
- changed = TRUE;
- }
++ set_image_properties (background);
++
+ background->details->background_changes_with_size = gnome_bg_changes_with_size (background->details->bg);
+ background->details->background_pixmap = gnome_bg_create_pixmap (background->details->bg,
+ window,
@@ -1139,7 +1141,7 @@
*changes_with_size = background->details->background_changes_with_size;
if (background->details->background_pixmap != NULL) {
-@@ -1039,18 +394,16 @@
+@@ -1039,18 +396,16 @@
if (event->window != widget->window) {
return;
}
@@ -1161,7 +1163,7 @@
if (!changes_with_size) {
/* The background was already drawn by X, since we set
* the GdkWindow background/back_pixmap.
-@@ -1087,319 +440,62 @@
+@@ -1087,319 +442,62 @@
}
}
@@ -1329,15 +1331,15 @@
{
- art_u8 *dst;
- int pixbuf_width, pixbuf_height;
-+ GnomeBGPlacement placement;
-
+-
- /* copy_left/top/right/bottom define the rect of the pixbuf (pixbuf relative)
- * we will copy into the canvas buffer
- */
- int copy_left, copy_top, copy_right, copy_bottom;
-
- dst = buf->buf;
--
++ GnomeBGPlacement placement;
+
- pixbuf_width = gdk_pixbuf_get_width (pixbuf);
- pixbuf_height = gdk_pixbuf_get_height (pixbuf);
+ if (!background->details->color) {
@@ -1362,15 +1364,15 @@
- if (copy_left >= copy_right) {
- return;
- }
-+ eel_gdk_color_parse_with_white_default (background->details->color, &c);
-
+-
- if (y > buf->rect.y0) {
- dst += (y - buf->rect.y0) * buf->buf_rowstride;
- copy_top = 0;
- } else {
- copy_top = buf->rect.y0 - y;
- }
--
++ eel_gdk_color_parse_with_white_default (background->details->color, &c);
+
- if (y + pixbuf_height > buf->rect.y1) {
- copy_bottom = buf->rect.y1 - y;
- } else {
@@ -1400,14 +1402,11 @@
- copy_bottom - copy_top);
- }
-}
+-
+ GdkColor c1;
+ GdkColor c2;
+ char *spec;
-+ spec = eel_gradient_get_start_color_spec (background->details->color);
-+ eel_gdk_color_parse_with_white_default (spec, &c1);
-+ g_free (spec);
-
-/* fill the canvas buffer with a tiled pixbuf */
-static void
-draw_pixbuf_tiled_aa (GdkPixbuf *pixbuf, EelCanvasBuf *buffer)
@@ -1421,7 +1420,10 @@
-
- start_x = buffer->rect.x0 - (buffer->rect.x0 % tile_width);
- start_y = buffer->rect.y0 - (buffer->rect.y0 % tile_height);
--
++ spec = eel_gradient_get_start_color_spec (background->details->color);
++ eel_gdk_color_parse_with_white_default (spec, &c1);
++ g_free (spec);
+
- for (y = start_y; y < buffer->rect.y1; y += tile_height) {
- for (x = start_x; x < buffer->rect.x1; x += tile_width) {
- canvas_draw_pixbuf (buffer, pixbuf, x, y);
@@ -1524,7 +1526,7 @@
}
char *
-@@ -1418,22 +514,6 @@
+@@ -1418,22 +516,6 @@
return g_strdup (background->details->image_uri);
}
@@ -1547,7 +1549,7 @@
/* Use style->base as the default color instead of bg */
void
eel_background_set_use_base (EelBackground *background,
-@@ -1446,106 +526,25 @@
+@@ -1446,106 +528,25 @@
eel_background_set_color (EelBackground *background,
const char *color)
{
@@ -1662,7 +1664,7 @@
{
time_t mtime;
GnomeVFSFileInfo *info;
-@@ -1563,12 +562,9 @@
+@@ -1563,12 +564,9 @@
}
if (eel_strcmp (background->details->image_uri, image_uri) == 0 &&
mtime == background->details->image_mtime) {
@@ -1675,7 +1677,7 @@
g_free (background->details->image_uri);
background->details->image_uri = g_strdup (image_uri);
background->details->image_mtime = mtime;
-@@ -1578,55 +574,27 @@
+@@ -1578,55 +576,27 @@
* current image can be used if an update is needed before the load completes.
*/
@@ -1736,7 +1738,7 @@
}
/* Use this fn to set both the image and color and avoid flash. The color isn't
-@@ -1634,37 +602,22 @@
+@@ -1634,37 +604,22 @@
* before then, it will use the old color and image.
*/
static void
@@ -1783,7 +1785,7 @@
}
void
-@@ -1676,7 +629,7 @@
+@@ -1676,7 +631,7 @@
* We rely on eel_background_set_image_uri_and_color to emit
* the SETTINGS_CHANGED & APPEARANCE_CHANGE signals.
*/
@@ -1792,7 +1794,7 @@
eel_background_set_image_uri_and_color (background, action, image_uri, NULL);
}
-@@ -1695,18 +648,6 @@
+@@ -1695,18 +650,6 @@
|| background->details->image_uri != NULL;
}
@@ -1811,7 +1813,7 @@
/**
* eel_background_reset:
*
-@@ -1725,39 +666,24 @@
+@@ -1725,39 +668,24 @@
eel_background_set_up_widget (EelBackground *background, GtkWidget *widget)
{
GtkStyle *style;
@@ -1853,7 +1855,7 @@
&color,
&changes_with_size);
-@@ -1770,8 +696,8 @@
+@@ -1770,8 +698,8 @@
} else {
window = widget->window;
}
@@ -1864,7 +1866,7 @@
gdk_window_set_back_pixmap (window, pixmap, FALSE);
} else {
gdk_window_set_back_pixmap (window, NULL, FALSE);
-@@ -1779,34 +705,23 @@
+@@ -1779,34 +707,23 @@
}
@@ -1909,7 +1911,7 @@
if (pixmap) {
g_object_unref (pixmap);
-@@ -1837,7 +752,7 @@
+@@ -1837,7 +754,7 @@
static void
screen_size_changed (GdkScreen *screen, EelBackground *background)
@@ -1918,7 +1920,7 @@
g_signal_emit (background, signals[APPEARANCE_CHANGED], 0);
}
-@@ -1975,70 +890,12 @@
+@@ -1975,70 +892,12 @@
return background;
}
@@ -1990,7 +1992,7 @@
}
/* handle dropped colors */
-@@ -2117,4 +974,4 @@
+@@ -2117,4 +976,4 @@
gtk_object_sink (GTK_OBJECT (background));
}
Index: eel2.spec
===================================================================
RCS file: /cvs/dist/rpms/eel2/devel/eel2.spec,v
retrieving revision 1.66
retrieving revision 1.67
diff -u -r1.66 -r1.67
--- eel2.spec 20 Mar 2007 00:15:32 -0000 1.66
+++ eel2.spec 20 Mar 2007 18:59:36 -0000 1.67
@@ -16,7 +16,7 @@
Name: eel2
Summary: Eazel Extensions Library
Version: 2.18.0.1
-Release: 2%{?dist}
+Release: 3%{?dist}
License: LGPL
Group: System Environment/Libraries
Source: eel-%{version}.tar.bz2
@@ -115,6 +115,10 @@
%{_includedir}/eel-2
%changelog
+* Tue Mar 20 2007 Soren Sandmann <sandmann at redhat.com> - 2.18.0.1-3
+- Fix bug in gnome-bg patch where backgrounds would get an uninitialized
+ color.
+
* Mon Mar 19 2007 Soren Sandmann <sandmann at redhat.com> - 2.18.0.1-2
- Add patch that makes eel-background.c use GnomeBG from libgnome-desktop.
More information about the fedora-cvs-commits
mailing list