From a07504fba7b1e695f114548715917682738f797c Mon Sep 17 00:00:00 2001
From: fbrehm <fbrehm@samara.profitbricks.localdomain>
Date: Sun, 19 Feb 2012 21:36:17 +0100
Subject: [PATCH] saving uncommitted changes in /etc prior to emerge run

---
 gconf/gconf.xml.defaults/%gconf-tree.xml | 70 ++++++++++++------------
 1 file changed, 35 insertions(+), 35 deletions(-)

diff --git a/gconf/gconf.xml.defaults/%gconf-tree.xml b/gconf/gconf.xml.defaults/%gconf-tree.xml
index 2a7c462..0915959 100644
--- a/gconf/gconf.xml.defaults/%gconf-tree.xml
+++ b/gconf/gconf.xml.defaults/%gconf-tree.xml
@@ -948,14 +948,14 @@
 		</dir>
 		<dir name="seahorse">
 			<dir name="listing">
-				<entry name="sort_by" mtime="1329422391" schema="/schemas/apps/seahorse/listing/sort_by"/>
-				<entry name="show_type" mtime="1329422391" schema="/schemas/apps/seahorse/listing/show_type"/>
-				<entry name="show_trust" mtime="1329422391" schema="/schemas/apps/seahorse/listing/show_trust"/>
-				<entry name="show_expires" mtime="1329422391" schema="/schemas/apps/seahorse/listing/show_expires"/>
-				<entry name="show_validity" mtime="1329422391" schema="/schemas/apps/seahorse/listing/show_validity"/>
+				<entry name="sort_by" mtime="1329683760" schema="/schemas/apps/seahorse/listing/sort_by"/>
+				<entry name="show_type" mtime="1329683760" schema="/schemas/apps/seahorse/listing/show_type"/>
+				<entry name="show_trust" mtime="1329683760" schema="/schemas/apps/seahorse/listing/show_trust"/>
+				<entry name="show_expires" mtime="1329683760" schema="/schemas/apps/seahorse/listing/show_expires"/>
+				<entry name="show_validity" mtime="1329683760" schema="/schemas/apps/seahorse/listing/show_validity"/>
 			</dir>
 			<dir name="sharing">
-				<entry name="sharing_enabled" mtime="1329422391" schema="/schemas/apps/seahorse/sharing/sharing_enabled"/>
+				<entry name="sharing_enabled" mtime="1329683760" schema="/schemas/apps/seahorse/sharing/sharing_enabled"/>
 			</dir>
 		</dir>
 		<dir name="gnome-power-manager">
@@ -2038,21 +2038,21 @@
 	</dir>
 	<dir name="desktop">
 		<dir name="pgp">
-			<entry name="last_signer_openpgp" mtime="1329422391" schema="/schemas/desktop/pgp/last_signer"/>
-			<entry name="last_signer_openssh" mtime="1329422391" schema="/schemas/desktop/pgp/last_signer"/>
-			<entry name="encrypt_to_self" mtime="1329422391" schema="/schemas/desktop/pgp/encrypt_to_self"/>
-			<entry name="default_key" mtime="1329422391" schema="/schemas/desktop/pgp/default_key"/>
-			<entry name="ascii_armor" mtime="1329422391" schema="/schemas/desktop/pgp/ascii_armor"/>
+			<entry name="last_signer_openpgp" mtime="1329683760" schema="/schemas/desktop/pgp/last_signer"/>
+			<entry name="last_signer_openssh" mtime="1329683760" schema="/schemas/desktop/pgp/last_signer"/>
+			<entry name="encrypt_to_self" mtime="1329683760" schema="/schemas/desktop/pgp/encrypt_to_self"/>
+			<entry name="default_key" mtime="1329683760" schema="/schemas/desktop/pgp/default_key"/>
+			<entry name="ascii_armor" mtime="1329683760" schema="/schemas/desktop/pgp/ascii_armor"/>
 			<dir name="keyservers">
-				<entry name="search_keyservers" mtime="1329422391" schema="/schemas/desktop/pgp/keyservers/search_keyservers"/>
-				<entry name="search_text" mtime="1329422391" schema="/schemas/desktop/pgp/keyservers/search_text"/>
-				<entry name="publish_to" mtime="1329422391" schema="/schemas/desktop/pgp/keyservers/publish_to"/>
-				<entry name="auto_sync" mtime="1329422391" schema="/schemas/desktop/pgp/keyservers/auto_sync"/>
-				<entry name="auto_retrieve" mtime="1329422391" schema="/schemas/desktop/pgp/keyservers/auto_retrieve"/>
-				<entry name="all_keyservers" mtime="1329422391" schema="/schemas/desktop/pgp/keyservers/all_keyservers"/>
+				<entry name="search_keyservers" mtime="1329683760" schema="/schemas/desktop/pgp/keyservers/search_keyservers"/>
+				<entry name="search_text" mtime="1329683760" schema="/schemas/desktop/pgp/keyservers/search_text"/>
+				<entry name="publish_to" mtime="1329683760" schema="/schemas/desktop/pgp/keyservers/publish_to"/>
+				<entry name="auto_sync" mtime="1329683760" schema="/schemas/desktop/pgp/keyservers/auto_sync"/>
+				<entry name="auto_retrieve" mtime="1329683760" schema="/schemas/desktop/pgp/keyservers/auto_retrieve"/>
+				<entry name="all_keyservers" mtime="1329683760" schema="/schemas/desktop/pgp/keyservers/all_keyservers"/>
 			</dir>
 			<dir name="recipients">
-				<entry name="sort_by" mtime="1329422391" schema="/schemas/desktop/pgp/recipients/sort_by"/>
+				<entry name="sort_by" mtime="1329683760" schema="/schemas/desktop/pgp/recipients/sort_by"/>
 			</dir>
 		</dir>
 		<dir name="gnome">
@@ -8887,7 +8887,7 @@
 			</dir>
 			<dir name="seahorse">
 				<dir name="listing">
-					<entry name="sort_by" mtime="1329422391" type="schema" stype="string" owner="seahorse">
+					<entry name="sort_by" mtime="1329683760" type="schema" stype="string" owner="seahorse">
 						<local_schema locale="C" short_desc="The column to sort the seahorse keys by">
 							<default type="string">
 								<stringvalue>name</stringvalue>
@@ -8898,25 +8898,25 @@
                 sort in descending order.</longdesc>
 						</local_schema>
 					</entry>
-					<entry name="show_type" mtime="1329422391" type="schema" stype="bool" owner="seahorse">
+					<entry name="show_type" mtime="1329683760" type="schema" stype="bool" owner="seahorse">
 						<local_schema locale="C" short_desc="Show type column in key manager">
 							<default type="bool" value="false"/>
 							<longdesc>Controls the visibility of the type column for the key manager.</longdesc>
 						</local_schema>
 					</entry>
-					<entry name="show_trust" mtime="1329422391" type="schema" stype="bool" owner="seahorse">
+					<entry name="show_trust" mtime="1329683760" type="schema" stype="bool" owner="seahorse">
 						<local_schema locale="C" short_desc="Show trust column in key manager">
 							<default type="bool" value="false"/>
 							<longdesc>Controls the visibility of the trust column for the key manager.</longdesc>
 						</local_schema>
 					</entry>
-					<entry name="show_expires" mtime="1329422391" type="schema" stype="bool" owner="seahorse">
+					<entry name="show_expires" mtime="1329683760" type="schema" stype="bool" owner="seahorse">
 						<local_schema locale="C" short_desc="Show expires column in key manager">
 							<default type="bool" value="false"/>
 							<longdesc>Controls the visibility of the expires column for the key manager.</longdesc>
 						</local_schema>
 					</entry>
-					<entry name="show_validity" mtime="1329422391" type="schema" stype="bool" owner="seahorse">
+					<entry name="show_validity" mtime="1329683760" type="schema" stype="bool" owner="seahorse">
 						<local_schema locale="C" short_desc="Show validity column in key manager">
 							<default type="bool" value="true"/>
 							<longdesc>Controls the visibility of the validity column for the key manager.</longdesc>
@@ -8924,7 +8924,7 @@
 					</entry>
 				</dir>
 				<dir name="sharing">
-					<entry name="sharing_enabled" mtime="1329422391" type="schema" stype="bool" owner="seahorse">
+					<entry name="sharing_enabled" mtime="1329683760" type="schema" stype="bool" owner="seahorse">
 						<local_schema locale="C" short_desc="Enable DNS-SD sharing">
 							<default type="bool" value="false"/>
 							<longdesc>Enables DNS-SD (Apple Bonjour) sharing of keys. seahorse-daemon 
@@ -15811,7 +15811,7 @@ The parser is fairly liberal and allows lower or upper case, and also abbreviati
 		</dir>
 		<dir name="desktop">
 			<dir name="pgp">
-				<entry name="last_signer" mtime="1329422391" type="schema" stype="string" owner="seahorse">
+				<entry name="last_signer" mtime="1329683760" type="schema" stype="string" owner="seahorse">
 					<local_schema locale="C" short_desc="Last key used to sign a message.">
 						<default type="string">
 							<stringvalue></stringvalue>
@@ -15819,14 +15819,14 @@ The parser is fairly liberal and allows lower or upper case, and also abbreviati
 						<longdesc>The ID of the last secret key used to sign a message.</longdesc>
 					</local_schema>
 				</entry>
-				<entry name="encrypt_to_self" mtime="1329422391" type="schema" stype="bool" owner="seahorse">
+				<entry name="encrypt_to_self" mtime="1329683760" type="schema" stype="bool" owner="seahorse">
 					<local_schema locale="C" short_desc="Whether to always encrypt to default key">
 						<default type="bool" value="false"/>
 						<longdesc>If set to true, then the default key will
 				always be added to an encryption recipients list.</longdesc>
 					</local_schema>
 				</entry>
-				<entry name="default_key" mtime="1329422391" type="schema" stype="string" owner="seahorse">
+				<entry name="default_key" mtime="1329683760" type="schema" stype="string" owner="seahorse">
 					<local_schema locale="C" short_desc="ID of the default key">
 						<default type="string">
 							<stringvalue></stringvalue>
@@ -15835,7 +15835,7 @@ The parser is fairly liberal and allows lower or upper case, and also abbreviati
 				certain operations, mainly signing.</longdesc>
 					</local_schema>
 				</entry>
-				<entry name="ascii_armor" mtime="1329422391" type="schema" stype="bool" owner="seahorse">
+				<entry name="ascii_armor" mtime="1329683760" type="schema" stype="bool" owner="seahorse">
 					<local_schema locale="C" short_desc="Whether to use ASCII Armor">
 						<default type="bool" value="false"/>
 						<longdesc>If set to true, then files encrypted with seahorse
@@ -15843,7 +15843,7 @@ The parser is fairly liberal and allows lower or upper case, and also abbreviati
 					</local_schema>
 				</entry>
 				<dir name="keyservers">
-					<entry name="search_keyservers" mtime="1329422391" type="schema" stype="list" owner="seahorse" list_type="string">
+					<entry name="search_keyservers" mtime="1329683760" type="schema" stype="list" owner="seahorse" list_type="string">
 						<local_schema locale="C" short_desc="Last key servers used">
 							<default type="list" ltype="string">
 							</default>
@@ -15851,7 +15851,7 @@ The parser is fairly liberal and allows lower or upper case, and also abbreviati
  				or empty for all key servers.</longdesc>
 						</local_schema>
 					</entry>
-					<entry name="search_text" mtime="1329422391" type="schema" stype="string" owner="seahorse">
+					<entry name="search_text" mtime="1329683760" type="schema" stype="string" owner="seahorse">
 						<local_schema locale="C" short_desc="Last key server search pattern">
 							<default type="string">
 								<stringvalue></stringvalue>
@@ -15859,7 +15859,7 @@ The parser is fairly liberal and allows lower or upper case, and also abbreviati
 							<longdesc>The last search pattern searched for against a key server.</longdesc>
 						</local_schema>
 					</entry>
-					<entry name="publish_to" mtime="1329422391" type="schema" stype="string" owner="seahorse">
+					<entry name="publish_to" mtime="1329683760" type="schema" stype="string" owner="seahorse">
 						<local_schema locale="C" short_desc="Publish keys to this key server.">
 							<default type="string">
 								<stringvalue></stringvalue>
@@ -15868,21 +15868,21 @@ The parser is fairly liberal and allows lower or upper case, and also abbreviati
                 publishing of PGP keys.</longdesc>
 						</local_schema>
 					</entry>
-					<entry name="auto_sync" mtime="1329422391" type="schema" stype="bool" owner="seahorse">
+					<entry name="auto_sync" mtime="1329683760" type="schema" stype="bool" owner="seahorse">
 						<local_schema locale="C" short_desc="Auto Sync Keys">
 							<default type="bool" value="false"/>
 							<longdesc>Whether or not modified keys should be automatically synced with the default
                 key server.</longdesc>
 						</local_schema>
 					</entry>
-					<entry name="auto_retrieve" mtime="1329422391" type="schema" stype="bool" owner="seahorse">
+					<entry name="auto_retrieve" mtime="1329683760" type="schema" stype="bool" owner="seahorse">
 						<local_schema locale="C" short_desc="Auto Retrieve Keys">
 							<default type="bool" value="false"/>
 							<longdesc>Whether or not keys should be automatically retrieved from key 
                 servers.</longdesc>
 						</local_schema>
 					</entry>
-					<entry name="all_keyservers" mtime="1329422391" type="schema" stype="list" owner="seahorse" list_type="string">
+					<entry name="all_keyservers" mtime="1329683760" type="schema" stype="list" owner="seahorse" list_type="string">
 						<local_schema locale="C" short_desc="PGP Key servers">
 							<default type="list" ltype="string">
 								<li type="string">
@@ -15899,7 +15899,7 @@ The parser is fairly liberal and allows lower or upper case, and also abbreviati
 					</entry>
 				</dir>
 				<dir name="recipients">
-					<entry name="sort_by" mtime="1329422391" type="schema" stype="string" owner="seahorse">
+					<entry name="sort_by" mtime="1329683760" type="schema" stype="string" owner="seahorse">
 						<local_schema locale="C" short_desc="The column to sort the recipients by">
 							<default type="string">
 								<stringvalue>name</stringvalue>
-- 
2.39.5