Merge lp:~hikiko/unity-control-center/unity-control-center.lowgfx into lp:unity-control-center

[Eleni Maria Stea]

Low Graphics Mode option:
https://www.youtube.com/watch?v=1-AX1QLIPXw

Needs unity branch: lp:~hikiko/unity/unity.lowgfx-2017

Low Graphics Mode option:
https://www.youtube.com/watch?v=1-AX1QLIPXw

Needs unity branch: lp:~hikiko/unity/unity.lowgfx-2017

[Marco Trevisan (Treviño) (3v1n0)]

This would work, but it won't make unity to use the lowgfx profile, but a copy of it...

So instead, I'd make at this level UCC only change the gsetting value.

Then in unity side (tools/compiz-profile-selector.in) just use "gsettings get" to read the value of this option and choose the right profile.

review: Needs Fixing

[lp:~hikiko/unity-control-center/unity-control-center.lowgfx]

12883. By Eleni Maria Stea on 2017-01-17

replaced deprecated INCLUDES with AM_CPPFLAGS to fix warnings at configure

12884. By Eleni Maria Stea on 2017-01-17

replaced INCLUDES with AM_CPPFLAGS to fix warning

12885. By Eleni Maria Stea on 2017-02-01

* use libcompizconfig to make sure compiz uses flat file configuration
before we apply changes to Default.ini

* renamed Low Graphics Mode section to Graphics Mode

12886. By Eleni Maria Stea on 2017-02-01

fixes

12887. By Eleni Maria Stea on 2017-02-02

take the backend into account

=== modified file 'configure.ac'
--- configure.ac	2016-02-16 15:26:59 +0000
+++ configure.ac	2017-02-02 17:33:35 +0000
@@ -172,6 +172,7 @@
                   pwquality
                   accountsservice >= $ACCOUNTSSERVICE_REQUIRED_VERSION)
 PKG_CHECK_MODULES(BLUETOOTH_PANEL, $COMMON_MODULES)
+PKG_CHECK_MODULES(COMPIZCONFIG, $COMMON_MODULES libcompizconfig)
 
 AM_PROG_VALAC([0.20.0])
 

=== modified file 'panels/appearance/Makefile.am'
--- panels/appearance/Makefile.am	2014-01-28 22:26:00 +0000
+++ panels/appearance/Makefile.am	2017-02-02 17:33:35 +0000
@@ -13,9 +13,10 @@
 slideshowemblemdir = $(datadir)/icons/hicolor/scalable/emblems/
 dist_slideshowemblem_DATA = ucc-slideshow-emblem.svg
 
-INCLUDES =						\
+AM_CPPFLAGS =						\
 	$(PANEL_CFLAGS)					\
 	$(APPEARANCE_PANEL_CFLAGS) \
+	$(COMPIZCONFIG_CFLAGS) \
 	-DG_LOG_DOMAIN="\"$(PACKAGE)\"" \
 	-DLOCALEDIR="\"$(datadir)/locale\"" \
 	-DPKGDATADIR="\"$(uidir)\"" \
@@ -48,11 +49,11 @@
 	bg-colors-source.h
 
 libappearance_la_LIBADD = $(PANEL_LIBS) $(APPEARANCE_PANEL_LIBS)
-libappearance_la_LDFLAGS = $(PANEL_LDFLAGS)
+libappearance_la_LDFLAGS = $(PANEL_LDFLAGS) $(COMPIZCONFIG_LIBS)
 
 if WITH_LIBSOCIALWEB
 libappearance_la_SOURCES += bg-flickr-source.c bg-flickr-source.h
-INCLUDES += $(SOCIALWEB_CFLAGS)
+AM_CPPFLAGS += $(SOCIALWEB_CFLAGS)
 libappearance_la_LIBADD += $(SOCIALWEB_LIBS)
 endif
 

=== modified file 'panels/appearance/appearance.ui'
--- panels/appearance/appearance.ui	2016-01-28 16:15:49 +0000
+++ panels/appearance/appearance.ui	2017-02-02 17:33:35 +0000
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!-- Generated with glade 3.16.1 -->
+<!-- Generated with glade 3.20.0 -->
 <interface>
   <requires lib="gtk+" version="3.0"/>
+  <object class="GtkSizeGroup" id="sizegroup">
+    <property name="mode">vertical</property>
+  </object>
   <object class="GtkListStore" id="sources-liststore">
     <columns>
       <!-- column-name source-name -->
@@ -84,9 +87,9 @@
                       <object class="GtkLabel" id="label1">
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
-                        <property name="xalign">0</property>
                         <property name="label" translatable="yes">&lt;b&gt;Background&lt;/b&gt;</property>
                         <property name="use_markup">True</property>
