Don't #include bonobo*.h

2001-12-18  Bradford Hovinen  <hovinen@ximian.com>

	* capplet-util.h: Don't #include bonobo*.h
This commit is contained in:
Bradford Hovinen 2001-12-18 21:13:16 +00:00 committed by Bradford Hovinen (Gdict maintainer)
parent 5cf9b9e178
commit f1aa0eed71
2 changed files with 7 additions and 7 deletions

View file

@ -1,5 +1,7 @@
2001-12-18 Bradford Hovinen <hovinen@ximian.com>
* 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

View file

@ -25,8 +25,6 @@
#define __CAPPLET_UTIL_H
#include <gnome.h>
#include <bonobo.h>
#include <bonobo/bonobo-property-control.h>
#include <gconf/gconf.h>
#include <gconf/gconf-changeset.h>
@ -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); \
#define COPY_FROM_LEGACY(type, key, legacy_key) \
val_##type = gnome_config_get_##type##_with_default (legacy_key, &def); \
\
if (!def) \
gconf_engine_set_##type (engine, key, val_##type, NULL);
gconf_client_set_##type (client, key, val_##type, NULL);
/* Callback to apply the settings in the given database */
typedef void (*ApplySettingsFn) (void);