Merge branch 'gnome-3-8'

Conflicts:
	src/empathy.c

diff --git a/NEWS b/NEWS
index 89f237c2704f0b3bc989b06e14ef6447362afc86..5eae4d0d0d44522788a6a7a24aa2f3e5f12db5a9 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,21 @@
+NEW in 3.8.1 (15/04/2013)
+============
+Bugs fixed:
+ - Fixed #696544, goa-mc-plugin: Fix deprecation warnings (Emanuele Aina)
+ - Fixed #696718, Cleanup unused and redundant #include directives (Emanuele Aina)
+ - Fixed #697076, Cleanup #includes, second round (Emanuele Aina)
+ - Fixed #697254, Launching Empathy -p opens both the preferences and the main window (Marco Trevisan (Treviño))
+
+Translations:
+ - Updated crh Translation (Reşat SABIQ)
+ - Updated en_GB Translation (Bruce Cowan)
+ - Updated fi Translation (Ville-Pekka Vainio)
+ - Updated kn Translation (Shankar Prasad)
+ - Updated uk Translation (Daniel Korostil)
+
+Documentation translations:
+ - Updated de Documentation translation (Christian Kirbach)
+
 NEW in 3.8.0 (25/03/2013)
 ============
 Bugs fixed:

diff --git a/configure.ac b/configure.ac
index 919fb3e81ad058efed5c36beb6a6650abbe2cffc..d4c07d0d087a7ffdea6e7acee68915185b1367f5 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -3,7 +3,7 @@ m4_define(empathy_released, 0)
 
 m4_define([empathy_major_version], [3])
 m4_define([empathy_minor_version], [8])
-m4_define([empathy_micro_version], [0])
+m4_define([empathy_micro_version], [1])
 m4_define([empathy_nano_version], [0])
 
 dnl Display the nano_version only if it's not '0'

diff --git a/libempathy/empathy-utils.c b/libempathy/empathy-utils.c
index 55769ca40a9d7210f7413c585eadb524b2fd2258..0efe3a1807ebd959cbea8353fa7e38402a098ad7 100644 (file)
--- a/libempathy/empathy-utils.c
+++ b/libempathy/empathy-utils.c
@@ -37,6 +37,8 @@
 #include "empathy-presence-manager.h"
 #include "extensions.h"
 
+#include <math.h>
+
 #define DEBUG_FLAG EMPATHY_DEBUG_OTHER
 #include "empathy-debug.h"