Merge lp:~dobey/ubuntu/natty/libubuntuone/release-0-9-2 into lp:ubuntu/natty/libubuntuone

[dobey]

[Didier Roche-Tolomelli (didrocks)]

The branch looks good, and works, approved :)

review: Approve

=== modified file 'aclocal.m4'
--- aclocal.m4	2011-02-11 21:56:37 +0000
+++ aclocal.m4	2011-04-07 16:11:09 +0000
@@ -514,6 +514,200 @@
   AM_CONDITIONAL([GTK_DOC_USE_REBASE], [test -n "$GTKDOC_REBASE"])
 ])
 
+
+dnl IT_PROG_INTLTOOL([MINIMUM-VERSION], [no-xml])
+# serial 40 IT_PROG_INTLTOOL
+AC_DEFUN([IT_PROG_INTLTOOL], [
+AC_PREREQ([2.50])dnl
+AC_REQUIRE([AM_NLS])dnl
+
+case "$am__api_version" in
+    1.[01234])
+	AC_MSG_ERROR([Automake 1.5 or newer is required to use intltool])
+    ;;
+    *)
+    ;;
+esac
+
+if test -n "$1"; then
+    AC_MSG_CHECKING([for intltool >= $1])
+
+    INTLTOOL_REQUIRED_VERSION_AS_INT=`echo $1 | awk -F. '{ print $ 1 * 1000 + $ 2 * 100 + $ 3; }'`
+    INTLTOOL_APPLIED_VERSION=`intltool-update --version | head -1 | cut -d" " -f3`
+    [INTLTOOL_APPLIED_VERSION_AS_INT=`echo $INTLTOOL_APPLIED_VERSION | awk -F. '{ print $ 1 * 1000 + $ 2 * 100 + $ 3; }'`
+    ]
+    AC_MSG_RESULT([$INTLTOOL_APPLIED_VERSION found])
+    test "$INTLTOOL_APPLIED_VERSION_AS_INT" -ge "$INTLTOOL_REQUIRED_VERSION_AS_INT" ||
+	AC_MSG_ERROR([Your intltool is too old.  You need intltool $1 or later.])
+fi
+
+AC_PATH_PROG(INTLTOOL_UPDATE, [intltool-update])
+AC_PATH_PROG(INTLTOOL_MERGE, [intltool-merge])
+AC_PATH_PROG(INTLTOOL_EXTRACT, [intltool-extract])
+if test -z "$INTLTOOL_UPDATE" -o -z "$INTLTOOL_MERGE" -o -z "$INTLTOOL_EXTRACT"; then
+    AC_MSG_ERROR([The intltool scripts were not found. Please install intltool.])
+fi
+
+  INTLTOOL_DESKTOP_RULE='%.desktop:   %.desktop.in   $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' 
+INTLTOOL_DIRECTORY_RULE='%.directory: %.directory.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' 
+     INTLTOOL_KEYS_RULE='%.keys:      %.keys.in      $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -k -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' 
+     INTLTOOL_PROP_RULE='%.prop:      %.prop.in      $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' 
+      INTLTOOL_OAF_RULE='%.oaf:       %.oaf.in       $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -o -p $(top_srcdir)/po $< [$]@'
+     INTLTOOL_PONG_RULE='%.pong:      %.pong.in      $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' 
+   INTLTOOL_SERVER_RULE='%.server:    %.server.in    $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -o -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' 
+    INTLTOOL_SHEET_RULE='%.sheet:     %.sheet.in     $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' 
+INTLTOOL_SOUNDLIST_RULE='%.soundlist: %.soundlist.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' 
+       INTLTOOL_UI_RULE='%.ui:        %.ui.in        $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' 
+      INTLTOOL_XML_RULE='%.xml:       %.xml.in       $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' 
+      INTLTOOL_XML_NOMERGE_RULE='%.xml:       %.xml.in       $(INTLTOOL_MERGE) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u /tmp $< [$]@' 
+      INTLTOOL_XAM_RULE='%.xam:       %.xml.in       $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' 
+      INTLTOOL_KBD_RULE='%.kbd:       %.kbd.in       $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u -m -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' 
+    INTLTOOL_CAVES_RULE='%.caves:     %.caves.in     $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' 
+  INTLTOOL_SCHEMAS_RULE='%.schemas:   %.schemas.in   $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -s -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' 
+    INTLTOOL_THEME_RULE='%.theme:     %.theme.in     $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' 
+    INTLTOOL_SERVICE_RULE='%.service: %.service.in   $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@'
+   INTLTOOL_POLICY_RULE='%.policy:    %.policy.in    $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@'
+
+_IT_SUBST(INTLTOOL_DESKTOP_RULE)
+_IT_SUBST(INTLTOOL_DIRECTORY_RULE)
+_IT_SUBST(INTLTOOL_KEYS_RULE)
+_IT_SUBST(INTLTOOL_PROP_RULE)
+_IT_SUBST(INTLTOOL_OAF_RULE)
+_IT_SUBST(INTLTOOL_PONG_RULE)
+_IT_SUBST(INTLTOOL_SERVER_RULE)
+_IT_SUBST(INTLTOOL_SHEET_RULE)
+_IT_SUBST(INTLTOOL_SOUNDLIST_RULE)
+_IT_SUBST(INTLTOOL_UI_RULE)
+_IT_SUBST(INTLTOOL_XAM_RULE)
+_IT_SUBST(INTLTOOL_KBD_RULE)
+_IT_SUBST(INTLTOOL_XML_RULE)
+_IT_SUBST(INTLTOOL_XML_NOMERGE_RULE)
+_IT_SUBST(INTLTOOL_CAVES_RULE)
+_IT_SUBST(INTLTOOL_SCHEMAS_RULE)
+_IT_SUBST(INTLTOOL_THEME_RULE)
+_IT_SUBST(INTLTOOL_SERVICE_RULE)
+_IT_SUBST(INTLTOOL_POLICY_RULE)
+
+# Check the gettext tools to make sure they are GNU
+AC_PATH_PROG(XGETTEXT, xgettext)
+AC_PATH_PROG(MSGMERGE, msgmerge)
+AC_PATH_PROG(MSGFMT, msgfmt)
+AC_PATH_PROG(GMSGFMT, gmsgfmt, $MSGFMT)
+if test -z "$XGETTEXT" -o -z "$MSGMERGE" -o -z "$MSGFMT"; then
+    AC_MSG_ERROR([GNU gettext tools not found; required for intltool])
+fi
+xgversion="`$XGETTEXT --version|grep '(GNU ' 2> /dev/null`"
+mmversion="`$MSGMERGE --version|grep '(GNU ' 2> /dev/null`"
+mfversion="`$MSGFMT --version|grep '(GNU ' 2> /dev/null`"
+if test -z "$xgversion" -o -z "$mmversion" -o -z "$mfversion"; then
+    AC_MSG_ERROR([GNU gettext tools not found; required for intltool])
+fi
+
+AC_PATH_PROG(INTLTOOL_PERL, perl)
+if test -z "$INTLTOOL_PERL"; then
+   AC_MSG_ERROR([perl not found])
+fi
+AC_MSG_CHECKING([for perl >= 5.8.1])
+$INTLTOOL_PERL -e "use 5.8.1;" > /dev/null 2>&1
+if test $? -ne 0; then
+   AC_MSG_ERROR([perl 5.8.1 is required for intltool])
+else
+   IT_PERL_VERSION="`$INTLTOOL_PERL -e \"printf '%vd', $^V\"`"
+   AC_MSG_RESULT([$IT_PERL_VERSION])
+fi
+if test "x$2" != "xno-xml"; then
+   AC_MSG_CHECKING([for XML::Parser])
+   if `$INTLTOOL_PERL -e "require XML::Parser" 2>/dev/null`; then
+       AC_MSG_RESULT([ok])
+   else
+       AC_MSG_ERROR([XML::Parser perl module is required for intltool])
+   fi
+fi
+
+# Substitute ALL_LINGUAS so we can use it in po/Makefile
+AC_SUBST(ALL_LINGUAS)
+
+# Set DATADIRNAME correctly if it is not set yet
+# (copied from glib-gettext.m4)
+if test -z "$DATADIRNAME"; then
+  AC_LINK_IFELSE(
+    [AC_LANG_PROGRAM([[]],
+                     [[extern int _nl_msg_cat_cntr;
+                       return _nl_msg_cat_cntr]])],
+    [DATADIRNAME=share],
+    [case $host in
+    *-*-solaris*)
+    dnl On Solaris, if bind_textdomain_codeset is in libc,
+    dnl GNU format message catalog is always supported,
+    dnl since both are added to the libc all together.
+    dnl Hence, we'd like to go with DATADIRNAME=share
+    dnl in this case.
+    AC_CHECK_FUNC(bind_textdomain_codeset,
+      [DATADIRNAME=share], [DATADIRNAME=lib])
+    ;;
+    *)
+    [DATADIRNAME=lib]
+    ;;
+    esac])
+fi
+AC_SUBST(DATADIRNAME)
+
+IT_PO_SUBDIR([po])
+
+])
+
+
+# IT_PO_SUBDIR(DIRNAME)
+# ---------------------
+# All po subdirs have to be declared with this macro; the subdir "po" is
+# declared by IT_PROG_INTLTOOL.
+#
+AC_DEFUN([IT_PO_SUBDIR],
+[AC_PREREQ([2.53])dnl We use ac_top_srcdir inside AC_CONFIG_COMMANDS.
+dnl
+dnl The following CONFIG_COMMANDS should be executed at the very end
+dnl of config.status.
+AC_CONFIG_COMMANDS_PRE([
+  AC_CONFIG_COMMANDS([$1/stamp-it], [
+    if [ ! grep "^# INTLTOOL_MAKEFILE$" "$1/Makefile.in" > /dev/null ]; then
+       AC_MSG_ERROR([$1/Makefile.in.in was not created by intltoolize.])
+    fi
+    rm -f "$1/stamp-it" "$1/stamp-it.tmp" "$1/POTFILES" "$1/Makefile.tmp"
+    >"$1/stamp-it.tmp"
+    [sed '/^#/d
+	 s/^[[].*] *//
+	 /^[ 	]*$/d
+	'"s|^|	$ac_top_srcdir/|" \
+      "$srcdir/$1/POTFILES.in" | sed '$!s/$/ \\/' >"$1/POTFILES"
+    ]
+    [sed '/^POTFILES =/,/[^\\]$/ {
+		/^POTFILES =/!d
+		r $1/POTFILES
+	  }
+	 ' "$1/Makefile.in" >"$1/Makefile"]
+    rm -f "$1/Makefile.tmp"
+    mv "$1/stamp-it.tmp" "$1/stamp-it"
+  ])
+])dnl
+])
+
+# _IT_SUBST(VARIABLE)
+# -------------------
+# Abstract macro to do either _AM_SUBST_NOTMAKE or AC_SUBST
+#
+AC_DEFUN([_IT_SUBST],
+[
+AC_SUBST([$1])
+m4_ifdef([_AM_SUBST_NOTMAKE], [_AM_SUBST_NOTMAKE([$1])])
+]
+)
+
+# deprecated macros
+AU_ALIAS([AC_PROG_INTLTOOL], [IT_PROG_INTLTOOL])
+# A hint is needed for aclocal from Automake <= 1.9.4:
+# AC_DEFUN([AC_PROG_INTLTOOL], ...)
+
+
 dnl -*- mode: autoconf -*-
 dnl Copyright 2009 Johan Dahlin
 dnl
