2007-01-08 Jan Arne Petersen <jap@gnome.org> Fixes #133815 * gnome-settings-multimedia-keys.c: added support for storing the DBus server. (unhookup_keysim, hookup_keysim): removed. (update_kbd_cb, init_kbd, acme_filter_events): iterate over all handled keys, not just until the PLAY_KEY. (do_multimedia_player_action): emit the "media_player_key_pressed" event. (do_action): call do_multimedia_player_action for all media player events. (gnome_settings_multimedia_keys_load): start a DBus server. * gnome-settings-dbus.c: added "media_player_key_pressed" signal. (find_by_application, find_by_time): new functions to search in the list of media players. (settings_daemon_grab_media_player_keys, settings_daemon_release_media_player_keys): new functions to grab/release the media players. (gnome_settings_server_get): new function to create GnomeSettingsServer objects. (gnome_settings_server_media_player_key_pressed, gnome_settings_server_constructor): new functions. (gnome_settings_server_class_init): add new signal and constructor. * gnome-settings-dbus.h: new file. * gsd-infos.xml: added GrabMediaPlayerKeys and ReleaseMediaPlayerKeys methods to the DBus interface. * gnome-settings-marshal.list, Makefile.am: generate marshalling functions. svn path=/trunk/; revision=7097
128 lines
3.8 KiB
Makefile
128 lines
3.8 KiB
Makefile
SUBDIRS = xrdb actions
|
|
|
|
INCLUDES=$(DBUS_CFLAGS) $(LIBGNOMEKBD_CFLAGS) $(GNOME_SETTINGS_DAEMON_CFLAGS) -I$(top_srcdir)/libbackground -I$(top_srcdir) \
|
|
-DDATADIR="\"$(datadir)\"" \
|
|
-DPIXMAPSDIR="\"$(GNOMECC_PIXMAPS_DIR)\"" \
|
|
$(FB_CFLAGS)
|
|
|
|
libexec_PROGRAMS=gnome-settings-daemon
|
|
|
|
gnome_settings_daemon_SOURCES = \
|
|
factory.c \
|
|
eggaccelerators.h \
|
|
eggaccelerators.c \
|
|
gnome-settings-daemon.h \
|
|
gnome-settings-daemon.c \
|
|
gnome-settings-font.h \
|
|
gnome-settings-font.c \
|
|
gnome-settings-mouse.h \
|
|
gnome-settings-mouse.c \
|
|
gnome-settings-multimedia-keys.h \
|
|
gnome-settings-multimedia-keys.c \
|
|
gnome-settings-keyboard-xkb.h \
|
|
gnome-settings-keyboard-xkb.c \
|
|
gnome-settings-keyboard.h \
|
|
gnome-settings-keyboard.c \
|
|
gnome-settings-background.h \
|
|
gnome-settings-background.c \
|
|
gnome-settings-xsettings.c \
|
|
gnome-settings-xsettings.h \
|
|
gnome-settings-locate-pointer.c \
|
|
gnome-settings-locate-pointer.h \
|
|
gnome-settings-sound.c \
|
|
gnome-settings-sound.h \
|
|
gnome-settings-accessibility-keyboard.h \
|
|
gnome-settings-accessibility-keyboard.c \
|
|
gnome-settings-screensaver.h \
|
|
gnome-settings-screensaver.c \
|
|
gnome-settings-default-editor.c \
|
|
gnome-settings-default-editor.h \
|
|
gnome-settings-gtk1theme.c \
|
|
gnome-settings-gtk1theme.h \
|
|
gnome-settings-server.h \
|
|
gnome-settings-dbus.c \
|
|
gnome-settings-dbus.h \
|
|
gnome-settings-xrdb.c \
|
|
gnome-settings-xrdb.h \
|
|
gsd-media-keys-window.c \
|
|
gsd-media-keys-window.h \
|
|
xsettings-common.c \
|
|
xsettings-manager.c \
|
|
xsettings-common.h \
|
|
xsettings-manager.h \
|
|
gnome-settings-keybindings.c \
|
|
gnome-settings-keybindings.h \
|
|
gnome-settings-typing-break.c \
|
|
gnome-settings-typing-break.h \
|
|
reaper.c \
|
|
reaper.h \
|
|
gnome-settings-xmodmap.c \
|
|
gnome-settings-xmodmap.h \
|
|
list.c \
|
|
list.h \
|
|
xutils.c \
|
|
xutils.h \
|
|
clipboard-manager.c \
|
|
clipboard-manager.h \
|
|
delayed-dialog.c
|
|
|
|
# $(AccessX_files)
|
|
|
|
gnome_settings_daemon_LDADD = \
|
|
$(DBUS_LIBS) \
|
|
$(LIBGNOMEKBD_LIBS) \
|
|
$(top_builddir)/libbackground/libbackground.la \
|
|
$(top_builddir)/libsounds/libsounds.a \
|
|
$(top_builddir)/libwindow-settings/libgnome-window-settings.la \
|
|
$(top_builddir)/gnome-settings-daemon/actions/libacme.la \
|
|
$(GNOME_SETTINGS_DAEMON_LIBS) \
|
|
$(XF86MISC_LIBS) $(GST_LIBS)
|
|
|
|
#AccessX_files = \
|
|
# AccessXcomm.c \
|
|
# extutil.h \
|
|
# AccessXproto.h \
|
|
# AccessXlibint.h
|
|
|
|
BUILT_SOURCES=gnome-settings-server.h \
|
|
gnome-settings-client.h \
|
|
gnome-settings-marshal.h \
|
|
gnome-settings-marshal.c
|
|
|
|
gnome_settings_daemon_SOURCES+=$(BUILT_SOURCES)
|
|
|
|
Gladedir = $(GNOMECC_GLADE_DIR)
|
|
Glade_DATA = modmap-dialog.glade
|
|
|
|
Dbusapidir = $(includedir)/gnome-settings-daemon-2.0/gnome-settings-daemon
|
|
Dbusapi_DATA = gnome-settings-client.h
|
|
|
|
#Rule to generate the marshal files
|
|
gnome-settings-marshal.c: gnome-settings-marshal.list
|
|
@GLIB_GENMARSHAL@ --prefix=gnome_settings_marshal $< --header --body > $@
|
|
|
|
gnome-settings-marshal.h: gnome-settings-marshal.list
|
|
@GLIB_GENMARSHAL@ --prefix=gnome_settings_marshal $< --header > $@
|
|
|
|
#Rule to generate the binding headers
|
|
gnome-settings-server.h: gsd-infos.xml
|
|
dbus-binding-tool --prefix=settings_daemon --mode=glib-server $< > $@
|
|
|
|
gnome-settings-client.h: gsd-infos.xml
|
|
dbus-binding-tool --prefix=settings_daemon --mode=glib-client $< > $@
|
|
|
|
# DBUS stuff
|
|
servicedir = $(DBUS_SERVICES_DIR)
|
|
service_in_files = org.gnome.SettingsDaemon.service.in
|
|
service_DATA = $(service_in_files:.service.in=.service)
|
|
|
|
org.gnome.SettingsDaemon.service: org.gnome.SettingsDaemon.service.in Makefile
|
|
@sed -e "s|\@libexecdir\@|$(libexecdir)|" $< > $@
|
|
|
|
EXTRA_DIST = $(Glade_DATA) $(Dbusapi_DATA) \
|
|
gnome-settings-daemon.pc.in gsd-infos.xml \
|
|
org.gnome.SettingsDaemon.service.in gnome-settings-marshal.list
|
|
CLEANFILES = $(BUILT_SOURCES) $(service_DATA)
|
|
|
|
pkgconfigdir = $(libdir)/pkgconfig
|
|
pkgconfig_DATA = gnome-settings-daemon.pc
|