Merge lp:~rodrigo-moya/libubuntuone/no-right-click-menu into lp:libubuntuone

Proposed by Rodrigo Moya on 2010-03-08
Status: Merged
Approved by: Rodrigo Moya on 2010-03-08
Approved revision: 67
Merged at revision: not available
Proposed branch: lp:~rodrigo-moya/libubuntuone/no-right-click-menu
Merge into: lp:libubuntuone
Diff against target: 36 lines (+2/-4)
1 file modified
libubuntuone/u1-music-store.c (+2/-4)
To merge this branch: bzr merge lp:~rodrigo-moya/libubuntuone/no-right-click-menu
Reviewer Review Type Date Requested Status
Stuart Langridge (community) 2010-03-08 Approve on 2010-03-08
Review via email: mp+20906@code.launchpad.net

Commit message

Only show context menu if environment variable defined

Description of the change

Only show context menu if environment variable defined

To post a comment you must log in.
67. By Rodrigo Moya on 2010-03-08

Back to navigation-policy-decision-requested, the other one is deprecated

Stuart Langridge (sil) wrote :

Works fine!

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'libubuntuone/u1-music-store.c'
2--- libubuntuone/u1-music-store.c 2010-03-05 19:04:01 +0000
3+++ libubuntuone/u1-music-store.c 2010-03-08 17:01:30 +0000
4@@ -1,6 +1,6 @@
5 /* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
6 /*
7- * Copyright (C) 2009 Canonical Services Ltd (www.canonical.com)
8+ * Copyright (C) 2009-2010 Canonical Services Ltd (www.canonical.com)
9 *
10 * Authors: Rodrigo Moya <rodrigo.moya@canonical.com>
11 *
12@@ -360,8 +360,6 @@
13 }
14 } else {
15 g_warning ("Couldn't get proxy for com.ubuntuone.Authentication");
16- return FALSE;
17-
18 }
19
20 return FALSE;
21@@ -377,7 +375,6 @@
22 if (library_override != NULL) {
23 g_debug ("overriding the library page to ours");
24 webkit_web_view_open (web_view, library_override);
25- return;
26 }
27 }
28 }
29@@ -747,6 +744,7 @@
30
31 g_object_set (G_OBJECT (webkit_web_view_get_settings (WEBKIT_WEB_VIEW (music_store->priv->web_viewer))),
32 "user-agent", new_user_agent,
33+ "enable-default-context-menu", g_getenv ("U1SHOWCONTEXTMENU") != NULL,
34 NULL);
35
36 g_free(new_user_agent);

Subscribers

People subscribed via source and target branches