[Xfce4-commits] <xfce4-settings:nick/xsettingsd-merge> Rename xfce4-settings-helper to xfsettingsd.

Tue Feb 22 23:26:01 CET 2011

Updating branch refs/heads/nick/xsettingsd-merge
         to c32944ac1359fde89e18469c945a1698f257694f (commit)
       from 5de265e1c054b01cdc27dc3d3cb81f90df8878c6 (commit)

commit c32944ac1359fde89e18469c945a1698f257694f
Author: Nick Schermer <nick at xfce.org>
Date:   Tue Feb 22 23:24:19 2011 +0100

    Rename xfce4-settings-helper to xfsettingsd.
    
    The name is waaay better.

 Makefile.am                                        |    2 +-
 configure.ac.in                                    |    2 +-
 po/POTFILES.in                                     |   12 ++++++------
 {xfce4-settings-helper => xfsettingsd}/Makefile.am |   20 ++++++++++----------
 .../accessibility.c                                |    0
 .../accessibility.h                                |    0
 .../clipboard-manager.c                            |    0
 .../clipboard-manager.h                            |    0
 {xfce4-settings-helper => xfsettingsd}/displays.c  |    0
 {xfce4-settings-helper => xfsettingsd}/displays.h  |    0
 .../keyboard-layout.c                              |    0
 .../keyboard-layout.h                              |    0
 .../keyboard-shortcuts.c                           |    0
 .../keyboard-shortcuts.h                           |    0
 {xfce4-settings-helper => xfsettingsd}/keyboards.c |    0
 {xfce4-settings-helper => xfsettingsd}/keyboards.h |    0
 {xfce4-settings-helper => xfsettingsd}/main.c      |    2 +-
 {xfce4-settings-helper => xfsettingsd}/pointers.c  |    0
 {xfce4-settings-helper => xfsettingsd}/pointers.h  |    0
 .../workspaces.c                                   |    0
 .../workspaces.h                                   |    0
 .../xfsettingsd-autostart.desktop                  |    4 ++--
 {xfce4-settings-helper => xfsettingsd}/xsettings.c |    0
 {xfce4-settings-helper => xfsettingsd}/xsettings.h |    0
 .../xsettings.xml                                  |    0
 25 files changed, 21 insertions(+), 21 deletions(-)

diff --git a/Makefile.am b/Makefile.am
index 4d1a319..3060bac 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -2,9 +2,9 @@
 
 SUBDIRS = \
 	dialogs \
-	xfce4-settings-helper \
 	xfce4-settings-manager \
 	xfce4-settings-editor \
+	xfsettingsd \
 	po
 
 EXTRA_DIST = \
diff --git a/configure.ac.in b/configure.ac.in
index 6b1735a..cfcea35 100644
--- a/configure.ac.in
+++ b/configure.ac.in
@@ -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
 ])
