GNOME.org
 

[gnome-settings-daemon] Make sure G_LOG_DOMAIN is set to the plugin name for each plugin

commit 132c1b66abc761f44a7bafb28e850202aca57cd0
Author: Richard Hughes <richard hughsie com>
Date:   Tue Mar 15 17:50:30 2011 +0000

    Make sure G_LOG_DOMAIN is set to the plugin name for each plugin

 configure.ac                            |    3 +++
 plugins/a11y-keyboard/Makefile.am       |    3 +++
 plugins/a11y-settings/Makefile.am       |    3 +++
 plugins/automount/Makefile.am           |    3 +++
 plugins/background/Makefile.am          |    3 +++
 plugins/clipboard/Makefile.am           |    3 +++
 plugins/common/Makefile.am              |    2 ++
 plugins/datetime/Makefile.am            |    4 +++-
 plugins/dummy/Makefile.am               |    3 +++
 plugins/gconf/Makefile.am               |    5 ++++-
 plugins/housekeeping/Makefile.am        |    3 +++
 plugins/keybindings/Makefile.am         |    3 +++
 plugins/keyboard/Makefile.am            |    3 +++
 plugins/media-keys/Makefile.am          |    3 +++
 plugins/mouse/Makefile.am               |    3 +++
 plugins/print-notifications/Makefile.am |    3 +++
 plugins/smartcard/Makefile.am           |    3 +++
 plugins/sound/Makefile.am               |    3 +++
 plugins/updates/Makefile.am             |    3 +++
 plugins/wacom/Makefile.am               |    3 +++
 plugins/xrandr/Makefile.am              |    3 +++
 plugins/xsettings/Makefile.am           |    3 +++
 22 files changed, 66 insertions(+), 2 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index d5e113a..0023e6b 100644
--- a/configure.ac
+++ b/configure.ac
@@ -449,6 +449,9 @@ fi
 plugindir='$(libdir)/gnome-settings-daemon-gsd_api_version'
 AC_SUBST([plugindir])
 
+PLUGIN_CFLAGS="-DG_LOG_DOMAIN=\"\\\"\$(plugin_name)-plugin\\\"\""
+AC_SUBST(PLUGIN_CFLAGS)
+
 dnl ---------------------------------------------------------------------------
 dnl - Finish
 dnl ---------------------------------------------------------------------------
diff --git a/plugins/a11y-keyboard/Makefile.am b/plugins/a11y-keyboard/Makefile.am
index 99bfa90..f2e0add 100644
--- a/plugins/a11y-keyboard/Makefile.am
+++ b/plugins/a11y-keyboard/Makefile.am
@@ -1,5 +1,7 @@
 NULL =
 
+plugin_name = keyboard
+
 gtkbuilderdir = $(pkgdatadir)
 gtkbuilder_DATA = 			\
 	gsd-a11y-preferences-dialog.ui	\
@@ -23,6 +25,7 @@ test_a11y_preferences_dialog_CPPFLAGS = \
 	$(AM_CPPFLAGS)
 
 test_a11y_preferences_dialog_CFLAGS = \
+	$(PLUGIN_CFLAGS)		\
 	$(SETTINGS_PLUGIN_CFLAGS)	\
 	$(AM_CFLAGS)
 
diff --git a/plugins/a11y-settings/Makefile.am b/plugins/a11y-settings/Makefile.am
index 999a6e8..f82cf38 100644
--- a/plugins/a11y-settings/Makefile.am
+++ b/plugins/a11y-settings/Makefile.am
@@ -1,3 +1,5 @@
+plugin_name = ally-settings
+
 plugin_LTLIBRARIES = \
 	liba11y-settings.la
 
@@ -13,6 +15,7 @@ liba11y_settings_la_CPPFLAGS = \
 	$(AM_CPPFLAGS)
 
 liba11y_settings_la_CFLAGS = \
+	$(PLUGIN_CFLAGS)		\
 	$(SETTINGS_PLUGIN_CFLAGS)	\
 	$(AM_CFLAGS)
 
diff --git a/plugins/automount/Makefile.am b/plugins/automount/Makefile.am
index f0e768a..acafa2c 100644
--- a/plugins/automount/Makefile.am
+++ b/plugins/automount/Makefile.am
@@ -1,5 +1,7 @@
 NULL =
 
+plugin_name = automount
+
 noinst_PROGRAMS = 			\
 	test-automount			\
 	$(NULL)
@@ -18,6 +20,7 @@ test_automount_CPPFLAGS = \
 	$(AM_CPPFLAGS)
 
 test_automount_CFLAGS = \
+	$(PLUGIN_CFLAGS)		\
 	$(SETTINGS_PLUGIN_CFLAGS)	\
 	$(AM_CFLAGS)
 
diff --git a/plugins/background/Makefile.am b/plugins/background/Makefile.am
index 47a6cdc..9023dfc 100644
--- a/plugins/background/Makefile.am
+++ b/plugins/background/Makefile.am
@@ -1,5 +1,7 @@
 NULL =
 
+plugin_name = background
+
 noinst_PROGRAMS = 			\
 	test-background			\
 	$(NULL)
@@ -16,6 +18,7 @@ test_background_CPPFLAGS = \
 	$(AM_CPPFLAGS)
 
 test_background_CFLAGS = \
+	$(PLUGIN_CFLAGS)		\
 	$(SETTINGS_PLUGIN_CFLAGS)	\
 	$(GNOME_DESKTOP_CFLAGS)		\
 	$(AM_CFLAGS)
diff --git a/plugins/clipboard/Makefile.am b/plugins/clipboard/Makefile.am
index c572cdd..5f8cfde 100644
--- a/plugins/clipboard/Makefile.am
+++ b/plugins/clipboard/Makefile.am
@@ -1,5 +1,7 @@
 NULL =
 
+plugin_name = clipboard
+
 plugin_LTLIBRARIES = \
 	libclipboard.la		\
 	$(NULL)
@@ -16,6 +18,7 @@ libclipboard_la_SOURCES = 	\
 	$(NULL)
 
 libclipboard_la_CPPFLAGS = \
+	$(PLUGIN_CFLAGS)		\
 	-I$(top_srcdir)/gnome-settings-daemon		\
 	-DGNOME_SETTINGS_LOCALEDIR=\""$(datadir)/locale"\" \
 	$(AM_CPPFLAGS)
diff --git a/plugins/common/Makefile.am b/plugins/common/Makefile.am
index e2367cb..608443d 100644
--- a/plugins/common/Makefile.am
+++ b/plugins/common/Makefile.am
@@ -1,3 +1,4 @@
+plugin_name = common
 
 noinst_LTLIBRARIES = libcommon.la
 
@@ -15,6 +16,7 @@ libcommon_la_CPPFLAGS = \
 	$(AM_CPPFLAGS)
 
 libcommon_la_CFLAGS = \
+	$(PLUGIN_CFLAGS)		\
 	$(SETTINGS_PLUGIN_CFLAGS)	\
 	$(XINPUT_CFLAGS)		\
 	$(AM_CFLAGS)
diff --git a/plugins/datetime/Makefile.am b/plugins/datetime/Makefile.am
index b4e0e9f..ea973e0 100644
--- a/plugins/datetime/Makefile.am
+++ b/plugins/datetime/Makefile.am
@@ -1,3 +1,5 @@
+plugin_name = datetime
+
 dbus_servicesdir = $(datadir)/dbus-1/system-services
 dbus_confdir = $(sysconfdir)/dbus-1/system.d
 polkitdir = $(datadir)/polkit-1/actions
@@ -29,7 +31,7 @@ if HAVE_POLKIT
 BUILT_SOURCES = gsd-datetime-mechanism-glue.h
 endif
 
