rpms/control-center/devel seal.patch, NONE, 1.1 .cvsignore, 1.105, 1.106 control-center.spec, 1.527, 1.528 sources, 1.109, 1.110

[Matthias Clasen]

Author: mclasen

Update of /cvs/pkgs/rpms/control-center/devel
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv4482

Modified Files:
	.cvsignore control-center.spec sources 
Added Files:
	seal.patch 
Log Message:
2.31.4.1


seal.patch:
 cc-shell-category-view.c |   11 +++++++----
 gnome-control-center.c   |   13 +++++++++----
 2 files changed, 16 insertions(+), 8 deletions(-)

--- NEW FILE seal.patch ---
diff -up gnome-control-center-2.31.4/shell/cc-shell-category-view.c.seal gnome-control-center-2.31.4/shell/cc-shell-category-view.c
--- gnome-control-center-2.31.4/shell/cc-shell-category-view.c.seal	2010-06-30 01:06:56.502211127 -0400
+++ gnome-control-center-2.31.4/shell/cc-shell-category-view.c	2010-06-30 01:07:55.711221673 -0400
@@ -168,21 +168,24 @@ cc_shell_category_view_style_set (GtkWid
                                   GtkStyle  *old_style)
 {
   CcShellCategoryViewPrivate *priv = CC_SHELL_CATEGORY_VIEW (widget)->priv;
+  GtkStyle *style;
+
+  style = gtk_widget_get_style (widget);
 
   if (priv->header)
     {
       gtk_widget_modify_bg (priv->header, GTK_STATE_NORMAL,
-                            &widget->style->base[GTK_STATE_NORMAL]);
+                            &style->base[GTK_STATE_NORMAL]);
       gtk_widget_modify_fg (priv->header, GTK_STATE_NORMAL,
-                            &widget->style->text[GTK_STATE_NORMAL]);
+                            &style->text[GTK_STATE_NORMAL]);
     }
 
   if (priv->iconview)
     {
       gtk_widget_modify_bg (priv->iconview, GTK_STATE_NORMAL,
-                            &widget->style->base[GTK_STATE_NORMAL]);
+                            &style->base[GTK_STATE_NORMAL]);
       gtk_widget_modify_fg (priv->iconview, GTK_STATE_NORMAL,
-                            &widget->style->text[GTK_STATE_NORMAL]);
+                            &style->text[GTK_STATE_NORMAL]);
     }
 }
 
diff -up gnome-control-center-2.31.4/shell/gnome-control-center.c.seal gnome-control-center-2.31.4/shell/gnome-control-center.c
--- gnome-control-center-2.31.4/shell/gnome-control-center.c.seal	2010-06-30 01:08:08.610963747 -0400
+++ gnome-control-center-2.31.4/shell/gnome-control-center.c	2010-06-30 01:09:17.626974503 -0400
@@ -869,6 +869,8 @@ gnome_control_center_init (GnomeControlC
   GError *err = NULL;
   GtkWidget *vbox;
   GnomeControlCenterPrivate *priv;
+  GtkWidget *parent;
+  GtkStyle *style;
 
   priv = self->priv = CONTROL_CENTER_PRIVATE (self);
 
@@ -901,10 +903,13 @@ gnome_control_center_init (GnomeControlC
   vbox = W (priv->builder, "main-vbox");
   gtk_widget_set_size_request (vbox, 0, -1);
 
-  gtk_widget_modify_bg (vbox->parent, GTK_STATE_NORMAL,
-                        &vbox->style->base[GTK_STATE_NORMAL]);
-  gtk_widget_modify_fg (vbox->parent, GTK_STATE_NORMAL,
-                        &vbox->style->text[GTK_STATE_NORMAL]);
+  parent = gtk_widget_get_parent (vbox);
+  style = gtk_widget_get_style (vbox);
+
+  gtk_widget_modify_bg (parent, GTK_STATE_NORMAL,
+                        &style->base[GTK_STATE_NORMAL]);
+  gtk_widget_modify_fg (parent, GTK_STATE_NORMAL,
+                        &style->text[GTK_STATE_NORMAL]);
 
   /* load the available settings panels */
   fill_model (self);


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/control-center/devel/.cvsignore,v
retrieving revision 1.105
retrieving revision 1.106
diff -u -p -r1.105 -r1.106
--- .cvsignore	30 Jun 2010 04:54:26 -0000	1.105
+++ .cvsignore	30 Jun 2010 05:12:20 -0000	1.106
@@ -1 +1 @@
-gnome-control-center-2.31.4.tar.bz2
+gnome-control-center-2.31.4.1.tar.bz2


Index: control-center.spec
===================================================================
RCS file: /cvs/pkgs/rpms/control-center/devel/control-center.spec,v
retrieving revision 1.527
retrieving revision 1.528
diff -u -p -r1.527 -r1.528
--- control-center.spec	30 Jun 2010 04:59:51 -0000	1.527
+++ control-center.spec	30 Jun 2010 05:12:21 -0000	1.528
@@ -17,7 +17,7 @@
 
 Summary: Utilities to configure the GNOME desktop
 Name: control-center
-Version: 2.31.4
+Version: 2.31.4.1
 Release: 1%{?dist}
 Epoch: 1
 License: GPLv2+ and GFDL
@@ -235,8 +235,8 @@ gtk-update-icon-cache %{_datadir}/icons/
 
 
 %changelog
-* Wed Jun 30 2010 Matthias Clasen <mclasen at redhat.com> 2.31.4-1
-- Update to 2.31.4
+* Wed Jun 30 2010 Matthias Clasen <mclasen at redhat.com> 2.31.4.1-1
+- Update to 2.31.4.1
 
 * Wed Jun 23 2010 Bastien Nocera <bnocera at redhat.com> 2.31.3-2
 - Add patches to compile against GTK+ 3.x


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/control-center/devel/sources,v
retrieving revision 1.109
retrieving revision 1.110
diff -u -p -r1.109 -r1.110
--- sources	30 Jun 2010 04:54:27 -0000	1.109
+++ sources	30 Jun 2010 05:12:21 -0000	1.110
@@ -1 +1 @@
-42122fa193ca2aedd778298580151b7b  gnome-control-center-2.31.4.tar.bz2
+ff8e16e9314801e704306481878f0117  gnome-control-center-2.31.4.1.tar.bz2