From 2c63f8ead772a7b95d885728d2b2ea62dc55947d Mon Sep 17 00:00:00 2001 From: Chema Celorio Date: Tue, 13 Mar 2001 05:17:20 +0000 Subject: [PATCH] s/gEdit/gedit 2001-03-13 Chema Celorio * capplets/gnome-edit-properties/gnome-edit-properties.c: s/gEdit/gedit --- ChangeLog | 5 +++++ capplets/Makefile.am | 4 ++-- capplets/background/main.c | 2 +- 3 files changed, 8 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index 3062ddc93..0531ff807 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2001-03-13 Chema Celorio + + * capplets/gnome-edit-properties/gnome-edit-properties.c: + s/gEdit/gedit + 2001-01-29 Fatih Demir * idl/.cvsignore & libcapplet/.cvsignore: Added these diff --git a/capplets/Makefile.am b/capplets/Makefile.am index 5240493e9..f918998ab 100644 --- a/capplets/Makefile.am +++ b/capplets/Makefile.am @@ -1,5 +1,5 @@ -always_built_SUBDIRS = desktop-links new-mouse-properties \ - new-screensaver-properties new-background-properties \ +always_built_SUBDIRS = desktop-links \ + new-background-properties \ theme-switcher new-sound-properties new-bell-properties \ new-ui-properties url-properties gnome-edit-properties \ session-properties wm-properties new-keyboard-properties \ diff --git a/capplets/background/main.c b/capplets/background/main.c index 709aebf92..7dcdcec4e 100644 --- a/capplets/background/main.c +++ b/capplets/background/main.c @@ -215,7 +215,7 @@ main (int argc, char **argv) prefs = PREFERENCES (preferences_new ()); preferences_load (prefs); - if (token) { + if (token || res == 1) { preferences_apply_now (prefs); }