Commit c1dd7e2d authored by Nick Schermer's avatar Nick Schermer

Rename xfce4-settings-helper to xfsettingsd.

The name is waaay better.
parent b912244a
......@@ -2,9 +2,9 @@
SUBDIRS = \
dialogs \
xfce4-settings-helper \
xfce4-settings-manager \
xfce4-settings-editor \
xfsettingsd \
po
EXTRA_DIST = \
......
......@@ -211,7 +211,7 @@ dialogs/accessibility-settings/Makefile
dialogs/display-settings/Makefile
dialogs/keyboard-settings/Makefile
dialogs/mouse-settings/Makefile
xfce4-settings-helper/Makefile
xfsettingsd/Makefile
xfce4-settings-manager/Makefile
xfce4-settings-editor/Makefile
])
......
......@@ -29,12 +29,12 @@ xfce4-settings-editor/main_window.c
xfce4-settings-editor/xfce4-settings-editor.desktop.in
xfce4-settings-editor/xfce4-settings-editor.glade
xfce4-settings-helper/accessibility.c
xfce4-settings-helper/keyboard-layout.c
xfce4-settings-helper/keyboard-shortcuts.c
xfce4-settings-helper/main.c
xfce4-settings-helper/workspaces.c
xfce4-settings-helper/xsettings.c
xfsettingsd/accessibility.c
xfsettingsd/keyboard-layout.c
xfsettingsd/keyboard-shortcuts.c
xfsettingsd/main.c
xfsettingsd/workspaces.c
xfsettingsd/xsettings.c
xfce4-settings-manager/main.c
xfce4-settings-manager/xfce-settings-manager-dialog.c
......
......@@ -6,14 +6,14 @@ INCLUDES = \
-DBINDIR=\"$(bindir)\" \
-DSRCDIR=\"$(top_srcdir)\" \
-DLOCALEDIR=\"$(localedir)\" \
-DG_LOG_DOMAIN=\"xfce4-settings-helper\" \
-DG_LOG_DOMAIN=\"xfsettingsd\" \
-DAUTOSTART_FILENAME=\"$(autostart_DATA)\" \
$(PLATFORM_CPPFLAGS)
bin_PROGRAMS = \
xfce4-settings-helper
xfsettingsd
xfce4_settings_helper_SOURCES = \
xfsettingsd_SOURCES = \
main.c \
accessibility.c \
accessibility.h \
......@@ -32,7 +32,7 @@ xfce4_settings_helper_SOURCES = \
xsettings.c \
xsettings.h
xfce4_settings_helper_CFLAGS = \
xfsettingsd_CFLAGS = \
-I$(top_builddir) \
-I$(top_srcdir) \
$(GTK_CFLAGS) \
......@@ -49,11 +49,11 @@ xfce4_settings_helper_CFLAGS = \
$(LIBNOTIFY_CFLAGS) \
$(PLATFORM_CFLAGS)
xfce4_settings_helper_LDFLAGS = \
xfsettingsd_LDFLAGS = \
-no-undefined \
$(PLATFORM_LDFLAGS)
xfce4_settings_helper_LDADD = \
xfsettingsd_LDADD = \
$(GTK_LIBS) \
$(GLIB_LIBS) \
$(GTHREAD_LIBS) \
......@@ -71,14 +71,14 @@ xfce4_settings_helper_LDADD = \
# Optional support for the display settings
#
if HAVE_XRANDR
xfce4_settings_helper_SOURCES += \
xfsettingsd_SOURCES += \
displays.c \
displays.h
xfce4_settings_helper_CFLAGS += \
xfsettingsd_CFLAGS += \
$(XRANDR_CFLAGS)
xfce4_settings_helper_LDADD += \
xfsettingsd_LDADD += \
$(XRANDR_LIBS)
endif
......@@ -86,7 +86,7 @@ settingsdir = $(sysconfdir)/xdg/xfce4/xfconf/xfce-perchannel-xml
settings_DATA = xsettings.xml
autostartdir = $(sysconfdir)/xdg/autostart
autostart_DATA = xfce4-settings-helper-autostart.desktop
autostart_DATA = xfsettingsd-autostart.desktop
EXTRA_DIST = \
$(settings_DATA) \
......
......@@ -63,7 +63,7 @@
#include "displays.h"
#endif
#define HELPER_DBUS_NAME "org.xfce.SettingsHelper"
#define HELPER_DBUS_NAME "org.xfce.SettingsDaemon"
static XfceSMClient *sm_client = NULL;
......
[Desktop Entry]
Version=1.0
Name=Xfce Settings Helper
Exec=xfce4-settings-helper
Name=Xfce Settings Daemon
Exec=xfsettingsd
Terminal=false
Type=Application
StartupNotify=false
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment