Merge lp:~didrocks/unity/unity-reset-removal into lp:unity

[Didier Roche]

remove unity --reset, it's not anymore really needed now that we are in
stable days of unity and we moved to gsettings

remove unity --reset, it's not anymore really needed now that we are in
stable days of unity and we moved to gsettings

[Michal Hruby (mhr3)]

Looks good. +1

review: Approve

[Omer Akram (om26er)]

*Its still needed*. unity --reset have been proved to fix a lot of issues in different bug reports. In many cases people end up ruining their config and we ask them to run unity --reset which fixes issues for them.

[Didier Roche (didrocks)]

@om26er, I think the release team won't be against a FFe for a gsettings version which can stop compiz (don't switch to metacity as it's not installed anymore), reset the keys, and restart it again. You're welcome to contribute (but I guess those will need tests now)

But let's remove (now broken) code first as it's useless.

[Jeremy Bicha (jbicha)]

I believe dconf reset -f /org/compiz/ basically duplicates what unity --reset would have done.

You can run dconf dump /org/compiz/ first to see what custom Compiz settings you have.

[Didier Roche (didrocks)]

Indeed Jeremy, the trick (and that's why we switched to metacity while we were resetting the keys) is that compiz doesn't really like when we change a bunch amount of keys while running.

So, someone has to stop compiz, ensure it's not autorestarted by gnome-session, reset the keys, and restart compiz. As we don't have metacity anymore to tell to gnome-session "we already have a windowmanager", that will become a little bit more tricky…

=== modified file 'tools/unity.cmake'
--- tools/unity.cmake	2012-07-04 02:37:23 +0000
+++ tools/unity.cmake	2012-09-06 16:04:42 +0000
@@ -18,7 +18,6 @@
 # this program; if not, write to the Free Software Foundation, Inc.,
 # 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
 
-import gconf
 import glib
 import glob
 from optparse import OptionParser
@@ -64,47 +63,6 @@
         print "WARNING: no DISPLAY variable set, setting it to :0"
         os.environ['DISPLAY'] = ':0'
 
-def reset_unity_compiz_profile ():
-    '''reset the compiz/unity profile to a vanilla one'''
-    
-    client = gconf.client_get_default()
-    
-    if not client:
-		print "WARNING: no gconf client found. No reset will be done"
-		return
-    
-    # get current compiz profile to know if we need to switch or not
-    # as compiz is setting that as a default key schema each time you
-    # change the profile, the key isn't straightforward to get and set
-    # as compiz set a new schema instead of a value..
-    try:
-        current_profile_schema = client.get_schema("/apps/compizconfig-1/current_profile")
-    except (glib.GError, AttributeError), e:
-        print "WARNING: environment is incorrect: %s\nDid you just try to reset in a tty?" % e
-        return
-    
-    # default value to not force reset if current_profile is unset
-    if not current_profile_schema:
-        print "WARNING: no current gconf profile set, assuming unity"
-        current_profile_str = 'unity'
-        current_profile_gconfvalue = None
-    else:
-        current_profile_gconfvalue = current_profile_schema.get_default_value()
-        current_profile_str = current_profile_gconfvalue.get_string()
-
-    if current_profile_str == 'unity':
-        print "WARNING: Unity currently default profile, so switching to metacity while resetting the values"
-        subprocess.Popen(["metacity", "--replace"]) #TODO: check if compiz is indeed running
-        # wait for compiz to stop
-        time.sleep(2)
-        if current_profile_gconfvalue:
-            current_profile_gconfvalue.set_string('fooo')
-            current_profile_schema.set_default_value(current_profile_gconfvalue)
-            client.set_schema("/apps/compizconfig-1/current_profile", current_profile_schema)
-        # 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"]) 
@@ -203,8 +161,6 @@
                       help="Store log under filename.")
     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.")  
     parser.add_option("--reset-icons", action="store_true",
                       help="Reset the default launcher icon.")  
     parser.add_option("-v", "--verbose", action="store_true",
@@ -216,9 +172,6 @@
     if options.distro:
 		sys.exit(reset_to_distro())
     
-    if options.reset:
-        reset_unity_compiz_profile ()
-    
     if options.reset_icons:
         reset_launcher_icons ()