+                        <property name="xalign">0</property>
                       </object>
                       <packing>
                         <property name="expand">False</property>
@@ -175,6 +178,19 @@
                               </packing>
                             </child>
                             <child>
+                              <object class="GtkLabel" id="slide-label">
+                                <property name="visible">True</property>
+                                <property name="can_focus">False</property>
+                                <property name="label" translatable="yes" comments="This refers to a slideshow background">Changes throughout the day</property>
+                                <property name="xalign">0</property>
+                              </object>
+                              <packing>
+                                <property name="expand">False</property>
+                                <property name="fill">True</property>
+                                <property name="position">1</property>
+                              </packing>
+                            </child>
+                            <child>
                               <object class="GtkLabel" id="strut">
                                 <property name="visible">True</property>
                                 <property name="can_focus">False</property>
@@ -186,19 +202,6 @@
                                 <property name="position">1</property>
                               </packing>
                             </child>
-                            <child>
-                              <object class="GtkLabel" id="slide-label">
-                                <property name="visible">True</property>
-                                <property name="can_focus">False</property>
-                                <property name="xalign">0</property>
-                                <property name="label" translatable="yes" comments="This refers to a slideshow background">Changes throughout the day</property>
-                              </object>
-                              <packing>
-                                <property name="expand">False</property>
-                                <property name="fill">True</property>
-                                <property name="position">1</property>
-                              </packing>
-                            </child>
                           </object>
                           <packing>
                             <property name="expand">True</property>
@@ -454,10 +457,10 @@
                   <object class="GtkLabel" id="theme-label">
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
-                    <property name="xalign">0</property>
                     <property name="xpad">6</property>
                     <property name="label" translatable="yes">&lt;b&gt;Theme&lt;/b&gt;</property>
                     <property name="use_markup">True</property>
+                    <property name="xalign">0</property>
                     <accessibility>
                       <relation type="label-for" target="theme-selector"/>
                     </accessibility>
@@ -521,10 +524,10 @@
                   <object class="GtkLabel" id="unity-iconsize-label">
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
-                    <property name="xalign">0</property>
                     <property name="xpad">6</property>
                     <property name="label" translatable="yes">&lt;b&gt;Launcher icon size&lt;/b&gt;</property>
                     <property name="use_markup">True</property>
+                    <property name="xalign">0</property>
                     <accessibility>
                       <relation type="label-for" target="unity-iconsize-scale"/>
                     </accessibility>
@@ -602,9 +605,9 @@
                           <object class="GtkLabel" id="label4">
                             <property name="visible">True</property>
                             <property name="can_focus">False</property>
-                            <property name="xalign">0</property>
                             <property name="label" translatable="yes">&lt;b&gt;Auto-hide the Launcher&lt;/b&gt;</property>
                             <property name="use_markup">True</property>
+                            <property name="xalign">0</property>
                             <accessibility>
                               <relation type="label-for" target="unity_launcher_autohide"/>
                             </accessibility>
@@ -619,9 +622,9 @@
                           <object class="GtkLabel" id="label2">
                             <property name="visible">True</property>
                             <property name="can_focus">False</property>
-                            <property name="xalign">0</property>
                             <property name="label" translatable="yes">&lt;span size="small"&gt;The launcher will reveal when moving the pointer to the defined hot spot.&lt;/span&gt;</property>
                             <property name="use_markup">True</property>
+                            <property name="xalign">0</property>
                           </object>
                           <packing>
                             <property name="expand">False</property>
@@ -640,8 +643,8 @@
                               <object class="GtkLabel" id="unity_reveal_label">
                                 <property name="visible">True</property>
                                 <property name="can_focus">False</property>
-                                <property name="xalign">0</property>
                                 <property name="label" translatable="yes">Reveal location:</property>
+                                <property name="xalign">0</property>
                                 <accessibility>
                                   <relation type="label-for" target="unity_reveal_spot_left"/>
                                   <relation type="label-for" target="unity_reveal_spot_topleft"/>
@@ -829,10 +832,10 @@
                 <child>
                   <object class="GtkLabel" id="unity-label-external-tool">
                     <property name="can_focus">False</property>
-                    <property name="xalign">0</property>
                     <property name="xpad">12</property>
                     <property name="label" translatable="yes">Some settings have been overriden by an external program, press "Restore Default Behaviors"  to reset the behavior and return control to this panel.</property>
                     <property name="wrap">True</property>
+                    <property name="xalign">0</property>
                   </object>
                   <packing>
                     <property name="expand">False</property>
@@ -936,9 +939,9 @@
                           <object class="GtkLabel" id="label3">
                             <property name="visible">True</property>
                             <property name="can_focus">False</property>
