diff options
| author | Georges Basile Stavracas Neto <georges.stavracas@gmail.com> | 2018-01-17 20:03:28 -0200 |
|---|---|---|
| committer | Georges Basile Stavracas Neto <georges.stavracas@gmail.com> | 2018-01-17 20:09:38 -0200 |
| commit | dc5e2fd5554ede165dc5b7e3d22bb3b086e8c240 (patch) | |
| tree | 68d6fdba5fedd587d44005f0f2aca993f51aeeb3 /shell/cc-application.c | |
| parent | 32edd6789e9d60b1e371660bdbb3c4a0671bd714 (diff) | |
| download | gnome-control-center-dc5e2fd5554ede165dc5b7e3d22bb3b086e8c240.tar.gz | |
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
Diffstat (limited to 'shell/cc-application.c')
| -rw-r--r-- | 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 c160899b2..50f1c862c 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_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)); |