liblauncher

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

  1. 0.1-lp-600207
  2. Merge into 0.1
Proposed by Loïc Minier
Status: Merged
Merged at revision: 31
Proposed branch: lp:~lool/liblauncher/0.1-lp-600207
Merge into: lp:~liblauncher-team/liblauncher/0.1
Diff against target: 45 lines (+10/-9)
2 files modified
autogen.sh (+7/-6)
launcher/launcher-session.c (+3/-3)
To merge this branch: bzr merge lp:~lool/liblauncher/0.1-lp-600207
Reviewer Review Type Date Requested Status
David Barth (community) Approve
Didier Roche-Tolomelli Approve
Review via email: mp+28886@code.launchpad.net
To post a comment you must log in.
Revision history for this message
Didier Roche-Tolomelli (didrocks) :
review: Approve
Revision history for this message
David Barth (dbarth) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'autogen.sh'
2--- autogen.sh 2009-06-06 14:20:34 +0000
3+++ autogen.sh 2010-06-30 14:00:51 +0000
4@@ -311,12 +311,13 @@
5
6 case $REQUIRED_AUTOMAKE_VERSION in
7 1.4*) automake_progs="automake-1.4" ;;
8- 1.5*) automake_progs="automake-1.10 automake-1.9 automake-1.8 automake-1.7 automake-1.6 automake-1.5" ;;
9- 1.6*) automake_progs="automake-1.10 automake-1.9 automake-1.8 automake-1.7 automake-1.6" ;;
10- 1.7*) automake_progs="automake-1.10 automake-1.9 automake-1.8 automake-1.7" ;;
11- 1.8*) automake_progs="automake-1.10 automake-1.9 automake-1.8" ;;
12- 1.9*) automake_progs="automake-1.10 automake-1.9" ;;
13- 1.10*) automake_progs="automake-1.10" ;;
14+ 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" ;;
15+ 1.6*) automake_progs="automake-1.11 automake-1.10 automake-1.9 automake-1.8 automake-1.7 automake-1.6" ;;
16+ 1.7*) automake_progs="automake-1.11 automake-1.10 automake-1.9 automake-1.8 automake-1.7" ;;
17+ 1.8*) automake_progs="automake-1.11 automake-1.10 automake-1.9 automake-1.8" ;;
18+ 1.9*) automake_progs="automake-1.11 automake-1.10 automake-1.9" ;;
19+ 1.10*) automake_progs="automake-1.11 automake-1.10" ;;
20+ 1.11*) automake_progs="automake-1.11" ;;
21 esac
22 version_check automake AUTOMAKE "$automake_progs" $REQUIRED_AUTOMAKE_VERSION \
23 "http://ftp.gnu.org/pub/gnu/automake/automake-$REQUIRED_AUTOMAKE_VERSION.tar.gz" || DIE=1
24
25=== modified file 'launcher/launcher-session.c'
26--- launcher/launcher-session.c 2009-09-09 15:39:36 +0000
27+++ launcher/launcher-session.c 2010-06-30 14:00:51 +0000
28@@ -225,15 +225,15 @@
29 latin1_to_utf8 (const gchar *latin1)
30 {
31 GError *error = NULL;
32- gsize read, written;
33+ gsize bytes_read, bytes_written;
34 gchar *utf8, *ret;
35
36- utf8 = g_convert (latin1, -1, "UTF-8", "ISO-8859-1", &read, &written, &error);
37+ utf8 = g_convert (latin1, -1, "UTF-8", "ISO-8859-1", &bytes_read, &bytes_written, &error);
38 if (error)
39 {
40 g_debug ("errors converting latin1 to utf8: latin1=\"%s\", utf8=\"%s\", "
41 "read=%zu, written=%zu, error=\"%s\".\n",
42- latin1, utf8, read, written, error->message);
43+ latin1, utf8, bytes_read, bytes_written, error->message);
44 g_error_free (error);
45 }
46

Subscribers

People subscribed via source and target branches