-                            <property name="xalign">0</property>
                             <property name="label" translatable="yes">&lt;b&gt;Show the menus for a window&lt;/b&gt;</property>
                             <property name="use_markup">True</property>
+                            <property name="xalign">0</property>
                             <accessibility>
                               <relation type="label-for" target="unity_global_menus"/>
                               <relation type="label-for" target="unity_local_menus"/>
@@ -1012,9 +1015,9 @@
                           <object class="GtkLabel" id="label5">
                             <property name="visible">True</property>
                             <property name="can_focus">False</property>
-                            <property name="xalign">0</property>
                             <property name="label" translatable="yes">&lt;b&gt;Menus visibility&lt;/b&gt;</property>
                             <property name="use_markup">True</property>
+                            <property name="xalign">0</property>
                             <accessibility>
                               <relation type="label-for" target="unity_global_menus"/>
                               <relation type="label-for" target="unity_local_menus"/>
@@ -1106,6 +1109,111 @@
               </packing>
             </child>
             <child>
+              <object class="GtkBox" id="low_gfx_box">
+                <property name="height_request">36</property>
+                <property name="visible">True</property>
+                <property name="can_focus">False</property>
+                <property name="margin_left">12</property>
+                <property name="orientation">vertical</property>
+                <property name="spacing">12</property>
+                <child>
+                  <object class="GtkLabel" id="label7">
+                    <property name="visible">True</property>
+                    <property name="can_focus">False</property>
+                    <property name="label" translatable="yes">&lt;b&gt;Graphics Mode&lt;/b&gt;</property>
+                    <property name="use_markup">True</property>
+                    <property name="xalign">0</property>
+                    <accessibility>
+                      <relation type="label-for" target="unity_global_menus"/>
+                      <relation type="label-for" target="unity_local_menus"/>
+                    </accessibility>
+                  </object>
+                  <packing>
+                    <property name="expand">False</property>
+                    <property name="fill">True</property>
+                    <property name="position">0</property>
+                  </packing>
+                </child>
+                <child>
+                  <object class="GtkBox" id="unity_lowgfx">
+                    <property name="visible">True</property>
+                    <property name="can_focus">False</property>
+                    <child>
+                      <object class="GtkLabel" id="unity_lowgfx_label">
+                        <property name="visible">True</property>
+                        <property name="can_focus">False</property>
+                        <property name="xpad">5</property>
+                        <property name="label" translatable="yes">Appearance and other effects:</property>
+                        <property name="xalign">0.5899999737739563</property>
+                      </object>
+                      <packing>
+                        <property name="expand">False</property>
+                        <property name="fill">True</property>
+                        <property name="position">0</property>
+                      </packing>
+                    </child>
+                    <child>
+                      <object class="GtkRadioButton" id="unity_lowgfx_enable">
+                        <property name="label" translatable="yes">Limited Effects </property>
+                        <property name="visible">True</property>
+                        <property name="can_focus">True</property>
+                        <property name="receives_default">False</property>
+                        <property name="margin_left">5</property>
+                        <property name="xalign">1</property>
+                        <property name="active">True</property>
+                        <property name="draw_indicator">True</property>
+                        <property name="group">unity_lowgfx_disable</property>
+                      </object>
+                      <packing>
+                        <property name="expand">False</property>
+                        <property name="fill">True</property>
+                        <property name="position">1</property>
+                      </packing>
+                    </child>
+                    <child>
+                      <object class="GtkRadioButton" id="unity_lowgfx_disable">
+                        <property name="label" translatable="yes">Full effects</property>
+                        <property name="visible">True</property>
+                        <property name="can_focus">True</property>
+                        <property name="receives_default">False</property>
+                        <property name="margin_left">6</property>
+                        <property name="xalign">1</property>
+                        <property name="active">True</property>
+                        <property name="draw_indicator">True</property>
+                        <property name="group">unity_lowgfx_enable</property>
+                      </object>
+                      <packing>
+                        <property name="expand">False</property>
+                        <property name="fill">True</property>
+                        <property name="position">2</property>
+                      </packing>
+                    </child>
+                  </object>
+                  <packing>
+                    <property name="expand">False</property>
+                    <property name="fill">True</property>
+                    <property name="position">1</property>
+                  </packing>
+                </child>
+              </object>
+              <packing>
+                <property name="expand">False</property>
+                <property name="fill">True</property>
+                <property name="position">5</property>
+              </packing>
+            </child>
+            <child>
+              <object class="GtkSeparator" id="separator5">
+                <property name="visible">True</property>
+                <property name="can_focus">False</property>
+              </object>
+              <packing>
+                <property name="expand">False</property>
+                <property name="fill">True</property>
+                <property name="position">6</property>
+              </packing>
+            </child>
+            <child>
               <object class="GtkBox" id="box5">
                 <property name="height_request">36</property>
                 <property name="visible">True</property>
