diff options
| author | Jonathan Blandford <jrb@gnome.org> | 2002-04-10 06:08:08 +0000 |
|---|---|---|
| committer | Jonathan Blandford <jrb@src.gnome.org> | 2002-04-10 06:08:08 +0000 |
| commit | 6f1fa592ecec0b32dc1ee4cc87c621e47ad67ad2 (patch) | |
| tree | 596a1880cb831b39d363cb26f24e9dbd129c0985 /gnome-settings-daemon | |
| parent | 5a1e076eedda885d2bcad37186182be687045833 (diff) | |
| download | gnome-control-center-6f1fa592ecec0b32dc1ee4cc87c621e47ad67ad2.tar.gz | |
Change gnome2-* to gnome-* ditto ditto ditto ditto ditto ditto ditto ditto
Tue Apr 9 11:43:08 2002 Jonathan Blandford <jrb@gnome.org>
* capplets/accessibility/keyboard/Makefile.am: Change gnome2-* to
gnome-*
* capplets/default-applications/Makefile.am: ditto
* capplets/file-types/Makefile.am: ditto
* capplets/font/Makefile.am: ditto
* capplets/keyboard/Makefile.am: ditto
* capplets/mouse/Makefile.am: ditto
* capplets/sound/Makefile.am: ditto
* capplets/theme-switcher/Makefile.am: ditto
* capplets/ui-properties/Makefile.am: ditto
* control-center/Makefile.am: ditto
* gnome-settings-daemon/Makefile.am: ditto
* gnome-keybinding-properties.c (setup_dialog): man, was this code
silly. Also, themes are case sensitive.
(is_metacity_running): Add support for metacity keybindings. This
is off by default until I write code to actually detect metacity.
Tue Apr 9 11:58:10 2002 Jonathan Blandford <jrb@gnome.org>
* Makefile.am: Add commented out disk support until I finish the code.
Diffstat (limited to 'gnome-settings-daemon')
| -rw-r--r-- | gnome-settings-daemon/ChangeLog | 4 | ||||
| -rw-r--r-- | gnome-settings-daemon/Makefile.am | 6 | ||||
| -rw-r--r-- | gnome-settings-daemon/gnome-settings-daemon.c | 3 |
3 files changed, 10 insertions, 3 deletions
diff --git a/gnome-settings-daemon/ChangeLog b/gnome-settings-daemon/ChangeLog index ab0ab3efa..d7efcf8d4 100644 --- a/gnome-settings-daemon/ChangeLog +++ b/gnome-settings-daemon/ChangeLog @@ -1,3 +1,7 @@ +Tue Apr 9 11:58:10 2002 Jonathan Blandford <jrb@gnome.org> + + * Makefile.am: Add commented out disk support until I finish the code. + 2002-04-04 jacob berkman <jacob@ximian.com> * gnome-settings-accessibility-keyboard.c (set_server_from_gconf): diff --git a/gnome-settings-daemon/Makefile.am b/gnome-settings-daemon/Makefile.am index b79c5cb42..8a6cf29be 100644 --- a/gnome-settings-daemon/Makefile.am +++ b/gnome-settings-daemon/Makefile.am @@ -1,8 +1,8 @@ INCLUDES=$(GNOME_SETTINGS_DAEMON_CFLAGS) -I$(top_srcdir)/libbackground -I$(top_srcdir) -bin_PROGRAMS=gnome2-settings-daemon +bin_PROGRAMS=gnome-settings-daemon -gnome2_settings_daemon_SOURCES = \ +gnome_settings_daemon_SOURCES = \ factory.c \ gnome-settings-daemon.h \ gnome-settings-daemon.c \ @@ -32,7 +32,7 @@ gnome2_settings_daemon_SOURCES = \ xsettings-manager.h \ $(CORBA_GENERATED) -gnome2_settings_daemon_LDADD = \ +gnome_settings_daemon_LDADD = \ $(GNOME_SETTINGS_DAEMON_LIBS) \ $(top_builddir)/libbackground/libbackground.la \ $(top_builddir)/libsounds/libsounds.a \ diff --git a/gnome-settings-daemon/gnome-settings-daemon.c b/gnome-settings-daemon/gnome-settings-daemon.c index cb5ec23f8..655a6babf 100644 --- a/gnome-settings-daemon/gnome-settings-daemon.c +++ b/gnome-settings-daemon/gnome-settings-daemon.c @@ -34,6 +34,7 @@ #include "xsettings-manager.h" #include "gnome-settings-daemon.h" +/*#include "gnome-settings-disk.h"*/ #include "gnome-settings-font.h" #include "gnome-settings-xsettings.h" #include "gnome-settings-mouse.h" @@ -224,6 +225,7 @@ gnome_settings_daemon_new (void) */ client = gconf_client_get_default (); +/* gnome_settings_disk_init (client);*/ gnome_settings_font_init (client); gnome_settings_xsettings_init (client); gnome_settings_mouse_init (client); @@ -261,6 +263,7 @@ gnome_settings_daemon_new (void) gdk_window_add_filter (NULL, manager_event_filter, NULL); +/* gnome_settings_disk_load (client);*/ gnome_settings_font_load (client); gnome_settings_xsettings_load (client); gnome_settings_mouse_load (client); |