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

[Rodrigo Moya]

Only show context menu if environment variable defined

Only show context menu if environment variable defined

[lp:~rodrigo-moya/libubuntuone/no-right-click-menu]

67. By Rodrigo Moya on 2010-03-08

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

[Stuart Langridge (sil)]

Works fine!

review: Approve

=== 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 @@
 /* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
 /*
- * Copyright (C) 2009 Canonical Services Ltd (www.canonical.com)
+ * Copyright (C) 2009-2010 Canonical Services Ltd (www.canonical.com)
  *
  * Authors: Rodrigo Moya <[e-mail]>
  *
@@ -360,8 +360,6 @@
 			}
 		} else {
 			g_warning ("Couldn't get proxy for com.ubuntuone.Authentication");
-			return FALSE;
-
 		}
 
 		return FALSE;
@@ -377,7 +375,6 @@
 			if (library_override != NULL) {
 				g_debug ("overriding the library page to ours");
 				webkit_web_view_open (web_view, library_override);
-				return;
 			}
 		}
 	}
@@ -747,6 +744,7 @@
 	
 	g_object_set (G_OBJECT (webkit_web_view_get_settings (WEBKIT_WEB_VIEW (music_store->priv->web_viewer))),
 		      "user-agent", new_user_agent,
+		      "enable-default-context-menu", g_getenv ("U1SHOWCONTEXTMENU") != NULL,
 		      NULL);
 
 	g_free(new_user_agent);