PsppireDataSheet: Reference handler improvements.

Changed the destroy method to dispose, because all it does is drop
references.  Also, keep a reference to the object returned by _get_ui_manager
since this seems to be causing issues elsewhere.

diff --git a/src/ui/gui/psppire-data-sheet.c b/src/ui/gui/psppire-data-sheet.c
index b25b189e2c2dbd86cc75f4e237721be391f5474b..b6bf67c265933bab22a28b70d23131ae20ae1a00 100644 (file)
--- a/src/ui/gui/psppire-data-sheet.c
+++ b/src/ui/gui/psppire-data-sheet.c
@@ -47,7 +47,7 @@
 #define _(msgid) gettext (msgid)
 #define N_(msgid) msgid
 
-static void psppire_data_sheet_destroy (GtkObject *);
+static void psppire_data_sheet_dispose (GObject *);
 static void psppire_data_sheet_unset_data_store (PsppireDataSheet *);
 
 static void psppire_data_sheet_update_clip_actions (PsppireDataSheet *);
@@ -1168,38 +1168,48 @@ psppire_data_sheet_get_current_case (const PsppireDataSheet *data_sheet)
 GtkUIManager *
 psppire_data_sheet_get_ui_manager (PsppireDataSheet *data_sheet)
 {
-  return GTK_UI_MANAGER (get_object_assert (data_sheet->builder,
-                                            "data_sheet_uim",
-                                            GTK_TYPE_UI_MANAGER));
+  if (data_sheet->uim == NULL)
+    {
+      data_sheet->uim = 
+       GTK_UI_MANAGER (get_object_assert (data_sheet->builder,
+                                          "data_sheet_uim",
+                                          GTK_TYPE_UI_MANAGER));
+      g_object_ref (data_sheet->uim);
+    }
+
+  return data_sheet->uim;
 }
 
 static void
-psppire_data_sheet_destroy (GtkObject *object)
+psppire_data_sheet_dispose (GObject *object)
 {
   PsppireDataSheet *data_sheet = PSPPIRE_DATA_SHEET (object);
 
+  if (data_sheet->dispose_has_run)
+    return;
+
+  data_sheet->dispose_has_run = TRUE;
+
   psppire_data_sheet_unset_data_store (data_sheet);
-  if (data_sheet->builder)
-    {
-      g_object_unref (data_sheet->builder);
-      data_sheet->builder = NULL;
-    }
 
-  GTK_OBJECT_CLASS (psppire_data_sheet_parent_class)->destroy (object);
+  g_object_unref (data_sheet->builder);
+
+  if (data_sheet->uim)
+    g_object_unref (data_sheet->uim);
+
+  G_OBJECT_CLASS (psppire_data_sheet_parent_class)->dispose (object);
 }
 
 static void
 psppire_data_sheet_class_init (PsppireDataSheetClass *class)
 {
   GObjectClass *gobject_class;
-  GtkObjectClass *gtk_object_class;
 
   gobject_class = G_OBJECT_CLASS (class);
   gobject_class->set_property = psppire_data_sheet_set_property;
   gobject_class->get_property = psppire_data_sheet_get_property;
 
-  gtk_object_class = GTK_OBJECT_CLASS (class);
-  gtk_object_class->destroy = psppire_data_sheet_destroy;
+  gobject_class->dispose = psppire_data_sheet_dispose;
 
   g_signal_new ("var-double-clicked",
                 G_OBJECT_CLASS_TYPE (gobject_class),
@@ -1622,6 +1632,9 @@ psppire_data_sheet_init (PsppireDataSheet *obj)
   obj->new_variable_column = NULL;
   obj->container = NULL;
 
+  obj->uim = NULL;
+  obj->dispose_has_run = FALSE;
+
   pspp_sheet_view_set_special_cells (sheet_view, PSPP_SHEET_VIEW_SPECIAL_CELLS_YES);
 
   g_signal_connect (obj, "notify::model",

diff --git a/src/ui/gui/psppire-data-sheet.h b/src/ui/gui/psppire-data-sheet.h
index e17278e70284ed97ca5fa994547d720a9a89dac6..a94bad7c77c88872deec64152066603dc2f89b5c 100644 (file)
--- a/src/ui/gui/psppire-data-sheet.h
+++ b/src/ui/gui/psppire-data-sheet.h
@@ -38,7 +38,8 @@ G_BEGIN_DECLS
 typedef struct _PsppireDataSheet      PsppireDataSheet;
 typedef struct _PsppireDataSheetClass PsppireDataSheetClass;
 
-struct _PsppireDataSheet {
+struct _PsppireDataSheet
+{
   PsppSheetView parent;
 
   struct _PsppireDataStore *data_store;
@@ -55,9 +56,12 @@ struct _PsppireDataSheet {
   GtkBuilder *builder;
 
   GtkWidget *container;
+  GtkUIManager *uim;
+  gboolean dispose_has_run;
 };
 
-struct _PsppireDataSheetClass {
+struct _PsppireDataSheetClass 
+{
   PsppSheetViewClass parent_class;
 };