Merge lp:~dobey/libubuntuone/merge-to-stable-3-0 into lp:libubuntuone/stable-3-0

[dobey]

[Martin Pitt]

    Fix usage of deprecated glib symbols.

[Rodney Dawes]

    Disable errors on deprecated declarations for newer glib/gtk+ versions.

[Gabor Kelemen]

    Include correct header to make i18n work.

[Natalia Bidart (nataliabidart)]

Looks good.

review: Approve

=== modified file 'configure.ac'
--- configure.ac	2011-12-01 19:19:07 +0000
+++ configure.ac	2011-12-20 23:51:25 +0000
@@ -32,7 +32,7 @@
 AC_PATH_PROG(GLIB_GENMARSHAL, glib-genmarshal)
 
 dnl Look for needed modules
-PKG_CHECK_MODULES(LIBUBUNTUONE, gdk-pixbuf-2.0 webkit-1.0 >= 1.1.15 libxml-2.0 libsoup-2.4 >= 2.33.1 libsoup-gnome-2.4 libsyncdaemon-1.0 >= 1.4.2 gstreamer-0.10 gstreamer-pbutils-0.10)
+PKG_CHECK_MODULES(LIBUBUNTUONE, glib-2.0 >= 2.24 gdk-pixbuf-2.0 webkit-1.0 >= 1.1.15 libxml-2.0 libsoup-2.4 >= 2.33.1 libsoup-gnome-2.4 libsyncdaemon-1.0 >= 1.4.2 gstreamer-0.10 gstreamer-pbutils-0.10)
 AC_SUBST(LIBUBUNTUONE_CFLAGS)
 AC_SUBST(LIBUBUNTUONE_LIBS)
 
@@ -59,7 +59,7 @@
    enable_debug=$enableval,
    enable_debug=$debugging)
 if test "x$enable_debug" != "xno"; then
-   CFLAGS="${CFLAGS} -Wno-strict-prototypes -Wall -Werror"
+   CFLAGS="${CFLAGS} -Wno-strict-prototypes -Wall -Werror -Wno-error=deprecated-declarations"
    AC_SUBST(CFLAGS)
 fi
 

=== modified file 'libubuntuone/u1-codec-installer.c'
--- libubuntuone/u1-codec-installer.c	2011-04-01 17:19:03 +0000
+++ libubuntuone/u1-codec-installer.c	2011-12-20 23:51:25 +0000
@@ -39,6 +39,12 @@
 	"unless the seller has received a license by Fraunhofer IIS " \
 	"and Thomson and paid the relevant royalties to them."
 
+/* glib < 2.30 still uses the deprecated g_format_size_for_display(), provide
+ * compatibility shim */
+#if (!GLIB_CHECK_VERSION(2, 30, 0))
+    #define g_format_size g_format_size_for_display
+#endif
+
 G_DEFINE_TYPE (U1CodecInstaller, u1_codec_installer, G_TYPE_OBJECT)
 
 struct _U1CodecInstallerPrivate {
@@ -235,10 +241,10 @@
 			gchar *message;
 			gchar *bd, *bt;
 
-			bd = g_format_size_for_display (bytes_done);
-			bt = g_format_size_for_display (bytes_total);
+			bd = g_format_size (bytes_done);
+			bt = g_format_size (bytes_total);
 			if (speed != 0) {
-				gchar *ks = g_format_size_for_display (speed);
+				gchar *ks = g_format_size (speed);
 
 				message = g_strdup_printf (_("Downloaded %sB of %sB at %sB/s"), bd, bt, ks);
 				g_free (ks);

=== modified file 'libubuntuone/u1-music-store.c'
--- libubuntuone/u1-music-store.c	2011-10-17 14:33:03 +0000
+++ libubuntuone/u1-music-store.c	2011-12-20 23:51:25 +0000
@@ -22,7 +22,7 @@
 #include "config.h"
 #include <string.h>
 #include <libxml/HTMLparser.h>
-#include <glib/gi18n.h>
+#include <glib/gi18n-lib.h>
 #include <gst/gst.h>
 #include <gst/pbutils/pbutils.h>
 #include <webkit/webkit.h>
@@ -1237,8 +1237,7 @@
 	SoupSession *session;
 	GtkWidget *alert_icon;
 
-	if (!g_thread_get_initialized ())
-		g_thread_init (NULL);
+        g_type_init();
 
 	gst_init (NULL, NULL);
 

=== modified file 'tests/test-music-store.c'
--- tests/test-music-store.c	2010-07-09 14:19:48 +0000
+++ tests/test-music-store.c	2011-12-20 23:51:25 +0000
@@ -55,7 +55,7 @@
 	GtkWidget *window, *music_store;
 
 	gtk_init (&argc, &argv);
-	g_thread_init (NULL);
+	g_type_init ();
 
 	/* Create the main window */
 	window = gtk_window_new (GTK_WINDOW_TOPLEVEL);