summaryrefslogtreecommitdiff
path: root/www
diff options
context:
space:
mode:
authorMaxim Sobolev <sobomax@FreeBSD.org>2000-08-04 11:59:33 +0000
committerMaxim Sobolev <sobomax@FreeBSD.org>2000-08-04 11:59:33 +0000
commit5f79c8595af2e0c69129c60fda173d7f36ce4bbd (patch)
tree6442d27e6d8a58e0c534a408129a295840aa4507 /www
parentFix brokeness caused by gconf shlib version change. (diff)
Fix a keybinding search path (PREFIX/share/gtkhtml --> PREFIX/share/gnome/gtkhtml).
Notes
Notes: svn path=/head/; revision=31313
Diffstat (limited to 'www')
-rw-r--r--www/gtkhtml/files/patch-ad24
-rw-r--r--www/gtkhtml3/files/patch-ad24
-rw-r--r--www/gtkhtml38/files/patch-ad24
-rw-r--r--www/libgtkhtml/files/patch-ad24
4 files changed, 60 insertions, 36 deletions
diff --git a/www/gtkhtml/files/patch-ad b/www/gtkhtml/files/patch-ad
index 4ce5c2dc4b59..10b829cb24bc 100644
--- a/www/gtkhtml/files/patch-ad
+++ b/www/gtkhtml/files/patch-ad
@@ -1,14 +1,20 @@
---- src/gtkhtml.c.orig Mon Jul 10 17:52:30 2000
-+++ src/gtkhtml.c Wed Aug 2 15:38:46 2000
-@@ -1130,3 +1130,3 @@
+--- src/gtkhtml.c.orig Tue Jul 11 01:52:30 2000
++++ src/gtkhtml.c Fri Aug 4 14:35:57 2000
+@@ -1128,7 +1128,7 @@
+ klass->properties = gtk_html_class_properties_new ();
+ #ifdef GTKHTML_HAVE_GCONF
if (gconf_is_initialized ()) {
- gconf_client = gconf_client_new ();
+ gconf_client = gconf_client_get_default ();
if (!gconf_client)
---- capplet/main.c.orig Mon Jun 19 16:33:41 2000
-+++ capplet/main.c Wed Aug 2 15:40:19 2000
-@@ -197,3 +197,3 @@
+ g_error ("cannot create gconf_client\n");
+ gconf_client_add_dir (gconf_client, GTK_HTML_GCONF_DIR, GCONF_CLIENT_PRELOAD_ONELEVEL, &gconf_error);
+@@ -2259,7 +2259,7 @@
-- client = gconf_client_new ();
-+ client = gconf_client_get_default ();
- gconf_client_add_dir(client, GTK_HTML_GCONF_DIR, GCONF_CLIENT_PRELOAD_NONE, NULL);
+ if (strcmp (klass->properties->keybindings_theme, "custom")) {
+ base = g_strconcat ("keybindingsrc.", klass->properties->keybindings_theme, NULL);
+- rcfile = g_concat_dir_and_file (PREFIX "/share/gtkhtml", base);
++ rcfile = g_concat_dir_and_file (PREFIX "/share/gnome/gtkhtml", base);
+ g_free (base);
+ } else {
+ rcfile = g_strconcat (gnome_util_user_home (), "/.gnome/gtkhtml-bindings-custom", NULL);
diff --git a/www/gtkhtml3/files/patch-ad b/www/gtkhtml3/files/patch-ad
index 4ce5c2dc4b59..10b829cb24bc 100644
--- a/www/gtkhtml3/files/patch-ad
+++ b/www/gtkhtml3/files/patch-ad
@@ -1,14 +1,20 @@
---- src/gtkhtml.c.orig Mon Jul 10 17:52:30 2000
-+++ src/gtkhtml.c Wed Aug 2 15:38:46 2000
-@@ -1130,3 +1130,3 @@
+--- src/gtkhtml.c.orig Tue Jul 11 01:52:30 2000
++++ src/gtkhtml.c Fri Aug 4 14:35:57 2000
+@@ -1128,7 +1128,7 @@
+ klass->properties = gtk_html_class_properties_new ();
+ #ifdef GTKHTML_HAVE_GCONF
if (gconf_is_initialized ()) {
- gconf_client = gconf_client_new ();
+ gconf_client = gconf_client_get_default ();
if (!gconf_client)
---- capplet/main.c.orig Mon Jun 19 16:33:41 2000
-+++ capplet/main.c Wed Aug 2 15:40:19 2000
-@@ -197,3 +197,3 @@
+ g_error ("cannot create gconf_client\n");
+ gconf_client_add_dir (gconf_client, GTK_HTML_GCONF_DIR, GCONF_CLIENT_PRELOAD_ONELEVEL, &gconf_error);
+@@ -2259,7 +2259,7 @@
-- client = gconf_client_new ();
-+ client = gconf_client_get_default ();
- gconf_client_add_dir(client, GTK_HTML_GCONF_DIR, GCONF_CLIENT_PRELOAD_NONE, NULL);
+ if (strcmp (klass->properties->keybindings_theme, "custom")) {
+ base = g_strconcat ("keybindingsrc.", klass->properties->keybindings_theme, NULL);
+- rcfile = g_concat_dir_and_file (PREFIX "/share/gtkhtml", base);
++ rcfile = g_concat_dir_and_file (PREFIX "/share/gnome/gtkhtml", base);
+ g_free (base);
+ } else {
+ rcfile = g_strconcat (gnome_util_user_home (), "/.gnome/gtkhtml-bindings-custom", NULL);
diff --git a/www/gtkhtml38/files/patch-ad b/www/gtkhtml38/files/patch-ad
index 4ce5c2dc4b59..10b829cb24bc 100644
--- a/www/gtkhtml38/files/patch-ad
+++ b/www/gtkhtml38/files/patch-ad
@@ -1,14 +1,20 @@
---- src/gtkhtml.c.orig Mon Jul 10 17:52:30 2000
-+++ src/gtkhtml.c Wed Aug 2 15:38:46 2000
-@@ -1130,3 +1130,3 @@
+--- src/gtkhtml.c.orig Tue Jul 11 01:52:30 2000
++++ src/gtkhtml.c Fri Aug 4 14:35:57 2000
+@@ -1128,7 +1128,7 @@
+ klass->properties = gtk_html_class_properties_new ();
+ #ifdef GTKHTML_HAVE_GCONF
if (gconf_is_initialized ()) {
- gconf_client = gconf_client_new ();
+ gconf_client = gconf_client_get_default ();
if (!gconf_client)
---- capplet/main.c.orig Mon Jun 19 16:33:41 2000
-+++ capplet/main.c Wed Aug 2 15:40:19 2000
-@@ -197,3 +197,3 @@
+ g_error ("cannot create gconf_client\n");
+ gconf_client_add_dir (gconf_client, GTK_HTML_GCONF_DIR, GCONF_CLIENT_PRELOAD_ONELEVEL, &gconf_error);
+@@ -2259,7 +2259,7 @@
-- client = gconf_client_new ();
-+ client = gconf_client_get_default ();
- gconf_client_add_dir(client, GTK_HTML_GCONF_DIR, GCONF_CLIENT_PRELOAD_NONE, NULL);
+ if (strcmp (klass->properties->keybindings_theme, "custom")) {
+ base = g_strconcat ("keybindingsrc.", klass->properties->keybindings_theme, NULL);
+- rcfile = g_concat_dir_and_file (PREFIX "/share/gtkhtml", base);
++ rcfile = g_concat_dir_and_file (PREFIX "/share/gnome/gtkhtml", base);
+ g_free (base);
+ } else {
+ rcfile = g_strconcat (gnome_util_user_home (), "/.gnome/gtkhtml-bindings-custom", NULL);
diff --git a/www/libgtkhtml/files/patch-ad b/www/libgtkhtml/files/patch-ad
index 4ce5c2dc4b59..10b829cb24bc 100644
--- a/www/libgtkhtml/files/patch-ad
+++ b/www/libgtkhtml/files/patch-ad
@@ -1,14 +1,20 @@
---- src/gtkhtml.c.orig Mon Jul 10 17:52:30 2000
-+++ src/gtkhtml.c Wed Aug 2 15:38:46 2000
-@@ -1130,3 +1130,3 @@
+--- src/gtkhtml.c.orig Tue Jul 11 01:52:30 2000
++++ src/gtkhtml.c Fri Aug 4 14:35:57 2000
+@@ -1128,7 +1128,7 @@
+ klass->properties = gtk_html_class_properties_new ();
+ #ifdef GTKHTML_HAVE_GCONF
if (gconf_is_initialized ()) {
- gconf_client = gconf_client_new ();
+ gconf_client = gconf_client_get_default ();
if (!gconf_client)
---- capplet/main.c.orig Mon Jun 19 16:33:41 2000
-+++ capplet/main.c Wed Aug 2 15:40:19 2000
-@@ -197,3 +197,3 @@
+ g_error ("cannot create gconf_client\n");
+ gconf_client_add_dir (gconf_client, GTK_HTML_GCONF_DIR, GCONF_CLIENT_PRELOAD_ONELEVEL, &gconf_error);
+@@ -2259,7 +2259,7 @@
-- client = gconf_client_new ();
-+ client = gconf_client_get_default ();
- gconf_client_add_dir(client, GTK_HTML_GCONF_DIR, GCONF_CLIENT_PRELOAD_NONE, NULL);
+ if (strcmp (klass->properties->keybindings_theme, "custom")) {
+ base = g_strconcat ("keybindingsrc.", klass->properties->keybindings_theme, NULL);
+- rcfile = g_concat_dir_and_file (PREFIX "/share/gtkhtml", base);
++ rcfile = g_concat_dir_and_file (PREFIX "/share/gnome/gtkhtml", base);
+ g_free (base);
+ } else {
+ rcfile = g_strconcat (gnome_util_user_home (), "/.gnome/gtkhtml-bindings-custom", NULL);
generated by cgit v1.2.3 (git 2.25.1) at 2024-09-03 17:16:54 +0000