1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
|
From: Teus Benschop <teusjannette@gmail.com>
Date: Sat, 17 Nov 2018 16:38:45 +0100
Subject: remove gconf-2.0 from source
---
src/gnome2/gui.c | 66 --------------------------------------------------------
src/gui/gui.h | 7 ------
2 files changed, 73 deletions(-)
diff --git a/src/gnome2/gui.c b/src/gnome2/gui.c
index 5fc4ca3..23fb120 100644
--- a/src/gnome2/gui.c
+++ b/src/gnome2/gui.c
@@ -68,9 +68,6 @@ void gui_init(int argc, char *argv[])
if (!gtk_init_with_args(&argc, &argv, NULL, NULL, NULL, NULL)) {
exit(1);
};
-#ifndef WIN32
- gconf_setup();
-#endif
#ifdef HAVE_DBUS
ipc = ipc_init_dbus_connection(ipc);
#endif
@@ -81,69 +78,6 @@ void gui_main(void)
gtk_main();
}
-/******************************************************************************
- * Name
- * gconf_setup
- *
- * Synopsis
- * #include "main/settings.h"
- *
- * void gconf_setup()
- *
- * Description
- * verifies and initializes the GConf subsystem, so that "sword://" and
- * similar can be handled by url-comprehending programs such as browsers.
- * dialogs for permission/success/failure => conditional on debug build.
- *
- * Return value
- * void
- */
-
-/* NOTE: removed query for user permission to install handlers around -r4528. */
-/* we don't ask any more, because there's no good reason not to take over. */
-
-char *gconf_keys[GS_GCONF_MAX][2] = {
- {"/desktop/gnome/url-handlers/bible/command", "xiphos-nav \"%s\""},
- {"/desktop/gnome/url-handlers/bible/enabled", (char *)1},
- {"/desktop/gnome/url-handlers/bible/needs_terminal", (char *)0},
- {"/desktop/gnome/url-handlers/sword/command", "xiphos-nav \"%s\""},
- {"/desktop/gnome/url-handlers/sword/enabled", (char *)1},
- {"/desktop/gnome/url-handlers/sword/needs_terminal", (char *)0}};
-
-#ifndef WIN32
-void gconf_setup()
-{
- gchar *str;
- GConfClient *client = gconf_client_get_default();
-
- if (client == NULL)
- return; /* we're not running under GConf */
-
- /*
- * This is deliberately somewhat simple-minded, at least for now.
- * We care about one thing: Is anything set to handle "bible://"?
- *
- * Unfortunate consequence of changing xiphos2 => xiphos:
- * We must fix broken keys.
- */
- if ((((str = gconf_client_get_string(client, gconf_keys[0][0],
- NULL)) == NULL) ||
- (strncmp(str, "xiphos ", 7) == 0))) {
- /*
- * Mechanical as can be, one after another.
- */
- int i;
- for (i = 0; i < GS_GCONF_MAX; ++i) {
- (((i % 3) == 0) /* contrived hack */
- ? gconf_client_set_string(client, gconf_keys[i][0], gconf_keys[i][1], NULL)
- : gconf_client_set_bool(client,
- gconf_keys[i][0],
- (gconf_keys[i][1] ? TRUE : FALSE), NULL));
- }
- }
-}
-#endif /* WIN32 */
-
#ifdef DEBUG
/* NOTE: these routines are here only and exactly because there is no other */
diff --git a/src/gui/gui.h b/src/gui/gui.h
index a6628e6..202e7ca 100644
--- a/src/gui/gui.h
+++ b/src/gui/gui.h
@@ -4,13 +4,6 @@
void gui_init(int argc, char *argv[]);
void gui_main(void);
-#ifndef WIN32
-#include <gconf/gconf-client.h>
-void gconf_setup(void);
-#endif
-
-#define GS_GCONF_MAX 6
-
#ifdef DEBUG
gchar *XI_g_strdup_printf(const char *filename,
|