@@ -9957,197 +10151,3 @@
 AC_SUBST([am__untar])
 ]) # _AM_PROG_TAR
 
-
-dnl IT_PROG_INTLTOOL([MINIMUM-VERSION], [no-xml])
-# serial 40 IT_PROG_INTLTOOL
-AC_DEFUN([IT_PROG_INTLTOOL], [
-AC_PREREQ([2.50])dnl
-AC_REQUIRE([AM_NLS])dnl
-
-case "$am__api_version" in
-    1.[01234])
-	AC_MSG_ERROR([Automake 1.5 or newer is required to use intltool])
-    ;;
-    *)
-    ;;
-esac
-
-if test -n "$1"; then
-    AC_MSG_CHECKING([for intltool >= $1])
-
-    INTLTOOL_REQUIRED_VERSION_AS_INT=`echo $1 | awk -F. '{ print $ 1 * 1000 + $ 2 * 100 + $ 3; }'`
-    INTLTOOL_APPLIED_VERSION=`intltool-update --version | head -1 | cut -d" " -f3`
-    [INTLTOOL_APPLIED_VERSION_AS_INT=`echo $INTLTOOL_APPLIED_VERSION | awk -F. '{ print $ 1 * 1000 + $ 2 * 100 + $ 3; }'`
-    ]
-    AC_MSG_RESULT([$INTLTOOL_APPLIED_VERSION found])
-    test "$INTLTOOL_APPLIED_VERSION_AS_INT" -ge "$INTLTOOL_REQUIRED_VERSION_AS_INT" ||
-	AC_MSG_ERROR([Your intltool is too old.  You need intltool $1 or later.])
-fi
-
-AC_PATH_PROG(INTLTOOL_UPDATE, [intltool-update])
-AC_PATH_PROG(INTLTOOL_MERGE, [intltool-merge])
-AC_PATH_PROG(INTLTOOL_EXTRACT, [intltool-extract])
-if test -z "$INTLTOOL_UPDATE" -o -z "$INTLTOOL_MERGE" -o -z "$INTLTOOL_EXTRACT"; then
-    AC_MSG_ERROR([The intltool scripts were not found. Please install intltool.])
-fi
-
-  INTLTOOL_DESKTOP_RULE='%.desktop:   %.desktop.in   $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' 
-INTLTOOL_DIRECTORY_RULE='%.directory: %.directory.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' 
-     INTLTOOL_KEYS_RULE='%.keys:      %.keys.in      $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -k -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' 
-     INTLTOOL_PROP_RULE='%.prop:      %.prop.in      $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' 
-      INTLTOOL_OAF_RULE='%.oaf:       %.oaf.in       $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -o -p $(top_srcdir)/po $< [$]@'
-     INTLTOOL_PONG_RULE='%.pong:      %.pong.in      $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' 
-   INTLTOOL_SERVER_RULE='%.server:    %.server.in    $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -o -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' 
-    INTLTOOL_SHEET_RULE='%.sheet:     %.sheet.in     $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' 
-INTLTOOL_SOUNDLIST_RULE='%.soundlist: %.soundlist.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' 
-       INTLTOOL_UI_RULE='%.ui:        %.ui.in        $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' 
-      INTLTOOL_XML_RULE='%.xml:       %.xml.in       $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' 
-      INTLTOOL_XML_NOMERGE_RULE='%.xml:       %.xml.in       $(INTLTOOL_MERGE) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u /tmp $< [$]@' 
-      INTLTOOL_XAM_RULE='%.xam:       %.xml.in       $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' 
-      INTLTOOL_KBD_RULE='%.kbd:       %.kbd.in       $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u -m -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' 
-    INTLTOOL_CAVES_RULE='%.caves:     %.caves.in     $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' 
-  INTLTOOL_SCHEMAS_RULE='%.schemas:   %.schemas.in   $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -s -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' 
-    INTLTOOL_THEME_RULE='%.theme:     %.theme.in     $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' 
-    INTLTOOL_SERVICE_RULE='%.service: %.service.in   $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@'
-   INTLTOOL_POLICY_RULE='%.policy:    %.policy.in    $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@'
-
-_IT_SUBST(INTLTOOL_DESKTOP_RULE)
-_IT_SUBST(INTLTOOL_DIRECTORY_RULE)
-_IT_SUBST(INTLTOOL_KEYS_RULE)
-_IT_SUBST(INTLTOOL_PROP_RULE)
-_IT_SUBST(INTLTOOL_OAF_RULE)
-_IT_SUBST(INTLTOOL_PONG_RULE)
-_IT_SUBST(INTLTOOL_SERVER_RULE)
-_IT_SUBST(INTLTOOL_SHEET_RULE)
-_IT_SUBST(INTLTOOL_SOUNDLIST_RULE)
-_IT_SUBST(INTLTOOL_UI_RULE)
-_IT_SUBST(INTLTOOL_XAM_RULE)
-_IT_SUBST(INTLTOOL_KBD_RULE)
-_IT_SUBST(INTLTOOL_XML_RULE)
-_IT_SUBST(INTLTOOL_XML_NOMERGE_RULE)
-_IT_SUBST(INTLTOOL_CAVES_RULE)
-_IT_SUBST(INTLTOOL_SCHEMAS_RULE)
-_IT_SUBST(INTLTOOL_THEME_RULE)
-_IT_SUBST(INTLTOOL_SERVICE_RULE)
-_IT_SUBST(INTLTOOL_POLICY_RULE)
-
-# Check the gettext tools to make sure they are GNU
-AC_PATH_PROG(XGETTEXT, xgettext)
-AC_PATH_PROG(MSGMERGE, msgmerge)
-AC_PATH_PROG(MSGFMT, msgfmt)
-AC_PATH_PROG(GMSGFMT, gmsgfmt, $MSGFMT)
-if test -z "$XGETTEXT" -o -z "$MSGMERGE" -o -z "$MSGFMT"; then
-    AC_MSG_ERROR([GNU gettext tools not found; required for intltool])
-fi
-xgversion="`$XGETTEXT --version|grep '(GNU ' 2> /dev/null`"
-mmversion="`$MSGMERGE --version|grep '(GNU ' 2> /dev/null`"
-mfversion="`$MSGFMT --version|grep '(GNU ' 2> /dev/null`"
-if test -z "$xgversion" -o -z "$mmversion" -o -z "$mfversion"; then
-    AC_MSG_ERROR([GNU gettext tools not found; required for intltool])
-fi
-
-AC_PATH_PROG(INTLTOOL_PERL, perl)
-if test -z "$INTLTOOL_PERL"; then
-   AC_MSG_ERROR([perl not found])
-fi
-AC_MSG_CHECKING([for perl >= 5.8.1])
-$INTLTOOL_PERL -e "use 5.8.1;" > /dev/null 2>&1
-if test $? -ne 0; then
-   AC_MSG_ERROR([perl 5.8.1 is required for intltool])
-else
-   IT_PERL_VERSION="`$INTLTOOL_PERL -e \"printf '%vd', $^V\"`"
-   AC_MSG_RESULT([$IT_PERL_VERSION])
-fi
-if test "x$2" != "xno-xml"; then
-   AC_MSG_CHECKING([for XML::Parser])
-   if `$INTLTOOL_PERL -e "require XML::Parser" 2>/dev/null`; then
-       AC_MSG_RESULT([ok])
-   else
-       AC_MSG_ERROR([XML::Parser perl module is required for intltool])
-   fi
-fi
-
-# Substitute ALL_LINGUAS so we can use it in po/Makefile
-AC_SUBST(ALL_LINGUAS)
-
-# Set DATADIRNAME correctly if it is not set yet
-# (copied from glib-gettext.m4)
-if test -z "$DATADIRNAME"; then
-  AC_LINK_IFELSE(
-    [AC_LANG_PROGRAM([[]],
-                     [[extern int _nl_msg_cat_cntr;
-                       return _nl_msg_cat_cntr]])],
-    [DATADIRNAME=share],
-    [case $host in
-    *-*-solaris*)
-    dnl On Solaris, if bind_textdomain_codeset is in libc,
-    dnl GNU format message catalog is always supported,
-    dnl since both are added to the libc all together.
-    dnl Hence, we'd like to go with DATADIRNAME=share
-    dnl in this case.
-    AC_CHECK_FUNC(bind_textdomain_codeset,
-      [DATADIRNAME=share], [DATADIRNAME=lib])
-    ;;
-    *)
-    [DATADIRNAME=lib]
-    ;;
-    esac])
-fi
-AC_SUBST(DATADIRNAME)
-
-IT_PO_SUBDIR([po])
-
-])
-
-
-# IT_PO_SUBDIR(DIRNAME)
-# ---------------------
-# All po subdirs have to be declared with this macro; the subdir "po" is
-# declared by IT_PROG_INTLTOOL.
-#
-AC_DEFUN([IT_PO_SUBDIR],
-[AC_PREREQ([2.53])dnl We use ac_top_srcdir inside AC_CONFIG_COMMANDS.
-dnl
-dnl The following CONFIG_COMMANDS should be exetuted at the very end
-dnl of config.status.
-AC_CONFIG_COMMANDS_PRE([
-  AC_CONFIG_COMMANDS([$1/stamp-it], [
-    if [ ! grep "^# INTLTOOL_MAKEFILE$" "$1/Makefile.in" > /dev/null ]; then
-       AC_MSG_ERROR([$1/Makefile.in.in was not created by intltoolize.])
-    fi
-    rm -f "$1/stamp-it" "$1/stamp-it.tmp" "$1/POTFILES" "$1/Makefile.tmp"
-    >"$1/stamp-it.tmp"
-    [sed '/^#/d
-	 s/^[[].*] *//
-	 /^[ 	]*$/d
-	'"s|^|	$ac_top_srcdir/|" \
-      "$srcdir/$1/POTFILES.in" | sed '$!s/$/ \\/' >"$1/POTFILES"
-    ]
-    [sed '/^POTFILES =/,/[^\\]$/ {
-		/^POTFILES =/!d
-		r $1/POTFILES
-	  }
-	 ' "$1/Makefile.in" >"$1/Makefile"]
-    rm -f "$1/Makefile.tmp"
-    mv "$1/stamp-it.tmp" "$1/stamp-it"
-  ])
-])dnl
-])
-
-# _IT_SUBST(VARIABLE)
-# -------------------
-# Abstract macro to do either _AM_SUBST_NOTMAKE or AC_SUBST
-#
-AC_DEFUN([_IT_SUBST],
-[
-AC_SUBST([$1])
-m4_ifdef([_AM_SUBST_NOTMAKE], [_AM_SUBST_NOTMAKE([$1])])
-]
-)
-
-# deprecated macros
-AU_ALIAS([AC_PROG_INTLTOOL], [IT_PROG_INTLTOOL])
-# A hint is needed for aclocal from Automake <= 1.9.4:
-# AC_DEFUN([AC_PROG_INTLTOOL], ...)
-
-

