From f1aa0eed71e1d2b1a305239d5714175d9033a7f0 Mon Sep 17 00:00:00 2001 From: Bradford Hovinen Date: Tue, 18 Dec 2001 21:13:16 +0000 Subject: [PATCH] Don't #include bonobo*.h 2001-12-18 Bradford Hovinen * capplet-util.h: Don't #include bonobo*.h --- capplets/common/ChangeLog | 2 ++ capplets/common/capplet-util.h | 12 +++++------- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/capplets/common/ChangeLog b/capplets/common/ChangeLog index a6158db70..cd0414785 100644 --- a/capplets/common/ChangeLog +++ b/capplets/common/ChangeLog @@ -1,5 +1,7 @@ 2001-12-18 Bradford Hovinen + * capplet-util.h: Don't #include bonobo*.h + * gconf-property-editor.c (peditor_string_widget_changed): Use actual signature for the changed signal Use gconf_client rather than gconf_engine diff --git a/capplets/common/capplet-util.h b/capplets/common/capplet-util.h index 37c3bb1e2..6849912ab 100644 --- a/capplets/common/capplet-util.h +++ b/capplets/common/capplet-util.h @@ -25,8 +25,6 @@ #define __CAPPLET_UTIL_H #include -#include -#include #include #include @@ -44,11 +42,11 @@ /* Copy a setting from the legacy gnome-config settings to the ConfigDatabase */ -#define COPY_FROM_LEGACY(type, key, legacy_type, legacy_key) \ - val_##type = gnome_config_get_##legacy_type##_with_default (legacy_key, &def); \ - \ - if (!def) \ - gconf_engine_set_##type (engine, key, val_##type, NULL); +#define COPY_FROM_LEGACY(type, key, legacy_key) \ + val_##type = gnome_config_get_##type##_with_default (legacy_key, &def); \ + \ + if (!def) \ + gconf_client_set_##type (client, key, val_##type, NULL); /* Callback to apply the settings in the given database */ typedef void (*ApplySettingsFn) (void);