[gtk+] bgo#563010 - Fix clearing the selection in GtkFileChooserButton

[Federico Mena Quintero <federico src gnome org>]

commit 48f1b89eae8d67663f841865c8eaf1efe08b82a4
Author: Federico Mena Quintero <federico novell com>
Date:   Wed Oct 21 12:29:03 2009 -0500

    bgo#563010 - Fix clearing the selection in GtkFileChooserButton
    
    Previously the filename would get re-set on the button if one cleared the selection,
    as an async cancellable was not getting canceled in that case.
    
    Signed-off-by: Federico Mena Quintero <federico novell com>

 gtk/gtkfilechooserbutton.c |   12 ++++++------
 1 files changed, 6 insertions(+), 6 deletions(-)
---
diff --git a/gtk/gtkfilechooserbutton.c b/gtk/gtkfilechooserbutton.c
index 4319bb0..70b0b4f 100644
--- a/gtk/gtkfilechooserbutton.c
+++ b/gtk/gtkfilechooserbutton.c
@@ -2302,6 +2302,12 @@ update_label_and_image (GtkFileChooserButton *button)
   label_text = NULL;
   pixbuf = NULL;
 
+  if (priv->update_button_cancellable)
+    {
+      g_cancellable_cancel (priv->update_button_cancellable);
+      priv->update_button_cancellable = NULL;
+    }
+
   if (files && files->data)
     {
       GFile *file;
@@ -2333,12 +2339,6 @@ update_label_and_image (GtkFileChooserButton *button)
 	    goto out;
 	}
 
-      if (priv->update_button_cancellable)
-	{
-	  g_cancellable_cancel (priv->update_button_cancellable);
-	  priv->update_button_cancellable = NULL;
-	}
-
       if (g_file_is_native (file))
 	{
 	  priv->update_button_cancellable =