Merge lp:~shanepatrickfagan/unity/unity-replace into lp:unity

[Shane Fagan]

fixes https://bugs.launchpad.net/ubuntu/+source/unity/+bug/692569

[Jason Smith (jassmith)]

+1 helps users used to gnome-shell --replace

review: Approve

[Didier Roche-Tolomelli (didrocks)]

Hi Fagan, thanks for the merge request and your work there.

I definitively see the added value of such an option to users. However, I think that we should make it clear that the design decision is to make it useless. This should be noted in the Help of the switch (maybe even adding an "compatibility" option group) and print a warning when using it telling it's useless.

review: Needs Fixing

[Shane Fagan (shanepatrickfagan)]

> Hi Fagan, thanks for the merge request and your work there.
>
> I definitively see the added value of such an option to users. However, I
> think that we should make it clear that the design decision is to make it
> useless. This should be noted in the Help of the switch (maybe even adding an
> "compatibility" option group) and print a warning when using it telling it's
> useless.

Cool ill fix that give me 10 minutes and ill add the text.

[Shane Fagan (shanepatrickfagan)]

Ok pushed it should be a little bit more descriptive now

[Didier Roche-Tolomelli (didrocks)]

Thanks for that fagan, can you also achieve the second part of my request: "print a warning when using it telling it's useless."

[Shane Fagan (shanepatrickfagan)]

I thought my change did that, what wording would you want instead?

[Didier Roche-Tolomelli (didrocks)]

Sorry, I'm maybe not clear. I meant "when you run unity --replace" print the warning as well.

[Shane Fagan (shanepatrickfagan)]

Oh ok then ill upload a merge in 10 minutes

[Didier Roche-Tolomelli (didrocks)]

Thanks fagan, I'll add a commit to replace Unity by unity in the warning as you are talking about the command line and not the shell :)

Merging it now, thanks for your work there!

review: Approve

=== modified file 'tools/unity.cmake'
--- tools/unity.cmake	2010-12-09 12:03:53 +0000
+++ tools/unity.cmake	2011-01-03 12:30:19 +0000
@@ -110,6 +110,7 @@
     usage = "usage: %prog [options]"
     parser = OptionParser(version= "%prog @UNITY_VERSION@", usage=usage)
 
+    parser.add_option("--replace", action="store_true", help="Run unity /!\ This is for compatibility with other desktop interfaces and acts the same as running unity without --replace")
     parser.add_option("--advanced-debug", action="store_true",
                       help="Run unity under debugging to help debugging an issue. /!\ Only if devs ask for it.")    
     parser.add_option("--log", action="store",
@@ -123,5 +124,8 @@
     set_unity_env()
     if options.reset:
         reset_unity_compiz_profile ()
-
+	
+	if options.replace:
+		print ("WARNING: This is for compatibility with other desktop interfaces please use Unity without --replace")
+			
     run_unity (options.verbose, options.advanced_debug, args, options.log)