@@ -1133,7 +1241,7 @@
               <packing>
                 <property name="expand">False</property>
                 <property name="fill">True</property>
-                <property name="position">7</property>
+                <property name="position">8</property>
               </packing>
             </child>
           </object>
@@ -1155,13 +1263,4 @@
       </object>
     </child>
   </object>
-  <object class="GtkSizeGroup" id="sizegroup">
-    <property name="mode">vertical</property>
-    <widgets>
-      <widget name="sources-combobox"/>
-      <widget name="heading-hbox"/>
-      <widget name="slide-label"/>
-      <widget name="strut"/>
-    </widgets>
-  </object>
 </interface>

=== modified file 'panels/appearance/cc-appearance-panel.c'
--- panels/appearance/cc-appearance-panel.c	2016-07-05 14:26:25 +0000
+++ panels/appearance/cc-appearance-panel.c	2017-02-02 17:33:35 +0000
@@ -5,24 +5,28 @@
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation, either version 2 of the License, or
  * (at your option) any later version.
- * 
+ *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
- * 
+ *
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- * 
+ *
  * Author: Thomas Wood <[e-mail]>
  *
  */
 
 #include <config.h>
 
+#include <errno.h>
 #include <string.h>
 #include <glib/gi18n-lib.h>
+#include <glib/gprintf.h>
+#include <glib/gstdio.h>
 #include <gdesktop-enums.h>
+#include <ccs.h>
 
 #include "cc-appearance-panel.h"
 #include "bg-wallpapers-source.h"
@@ -118,6 +122,7 @@
 #define UNITY_INTEGRATED_MENUS_KEY "integrated-menus"
 #define UNITY_ALWAYS_SHOW_MENUS_KEY "always-show-menus"
 #define SHOW_DESKTOP_UNITY_FAVORITE_STR "unity://desktop-icon"
+#define UNITY_LOWGFX "lowgfx"
 
 #define MIN_ICONSIZE 16.0
 #define MAX_ICONSIZE 64.0
@@ -128,6 +133,157 @@
 
 #define WID(y) (GtkWidget *) gtk_builder_get_object (priv->builder, y)
 
+static CCSContext *ccs_context;
+static char *ccs_backend;
+static gboolean init_ccs_context ()
+{
+  GdkScreen *screen = gdk_screen_get_default ();
+  g_assert (screen);
+
+  if (!(ccs_context = ccsContextNew (gdk_screen_get_number (screen),
+          &ccsDefaultInterfaceTable)))
+  {
+    fprintf (stderr, "CCS error: Failed to initialize context.\n");
+    return FALSE;
+  }
+
+  return TRUE;
+}
+
+static void finalize_ccs_context ()
+{
+  ccsFreeContext(ccs_context);
+}
+
+static gboolean copy_file_to (const gchar *f1, const gchar *f2)
+{
+  FILE *fp1, *fp2;
+  char buf[4096];
+  int sz;
+  gboolean res = TRUE;
+
+  if (!(fp1 = fopen (f1, "r")))
+  {
+    fprintf (stderr, "Failed to open %s for reading: %s.\n", f1, strerror (errno));
+    return FALSE;
+  }
+
+  if (!(fp2 = fopen (f2, "w")))
+  {
+    fprintf (stderr, "Failed to open %s for writing: %s.\n", f2, strerror (errno));
+    fclose (fp1);
+    return FALSE;
+  }
+
+  while ((sz = fread (buf, 1, sizeof buf, fp1)) > 0)
+  {
+    if (fwrite (buf, 1, sz, fp2) != sz)
+    {
+      res = FALSE;
+      break;
+    }
+  }
+
+  fclose (fp1);
+  fclose (fp2);
+
+  return res;
+}
+
+static gboolean toggle_lowgfx_profile (gboolean enable_lowgfx)
+{
+  if (enable_lowgfx)
+  {
+    ccsSetProfile (ccs_context, "unity-lowgfx");
+    ccsSetIntegrationEnabled (ccs_context, TRUE);
+    ccsSetPluginListAutoSort (ccs_context, TRUE);
+  }
+  else
+  {
+    ccsSetProfile (ccs_context, "unity");
+    ccsSetIntegrationEnabled (ccs_context, TRUE);
+    ccsSetPluginListAutoSort (ccs_context, TRUE);
+  }
+
+  return TRUE;
+}
+
+static gboolean toggle_lowgfx_ini_settings (gboolean enable_lowgfx)
+{
+  gchar *home_dir = g_get_home_dir ();
+
+  gchar *default_ini = g_strconcat (home_dir, "/.config/compiz-1/compizconfig/Default.ini", NULL);
+  gchar *system_lowgfx_ini = strdup ("/etc/compizconfig/unity-lowgfx.ini");
+  gchar *system_unity_ini = strdup ("/etc/compizconfig/unity.ini");
+
+  g_assert (g_file_test (system_unity_ini, G_FILE_TEST_EXISTS));
+
+  if (!g_file_test (system_lowgfx_ini, G_FILE_TEST_EXISTS))
+  {
+    g_warning ("File %s not found.", system_lowgfx_ini);
+    goto error;
+  }
+
+  if (!g_file_test (default_ini, G_FILE_TEST_EXISTS))
+  {
+    if (!copy_file_to (system_unity_ini, default_ini))
+      goto error;
+  }
+
+  ccsSetProfile (ccs_context, "Default");
+  if (g_strcmp0 (ccsGetProfile (ccs_context), "Default"))
+  {
+    goto error;
+  }
+
+  if (enable_lowgfx)
+  {
+    if (!copy_file_to (system_lowgfx_ini, default_ini))
+      goto error;
+  }
+  else
+  {
+    if (!copy_file_to (system_unity_ini, default_ini))
+      goto error;
+  }
+
+  g_free (system_unity_ini);
+  g_free (system_lowgfx_ini);
+  g_free (default_ini);
+  return TRUE;
+
+error:
+  g_free (system_unity_ini);
+  g_free (system_lowgfx_ini);
+  g_free (default_ini);
+  return FALSE;
+}
+
+static gboolean toggle_lowgfx (gboolean enable_lowgfx)
+{
+  if (!g_file_test ("/etc/compizconfig/unity-lowgfx.ini", G_FILE_TEST_EXISTS))
+    return FALSE;
+
+  ccs_backend = ccsGetBackend (ccs_context);
+  if (!g_strcmp0 (ccs_backend, "ini"))
+  {
+    return toggle_lowgfx_ini_settings (enable_lowgfx);
+  }
+  else
+  {
+    if (!g_strcmp0 (ccs_backend, "gsettings"))
+    {
+      return toggle_lowgfx_profile (enable_lowgfx);
+    }
+    else
+    {
+      return FALSE;
+    }
+  }
+
+  return TRUE;
+}
+
 static void
 cc_appearance_panel_get_property (GObject    *object,
                                   guint       property_id,
@@ -270,6 +426,8 @@
       priv->current_background = NULL;
     }
 
