From 9238d69859b4d56477a898ea966c54d3f388a289 Mon Sep 17 00:00:00 2001 From: Guillaume Desmottes Date: Mon, 14 May 2012 13:30:33 +0200 Subject: prepare 3.4.2 --- NEWS | 14 ++++++++++++++ configure.ac | 4 ++-- 2 files changed, 16 insertions(+), 2 deletions(-) diff --git a/NEWS b/NEWS index caf311a07..c2983c407 100644 --- a/NEWS +++ b/NEWS @@ -1,3 +1,17 @@ +NEW in 3.4.2 (14/05/2012) +============ + +Dependencies: + • telepathy-glib ≥ 0.18.0 + +Bugs fixed: + - Fixed #674432, The buddy list window is very small by default + - Fixed #675767, IRC Edit Connection Parameters text alignment + +Translations: + - Updated an Translation (Daniel Martinez Cucalon) + - Updated sk Translation (Pavol Klačanský) + NEW in 3.4.1 (16/04/2012) ============ diff --git a/configure.ac b/configure.ac index 1c45c90fa..b6c8e1752 100644 --- a/configure.ac +++ b/configure.ac @@ -1,9 +1,9 @@ dnl If not 1, append datestamp to the version number -m4_define(empathy_released, 0) +m4_define(empathy_released, 1) m4_define([empathy_major_version], [3]) m4_define([empathy_minor_version], [4]) -m4_define([empathy_micro_version], [1]) +m4_define([empathy_micro_version], [2]) m4_define([empathy_nano_version], [0]) dnl Display the nano_version only if it's not '0' -- cgit v1.2.3 From 90bea18ba8c6b585f483aa902d66d08972d982dd Mon Sep 17 00:00:00 2001 From: Guillaume Desmottes Date: Mon, 14 May 2012 13:40:08 +0200 Subject: remove released flag --- configure.ac | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configure.ac b/configure.ac index b6c8e1752..dc1e3f17c 100644 --- a/configure.ac +++ b/configure.ac @@ -1,5 +1,5 @@ dnl If not 1, append datestamp to the version number -m4_define(empathy_released, 1) +m4_define(empathy_released, 0) m4_define([empathy_major_version], [3]) m4_define([empathy_minor_version], [4]) -- cgit v1.2.3 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 --- configure.ac | 2 +- src/empathy-call-window.c | 1 + src/empathy-call.c | 3 --- 3 files changed, 2 insertions(+), 4 deletions(-) diff --git a/configure.ac b/configure.ac index dc1e3f17c..b061db4a1 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.18.0 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 87524d43add5732091025b0f76661c09a06bb116 Mon Sep 17 00:00:00 2001 From: Guillaume Desmottes Date: Mon, 21 May 2012 10:47:00 +0200 Subject: configure.ac: set cheese version in CHEESE_GTK_REQUIRED https://bugzilla.gnome.org/show_bug.cgi?id=674553 --- configure.ac | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/configure.ac b/configure.ac index b061db4a1..9a8b0f45d 100644 --- a/configure.ac +++ b/configure.ac @@ -73,6 +73,7 @@ ISO_CODES_REQUIRED=0.35 NAUTILUS_SENDTO_REQUIRED=2.90.0 NETWORK_MANAGER_REQUIRED=0.7.0 CHAMPLAIN_REQUIRED=0.12.1 +CHEESE_GTK_REQUIRED=2.91.91.1 # Use --enable-maintainer-mode to disable deprecated symbols, # disable single include and enable GSEAL. If this is not a released empathy, @@ -579,7 +580,7 @@ AC_ARG_WITH([cheese], with_cheese=auto) if test x"$with_cheese" != x"no" ; then - PKG_CHECK_MODULES(CHEESE, gstreamer-0.10 cheese-gtk >= 2.91.91.1, [have_cheese=yes], [have_cheese=no]) + PKG_CHECK_MODULES(CHEESE, gstreamer-0.10 cheese-gtk >= CHEESE_GTK_REQUIRED, [have_cheese=yes], [have_cheese=no]) if test x${have_cheese} = xyes; then AC_DEFINE(HAVE_CHEESE, 1, [Define to 1 to enable cheese webcam support]) fi -- 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 --- configure.ac | 2 +- src/Makefile.am | 5 +++++ src/empathy-accounts.c | 11 +++++++++++ 3 files changed, 17 insertions(+), 1 deletion(-) diff --git a/configure.ac b/configure.ac index 9a8b0f45d..eebe69790 100644 --- a/configure.ac +++ b/configure.ac @@ -73,7 +73,7 @@ ISO_CODES_REQUIRED=0.35 NAUTILUS_SENDTO_REQUIRED=2.90.0 NETWORK_MANAGER_REQUIRED=0.7.0 CHAMPLAIN_REQUIRED=0.12.1 -CHEESE_GTK_REQUIRED=2.91.91.1 +CHEESE_GTK_REQUIRED=3.4.0 # Use --enable-maintainer-mode to disable deprecated symbols, # disable single include and enable GSEAL. If this is not a released empathy, 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