The attached patch changes the GNOME URL schemas a bit, in accordance with some changes in the way the capplet operates, and updates gnome_url_show to match. May I commit? -- ======================================================================== Bradford Hovinen Hacker http://www.cis.udel.edu/~hovinen/ Ximian Desktop team hovinen ximian com Ximian, Inc. Now what is history? It is the centuries of systematic explorations of the riddle of death, with a view to overcoming death. That's why people discover mathematical infinity and electromagnetic waves, that's why they write symphonies. - Boris Pasternak, Doctor Zhivago
? fix-gnome-url.patch
? fix-url-show.patch
? stamp-h1
Index: ChangeLog
===================================================================
RCS file: /cvs/gnome/libgnome/ChangeLog,v
retrieving revision 1.131
diff -u -r1.131 ChangeLog
--- ChangeLog 2002/01/25 20:07:56 1.131
+++ ChangeLog 2002/01/28 19:39:49
@@ -1,3 +1,9 @@
+2002-01-27 Bradford Hovinen <hovinen ximian com>
+
+ * libgnome/gnome-url.c (gnome_url_show): Update key name to match
+ schema
+ (gnome_url_default_handler): Update key names to match schemas
+
2002-01-25 Darin Adler <darin bentspoon com>
* help-converters/gnome-vfs-module/help-method.c: Remove unused include <ctype.h>.
@@ -110,6 +116,10 @@
* monikers/GNOME_Moniker_std.server.in.in: the GNOME std monikers
are in libmoniker_extra_2.so, not libmoniker_std_2.so
+
+2002-01-12 Hasbullah Bin Pit <sebol ikhlas com>
+
+ * Added Malay (ms) Translation in configure.in
2002-01-11 Rodrigo Moya <rodrigo gnome-db org>
Index: libgnome/gnome-url.c
===================================================================
RCS file: /cvs/gnome/libgnome/libgnome/gnome-url.c,v
retrieving revision 1.35
diff -u -r1.35 gnome-url.c
--- libgnome/gnome-url.c 2001/12/27 01:41:13 1.35
+++ libgnome/gnome-url.c 2002/01/28 19:39:49
@@ -63,7 +63,7 @@
client = gconf_client_get_default ();
- str = gconf_client_get_string (client, "/desktop/gnome/url-handlers/default-show", NULL);
+ str = gconf_client_get_string (client, "/desktop/gnome/url-handlers/unknown/command", NULL);
if (str) {
default_handler = str;
@@ -79,19 +79,19 @@
app = "gnome-help-browser \"%s\"";
default_handler = DEFAULT_HANDLER;
- gconf_client_set_string (client, "/desktop/gnome/url-handlers/default-show",
+ gconf_client_set_string (client, "/desktop/gnome/url-handlers/unknown/command",
default_handler, NULL);
- if (gconf_client_dir_exists (client, "/desktop/gnome/url-handlers/info-show", NULL) == FALSE) {
- gconf_client_set_string (client, "/desktop/gnome/url-handlers/info-show", app, NULL);
+ if (gconf_client_dir_exists (client, "/desktop/gnome/url-handlers/info", NULL) == FALSE) {
+ gconf_client_set_string (client, "/desktop/gnome/url-handlers/info/command", app, NULL);
}
- if (gconf_client_dir_exists (client, "/desktop/gnome/url-handlers/man-show", NULL) == FALSE) {
- gconf_client_set_string (client, "/desktop/gnome/url-handlers/man-show", app, NULL);
+ if (gconf_client_dir_exists (client, "/desktop/gnome/url-handlers/man", NULL) == FALSE) {
+ gconf_client_set_string (client, "/desktop/gnome/url-handlers/man/command", app, NULL);
}
- if (gconf_client_dir_exists (client, "/desktop/gnome/url-handlers/ghelp-show", NULL) == FALSE) {
- gconf_client_set_string (client, "/desktop/gnome/url-handlers/ghelp-show", app, NULL);
+ if (gconf_client_dir_exists (client, "/desktop/gnome/url-handlers/ghelp", NULL) == FALSE) {
+ gconf_client_set_string (client, "/desktop/gnome/url-handlers/ghelp/command", app, NULL);
}
}
@@ -154,7 +154,7 @@
/* init our gconf stuff if necessary */
gnome_gconf_lazy_init ();
- path = g_strconcat ("/desktop/gnome/url-handlers/", protocol, "-show", NULL);
+ path = g_strconcat ("/desktop/gnome/url-handlers/", protocol, "/command", NULL);
client = gconf_client_get_default ();
template = gconf_client_get_string (client, path, NULL);
Index: schemas/desktop_gnome_url_handlers.schemas
===================================================================
RCS file: /cvs/gnome/libgnome/schemas/desktop_gnome_url_handlers.schemas,v
retrieving revision 1.1
diff -u -r1.1 desktop_gnome_url_handlers.schemas
--- schemas/desktop_gnome_url_handlers.schemas 2001/12/14 21:22:22 1.1
+++ schemas/desktop_gnome_url_handlers.schemas 2002/01/28 19:39:49
@@ -2,29 +2,131 @@
<gconfschemafile>
<schemalist>
<schema>
- <applyto>/desktop/gnome/url-handlers/default-show</applyto>
- <key>/schemas/desktop/gnome/url-handlers/default-show</key>
+ <applyto>/desktop/gnome/url-handlers/unknown/type</applyto>
+ <key>/schemas/desktop/gnome/url-handlers/unknown/type</key>
<owner>gnome</owner>
+ <type>bool</type>
+ <default>true</default>
+ <locale name="C">
+ <short>How to handle unknown URLs</short>
+ <long>Set to true to have a program specified in programs/unknown handle unknown URLs</long>
+ </locale>
+ </schema>
+ <schema>
+ <applyto>/desktop/gnome/url-handlers/unknown/command</applyto>
+ <key>/schemas/desktop/gnome/url-handlers/unknown/command</key>
+ <owner>gnome</owner>
<type>string</type>
+ <locale name="C">
+ <short>Unknown URL show handler</short>
+ <long>Unknown URL show handler</long>
+ </locale>
+ </schema>
+ <schema>
+ <applyto>/desktop/gnome/url-handlers/unknown/need-terminal</applyto>
+ <key>/schemas/desktop/gnome/url-handlers/unknown/need-terminal</key>
+ <owner>gnome</owner>
+ <type>bool</type>
+ <default>false</default>
+ <locale name="C">
+ <short>Run program in terminal</short>
+ <long>True if the program to handle this URL should be run in a terminal</long>
+ </locale>
+ </schema>
+
+ <schema>
+ <applyto>/desktop/gnome/url-handlers/http/type</applyto>
+ <key>/schemas/desktop/gnome/url-handlers/http/type</key>
+ <owner>gnome</owner>
+ <type>bool</type>
+ <default>false</default>
+ <locale name="C">
+ <short>How to handle http URLs</short>
+ <long>Set to true to have a program specified in programs/http handle http URLs</long>
+ </locale>
+ </schema>
+
+ <schema>
+ <applyto>/desktop/gnome/url-handlers/ftp/type</applyto>
+ <key>/schemas/desktop/gnome/url-handlers/ftp/type</key>
+ <owner>gnome</owner>
+ <type>bool</type>
+ <default>false</default>
<locale name="C">
- <short>Default URL show handler</short>
- <long>Default URL show handler</long>
+ <short>How to handle http URLs</short>
+ <long>Set to true to have a program specified in programs/ftp handle ftp URLs</long>
</locale>
</schema>
<schema>
- <applyto>/desktop/gnome/url-handlers/info-show</applyto>
- <key>/schemas/desktop/gnome/url-handlers/info-show</key>
+ <applyto>/desktop/gnome/url-handlers/ftp/command</applyto>
+ <key>/schemas/desktop/gnome/url-handlers/ftp/command</key>
<owner>gnome</owner>
<type>string</type>
<locale name="C">
+ <short>URL handler for ftp directories</short>
+ <long>URL handler for ftp directories</long>
+ </locale>
+ </schema>
+ <schema>
+ <applyto>/desktop/gnome/url-handlers/ftp/need-terminal</applyto>
+ <key>/schemas/desktop/gnome/url-handlers/ftp/need-terminal</key>
+ <owner>gnome</owner>
+ <type>bool</type>
+ <default>false</default>
+ <locale name="C">
+ <short>Run program in terminal</short>
+ <long>True if the program to handle this URL should be run in a terminal</long>
+ </locale>
+ </schema>
+
+ <schema>
+ <applyto>/desktop/gnome/url-handlers/info/type</applyto>
+ <key>/schemas/desktop/gnome/url-handlers/info/type</key>
+ <owner>gnome</owner>
+ <type>bool</type>
+ <default>true</default>
+ <locale name="C">
+ <short>How to handle info URLs</short>
+ <long>Set to true to have a program specified in programs/info handle info URLs</long>
+ </locale>
+ </schema>
+ <schema>
+ <applyto>/desktop/gnome/url-handlers/info/command</applyto>
+ <key>/schemas/desktop/gnome/url-handlers/info/command</key>
+ <owner>gnome</owner>
+ <type>string</type>
+ <locale name="C">
<short>URL handler for info pages</short>
<long>URL handler for info pages</long>
</locale>
</schema>
<schema>
- <applyto>/desktop/gnome/url-handlers/man-show</applyto>
- <key>/schemas/desktop/gnome/url-handlers/man-show</key>
+ <applyto>/desktop/gnome/url-handlers/info/need-terminal</applyto>
+ <key>/schemas/desktop/gnome/url-handlers/info/need-terminal</key>
<owner>gnome</owner>
+ <type>bool</type>
+ <default>false</default>
+ <locale name="C">
+ <short>Run program in terminal</short>
+ <long>True if the program to handle this URL should be run in a terminal</long>
+ </locale>
+ </schema>
+
+ <schema>
+ <applyto>/desktop/gnome/url-handlers/man/type</applyto>
+ <key>/schemas/desktop/gnome/url-handlers/man/type</key>
+ <owner>gnome</owner>
+ <type>bool</type>
+ <default>true</default>
+ <locale name="C">
+ <short>How to handle unknown URLs</short>
+ <long>Set to true to have a program specified in programs/man handle man URLs</long>
+ </locale>
+ </schema>
+ <schema>
+ <applyto>/desktop/gnome/url-handlers/man/command</applyto>
+ <key>/schemas/desktop/gnome/url-handlers/man/command</key>
+ <owner>gnome</owner>
<type>string</type>
<locale name="C">
<short>URL handler for man pages</short>
@@ -32,13 +134,14 @@
</locale>
</schema>
<schema>
- <applyto>/desktop/gnome/url-handlers/ghelp-show</applyto>
- <key>/schemas/desktop/gnome/url-handlers/ghelp-show</key>
+ <applyto>/desktop/gnome/url-handlers/man/need-terminal</applyto>
+ <key>/schemas/desktop/gnome/url-handlers/man/need-terminal</key>
<owner>gnome</owner>
- <type>string</type>
+ <type>bool</type>
+ <default>false</default>
<locale name="C">
- <short>URL handler for gnome help pages</short>
- <long>URL handler for gnome help pages</long>
+ <short>Run program in terminal</short>
+ <long>True if the program to handle this URL should be run in a terminal</long>
</locale>
</schema>
</schemalist>
Attachment:
signature.asc
Description: This is a digitally signed message part