← Back to branch summary

~aw/sabayon-template/trunk

« back to all changes in this revision

Viewing changes to lib/sources/paneldelegate.py

  • Committer: Bazaar Package Importer
  • Author(s): Luca Falavigna
  • Date: 2010-03-18 18:01:03 UTC
  • mto: (1.3.1 upstream) (2.1.9 experimental)
  • mto: This revision was merged to the branch mainline in revision 31.
  • Revision ID: james.westby@ubuntu.com-20100318180103-aeurz233o0ujtkw7
Tags: upstream-2.29.92
Import upstream version 2.29.92

Show diffs side-by-side

added added

removed removed

Lines of Context:
lib/sources/paneldelegate.py
181
181
            self.added        = added
182
182
            self.removed      = removed
183
183
            self.gconf_client = self.delegate.get_gconf_client ()
 
184
            self.SORTPRIORITY = 60
184
185
    
185
186
        def _copy_tree (self, dir):
186
187
            if not self.gconf_client.dir_exists(dir):
187
188
                (src_client, src_address) = gconfsource.get_client_and_address_for_path (os.path.join (util.get_home_dir (), '.gconf'))
188
 
                (dst_client, dst_address) = gconfsource.get_client_and_address_for_path (os.path.join (util.get_home_dir (), '.gconf.xml.defaults'))
 
189
                (dst_client, dst_address) = gconfsource.get_client_and_address_for_path (os.path.join (util.get_home_dir (), GCONF_DEFAULTS_SOURCE))
189
190
                copy_dir (src_client, dst_client, dst_address, dir)
190
191
 
191
192
    class PanelToplevel (PanelThing):
575
576
            if not mandatory:
576
577
                if not self.defaults_client:
577
578
                    (client, address) = gconfsource.get_client_and_address_for_path (
578
 
                        os.path.join (self.temp_path, ".gconf.xml.defaults"))
 
579
                        os.path.join (self.temp_path, GCONF_DEFAULTS_SOURCE))
579
580
                    self.defaults_client = client
580
581
                    self.defaults_address = address
581
582
                return (self.defaults_client, self.defaults_address)
582
583
            else:
583
584
                if not self.mandatory_client:
584
585
                    (client, address) = gconfsource.get_client_and_address_for_path (
585
 
                        os.path.join (self.temp_path, ".gconf.xml.mandatory"))
 
586
                        os.path.join (self.temp_path, GCONF_MANDATORY_SOURCE))
586
587
                    self.mandatory_client = client
587
588
                    self.mandatory_address = address
588
589
                return (self.mandatory_client, self.mandatory_address)
686
687
    subprocess.call (["gconftool-2", "--shutdown"])
687
688
    time.sleep (1)
688
689
 
689
 
    assert os.access (os.path.join (temp_path, ".gconf.xml.defaults/apps/panel/general/%gconf.xml"), os.F_OK)
690
 
    assert os.access (os.path.join (temp_path, ".gconf.xml.defaults/apps/panel/toplevels/foo/%gconf.xml"), os.F_OK)
 
690
    assert os.access (os.path.join (temp_path, GCONF_DEFAULTS_SOURCE + "/apps/panel/general/%gconf.xml"), os.F_OK)
 
691
    assert os.access (os.path.join (temp_path, GCONF_DEFAULTS_SOURCE + "/apps/panel/toplevels/foo/%gconf.xml"), os.F_OK)
691
692
 
692
693
    changes = []
693
694
 
742
743
    subprocess.call (["gconftool-2", "--shutdown"])
743
744
    time.sleep (1)
744
745
    
745
 
    assert not os.access (os.path.join (temp_path, ".gconf.xml.defaults/apps/panel/toplevels/foo/%gconf.xml"), os.F_OK)
 
746
    assert not os.access (os.path.join (temp_path, GCONF_DEFAULTS_SOURCE + "/apps/panel/toplevels/foo/%gconf.xml"), os.F_OK)
746
747
 
747
748
    # Bye, bye cruft
748
749
    subprocess.call (["gconftool-2", "--recursive-unset", "%s/toplevels/foo" % PANEL_KEY_BASE])