rpms/notification-daemon-engine-nodoka/devel notification-daemon-engine-nodoka-base-color.patch, NONE, 1.1 notification-daemon-engine-nodoka.spec, 1.5, 1.6

[Martin Sourada]

Author: mso

Update of /cvs/extras/rpms/notification-daemon-engine-nodoka/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19041

Modified Files:
	notification-daemon-engine-nodoka.spec 
Added Files:
	notification-daemon-engine-nodoka-base-color.patch 
Log Message:


Use background color specified in gtkrc. Fixes rhbz #498422.



notification-daemon-engine-nodoka-base-color.patch:

--- NEW FILE notification-daemon-engine-nodoka-base-color.patch ---
diff -up notification-daemon-engine-nodoka-0.1.0/src/nodoka-theme.c.base-color notification-daemon-engine-nodoka-0.1.0/src/nodoka-theme.c
--- notification-daemon-engine-nodoka-0.1.0/src/nodoka-theme.c.base-color	2009-06-20 08:51:58.000000000 +0200
+++ notification-daemon-engine-nodoka-0.1.0/src/nodoka-theme.c	2009-06-20 09:00:55.000000000 +0200
@@ -346,11 +346,26 @@ fill_background(GtkWidget *widget, Windo
 	else
 		alpha = 1.0;
 
+	GtkStyle *style = gtk_widget_get_style(widget);
+	GdkColor *background_color = &style->base[GTK_STATE_NORMAL];
 	cairo_pattern_t *pattern;
 	pattern = cairo_pattern_create_linear (0, 0, 0, windata->height);
-	cairo_pattern_add_color_stop_rgba (pattern, 0, 0.996, 0.996, 0.89, alpha);
-	cairo_pattern_add_color_stop_rgba (pattern, GRADIENT_CENTER, 0.988, 0.988, 0.714, alpha);
-	cairo_pattern_add_color_stop_rgba (pattern, 1, 0.984, 0.984, 0.663, alpha);
+	cairo_pattern_add_color_stop_rgba (pattern, 0, 
+					   background_color->red / 65535.0, 
+					   background_color->green / 65535.0, 
+					   background_color->blue / 65535.0, 
+					   alpha);
+	cairo_pattern_add_color_stop_rgba (pattern, GRADIENT_CENTER, 
+					   background_color->red / 65535.0 * 0.80, 
+					   background_color->green / 65535.0 * 0.80, 
+					   background_color->blue / 65535.0 * 0.80, 
+					   alpha);
+
+	cairo_pattern_add_color_stop_rgba (pattern, 1, 
+					   background_color->red / 65535.0 * 0.74, 
+					   background_color->green / 65535.0 * 0.74, 
+					   background_color->blue / 65535.0 * 0.74, 
+					   alpha);
 	cairo_set_source (cr, pattern);
 	cairo_pattern_destroy (pattern);
 	
@@ -453,10 +468,20 @@ draw_border(GtkWidget *widget, WindowDat
 	else
 		alpha = 1.0;
 
+	GtkStyle *style = gtk_widget_get_style(widget);
+	GdkColor *background_color = &style->base[GTK_STATE_NORMAL];
 	cairo_pattern_t *pattern;
 	pattern = cairo_pattern_create_linear (0, 0, 0, windata->height);
-	cairo_pattern_add_color_stop_rgba (pattern, 0, 0.62, 0.584, 0.341, alpha);
-	cairo_pattern_add_color_stop_rgba (pattern, 1, 0.776, 0.757, 0.596, alpha);
+	cairo_pattern_add_color_stop_rgba (pattern, 0,
+					   background_color->red / 65535.0 * 0.38, 
+					   background_color->green / 65535.0 * 0.38, 
+					   background_color->blue / 65535.0 * 0.38, 
+					   alpha);
+	cairo_pattern_add_color_stop_rgba (pattern, 1,
+					   background_color->red / 65535.0 * 0.67, 
+					   background_color->green / 65535.0 * 0.67, 
+					   background_color->blue / 65535.0 * 0.67, 
+					   alpha);
 	cairo_set_source (cr, pattern);
 	cairo_pattern_destroy (pattern);
 	


Index: notification-daemon-engine-nodoka.spec
===================================================================
RCS file: /cvs/extras/rpms/notification-daemon-engine-nodoka/devel/notification-daemon-engine-nodoka.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- notification-daemon-engine-nodoka.spec	26 Feb 2009 06:00:13 -0000	1.5
+++ notification-daemon-engine-nodoka.spec	20 Jun 2009 07:16:33 -0000	1.6
@@ -1,6 +1,6 @@
 Name:           notification-daemon-engine-nodoka
 Version:        0.1.0
-Release:        6%{?dist}
+Release:        7%{?dist}
 Summary:        The Nodoka theme engine for the notification daemon
 
 Group:          System Environment/Libraries 
@@ -10,6 +10,7 @@ Source0:        https://fedorahosted.org
 Patch0:         notification-daemon-engine-nodoka-clipping.patch
 Patch1:         notification-daemon-engine-nodoka-0.1.0-version-check.patch
 Patch2:         notification-daemon-engine-nodoka-rtl.patch
+Patch3:         notification-daemon-engine-nodoka-base-color.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  libsexy-devel
@@ -25,6 +26,7 @@ The Nodoka theme engine for the notifica
 %patch0 -p1 -b .clipping
 %patch1 -p1 -b .version-check
 %patch2 -p1 -b .rtl
+%patch3 -p1 -b .base-color
 
 %build
 %configure
@@ -49,6 +51,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/notification-daemon-1.0/engines/libnodoka.so
 
 %changelog
+* Sat Jun 20 2009 Martin Sourada <mso at fedoraproject.org> - 0.1.0-7
+- Use gtkrc specified color for background (fixes rhbz #498422)
+
 * Wed Feb 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.1.0-6
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild