diff options
| author | haxar <[email protected]> | 2012-02-21 20:13:04 -0800 |
|---|---|---|
| committer | haxar <[email protected]> | 2012-02-21 20:13:04 -0800 |
| commit | ddaceb232c8b537a7d29a9708928d3a3671b98e5 (patch) | |
| tree | d874e557f2999f9550ad2b710f0231ed06f50ba8 /mate-settings-daemon | |
| parent | ecd8a153901507f5d210d6f85103693ef81d49c3 (diff) | |
| download | mate-settings-daemon-ddaceb232c8b537a7d29a9708928d3a3671b98e5.tar.bz2 mate-settings-daemon-ddaceb232c8b537a7d29a9708928d3a3671b98e5.tar.xz | |
gsd to msd complete rename patch by NiceandGently; code changes commit
Diffstat (limited to 'mate-settings-daemon')
| -rw-r--r-- | mate-settings-daemon/Makefile.am | 18 | ||||
| -rw-r--r-- | mate-settings-daemon/main.c | 16 | ||||
| -rw-r--r-- | mate-settings-daemon/mate-settings-manager.c | 4 |
3 files changed, 19 insertions, 19 deletions
diff --git a/mate-settings-daemon/Makefile.am b/mate-settings-daemon/Makefile.am index 80150e1..6ba7d37 100644 --- a/mate-settings-daemon/Makefile.am +++ b/mate-settings-daemon/Makefile.am @@ -11,32 +11,32 @@ INCLUDES = \ $(NULL) noinst_LTLIBRARIES = \ - libgsd-profile.la \ + libmsd-profile.la \ $(NULL) -libgsd_profile_la_SOURCES = \ +libmsd_profile_la_SOURCES = \ mate-settings-profile.c \ mate-settings-profile.h \ $(NULL) -libgsd_profile_la_CPPFLAGS = \ +libmsd_profile_la_CPPFLAGS = \ $(DISABLE_DEPRECATED_CFLAGS) \ $(NULL) -libgsd_profile_la_CFLAGS = \ +libmsd_profile_la_CFLAGS = \ $(SIMPLE_GREETER_CFLAGS) \ $(NULL) -libgsd_profile_la_LIBADD = \ +libmsd_profile_la_LIBADD = \ $(NULL) -libgsd_profile_la_LDFLAGS = \ +libmsd_profile_la_LDFLAGS = \ -export-dynamic \ $(NULL) -gsddir = $(libexecdir) +msddir = $(libexecdir) -gsd_PROGRAMS = \ +msd_PROGRAMS = \ mate-settings-daemon mate-settings-manager-glue.h: mate-settings-manager.xml Makefile.am @@ -77,7 +77,7 @@ mate_settings_daemon_LDFLAGS = \ $(AM_LDFLAGS) mate_settings_daemon_LDADD = \ - libgsd-profile.la \ + libmsd-profile.la \ $(SETTINGS_DAEMON_LIBS) EXTRA_DIST = \ diff --git a/mate-settings-daemon/main.c b/mate-settings-daemon/main.c index 8ba3620..b4348b8 100644 --- a/mate-settings-daemon/main.c +++ b/mate-settings-daemon/main.c @@ -38,7 +38,7 @@ #include "mate-settings-manager.h" #include "mate-settings-profile.h" -#define GSD_DBUS_NAME "org.mate.SettingsDaemon" +#define MSD_DBUS_NAME "org.mate.SettingsDaemon" #define MATE_SESSION_DBUS_NAME "org.mate.SessionManager" #define MATE_SESSION_DBUS_OBJECT "/org/mate/SessionManager" @@ -92,27 +92,27 @@ acquire_name_on_proxy (DBusGProxy *bus_proxy) res = dbus_g_proxy_call (bus_proxy, "RequestName", &error, - G_TYPE_STRING, GSD_DBUS_NAME, + G_TYPE_STRING, MSD_DBUS_NAME, G_TYPE_UINT, 0, G_TYPE_INVALID, G_TYPE_UINT, &result, G_TYPE_INVALID); if (! res) { if (error != NULL) { - g_warning ("Failed to acquire %s: %s", GSD_DBUS_NAME, error->message); + g_warning ("Failed to acquire %s: %s", MSD_DBUS_NAME, error->message); g_error_free (error); } else { - g_warning ("Failed to acquire %s", GSD_DBUS_NAME); + g_warning ("Failed to acquire %s", MSD_DBUS_NAME); } goto out; } if (result != DBUS_REQUEST_NAME_REPLY_PRIMARY_OWNER) { if (error != NULL) { - g_warning ("Failed to acquire %s: %s", GSD_DBUS_NAME, error->message); + g_warning ("Failed to acquire %s: %s", MSD_DBUS_NAME, error->message); g_error_free (error); } else { - g_warning ("Failed to acquire %s", GSD_DBUS_NAME); + g_warning ("Failed to acquire %s", MSD_DBUS_NAME); } goto out; } @@ -289,7 +289,7 @@ set_session_over_handler (DBusGConnection *bus, MateSettingsManager *manager) } static void -gsd_log_default_handler (const gchar *log_domain, +msd_log_default_handler (const gchar *log_domain, GLogLevelFlags log_level, const gchar *message, gpointer unused_data) @@ -455,7 +455,7 @@ main (int argc, char *argv[]) daemon_detach (); - g_log_set_default_handler (gsd_log_default_handler, NULL); + g_log_set_default_handler (msd_log_default_handler, NULL); bus = get_session_bus (); if (bus == NULL) { diff --git a/mate-settings-daemon/mate-settings-manager.c b/mate-settings-daemon/mate-settings-manager.c index 06015ec..e708997 100644 --- a/mate-settings-daemon/mate-settings-manager.c +++ b/mate-settings-daemon/mate-settings-manager.c @@ -38,7 +38,7 @@ #include "mate-settings-manager-glue.h" #include "mate-settings-profile.h" -#define GSD_MANAGER_DBUS_PATH "/org/mate/SettingsDaemon" +#define MSD_MANAGER_DBUS_PATH "/org/mate/SettingsDaemon" #define DEFAULT_SETTINGS_PREFIX "/apps/mate_settings_daemon/plugins" @@ -310,7 +310,7 @@ register_manager (MateSettingsManager *manager) return FALSE; } - dbus_g_connection_register_g_object (manager->priv->connection, GSD_MANAGER_DBUS_PATH, G_OBJECT (manager)); + dbus_g_connection_register_g_object (manager->priv->connection, MSD_MANAGER_DBUS_PATH, G_OBJECT (manager)); return TRUE; } |