diff --git a/po/POTFILES.in b/po/POTFILES.in
index 387110c..4076595 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -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
diff --git a/xfce4-settings-helper/Makefile.am b/xfsettingsd/Makefile.am
similarity index 81%
rename from xfce4-settings-helper/Makefile.am
rename to xfsettingsd/Makefile.am
index 33f6692..646176d 100644
--- a/xfce4-settings-helper/Makefile.am
+++ b/xfsettingsd/Makefile.am
@@ -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) \
diff --git a/xfce4-settings-helper/accessibility.c b/xfsettingsd/accessibility.c
similarity index 100%
rename from xfce4-settings-helper/accessibility.c
rename to xfsettingsd/accessibility.c
diff --git a/xfce4-settings-helper/accessibility.h b/xfsettingsd/accessibility.h
similarity index 100%
rename from xfce4-settings-helper/accessibility.h
rename to xfsettingsd/accessibility.h
diff --git a/xfce4-settings-helper/clipboard-manager.c b/xfsettingsd/clipboard-manager.c
similarity index 100%
rename from xfce4-settings-helper/clipboard-manager.c
rename to xfsettingsd/clipboard-manager.c
diff --git a/xfce4-settings-helper/clipboard-manager.h b/xfsettingsd/clipboard-manager.h
similarity index 100%
rename from xfce4-settings-helper/clipboard-manager.h
rename to xfsettingsd/clipboard-manager.h
diff --git a/xfce4-settings-helper/displays.c b/xfsettingsd/displays.c
similarity index 100%
rename from xfce4-settings-helper/displays.c
rename to xfsettingsd/displays.c
diff --git a/xfce4-settings-helper/displays.h b/xfsettingsd/displays.h
similarity index 100%
rename from xfce4-settings-helper/displays.h
rename to xfsettingsd/displays.h
diff --git a/xfce4-settings-helper/keyboard-layout.c b/xfsettingsd/keyboard-layout.c
similarity index 100%
rename from xfce4-settings-helper/keyboard-layout.c
rename to xfsettingsd/keyboard-layout.c
diff --git a/xfce4-settings-helper/keyboard-layout.h b/xfsettingsd/keyboard-layout.h
similarity index 100%
rename from xfce4-settings-helper/keyboard-layout.h
rename to xfsettingsd/keyboard-layout.h
diff --git a/xfce4-settings-helper/keyboard-shortcuts.c b/xfsettingsd/keyboard-shortcuts.c
similarity index 100%
rename from xfce4-settings-helper/keyboard-shortcuts.c
rename to xfsettingsd/keyboard-shortcuts.c
diff --git a/xfce4-settings-helper/keyboard-shortcuts.h b/xfsettingsd/keyboard-shortcuts.h
similarity index 100%
rename from xfce4-settings-helper/keyboard-shortcuts.h
rename to xfsettingsd/keyboard-shortcuts.h
diff --git a/xfce4-settings-helper/keyboards.c b/xfsettingsd/keyboards.c
similarity index 100%
rename from xfce4-settings-helper/keyboards.c
rename to xfsettingsd/keyboards.c
diff --git a/xfce4-settings-helper/keyboards.h b/xfsettingsd/keyboards.h
similarity index 100%
rename from xfce4-settings-helper/keyboards.h
rename to xfsettingsd/keyboards.h
diff --git a/xfce4-settings-helper/main.c b/xfsettingsd/main.c
similarity index 99%
rename from xfce4-settings-helper/main.c
rename to xfsettingsd/main.c
index 3cec8ce..e3959a6 100644
--- a/xfce4-settings-helper/main.c
+++ b/xfsettingsd/main.c
@@ -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;
diff --git a/xfce4-settings-helper/pointers.c b/xfsettingsd/pointers.c
similarity index 100%
rename from xfce4-settings-helper/pointers.c
rename to xfsettingsd/pointers.c
diff --git a/xfce4-settings-helper/pointers.h b/xfsettingsd/pointers.h
similarity index 100%
rename from xfce4-settings-helper/pointers.h
rename to xfsettingsd/pointers.h
diff --git a/xfce4-settings-helper/workspaces.c b/xfsettingsd/workspaces.c
similarity index 100%
rename from xfce4-settings-helper/workspaces.c
rename to xfsettingsd/workspaces.c
diff --git a/xfce4-settings-helper/workspaces.h b/xfsettingsd/workspaces.h
similarity index 100%
rename from xfce4-settings-helper/workspaces.h
rename to xfsettingsd/workspaces.h
diff --git a/xfce4-settings-helper/xfce4-settings-helper-autostart.desktop b/xfsettingsd/xfsettingsd-autostart.desktop
similarity index 64%
rename from xfce4-settings-helper/xfce4-settings-helper-autostart.desktop
rename to xfsettingsd/xfsettingsd-autostart.desktop
index abf4267..f134865 100644
--- a/xfce4-settings-helper/xfce4-settings-helper-autostart.desktop
+++ b/xfsettingsd/xfsettingsd-autostart.desktop
@@ -1,7 +1,7 @@
 [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
diff --git a/xfce4-settings-helper/xsettings.c b/xfsettingsd/xsettings.c
similarity index 100%
rename from xfce4-settings-helper/xsettings.c
rename to xfsettingsd/xsettings.c
diff --git a/xfce4-settings-helper/xsettings.h b/xfsettingsd/xsettings.h
similarity index 100%
rename from xfce4-settings-helper/xsettings.h
rename to xfsettingsd/xsettings.h
diff --git a/xfce4-settings-helper/xsettings.xml b/xfsettingsd/xsettings.xml
similarity index 100%
rename from xfce4-settings-helper/xsettings.xml
rename to xfsettingsd/xsettings.xml

