[gnome-control-center] Revert "shell: ensure the background and foreground colours are consistent"

[Rui Matos <rtcm src gnome org>]

commit c812b9ac16dd13fb90b590845000d0e637a3bd42
Author: Rui Matos <tiagomatos gmail com>
Date:   Thu Dec 22 16:14:26 2011 +0000

    Revert "shell: ensure the background and foreground colours are consistent"
    
    This actually breaks unfocused windows theming and doesn't seem to be needed
    otherwise.
    
    This reverts commit aac24399f847df62708d77cb5a0cff025a7ff30d.
    
    https://bugzilla.gnome.org/show_bug.cgi?id=666723

 shell/cc-shell-category-view.c |   51 ----------------------------------------
 shell/gnome-control-center.c   |   25 -------------------
 2 files changed, 0 insertions(+), 76 deletions(-)
---
diff --git a/shell/cc-shell-category-view.c b/shell/cc-shell-category-view.c
index afd2396..b9f6694 100644
--- a/shell/cc-shell-category-view.c
+++ b/shell/cc-shell-category-view.c
@@ -115,28 +115,6 @@ cc_shell_category_view_finalize (GObject *object)
 }
 
 static void
-label_style_set_cb (GtkWidget *widget,
-                    GtkStyle  *old_style,
-                    gpointer   user_data)
-{
-  GtkStyle *style;
-
-  /* "base" colours are used for the background inside CcShellCategoryView,
-   * so set the labels to use the "text" colors */
-
-  g_signal_handlers_block_by_func (widget, label_style_set_cb, NULL);
-
-  style = gtk_widget_get_style (widget);
-
-  gtk_widget_modify_fg (widget, GTK_STATE_NORMAL,
-                        &style->text[GTK_STATE_NORMAL]);
-
-  g_signal_handlers_unblock_by_func (widget, label_style_set_cb, NULL);
-}
-
-
-
-static void
 cc_shell_category_view_constructed (GObject *object)
 {
   CcShellCategoryViewPrivate *priv = CC_SHELL_CATEGORY_VIEW (object)->priv;
@@ -174,9 +152,6 @@ cc_shell_category_view_constructed (GObject *object)
       pango_attr_list_unref (attrs);
       gtk_frame_set_label_widget (GTK_FRAME (object), label);
       gtk_widget_show (label);
-
-      g_signal_connect (label, "style-set", G_CALLBACK (label_style_set_cb),
-                        NULL);
     }
 
   /* add the iconview to the vbox */
@@ -189,35 +164,11 @@ cc_shell_category_view_constructed (GObject *object)
   priv->iconview = iconview;
 }
 
-static gboolean
-cc_shell_category_view_draw (GtkWidget *widget,
-                             cairo_t   *cr)
-{
-  GtkStyle *style;
-  GtkStateType state;
-  GtkAllocation allocation;
-
-  style = gtk_widget_get_style (widget);
-  state = gtk_widget_get_state (widget);
-  gtk_widget_get_allocation (widget, &allocation);
-
-
-  cairo_rectangle (cr, 0, 0, allocation.width, allocation.height);
-  gdk_cairo_set_source_color (cr, &style->base[state]);
-
-  cairo_fill (cr);
-
-  GTK_WIDGET_CLASS (cc_shell_category_view_parent_class)->draw (widget, cr);
-
-  return FALSE;
-}
-
 static void
 cc_shell_category_view_class_init (CcShellCategoryViewClass *klass)
 {
   GParamSpec *pspec;
   GObjectClass *object_class = G_OBJECT_CLASS (klass);
-  GtkWidgetClass *widget_class = GTK_WIDGET_CLASS (klass);
 
   g_type_class_add_private (klass, sizeof (CcShellCategoryViewPrivate));
 
@@ -227,8 +178,6 @@ cc_shell_category_view_class_init (CcShellCategoryViewClass *klass)
   object_class->finalize = cc_shell_category_view_finalize;
   object_class->constructed = cc_shell_category_view_constructed;
 
-  widget_class->draw = cc_shell_category_view_draw;
-
   pspec = g_param_spec_string ("name",
                                "Name",
                                "Name of the category",
diff --git a/shell/gnome-control-center.c b/shell/gnome-control-center.c
index 92d256b..85d7062 100644
--- a/shell/gnome-control-center.c
+++ b/shell/gnome-control-center.c
@@ -1008,25 +1008,6 @@ gnome_control_center_class_init (GnomeControlCenterClass *klass)
   shell_class->get_toplevel = _shell_get_toplevel;
 }
 
-static void
-viewport_style_set_cb (GtkWidget *widget,
-                       GtkStyle  *old_style,
-                       gpointer   user_data)
-{
-  GtkStyle *style;
-
-  /* use "base" colours inside the viewport */
-
-  g_signal_handlers_block_by_func (widget, viewport_style_set_cb, NULL);
-
-  style = gtk_widget_get_style (widget);
-
-  gtk_widget_modify_bg (widget, GTK_STATE_NORMAL,
-                        &style->base[GTK_STATE_NORMAL]);
-
-  g_signal_handlers_unblock_by_func (widget, viewport_style_set_cb, NULL);
-}
-
 static gboolean
 window_key_press_event (GtkWidget          *win,
 			GdkEventKey        *event,
@@ -1070,7 +1051,6 @@ window_key_press_event (GtkWidget          *win,
 static void
 gnome_control_center_init (GnomeControlCenter *self)
 {
-  GtkWidget *widget;
   GError *err = NULL;
   GnomeControlCenterPrivate *priv;
 
@@ -1095,11 +1075,6 @@ gnome_control_center_init (GnomeControlCenter *self)
 
   priv->notebook = W (priv->builder, "notebook");
   priv->scrolled_window = W (priv->builder, "scrolledwindow1");
-
-  widget = W (priv->builder, "viewport");
-  g_signal_connect (widget, "style-set", G_CALLBACK (viewport_style_set_cb),
-                    NULL);
-
   gtk_widget_set_size_request (priv->scrolled_window, FIXED_WIDTH, -1);
   priv->main_vbox = W (priv->builder, "main-vbox");
   g_signal_connect (priv->notebook, "switch-page",