forked from flathub/org.xfce.ristretto
-
Notifications
You must be signed in to change notification settings - Fork 0
/
Rename-org.xfce.Xfconf-to-org.xfce.ristretto.Xfconf.patch
277 lines (244 loc) · 11.5 KB
/
Rename-org.xfce.Xfconf-to-org.xfce.ristretto.Xfconf.patch
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
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
226
227
228
229
230
231
232
233
234
235
236
237
238
239
240
241
242
243
244
245
246
247
248
249
250
251
252
253
254
255
256
257
258
259
260
261
262
263
264
265
266
267
268
269
270
271
272
273
274
275
276
From 4e952f1c63f784c7ad0d705ff833ed4a8df5fb0b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ga=C3=ABl=20Bonithon?= <[email protected]>
Date: Thu, 7 Oct 2021 12:50:12 +0200
Subject: [PATCH] Rename org.xfce.Xfconf to org.xfce.ristretto.Xfconf
---
.gitignore | 2 +-
common/Makefile.am | 4 ++--
common/xfconf-dbus.xml | 22 +++++++++----------
common/xfconf-errors.c | 20 ++++++++---------
tests/tests-common.h | 4 ++--
xfconf/xfconf-cache.c | 4 ++--
xfconf/xfconf.c | 8 +++----
xfconfd/Makefile.am | 2 +-
xfconfd/main.c | 4 ++--
...n => org.xfce.ristretto.Xfconf.service.in} | 2 +-
xfconfd/xfconf-daemon.c | 2 +-
11 files changed, 37 insertions(+), 37 deletions(-)
rename xfconfd/{org.xfce.Xfconf.service.in => org.xfce.ristretto.Xfconf.service.in} (63%)
diff --git a/.gitignore b/.gitignore
index 5a0cdf1..485fcdc 100644
--- a/.gitignore
+++ b/.gitignore
@@ -110,4 +110,4 @@ xfconf/libxfconf-0.vapi
xfconf-query/xfconf-query
xfconfd/xfconfd
xfconfd/xfconf-dbus-server.h
-xfconfd/org.xfce.Xfconf.service
+xfconfd/org.xfce.ristretto.Xfconf.service
diff --git a/common/Makefile.am b/common/Makefile.am
index 95cfbfb..dd731da 100644
--- a/common/Makefile.am
+++ b/common/Makefile.am
@@ -70,8 +70,8 @@ xfconf-marshal.c: $(srcdir)/xfconf-marshal.list Makefile
xfconf-gdbus-bindings.h:
xfconf-gdbus-bindings.c: xfconf-dbus.xml Makefile
$(AM_V_GEN) $(GDBUS_CODEGEN) \
- --interface-prefix org.xfce.Xfconf \
- --annotate "org.xfce.Xfconf" "org.gtk.GDBus.C.Name" Exported \
+ --interface-prefix org.xfce.ristretto.Xfconf \
+ --annotate "org.xfce.ristretto.Xfconf" "org.gtk.GDBus.C.Name" Exported \
--c-namespace Xfconf \
--generate-c-code xfconf-gdbus-bindings \
$<
diff --git a/common/xfconf-dbus.xml b/common/xfconf-dbus.xml
index 3430392..efbe489 100644
--- a/common/xfconf-dbus.xml
+++ b/common/xfconf-dbus.xml
@@ -1,9 +1,9 @@
<?xml version="1.0" encoding="UTF-8"?>
-<node name="/org/xfce/Xfconf">
- <interface name="org.xfce.Xfconf">
+<node name="/org/xfce/ristretto/Xfconf">
+ <interface name="org.xfce.ristretto.Xfconf">
<!--
- void org.xfce.Xfconf.SetProperty(String channel,
+ void org.xfce.ristretto.Xfconf.SetProperty(String channel,
String property,
Variant value)
@@ -21,7 +21,7 @@
</method>
<!--
- Variant org.xfce.Xfconf.GetProperty(String channel,
+ Variant org.xfce.ristretto.Xfconf.GetProperty(String channel,
String property)
@channel: A channel/application/namespace name.
@@ -36,7 +36,7 @@
</method>
<!--
- Array{String,Variant} org.xfce.Xfconf.GetAllProperties(String channel,
+ Array{String,Variant} org.xfce.ristretto.Xfconf.GetAllProperties(String channel,
String property_base)
@channel: A channel/application/namespace name.
@@ -58,7 +58,7 @@
</method>
<!--
- Boolean org.xfce.Xfconf.PropertyExists(String channel,
+ Boolean org.xfce.ristretto.Xfconf.PropertyExists(String channel,
String property)
@channel: A channel/application/namespace name.
@@ -75,7 +75,7 @@
</method>
<!--
- void org.xfce.Xfconf.ResetProperty(String channel,
+ void org.xfce.ristretto.Xfconf.ResetProperty(String channel,
String property,
Boolean recursive)
@@ -105,7 +105,7 @@
</method>
<!--
- Array{String} org.xfce.Xfconf.ListChannels()
+ Array{String} org.xfce.ristretto.Xfconf.ListChannels()
Returns a list of all known channels as an array of
strings.
@@ -115,7 +115,7 @@
</method>
<!--
- Boolean org.xfce.Xfconf.IsPropertyLocked(String channel,
+ Boolean org.xfce.ristretto.Xfconf.IsPropertyLocked(String channel,
String property)
@channel: A channel/application/namespace name.
@@ -134,7 +134,7 @@
</method>
<!--
- void org.xfce.Xfconf.PropertyChanged(String channel,
+ void org.xfce.ristretto.Xfconf.PropertyChanged(String channel,
String property.
Variant value)
@@ -151,7 +151,7 @@
</signal>
<!--
- void org.xfce.Xfconf.PropertyRemoved(String channel,
+ void org.xfce.ristretto.Xfconf.PropertyRemoved(String channel,
String property)
@channel: A channel/application/namespace name.
diff --git a/common/xfconf-errors.c b/common/xfconf-errors.c
index 8f261e6..18d7699 100644
--- a/common/xfconf-errors.c
+++ b/common/xfconf-errors.c
@@ -38,16 +38,16 @@
static const GDBusErrorEntry xfconf_daemon_dbus_error_entries[] =
{
- { XFCONF_ERROR_UNKNOWN, "org.xfce.Xfconf.Error.Unknown" },
- { XFCONF_ERROR_CHANNEL_NOT_FOUND, "org.xfce.Xfconf.Error.ChannelNotFound" },
- { XFCONF_ERROR_PROPERTY_NOT_FOUND, "org.xfce.Xfconf.Error.PropertyNotFound" },
- { XFCONF_ERROR_READ_FAILURE, "org.xfce.Xfconf.Error.ReadFailure" },
- { XFCONF_ERROR_WRITE_FAILURE, "org.xfce.Xfconf.Error.WriteFailure" },
- { XFCONF_ERROR_PERMISSION_DENIED, "org.xfce.Xfconf.Error.PermissionDenied" },
- { XFCONF_ERROR_INTERNAL_ERROR, "org.xfce.Xfconf.Error.InternalError" },
- { XFCONF_ERROR_NO_BACKEND, "org.xfce.Xfconf.Error.NoBackend" },
- { XFCONF_ERROR_INVALID_PROPERTY, "org.xfce.Xfconf.Error.InvalidProperty" },
- { XFCONF_ERROR_INVALID_CHANNEL, "org.xfce.Xfconf.Error.InvalidChannel" },
+ { XFCONF_ERROR_UNKNOWN, "org.xfce.ristretto.Xfconf.Error.Unknown" },
+ { XFCONF_ERROR_CHANNEL_NOT_FOUND, "org.xfce.ristretto.Xfconf.Error.ChannelNotFound" },
+ { XFCONF_ERROR_PROPERTY_NOT_FOUND, "org.xfce.ristretto.Xfconf.Error.PropertyNotFound" },
+ { XFCONF_ERROR_READ_FAILURE, "org.xfce.ristretto.Xfconf.Error.ReadFailure" },
+ { XFCONF_ERROR_WRITE_FAILURE, "org.xfce.ristretto.Xfconf.Error.WriteFailure" },
+ { XFCONF_ERROR_PERMISSION_DENIED, "org.xfce.ristretto.Xfconf.Error.PermissionDenied" },
+ { XFCONF_ERROR_INTERNAL_ERROR, "org.xfce.ristretto.Xfconf.Error.InternalError" },
+ { XFCONF_ERROR_NO_BACKEND, "org.xfce.ristretto.Xfconf.Error.NoBackend" },
+ { XFCONF_ERROR_INVALID_PROPERTY, "org.xfce.ristretto.Xfconf.Error.InvalidProperty" },
+ { XFCONF_ERROR_INVALID_CHANNEL, "org.xfce.ristretto.Xfconf.Error.InvalidChannel" },
};
/**
diff --git a/tests/tests-common.h b/tests/tests-common.h
index 28eb3d6..80e5635 100644
--- a/tests/tests-common.h
+++ b/tests/tests-common.h
@@ -89,8 +89,8 @@ xfconf_tests_start(void)
xfconf_tests_end();
return FALSE;
}
- msg = g_dbus_message_new_method_call("org.xfce.XfconfTest",
- "/org/xfce/Xfconf",
+ msg = g_dbus_message_new_method_call("org.xfce.ristretto.XfconfTest",
+ "/org/xfce/ristretto/Xfconf",
"org.freedesktop.DBus.Peer",
"Ping");
g_get_current_time(&start);
diff --git a/xfconf/xfconf-cache.c b/xfconf/xfconf-cache.c
index 1a0d536..c1eb280 100644
--- a/xfconf/xfconf-cache.c
+++ b/xfconf/xfconf-cache.c
@@ -841,8 +841,8 @@ xfconf_cache_set(XfconfCache *cache,
if(G_LIKELY(g_dbus_error_is_remote_error (tmp_error)))
dbus_error_name = g_dbus_error_get_remote_error (tmp_error);
- if(g_strcmp0(dbus_error_name, "org.xfce.Xfconf.Error.PropertyNotFound") != 0
- && g_strcmp0(dbus_error_name, "org.xfce.Xfconf.Error.ChannelNotFound") != 0)
+ if(g_strcmp0(dbus_error_name, "org.xfce.ristretto.Xfconf.Error.PropertyNotFound") != 0
+ && g_strcmp0(dbus_error_name, "org.xfce.ristretto.Xfconf.Error.ChannelNotFound") != 0)
{
/* this is bad... */
g_propagate_error(error, tmp_error);
diff --git a/xfconf/xfconf.c b/xfconf/xfconf.c
index 3291a8b..f61c736 100644
--- a/xfconf/xfconf.c
+++ b/xfconf/xfconf.c
@@ -41,8 +41,8 @@ static GDBusConnection *gdbus = NULL;
static GDBusProxy *gproxy = NULL;
static GHashTable *named_structs = NULL;
-#define XFCONF_DBUS_NAME "org.xfce.Xfconf"
-#define XFCONF_DBUS_NAME_TEST "org.xfce.XfconfTest"
+#define XFCONF_DBUS_NAME "org.xfce.ristretto.Xfconf"
+#define XFCONF_DBUS_NAME_TEST "org.xfce.ristretto.XfconfTest"
/* private api */
@@ -128,8 +128,8 @@ xfconf_init(GError **error)
G_DBUS_PROXY_FLAGS_NONE,
NULL,
is_test_mode == NULL ? XFCONF_DBUS_NAME : XFCONF_DBUS_NAME_TEST,
- "/org/xfce/Xfconf",
- "org.xfce.Xfconf",
+ "/org/xfce/ristretto/Xfconf",
+ "org.xfce.ristretto.Xfconf",
NULL,
NULL);
diff --git a/xfconfd/Makefile.am b/xfconfd/Makefile.am
index d7fdfcb..2c3a5ee 100644
--- a/xfconfd/Makefile.am
+++ b/xfconfd/Makefile.am
@@ -55,7 +55,7 @@ xfconfd_LDADD = \
$(LIBXFCE4UTIL_LIBS)
servicedir = $(datadir)/dbus-1/services
-service_in_files = org.xfce.Xfconf.service.in
+service_in_files = org.xfce.ristretto.Xfconf.service.in
service_DATA = $(service_in_files:.service.in=.service)
%.service: %.service.in
diff --git a/xfconfd/main.c b/xfconfd/main.c
index 3fbca0e..616a008 100644
--- a/xfconfd/main.c
+++ b/xfconfd/main.c
@@ -55,8 +55,8 @@
#include "xfconf-backend-factory.h"
#define DEFAULT_BACKEND "xfce-perchannel-xml"
-#define XFCONF_DBUS_NAME "org.xfce.Xfconf"
-#define XFCONF_DBUS_NAME_TEST "org.xfce.XfconfTest"
+#define XFCONF_DBUS_NAME "org.xfce.ristretto.Xfconf"
+#define XFCONF_DBUS_NAME_TEST "org.xfce.ristretto.XfconfTest"
enum
{
diff --git a/xfconfd/org.xfce.Xfconf.service.in b/xfconfd/org.xfce.ristretto.Xfconf.service.in
similarity index 63%
rename from xfconfd/org.xfce.Xfconf.service.in
rename to xfconfd/org.xfce.ristretto.Xfconf.service.in
index 58f6680..33f12f4 100644
--- a/xfconfd/org.xfce.Xfconf.service.in
+++ b/xfconfd/org.xfce.ristretto.Xfconf.service.in
@@ -1,3 +1,3 @@
[D-BUS Service]
-Name=org.xfce.Xfconf
+Name=org.xfce.ristretto.Xfconf
Exec=@HELPERDIR@/xfce4/xfconf/xfconfd
diff --git a/xfconfd/xfconf-daemon.c b/xfconfd/xfconf-daemon.c
index fbe5da3..ea5d85e 100644
--- a/xfconfd/xfconf-daemon.c
+++ b/xfconfd/xfconf-daemon.c
@@ -441,7 +441,7 @@ xfconf_daemon_start(XfconfDaemon *xfconfd,
ret =
g_dbus_interface_skeleton_export (G_DBUS_INTERFACE_SKELETON(xfconfd),
xfconfd->conn,
- "/org/xfce/Xfconf",
+ "/org/xfce/ristretto/Xfconf",
error);
if (ret == FALSE)
--
2.33.0