application: Initialize clutter-gtk either with Cheese or Wacom

Both require clutter-gtk, but only Wacom was being checked. This would
make compiling with Cheese disabled fail.

https://bugzilla.gnome.org/show_bug.cgi?id=785414
This commit is contained in:
Georges Basile Stavracas Neto 2018-01-17 20:03:28 -02:00
parent 32edd6789e
commit dc5e2fd555

View file

@ -30,9 +30,9 @@
#include "cc-shell-log.h"
#include "cc-window.h"
#if defined(HAVE_WACOM)
#if defined(HAVE_WACOM) || defined(HAVE_CHEESE)
#include <clutter-gtk/clutter-gtk.h>
#endif /* HAVE_WACOM */
#endif /* HAVE_WACOM || HAVE_CHEESE */
struct _CcApplicationPrivate
{
@ -218,13 +218,13 @@ cc_application_startup (GApplication *application)
G_APPLICATION_CLASS (cc_application_parent_class)->startup (application);
#if defined(HAVE_WACOM)
#if defined(HAVE_WACOM) || defined(HAVE_CHEESE)
if (gtk_clutter_init (NULL, NULL) != CLUTTER_INIT_SUCCESS)
{
g_critical ("Unable to initialize Clutter");
return;
}
#endif /* HAVE_WACOM */
#endif /* HAVE_WACOM || HAVE_CHEESE */
action = g_simple_action_new ("help", NULL);
g_action_map_add_action (G_ACTION_MAP (application), G_ACTION (action));