diff options
| author | Mike Kestner <mkestner@src.gnome.org> | 2002-11-01 05:30:57 +0800 |
|---|---|---|
| committer | Mike Kestner <mkestner@src.gnome.org> | 2002-11-01 05:30:57 +0800 |
| commit | 613453b1095e325149b8d37e5731d415e1d5f9bd (patch) | |
| tree | 1c0d7f9be4d4a87aa67d8e185ae2bb23d02254b7 /widgets/table/e-table-field-chooser-dialog.c | |
| parent | ec242d6c30d7bf056c8f59710b8576c942f93583 (diff) | |
| download | gsoc2013-evolution-613453b1095e325149b8d37e5731d415e1d5f9bd.tar.gz gsoc2013-evolution-613453b1095e325149b8d37e5731d415e1d5f9bd.tar.zst gsoc2013-evolution-613453b1095e325149b8d37e5731d415e1d5f9bd.zip | |
merging the gal-2 branch back to the trunk.
merging the gal-2 branch back to the trunk.
svn path=/trunk/; revision=18471
Diffstat (limited to 'widgets/table/e-table-field-chooser-dialog.c')
| -rw-r--r-- | widgets/table/e-table-field-chooser-dialog.c | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/widgets/table/e-table-field-chooser-dialog.c b/widgets/table/e-table-field-chooser-dialog.c index fa9def8a6f..906dadc52a 100644 --- a/widgets/table/e-table-field-chooser-dialog.c +++ b/widgets/table/e-table-field-chooser-dialog.c @@ -23,7 +23,6 @@ #include <config.h> #include "e-table-field-chooser-dialog.h" -#include <libgnomeui/gnome-stock.h> #include "gal/util/e-i18n.h" static void e_table_field_chooser_dialog_init (ETableFieldChooserDialog *card); @@ -105,7 +104,7 @@ e_table_field_chooser_dialog_init (ETableFieldChooserDialog *e_table_field_choos e_table_field_chooser_dialog->header = NULL; gnome_dialog_append_buttons(GNOME_DIALOG(e_table_field_chooser_dialog), - GNOME_STOCK_BUTTON_CLOSE, + GTK_STOCK_CLOSE, NULL); gtk_window_set_policy(GTK_WINDOW(e_table_field_chooser_dialog), FALSE, TRUE, FALSE); @@ -138,11 +137,17 @@ static void e_table_field_chooser_dialog_destroy (GtkObject *object) { ETableFieldChooserDialog *etfcd = E_TABLE_FIELD_CHOOSER_DIALOG (object); - g_free(etfcd->dnd_code); + + g_free (etfcd->dnd_code); + etfcd->dnd_code = NULL; + if (etfcd->full_header) gtk_object_unref(GTK_OBJECT(etfcd->full_header)); + etfcd->full_header = NULL; + if (etfcd->header) gtk_object_unref(GTK_OBJECT(etfcd->header)); + etfcd->header = NULL; } static void |