-AM_CFLAGS = $(SETTINGS_PLUGIN_CFLAGS) $(POLKIT_CFLAGS)
+AM_CFLAGS = $(PLUGIN_CFLAGS) $(SETTINGS_PLUGIN_CFLAGS) $(POLKIT_CFLAGS)
 gsd_datetime_mechanism_LDADD = $(POLKIT_LIBS) $(SETTINGS_PLUGIN_LIBS)
 
 test_system_timezone_SOURCES = test-system-timezone.c system-timezone.c system-timezone.h
diff --git a/plugins/dummy/Makefile.am b/plugins/dummy/Makefile.am
index 22671b5..9d93b98 100644
--- a/plugins/dummy/Makefile.am
+++ b/plugins/dummy/Makefile.am
@@ -1,3 +1,5 @@
+plugin_name = dummy
+
 plugin_LTLIBRARIES = \
 	libdummy.la
 
@@ -13,6 +15,7 @@ libdummy_la_CPPFLAGS = \
 	$(AM_CPPFLAGS)
 
 libdummy_la_CFLAGS = \
+	$(PLUGIN_CFLAGS)		\
 	$(SETTINGS_PLUGIN_CFLAGS)	\
 	$(AM_CFLAGS)
 
diff --git a/plugins/gconf/Makefile.am b/plugins/gconf/Makefile.am
index 31fb3c3..3a0f9e4 100644
--- a/plugins/gconf/Makefile.am
+++ b/plugins/gconf/Makefile.am
@@ -1,3 +1,5 @@
+plugin_name = gconf
+
 plugin_LTLIBRARIES = libgconf.la
 
 libgconf_la_SOURCES =		\
@@ -16,6 +18,7 @@ libgconf_la_CPPFLAGS =							\
         $(AM_CPPFLAGS)
 
 libgconf_la_CFLAGS =			\
+	$(PLUGIN_CFLAGS)		\
 	$(GCONF_CFLAGS)			\
 	$(SETTINGS_PLUGIN_CFLAGS)	\
 	$(AM_CFLAGS)
@@ -34,4 +37,4 @@ EXTRA_DIST = $(plugin_in_files)
 CLEANFILES = $(plugin_DATA)
 DISTCLEANFILES = $(plugin_DATA)
 
- GSD_INTLTOOL_PLUGIN_RULE@
\ No newline at end of file
+ GSD_INTLTOOL_PLUGIN_RULE@
diff --git a/plugins/housekeeping/Makefile.am b/plugins/housekeeping/Makefile.am
index a848658..5440e2d 100644
--- a/plugins/housekeeping/Makefile.am
+++ b/plugins/housekeeping/Makefile.am
@@ -1,3 +1,5 @@
+plugin_name = housekeeping
+
 COMMON_FILES =				\
 	gsd-disk-space.c		\
 	gsd-disk-space.h		\
@@ -41,6 +43,7 @@ libhousekeeping_la_CPPFLAGS = 					\
 	$(AM_CPPFLAGS)
 
 libhousekeeping_la_CFLAGS = 		\
+	$(PLUGIN_CFLAGS)		\
 	$(SETTINGS_PLUGIN_CFLAGS)	\
 	$(GIOUNIX_CFLAGS)		\
 	$(LIBNOTIFY_CFLAGS)		\
diff --git a/plugins/keybindings/Makefile.am b/plugins/keybindings/Makefile.am
index b89ad08..d75bc9b 100644
--- a/plugins/keybindings/Makefile.am
+++ b/plugins/keybindings/Makefile.am
@@ -1,5 +1,7 @@
 NULL =
 
+plugin_name = keybindings
+
 plugin_LTLIBRARIES = \
 	libkeybindings.la		\
 	$(NULL)
@@ -18,6 +20,7 @@ libkeybindings_la_CPPFLAGS = \
 	$(AM_CPPFLAGS)
 
 libkeybindings_la_CFLAGS = \
+	$(PLUGIN_CFLAGS)		\
 	$(SETTINGS_PLUGIN_CFLAGS)	\
 	$(AM_CFLAGS)
 
