diff options
| author | Joaquim Rocha <jrocha@redhat.com> | 2013-04-08 18:44:12 +0200 |
|---|---|---|
| committer | Joaquim Rocha <jrocha@redhat.com> | 2013-05-17 16:36:59 +0200 |
| commit | d78bc9772a3109ed75e80d6adc0d691a0a15c6d3 (patch) | |
| tree | 8b3c068c1c9d16cd0b99290f26a1dcc9dfbc33ab /shell | |
| parent | 11382d241a02ddd33e55888cc8d4cfeb5e916244 (diff) | |
| download | gnome-control-center-d78bc9772a3109ed75e80d6adc0d691a0a15c6d3.tar.gz | |
wacom: Re-write gui_gtk in Clutter to introduce animations
The name of the file was also changed to calibratorgui.c/h to avoid
it being inconsistent, this way it is no longer dependent on the
the technology.
https://bugzilla.gnome.org/show_bug.cgi?id=667797
Diffstat (limited to 'shell')
| -rw-r--r-- | shell/Makefile.am | 1 | ||||
| -rw-r--r-- | shell/cc-application.c | 9 |
2 files changed, 7 insertions, 3 deletions
diff --git a/shell/Makefile.am b/shell/Makefile.am index 68b70e91a..ad7a68faf 100644 --- a/shell/Makefile.am +++ b/shell/Makefile.am @@ -2,6 +2,7 @@ INCLUDES = \ -I$(top_srcdir) \ $(SHELL_CFLAGS) \ $(CHEESE_CFLAGS) \ + $(WACOM_PANEL_CFLAGS) \ -I$(top_srcdir)/panels/common/ \ -I$(top_srcdir)/libgd diff --git a/shell/cc-application.c b/shell/cc-application.c index 72a61436b..e7de6f753 100644 --- a/shell/cc-application.c +++ b/shell/cc-application.c @@ -30,9 +30,12 @@ #include "cc-shell-log.h" #include "cc-window.h" +#if defined(HAVE_CHEESE) || defined(HAVE_WACOM) +#include <clutter-gtk/clutter-gtk.h> +#endif /* HAVE_CHEESE || HAVE_WACOM */ + #ifdef HAVE_CHEESE #include <cheese-gtk.h> -#include <clutter-gtk/clutter-gtk.h> #endif /* HAVE_CHEESE */ struct _CcApplicationPrivate @@ -277,13 +280,13 @@ cc_application_startup (GApplication *application) G_APPLICATION_CLASS (cc_application_parent_class)->startup (application); -#ifdef HAVE_CHEESE +#if defined(HAVE_CHEESE) || defined(HAVE_WACOM) if (gtk_clutter_init (NULL, NULL) != CLUTTER_INIT_SUCCESS) { g_critical ("Unable to initialize Clutter"); return; } -#endif /* HAVE_CHEESE */ +#endif /* HAVE_CHEESE || HAVE_WACOM */ /* register a symbolic icon size for use in sidebar lists */ gtk_icon_size_register ("cc-sidebar-list", 24, 24); |