rpms/gtk2-engines/devel gtk-engines-2.7.4-copy.patch, NONE, 1.1 gtk2-engines.spec, 1.39, 1.40 gtk-engines-2.7.4-clone.patch, 1.1, NONE

[fedora-cvs-commits at redhat.com]

Author: sandmann

Update of /cvs/dist/rpms/gtk2-engines/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv6391

Modified Files:
	gtk2-engines.spec 
Added Files:
	gtk-engines-2.7.4-copy.patch 
Removed Files:
	gtk-engines-2.7.4-clone.patch 
Log Message:
* Mon Apr 19 2006 Soren Sandmann <sandmann at redhat.com> - 2.7.4-6
- It was in fact a missing copy method. See gnome bug 338826.



gtk-engines-2.7.4-copy.patch:
 clearlooks_style.c |   21 +++++++++++++++++++++
 1 files changed, 21 insertions(+)

--- NEW FILE gtk-engines-2.7.4-copy.patch ---
--- gtk-engines-2.7.4/engines/clearlooks/src/clearlooks_style.c.clone	2006-04-17 17:13:09.000000000 -0400
+++ gtk-engines-2.7.4/engines/clearlooks/src/clearlooks_style.c	2006-04-17 17:14:44.000000000 -0400
@@ -1482,6 +1482,26 @@
 static void
 clearlooks_style_init (ClearlooksStyle * style)
 {
+
+}
+
+static void
+clearlooks_style_copy (GtkStyle *style,
+                       GtkStyle *src)
+{
+       ClearlooksStyle *cl_style = CLEARLOOKS_STYLE (style);
+       ClearlooksStyle *cl_src = CLEARLOOKS_STYLE (src);
+ 
+	cl_style->colors = cl_src->colors;
+	cl_style->progressbarstyle = cl_src->progressbarstyle;
+	cl_style->menubarstyle = cl_src->menubarstyle;
+	cl_style->menuitemstyle = cl_src->menuitemstyle;
+	cl_style->listviewitemstyle = cl_src->listviewitemstyle;
+	cl_style->scrollbar_color = cl_src->scrollbar_color;
+	cl_style->has_scrollbar_color = cl_src->has_scrollbar_color;
+	cl_style->animation = cl_src->animation;
+
+       parent_class->copy (style, src);
 }
 
 static void
@@ -1493,6 +1512,7 @@
 
 	style_class->unrealize        = clearlooks_style_unrealize;
 	style_class->init_from_rc     = clearlooks_style_init_from_rc;
+	style_class->copy	      = clearlooks_style_copy;
 	style_class->draw_handle      = draw_handle;
 	style_class->draw_slider      = draw_slider;
 	style_class->draw_shadow_gap  = draw_shadow_gap;


Index: gtk2-engines.spec
===================================================================
RCS file: /cvs/dist/rpms/gtk2-engines/devel/gtk2-engines.spec,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -r1.39 -r1.40
--- gtk2-engines.spec	18 Apr 2006 18:52:03 -0000	1.39
+++ gtk2-engines.spec	19 Apr 2006 15:11:22 -0000	1.40
@@ -1,7 +1,7 @@
 Summary:        Theme engines for GTK+ 2.0
 Name:           gtk2-engines
 Version:        2.7.4
-Release:	5
+Release:	6
 License:        GPL
 Group:          System Environment/Libraries
 Source:         gtk-engines-%{version}.tar.bz2
@@ -9,8 +9,8 @@
 Patch0:		gtk-engines-2.7.4-fixes.patch
 # fix some memory leaks in the Clearlooks engine
 Patch1:		gtk-engines-2.7.4-leaks.patch
-# add missing clone method in clearlooks engine
-Patch2:		gtk-engines-2.7.4-clone.patch
+# add missing copy method in clearlooks engine
+Patch2:		gtk-engines-2.7.4-copy.patch
 
 Requires:       gtk2 >= 2.2.0
 Conflicts:  	gnome-themes < 2.9.0
@@ -31,7 +31,7 @@
 %setup -q -n gtk-engines-%{version}
 %patch0 -p1 -b .fixes
 %patch1 -p1 -b .leaks
-%patch2 -p1 -b .clone
+%patch2 -p1 -b .copy
 
 %build
 %configure
@@ -69,6 +69,9 @@
 %{_datadir}/themes
 
 %changelog
+* Mon Apr 19 2006 Soren Sandmann <sandmann at redhat.com> - 2.7.4-6
+- It was in fact a missing copy method. See gnome bug 338826.
+
 * Tue Apr 18 2006 Kristian Høgsberg <krh at redhat.com> 2.7.4-5
 - Bump for fc5-blig repo build.
 


--- gtk-engines-2.7.4-clone.patch DELETED ---