Eliminate compiler warnings

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

	* gconf-property-editor.c: Eliminate compiler warnings

	* capplet-util.c: Eliminate compiler warnings
This commit is contained in:
Bradford Hovinen 2001-12-20 20:21:39 +00:00 committed by Bradford Hovinen (Gdict maintainer)
parent 575824d32a
commit bc02837644
3 changed files with 6 additions and 10 deletions

View file

@ -1,5 +1,9 @@
2001-12-20 Bradford Hovinen <hovinen@ximian.com>
* gconf-property-editor.c: Eliminate compiler warnings
* capplet-util.c: Eliminate compiler warnings
* gconf-property-editor.c (gconf_peditor_new): Fold the callback
back in; accept variable argument list with extra parameters
(gconf_peditor_new_filename): Return the property editor

View file

@ -34,12 +34,6 @@
#include "capplet-util.h"
static CreateDialogFn create_dialog_cb = NULL;
static ApplySettingsFn apply_settings_cb = NULL;
static SetupPropertyEditorsFn setup_property_editors_cb = NULL;
static GConfChangeSet *changeset;
#if 0
/* apply_cb

View file

@ -198,7 +198,6 @@ gconf_property_editor_set_prop (GObject *object,
GConfPropertyEditor *peditor;
GConfClient *client;
GConfNotifyFunc cb;
GObject *det_obj;
g_return_if_fail (object != NULL);
g_return_if_fail (IS_GCONF_PROPERTY_EDITOR (object));
@ -298,8 +297,8 @@ gconf_peditor_new (gchar *key,
GConfClient *client;
GConfEntry *gconf_entry;
g_return_if_fail (key != NULL);
g_return_if_fail (cb != NULL);
g_return_val_if_fail (key != NULL, NULL);
g_return_val_if_fail (cb != NULL, NULL);
obj = g_object_new (gconf_property_editor_get_type (),
"key", key,
@ -736,7 +735,6 @@ peditor_numeric_range_value_changed (GConfClient *client,
GConfPropertyEditor *peditor)
{
GConfValue *value, *value_wid;
GtkAdjustment *adjustment;
gconf_change_set_remove (peditor->p->changeset, peditor->p->key);