Call: Fix floating toolbar

Empathy needed to mark the toolbar actor as reactive otherwise it won't
be reactive to events (doh)...

And empathy needed to stop calling gdk_disable_multi_device().. Empathy
used to do this because it has to be called before GTK+ is initialized
and clutter-gtk only called after GTK+ was initialized by other function
in empathy. Unfortunately since clutter-gtk 1.1.2 instead of ensuring
event actually work with clutter-gtk calling this function will actually
break event handle (great fun!)..

Oh and also bump the clutter-gtk requirement to 1.1.2 to ensure we get
the right behaviour for events..

https://bugzilla.gnome.org/show_bug.cgi?id=670874

diff --git a/configure.ac b/configure.ac
index dc1e3f17cafbef929245de46c4e37dabbae0d7c3..b061db4a10b732aeca6537da19c858076afbd17a 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -49,7 +49,7 @@ CLUTTER_REQUIRED=1.10.0
 AC_DEFINE(CLUTTER_VERSION_MIN_REQUIRED, CLUTTER_VERSION_1_8, [Ignore post 1.8 deprecations])
 AC_DEFINE(CLUTTER_VERSION_MAX_ALLOWED, CLUTTER_VERSION_1_10, [Prevent post 1.10 APIs])
 
-CLUTTER_GTK_REQUIRED=0.90.3
+CLUTTER_GTK_REQUIRED=1.1.2
 CLUTTER_GST_REQUIRED=1.5.2
 
 TELEPATHY_GLIB_REQUIRED=0.18.0

diff --git a/src/empathy-call-window.c b/src/empathy-call-window.c
index 083bdb1751fffbcfd92082d6c93942cffe87a268..191a238335726ea332008f18c5d30a54aa550591 100644 (file)
--- a/src/empathy-call-window.c
+++ b/src/empathy-call-window.c
@@ -1710,6 +1710,7 @@ empathy_call_window_init (EmpathyCallWindow *self)
   create_video_input (self);
 
   priv->floating_toolbar = gtk_clutter_actor_new ();
+  clutter_actor_set_reactive (priv->floating_toolbar, TRUE);
   make_background_transparent (GTK_CLUTTER_ACTOR (priv->floating_toolbar));
 
   gtk_widget_reparent (priv->bottom_toolbar,

diff --git a/src/empathy-call.c b/src/empathy-call.c
index 207f32f2585d6df352b7bc1f19ed743fb5e6c73c..2188d37261c017209da7729f333cde83f228cb89 100644 (file)
--- a/src/empathy-call.c
+++ b/src/empathy-call.c
@@ -195,9 +195,6 @@ main (int argc,
   XInitThreads ();
 #endif
 
-  /* Clutter needs this */
-  gdk_disable_multidevice ();
-
   optcontext = g_option_context_new (N_("- Empathy Audio/Video Client"));
   g_option_context_add_group (optcontext, gst_init_get_option_group ());
   g_option_context_add_group (optcontext, gtk_get_option_group (TRUE));