summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRichard Hestilow <hestilow@ximian.com>2001-07-25 03:12:31 +0000
committerRachel Hestilow <hestgray@src.gnome.org>2001-07-25 03:12:31 +0000
commit4658f96ff370b0946a994e45b6c6f1415ca2aa96 (patch)
treecac61372e03197fd524eddf226548f6075352034
parent29095b8349de0159711306cd5c6796a29e646ebf (diff)
downloadgnome-control-center-4658f96ff370b0946a994e45b6c6f1415ca2aa96.tar.gz
Pass in legacy files to capplet_init.
2001-07-24 Richard Hestilow <hestilow@ximian.com> * main.c (main): Pass in legacy files to capplet_init.
-rw-r--r--capplets/background/ChangeLog4
-rw-r--r--capplets/background/main.c4
-rw-r--r--capplets/keyboard/ChangeLog4
-rw-r--r--capplets/keyboard/main.c5
4 files changed, 15 insertions, 2 deletions
diff --git a/capplets/background/ChangeLog b/capplets/background/ChangeLog
index 7906f4f55..dcc76c004 100644
--- a/capplets/background/ChangeLog
+++ b/capplets/background/ChangeLog
@@ -1,3 +1,7 @@
+2001-07-24 Richard Hestilow <hestilow@ximian.com>
+
+ * main.c (main): Pass in legacy files to capplet_init.
+
2001-07-23 Bradford Hovinen <hovinen@ximian.com>
* applier.c (renderer_render_wallpaper): Don't adjust pixmap width
diff --git a/capplets/background/main.c b/capplets/background/main.c
index 27386b12c..90c0d2f95 100644
--- a/capplets/background/main.c
+++ b/capplets/background/main.c
@@ -262,10 +262,12 @@ create_dialog (void)
int
main (int argc, char **argv)
{
+ const gchar* legacy_files[] = { "Background", NULL };
+
glade_gnome_init ();
gnomelib_register_popt_table (options, "background options");
- capplet_init (argc, argv, apply_settings, create_dialog, setup_dialog, get_legacy_settings);
+ capplet_init (argc, argv, legacy_files, apply_settings, create_dialog, setup_dialog, get_legacy_settings);
gnome_window_icon_set_default_from_file
(GNOMECC_ICONS_DIR"/gnome-ccbackground.png");
diff --git a/capplets/keyboard/ChangeLog b/capplets/keyboard/ChangeLog
index d5b3a9c2c..01eea4fbb 100644
--- a/capplets/keyboard/ChangeLog
+++ b/capplets/keyboard/ChangeLog
@@ -1,3 +1,7 @@
+2001-07-24 Richard Hestilow <hestilow@ximian.com>
+
+ * main.c (main): Pass in legacy files to capplet_init.
+
2001-07-20 Chema Celorio <chema@celorio.com>
* RELEASE : 1.5.0
diff --git a/capplets/keyboard/main.c b/capplets/keyboard/main.c
index a5cefdef5..1bc6822ea 100644
--- a/capplets/keyboard/main.c
+++ b/capplets/keyboard/main.c
@@ -204,8 +204,11 @@ get_legacy_settings (Bonobo_ConfigDatabase db)
int
main (int argc, char **argv)
{
+ const gchar* legacy_files[] = { "Desktop", NULL };
+
glade_gnome_init ();
- capplet_init (argc, argv, apply_settings, create_dialog, setup_dialog, get_legacy_settings);
+
+ capplet_init (argc, argv, legacy_files, apply_settings, create_dialog, setup_dialog, get_legacy_settings);
gnome_window_icon_set_default_from_file
(GNOMECC_ICONS_DIR"keyboard-capplet.png.png");