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
=== modified file 'libubuntuone/u1-music-store.c'
--- libubuntuone/u1-music-store.c 2010-03-05 19:04:01 +0000
+++ libubuntuone/u1-music-store.c 2010-03-08 17:01:30 +0000
@@ -1,6 +1,6 @@
1/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */1/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
2/*2/*
3 * Copyright (C) 2009 Canonical Services Ltd (www.canonical.com)3 * Copyright (C) 2009-2010 Canonical Services Ltd (www.canonical.com)
4 *4 *
5 * Authors: Rodrigo Moya <rodrigo.moya@canonical.com>5 * Authors: Rodrigo Moya <rodrigo.moya@canonical.com>
6 *6 *
@@ -360,8 +360,6 @@
360 }360 }
361 } else {361 } else {
362 g_warning ("Couldn't get proxy for com.ubuntuone.Authentication");362 g_warning ("Couldn't get proxy for com.ubuntuone.Authentication");
363 return FALSE;
364
365 }363 }
366364
367 return FALSE;365 return FALSE;
@@ -377,7 +375,6 @@
377 if (library_override != NULL) {375 if (library_override != NULL) {
378 g_debug ("overriding the library page to ours");376 g_debug ("overriding the library page to ours");
379 webkit_web_view_open (web_view, library_override);377 webkit_web_view_open (web_view, library_override);
380 return;
381 }378 }
382 }379 }
383 }380 }
@@ -747,6 +744,7 @@
747 744
748 g_object_set (G_OBJECT (webkit_web_view_get_settings (WEBKIT_WEB_VIEW (music_store->priv->web_viewer))),745 g_object_set (G_OBJECT (webkit_web_view_get_settings (WEBKIT_WEB_VIEW (music_store->priv->web_viewer))),
749 "user-agent", new_user_agent,746 "user-agent", new_user_agent,
747 "enable-default-context-menu", g_getenv ("U1SHOWCONTEXTMENU") != NULL,
750 NULL);748 NULL);
751749
752 g_free(new_user_agent);750 g_free(new_user_agent);

Subscribers

People subscribed via source and target branches