+  finalize_ccs_context ();
+
   G_OBJECT_CLASS (cc_appearance_panel_parent_class)->finalize (object);
 }
 
@@ -1787,6 +1945,49 @@
 }
 
 static void
+lowgfx_widget_refresh (CcAppearancePanel *self)
+{
+    CcAppearancePanelPrivate *priv = self->priv;
+    gboolean has_setting = unity_own_setting_exists(self, UNITY_LOWGFX);
+    gboolean profile_exists = g_file_test ("/etc/compizconfig/unity-lowgfx.ini", G_FILE_TEST_EXISTS);
+
+    gtk_widget_set_sensitive (WID ("unity_lowgfx"), has_setting && profile_exists);
+
+    gboolean enable_lowgfx = g_settings_get_boolean (priv->unity_own_settings, UNITY_LOWGFX);
+    if (!toggle_lowgfx (enable_lowgfx)) {
+	gtk_widget_set_sensitive (WID ("unity_lowgfx"), FALSE);
+    }
+
+    if (enable_lowgfx == TRUE)
+	gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (WID ("unity_lowgfx_enable")), TRUE);
+    else
+	gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (WID ("unity_lowgfx_disable")), TRUE);
+}
+
+static void
+on_lowgfx_changed (GtkToggleButton *button,
+                   gpointer user_data)
+{
+    CcAppearancePanel *self = CC_APPEARANCE_PANEL (user_data);
+    CcAppearancePanelPrivate *priv = self->priv;
+
+    gboolean enabled = gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (WID ("unity_lowgfx_enable")));
+    g_settings_set_boolean (priv->unity_own_settings, UNITY_LOWGFX, enabled);
+
+    if (!toggle_lowgfx (enabled)) {
+	gtk_widget_set_sensitive (WID ("unity_lowgfx"), FALSE);
+    }
+}
+
+static void
+ext_lowgfx_changed_callback (GSettings* settings,
+                             guint key,
+                             gpointer user_data)
+{
+    lowgfx_widget_refresh (CC_APPEARANCE_PANEL (user_data));
+}
+
+static void
 on_restore_defaults_page2_clicked (GtkButton *button, gpointer user_data)
 {
   CcAppearancePanel *self = CC_APPEARANCE_PANEL (user_data);
@@ -1805,6 +2006,9 @@
   if (unity_own_setting_exists (self, UNITY_ALWAYS_SHOW_MENUS_KEY))
     g_settings_reset (priv->unity_own_settings, UNITY_ALWAYS_SHOW_MENUS_KEY);
 
+  if (unity_own_setting_exists (self, UNITY_LOWGFX))
+    g_settings_reset (priv->unity_own_settings, UNITY_LOWGFX);
+
   GtkToggleButton *showdesktop = GTK_TOGGLE_BUTTON (WID ("check_showdesktop_in_launcher"));
   gtk_toggle_button_set_active(showdesktop, TRUE);
 }
