saving uncommitted changes in /etc prior to emerge run

diff --git a/gconf/gconf.xml.defaults/%gconf-tree.xml b/gconf/gconf.xml.defaults/%gconf-tree.xml
index b8ae87704ed96b1e5f3538e366fc3d66949e814a..548cb059e764d6ae3e6b5c7edfa708072df34595 100644 (file)
--- a/gconf/gconf.xml.defaults/%gconf-tree.xml
+++ b/gconf/gconf.xml.defaults/%gconf-tree.xml
@@ -1,6 +1,15 @@
 <?xml version="1.0"?>
 <gconf>
        <dir name="apps">
+               <dir name="gksu">
+                       <entry name="save-keyring" mtime="1326792509" schema="/schemas/apps/gksu/save-keyring"/>
+                       <entry name="save-to-keyring" mtime="1326792509" schema="/schemas/apps/gksu/save-to-keyring"/>
+                       <entry name="display-no-pass-info" mtime="1326792509" schema="/schemas/apps/gksu/display-no-pass-info"/>
+                       <entry name="prompt" mtime="1326792509" schema="/schemas/apps/gksu/prompt"/>
+                       <entry name="sudo-mode" mtime="1326792509" schema="/schemas/apps/gksu/sudo-mode"/>
+                       <entry name="force-grab" mtime="1326792509" schema="/schemas/apps/gksu/force-grab"/>
+                       <entry name="disable-grab" mtime="1326792509" schema="/schemas/apps/gksu/disable-grab"/>
+               </dir>
                <dir name="vinagre">
                        <entry name="always_enable_listening" mtime="1326792465" schema="/schemas/apps/vinagre/always_enable_listening"/>
                        <entry name="history_size" mtime="1326792465" schema="/schemas/apps/vinagre/history_size"/>
@@ -1370,6 +1379,79 @@
        </dir>
        <dir name="schemas">
                <dir name="apps">
+                       <dir name="gksu">
+                               <entry name="save-keyring" mtime="1326792509" type="schema" stype="string" owner="gksu">
+                                       <local_schema locale="C" short_desc="Keyring to which passwords will be saved">
+                                               <default type="string">
+                                                       <stringvalue>session</stringvalue>
+                                               </default>
+                                               <longdesc>
+       The name of the keyring gksu should use. Usual values are &quot;session&quot;,
+       which saves the password for the session, and &quot;default&quot;, which saves the
+       password with no timeout.
+       </longdesc>
+                                       </local_schema>
+                               </entry>
+                               <entry name="save-to-keyring" mtime="1326792509" type="schema" stype="bool" owner="gksu">
+                                       <local_schema locale="C" short_desc="Save password to gnome-keyring">
+                                               <default type="bool" value="true"/>
+                                               <longdesc>
+       gksu can save the password you type to the gnome-keyring so you&apos;ll
+       not be asked everytime
+       </longdesc>
+                                       </local_schema>
+                               </entry>
+                               <entry name="display-no-pass-info" mtime="1326792509" type="schema" stype="bool" owner="gksu">
+                                       <local_schema locale="C" short_desc="Display information message when no password is needed">
+                                               <default type="bool" value="true"/>
+                                               <longdesc>
+       This option determines whether a message dialog will be displayed
+       informing the user that the program is being run without the need
+       of a password being asked for some reason.
+       </longdesc>
+                                       </local_schema>
+                               </entry>
+                               <entry name="prompt" mtime="1326792509" type="schema" stype="bool" owner="gksu">
+                                       <local_schema locale="C" short_desc="Prompt for grabbing">
+                                               <default type="bool" value="false"/>
+                                               <longdesc>
+       This option will make gksu prompt the user if he wants to have
+       the screen grabbed before entering the password. Notice that this
+       only has an effect if force-grab is disabled.
+       </longdesc>
+                                       </local_schema>
+                               </entry>
+                               <entry name="sudo-mode" mtime="1326792509" type="schema" stype="bool" owner="gksu">
+                                       <local_schema locale="C" short_desc="Sudo mode">
+                                               <default type="bool" value="false"/>
+                                               <longdesc>
+       Whether sudo should be the default backend method. This method
+        is otherwise accessed though the -S switch or by running &apos;gksudo&apos;
+        instead of &apos;gksu&apos;.
+       </longdesc>
+                                       </local_schema>
+                               </entry>
+                               <entry name="force-grab" mtime="1326792509" type="schema" stype="bool" owner="gksu">
+                                       <local_schema locale="C" short_desc="Force keyboard and mouse grab">
+                                               <default type="bool" value="false"/>
+                                               <longdesc>
+       Grab keyboard and mouse even if -g has been passed as argument
+       on the command line.
+       </longdesc>
+                                       </local_schema>
+                               </entry>
+                               <entry name="disable-grab" mtime="1326792509" type="schema" stype="bool" owner="gksu">
+                                       <local_schema locale="C" short_desc="Disable keyboard and mouse grab">
+                                               <default type="bool" value="false"/>
+                                               <longdesc>
+       Whether the keyboard and mouse grabbing should be turned
+       off. This will make it possible for other X applications to
+       listen to keyboard input events, thus making it not possible
+       to shield from malicious applications which may be running.
+       </longdesc>
+                                       </local_schema>
+                               </entry>
+                       </dir>
                        <dir name="vinagre">
                                <entry name="always_enable_listening" mtime="1326792465" type="schema" stype="bool" owner="vinagre">
                                        <local_schema locale="C" short_desc="Whether we should start the program listening for reverse connections">
@@ -9460,13 +9542,11 @@ The parser is fairly liberal and allows lower or upper case, and also abbreviati
                                                <entry name="enabled" mtime="1326792465" type="schema" stype="bool" owner="vinagre">
                                                        <local_schema locale="C" short_desc="">
                                                                <default type="bool" value="true"/>
-                                                               <longdesc></longdesc>
                                                        </local_schema>
                                                </entry>
                                                <entry name="needs_terminal" mtime="1326792465" type="schema" stype="bool" owner="vinagre">
                                                        <local_schema locale="C" short_desc="">
                                                                <default type="bool" value="false"/>
-                                                               <longdesc></longdesc>
                                                        </local_schema>
                                                </entry>
                                                <entry name="command" mtime="1326792465" type="schema" stype="string" owner="vinagre">
@@ -9474,7 +9554,6 @@ The parser is fairly liberal and allows lower or upper case, and also abbreviati
                                                                <default type="string">
                                                                        <stringvalue>vinagre %s</stringvalue>
                                                                </default>
-                                                               <longdesc></longdesc>
                                                        </local_schema>
                                                </entry>
                                        </dir>