Merge lp:~codygarver/switchboard/no-cheese-please into lp:~elementary-pantheon/switchboard/switchboard

[Cody Garver]

Drop cheese dependency since the offending gnomecc plug was replaced with the native lp:switchboard-plug-useraccounts

[Cody Garver (codygarver)]

Makes Displays plug crash with message about having not initialized clutter

review: Needs Fixing

[Cody Garver (codygarver)]

Fixed crash

review: Abstain

[lp:~codygarver/switchboard/no-cheese-please]

546. By Cody Garver on 2015-04-09

Drop cheese dependency since the offending gnomecc plug was replaced with the native lp:switchboard-plug-useraccounts

[Rico Tzschichholz (ricotz)]

review: Approve

=== modified file 'CMakeLists.txt'
--- CMakeLists.txt	2014-08-01 13:18:10 +0000
+++ CMakeLists.txt	2015-04-09 08:29:29 +0000
@@ -86,6 +86,7 @@
 endif ()
 
 set (LIB_PACKAGES
+  clutter-gtk-1.0
   glib-2.0
   gio-2.0
   gee-0.8
@@ -95,14 +96,13 @@
 )
 
 set (LIB_PKG
+  clutter-gtk-1.0
   glib-2.0>=2.32
   gio-2.0
   gee-0.8
   gmodule-2.0
   gtk+-3.0>=3.10
   gio-unix-2.0
-  # cheese is required for the GCC panels to work
-  cheese-gtk
 )
 find_package(PkgConfig)
 

=== modified file 'src/Switchboard.vala'
--- src/Switchboard.vala	2015-03-10 10:01:54 +0000
+++ src/Switchboard.vala	2015-04-09 08:29:29 +0000
@@ -17,9 +17,6 @@
 
 namespace Switchboard {
 
-    [CCode (cname = "cheese_gtk_init")]
-    public extern static bool cheese_gtk_init ([CCode (array_length_pos = 0.9)] ref unowned string[] argv);
-
     public enum WindowState {
         NORMAL = 0,
         MAXIMIZED = 1
@@ -27,10 +24,8 @@
 
     public static int main (string[] args) {
 
-        // FIXME the gcc user-accounts plug requires cheese to be initialized before gtk,
-        //       otherwise it will crash switchboard if it's loaded before the window and
-        //       all its widgets are displayed.
-        cheese_gtk_init (ref args);
+        // Only known plug that requires GtkClutter is switchboard-plug-display
+        GtkClutter.init (ref args);
 
         var app = SwitchboardApp.instance;
         return app.run (args);