@@ -1985,9 +2189,19 @@
                      G_CALLBACK (on_menuvisibility_changed), self);
   menuvisibility_widget_refresh (self);
 
+
+  /* Low gfx */
+  g_signal_connect (priv->unity_own_settings, "changed::" UNITY_OWN_GSETTINGS_SCHEMA, G_CALLBACK (ext_lowgfx_changed_callback), self);
+  g_signal_connect (WID ("unity_lowgfx_enable"), "toggled",
+                    G_CALLBACK (on_lowgfx_changed), self);
+  g_signal_connect (WID ("unity_lowgfx_disable"), "toggled",
+                    G_CALLBACK (on_lowgfx_changed), self);
+  lowgfx_widget_refresh (self);
+
   /* Restore defaut on second page */
   g_signal_connect (WID ("button-restore-unitybehavior"), "clicked",
                     G_CALLBACK (on_restore_defaults_page2_clicked), self);
+
 }
 
 static void
@@ -2001,6 +2215,8 @@
   GtkListStore *store;
   GtkStyleContext *context;
 
+  init_ccs_context();
+
   priv = self->priv = APPEARANCE_PANEL_PRIVATE (self);
 
   priv->builder = gtk_builder_new ();

=== modified file 'panels/bluetooth/Makefile.am'
--- panels/bluetooth/Makefile.am	2015-03-03 11:08:17 +0000
+++ panels/bluetooth/Makefile.am	2017-02-02 17:33:35 +0000
@@ -6,7 +6,7 @@
 ccpanelsdir = $(PANELS_DIR)
 ccpanels_LTLIBRARIES = libbluetooth.la
 
-INCLUDES = 						\
+AM_CPPFLAGS = 						\
 	$(PANEL_CFLAGS)					\
 	$(BLUETOOTH_PANEL_CFLAGS)				\
 	-I$(srcdir)/gnome-bluetooth/lib			\

=== modified file 'panels/bluetooth/gnome-bluetooth/wizard/Makefile.am'
--- panels/bluetooth/gnome-bluetooth/wizard/Makefile.am	2015-03-03 11:08:17 +0000
+++ panels/bluetooth/gnome-bluetooth/wizard/Makefile.am	2017-02-02 17:33:35 +0000
@@ -20,7 +20,7 @@
 ui_DATA = wizard.ui
 uidir = $(pkgdatadir)
 
-INCLUDES = \
+AM_CPPFLAGS = \
 	 -I$(srcdir)/../lib \
 	-DLOCALEDIR="\"$(datadir)/locale\""
 

=== modified file 'panels/color/Makefile.am'
--- panels/color/Makefile.am	2013-11-29 06:28:37 +0000
+++ panels/color/Makefile.am	2017-02-02 17:33:35 +0000
@@ -2,7 +2,7 @@
 
 cappletname = color
 
-INCLUDES = 						\
+AM_CPPFLAGS = 						\
 	$(PANEL_CFLAGS)					\
 	$(COLOR_PANEL_CFLAGS)				\
 	-DGNOMECC_UI_DIR="\"$(uidir)\""			\

=== modified file 'panels/datetime/Makefile.am'
--- panels/datetime/Makefile.am	2014-02-10 22:51:08 +0000
+++ panels/datetime/Makefile.am	2017-02-02 17:33:35 +0000
@@ -17,7 +17,7 @@
 iconsscalabledir = $(datadir)/icons/hicolor/scalable/apps
 dist_iconsscalable_DATA = icons/scalable/unity-datetime-panel.svg
 
-INCLUDES =						\
+AM_CPPFLAGS =						\
 	$(PANEL_CFLAGS)					\
 	$(DATETIME_PANEL_CFLAGS) \
 	-DLOCALEDIR="\"$(datadir)/locale\"" \

=== modified file 'panels/display/Makefile.am'
--- panels/display/Makefile.am	2014-02-14 07:43:49 +0000
+++ panels/display/Makefile.am	2017-02-02 17:33:35 +0000
@@ -43,7 +43,7 @@
 Desktop_in_files = unity-display-panel.desktop.in
 desktop_DATA = $(Desktop_in_files:.desktop.in=.desktop)
 
