aboutsummaryrefslogtreecommitdiffstats
path: root/widgets/table/e-table-field-chooser.c
diff options
context:
space:
mode:
Diffstat (limited to 'widgets/table/e-table-field-chooser.c')
-rw-r--r--widgets/table/e-table-field-chooser.c17
1 files changed, 12 insertions, 5 deletions
diff --git a/widgets/table/e-table-field-chooser.c b/widgets/table/e-table-field-chooser.c
index 85d65817b0..5a74ae788c 100644
--- a/widgets/table/e-table-field-chooser.c
+++ b/widgets/table/e-table-field-chooser.c
@@ -22,7 +22,10 @@
*/
#include <config.h>
-#include <libgnomeui/gnome-canvas-rect-ellipse.h>
+#include <gtk/gtksignal.h>
+#include <gtk/gtk.h>
+#include <gtk/gtkbox.h>
+#include <libgnomecanvas/gnome-canvas-rect-ellipse.h>
#include "e-table-field-chooser.h"
#include "e-table-field-chooser-item.h"
@@ -131,7 +134,7 @@ e_table_field_chooser_init (ETableFieldChooser *etfc)
GladeXML *gui;
GtkWidget *widget;
- gui = glade_xml_new_with_domain (ETABLE_GLADEDIR "/e-table-field-chooser.glade", NULL, PACKAGE);
+ gui = glade_xml_new (ETABLE_GLADEDIR "/e-table-field-chooser.glade", NULL, PACKAGE);
etfc->gui = gui;
widget = glade_xml_get_widget(gui, "vbox-top");
@@ -141,7 +144,6 @@ e_table_field_chooser_init (ETableFieldChooser *etfc)
gtk_widget_reparent(widget,
GTK_WIDGET(etfc));
- gtk_widget_push_visual (gdk_rgb_get_visual ());
gtk_widget_push_colormap (gdk_rgb_get_cmap ());
etfc->canvas = GNOME_CANVAS(glade_xml_get_widget(gui, "canvas-buttons"));
@@ -176,7 +178,6 @@ e_table_field_chooser_init (ETableFieldChooser *etfc)
GTK_SIGNAL_FUNC (allocate_callback),
etfc);
- gtk_widget_pop_visual ();
gtk_widget_pop_colormap ();
gtk_widget_show(widget);
}
@@ -186,14 +187,20 @@ e_table_field_chooser_destroy (GtkObject *object)
{
ETableFieldChooser *etfc = E_TABLE_FIELD_CHOOSER(object);
- g_free(etfc->dnd_code);
+ g_free (etfc->dnd_code);
+ etfc->dnd_code = NULL;
+
if (etfc->full_header)
gtk_object_unref(GTK_OBJECT(etfc->full_header));
+ etfc->full_header = NULL;
+
if (etfc->header)
gtk_object_unref(GTK_OBJECT(etfc->header));
+ etfc->header = NULL;
if (etfc->gui)
gtk_object_unref(GTK_OBJECT(etfc->gui));
+ etfc->gui = NULL;
if (GTK_OBJECT_CLASS (parent_class)->destroy)
(* GTK_OBJECT_CLASS (parent_class)->destroy) (object);