gtk+ r19851 - trunk/gtk

[federico svn gnome org]

Author: federico
Date: Thu Mar 13 00:45:58 2008
New Revision: 19851
URL: http://svn.gnome.org/viewvc/gtk+?rev=19851&view=rev

Log:
Present an error if we can't load the folder during explicit completion

Signed-off-by: Federico Mena Quintero <federico gnu org>


Modified:
   trunk/gtk/gtkfilechooserentry.c

Modified: trunk/gtk/gtkfilechooserentry.c
==============================================================================
--- trunk/gtk/gtkfilechooserentry.c	(original)
+++ trunk/gtk/gtkfilechooserentry.c	Thu Mar 13 00:45:58 2008
@@ -1264,11 +1264,26 @@
 
   chooser_entry->load_folder_handle = NULL;
 
-  /* FIXME: if there was an error *AND* we had a pending explicit completion, beep and pop up a
-   * tooltip to say that the folder could not be loaded.
-   */
+  if (error)
+    {
+      LoadCompleteAction old_load_complete_action;
+
+      old_load_complete_action = chooser_entry->load_complete_action;
+
+      clear_completions (chooser_entry);
+
+      if (old_load_complete_action == LOAD_COMPLETE_EXPLICIT_COMPLETION)
+	{
+	  /* Since this came from explicit user action (Tab completion), we'll present errors visually */
+	  char *msg;
+
+	  beep (chooser_entry);
 
-  /* FIXME: if error, remove the current tooltip ("making completion list") */
+	  msg = g_strdup_printf (_("Could not load folder: %s"), error->message);
+	  pop_up_completion_feedback (chooser_entry, msg);
+	  g_free (msg);
+	}
+    }
 
   if (cancelled || error)
     goto out;