summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorWilliam Jon McCann <mccann@jhu.edu>2007-12-22 20:29:21 +0000
committerWilliam Jon McCann <mccann@src.gnome.org>2007-12-22 20:29:21 +0000
commit37a40693f3121447dfd9ab5ce546c42fc883d19f (patch)
treee74c8668ccd2b0b3e71dfe1ead0cda577c0eec59
parentc67fb6b71fe0632db86cf6fff16141b235afa79d (diff)
downloadgnome-settings-daemon-37a40693f3121447dfd9ab5ce546c42fc883d19f.tar.gz
Rename files to be consistent with other plugins.
2007-12-22 William Jon McCann <mccann@jhu.edu> * plugins/xsettings/Makefile.am: * plugins/xsettings/gnome-xsettings-manager.c: * plugins/xsettings/gnome-xsettings-manager.h: * plugins/xsettings/gnome-xsettings-plugin.c: * plugins/xsettings/gnome-xsettings-plugin.h: * plugins/xsettings/gsd-xsettings-manager.c: * plugins/xsettings/gsd-xsettings-plugin.c: Rename files to be consistent with other plugins. svn path=/trunk/; revision=36
-rw-r--r--ChangeLog11
-rw-r--r--plugins/xsettings/Makefile.am8
-rw-r--r--plugins/xsettings/gsd-xsettings-manager.c (renamed from plugins/xsettings/gnome-xsettings-manager.c)2
-rw-r--r--plugins/xsettings/gsd-xsettings-manager.h (renamed from plugins/xsettings/gnome-xsettings-manager.h)0
-rw-r--r--plugins/xsettings/gsd-xsettings-plugin.c (renamed from plugins/xsettings/gnome-xsettings-plugin.c)4
-rw-r--r--plugins/xsettings/gsd-xsettings-plugin.h (renamed from plugins/xsettings/gnome-xsettings-plugin.h)0
-rw-r--r--po/ChangeLog12
-rw-r--r--po/POTFILES.in2
8 files changed, 31 insertions, 8 deletions
diff --git a/ChangeLog b/ChangeLog
index d8834f8a..ce67be5c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,14 @@
+2007-12-22 William Jon McCann <mccann@jhu.edu>
+
+ * plugins/xsettings/Makefile.am:
+ * plugins/xsettings/gnome-xsettings-manager.c:
+ * plugins/xsettings/gnome-xsettings-manager.h:
+ * plugins/xsettings/gnome-xsettings-plugin.c:
+ * plugins/xsettings/gnome-xsettings-plugin.h:
+ * plugins/xsettings/gsd-xsettings-manager.c:
+ * plugins/xsettings/gsd-xsettings-plugin.c:
+ Rename files to be consistent with other plugins.
+
2007-12-21 William Jon McCann <mccann@jhu.edu>
* plugins/background/Makefile.am:
diff --git a/plugins/xsettings/Makefile.am b/plugins/xsettings/Makefile.am
index b2304331..151d97c3 100644
--- a/plugins/xsettings/Makefile.am
+++ b/plugins/xsettings/Makefile.am
@@ -15,10 +15,10 @@ plugin_LTLIBRARIES = \
$(NULL)
libxsettings_la_SOURCES = \
- gnome-xsettings-plugin.h \
- gnome-xsettings-plugin.c \
- gnome-xsettings-manager.h \
- gnome-xsettings-manager.c \
+ gsd-xsettings-plugin.h \
+ gsd-xsettings-plugin.c \
+ gsd-xsettings-manager.h \
+ gsd-xsettings-manager.c \
xsettings-common.h \
xsettings-common.c \
xsettings-manager.h \
diff --git a/plugins/xsettings/gnome-xsettings-manager.c b/plugins/xsettings/gsd-xsettings-manager.c
index 76c44173..34bd8b92 100644
--- a/plugins/xsettings/gnome-xsettings-manager.c
+++ b/plugins/xsettings/gsd-xsettings-manager.c
@@ -39,7 +39,7 @@
#include <gconf/gconf.h>
#include <gconf/gconf-client.h>
-#include "gnome-xsettings-manager.h"
+#include "gsd-xsettings-manager.h"
#include "xsettings-manager.h"
#define GNOME_XSETTINGS_MANAGER_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), GNOME_TYPE_XSETTINGS_MANAGER, GnomeXSettingsManagerPrivate))
diff --git a/plugins/xsettings/gnome-xsettings-manager.h b/plugins/xsettings/gsd-xsettings-manager.h
index 5df7aacd..5df7aacd 100644
--- a/plugins/xsettings/gnome-xsettings-manager.h
+++ b/plugins/xsettings/gsd-xsettings-manager.h
diff --git a/plugins/xsettings/gnome-xsettings-plugin.c b/plugins/xsettings/gsd-xsettings-plugin.c
index b826dab0..77d71051 100644
--- a/plugins/xsettings/gnome-xsettings-plugin.c
+++ b/plugins/xsettings/gsd-xsettings-plugin.c
@@ -24,8 +24,8 @@
#include <gmodule.h>
#include "gnome-settings-plugin.h"
-#include "gnome-xsettings-plugin.h"
-#include "gnome-xsettings-manager.h"
+#include "gsd-xsettings-plugin.h"
+#include "gsd-xsettings-manager.h"
struct GnomeXSettingsPluginPrivate {
GnomeXSettingsManager *manager;
diff --git a/plugins/xsettings/gnome-xsettings-plugin.h b/plugins/xsettings/gsd-xsettings-plugin.h
index 777a149b..777a149b 100644
--- a/plugins/xsettings/gnome-xsettings-plugin.h
+++ b/plugins/xsettings/gsd-xsettings-plugin.h
diff --git a/po/ChangeLog b/po/ChangeLog
index e9639701..4311f34c 100644
--- a/po/ChangeLog
+++ b/po/ChangeLog
@@ -1,3 +1,15 @@
+2007-12-22 William Jon McCann <mccann@jhu.edu>
+
+ reviewed by: <delete if not using a buddy>
+
+ * POTFILES.in:
+
+2007-12-22 William Jon McCann <mccann@jhu.edu>
+
+ reviewed by: <delete if not using a buddy>
+
+ * POTFILES.in:
+
2007-12-21 Kjartan Maraas <kmaraas@gnome.org>
* POTFILES.in:
diff --git a/po/POTFILES.in b/po/POTFILES.in
index 72bcad8c..163bf19e 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -34,6 +34,6 @@ plugins/typing-break/typing-break.gnome-settings-plugin.desktop.in
plugins/xrandr/xrandr.gnome-settings-plugin.desktop.in
plugins/xrdb/gsd-xrdb-manager.c
plugins/xrdb/xrdb.gnome-settings-plugin.desktop.in
-plugins/xsettings/gnome-xsettings-manager.c
+plugins/xsettings/gsd-xsettings-manager.c
plugins/xsettings/xsettings.gnome-settings-plugin.desktop.in
src/main.c