Merge lp:~azzar1/unity/fix-731578 into lp:unity

[Andrea Azzarone]

Add unity --reset-icons option to restore default launcher icons.

I don't know if this is the better way to do this.

[Didier Roche-Tolomelli (didrocks)]

Approved! thanks a lot for your work there ;)

And no, there is no gsettings binding in python (yet), so this is the less ugly way to deal with it :)

review: Approve

=== modified file 'com.canonical.Unity.gschema.xml'
--- com.canonical.Unity.gschema.xml	2011-03-16 16:29:02 +0000
+++ com.canonical.Unity.gschema.xml	2011-03-16 17:11:26 +0000
@@ -40,8 +40,8 @@
   <schema path="/desktop/unity/devices/" id="com.canonical.Unity.Devices" gettext-domain="unity">
     <key enum="devices-option-enum" name="devices-option">
         <default>"OnlyMounted"</default>
-        <summary>Summary</summary>
-        <description>Description</description>
+        <summary>The devices that will be shown on launcher</summary>
+        <description>Key for setting the devices that will be shown on launcher. </description>
     </key>
     </schema>
 </schemalist>

=== modified file 'tools/unity.cmake'
--- tools/unity.cmake	2011-03-07 15:47:14 +0000
+++ tools/unity.cmake	2011-03-16 17:11:26 +0000
@@ -87,7 +87,10 @@
         # the python binding doesn't recursive-unset right
         subprocess.Popen(["gconftool-2", "--recursive-unset", "/apps/compiz-1"]).communicate()
     subprocess.Popen(["gconftool-2", "--recursive-unset", "/apps/compizconfig-1/profiles/unity"]).communicate()
-    
+
+def reset_launcher_icons ():
+    '''Reset the default launcher icon and restart it.'''
+    subprocess.Popen(["gsettings", "reset" ,"com.canonical.Unity.Launcher" , "favorites"]) 
 
 def process_and_start_unity (verbose, debug, compiz_args, log_file):
     '''launch unity under compiz (replace the current shell in any case)'''
@@ -175,7 +178,9 @@
     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("--reset", action="store_true",
-                      help="Reset the unity profile in compiz and restart it.")    
+                      help="Reset the unity profile in compiz and restart it.")  
+    parser.add_option("--reset-icons", action="store_true",
+                      help="Reset the default launcher icon.")  
     parser.add_option("-v", "--verbose", action="store_true",
                       help="Get additional debug output from unity.")
     (options, args) = parser.parse_args()
@@ -187,6 +192,9 @@
     
     if options.reset:
         reset_unity_compiz_profile ()
+    
+    if options.reset_icons:
+        reset_launcher_icons ()
 	
 	if options.replace:
 		print ("WARNING: This is for compatibility with other desktop interfaces please use unity without --replace")