=== modified file 'configure'
--- configure	2011-03-18 20:39:27 +0000
+++ configure	2011-04-07 16:11:09 +0000
@@ -1,6 +1,6 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.67 for libubuntuone 0.9.1.
+# Generated by GNU Autoconf 2.67 for libubuntuone 0.9.2.
 #
 #
 # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
@@ -698,8 +698,8 @@
 # Identity of this package.
 PACKAGE_NAME='libubuntuone'
 PACKAGE_TARNAME='libubuntuone'
-PACKAGE_VERSION='0.9.1'
-PACKAGE_STRING='libubuntuone 0.9.1'
+PACKAGE_VERSION='0.9.2'
+PACKAGE_STRING='libubuntuone 0.9.2'
 PACKAGE_BUGREPORT=''
 PACKAGE_URL=''
 
@@ -1535,7 +1535,7 @@
   # Omit some internal or obsolete options to make the list less imposing.
   # This message is too long to be a string in the A/UX 3.1 sh.
   cat <<_ACEOF
-\`configure' configures libubuntuone 0.9.1 to adapt to many kinds of systems.
+\`configure' configures libubuntuone 0.9.2 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1605,7 +1605,7 @@
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of libubuntuone 0.9.1:";;
+     short | recursive ) echo "Configuration of libubuntuone 0.9.2:";;
    esac
   cat <<\_ACEOF
 
@@ -1730,7 +1730,7 @@
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-libubuntuone configure 0.9.1
+libubuntuone configure 0.9.2
 generated by GNU Autoconf 2.67
 
 Copyright (C) 2010 Free Software Foundation, Inc.
@@ -2095,7 +2095,7 @@
 This file contains any messages produced by compilers while
 running configure, to aid debugging if configure makes a mistake.
 
-It was created by libubuntuone $as_me 0.9.1, which was
+It was created by libubuntuone $as_me 0.9.2, which was
 generated by GNU Autoconf 2.67.  Invocation command line was
 
   $ $0 $@
@@ -2918,7 +2918,7 @@
 
 # Define the identity of the package.
  PACKAGE='libubuntuone'
- VERSION='0.9.1'
+ VERSION='0.9.2'
 
 
 cat >>confdefs.h <<_ACEOF
@@ -12750,12 +12750,12 @@
     pkg_cv_LIBUBUNTUONE_CFLAGS="$LIBUBUNTUONE_CFLAGS"
  elif test -n "$PKG_CONFIG"; then
     if test -n "$PKG_CONFIG" && \
-    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"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\""; } >&5
-  ($PKG_CONFIG --exists --print-errors "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") 2>&5
+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"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\""; } >&5
+  ($PKG_CONFIG --exists --print-errors "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") 2>&5
   ac_status=$?
   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }; then
-  pkg_cv_LIBUBUNTUONE_CFLAGS=`$PKG_CONFIG --cflags "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" 2>/dev/null`
+  pkg_cv_LIBUBUNTUONE_CFLAGS=`$PKG_CONFIG --cflags "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" 2>/dev/null`
 else
   pkg_failed=yes
 fi
@@ -12766,12 +12766,12 @@
     pkg_cv_LIBUBUNTUONE_LIBS="$LIBUBUNTUONE_LIBS"
  elif test -n "$PKG_CONFIG"; then
     if test -n "$PKG_CONFIG" && \
-    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"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\""; } >&5
-  ($PKG_CONFIG --exists --print-errors "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") 2>&5
+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"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\""; } >&5
+  ($PKG_CONFIG --exists --print-errors "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") 2>&5
   ac_status=$?
   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }; then
-  pkg_cv_LIBUBUNTUONE_LIBS=`$PKG_CONFIG --libs "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" 2>/dev/null`
+  pkg_cv_LIBUBUNTUONE_LIBS=`$PKG_CONFIG --libs "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" 2>/dev/null`
 else
   pkg_failed=yes
 fi
@@ -12791,14 +12791,14 @@
         _pkg_short_errors_supported=no
 fi
         if test $_pkg_short_errors_supported = yes; then
-	        LIBUBUNTUONE_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "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" 2>&1`
+	        LIBUBUNTUONE_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "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" 2>&1`
         else
-	        LIBUBUNTUONE_PKG_ERRORS=`$PKG_CONFIG --print-errors "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" 2>&1`
+	        LIBUBUNTUONE_PKG_ERRORS=`$PKG_CONFIG --print-errors "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" 2>&1`
         fi
 	# Put the nasty error message in config.log where it belongs
 	echo "$LIBUBUNTUONE_PKG_ERRORS" >&5
 
-	as_fn_error $? "Package requirements (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) were not met:
+	as_fn_error $? "Package requirements (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) were not met:
 
 $LIBUBUNTUONE_PKG_ERRORS
 
@@ -14638,7 +14638,7 @@
 # report actual input values of CONFIG_FILES etc. instead of their
 # values after options handling.
 ac_log="
-This file was extended by libubuntuone $as_me 0.9.1, which was
+This file was extended by libubuntuone $as_me 0.9.2, which was
 generated by GNU Autoconf 2.67.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -14704,7 +14704,7 @@
 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
 ac_cs_version="\\
-libubuntuone config.status 0.9.1
+libubuntuone config.status 0.9.2
 configured by $0, generated by GNU Autoconf 2.67,
   with options \\"\$ac_cs_config\\"
 

=== modified file 'configure.ac'
--- configure.ac	2011-03-18 20:30:19 +0000
+++ configure.ac	2011-04-07 16:11:09 +0000
@@ -1,4 +1,4 @@
-AC_INIT([libubuntuone], [0.9.1], [], [libubuntuone])
+AC_INIT([libubuntuone], [0.9.2], [], [libubuntuone])
 
 AC_PREREQ([2.59])
 
@@ -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)
+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)
 AC_SUBST(LIBUBUNTUONE_CFLAGS)
 AC_SUBST(LIBUBUNTUONE_LIBS)
 

=== modified file 'data/Makefile.am'
--- data/Makefile.am	2010-08-26 01:19:30 +0000
+++ data/Makefile.am	2011-04-07 16:11:09 +0000
@@ -1,5 +1,6 @@
 jsdir = $(U1_JAVASCRIPT_DIR)
 nobase_js_DATA =			\
+	empty.mp3				\
 	u1-library-override.js	\
 	u1-preview.js	\
 	u1-songs-clickable.js	\

=== modified file 'data/Makefile.in'
--- data/Makefile.in	2011-01-14 22:24:48 +0000
+++ data/Makefile.in	2011-04-07 16:11:09 +0000
@@ -262,6 +262,7 @@
 top_srcdir = @top_srcdir@
 jsdir = $(U1_JAVASCRIPT_DIR)
 nobase_js_DATA = \
+	empty.mp3				\
 	u1-library-override.js	\
 	u1-preview.js	\
 	u1-songs-clickable.js	\

=== added file 'data/empty.mp3'
Binary files data/empty.mp3	1970-01-01 00:00:00 +0000 and data/empty.mp3	2011-04-07 16:11:09 +0000 differ
=== modified file 'debian/changelog'
--- debian/changelog	2011-03-18 20:39:27 +0000
+++ debian/changelog	2011-04-07 16:11:09 +0000
@@ -1,3 +1,12 @@
+libubuntuone (0.9.2-0ubuntu1) natty; urgency=low
+
+  * New upstream release.
+    - Distribution series hardcoded for codec installation (LP: #693536)
+    - [UIFE] Notify user of missing MP3 suupport (LP: #733327)
+    - Music purchased from U1MS not appear in music library (LP: #604699)
+
+ -- Rodney Dawes <[e-mail]>  Thu, 07 Apr 2011 11:33:11 -0400
+
 libubuntuone (0.9.1-0ubuntu1) natty; urgency=low
 
   * New upstream release.

=== modified file 'debian/control'
--- debian/control	2011-03-18 20:39:27 +0000
+++ debian/control	2011-04-07 16:11:09 +0000
@@ -8,9 +8,10 @@
 Build-Depends: debhelper (>= 7.0.17),
                cdbs,
                python-support,
+               libgstreamer0.10-dev,
+               libgstreamer-plugins-base0.10-dev,
                libwebkitgtk-dev,
                libglib2.0-dev,
-               libebook1.2-dev,
                gnome-doc-utils,
                gtk-doc-tools,
                intltool,
@@ -107,3 +108,4 @@
  .
  It can be used by packages using the GIRepository format to generate
  dynamic bindings.
+

=== modified file 'debian/libubuntuone-1.0-1.install'
--- debian/libubuntuone-1.0-1.install	2010-02-17 16:07:01 +0000
+++ debian/libubuntuone-1.0-1.install	2011-04-07 16:11:09 +0000
@@ -1,3 +1,3 @@
 debian/tmp/usr/lib/libubuntuone-1.0.so.*
-debian/tmp/usr/share/libubuntuone/1/javascript/*
+debian/tmp/usr/share/libubuntuone
 debian/tmp/usr/share/locale/*

=== modified file 'libubuntuone/Makefile.am'
--- libubuntuone/Makefile.am	2011-03-18 20:30:19 +0000
+++ libubuntuone/Makefile.am	2011-04-07 16:11:09 +0000
@@ -19,6 +19,8 @@
 	$(MARSHAL_GENERATED)	\
 	oauth.c			\
 	oauth.h			\
+	u1-codec-installer.c	\
+	u1-codec-installer.h	\
 	u1-music-store.c	\
 	u1-request-chrome.c	\
 	u1-request-chrome.h	\

=== modified file 'libubuntuone/Makefile.in'
--- libubuntuone/Makefile.in	2011-03-18 20:39:27 +0000
+++ libubuntuone/Makefile.in	2011-04-07 16:11:09 +0000
@@ -79,7 +79,8 @@
 	$(am__DEPENDENCIES_1)
 am__objects_1 = u1-marshal.lo
 am_libubuntuone_1_0_la_OBJECTS = $(am__objects_1) oauth.lo \
-	u1-music-store.lo u1-request-chrome.lo xmalloc.lo
+	u1-codec-installer.lo u1-music-store.lo u1-request-chrome.lo \
+	xmalloc.lo
 libubuntuone_1_0_la_OBJECTS = $(am_libubuntuone_1_0_la_OBJECTS)
 AM_V_lt = $(am__v_lt_$(V))
 am__v_lt_ = $(am__v_lt_$(AM_DEFAULT_VERBOSITY))
@@ -318,6 +319,8 @@
 	$(MARSHAL_GENERATED)	\
 	oauth.c			\
 	oauth.h			\
+	u1-codec-installer.c	\
+	u1-codec-installer.h	\
 	u1-music-store.c	\
 	u1-request-chrome.c	\
 	u1-request-chrome.h	\
@@ -426,6 +429,7 @@
 	-rm -f *.tab.c
 
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/oauth.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/u1-codec-installer.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/u1-marshal.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/u1-music-store.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/u1-request-chrome.Plo@am__quote@

=== added file 'libubuntuone/u1-codec-installer.c'
--- libubuntuone/u1-codec-installer.c	1970-01-01 00:00:00 +0000
+++ libubuntuone/u1-codec-installer.c	2011-04-07 16:11:09 +0000
@@ -0,0 +1,650 @@
+/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
+/*
+ * Copyright (C) 2011 Canonical, Ltd.
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of version 2 of the GNU Lesser General Public
+ * License as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the
+ * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+ * Boston, MA 02110-1301, USA.
+ */
+
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
+#include <gio/gio.h>
+#include <glib/gi18n-lib.h>
+
+#include "u1-codec-installer.h"
+
+#define U1MS_PARTNER_LIST_FILE "u1ms-partner-mp3.list"
+#define U1MS_SOURCES_LIST_DIR  "/etc/apt/sources.list.d/"
+#define U1MS_SOURCES_LIST_FILE U1MS_SOURCES_LIST_DIR U1MS_PARTNER_LIST_FILE
+#define U1MS_CODEC_PACKAGE     "gstreamer0.10-fluendo-plugins-mp3-partner"
+#define FLUENDO_CODEC_EULA     "MPEG Layer-3 audio decoding technology " \
+	"licensed from Fraunhofer IIS and Thomson. " \
+	"This product cannot be installed in product other than Personal " \
+	"Computers sold for general purpose usage, and not for set-top " \
+	"boxes, embedded PCs, PCs which are sold and customized for " \
+	"mainly audio or multimedia playback and/or registration, " \
+	"unless the seller has received a license by Fraunhofer IIS " \
+	"and Thomson and paid the relevant royalties to them."
+
+G_DEFINE_TYPE (U1CodecInstaller, u1_codec_installer, G_TYPE_OBJECT)
+
+struct _U1CodecInstallerPrivate {
+	GDBusConnection *bus;
+	GDBusProxy      *ad_proxy;
+	GDBusProxy      *tr_proxy;
+	gchar           *tr_object_path;
+
+	/* Support information */
+	gboolean         is_supported;
+	gchar           *series;
+
+	/* Widgets for the install process */
+	GtkWidget       *progressbar;
+};
+
+enum {
+	STARTED_SIGNAL,
+	FINISHED_SIGNAL,
+	ERROR_SIGNAL,
+	LAST_SIGNAL
+};
+
+static guint installer_signals[LAST_SIGNAL] = { 0, };
+
+
+static void
+u1_codec_installer_init (U1CodecInstaller *installer)
+{
+	GError *error = NULL;
+
+	installer->priv = G_TYPE_INSTANCE_GET_PRIVATE (installer, U1_TYPE_CODEC_INSTALLER, U1CodecInstallerPrivate);
+
+	installer->priv->bus = g_bus_get_sync (G_BUS_TYPE_SYSTEM, NULL, &error);
+	if (error != NULL) {
+		g_warning ("Failed to connect to D-Bus system bus: %s",
+			   error->message);
+		g_error_free (error);
+		return;
+	}
+
+	installer->priv->ad_proxy = g_dbus_proxy_new_sync (installer->priv->bus,
+							   0, NULL,
+							   "org.debian.apt",
+							   "/org/debian/apt",
+							   "org.debian.apt",
+							   NULL,
+							   &error);
+	if (error != NULL) {
+		g_warning ("Failed to connect to Apt daemon: %s",
+			   error->message);
+		g_error_free (error);
+		return;
+	}
+
+	installer->priv->progressbar = gtk_progress_bar_new ();
+	gtk_progress_bar_set_ellipsize (GTK_PROGRESS_BAR (installer->priv->progressbar), PANGO_ELLIPSIZE_END);
+	gtk_progress_bar_set_pulse_step (GTK_PROGRESS_BAR (installer->priv->progressbar), 0.05);
+	gtk_progress_bar_set_text (GTK_PROGRESS_BAR (installer->priv->progressbar), "");
+}
+
+static void
+_u1_codec_installer_finalize (GObject *object)
+{
+	U1CodecInstaller *installer = U1_CODEC_INSTALLER (object);
+
+	if (installer->priv != NULL) {
+		if (installer->priv->bus)
+			g_object_unref (installer->priv->bus);
+
+		if (installer->priv->tr_object_path)
+			g_free (installer->priv->tr_object_path);
+
+		if (installer->priv->series)
+			g_free (installer->priv->series);
+
+		if (GTK_IS_WIDGET (installer->priv->progressbar)) {
+			gtk_widget_destroy (installer->priv->progressbar);
+		}
+	}
+
+	G_OBJECT_CLASS (u1_codec_installer_parent_class)->finalize (object);
+}
+
+static void
+u1_codec_installer_class_init (U1CodecInstallerClass *klass)
+{
+	GObjectClass *object_class = G_OBJECT_CLASS (klass);
+
+	g_type_class_add_private (klass, sizeof (U1CodecInstallerClass));
+
+	/* Signals */
+	installer_signals[STARTED_SIGNAL] = g_signal_new ("started",
+							  G_TYPE_FROM_CLASS (klass),
+							  (GSignalFlags) G_SIGNAL_RUN_LAST,
+							  G_STRUCT_OFFSET (U1CodecInstallerClass, started),
+							  NULL,
+							  NULL,
+							  g_cclosure_marshal_VOID__VOID,
+							  G_TYPE_NONE, 0,
+							  G_TYPE_NONE);
+	installer_signals[FINISHED_SIGNAL] = g_signal_new ("finished",
+							   G_TYPE_FROM_CLASS (klass),
+							   (GSignalFlags) G_SIGNAL_RUN_LAST,
+							   G_STRUCT_OFFSET (U1CodecInstallerClass, finished),
+							   NULL,
+							   NULL,
+							   g_cclosure_marshal_VOID__VOID,
+							   G_TYPE_NONE, 0,
+							   G_TYPE_NONE);
+	installer_signals[ERROR_SIGNAL] = g_signal_new ("error",
+							G_TYPE_FROM_CLASS (klass),
+							(GSignalFlags) G_SIGNAL_RUN_LAST,
+							G_STRUCT_OFFSET (U1CodecInstallerClass, error),
+							NULL,
+							NULL,
+							g_cclosure_marshal_VOID__POINTER,
+							G_TYPE_NONE, 1,
+							G_TYPE_POINTER);
+
+	object_class->finalize = _u1_codec_installer_finalize;
+}
+
+static void
+_get_ubuntu_release_series (U1CodecInstaller *installer)
+{
+	gchar *contents;
+	gchar **lines;
+	gint i;
+
+	if (!g_file_get_contents ("/etc/lsb-release", &contents, NULL, NULL))
+		return;
+
+	lines = g_strsplit (contents, "\n", -1);
+	g_free (contents);
+
+	for (i = 0; lines[i] != NULL; i++) {
+		gchar **keyval = g_strsplit (lines[i], "=", 2);
+		if (g_strcmp0 (keyval[0], "DISTRIB_ID") == 0 &&
+		    g_strcmp0 (keyval[1], "Ubuntu") == 0)
+			installer->priv->is_supported = TRUE;
+		else if (g_strcmp0 (keyval[0], "DISTRIB_CODENAME") == 0)
+			installer->priv->series = g_strdup (keyval[1]);
+
+		g_strfreev (keyval);
+	}
+	g_strfreev (lines);
+
+	return;
+}
+
+/**
+ * u1_codec_installer_new:
+ *
+ * Create a new #U1CodecInstaller object.
+ *
+ * Return value: A new #U1CodecInstaller object.
+ */
+U1CodecInstaller *
+u1_codec_installer_new (void)
+{
+	U1CodecInstaller *installer = g_object_new (U1_TYPE_CODEC_INSTALLER,
+						    NULL);
+	_get_ubuntu_release_series (installer);
+	return installer;
+}
+
+static void
+_transaction_progress_changed_cb (GDBusConnection *bus,
+				  const gchar *sender_name,
+				  const gchar *object_path,
+				  const gchar *interface_name,
+				  const gchar *signal_name,
+				  GVariant *parameters,
+				  gpointer user_data)
+{
+	U1CodecInstaller *installer = U1_CODEC_INSTALLER (user_data);
+	gchar *property;
+	GVariant *value;
+
+	g_variant_get (parameters, "(sv)", &property, &value);
+
+	if (g_strcmp0 (property, "ProgressDetails") == 0) {
+		gint transaction, items_done, items_total;
+		gint bytes_done, bytes_total, speed;
+		g_variant_get (value, "(iiiiii)", &transaction,
+			       &items_done, &items_total,
+			       &bytes_done, &bytes_total,
+			       &speed);
+
+		if (items_total == 0 && bytes_total == 0)
+			gtk_progress_bar_set_text (GTK_PROGRESS_BAR (installer->priv->progressbar), "");
+		else {
+			gchar *message;
+			gchar *bd, *bt;
+
+			bd = g_format_size_for_display (bytes_done);
+			bt = g_format_size_for_display (bytes_total);
+			if (speed != 0) {
+				gchar *ks = g_format_size_for_display (speed);
+
+				message = g_strdup_printf (_("Downloaded %sB of %sB at %sB/s"), bd, bt, ks);
+				g_free (ks);
+			} else
+				message = g_strdup_printf (_("Downloaded %sB of %sB"), bd, bt);
+
+			gtk_progress_bar_set_text (GTK_PROGRESS_BAR (installer->priv->progressbar), message);
+
+			g_free (bd);
+			g_free (bt);
+			g_free (message);
+		}
+	} else if (g_strcmp0 (property, "Progress") == 0) {
+		gint progress;
+
+		g_variant_get (value, "i", &progress);
+		if (progress > 100)
+			gtk_progress_bar_pulse (GTK_PROGRESS_BAR (installer->priv->progressbar));
+		else
+			gtk_progress_bar_set_fraction (GTK_PROGRESS_BAR (installer->priv->progressbar), (gdouble) progress / 100.0);
+	} else if (g_strcmp0 (property, "ExitState") == 0) {
+		gchar *exit_code;
+
+		g_variant_get (value, "s", &exit_code);
+
+		if (g_strcmp0 (exit_code, "exit-unfinished") != 0) {
+			gtk_progress_bar_set_fraction (GTK_PROGRESS_BAR (installer->priv->progressbar), 1.0);
+			if (g_strcmp0(object_path, installer->priv->tr_object_path) == 0) {
+				g_signal_emit (installer, installer_signals[FINISHED_SIGNAL], 0, NULL);
+			}
+		}
+		g_free (exit_code);
+	} else if (g_strcmp0 (property, "Error") == 0) {
+		gchar *error_code, *error_msg;
+
+		g_variant_get (value, "(ss)", &error_code, &error_msg);
+
+		if (g_strcmp0 (error_code, "error-package-already-installed") != 0) {
+			GError *error = NULL;
+
+			g_set_error (&error,
+				     U1_CODEC_INSTALLER_ERROR,
+				     U1_CODEC_INSTALLER_ERROR_UNKNOWN,
+				     "%s", error_msg);
+			g_signal_emit (installer,
+				       installer_signals[ERROR_SIGNAL], 0,
+				       error);
+		}
+
+		g_free (error_code);
+		g_free (error_msg);
+	}
+
+	g_free (property);
+	g_variant_unref (value);
+}
+
+static void
+_transaction_connect_progress_changed (U1CodecInstaller *installer)
+{
+	g_dbus_connection_signal_subscribe (installer->priv->bus,
+					    "org.debian.apt",
+					    "org.debian.apt.transaction",
+					    "PropertyChanged",
+					    g_dbus_proxy_get_object_path (installer->priv->tr_proxy),
+					    NULL,
+					    G_DBUS_SIGNAL_FLAGS_NONE,
+					    (GDBusSignalCallback) _transaction_progress_changed_cb,
+					    installer,
+					    NULL);
+}
+
+static void
+_update_install_finished_cb (GObject *object, GAsyncResult *result, gpointer user_data)
+{
+	U1CodecInstaller *installer = U1_CODEC_INSTALLER (user_data);
+	GVariant *finished;
+
+	finished = g_dbus_proxy_call_finish (G_DBUS_PROXY (object),
+					     result, NULL);
+	g_object_unref (installer->priv->tr_proxy);
+	if (finished != NULL)
+		g_variant_unref (finished);
+}
+
+static void
+_update_install_cb (GObject *object, GAsyncResult *result, gpointer user_data)
+{
+	U1CodecInstaller *installer = U1_CODEC_INSTALLER (user_data);
+	GError *error = NULL;
+	GVariant *finished;
+	gchar *result_val;
+
+	finished = g_dbus_proxy_call_finish (G_DBUS_PROXY (object),
+					     result, &error);
+	if (error != NULL) {
+		g_signal_emit (installer,
+			       installer_signals[ERROR_SIGNAL], 0,
+			       error);
+		return;
+	}
+
+	g_variant_get (finished, "(s)", &result_val);
+	
+	installer->priv->tr_object_path = g_strdup (result_val);
+	installer->priv->tr_proxy = g_dbus_proxy_new_sync (installer->priv->bus,
+							   0, NULL,
+							   "org.debian.apt",
+							   result_val,
+							   "org.debian.apt.transaction",
+							   NULL,
+							   &error);
+
+	g_free (result_val);
+	g_variant_unref (finished);
+
+	if (error != NULL) {
+		g_signal_emit (installer,
+			       installer_signals[ERROR_SIGNAL], 0,
+			       error);
+		return;
+	}
+
+	_transaction_connect_progress_changed (installer);
+
+	g_dbus_proxy_call (installer->priv->tr_proxy,
+			   "Run",
+			   NULL,
+			   G_DBUS_CALL_FLAGS_NONE,
+			   -1,
+			   NULL,
+			   (GAsyncReadyCallback) _update_install_finished_cb,
+			   installer);
+}
+
+static void
+_update_cache_finished_cb (GObject *object, GAsyncResult *result, gpointer user_data)
+{
+	U1CodecInstaller *installer = U1_CODEC_INSTALLER (user_data);
+	GError *error = NULL;
+	GVariant *finished;
+	GVariant *params;
+	GVariantBuilder *builder;
+
+	finished = g_dbus_proxy_call_finish (G_DBUS_PROXY (object),
+					     result, &error);
+	g_object_unref (installer->priv->tr_proxy);
+
+	if (error != NULL) {
+		g_signal_emit (installer,
+			       installer_signals[ERROR_SIGNAL], 0,
+			       error);
+		return;
+	}
+
+	g_variant_unref (finished);
+
+	builder = g_variant_builder_new (G_VARIANT_TYPE ("as"));
+	g_variant_builder_add (builder, "s", U1MS_CODEC_PACKAGE);
+
+	params = g_variant_new ("(as)", builder);
+
+	g_dbus_proxy_call (installer->priv->ad_proxy,
+			   "InstallPackages",
+			   params, 0, 86400, NULL,
+			   (GAsyncReadyCallback) _update_install_cb,
+			   installer);
+
+	g_variant_builder_unref (builder);
+	g_variant_unref (params);
+}
+
+static void
+_update_cache_cb (GObject *object, GAsyncResult *result, gpointer user_data)
+{
+	U1CodecInstaller *installer = U1_CODEC_INSTALLER (user_data);
+	GError *error = NULL;
+	GVariant *finished;
+	gchar *result_val;
+
+	finished = g_dbus_proxy_call_finish (G_DBUS_PROXY (object),
+					     result, &error);
+	if (error != NULL) {
+		g_signal_emit (installer,
+			       installer_signals[ERROR_SIGNAL], 0,
+			       error);
+		return;
+	}
+
+	g_variant_get (finished, "(s)", &result_val);
+	
+	installer->priv->tr_proxy = g_dbus_proxy_new_sync (installer->priv->bus,
+							   0, NULL,
+							   "org.debian.apt",
+							   result_val,
+							   "org.debian.apt.transaction",
+							   NULL,
+							   &error);
+
+	g_free (result_val);
+	g_variant_unref (finished);
+
+	if (error != NULL) {
+		g_signal_emit (installer,
+			       installer_signals[ERROR_SIGNAL], 0,
+			       error);
+		return;
+	}
+
+	_transaction_connect_progress_changed (installer);
+
+	g_dbus_proxy_call (installer->priv->tr_proxy,
+			   "Run",
+			   NULL,
+			   G_DBUS_CALL_FLAGS_NONE,
+			   -1,
+			   NULL,
+			   (GAsyncReadyCallback) _update_cache_finished_cb,
+			   installer);
+
+	g_signal_emit (installer, installer_signals[STARTED_SIGNAL], 0, NULL);
+}
+
+static void
+_repository_add_finished_cb (GObject *object, GAsyncResult *result, gpointer user_data)
+{
+	U1CodecInstaller *installer = U1_CODEC_INSTALLER (user_data);
+	GError *error = NULL;
+	GVariant *finished;
+	GVariant *params;
+	GVariantBuilder *builder;
+
+	finished = g_dbus_proxy_call_finish (G_DBUS_PROXY (object),
+					     result, &error);
+	g_object_unref (installer->priv->tr_proxy);
+
+	if (error != NULL) {
+		g_signal_emit (installer,
+			       installer_signals[ERROR_SIGNAL], 0,
+			       g_error_copy (error));
+		return;
+	}
+
+	g_variant_unref (finished);
+
+	builder = g_variant_builder_new (G_VARIANT_TYPE ("as"));
+	g_variant_builder_add (builder, "s", U1MS_SOURCES_LIST_FILE);
+
+	params = g_variant_new ("(s)", U1MS_SOURCES_LIST_FILE);
+
+	g_dbus_proxy_call (installer->priv->ad_proxy,
+			   "UpdateCachePartially",
+			   params, 0, 86400, NULL,
+			   (GAsyncReadyCallback) _update_cache_cb,
+			   installer);
+
+	g_variant_builder_unref (builder);
+	g_variant_unref (params);
+}
+
+static void
+_repository_add_cb (GObject *object, GAsyncResult *result, gpointer user_data)
+{
+	U1CodecInstaller *installer = U1_CODEC_INSTALLER (user_data);
+	GError *error = NULL;
+	GVariant *finished;
+	gchar *result_val;
+
+	finished = g_dbus_proxy_call_finish (G_DBUS_PROXY (object),
+					     result, &error);
+	if (error != NULL) {
+		g_signal_emit (installer,
+			       installer_signals[ERROR_SIGNAL], 0,
+			       error);
+		return;
+	}
+
+	g_variant_get (finished, "(s)", &result_val);
+
+	installer->priv->tr_proxy = g_dbus_proxy_new_sync (installer->priv->bus,
+							   0, NULL,
+							   "org.debian.apt",
+							   result_val,
+							   "org.debian.apt.transaction",
+							   NULL,
+							   &error);
+	g_free (result_val);
+	g_variant_unref (finished);
+
+	if (error != NULL) {
+		g_signal_emit (installer,
+			       installer_signals[ERROR_SIGNAL], 0,
+			       error);
+		return;
+	}
+
+	g_dbus_proxy_call (installer->priv->tr_proxy,
+			   "Run",
+			   NULL,
+			   G_DBUS_CALL_FLAGS_NONE,
+			   -1,
+			   NULL,
+			   (GAsyncReadyCallback) _repository_add_finished_cb,
+			   installer);
+
+}
+
+enum {
+	EULA_DIALOG_ACCEPT = -1,
+	EULA_DIALOG_CANCEL = -2
+};
+
+/**
+ * u1_codec_installer_install_codec:
+ *
+ * Begin the process to install the MP3 codec plug-in.
+ **/
+void
+u1_codec_installer_install_codec (U1CodecInstaller *installer,
+				  GtkWindow *parent_window)
+{
+	GtkWidget *eula_dialog;
+
+	eula_dialog = gtk_message_dialog_new (parent_window,
+					      GTK_DIALOG_MODAL | GTK_DIALOG_DESTROY_WITH_PARENT,
+					      GTK_MESSAGE_OTHER,
+					      GTK_BUTTONS_NONE,
+					      "MPEG Layer-3 audio decoding technology notice");
+	gtk_message_dialog_format_secondary_text (GTK_MESSAGE_DIALOG (eula_dialog),
+						  FLUENDO_CODEC_EULA);
+	gtk_dialog_add_buttons (GTK_DIALOG (eula_dialog),
+				_("Cancel"), EULA_DIALOG_CANCEL,
+				_("Accept"), EULA_DIALOG_ACCEPT,
+				NULL);
+	gtk_dialog_set_default_response (GTK_DIALOG (eula_dialog),
+					 EULA_DIALOG_ACCEPT);
+
+	switch (gtk_dialog_run (GTK_DIALOG (eula_dialog))) {
+	case EULA_DIALOG_ACCEPT: {
+		GVariant *params;
+		GVariantBuilder *builder;
+
+		builder = g_variant_builder_new (G_VARIANT_TYPE ("as"));
+		g_variant_builder_add (builder, "s", "partner");
+
+		params = g_variant_new ("(sssasss)",
+					"deb",
+					"http://archive.canonical.com/",
+					installer->priv->series,
+					builder,
+					"added by Ubuntu One Music Store",
+					U1MS_PARTNER_LIST_FILE);
+
+		g_dbus_proxy_call (installer->priv->ad_proxy,
+				   "AddRepository",
+				   params, 0, 86400, NULL,
+				   (GAsyncReadyCallback) _repository_add_cb,
+				   installer);
+
+		g_variant_builder_unref (builder);
+		g_variant_unref (params);
+	}
+	case EULA_DIALOG_CANCEL:
+	default:
+		gtk_widget_destroy (eula_dialog);
+		break;
+	}
+}
+
+/**
+ * u1_codec_installer_get_progress_widget:
+ *
+ * The widget used for displaying progress of codec installation.
+ *
+ * Return value: The #GtkWidget used to display progress.
+ **/
+GtkWidget *
+u1_codec_installer_get_progress_widget (U1CodecInstaller *installer)
+{
+	return installer->priv->progressbar;
+}
+
+/**
+ * U1_CODEC_INSTALLER_ERROR:
+ *
+ * A #GError domain representing an MP3 codec install error.
+ * Used with #U1CodecInstallerError.
+ **/
+/**
+ * u1_codec_installer_error_quark:
+ *
+ * The #GQuark used as %U1_CODEC_INSTALLER_ERROR.
+ *
+ * Return value: The #GQuark used as %U1_CODEC_INSTALLER_ERROR.
+ **/
+GQuark
+u1_codec_installer_error_quark (void)
+{
+	return g_quark_from_static_string ("u1_codec_installer_error_quark");
+}
+
+/**
+ * U1CodecInstallerError:
+ * @U1_CODEC_INSTALLER_ERROR_UNKNOWN: Any otherwise unhandled error.
+ * @U1_CODEC_INSTALLER_ERROR_UNSUPPORTED: Indicates an unsupported version of
+ * Linux.
+ *
+ * Codec installation related errors.
+ **/

=== added file 'libubuntuone/u1-codec-installer.h'
--- libubuntuone/u1-codec-installer.h	1970-01-01 00:00:00 +0000
+++ libubuntuone/u1-codec-installer.h	2011-04-07 16:11:09 +0000
@@ -0,0 +1,68 @@
+/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
+/*
+ * Copyright (C) 2011 Canonical, Ltd.
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of version 2 of the GNU Lesser General Public
+ * License as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the
+ * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+ * Boston, MA 02110-1301, USA.
+ */
+
+#ifndef __U1_CODEC_INSTALLER_H__
+#define __U1_CODEC_INSTALLER_H__
+
+#include <glib-object.h>
+#include <gtk/gtk.h>
+
+#define U1_TYPE_CODEC_INSTALLER            (u1_codec_installer_get_type ())
+#define U1_CODEC_INSTALLER(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), U1_TYPE_CODEC_INSTALLER, U1CodecInstaller))
+#define U1_IS_CODEC_INSTALLER(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), U1_TYPE_CODEC_INSTALLER))
+#define U1_CODEC_INSTALLER_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass), U1_TYPE_CODEC_INSTALLER, U1CodecInstaller))
+#define U1_IS_CODEC_INSTALLER_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), U1_TYPE_CODEC_INSTALLER))
+#define U1_CODEC_INSTALLER_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj), U1_TYPE_CODEC_INSTALLER, U1CodecInstaller))
+#define U1_CODEC_INSTALLER_ERROR           (u1_codec_installer_error_quark ())
+
+typedef struct _U1CodecInstaller        U1CodecInstaller;
+typedef struct _U1CodecInstallerClass   U1CodecInstallerClass;
+typedef struct _U1CodecInstallerPrivate U1CodecInstallerPrivate;
+typedef enum   _U1CodecInstallerError   U1CodecInstallerError;
+
+struct _U1CodecInstaller {
+	GObject parent;
+
+	U1CodecInstallerPrivate *priv;
+};
+
+struct _U1CodecInstallerClass {
+	GObjectClass parent_class;
+
+	void (* started)  (U1CodecInstaller *installer);
+	void (* finished) (U1CodecInstaller *installer);
+	void (* error)    (U1CodecInstaller *installer, GError *error);
+};
+
+enum _U1CodecInstallerError {
+	U1_CODEC_INSTALLER_ERROR_UNKNOWN = 0,
+	U1_CODEC_INSTALLER_ERROR_UNSUPPORTED
+};
+
+GType u1_codec_installer_get_type (void);
+
+U1CodecInstaller *u1_codec_installer_new (void);
+
+void  u1_codec_installer_install_codec (U1CodecInstaller *installer,
+					GtkWindow *parent_window);
+GtkWidget *u1_codec_installer_get_progress_widget (U1CodecInstaller *installer);
+
+GQuark u1_codec_installer_error_quark (void);
+
+#endif

=== modified file 'libubuntuone/u1-music-store.c'
--- libubuntuone/u1-music-store.c	2011-03-18 20:30:19 +0000
+++ libubuntuone/u1-music-store.c	2011-04-07 16:11:09 +0000
@@ -23,6 +23,8 @@
 #include <string.h>
 #include <libxml/HTMLparser.h>
 #include <glib/gi18n.h>
+#include <gst/gst.h>
+#include <gst/pbutils/pbutils.h>
 #include <webkit/webkit.h>
 #include <libsoup/soup-gnome-features.h>
 #include <libsoup/soup-uri.h>
@@ -30,6 +32,7 @@
 #include "oauth.h"
 #include "u1-music-store.h"
 #include "u1-marshal.h"
+#include "u1-codec-installer.h"
 #include "u1-request-chrome.h"
 
 #define U1_MUSIC_LIBRARY_LOCATION  ".ubuntuone/Purchased from Ubuntu One"
@@ -65,7 +68,16 @@
 	GtkWidget *alertbar;
 	GtkWidget *alert_label;
 	GtkWidget *subscribe_btn;
+	GtkWidget *install_btn;
+	GtkWidget *install_progress;
 	gboolean folder_subscribed;
+	gboolean codec_installed;
+
+	/* The installer object */
+	U1CodecInstaller *installer;
+
+	/* GStreamer pipeline used to check for the MP3 codec */
+	GstElement *pipeline;
 
 	guint watch_id;
 	guint idle_cb;
@@ -107,6 +119,9 @@
 		if (music_store->priv->syncdaemon != NULL)
 			g_object_unref (G_OBJECT (music_store->priv->syncdaemon));
 
+		if (music_store->priv->installer != NULL)
+			g_object_unref (music_store->priv->installer);
+
 		g_free (music_store->priv);
 	}
 
@@ -514,6 +529,9 @@
 	gchar *internal_uri;
 	gboolean return_val = FALSE;
 
+	/* Hide the alertbar in case we should show something else */
+	gtk_widget_hide (music_store->priv->alertbar);
+
 	/* Remove watching callback for the page */
 	if (music_store->priv->watch_id != 0) {
 		g_source_remove (music_store->priv->watch_id);
@@ -826,6 +844,20 @@
 }
 
 static void
+_show_missing_codec_warning (U1MusicStore *music_store)
+{
+	gtk_label_set_text (GTK_LABEL (music_store->priv->alert_label),
+			    _("MP3 playback support is not available. It must be installed to play Previews and Purchased Music on this computer."));
+
+	if (music_store->priv->install_progress)
+		gtk_widget_hide (music_store->priv->install_progress);
+
+	gtk_widget_hide (music_store->priv->subscribe_btn);
+	gtk_widget_show (music_store->priv->install_btn);
+	gtk_widget_show (music_store->priv->alertbar);
+}
+
+static void
 load_finished_cb (WebKitWebView *web_view, WebKitWebFrame *frame, gpointer user_data)
 {
 	const gchar *library_override;
@@ -858,6 +890,7 @@
 		if (!music_store->priv->folder_subscribed) {
 			gtk_label_set_text (GTK_LABEL (music_store->priv->alert_label),
 					    _("Your 'Purchased Music' folder is not subscribed. New purchases will not download to this computer."));
+			gtk_widget_hide (music_store->priv->install_btn);
 			gtk_widget_show (music_store->priv->subscribe_btn);
 			gtk_widget_show (music_store->priv->alertbar);
 		}
@@ -871,6 +904,12 @@
 
 		/* Poll syncdaemon for downloads while the page is loaded */
 		music_store->priv->watch_id = g_timeout_add (1000, (GSourceFunc) poll_downloads_cb, music_store);
+	} else if (g_strcmp0 (uri->path, "/default.aspx") == 0 ||
+		   g_strcmp0 (uri->path, "/stores/default.aspx") == 0) {
+		/* Show the alert bar for codec installation */
+		if (!music_store->priv->codec_installed) {
+			_show_missing_codec_warning (music_store);
+ 		}
 	}
 
 	/* Signal users the URL finished loading */
@@ -890,23 +929,32 @@
 	if (g_str_has_prefix (text, "u1preview:::")) {
 		gchar **args;
 
+		/* Show the alert bar for codec installation */
+		if (!music_store->priv->codec_installed) {
+			_show_missing_codec_warning (music_store);
+			return;
+ 		}
+
 		args = g_strsplit (text, ":::", 0);
 		if (args != NULL) {
 			g_signal_emit (music_store, u1_music_store_signals[PREVIEW_MP3_SIGNAL], 0, args[1], args[2]);
 			g_strfreev (args);
 		}
-	}
-	if (g_str_has_prefix (text, "u1playlibrary:::")) {
+	} else if (g_str_has_prefix (text, "u1playlibrary:::")) {
 		gchar **args;
 
+		/* Show the alert bar for codec installation */
+		if (!music_store->priv->codec_installed) {
+			_show_missing_codec_warning (music_store);
+			return;
+ 		}
+
 		args = g_strsplit (text, ":::", 2);
 		if (args != NULL) {
 			g_signal_emit (music_store, u1_music_store_signals[PLAY_LIBRARY_SIGNAL], 0, args[1]);
 			g_strfreev (args);
 		}
-	}
-
-	if (g_str_has_prefix (text, "u1showcertificate:::")) {
+	} else if (g_str_has_prefix (text, "u1showcertificate:::")) {
 		/* should show certificate here in its own window. */
 	}
 
@@ -976,6 +1024,130 @@
 }
 
 static void
+got_gst_element_message (GstBus *bus, GstMessage *msg, gpointer user_data)
+{
+	U1MusicStore *music_store = U1_MUSIC_STORE (user_data);
+	gboolean is_missing = FALSE;
+
+	is_missing = gst_is_missing_plugin_message (msg);
+	if (is_missing) {
+		g_debug ("MP3 playback is missing.");
+		gst_element_set_state (music_store->priv->pipeline,
+				       GST_STATE_NULL);
+		music_store->priv->codec_installed = FALSE;
+	}
+}
+
+static void
+got_gst_eos_message (GstBus *bus, GstMessage *msg, gpointer user_data)
+{
+	U1MusicStore *music_store = U1_MUSIC_STORE (user_data);
+
+	gst_element_set_state (music_store->priv->pipeline, GST_STATE_NULL);
+	if (g_getenv ("U1INSTALLMP3ANYWAY") != NULL)
+		music_store->priv->codec_installed = FALSE;
+	else
+		music_store->priv->codec_installed = TRUE;
+}
+
+static gboolean
+check_mp3_support (gpointer user_data)
+{
+	U1MusicStore *music_store = U1_MUSIC_STORE (user_data);
+	GstBus *bus;
+	GError *error = NULL;
+	gchar *empty_file;
+	gchar *empty_uri;
+	gchar *launch;
+
+	empty_file = g_build_filename (U1_JAVASCRIPT_DIR, "empty.mp3", NULL);
+	empty_uri = g_filename_to_uri (empty_file, NULL, NULL);
+	g_free (empty_file);
+
+	launch = g_strdup_printf ("uridecodebin uri=%s ! fakesink", empty_uri);
+	g_free (empty_uri);
+
+	music_store->priv->pipeline = gst_parse_launch (launch, &error);
+	if (error != NULL) {
+		g_warning ("Error checking for MP3 support: %s",
+			   error->message);
+		music_store->priv->codec_installed = FALSE;
+		return FALSE;
+	}
+	bus = gst_element_get_bus (music_store->priv->pipeline);
+	gst_bus_add_signal_watch (bus);
+	g_signal_connect (G_OBJECT (bus), "message::element",
+			  G_CALLBACK (got_gst_element_message), music_store);
+	g_signal_connect (G_OBJECT (bus), "message::eos",
+			  G_CALLBACK (got_gst_eos_message), music_store);
+	gst_element_set_state (music_store->priv->pipeline, GST_STATE_PLAYING);
+
+	return FALSE;
+}
+
+static void
+_install_codec_error (U1CodecInstaller *installer, GError *error,
+		      gpointer user_data)
+{
+	U1MusicStore *music_store = U1_MUSIC_STORE (user_data);
+
+	music_store->priv->codec_installed = FALSE;
+	if (music_store->priv->install_progress) {
+		gtk_widget_hide (music_store->priv->install_progress);
+	}
+
+	if (music_store->priv->install_btn)
+		gtk_widget_hide (music_store->priv->install_btn);
+
+	if (error->domain == U1_CODEC_INSTALLER_ERROR &&
+	    error->code == U1_CODEC_INSTALLER_ERROR_UNSUPPORTED) {
+		gtk_label_set_text (GTK_LABEL (music_store->priv->alert_label),
+				    _("MP3 codec cannot be installed. Install is only supported on Ubuntu Linux."));
+	} else {
+		_show_missing_codec_warning (music_store);
+	}
+
+	g_error_free (error);
+}
+
+static void
+_install_codec_started (U1CodecInstaller *installer, gpointer user_data)
+{
+	U1MusicStore *music_store = U1_MUSIC_STORE (user_data);
+
+	if (music_store->priv->install_progress == NULL) {
+		music_store->priv->install_progress = u1_codec_installer_get_progress_widget (installer);
+		gtk_box_pack_end (GTK_BOX (music_store->priv->alertbar),
+				  music_store->priv->install_progress,
+				  TRUE, TRUE, 0);
+	}
+
+	gtk_widget_hide (music_store->priv->install_btn);
+	gtk_widget_show (music_store->priv->install_progress);
+}
+
+static void
+_install_codec_finished (U1CodecInstaller *installer, gpointer user_data)
+{
+	U1MusicStore *music_store = U1_MUSIC_STORE (user_data);
+
+	gtk_widget_hide (music_store->priv->alertbar);
+	gtk_widget_hide (music_store->priv->install_btn);
+	gtk_widget_hide (music_store->priv->install_progress);
+
+	music_store->priv->codec_installed = TRUE;
+}
+
+static void
+_install_missing_codec (GtkButton *button, gpointer user_data)
+{
+	U1MusicStore *music_store = U1_MUSIC_STORE (user_data);
+
+	u1_codec_installer_install_codec (music_store->priv->installer,
+					  GTK_WINDOW (gtk_widget_get_toplevel (GTK_WIDGET (music_store))));
+}
+
+static void
 subscribe_purchased_folder (GtkButton *button, gpointer user_data)
 {
 	U1MusicStore *music_store = U1_MUSIC_STORE (user_data);
@@ -988,6 +1160,67 @@
 }
 
 static void
+_u1_purchased_enumerate (GObject *source, GAsyncResult *result,
+                         gpointer user_data)
+{
+	U1MusicStore *music_store = U1_MUSIC_STORE (user_data);
+	GFile *dir = G_FILE (source);
+	GFileEnumerator *files;
+	GFileInfo *info;
+	GError *error = NULL;
+
+	files = g_file_enumerate_children_finish (dir, result, &error);
+
+	if (error != NULL) {
+		g_warning ("Error rescanning Purchased Music: %s", error->message);
+		g_error_free (error);
+		return;
+	}
+
+	while ((info = g_file_enumerator_next_file (files, NULL, NULL)) != NULL) {
+		gchar *path;
+
+		path = g_build_filename (g_file_get_path (dir),
+					 g_file_info_get_name (info),
+					 NULL);
+		if (g_file_test (path, G_FILE_TEST_IS_DIR)) {
+			GFile *subdir = g_file_new_for_path (path);
+			g_file_enumerate_children_async (subdir,
+							 G_FILE_ATTRIBUTE_STANDARD_NAME,
+                                        		 G_FILE_QUERY_INFO_NOFOLLOW_SYMLINKS,
+                                        		 G_PRIORITY_DEFAULT, NULL,
+                                        		 (GAsyncReadyCallback) _u1_purchased_enumerate,
+                                        		 music_store);
+		} else if (g_file_test (path, G_FILE_TEST_IS_REGULAR)) {
+			g_signal_emit (music_store,
+				       u1_music_store_signals[DOWNLOAD_FINISHED_SIGNAL], 0,
+                                       (const gchar *) path);
+		}
+
+		g_free (path);
+		g_object_unref (info);
+	}
+	g_file_enumerator_close (files, NULL, NULL);
+	g_object_unref (dir);
+}
+
+static void
+_u1_music_store_rescan_purchased_folder (U1MusicStore *music_store)
+{
+	GFile *dir;
+	const gchar *path;
+
+	path = u1_music_store_get_library_location (music_store);
+	dir = g_file_new_for_path (path);
+	g_file_enumerate_children_async (dir,
+					 G_FILE_ATTRIBUTE_STANDARD_NAME,
+					 G_FILE_QUERY_INFO_NOFOLLOW_SYMLINKS,
+					 G_PRIORITY_DEFAULT, NULL,
+					 (GAsyncReadyCallback) _u1_purchased_enumerate,
+					 music_store);
+}
+
+static void
 u1_music_store_init (U1MusicStore *music_store)
 {
 	gchar *new_user_agent;
@@ -999,6 +1232,8 @@
 	if (!g_thread_get_initialized ())
 		g_thread_init (NULL);
 
+	gst_init (NULL, NULL);
+
 	music_store->priv = g_new0 (U1MusicStorePrivate, 1);
 	music_store->priv->watched_downloads = g_hash_table_new_full (g_str_hash, g_str_equal, g_free, g_free);
 	music_store->priv->syncdaemon = syncdaemon_daemon_new ();
@@ -1007,6 +1242,15 @@
 			  "folder_subscribed",
 			  G_CALLBACK (sd_folder_subscribed_cb), music_store);
 
+	/* Set up the installer in case we need it */
+	music_store->priv->installer = u1_codec_installer_new ();
+	g_signal_connect (G_OBJECT (music_store->priv->installer), "error",
+			  G_CALLBACK (_install_codec_error), music_store);
+	g_signal_connect (G_OBJECT (music_store->priv->installer), "started",
+			  G_CALLBACK (_install_codec_started), music_store);
+	g_signal_connect (G_OBJECT (music_store->priv->installer), "finished",
+			  G_CALLBACK (_install_codec_finished), music_store);
+
 	/* If U1MUSICSTOREURL is defined, use that instead of the real URL */
 	if (! (url_to_use = g_getenv ("U1MUSICSTOREURL")))
 		url_to_use = "https://one.ubuntu.com";
@@ -1075,6 +1319,17 @@
 			    TRUE, TRUE, 0);
 	gtk_widget_show (music_store->priv->alert_label);
 
+	/* Button to install MP3 codec if missing */
+	music_store->priv->install_btn = gtk_button_new_with_label (_("Install"));
+	gtk_box_pack_end (GTK_BOX (music_store->priv->alertbar),
+			  music_store->priv->install_btn,
+			  FALSE, FALSE, 6);
+	g_signal_connect (G_OBJECT (music_store->priv->install_btn), "clicked",
+			  G_CALLBACK (_install_missing_codec), music_store);
+
+	/* Check that MP3 codec is available */
+	g_timeout_add_seconds (3, (GSourceFunc) check_mp3_support, music_store);
+
 	/* Button to subscribe the Purchased Music folder */
 	music_store->priv->subscribe_btn = gtk_button_new_with_label (_("Subscribe"));
 	gtk_box_pack_end (GTK_BOX (music_store->priv->alertbar),
@@ -1099,6 +1354,8 @@
 	gtk_box_pack_start (GTK_BOX (music_store), music_store->priv->alertbar, FALSE, FALSE, 6);
 	gtk_box_pack_start (GTK_BOX (music_store), music_store->priv->scroll, TRUE, TRUE, 0);
 	gtk_box_pack_end (GTK_BOX (music_store), music_store->priv->progress, FALSE, FALSE, 0);
+
+	_u1_music_store_rescan_purchased_folder (music_store);
 }
 
 /**

=== modified file 'po/POTFILES.in'
--- po/POTFILES.in	2010-02-12 16:26:46 +0000
+++ po/POTFILES.in	2011-04-07 16:11:09 +0000
@@ -1,2 +1,3 @@
+libubuntuone/u1-codec-installer.c
 libubuntuone/u1-music-store.c
 libubuntuone/xmalloc.c