diff options
| author | Dave Camp <dave@ximian.com> | 2002-01-07 17:06:26 +0000 |
|---|---|---|
| committer | Dave Camp <campd@src.gnome.org> | 2002-01-07 17:06:26 +0000 |
| commit | fa0d91ebce9644f425447a847b62c8ec6e8396be (patch) | |
| tree | 81f8f4fd0d0cb2d357c988b2c3ce5e9c101576f1 /src | |
| parent | e0d36ccafb5d3e5e5ae65c2eb19b1c0c196944f1 (diff) | |
| download | nautilus-fa0d91ebce9644f425447a847b62c8ec6e8396be.tar.gz | |
Take out the return. The EelLabel exorcism did in fact mostly fix the
2002-01-07 Dave Camp <dave@ximian.com>
* src/nautilus-preferences-dialog.c
(preferences_dialog_populate_themes_group): Take out the return.
The EelLabel exorcism did in fact mostly fix the theme selector.
* src/nautilus-theme-selector.c (theme_selector_finalize): Moved here
from theme_selector_destroy.
(nautilus_theme_selector_class_init): Fixed the argument type list for
the theme_changed signal, and reflect the destroy->finalize change.
Diffstat (limited to 'src')
| -rw-r--r-- | src/nautilus-preferences-dialog.c | 6 | ||||
| -rw-r--r-- | src/nautilus-theme-selector.c | 20 |
2 files changed, 9 insertions, 17 deletions
diff --git a/src/nautilus-preferences-dialog.c b/src/nautilus-preferences-dialog.c index d0bde1ea1..620fcd5c6 100644 --- a/src/nautilus-preferences-dialog.c +++ b/src/nautilus-preferences-dialog.c @@ -527,12 +527,6 @@ preferences_dialog_populate_themes_group (EelPreferencesGroup *group) g_return_if_fail (EEL_IS_PREFERENCES_GROUP (group)); - /* FIXME: The image chooser is broken because of EelLabel usage. - Im hopeful that a general exorcism of EelLabel will fix this - along with many other label related problems. - */ - return; - child = nautilus_theme_selector_new (); parent_window = gtk_widget_get_ancestor (GTK_WIDGET (group), GTK_TYPE_WINDOW); diff --git a/src/nautilus-theme-selector.c b/src/nautilus-theme-selector.c index 37cfd11a0..44661f300 100644 --- a/src/nautilus-theme-selector.c +++ b/src/nautilus-theme-selector.c @@ -77,7 +77,7 @@ static guint theme_selector_signals[LAST_SIGNAL]; /* GtkObjectClass methods */ static void nautilus_theme_selector_class_init (NautilusThemeSelectorClass *theme_selector_class); static void nautilus_theme_selector_init (NautilusThemeSelector *theme_selector); -static void theme_selector_destroy (GtkObject *object); +static void theme_selector_finalize (GObject *object); /* Private stuff */ static void theme_selector_populate_list (EelImageChooser *image_chooser, @@ -105,12 +105,12 @@ EEL_CLASS_BOILERPLATE (NautilusThemeSelector, nautilus_theme_selector, GTK_TYPE_ static void nautilus_theme_selector_class_init (NautilusThemeSelectorClass *theme_selector_class) { - GtkObjectClass *object_class; + GObjectClass *object_class; - object_class = GTK_OBJECT_CLASS (theme_selector_class); + object_class = G_OBJECT_CLASS (theme_selector_class); - /* GtkObjectClass */ - object_class->destroy = theme_selector_destroy; + /* GObjectClass */ + object_class->finalize = theme_selector_finalize; /* Signals */ theme_selector_signals[THEME_CHANGED] = g_signal_new @@ -120,7 +120,7 @@ nautilus_theme_selector_class_init (NautilusThemeSelectorClass *theme_selector_c 0, NULL, NULL, g_cclosure_marshal_VOID__STRING, - G_TYPE_NONE, 0); + G_TYPE_NONE, 1, G_TYPE_STRING); } static void @@ -519,7 +519,7 @@ theme_selector_changed_callback (EelImageChooser *image_chooser, /* GtkObjectClass methods */ static void -theme_selector_destroy (GtkObject *object) +theme_selector_finalize (GObject *object) { NautilusThemeSelector *theme_selector; @@ -528,10 +528,8 @@ theme_selector_destroy (GtkObject *object) theme_selector = NAUTILUS_THEME_SELECTOR (object); theme_selector->details->theme_selector_changed_connection = 0; - g_free (theme_selector->details); - - /* Chain destroy */ - EEL_CALL_PARENT (GTK_OBJECT_CLASS, destroy, (object)); + /* Chain finalize */ + EEL_CALL_PARENT (G_OBJECT_CLASS, finalize, (object)); } /* Private stuff */ |