-INCLUDES   = $(PANEL_CFLAGS) \
+AM_CPPFLAGS   = $(PANEL_CFLAGS) \
 	     $(DISPLAY_PANEL_CFLAGS) \
 	     -DSBINDIR="\"$(sbindir)\"" \
 	     -DUIDIR="\"$(uidir)\"" \

=== modified file 'panels/info/Makefile.am'
--- panels/info/Makefile.am	2014-02-20 23:38:45 +0000
+++ panels/info/Makefile.am	2017-02-02 17:33:35 +0000
@@ -1,6 +1,6 @@
 cappletname = info
 
-INCLUDES = 						\
+AM_CPPFLAGS = 						\
 	$(PANEL_CFLAGS)					\
 	$(INFO_PANEL_CFLAGS)				\
 	-DGNOMECC_UI_DIR="\"$(uidir)\""			\
@@ -13,7 +13,7 @@
 noinst_PROGRAMS = test-hostname logo-generator
 test_hostname_SOURCES = hostname-helper.c hostname-helper.h test-hostname.c
 test_hostname_LDADD = $(PANEL_LIBS) $(INFO_PANEL_LIBS)
-test_hostname_CFLAGS = $(INCLUDES)
+test_hostname_CFLAGS = $(AM_CPPFLAGS)
 
 logo_generator_SOURCES = logo-generator.vala
 

=== modified file 'panels/keyboard/Makefile.am'
--- panels/keyboard/Makefile.am	2013-11-29 06:28:37 +0000
+++ panels/keyboard/Makefile.am	2017-02-02 17:33:35 +0000
@@ -47,7 +47,7 @@
 pkgconfigdir = $(datadir)/pkgconfig
 pkgconfig_DATA = unity-keybindings.pc
 
-INCLUDES = \
+AM_CPPFLAGS = \
 	-DGNOMELOCALEDIR="\"$(datadir)/locale\"" \
 	-DGNOMECC_DATA_DIR="\"$(pkgdatadir)\"" \
 	-DGNOMECC_UI_DIR="\"$(uidir)\"" \

=== modified file 'panels/mouse/Makefile.am'
--- panels/mouse/Makefile.am	2013-11-29 06:28:37 +0000
+++ panels/mouse/Makefile.am	2017-02-02 17:33:35 +0000
@@ -1,7 +1,7 @@
 # This is used in PANEL_CFLAGS
 cappletname = mouse
 
-INCLUDES = 						\
+AM_CPPFLAGS = 						\
 	$(PANEL_CFLAGS)					\
 	$(MOUSE_PANEL_CFLAGS)				\
 	-DGNOMELOCALEDIR="\"$(datadir)/locale\""	\
@@ -34,7 +34,7 @@
 
 noinst_PROGRAMS = test-gnome-mouse-test
 
-test_gnome_mouse_test_CPPFLAGS = $(INCLUDES)
+test_gnome_mouse_test_CPPFLAGS = $(AM_CPPFLAGS)
 test_gnome_mouse_test_LDADD = $(PANEL_LIBS) $(MOUSE_PANEL_LIBS)
 
 @INTLTOOL_DESKTOP_RULE@

=== modified file 'panels/network/Makefile.am'
--- panels/network/Makefile.am	2013-11-29 06:28:37 +0000
+++ panels/network/Makefile.am	2017-02-02 17:33:35 +0000
@@ -1,6 +1,6 @@
 cappletname = network
 
-INCLUDES = 						\
+AM_CPPFLAGS = 						\
 	$(PANEL_CFLAGS)					\
 	$(NETWORK_PANEL_CFLAGS)				\
 	$(NETWORK_MANAGER_CFLAGS)			\

=== modified file 'panels/power/Makefile.am'
--- panels/power/Makefile.am	2013-11-29 06:28:37 +0000
+++ panels/power/Makefile.am	2017-02-02 17:33:35 +0000
@@ -2,7 +2,7 @@
 
 SUBDIRS = icons
 
-INCLUDES = 						\
+AM_CPPFLAGS = 						\
 	$(PANEL_CFLAGS)					\
 	$(POWER_PANEL_CFLAGS)				\
 	-DGNOMECC_UI_DIR="\"$(uidir)\""			\

=== modified file 'panels/printers/Makefile.am'
--- panels/printers/Makefile.am	2013-11-29 07:58:26 +0000
+++ panels/printers/Makefile.am	2017-02-02 17:33:35 +0000
@@ -8,7 +8,7 @@
 	jobs-dialog.ui		\
 	printers.ui
 
-INCLUDES = 						\
+AM_CPPFLAGS = 						\
 	$(PANEL_CFLAGS)					\
 	$(PRINTERS_PANEL_CFLAGS)			\
 	-I$(top_srcdir)/shell/				\

