Merge lp:~lool/liblauncher/0.1-lp-600207 into lp:~liblauncher-team/liblauncher/0.1

[Loïc Minier]

[Didier Roche (didrocks)]

review: Approve

[David Barth (dbarth)]

review: Approve

=== modified file 'autogen.sh'
--- autogen.sh	2009-06-06 14:20:34 +0000
+++ autogen.sh	2010-06-30 14:00:51 +0000
@@ -311,12 +311,13 @@
 
 case $REQUIRED_AUTOMAKE_VERSION in
     1.4*) automake_progs="automake-1.4" ;;
-    1.5*) automake_progs="automake-1.10 automake-1.9 automake-1.8 automake-1.7 automake-1.6 automake-1.5" ;;
-    1.6*) automake_progs="automake-1.10 automake-1.9 automake-1.8 automake-1.7 automake-1.6" ;;
-    1.7*) automake_progs="automake-1.10 automake-1.9 automake-1.8 automake-1.7" ;;
-    1.8*) automake_progs="automake-1.10 automake-1.9 automake-1.8" ;;
-    1.9*) automake_progs="automake-1.10 automake-1.9" ;;
-    1.10*) automake_progs="automake-1.10" ;;
+    1.5*) automake_progs="automake-1.11 automake-1.10 automake-1.9 automake-1.8 automake-1.7 automake-1.6 automake-1.5" ;;
+    1.6*) automake_progs="automake-1.11 automake-1.10 automake-1.9 automake-1.8 automake-1.7 automake-1.6" ;;
+    1.7*) automake_progs="automake-1.11 automake-1.10 automake-1.9 automake-1.8 automake-1.7" ;;
+    1.8*) automake_progs="automake-1.11 automake-1.10 automake-1.9 automake-1.8" ;;
+    1.9*) automake_progs="automake-1.11 automake-1.10 automake-1.9" ;;
+    1.10*) automake_progs="automake-1.11 automake-1.10" ;;
+    1.11*) automake_progs="automake-1.11" ;;
 esac
 version_check automake AUTOMAKE "$automake_progs" $REQUIRED_AUTOMAKE_VERSION \
     "http://ftp.gnu.org/pub/gnu/automake/automake-$REQUIRED_AUTOMAKE_VERSION.tar.gz" || DIE=1

=== modified file 'launcher/launcher-session.c'
--- launcher/launcher-session.c	2009-09-09 15:39:36 +0000
+++ launcher/launcher-session.c	2010-06-30 14:00:51 +0000
@@ -225,15 +225,15 @@
 latin1_to_utf8 (const gchar *latin1)
 {
   GError *error = NULL;
-  gsize read, written;
+  gsize bytes_read, bytes_written;
   gchar *utf8, *ret;
 
-  utf8 = g_convert (latin1, -1, "UTF-8", "ISO-8859-1", &read, &written, &error);
+  utf8 = g_convert (latin1, -1, "UTF-8", "ISO-8859-1", &bytes_read, &bytes_written, &error);
   if (error)
     {
       g_debug ("errors converting latin1 to utf8: latin1=\"%s\", utf8=\"%s\", "
                "read=%zu, written=%zu, error=\"%s\".\n",
-               latin1, utf8, read, written, error->message);
+               latin1, utf8, bytes_read, bytes_written, error->message);
       g_error_free (error);
     }