[gnome-control-center] shell: Don't call gtk_clutter_init() when using cheese



commit 3717e985ebfb09d3310fb2039650006e73133a9c
Author: Christophe Fergeau <cfergeau redhat com>
Date:   Sun Jun 21 10:23:28 2015 +0200

    shell: Don't call gtk_clutter_init() when using cheese
    
    cheese_gtk_init() is called as well and will be taking care of that for
    us.
    
    https://bugzilla.gnome.org/show_bug.cgi?id=751597

 shell/cc-application.c |    8 ++++----
 1 files changed, 4 insertions(+), 4 deletions(-)
---
diff --git a/shell/cc-application.c b/shell/cc-application.c
index bedf4c1..1b6b9f8 100644
--- a/shell/cc-application.c
+++ b/shell/cc-application.c
@@ -30,9 +30,9 @@
 #include "cc-shell-log.h"
 #include "cc-window.h"
 
-#if defined(HAVE_CHEESE) || defined(HAVE_WACOM)
+#if defined(HAVE_WACOM)
 #include <clutter-gtk/clutter-gtk.h>
-#endif /* HAVE_CHEESE || HAVE_WACOM */
+#endif /* HAVE_WACOM */
 
 struct _CcApplicationPrivate
 {
@@ -218,13 +218,13 @@ cc_application_startup (GApplication *application)
 
   G_APPLICATION_CLASS (cc_application_parent_class)->startup (application);
 
-#if defined(HAVE_CHEESE) || defined(HAVE_WACOM)
+#if defined(HAVE_WACOM)
   if (gtk_clutter_init (NULL, NULL) != CLUTTER_INIT_SUCCESS)
     {
       g_critical ("Unable to initialize Clutter");
       return;
     }
-#endif /* HAVE_CHEESE || HAVE_WACOM */
+#endif /* HAVE_WACOM */
 
   action = g_simple_action_new ("help", NULL);
   g_action_map_add_action (G_ACTION_MAP (application), G_ACTION (action));


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