Current state

diff --git a/gconf/gconf.xml.defaults/%gconf-tree.xml b/gconf/gconf.xml.defaults/%gconf-tree.xml
index a534f0d86d58f07d59a84c07d2db9abf5374e9f4..c2fa66278004510a51af675e366c878278f4d5a5 100644 (file)
--- a/gconf/gconf.xml.defaults/%gconf-tree.xml
+++ b/gconf/gconf.xml.defaults/%gconf-tree.xml
@@ -19790,13 +19790,13 @@ The parser is fairly liberal and allows lower or upper case, and also abbreviati
                                                </entry>
                                        </dir>
                                        <dir name="ymsgr">
-                                               <entry name="needs_terminal" mtime="1362859471" type="schema" stype="bool" owner="purple">
+                                               <entry name="needs_terminal" mtime="1363167058" type="schema" stype="bool" owner="purple">
                                                        <local_schema locale="C" short_desc="Run the command in a terminal">
                                                                <default type="bool" value="false"/>
                                                                <longdesc>True if the command used to handle this type of URL should be run in a terminal.</longdesc>
                                                        </local_schema>
                                                </entry>
-                                               <entry name="command" mtime="1362859471" type="schema" stype="string" owner="purple">
+                                               <entry name="command" mtime="1363167058" type="schema" stype="string" owner="purple">
                                                        <local_schema locale="C" short_desc="The handler for &quot;ymsgr&quot; URLs">
                                                                <default type="string">
                                                                        <stringvalue>purple-url-handler &quot;%s&quot;</stringvalue>
@@ -19804,7 +19804,7 @@ The parser is fairly liberal and allows lower or upper case, and also abbreviati
                                                                <longdesc>The command used to handle &quot;ymsgr&quot; URLs, if enabled.</longdesc>
                                                        </local_schema>
                                                </entry>
-                                               <entry name="enabled" mtime="1362859471" type="schema" stype="bool" owner="purple">
+                                               <entry name="enabled" mtime="1363167058" type="schema" stype="bool" owner="purple">
                                                        <local_schema locale="C" short_desc="Whether the specified command should handle &quot;ymsgr&quot; URLs">
                                                                <default type="bool" value="true"/>
                                                                <longdesc>True if the command specified in the &quot;command&quot; key should handle &quot;ymsgr&quot; URLs.</longdesc>
@@ -19812,13 +19812,13 @@ The parser is fairly liberal and allows lower or upper case, and also abbreviati
                                                </entry>
                                        </dir>
                                        <dir name="xmpp">
-                                               <entry name="needs_terminal" mtime="1362859471" type="schema" stype="bool" owner="purple">
+                                               <entry name="needs_terminal" mtime="1363167058" type="schema" stype="bool" owner="purple">
                                                        <local_schema locale="C" short_desc="Run the command in a terminal">
                                                                <default type="bool" value="false"/>
                                                                <longdesc>True if the command used to handle this type of URL should be run in a terminal.</longdesc>
                                                        </local_schema>
                                                </entry>
-                                               <entry name="command" mtime="1362859471" type="schema" stype="string" owner="purple">
+                                               <entry name="command" mtime="1363167058" type="schema" stype="string" owner="purple">
                                                        <local_schema locale="C" short_desc="The handler for &quot;xmpp&quot; URLs">
                                                                <default type="string">
                                                                        <stringvalue>purple-url-handler &quot;%s&quot;</stringvalue>
@@ -19826,7 +19826,7 @@ The parser is fairly liberal and allows lower or upper case, and also abbreviati
                                                                <longdesc>The command used to handle &quot;xmpp&quot; URLs, if enabled.</longdesc>
                                                        </local_schema>
                                                </entry>
-                                               <entry name="enabled" mtime="1362859471" type="schema" stype="bool" owner="purple">
+                                               <entry name="enabled" mtime="1363167058" type="schema" stype="bool" owner="purple">
                                                        <local_schema locale="C" short_desc="Whether the specified command should handle &quot;xmpp&quot; URLs">
                                                                <default type="bool" value="true"/>
                                                                <longdesc>True if the command specified in the &quot;command&quot; key should handle &quot;xmpp&quot; URLs.</longdesc>