diff --git a/plugins/keyboard/Makefile.am b/plugins/keyboard/Makefile.am
index 83edead..e4926f0 100644
--- a/plugins/keyboard/Makefile.am
+++ b/plugins/keyboard/Makefile.am
@@ -1,5 +1,7 @@
 NULL =
 
+plugin_name = keyboard
+
 plugin_LTLIBRARIES = \
 	libkeyboard.la		\
 	$(NULL)
@@ -32,6 +34,7 @@ libkeyboard_la_CPPFLAGS = \
 	$(AM_CPPFLAGS)
 
 libkeyboard_la_CFLAGS = \
+	$(PLUGIN_CFLAGS)		\
 	$(SETTINGS_PLUGIN_CFLAGS)	\
 	$(LIBGNOMEKBDUI_CFLAGS)		\
 	$(AM_CFLAGS)
diff --git a/plugins/media-keys/Makefile.am b/plugins/media-keys/Makefile.am
index ab1f683..d596c9c 100644
--- a/plugins/media-keys/Makefile.am
+++ b/plugins/media-keys/Makefile.am
@@ -1,6 +1,8 @@
 icondir = $(datadir)/icons/hicolor
 context = actions
 
+plugin_name = media-keys
+
 NULL =
 
 SUBDIRS =
@@ -86,6 +88,7 @@ libmedia_keys_la_CPPFLAGS = \
 	$(AM_CPPFLAGS)
 
 libmedia_keys_la_CFLAGS = \
+	$(PLUGIN_CFLAGS)		\
 	$(SETTINGS_PLUGIN_CFLAGS)	\
 	$(AM_CFLAGS)
 
diff --git a/plugins/mouse/Makefile.am b/plugins/mouse/Makefile.am
index 3c62254..9feca5f 100644
--- a/plugins/mouse/Makefile.am
+++ b/plugins/mouse/Makefile.am
@@ -1,3 +1,5 @@
+plugin_name = mouse
+
 plugin_LTLIBRARIES = libmouse.la
 
 libmouse_la_SOURCES = 		\
@@ -15,6 +17,7 @@ libmouse_la_CPPFLAGS = \
 	$(AM_CPPFLAGS)
 
 libmouse_la_CFLAGS = \
+	$(PLUGIN_CFLAGS)		\
 	$(SETTINGS_PLUGIN_CFLAGS)	\
 	$(AM_CFLAGS)
 
diff --git a/plugins/print-notifications/Makefile.am b/plugins/print-notifications/Makefile.am
index e49c3c0..db221fc 100644
--- a/plugins/print-notifications/Makefile.am
+++ b/plugins/print-notifications/Makefile.am
@@ -1,3 +1,5 @@
+plugin_name = print-notifications
+
 plugin_LTLIBRARIES = \
 	libprint-notifications.la
 
@@ -14,6 +16,7 @@ libprint_notifications_la_CPPFLAGS = \
 	$(AM_CPPFLAGS)
 
 libprint_notifications_la_CFLAGS = \
+	$(PLUGIN_CFLAGS)		\
 	$(SETTINGS_PLUGIN_CFLAGS)	\
 	$(AM_CFLAGS)
 
diff --git a/plugins/smartcard/Makefile.am b/plugins/smartcard/Makefile.am
index dcfaf49..8cb4246 100644
--- a/plugins/smartcard/Makefile.am
+++ b/plugins/smartcard/Makefile.am
@@ -1,3 +1,5 @@
+plugin_name = smartcard
+
 plugin_LTLIBRARIES = \
 	libsmartcard.la
 
@@ -18,6 +20,7 @@ libsmartcard_la_CPPFLAGS = \
 	$(AM_CPPFLAGS)
 
 libsmartcard_la_CFLAGS = \
+	$(PLUGIN_CFLAGS)	\
 	$(SETTINGS_PLUGIN_CFLAGS) \
 	$(GNOME_CFLAGS)	\
 	$(NSS_CFLAGS)	\
