summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLennart Poettering <lennart@poettering.net>2011-02-24 22:51:32 +0100
committerLennart Poettering <lennart@poettering.net>2011-02-24 22:51:32 +0100
commita604b0ab140f954a80171a5fa3d09a29389fa0c5 (patch)
tree9af981746802ceccd35c2791b0e7739577ffb515
parent50f44c079c34f3661b96c98607afe2f977c06bb8 (diff)
gtk: enable gtk module by default in gnome3
-rw-r--r--src/Makefile.am7
-rw-r--r--src/canberra-gtk-module.desktop6
2 files changed, 12 insertions, 1 deletions
diff --git a/src/Makefile.am b/src/Makefile.am
index d6a5352..1036b7a 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -25,7 +25,9 @@ gnomeshutdowndir = $(datadir)/gnome/shutdown
gnomeautostartdir = $(datadir)/gnome/autostart
-gdmautostartdir = $(datadir)/gdm/autostart/LoginWindow/
+gdmautostartdir = $(datadir)/gdm/autostart/LoginWindow
+
+gsdgtkmodulesdir = $(libdir)/gnome-settings-daemon-3.0/gtk-modules
AM_CFLAGS = $(PTHREAD_CFLAGS) -DCA_PLUGIN_PATH=\"$(plugindir)\"
#AM_CFLAGS = $(PTHREAD_CFLAGS) -DCA_PLUGIN_PATH=\"/home/lennart/projects/libcanberra/src/.libs\"
@@ -418,6 +420,9 @@ endif
if HAVE_GTK_ANY
+dist_gsdgtkmodules_DATA = \
+ canberra-gtk-module.desktop
+
canberra_gtk_play_SOURCES = \
canberra-gtk-play.c
diff --git a/src/canberra-gtk-module.desktop b/src/canberra-gtk-module.desktop
new file mode 100644
index 0000000..80a087b
--- /dev/null
+++ b/src/canberra-gtk-module.desktop
@@ -0,0 +1,6 @@
+[GTK Module]
+Name=canberra-gtk-module
+Description=Event Sound Module
+X-GTK-Module-Name=canberra-gtk-module
+X-GTK-Module-Enabled-Schema=org.gnome.desktop.sound
+X-GTK-Module-Enabled-Key=event-sounds