diff options
| author | Maxim Sobolev <sobomax@FreeBSD.org> | 2000-08-04 11:59:33 +0000 |
|---|---|---|
| committer | Maxim Sobolev <sobomax@FreeBSD.org> | 2000-08-04 11:59:33 +0000 |
| commit | 5f79c8595af2e0c69129c60fda173d7f36ce4bbd (patch) | |
| tree | 6442d27e6d8a58e0c534a408129a295840aa4507 /www/libgtkhtml/files/patch-ad | |
| parent | Fix brokeness caused by gconf shlib version change. (diff) | |
Fix a keybinding search path (PREFIX/share/gtkhtml --> PREFIX/share/gnome/gtkhtml).
Diffstat (limited to 'www/libgtkhtml/files/patch-ad')
| -rw-r--r-- | www/libgtkhtml/files/patch-ad | 24 |
1 files changed, 15 insertions, 9 deletions
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); |