@@ -19834,13 +19834,13 @@ The parser is fairly liberal and allows lower or upper case, and also abbreviati
                                                </entry>
                                        </dir>
                                        <dir name="sip">
-                                               <entry name="needs_terminal" mtime="1362859471" type="schema" stype="bool" owner="purple">
+                                               <entry name="needs_terminal" mtime="1363167058" type="schema" stype="bool" owner="purple">
                                                        <local_schema locale="C" short_desc="Run the command in a terminal">
                                                                <default type="bool" value="false"/>
                                                                <longdesc>True if the command used to handle this type of URL should be run in a terminal.</longdesc>
                                                        </local_schema>
                                                </entry>
-                                               <entry name="command" mtime="1362859471" type="schema" stype="string" owner="purple">
+                                               <entry name="command" mtime="1363167058" type="schema" stype="string" owner="purple">
                                                        <local_schema locale="C" short_desc="The handler for &quot;sip&quot; URLs">
                                                                <default type="string">
                                                                        <stringvalue>purple-url-handler &quot;%s&quot;</stringvalue>
@@ -19848,7 +19848,7 @@ The parser is fairly liberal and allows lower or upper case, and also abbreviati
                                                                <longdesc>The command used to handle &quot;sip&quot; URLs, if enabled.</longdesc>
                                                        </local_schema>
                                                </entry>
-                                               <entry name="enabled" mtime="1362859471" type="schema" stype="bool" owner="purple">
+                                               <entry name="enabled" mtime="1363167058" type="schema" stype="bool" owner="purple">
                                                        <local_schema locale="C" short_desc="Whether the specified command should handle &quot;sip&quot; URLs">
                                                                <default type="bool" value="true"/>
                                                                <longdesc>True if the command specified in the &quot;command&quot; key should handle &quot;sip&quot; URLs.</longdesc>
@@ -19856,13 +19856,13 @@ The parser is fairly liberal and allows lower or upper case, and also abbreviati
                                                </entry>
                                        </dir>
                                        <dir name="msnim">
-                                               <entry name="needs_terminal" mtime="1362859471" type="schema" stype="bool" owner="purple">
+                                               <entry name="needs_terminal" mtime="1363167058" type="schema" stype="bool" owner="purple">
                                                        <local_schema locale="C" short_desc="Run the command in a terminal">
                                                                <default type="bool" value="false"/>
                                                                <longdesc>True if the command used to handle this type of URL should be run in a terminal.</longdesc>
                                                        </local_schema>
                                                </entry>
-                                               <entry name="command" mtime="1362859471" type="schema" stype="string" owner="purple">
+                                               <entry name="command" mtime="1363167058" type="schema" stype="string" owner="purple">
                                                        <local_schema locale="C" short_desc="The handler for &quot;msnim&quot; URLs">
                                                                <default type="string">
                                                                        <stringvalue>purple-url-handler &quot;%s&quot;</stringvalue>
@@ -19870,7 +19870,7 @@ The parser is fairly liberal and allows lower or upper case, and also abbreviati
                                                                <longdesc>The command used to handle &quot;msnim&quot; URLs, if enabled.</longdesc>
                                                        </local_schema>
                                                </entry>
-                                               <entry name="enabled" mtime="1362859471" type="schema" stype="bool" owner="purple">
+                                               <entry name="enabled" mtime="1363167058" type="schema" stype="bool" owner="purple">
                                                        <local_schema locale="C" short_desc="Whether the specified command should handle &quot;msnim&quot; URLs">
                                                                <default type="bool" value="true"/>
                                                                <longdesc>True if the command specified in the &quot;command&quot; key should handle &quot;msnim&quot; URLs.</longdesc>
@@ -19878,13 +19878,13 @@ The parser is fairly liberal and allows lower or upper case, and also abbreviati
                                                </entry>
                                        </dir>
                                        <dir name="irc">
-                                               <entry name="needs_terminal" mtime="1362859471" type="schema" stype="bool" owner="purple">
+                                               <entry name="needs_terminal" mtime="1363167058" type="schema" stype="bool" owner="purple">
                                                        <local_schema locale="C" short_desc="Run the command in a terminal">
                                                                <default type="bool" value="false"/>
                                                                <longdesc>True if the command used to handle this type of URL should be run in a terminal.</longdesc>
                                                        </local_schema>
                                                </entry>
