gimp r27355 - in branches/gimp-2-6: . app/widgets

[neo svn gnome org]

Author: neo
Date: Wed Oct 22 05:58:20 2008
New Revision: 27355
URL: http://svn.gnome.org/viewvc/gimp?rev=27355&view=rev

Log:
2008-10-22  Sven Neumann  <sven gimp org>

	Merged from trunk:

	Bug 555246 â gimp crashes when a file is opened while a preview 
is
	generating

        * app/widgets/gimpfiledialog.c: set dialog->progress to NULL in
        destroy() and check for progress being NULL in various places so
        we don't crash on API calls after the widget is destroyed.



Modified:
   branches/gimp-2-6/ChangeLog
   branches/gimp-2-6/app/widgets/gimpfiledialog.c

Modified: branches/gimp-2-6/app/widgets/gimpfiledialog.c
==============================================================================
--- branches/gimp-2-6/app/widgets/gimpfiledialog.c	(original)
+++ branches/gimp-2-6/app/widgets/gimpfiledialog.c	Wed Oct 22 05:58:20 2008
@@ -62,6 +62,8 @@
 
 
 static void     gimp_file_dialog_progress_iface_init (GimpProgressInterface *iface);
+
+static void     gimp_file_dialog_destroy             (GtkObject        *object);
 static gboolean gimp_file_dialog_delete_event        (GtkWidget        *widget,
                                                       GdkEventAny      *event);
 static void     gimp_file_dialog_response            (GtkDialog        *dialog,
@@ -121,9 +123,12 @@
 static void
 gimp_file_dialog_class_init (GimpFileDialogClass *klass)
 {
+  GtkObjectClass *object_class = GTK_OBJECT_CLASS (klass);
   GtkWidgetClass *widget_class = GTK_WIDGET_CLASS (klass);
   GtkDialogClass *dialog_class = GTK_DIALOG_CLASS (klass);
 
+  object_class->destroy      = gimp_file_dialog_destroy;
+
   widget_class->delete_event = gimp_file_dialog_delete_event;
 
   dialog_class->response     = gimp_file_dialog_response;
@@ -147,6 +152,16 @@
   iface->get_window = gimp_file_dialog_progress_get_window;
 }
 
+static void
+gimp_file_dialog_destroy (GtkObject *object)
+{
+  GimpFileDialog *dialog = GIMP_FILE_DIALOG (object);
+
+  GTK_OBJECT_CLASS (parent_class)->destroy (object);
+
+  dialog->progress = NULL;
+}
+
 static gboolean
 gimp_file_dialog_delete_event (GtkWidget   *widget,
                                GdkEventAny *event)
@@ -164,7 +179,8 @@
     {
       file_dialog->canceled = TRUE;
 
-      if (GIMP_PROGRESS_BOX (file_dialog->progress)->active &&
+      if (file_dialog->progress                             &&
+          GIMP_PROGRESS_BOX (file_dialog->progress)->active &&
           GIMP_PROGRESS_BOX (file_dialog->progress)->cancelable)
         {
           gimp_progress_cancel (GIMP_PROGRESS (dialog));
@@ -178,14 +194,17 @@
                                  gboolean      cancelable)
 {
   GimpFileDialog *dialog = GIMP_FILE_DIALOG (progress);
-  GimpProgress   *retval;
+  GimpProgress   *retval = NULL;
 
-  retval = gimp_progress_start (GIMP_PROGRESS (dialog->progress),
-                                message, cancelable);
-  gtk_widget_show (dialog->progress);
+  if (dialog->progress)
+    {
+      retval = gimp_progress_start (GIMP_PROGRESS (dialog->progress),
+                                    message, cancelable);
+      gtk_widget_show (dialog->progress);
 
-  gtk_dialog_set_response_sensitive (GTK_DIALOG (dialog),
-                                     GTK_RESPONSE_CANCEL, cancelable);
+      gtk_dialog_set_response_sensitive (GTK_DIALOG (dialog),
+                                         GTK_RESPONSE_CANCEL, cancelable);
+    }
 
   return retval;
 }
@@ -195,8 +214,11 @@
 {
   GimpFileDialog *dialog = GIMP_FILE_DIALOG (progress);
 
-  gimp_progress_end (GIMP_PROGRESS (dialog->progress));
-  gtk_widget_hide (dialog->progress);
+  if (dialog->progress)
+    {
+      gimp_progress_end (GIMP_PROGRESS (dialog->progress));
+      gtk_widget_hide (dialog->progress);
+    }
 }
 
 static gboolean
@@ -204,7 +226,10 @@
 {
   GimpFileDialog *dialog = GIMP_FILE_DIALOG (progress);
 
-  return gimp_progress_is_active (GIMP_PROGRESS (dialog->progress));
+  if (dialog->progress)
+    return gimp_progress_is_active (GIMP_PROGRESS (dialog->progress));
+
+  return FALSE;
 }
 
 static void
@@ -213,7 +238,8 @@
 {
   GimpFileDialog *dialog = GIMP_FILE_DIALOG (progress);
 
-  gimp_progress_set_text (GIMP_PROGRESS (dialog->progress), message);
+  if (dialog->progress)
+    gimp_progress_set_text (GIMP_PROGRESS (dialog->progress), message);
 }
 
 static void
@@ -222,7 +248,8 @@
 {
   GimpFileDialog *dialog = GIMP_FILE_DIALOG (progress);
 
-  gimp_progress_set_value (GIMP_PROGRESS (dialog->progress), percentage);
+  if (dialog->progress)
+    gimp_progress_set_value (GIMP_PROGRESS (dialog->progress), percentage);
 }
 
 static gdouble
@@ -230,7 +257,10 @@
 {
   GimpFileDialog *dialog = GIMP_FILE_DIALOG (progress);
 
-  return gimp_progress_get_value (GIMP_PROGRESS (dialog->progress));
+  if (dialog->progress)
+    return gimp_progress_get_value (GIMP_PROGRESS (dialog->progress));
+
+  return 0.0;
 }
 
 static void
@@ -238,7 +268,8 @@
 {
   GimpFileDialog *dialog = GIMP_FILE_DIALOG (progress);
 
-  gimp_progress_pulse (GIMP_PROGRESS (dialog->progress));
+  if (dialog->progress)
+    gimp_progress_pulse (GIMP_PROGRESS (dialog->progress));
 }
 
 static guint32
@@ -368,6 +399,10 @@
 
   g_return_if_fail (GIMP_IS_FILE_DIALOG (dialog));
 
+  /*  bail out if we are already destroyed  */
+  if (! dialog->progress)
+    return;
+
   children =
     gtk_container_get_children (GTK_CONTAINER (GTK_DIALOG (dialog)->vbox));