gtk+ r22347 - in trunk: . gtk

[matthiasc svn gnome org]

Author: matthiasc
Date: Tue Feb 17 06:29:21 2009
New Revision: 22347
URL: http://svn.gnome.org/viewvc/gtk+?rev=22347&view=rev

Log:
        * configure.in: Require GLib 2.19.7 for GMountOperation::aborted.

        * gtk/gtkmountoperation.c: Implement GMountOperation::aborted.


Modified:
   trunk/configure.in
   trunk/gtk/gtkmountoperation.c

Modified: trunk/configure.in
==============================================================================
--- trunk/configure.in	(original)
+++ trunk/configure.in	Tue Feb 17 06:29:21 2009
@@ -31,7 +31,7 @@
 m4_define([gtk_binary_version], [2.10.0])
 
 # required versions of other packages
-m4_define([glib_required_version], [2.17.6])
+m4_define([glib_required_version], [2.19.7])
 m4_define([pango_required_version], [1.20])
 m4_define([atk_required_version], [1.13.0])
 m4_define([cairo_required_version], [1.6])

Modified: trunk/gtk/gtkmountoperation.c
==============================================================================
--- trunk/gtk/gtkmountoperation.c	(original)
+++ trunk/gtk/gtkmountoperation.c	Tue Feb 17 06:29:21 2009
@@ -92,6 +92,8 @@
                                                 const char      *message,
                                                 const char      *choices[]);
 
+static void   gtk_mount_operation_aborted      (GMountOperation *op);
+
 G_DEFINE_TYPE (GtkMountOperation, gtk_mount_operation, G_TYPE_MOUNT_OPERATION);
 
 enum {
@@ -153,6 +155,7 @@
   mount_op_class = G_MOUNT_OPERATION_CLASS (klass);
   mount_op_class->ask_password = gtk_mount_operation_ask_password;
   mount_op_class->ask_question = gtk_mount_operation_ask_question;
+  mount_op_class->aborted = gtk_mount_operation_aborted;
 
   g_object_class_install_property (object_class,
                                    PROP_PARENT,
@@ -734,6 +737,22 @@
   g_object_ref (op);
 }
 
+static void
+gtk_mount_operation_aborted (GMountOperation *op)
+{
+  GtkMountOperationPrivate *priv;
+
+  priv = GTK_MOUNT_OPERATION (op)->priv;
+
+  if (priv->dialog != NULL)
+    {
+      gtk_widget_destroy (GTK_WIDGET (priv->dialog));
+      priv->dialog = NULL;
+      g_object_notify (G_OBJECT (op), "is-showing");
+      g_object_unref (op);
+    }
+}
+
 /**
  * gtk_mount_operation_new:
  * @parent: transient parent of the window, or %NULL