applications/gnome-control-center
4
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

shell: Don't call gtk_clutter_init() when using cheese

Browse source 
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
This commit is contained in:
Christophe Fergeau 2015-06-21 10:23:28 +02:00
parent a70172cfea
commit 3717e985eb
1 changed files with 4 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

8
shell/cc-application.c
View file

@ -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));