Fix problem with non-reentrant journal driver

[pspp] / src / ui / gui / psppire-dialog.c

diff --git a/src/ui/gui/psppire-dialog.c b/src/ui/gui/psppire-dialog.c
index 1e4216175b41e1a536a4d64decbca52a89911afc..d89b3b4ec288f8d9f00fd812a15f72f9d4b49202 100644 (file)
--- a/src/ui/gui/psppire-dialog.c
+++ b/src/ui/gui/psppire-dialog.c
@@ -86,22 +86,6 @@ psppire_dialog_get_type (void)
 static GObjectClass     *parent_class = NULL;
 
 
-static void
-psppire_dialog_finalize (GObject *object)
-{
-  PsppireDialog *dialog ;
-
-  g_return_if_fail (object != NULL);
-  g_return_if_fail (PSPPIRE_IS_DIALOG (object));
-
-  dialog = PSPPIRE_DIALOG (object);
-
-  if (G_OBJECT_CLASS (parent_class)->finalize)
-    G_OBJECT_CLASS (parent_class)->finalize (object);
-}
-
-
-
 /* Properties */
 enum
 {
@@ -286,7 +270,7 @@ psppire_dialog_class_init (PsppireDialogClass *class)
                  G_TYPE_STRING);
 
 
-  object_class->finalize = psppire_dialog_finalize;
+  parent_class = g_type_class_peek_parent (class);
 }
 
 
@@ -322,6 +306,8 @@ psppire_dialog_init (PsppireDialog *dialog)
   dialog->box = NULL;
   dialog->contents_are_valid = NULL;
   dialog->validity_data = NULL;
+  dialog->contents_are_acceptable = NULL;
+  dialog->acceptable_data = NULL;
   dialog->slidable = FALSE;
 
   g_value_init (&value, orientation_spec->value_type);
@@ -367,6 +353,13 @@ psppire_dialog_notify_change (PsppireDialog *dialog)
 }
 
 
+static void
+remove_notify_handlers (PsppireDialog *dialog, GObject *sel)
+{
+  g_signal_handlers_disconnect_by_data (sel, dialog);
+}
+
+
 /* Descend the widget tree, connecting appropriate signals to the
    psppire_dialog_notify_change callback */
 static void
@@ -441,19 +434,22 @@ connect_notify_signal (GtkWidget *w, gpointer data)
 
       if ( model)
        {
-      g_signal_connect_swapped (model, "row-changed",
-                               G_CALLBACK (psppire_dialog_notify_change),
-                               dialog);
+         g_signal_connect_swapped (model, "row-changed",
+                                   G_CALLBACK (psppire_dialog_notify_change),
+                                   dialog);
 
-      g_signal_connect_swapped (model, "row-deleted",
-                               G_CALLBACK (psppire_dialog_notify_change),
-                               dialog);
+         g_signal_connect_swapped (model, "row-deleted",
+                                   G_CALLBACK (psppire_dialog_notify_change),
+                                   dialog);
 
-      g_signal_connect_swapped (model, "row-inserted",
-                               G_CALLBACK (psppire_dialog_notify_change),
-                               dialog);
-       }
+         g_signal_connect_swapped (model, "row-inserted",
+                                   G_CALLBACK (psppire_dialog_notify_change),
+                                   dialog);
 
+         g_signal_connect (dialog, "destroy", G_CALLBACK (remove_notify_handlers),
+                           model);
+       }
+      
       g_signal_connect_swapped (selection, "changed",
                                G_CALLBACK (psppire_dialog_notify_change),
                                dialog);
@@ -478,6 +474,12 @@ connect_notify_signal (GtkWidget *w, gpointer data)
 gint
 psppire_dialog_run (PsppireDialog *dialog)
 {
+  gchar *title = NULL;
+  g_object_get (dialog, "title", &title, NULL);
+
+  if (title == NULL)
+    g_warning ("PsppireDialog %s has no title", gtk_widget_get_name (GTK_WIDGET (dialog)));
+  
   if ( dialog->contents_are_valid != NULL )
     gtk_container_foreach (GTK_CONTAINER (dialog->box),
                           connect_notify_signal,
@@ -545,6 +547,10 @@ psppire_orientation_get_type (void)
 }
 
 
+/* Sets a predicate function that is checked after each change that the user
+   makes to the dialog's state.  If the predicate function returns false, then
+   "OK" and other buttons that accept the dialog's settings will be
+   disabled. */
 void
 psppire_dialog_set_valid_predicate (PsppireDialog *dialog,
                                    ContentsAreValid contents_are_valid,
@@ -554,6 +560,30 @@ psppire_dialog_set_valid_predicate (PsppireDialog *dialog,
   dialog->validity_data = data;
 }
 
+/* Sets a predicate function that is called after "OK" or another button that
+   accepts the dialog's settings is pushed.  If the predicate function returns
+   false, then the button push is ignored.  (If the predicate function returns
+   false, then it should take some action to notify the user why the contents
+   are unacceptable, e.g. pop up a dialog box.)
+
+   An accept predicate is preferred over a validity predicate when the reason
+   why the dialog settings are unacceptable may not be obvious to the user, so
+   that the user needs a helpful message to explain. */
+void
+psppire_dialog_set_accept_predicate (PsppireDialog *dialog,
+                                     ContentsAreValid contents_are_acceptable,
+                                     gpointer data)
+{
+  dialog->contents_are_acceptable = contents_are_acceptable;
+  dialog->acceptable_data = data;
+}
+
+gboolean
+psppire_dialog_is_acceptable (const PsppireDialog *dialog)
+{
+  return (dialog->contents_are_acceptable == NULL
+          || dialog->contents_are_acceptable (dialog->acceptable_data));
+}