From 001e077b3575d2525bb7354d78e0e25837db73e7 Mon Sep 17 00:00:00 2001 From: Sjoerd Simons Date: Sat, 19 May 2012 20:30:57 +0200 Subject: 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 --- src/empathy-call-window.c | 1 + src/empathy-call.c | 3 --- 2 files changed, 1 insertion(+), 3 deletions(-) (limited to 'src') diff --git a/src/empathy-call-window.c b/src/empathy-call-window.c index 083bdb175..191a23833 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 207f32f25..2188d3726 100644 --- 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)); -- cgit v1.2.3 From 2b263049bd152504227c9ade7e7b6e17cbc95f11 Mon Sep 17 00:00:00 2001 From: Guillaume Desmottes Date: Mon, 21 May 2012 10:55:46 +0200 Subject: empathy-accounts: init cheese-gtk if needed The avatar chooser, which is not used by empathy-accounts, may use Cheese to take a photo. cheese_gtk_init() has been added during the 3.4 cycle so I bumped the dep to 3.4.0 as that's the version I have tested it with it. It's an optionnal dep anyway so... https://bugzilla.gnome.org/show_bug.cgi?id=674553 --- src/Makefile.am | 5 +++++ src/empathy-accounts.c | 11 +++++++++++ 2 files changed, 16 insertions(+) (limited to 'src') diff --git a/src/Makefile.am b/src/Makefile.am index dfde20558..dc85dd9ca 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -59,6 +59,11 @@ empathy_accounts_SOURCES = \ empathy-accounts.c empathy-accounts.h \ $(NULL) +empathy_accounts_CPPFLAGS = \ + $(AM_CPPFLAGS) \ + $(CHEESE_CFLAGS) \ + $(NULL) + empathy_accounts_LDADD = \ $(LDADD) \ libempathy-accounts-common.la \ diff --git a/src/empathy-accounts.c b/src/empathy-accounts.c index 6b51820f7..efb98e9b3 100644 --- a/src/empathy-accounts.c +++ b/src/empathy-accounts.c @@ -32,6 +32,10 @@ #include #include +#ifdef HAVE_CHEESE +#include +#endif + #include #include #include @@ -223,6 +227,13 @@ main (int argc, char *argv[]) gint retval; g_thread_init (NULL); + g_type_init (); + +#ifdef HAVE_CHEESE + /* Used by the avatar chooser */ + g_return_val_if_fail (cheese_gtk_init (&argc, &argv), 1); +#endif + empathy_init (); gtk_init (&argc, &argv); -- cgit v1.2.3