-                                               <entry name="command" mtime="1362859471" type="schema" stype="string" owner="purple">
+                                               <entry name="command" mtime="1363167058" type="schema" stype="string" owner="purple">
                                                        <local_schema locale="C" short_desc="The handler for &quot;irc&quot; URLs">
                                                                <default type="string">
                                                                        <stringvalue>purple-url-handler &quot;%s&quot;</stringvalue>
@@ -19892,7 +19892,7 @@ The parser is fairly liberal and allows lower or upper case, and also abbreviati
                                                                <longdesc>The command used to handle &quot;irc&quot; URLs, if enabled.</longdesc>
                                                        </local_schema>
                                                </entry>
-                                               <entry name="enabled" mtime="1362859471" type="schema" stype="bool" owner="purple">
+                                               <entry name="enabled" mtime="1363167058" type="schema" stype="bool" owner="purple">
                                                        <local_schema locale="C" short_desc="Whether the specified command should handle &quot;irc&quot; URLs">
                                                                <default type="bool" value="true"/>
                                                                <longdesc>True if the command specified in the &quot;command&quot; key should handle &quot;irc&quot; URLs.</longdesc>
@@ -19900,13 +19900,13 @@ The parser is fairly liberal and allows lower or upper case, and also abbreviati
                                                </entry>
                                        </dir>
                                        <dir name="icq">
-                                               <entry name="needs_terminal" mtime="1362859471" type="schema" stype="bool" owner="purple">
+                                               <entry name="needs_terminal" mtime="1363167058" type="schema" stype="bool" owner="purple">
                                                        <local_schema locale="C" short_desc="Run the command in a terminal">
                                                                <default type="bool" value="false"/>
                                                                <longdesc>True if the command used to handle this type of URL should be run in a terminal.</longdesc>
                                                        </local_schema>
                                                </entry>
-                                               <entry name="command" mtime="1362859471" type="schema" stype="string" owner="purple">
+                                               <entry name="command" mtime="1363167058" type="schema" stype="string" owner="purple">
                                                        <local_schema locale="C" short_desc="The handler for &quot;icq&quot; URLs">
                                                                <default type="string">
                                                                        <stringvalue>purple-url-handler &quot;%s&quot;</stringvalue>
@@ -19914,7 +19914,7 @@ The parser is fairly liberal and allows lower or upper case, and also abbreviati
                                                                <longdesc>The command used to handle &quot;icq&quot; URLs, if enabled.</longdesc>
                                                        </local_schema>
                                                </entry>
-                                               <entry name="enabled" mtime="1362859471" type="schema" stype="bool" owner="purple">
+                                               <entry name="enabled" mtime="1363167058" type="schema" stype="bool" owner="purple">
                                                        <local_schema locale="C" short_desc="Whether the specified command should handle &quot;icq&quot; URLs">
                                                                <default type="bool" value="true"/>
                                                                <longdesc>True if the command specified in the &quot;command&quot; key should handle &quot;icq&quot; URLs.</longdesc>
@@ -19922,13 +19922,13 @@ The parser is fairly liberal and allows lower or upper case, and also abbreviati
                                                </entry>
                                        </dir>
                                        <dir name="gg">
-                                               <entry name="needs_terminal" mtime="1362859471" type="schema" stype="bool" owner="purple">
+                                               <entry name="needs_terminal" mtime="1363167058" type="schema" stype="bool" owner="purple">
                                                        <local_schema locale="C" short_desc="Run the command in a terminal">
                                                                <default type="bool" value="false"/>
                                                                <longdesc>True if the command used to handle this type of URL should be run in a terminal.</longdesc>
                                                        </local_schema>
                                                </entry>
-                                               <entry name="command" mtime="1362859471" type="schema" stype="string" owner="purple">
+                                               <entry name="command" mtime="1363167058" type="schema" stype="string" owner="purple">
                                                        <local_schema locale="C" short_desc="The handler for &quot;gg&quot; URLs">
                                                                <default type="string">
                                                                        <stringvalue>purple-url-handler &quot;%s&quot;</stringvalue>
