Merge lp:~larsu/unity-control-center/dont-use-view-style-class into lp:unity-control-center

[Lars Karlitski]

Don't use .view style class for the item view

Don't use .view style class for the item view

Ambiance styles widgets that have the "view" css class set (mostly tree- and iconviews) with a white background. Matthew suggested that white backgrounds are only for user-editable regions, which the system settings panel is not.

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:12748
http://jenkins.qa.ubuntu.com/job/unity-control-center-ci/67/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-control-center-trusty-amd64-ci/67
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-control-center-trusty-armhf-ci/67
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-control-center-trusty-i386-ci/68

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity-control-center-ci/67/rebuild

review: Approve (continuous-integration)

[Sebastien Bacher (seb128)]

Nice to get the color back, I didn't really get used to the white background ;-)

review: Approve

=== modified file 'shell/cc-shell-item-view.c'
--- shell/cc-shell-item-view.c	2011-07-14 14:24:03 +0000
+++ shell/cc-shell-item-view.c	2014-03-12 12:56:38 +0000
@@ -199,6 +199,9 @@
 {
   self->priv = SHELL_ITEM_VIEW_PRIVATE (self);
 
+  /* Style like a normal widget instead of like an icon view */
+  gtk_style_context_remove_class (gtk_widget_get_style_context (GTK_WIDGET (self)), "view");
+
   g_object_set (self, "margin", 0, NULL);
   g_signal_connect (self, "item-activated",
                     G_CALLBACK (iconview_item_activated_cb), self);
 
=== modified file 'shell/shell.ui'
--- shell/shell.ui	2014-02-26 12:28:12 +0000
+++ shell/shell.ui	2014-03-12 12:56:38 +0000
@@ -96,9 +96,6 @@
                     <property name="visible">True</property>
                     <property name="resize_mode">queue</property>
                     <property name="shadow_type">none</property>
-                    <style>
-                      <class name="view" />
-                    </style>
                     <child>
                       <object class="GtkVBox" id="main-vbox">
                         <property name="visible">True</property>