[gnome-control-center] user-accounts: Call cheese init function



commit 232aa050c2c7656899461c6a1944b1f1e653fe73
Author: Bastien Nocera <hadess hadess net>
Date:   Mon Jan 23 14:21:20 2012 +0000

    user-accounts: Call cheese init function
    
    Instead of clutter-gst's

 configure.ac                          |    1 -
 panels/user-accounts/um-user-module.c |    8 ++++++--
 2 files changed, 6 insertions(+), 3 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index c163ea3..9f02e5e 100644
--- a/configure.ac
+++ b/configure.ac
@@ -129,7 +129,6 @@ PKG_CHECK_MODULES(UNIVERSAL_ACCESS_PANEL, $COMMON_MODULES gsettings-desktop-sche
 PKG_CHECK_MODULES(USER_ACCOUNTS_PANEL, $COMMON_MODULES dbus-glib-1
                   polkit-gobject-1 >= $POLKIT_REQUIRED_VERSION
                   gnome-desktop-3.0
-                  clutter-gst-1.0
                   gdk-pixbuf-2.0 >= $GDKPIXBUF_REQUIRED_VERSION
                   $SYSTEMD)
 PKG_CHECK_MODULES(WACOM_PANEL, $COMMON_MODULES
diff --git a/panels/user-accounts/um-user-module.c b/panels/user-accounts/um-user-module.c
index e1dfaa1..72f276d 100644
--- a/panels/user-accounts/um-user-module.c
+++ b/panels/user-accounts/um-user-module.c
@@ -23,8 +23,10 @@
 
 #include "um-user-panel.h"
 
-#include <clutter-gst/clutter-gst.h>
 #include <glib/gi18n.h>
+#ifdef HAVE_CHEESE
+#include <cheese-gtk.h>
+#endif
 
 void
 g_io_module_load (GIOModule *module)
@@ -32,7 +34,9 @@ g_io_module_load (GIOModule *module)
   bindtextdomain (GETTEXT_PACKAGE, GNOMELOCALEDIR);
   bind_textdomain_codeset (GETTEXT_PACKAGE, "UTF-8");
 
-  clutter_gst_init (NULL, NULL);
+#ifdef HAVE_CHEESE
+  cheese_gtk_init (NULL, NULL);
+#endif
 
   /* register the panel */
   um_user_panel_register (module);



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]