@@ -19936,7 +19936,7 @@ The parser is fairly liberal and allows lower or upper case, and also abbreviati
                                                                <longdesc>The command used to handle &quot;gg&quot; URLs, if enabled.</longdesc>
                                                        </local_schema>
                                                </entry>
-                                               <entry name="enabled" mtime="1362859471" type="schema" stype="bool" owner="purple">
+                                               <entry name="enabled" mtime="1363167058" type="schema" stype="bool" owner="purple">
                                                        <local_schema locale="C" short_desc="Whether the specified command should handle &quot;gg&quot; URLs">
                                                                <default type="bool" value="true"/>
                                                                <longdesc>True if the command specified in the &quot;command&quot; key should handle &quot;gg&quot; URLs.</longdesc>
@@ -19988,13 +19988,13 @@ The parser is fairly liberal and allows lower or upper case, and also abbreviati
                                                </entry>
                                        </dir>
                                        <dir name="aim">
-                                               <entry name="needs_terminal" mtime="1362859471" type="schema" stype="bool" owner="purple">
+                                               <entry name="needs_terminal" mtime="1363167058" type="schema" stype="bool" owner="purple">
                                                        <local_schema locale="C" short_desc="Run the command in a terminal">
                                                                <default type="bool" value="false"/>
                                                                <longdesc>True if the command used to handle this type of URL should be run in a terminal.</longdesc>
                                                        </local_schema>
                                                </entry>
-                                               <entry name="command" mtime="1362859471" type="schema" stype="string" owner="purple">
+                                               <entry name="command" mtime="1363167058" type="schema" stype="string" owner="purple">
                                                        <local_schema locale="C" short_desc="The handler for &quot;aim&quot; URLs">
                                                                <default type="string">
                                                                        <stringvalue>purple-url-handler &quot;%s&quot;</stringvalue>
@@ -20002,7 +20002,7 @@ The parser is fairly liberal and allows lower or upper case, and also abbreviati
                                                                <longdesc>The command used to handle &quot;aim&quot; URLs, if enabled.</longdesc>
                                                        </local_schema>
                                                </entry>
-                                               <entry name="enabled" mtime="1362859471" type="schema" stype="bool" owner="purple">
+                                               <entry name="enabled" mtime="1363167058" type="schema" stype="bool" owner="purple">
                                                        <local_schema locale="C" short_desc="Whether the specified command should handle &quot;aim&quot; URLs">
                                                                <default type="bool" value="true"/>
                                                                <longdesc>True if the command specified in the &quot;command&quot; key should handle &quot;aim&quot; URLs.</longdesc>
@@ -21188,39 +21188,39 @@ The parser is fairly liberal and allows lower or upper case, and also abbreviati
                                        <entry name="command" mtime="1362855762" schema="/schemas/desktop/gnome/url-handlers/vnc/command"/>
                                </dir>
                                <dir name="ymsgr">
-                                       <entry name="needs_terminal" mtime="1362859471" schema="/schemas/desktop/gnome/url-handlers/ymsgr/needs_terminal"/>
-                                       <entry name="command" mtime="1362859471" schema="/schemas/desktop/gnome/url-handlers/ymsgr/command"/>
-                                       <entry name="enabled" mtime="1362859471" schema="/schemas/desktop/gnome/url-handlers/ymsgr/enabled"/>
+                                       <entry name="needs_terminal" mtime="1363167058" schema="/schemas/desktop/gnome/url-handlers/ymsgr/needs_terminal"/>
+                                       <entry name="command" mtime="1363167058" schema="/schemas/desktop/gnome/url-handlers/ymsgr/command"/>
+                                       <entry name="enabled" mtime="1363167058" schema="/schemas/desktop/gnome/url-handlers/ymsgr/enabled"/>
                                </dir>
                                <dir name="xmpp">