=== modified file 'panels/region/Makefile.am'
--- panels/region/Makefile.am	2014-09-15 20:22:00 +0000
+++ panels/region/Makefile.am	2017-02-02 17:33:35 +0000
@@ -1,7 +1,7 @@
 # This is used in PANEL_CFLAGS
 cappletname = region
 
-INCLUDES =						\
+AM_CPPFLAGS =						\
 	$(PANEL_CFLAGS)					\
 	$(REGION_PANEL_CFLAGS)				\
 	-DGNOMELOCALEDIR="\"$(datadir)/locale\""	\

=== modified file 'panels/screen/Makefile.am'
--- panels/screen/Makefile.am	2013-11-29 06:28:37 +0000
+++ panels/screen/Makefile.am	2017-02-02 17:33:35 +0000
@@ -1,6 +1,6 @@
 cappletname = screen
 
-INCLUDES = 						\
+AM_CPPFLAGS = 						\
 	$(PANEL_CFLAGS)					\
 	$(SCREEN_PANEL_CFLAGS)			\
 	-DGNOMECC_UI_DIR="\"$(uidir)\""			\

=== modified file 'panels/universal-access/Makefile.am'
--- panels/universal-access/Makefile.am	2013-11-29 06:28:37 +0000
+++ panels/universal-access/Makefile.am	2017-02-02 17:33:35 +0000
@@ -1,6 +1,6 @@
 cappletname = universal-access
 
-INCLUDES = 						\
+AM_CPPFLAGS = 						\
 	$(PANEL_CFLAGS)					\
 	$(UNIVERSAL_ACCESS_PANEL_CFLAGS)		\
 	-DGNOMECC_UI_DIR="\"$(uidir)\""			\

=== modified file 'panels/wacom/Makefile.am'
--- panels/wacom/Makefile.am	2014-02-19 02:24:52 +0000
+++ panels/wacom/Makefile.am	2017-02-02 17:33:35 +0000
@@ -3,7 +3,7 @@
 
 SUBDIRS = calibrator
 
-INCLUDES = 						\
+AM_CPPFLAGS = 						\
 	$(PANEL_CFLAGS)					\
 	$(WACOM_PANEL_CFLAGS)				\
 	-I$(srcdir)/calibrator				\
@@ -59,7 +59,7 @@
 	gsd-input-helper.h		\
 	gsd-enums.h
 
-test_wacom_CPPFLAGS = $(INCLUDES)
+test_wacom_CPPFLAGS = $(AM_CPPFLAGS)
 test_wacom_LDADD = $(PANEL_LIBS) $(WACOM_PANEL_LIBS) $(builddir)/calibrator/libwacom-calibrator.la
 
 resource_files = $(shell glib-compile-resources --sourcedir=$(srcdir) --generate-dependencies $(srcdir)/wacom.gresource.xml)

=== modified file 'panels/wacom/calibrator/Makefile.am'
--- panels/wacom/calibrator/Makefile.am	2014-02-19 02:24:52 +0000
+++ panels/wacom/calibrator/Makefile.am	2017-02-02 17:33:35 +0000
@@ -1,7 +1,7 @@
 # This is used in PANEL_CFLAGS
 cappletname = wacom
 
-INCLUDES = 						\
+AM_CPPFLAGS = 						\
 	$(PANEL_CFLAGS)					\
 	$(WACOM_PANEL_CFLAGS)				\
 	-DGNOMELOCALEDIR="\"$(datadir)/locale\""	\
@@ -28,7 +28,7 @@
 	gui_gtk.c			\
 	gui_gtk.h
 
-test_calibrator_CPPFLAGS = $(INCLUDES)
+test_calibrator_CPPFLAGS = $(AM_CPPFLAGS)
 test_calibrator_LDADD = $(PANEL_LIBS) $(WACOM_PANEL_LIBS)
 
 -include $(top_srcdir)/git.mk

=== modified file 'shell/Makefile.am'
--- shell/Makefile.am	2014-02-24 17:28:38 +0000
+++ shell/Makefile.am	2017-02-02 17:33:35 +0000
@@ -1,4 +1,4 @@
-INCLUDES =					\
+AM_CPPFLAGS =					\
 	-I$(top_srcdir)				\
 	$(SHELL_CFLAGS)				\
 	$(CHEESE_CFLAGS)
@@ -70,7 +70,7 @@
 pkgconfigdir=$(libdir)/pkgconfig
 pkgconfig_DATA=libunity-control-center.pc
 
-AM_CPPFLAGS =							\
+AM_CPPFLAGS +=							\
 	-DGNOMELOCALEDIR="\"$(datadir)/locale\""		\
 	-DUIDIR="\"$(uidir)\""					\
 	-DMENUDIR="\"$(menudir)\""				\