aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSjoerd Simons <sjoerd@luon.net>2012-05-20 02:30:57 +0800
committerSjoerd Simons <sjoerd@luon.net>2012-05-20 02:32:18 +0800
commitfc44b9eab9ca84ff24e7129ee29463d005f6b304 (patch)
tree4598182513e22e91f34435fb705b8b9163f905af
parent17f2b276376f3de95d90f988d54e815e13b19be1 (diff)
downloadgsoc2013-empathy-fc44b9eab9ca84ff24e7129ee29463d005f6b304.tar
gsoc2013-empathy-fc44b9eab9ca84ff24e7129ee29463d005f6b304.tar.gz
gsoc2013-empathy-fc44b9eab9ca84ff24e7129ee29463d005f6b304.tar.bz2
gsoc2013-empathy-fc44b9eab9ca84ff24e7129ee29463d005f6b304.tar.lz
gsoc2013-empathy-fc44b9eab9ca84ff24e7129ee29463d005f6b304.tar.xz
gsoc2013-empathy-fc44b9eab9ca84ff24e7129ee29463d005f6b304.tar.zst
gsoc2013-empathy-fc44b9eab9ca84ff24e7129ee29463d005f6b304.zip
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
-rw-r--r--configure.ac2
-rw-r--r--src/empathy-call-window.c1
-rw-r--r--src/empathy-call.c3
3 files changed, 2 insertions, 4 deletions
diff --git a/configure.ac b/configure.ac
index 043fd80ca..5d6905e38 100644
--- 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.19.0
diff --git a/src/empathy-call-window.c b/src/empathy-call-window.c
index 62ed406c8..1081efa0d 100644
--- 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 e19b1d05f..9d7a2b355 100644
--- a/src/empathy-call.c
+++ b/src/empathy-call.c
@@ -192,9 +192,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));