-                                       <entry name="needs_terminal" mtime="1362859471" schema="/schemas/desktop/gnome/url-handlers/xmpp/needs_terminal"/>
-                                       <entry name="command" mtime="1362859471" schema="/schemas/desktop/gnome/url-handlers/xmpp/command"/>
-                                       <entry name="enabled" mtime="1362859471" schema="/schemas/desktop/gnome/url-handlers/xmpp/enabled"/>
+                                       <entry name="needs_terminal" mtime="1363167058" schema="/schemas/desktop/gnome/url-handlers/xmpp/needs_terminal"/>
+                                       <entry name="command" mtime="1363167058" schema="/schemas/desktop/gnome/url-handlers/xmpp/command"/>
+                                       <entry name="enabled" mtime="1363167058" schema="/schemas/desktop/gnome/url-handlers/xmpp/enabled"/>
                                </dir>
                                <dir name="sip">
-                                       <entry name="needs_terminal" mtime="1362859471" schema="/schemas/desktop/gnome/url-handlers/sip/needs_terminal"/>
-                                       <entry name="command" mtime="1362859471" schema="/schemas/desktop/gnome/url-handlers/sip/command"/>
-                                       <entry name="enabled" mtime="1362859471" schema="/schemas/desktop/gnome/url-handlers/sip/enabled"/>
+                                       <entry name="needs_terminal" mtime="1363167058" schema="/schemas/desktop/gnome/url-handlers/sip/needs_terminal"/>
+                                       <entry name="command" mtime="1363167058" schema="/schemas/desktop/gnome/url-handlers/sip/command"/>
+                                       <entry name="enabled" mtime="1363167058" schema="/schemas/desktop/gnome/url-handlers/sip/enabled"/>
                                </dir>
                                <dir name="msnim">
-                                       <entry name="needs_terminal" mtime="1362859471" schema="/schemas/desktop/gnome/url-handlers/msnim/needs_terminal"/>
-                                       <entry name="command" mtime="1362859471" schema="/schemas/desktop/gnome/url-handlers/msnim/command"/>
-                                       <entry name="enabled" mtime="1362859471" schema="/schemas/desktop/gnome/url-handlers/msnim/enabled"/>
+                                       <entry name="needs_terminal" mtime="1363167058" schema="/schemas/desktop/gnome/url-handlers/msnim/needs_terminal"/>
+                                       <entry name="command" mtime="1363167058" schema="/schemas/desktop/gnome/url-handlers/msnim/command"/>
+                                       <entry name="enabled" mtime="1363167058" schema="/schemas/desktop/gnome/url-handlers/msnim/enabled"/>
                                </dir>
                                <dir name="irc">
-                                       <entry name="needs_terminal" mtime="1362859471" schema="/schemas/desktop/gnome/url-handlers/irc/needs_terminal"/>
-                                       <entry name="command" mtime="1362859471" schema="/schemas/desktop/gnome/url-handlers/irc/command"/>
-                                       <entry name="enabled" mtime="1362859471" schema="/schemas/desktop/gnome/url-handlers/irc/enabled"/>
+                                       <entry name="needs_terminal" mtime="1363167058" schema="/schemas/desktop/gnome/url-handlers/irc/needs_terminal"/>
+                                       <entry name="command" mtime="1363167058" schema="/schemas/desktop/gnome/url-handlers/irc/command"/>
+                                       <entry name="enabled" mtime="1363167058" schema="/schemas/desktop/gnome/url-handlers/irc/enabled"/>
                                </dir>
                                <dir name="icq">
-                                       <entry name="needs_terminal" mtime="1362859471" schema="/schemas/desktop/gnome/url-handlers/icq/needs_terminal"/>
-                                       <entry name="command" mtime="1362859471" schema="/schemas/desktop/gnome/url-handlers/icq/command"/>
-                                       <entry name="enabled" mtime="1362859471" schema="/schemas/desktop/gnome/url-handlers/icq/enabled"/>
+                                       <entry name="needs_terminal" mtime="1363167058" schema="/schemas/desktop/gnome/url-handlers/icq/needs_terminal"/>
+                                       <entry name="command" mtime="1363167058" schema="/schemas/desktop/gnome/url-handlers/icq/command"/>
+                                       <entry name="enabled" mtime="1363167058" schema="/schemas/desktop/gnome/url-handlers/icq/enabled"/>
                                </dir>
                                <dir name="gg">
