libubuntuone

Merge lp:~dobey/libubuntuone/update-stable-4-0 into lp:libubuntuone/stable-4-0

  1. update-stable-4-0
  2. Merge into stable-4-0
Proposed by dobey on 2012-06-04
Status: Merged
Approved by: dobey on 2012-06-04
Approved revision: 153
Merged at revision: 153
Proposed branch: lp:~dobey/libubuntuone/update-stable-4-0
Merge into: lp:libubuntuone/stable-4-0
Diff against target: 22 lines (+2/-2)
2 files modified
configure.ac (+1/-1)
libubuntuoneui/u1-music-store.c (+1/-1)
To merge this branch: bzr merge lp:~dobey/libubuntuone/update-stable-4-0
Reviewer Review Type Date Requested Status
Roberto Alsina (community) 2012-06-04 Approve on 2012-06-04
Review via email: mp+108605@code.launchpad.net

Commit Message

Fix new compiler warning from gcc 4.7

To post a comment you must log in.
Roberto Alsina (ralsina) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'configure.ac'
2--- configure.ac 2012-04-05 14:09:11 +0000
3+++ configure.ac 2012-06-04 18:23:17 +0000
4@@ -1,4 +1,4 @@
5-AC_INIT([libubuntuone], [3.1], [], [libubuntuone])
6+AC_INIT([libubuntuone], [3.99], [], [libubuntuone])
7
8 AC_PREREQ([2.59])
9
10
11=== modified file 'libubuntuoneui/u1-music-store.c'
12--- libubuntuoneui/u1-music-store.c 2012-04-19 19:22:52 +0000
13+++ libubuntuoneui/u1-music-store.c 2012-06-04 18:23:17 +0000
14@@ -274,7 +274,7 @@
15 static gchar *
16 get_url_to_use (U1MusicStore *music_store)
17 {
18- gchar *oauth_consumer_token, *oauth_consumer_secret, *oauth_token = NULL, *oauth_token_secret = NULL, *real_url;
19+ gchar *oauth_consumer_token = NULL, *oauth_consumer_secret = NULL, *oauth_token = NULL, *oauth_token_secret = NULL, *real_url = NULL;
20
21 /* OAUth sign the URL */
22 if (g_str_has_prefix (music_store->priv->base_url, "http://localhost") || g_str_has_prefix (music_store->priv->base_url, "http://127.0.0.1")) {

Subscribers

People subscribed via source and target branches

to all changes: