summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--common/xfconf-dbus.xml4
-rw-r--r--xfconfd/Makefile.am6
-rw-r--r--xfconfd/xfconf-daemon.c132
3 files changed, 73 insertions, 69 deletions
diff --git a/common/xfconf-dbus.xml b/common/xfconf-dbus.xml
index c8e9139..fe8a22d 100644
--- a/common/xfconf-dbus.xml
+++ b/common/xfconf-dbus.xml
@@ -2,6 +2,7 @@
<node name="/org/xfce/Xfconf">
<interface name="org.xfce.Xfconf">
+ <annotation name="org.freedesktop.DBus.GLib.CSymbol" value="xfconf"/>
<!--
void org.xfce.Xfconf.SetProperty(String channel,
@@ -111,6 +112,9 @@
</interface>
<interface name="org.xfce.Xfconf.GUI">
+ <annotation name="org.freedesktop.DBus.GLib.CSymbol"
+ value="xfconf_gui"/>
+
<!--
void org.xfce.Xfconf.GUI.ShowList(String display)
diff --git a/xfconfd/Makefile.am b/xfconfd/Makefile.am
index 010d94d..bfd012e 100644
--- a/xfconfd/Makefile.am
+++ b/xfconfd/Makefile.am
@@ -17,7 +17,7 @@ xfconfd_SOURCES = \
xfconf-backend.h \
xfconf-daemon.c \
xfconf-daemon.h \
- xfconfd-dbus-server.h \
+ xfconf-dbus-server.h \
$(xfconf_backend_sources)
xfconfd_CFLAGS = \
@@ -46,8 +46,8 @@ service_DATA = $(service_in_files:.service.in=.service)
if MAINTAINER_MODE
-xfconfd-dbus-server.h: $(top_srcdir)/common/xfconf-dbus.xml
- dbus-binding-tool --mode=glib-server --prefix=xfconfd $< > $@
+xfconf-dbus-server.h: $(top_srcdir)/common/xfconf-dbus.xml
+ dbus-binding-tool --mode=glib-server --prefix=xfconf $< > $@
endif
diff --git a/xfconfd/xfconf-daemon.c b/xfconfd/xfconf-daemon.c
index 68a13d7..3a42e62 100644
--- a/xfconfd/xfconf-daemon.c
+++ b/xfconfd/xfconf-daemon.c
@@ -30,41 +30,41 @@
#include "xfconf-marshal.h"
-static gboolean xfconfd_set_property(XfconfDaemon *xfconfd,
- const gchar *channel,
- const gchar *property,
- const GValue *value,
- GError **error);
-static gboolean xfconfd_get_property(XfconfDaemon *xfconfd,
- const gchar *channel,
- const gchar *property,
- GValue *value,
- GError **error);
-static gboolean xfconfd_get_all_properties(XfconfDaemon *xfconfd,
- const gchar *channel,
- GHashTable **properties,
- GError **error);
-static gboolean xfconfd_property_exists(XfconfDaemon *xfconfd,
- const gchar *channel,
- const gchar *property,
- gboolean *exists,
- GError **error);
-static gboolean xfconfd_remove_property(XfconfDaemon *xfconfd,
- const gchar *channel,
- const gchar *property,
- GError **error);
-static gboolean xfconfd_remove_channel(XfconfDaemon *xfconfd,
+static gboolean xfconf_set_property(XfconfDaemon *xfconfd,
+ const gchar *channel,
+ const gchar *property,
+ const GValue *value,
+ GError **error);
+static gboolean xfconf_get_property(XfconfDaemon *xfconfd,
+ const gchar *channel,
+ const gchar *property,
+ GValue *value,
+ GError **error);
+static gboolean xfconf_get_all_properties(XfconfDaemon *xfconfd,
+ const gchar *channel,
+ GHashTable **properties,
+ GError **error);
+static gboolean xfconf_property_exists(XfconfDaemon *xfconfd,
const gchar *channel,
+ const gchar *property,
+ gboolean *exists,
+ GError **error);
+static gboolean xfconf_remove_property(XfconfDaemon *xfconfd,
+ const gchar *channel,
+ const gchar *property,
+ GError **error);
+static gboolean xfconf_remove_channel(XfconfDaemon *xfconfd,
+ const gchar *channel,
+ GError **error);
+static gboolean xfconf_gui_show_list(XfconfDaemon *xfconfd,
+ const gchar *display,
+ GError **error);
+static gboolean xfconf_gui_show_plugin(XfconfDaemon *xfconfd,
+ const gchar *display,
+ const gchar *name,
GError **error);
-static gboolean xfconfd_show_list(XfconfDaemon *xfconfd,
- const gchar *display,
- GError **error);
-static gboolean xfconfd_show_plugin(XfconfDaemon *xfconfd,
- const gchar *display,
- const gchar *name,
- GError **error);
-#include "xfconfd-dbus-server.h"
+#include "xfconf-dbus-server.h"
struct _XfconfDaemon
{
@@ -101,7 +101,7 @@ xfconf_daemon_class_init(XfconfDaemonClass *klass)
G_TYPE_STRING, G_TYPE_STRING);
dbus_g_object_type_install_info(G_TYPE_FROM_CLASS(klass),
- &dbus_glib_xfconfd_object_info);
+ &dbus_glib_xfconf_object_info);
}
static void
@@ -129,21 +129,21 @@ xfconf_daemon_finalize(GObject *obj)
static gboolean
-xfconfd_set_property(XfconfDaemon *xfconfd,
- const gchar *channel,
- const gchar *property,
- const GValue *value,
- GError **error)
+xfconf_set_property(XfconfDaemon *xfconfd,
+ const gchar *channel,
+ const gchar *property,
+ const GValue *value,
+ GError **error)
{
return xfconf_backend_set(xfconfd->backend, channel, property, value, error);
}
static gboolean
-xfconfd_get_property(XfconfDaemon *xfconfd,
- const gchar *channel,
- const gchar *property,
- GValue *value,
- GError **error)
+xfconf_get_property(XfconfDaemon *xfconfd,
+ const gchar *channel,
+ const gchar *property,
+ GValue *value,
+ GError **error)
{
/* FIXME: presumably, |value| leaks. how do we fix this? perhaps
* using the org.freedesktop.DBus.GLib.Async annotation? */
@@ -151,10 +151,10 @@ xfconfd_get_property(XfconfDaemon *xfconfd,
}
static gboolean
-xfconfd_get_all_properties(XfconfDaemon *xfconfd,
- const gchar *channel,
- GHashTable **properties,
- GError **error)
+xfconf_get_all_properties(XfconfDaemon *xfconfd,
+ const gchar *channel,
+ GHashTable **properties,
+ GError **error)
{
gboolean ret;
@@ -177,36 +177,36 @@ xfconfd_get_all_properties(XfconfDaemon *xfconfd,
}
static gboolean
-xfconfd_property_exists(XfconfDaemon *xfconfd,
- const gchar *channel,
- const gchar *property,
- gboolean *exists,
- GError **error)
+xfconf_property_exists(XfconfDaemon *xfconfd,
+ const gchar *channel,
+ const gchar *property,
+ gboolean *exists,
+ GError **error)
{
return xfconf_backend_exists(xfconfd->backend, channel, property, exists, error);
}
static gboolean
-xfconfd_remove_property(XfconfDaemon *xfconfd,
- const gchar *channel,
- const gchar *property,
- GError **error)
+xfconf_remove_property(XfconfDaemon *xfconfd,
+ const gchar *channel,
+ const gchar *property,
+ GError **error)
{
return xfconf_backend_remove(xfconfd->backend, channel, property, error);
}
static gboolean
-xfconfd_remove_channel(XfconfDaemon *xfconfd,
- const gchar *channel,
- GError **error)
+xfconf_remove_channel(XfconfDaemon *xfconfd,
+ const gchar *channel,
+ GError **error)
{
return xfconf_backend_remove_channel(xfconfd->backend, channel, error);
}
static gboolean
-xfconfd_show_list(XfconfDaemon *xfconfd,
- const gchar *display,
- GError **error)
+xfconf_gui_show_list(XfconfDaemon *xfconfd,
+ const gchar *display,
+ GError **error)
{
gchar *command;
gboolean ret;
@@ -225,10 +225,10 @@ xfconfd_show_list(XfconfDaemon *xfconfd,
}
static gboolean
-xfconfd_show_plugin(XfconfDaemon *xfconfd,
- const gchar *display,
- const gchar *name,
- GError **error)
+xfconf_gui_show_plugin(XfconfDaemon *xfconfd,
+ const gchar *display,
+ const gchar *name,
+ GError **error)
{
gchar *command;
gboolean ret;
View Lorry Controller Status