-                                       <entry name="needs_terminal" mtime="1362859471" schema="/schemas/desktop/gnome/url-handlers/gg/needs_terminal"/>
-                                       <entry name="command" mtime="1362859471" schema="/schemas/desktop/gnome/url-handlers/gg/command"/>
-                                       <entry name="enabled" mtime="1362859471" schema="/schemas/desktop/gnome/url-handlers/gg/enabled"/>
+                                       <entry name="needs_terminal" mtime="1363167058" schema="/schemas/desktop/gnome/url-handlers/gg/needs_terminal"/>
+                                       <entry name="command" mtime="1363167058" schema="/schemas/desktop/gnome/url-handlers/gg/command"/>
+                                       <entry name="enabled" mtime="1363167058" schema="/schemas/desktop/gnome/url-handlers/gg/enabled"/>
                                </dir>
                                <dir name="h323">
                                        <entry name="needs_terminal" mtime="1362854593" schema="/schemas/desktop/gnome/url-handlers/h323/needs_terminal"/>
@@ -21233,9 +21233,9 @@ The parser is fairly liberal and allows lower or upper case, and also abbreviati
                                        <entry name="enabled" mtime="1362854593" schema="/schemas/desktop/gnome/url-handlers/callto/enabled"/>
                                </dir>
                                <dir name="aim">
-                                       <entry name="needs_terminal" mtime="1362859471" schema="/schemas/desktop/gnome/url-handlers/aim/needs_terminal"/>
-                                       <entry name="command" mtime="1362859471" schema="/schemas/desktop/gnome/url-handlers/aim/command"/>
-                                       <entry name="enabled" mtime="1362859471" schema="/schemas/desktop/gnome/url-handlers/aim/enabled"/>
+                                       <entry name="needs_terminal" mtime="1363167058" schema="/schemas/desktop/gnome/url-handlers/aim/needs_terminal"/>
+                                       <entry name="command" mtime="1363167058" schema="/schemas/desktop/gnome/url-handlers/aim/command"/>
+                                       <entry name="enabled" mtime="1363167058" schema="/schemas/desktop/gnome/url-handlers/aim/enabled"/>
                                </dir>
                                <dir name="mailto">
                                        <entry name="needs_terminal" mtime="1362854593" schema="/schemas/desktop/gnome/url-handlers/mailto/needs_terminal"/>

diff --git a/xml/catalog b/xml/catalog
index 88dcdd82ff2947f7851d0fa2c3906f176316cdea..15deabd9b1b29904e6c8eb20886ce76e94e01fac 100644 (file)
--- a/xml/catalog
+++ b/xml/catalog
@@ -8,6 +8,7 @@
   <rewriteURI uriStartString="http://www.w3.org/TR/xhtml1/DTD" rewritePrefix="/usr/share/sgml/xhtml1"/>
   <public publicId="-//OMF//DTD Scrollkeeper OMF Variant V1.0//EN" uri="/usr/share/xml/scrollkeeper/dtds/scrollkeeper-omf.dtd"/>
   <system systemId="http://scrollkeeper.sourceforge.net/dtds/scrollkeeper-omf-1.0/scrollkeeper-omf.dtd" uri="/usr/share/xml/scrollkeeper/dtds/scrollkeeper-omf.dtd"/>
+  <system systemId="http://glade.gnome.org/glade-2.0.dtd" uri="/usr/share/xml/libglade/glade-2.0.dtd"/>
   <delegatePublic publicIdStartString="-//OASIS//ENTITIES DocBook" catalog="file:///etc/xml/docbook"/>
   <delegatePublic publicIdStartString="-//OASIS//ELEMENTS DocBook" catalog="file:///etc/xml/docbook"/>
   <delegatePublic publicIdStartString="-//OASIS//DTD DocBook" catalog="file:///etc/xml/docbook"/>
@@ -16,5 +17,4 @@
   <delegatePublic publicIdStartString="ISO 8879:1986" catalog="file:///etc/xml/docbook"/>
   <delegateSystem systemIdStartString="http://docbook.sourceforge.net/release/xsl/" catalog="file:///etc/xml/docbook"/>
   <delegateURI uriStartString="http://docbook.sourceforge.net/release/xsl/" catalog="file:///etc/xml/docbook"/>
-  <system systemId="http://glade.gnome.org/glade-2.0.dtd" uri="/usr/share/xml/libglade/glade-2.0.dtd"/>
 </catalog>