diff --git a/plugins/sound/Makefile.am b/plugins/sound/Makefile.am
index 29056ae..f98d50f 100644
--- a/plugins/sound/Makefile.am
+++ b/plugins/sound/Makefile.am
@@ -1,3 +1,5 @@
+plugin_name = sound
+
 plugin_LTLIBRARIES = \
 	libsound.la
 
@@ -13,6 +15,7 @@ libsound_la_CPPFLAGS = \
 	$(AM_CPPFLAGS)
 
 libsound_la_CFLAGS = \
+	$(PLUGIN_CFLAGS)		\
 	$(SETTINGS_PLUGIN_CFLAGS) \
 	$(GNOME_CFLAGS)	\
 	$(PULSE_CFLAGS)	\
diff --git a/plugins/updates/Makefile.am b/plugins/updates/Makefile.am
index 7d32a4a..9510c65 100644
--- a/plugins/updates/Makefile.am
+++ b/plugins/updates/Makefile.am
@@ -1,3 +1,5 @@
+plugin_name = updates
+
 introspectiondir = $(datadir)/dbus-1/interfaces
 dist_introspection_DATA = org.gnome.SettingsDaemonUpdates.xml
 
@@ -21,6 +23,7 @@ libupdates_la_CPPFLAGS = \
 	$(AM_CPPFLAGS)
 
 libupdates_la_CFLAGS = \
+	$(PLUGIN_CFLAGS) \
 	$(SETTINGS_PLUGIN_CFLAGS) \
 	$(GNOME_CFLAGS)	\
 	$(GUDEV_CFLAGS)	\
diff --git a/plugins/wacom/Makefile.am b/plugins/wacom/Makefile.am
index 445f986..6a765c1 100644
--- a/plugins/wacom/Makefile.am
+++ b/plugins/wacom/Makefile.am
@@ -1,3 +1,5 @@
+plugin_name = wacom
+
 plugin_LTLIBRARIES = libwacom.la
 
 libwacom_la_SOURCES = 		\
@@ -15,6 +17,7 @@ libwacom_la_CPPFLAGS = \
 	$(AM_CPPFLAGS)
 
 libwacom_la_CFLAGS = \
+	$(PLUGIN_CFLAGS)		\
 	$(SETTINGS_PLUGIN_CFLAGS)	\
 	$(AM_CFLAGS)
 
diff --git a/plugins/xrandr/Makefile.am b/plugins/xrandr/Makefile.am
index d20a4be..0bc78a2 100644
--- a/plugins/xrandr/Makefile.am
+++ b/plugins/xrandr/Makefile.am
@@ -1,3 +1,5 @@
+plugin_name = xrandr
+
 icondir = $(datadir)/icons/hicolor
 context = apps
 
@@ -45,6 +47,7 @@ libxrandr_la_CPPFLAGS =						\
 	$(AM_CPPFLAGS)
 
 libxrandr_la_CFLAGS =			\
+	$(PLUGIN_CFLAGS)		\
 	$(SETTINGS_PLUGIN_CFLAGS)	\
 	$(LIBNOTIFY_CFLAGS)		\
 	$(GNOME_DESKTOP_CFLAGS)		\
diff --git a/plugins/xsettings/Makefile.am b/plugins/xsettings/Makefile.am
index 9f445e3..cc6f985 100644
--- a/plugins/xsettings/Makefile.am
+++ b/plugins/xsettings/Makefile.am
@@ -1,5 +1,7 @@
 NULL =
 
+plugin_name = xsettings
+
 noinst_PROGRAMS = test-gtk-modules
 
 test_gtk_modules_SOURCES =	\
@@ -8,6 +10,7 @@ test_gtk_modules_SOURCES =	\
 	test-gtk-modules.c
 
 test_gtk_modules_CFLAGS =		\
+	$(PLUGIN_CFLAGS)		\
 	$(SETTINGS_PLUGIN_CFLAGS)	\
 	$(AM_CFLAGS)
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]