2004-01-13 15:59:09 +00:00
|
|
|
SUBDIRS = xrdb actions
|
2003-05-01 16:08:26 +00:00
|
|
|
|
2007-02-02 18:12:40 +00:00
|
|
|
INCLUDES= \
|
|
|
|
|
$(DBUS_CFLAGS) \
|
|
|
|
|
$(LIBGNOMEKBD_CFLAGS) \
|
|
|
|
|
$(GNOME_SETTINGS_DAEMON_CFLAGS) \
|
|
|
|
|
$(FB_CFLAGS) \
|
|
|
|
|
-I$(top_srcdir)/libbackground \
|
|
|
|
|
-I$(top_srcdir) \
|
|
|
|
|
-DDATADIR="\"$(datadir)\"" \
|
|
|
|
|
-DGNOMELOCALEDIR="\"$(datadir)/locale\"" \
|
|
|
|
|
-DGNOMECC_DATA_DIR="\"$(pkgdatadir)\"" \
|
|
|
|
|
-DGNOMECC_GLADE_DIR="\"$(pkgdatadir)/glade\"" \
|
|
|
|
|
-DGNOMECC_PIXMAPS_DIR="\"$(pkgdatadir)/pixmaps\""
|
2004-01-14 00:22:55 +00:00
|
|
|
|
2003-12-30 17:59:41 +00:00
|
|
|
libexec_PROGRAMS=gnome-settings-daemon
|
2002-01-14 19:30:34 +00:00
|
|
|
|
2002-04-10 06:08:08 +00:00
|
|
|
gnome_settings_daemon_SOURCES = \
|
return NULL when there is an error, not exit(), so that we do proper
2007-04-02 Rodrigo Moya <rodrigo@gnome-db.org>
* gnome-settings-daemon.c (gnome_settings_daemon_new): return NULL
when there is an error, not exit(), so that we do proper cleanup.
Remove code to register GConf callbacks, that is done in utils.c.
(gnome_settings_daemon_get_conf_client,
gnome_settings_daemon_register_callback,
gnome_settings_daemon_spawn_with_input,
gnome_settings_daemon_get_invisible,
gnome_settings_daemon_delayed_show_dialog): removed from the
GnomeSettingsDaemon interface.
* utils.c (gnome_settings_get_config_client,
gnome_settings_get_invisible,
gnome_settings_register_config_callback,
gnome_settings_spawn_with_input,
gnome_settings_delayed_show_dialog): moved from GnomeSettingsDaemon
interface.
* factory.c (main): check return value from gnome_settings_daemon().
* *.c: adapted to changes in function names.
* Makefile.am: put source files in alphabetical order.
svn path=/trunk/; revision=7434
2007-04-02 15:27:35 +00:00
|
|
|
delayed-dialog.c \
|
2004-01-13 15:59:09 +00:00
|
|
|
eggaccelerators.h \
|
|
|
|
|
eggaccelerators.c \
|
return NULL when there is an error, not exit(), so that we do proper
2007-04-02 Rodrigo Moya <rodrigo@gnome-db.org>
* gnome-settings-daemon.c (gnome_settings_daemon_new): return NULL
when there is an error, not exit(), so that we do proper cleanup.
Remove code to register GConf callbacks, that is done in utils.c.
(gnome_settings_daemon_get_conf_client,
gnome_settings_daemon_register_callback,
gnome_settings_daemon_spawn_with_input,
gnome_settings_daemon_get_invisible,
gnome_settings_daemon_delayed_show_dialog): removed from the
GnomeSettingsDaemon interface.
* utils.c (gnome_settings_get_config_client,
gnome_settings_get_invisible,
gnome_settings_register_config_callback,
gnome_settings_spawn_with_input,
gnome_settings_delayed_show_dialog): moved from GnomeSettingsDaemon
interface.
* factory.c (main): check return value from gnome_settings_daemon().
* *.c: adapted to changes in function names.
* Makefile.am: put source files in alphabetical order.
svn path=/trunk/; revision=7434
2007-04-02 15:27:35 +00:00
|
|
|
factory.c \
|
|
|
|
|
gnome-settings-accessibility-keyboard.c \
|
|
|
|
|
gnome-settings-background.c \
|
2007-05-09 15:01:51 +00:00
|
|
|
gnome-settings-clipboard.c \
|
2002-01-14 19:30:34 +00:00
|
|
|
gnome-settings-daemon.h \
|
2001-12-09 18:50:32 +00:00
|
|
|
gnome-settings-daemon.c \
|
return NULL when there is an error, not exit(), so that we do proper
2007-04-02 Rodrigo Moya <rodrigo@gnome-db.org>
* gnome-settings-daemon.c (gnome_settings_daemon_new): return NULL
when there is an error, not exit(), so that we do proper cleanup.
Remove code to register GConf callbacks, that is done in utils.c.
(gnome_settings_daemon_get_conf_client,
gnome_settings_daemon_register_callback,
gnome_settings_daemon_spawn_with_input,
gnome_settings_daemon_get_invisible,
gnome_settings_daemon_delayed_show_dialog): removed from the
GnomeSettingsDaemon interface.
* utils.c (gnome_settings_get_config_client,
gnome_settings_get_invisible,
gnome_settings_register_config_callback,
gnome_settings_spawn_with_input,
gnome_settings_delayed_show_dialog): moved from GnomeSettingsDaemon
interface.
* factory.c (main): check return value from gnome_settings_daemon().
* *.c: adapted to changes in function names.
* Makefile.am: put source files in alphabetical order.
svn path=/trunk/; revision=7434
2007-04-02 15:27:35 +00:00
|
|
|
gnome-settings-dbus.c \
|
|
|
|
|
gnome-settings-dbus.h \
|
|
|
|
|
gnome-settings-default-editor.c \
|
2002-03-28 14:27:13 +00:00
|
|
|
gnome-settings-font.c \
|
return NULL when there is an error, not exit(), so that we do proper
2007-04-02 Rodrigo Moya <rodrigo@gnome-db.org>
* gnome-settings-daemon.c (gnome_settings_daemon_new): return NULL
when there is an error, not exit(), so that we do proper cleanup.
Remove code to register GConf callbacks, that is done in utils.c.
(gnome_settings_daemon_get_conf_client,
gnome_settings_daemon_register_callback,
gnome_settings_daemon_spawn_with_input,
gnome_settings_daemon_get_invisible,
gnome_settings_daemon_delayed_show_dialog): removed from the
GnomeSettingsDaemon interface.
* utils.c (gnome_settings_get_config_client,
gnome_settings_get_invisible,
gnome_settings_register_config_callback,
gnome_settings_spawn_with_input,
gnome_settings_delayed_show_dialog): moved from GnomeSettingsDaemon
interface.
* factory.c (main): check return value from gnome_settings_daemon().
* *.c: adapted to changes in function names.
* Makefile.am: put source files in alphabetical order.
svn path=/trunk/; revision=7434
2007-04-02 15:27:35 +00:00
|
|
|
gnome-settings-gtk1theme.c \
|
|
|
|
|
gnome-settings-keybindings.c \
|
2003-11-12 21:58:51 +00:00
|
|
|
gnome-settings-keyboard-xkb.h \
|
|
|
|
|
gnome-settings-keyboard-xkb.c \
|
2001-12-20 14:11:59 +00:00
|
|
|
gnome-settings-keyboard.c \
|
2002-01-08 21:03:07 +00:00
|
|
|
gnome-settings-locate-pointer.c \
|
|
|
|
|
gnome-settings-locate-pointer.h \
|
2007-04-20 08:35:45 +00:00
|
|
|
gnome-settings-module.c \
|
|
|
|
|
gnome-settings-module.h \
|
return NULL when there is an error, not exit(), so that we do proper
2007-04-02 Rodrigo Moya <rodrigo@gnome-db.org>
* gnome-settings-daemon.c (gnome_settings_daemon_new): return NULL
when there is an error, not exit(), so that we do proper cleanup.
Remove code to register GConf callbacks, that is done in utils.c.
(gnome_settings_daemon_get_conf_client,
gnome_settings_daemon_register_callback,
gnome_settings_daemon_spawn_with_input,
gnome_settings_daemon_get_invisible,
gnome_settings_daemon_delayed_show_dialog): removed from the
GnomeSettingsDaemon interface.
* utils.c (gnome_settings_get_config_client,
gnome_settings_get_invisible,
gnome_settings_register_config_callback,
gnome_settings_spawn_with_input,
gnome_settings_delayed_show_dialog): moved from GnomeSettingsDaemon
interface.
* factory.c (main): check return value from gnome_settings_daemon().
* *.c: adapted to changes in function names.
* Makefile.am: put source files in alphabetical order.
svn path=/trunk/; revision=7434
2007-04-02 15:27:35 +00:00
|
|
|
gnome-settings-mouse.c \
|
|
|
|
|
gnome-settings-multimedia-keys.c \
|
2002-03-26 17:22:02 +00:00
|
|
|
gnome-settings-screensaver.c \
|
2006-06-25 02:16:06 +00:00
|
|
|
gnome-settings-server.h \
|
return NULL when there is an error, not exit(), so that we do proper
2007-04-02 Rodrigo Moya <rodrigo@gnome-db.org>
* gnome-settings-daemon.c (gnome_settings_daemon_new): return NULL
when there is an error, not exit(), so that we do proper cleanup.
Remove code to register GConf callbacks, that is done in utils.c.
(gnome_settings_daemon_get_conf_client,
gnome_settings_daemon_register_callback,
gnome_settings_daemon_spawn_with_input,
gnome_settings_daemon_get_invisible,
gnome_settings_daemon_delayed_show_dialog): removed from the
GnomeSettingsDaemon interface.
* utils.c (gnome_settings_get_config_client,
gnome_settings_get_invisible,
gnome_settings_register_config_callback,
gnome_settings_spawn_with_input,
gnome_settings_delayed_show_dialog): moved from GnomeSettingsDaemon
interface.
* factory.c (main): check return value from gnome_settings_daemon().
* *.c: adapted to changes in function names.
* Makefile.am: put source files in alphabetical order.
svn path=/trunk/; revision=7434
2007-04-02 15:27:35 +00:00
|
|
|
gnome-settings-sound.c \
|
|
|
|
|
gnome-settings-typing-break.c \
|
|
|
|
|
gnome-settings-xmodmap.c \
|
|
|
|
|
gnome-settings-xmodmap.h \
|
2003-05-01 16:08:26 +00:00
|
|
|
gnome-settings-xrdb.c \
|
return NULL when there is an error, not exit(), so that we do proper
2007-04-02 Rodrigo Moya <rodrigo@gnome-db.org>
* gnome-settings-daemon.c (gnome_settings_daemon_new): return NULL
when there is an error, not exit(), so that we do proper cleanup.
Remove code to register GConf callbacks, that is done in utils.c.
(gnome_settings_daemon_get_conf_client,
gnome_settings_daemon_register_callback,
gnome_settings_daemon_spawn_with_input,
gnome_settings_daemon_get_invisible,
gnome_settings_daemon_delayed_show_dialog): removed from the
GnomeSettingsDaemon interface.
* utils.c (gnome_settings_get_config_client,
gnome_settings_get_invisible,
gnome_settings_register_config_callback,
gnome_settings_spawn_with_input,
gnome_settings_delayed_show_dialog): moved from GnomeSettingsDaemon
interface.
* factory.c (main): check return value from gnome_settings_daemon().
* *.c: adapted to changes in function names.
* Makefile.am: put source files in alphabetical order.
svn path=/trunk/; revision=7434
2007-04-02 15:27:35 +00:00
|
|
|
gnome-settings-xsettings.c \
|
Add a new media keys window that takes advantage of compositing when
2006-12-07 William Jon McCann <mccann@jhu.edu>
* gnome-settings-daemon/Makefile.am:
* gnome-settings-daemon/actions/Makefile.am:
* gnome-settings-daemon/actions/acme.glade:
* gnome-settings-daemon/actions/gnome-speakernotes-muted.png:
* gnome-settings-daemon/actions/gnome-speakernotes.png:
* gnome-settings-daemon/gnome-settings-multimedia-keys.c:
(execute), (dialog_init), (unhookup_keysym), (update_kbd_cb),
(init_kbd), (dialog_show), (do_eject_action), (do_sound_action),
(gnome_settings_multimedia_keys_load):
* gnome-settings-daemon/gsd-media-keys-window.c: (hide_timeout),
(remove_hide_timeout), (add_hide_timeout), (update_window),
(volume_controls_set_visible), (window_set_icon_name),
(window_set_icon_file), (action_changed), (volume_level_changed),
(volume_muted_changed), (gsd_media_keys_window_set_action),
(gsd_media_keys_window_set_volume_muted),
(gsd_media_keys_window_set_volume_level), (curved_rectangle),
(draw_action_eject), (draw_waves), (draw_speaker),
(draw_volume_boxes), (draw_action_volume), (draw_action),
(on_expose_event), (gsd_media_keys_window_real_show),
(gsd_media_keys_window_real_hide),
(gsd_media_keys_window_class_init), (initialize_alpha_mode),
(gsd_media_keys_window_init), (gsd_media_keys_window_finalize),
(gsd_media_keys_window_new):
* gnome-settings-daemon/gsd-media-keys-window.h:
Add a new media keys window that takes advantage of
compositing when available. Fixes #383066
2006-12-07 17:54:56 +00:00
|
|
|
gsd-media-keys-window.c \
|
|
|
|
|
gsd-media-keys-window.h \
|
return NULL when there is an error, not exit(), so that we do proper
2007-04-02 Rodrigo Moya <rodrigo@gnome-db.org>
* gnome-settings-daemon.c (gnome_settings_daemon_new): return NULL
when there is an error, not exit(), so that we do proper cleanup.
Remove code to register GConf callbacks, that is done in utils.c.
(gnome_settings_daemon_get_conf_client,
gnome_settings_daemon_register_callback,
gnome_settings_daemon_spawn_with_input,
gnome_settings_daemon_get_invisible,
gnome_settings_daemon_delayed_show_dialog): removed from the
GnomeSettingsDaemon interface.
* utils.c (gnome_settings_get_config_client,
gnome_settings_get_invisible,
gnome_settings_register_config_callback,
gnome_settings_spawn_with_input,
gnome_settings_delayed_show_dialog): moved from GnomeSettingsDaemon
interface.
* factory.c (main): check return value from gnome_settings_daemon().
* *.c: adapted to changes in function names.
* Makefile.am: put source files in alphabetical order.
svn path=/trunk/; revision=7434
2007-04-02 15:27:35 +00:00
|
|
|
list.c \
|
|
|
|
|
list.h \
|
|
|
|
|
reaper.c \
|
|
|
|
|
reaper.h \
|
|
|
|
|
utils.c \
|
|
|
|
|
utils.h \
|
2001-12-09 18:50:32 +00:00
|
|
|
xsettings-common.c \
|
|
|
|
|
xsettings-common.h \
|
return NULL when there is an error, not exit(), so that we do proper
2007-04-02 Rodrigo Moya <rodrigo@gnome-db.org>
* gnome-settings-daemon.c (gnome_settings_daemon_new): return NULL
when there is an error, not exit(), so that we do proper cleanup.
Remove code to register GConf callbacks, that is done in utils.c.
(gnome_settings_daemon_get_conf_client,
gnome_settings_daemon_register_callback,
gnome_settings_daemon_spawn_with_input,
gnome_settings_daemon_get_invisible,
gnome_settings_daemon_delayed_show_dialog): removed from the
GnomeSettingsDaemon interface.
* utils.c (gnome_settings_get_config_client,
gnome_settings_get_invisible,
gnome_settings_register_config_callback,
gnome_settings_spawn_with_input,
gnome_settings_delayed_show_dialog): moved from GnomeSettingsDaemon
interface.
* factory.c (main): check return value from gnome_settings_daemon().
* *.c: adapted to changes in function names.
* Makefile.am: put source files in alphabetical order.
svn path=/trunk/; revision=7434
2007-04-02 15:27:35 +00:00
|
|
|
xsettings-manager.c \
|
2002-03-11 01:44:03 +00:00
|
|
|
xsettings-manager.h \
|
2005-06-03 08:29:45 +00:00
|
|
|
xutils.c \
|
return NULL when there is an error, not exit(), so that we do proper
2007-04-02 Rodrigo Moya <rodrigo@gnome-db.org>
* gnome-settings-daemon.c (gnome_settings_daemon_new): return NULL
when there is an error, not exit(), so that we do proper cleanup.
Remove code to register GConf callbacks, that is done in utils.c.
(gnome_settings_daemon_get_conf_client,
gnome_settings_daemon_register_callback,
gnome_settings_daemon_spawn_with_input,
gnome_settings_daemon_get_invisible,
gnome_settings_daemon_delayed_show_dialog): removed from the
GnomeSettingsDaemon interface.
* utils.c (gnome_settings_get_config_client,
gnome_settings_get_invisible,
gnome_settings_register_config_callback,
gnome_settings_spawn_with_input,
gnome_settings_delayed_show_dialog): moved from GnomeSettingsDaemon
interface.
* factory.c (main): check return value from gnome_settings_daemon().
* *.c: adapted to changes in function names.
* Makefile.am: put source files in alphabetical order.
svn path=/trunk/; revision=7434
2007-04-02 15:27:35 +00:00
|
|
|
xutils.h
|
2001-12-09 18:50:32 +00:00
|
|
|
|
2002-06-25 09:14:35 +00:00
|
|
|
# $(AccessX_files)
|
2002-06-19 22:46:39 +00:00
|
|
|
|
2002-04-10 06:08:08 +00:00
|
|
|
gnome_settings_daemon_LDADD = \
|
2006-06-25 02:16:06 +00:00
|
|
|
$(DBUS_LIBS) \
|
2006-10-18 22:37:40 +00:00
|
|
|
$(LIBGNOMEKBD_LIBS) \
|
2002-08-08 07:13:38 +00:00
|
|
|
$(top_builddir)/libbackground/libbackground.la \
|
|
|
|
|
$(top_builddir)/libsounds/libsounds.a \
|
2003-12-02 00:15:27 +00:00
|
|
|
$(top_builddir)/libwindow-settings/libgnome-window-settings.la \
|
2004-03-31 21:30:23 +00:00
|
|
|
$(top_builddir)/gnome-settings-daemon/actions/libacme.la \
|
|
|
|
|
$(GNOME_SETTINGS_DAEMON_LIBS) \
|
2006-03-03 10:18:21 +00:00
|
|
|
$(XF86MISC_LIBS) $(GST_LIBS)
|
2001-12-20 14:11:59 +00:00
|
|
|
|
2002-06-18 18:55:14 +00:00
|
|
|
#AccessX_files = \
|
|
|
|
|
# AccessXcomm.c \
|
|
|
|
|
# extutil.h \
|
|
|
|
|
# AccessXproto.h \
|
|
|
|
|
# AccessXlibint.h
|
|
|
|
|
|
2006-07-11 16:12:38 +00:00
|
|
|
BUILT_SOURCES=gnome-settings-server.h \
|
2007-01-08 16:48:19 +00:00
|
|
|
gnome-settings-client.h \
|
|
|
|
|
gnome-settings-marshal.h \
|
|
|
|
|
gnome-settings-marshal.c
|
|
|
|
|
|
|
|
|
|
gnome_settings_daemon_SOURCES+=$(BUILT_SOURCES)
|
2002-01-29 04:48:25 +00:00
|
|
|
|
2007-02-02 18:12:40 +00:00
|
|
|
Gladedir = $(pkgdatadir)/glade
|
2006-06-25 02:16:06 +00:00
|
|
|
Glade_DATA = modmap-dialog.glade
|
|
|
|
|
|
|
|
|
|
Dbusapidir = $(includedir)/gnome-settings-daemon-2.0/gnome-settings-daemon
|
|
|
|
|
Dbusapi_DATA = gnome-settings-client.h
|
2002-03-11 01:44:03 +00:00
|
|
|
|
2007-01-08 16:48:19 +00:00
|
|
|
#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 > $@
|
|
|
|
|
|
2006-06-25 02:16:06 +00:00
|
|
|
#Rule to generate the binding headers
|
|
|
|
|
gnome-settings-server.h: gsd-infos.xml
|
|
|
|
|
dbus-binding-tool --prefix=settings_daemon --mode=glib-server $< > $@
|
2002-03-11 01:44:03 +00:00
|
|
|
|
2006-06-25 02:16:06 +00:00
|
|
|
gnome-settings-client.h: gsd-infos.xml
|
|
|
|
|
dbus-binding-tool --prefix=settings_daemon --mode=glib-client $< > $@
|
2002-03-11 01:44:03 +00:00
|
|
|
|
2006-06-25 02:16:06 +00:00
|
|
|
# DBUS stuff
|
2007-01-31 22:46:48 +00:00
|
|
|
servicedir = $(datadir)/dbus-1/services
|
2006-06-25 02:16:06 +00:00
|
|
|
service_in_files = org.gnome.SettingsDaemon.service.in
|
|
|
|
|
service_DATA = $(service_in_files:.service.in=.service)
|
2005-01-31 15:31:44 +00:00
|
|
|
|
2006-06-25 02:16:06 +00:00
|
|
|
org.gnome.SettingsDaemon.service: org.gnome.SettingsDaemon.service.in Makefile
|
|
|
|
|
@sed -e "s|\@libexecdir\@|$(libexecdir)|" $< > $@
|
2004-01-09 07:41:19 +00:00
|
|
|
|
2006-07-11 16:12:38 +00:00
|
|
|
EXTRA_DIST = $(Glade_DATA) $(Dbusapi_DATA) \
|
2007-01-08 16:48:19 +00:00
|
|
|
gnome-settings-daemon.pc.in gsd-infos.xml \
|
|
|
|
|
org.gnome.SettingsDaemon.service.in gnome-settings-marshal.list
|
2006-07-11 16:24:17 +00:00
|
|
|
CLEANFILES = $(BUILT_SOURCES) $(service_DATA)
|
2004-12-20 21:53:31 +00:00
|
|
|
|
2006-06-25 02:16:06 +00:00
|
|
|
pkgconfigdir = $(libdir)/pkgconfig
|
|
|
|
|
pkgconfig_DATA = gnome-settings-daemon.pc
|
Make the new volume overlay window follow the icon and color themes. Add
2007-02-05 William Jon McCann <mccann@jhu.edu>
* Makefile.am:
* gsd-media-keys-window.c: (load_pixbuf), (render_eject),
(draw_eject), (draw_action_eject), (draw_waves), (draw_speaker),
(render_speaker), (draw_volume_boxes), (draw_action_volume),
(on_expose_event):
* test-media-window.c: (update_state), (test_window), (main):
Make the new volume overlay window follow the
icon and color themes. Add an unstalled test app. Fixes #403320
svn path=/trunk/; revision=7246
2007-02-05 05:25:27 +00:00
|
|
|
|
|
|
|
|
noinst_PROGRAMS = \
|
|
|
|
|
test-media-window
|
|
|
|
|
|
|
|
|
|
test_media_window_SOURCES = \
|
|
|
|
|
gsd-media-keys-window.c \
|
|
|
|
|
gsd-media-keys-window.h \
|
|
|
|
|
test-media-window.c
|
|
|
|
|
|
|
|
|
|
test_media_window_LDADD = \
|
|
|
|
|
$(GNOME_SETTINGS_DAEMON_LIBS) \
|
|
|
|
|
$(XF86MISC_LIBS) $(GST_LIBS)
|
