[Xfce4-commits] r29340 - in thunar/trunk: . thunar

[Nick Schermer]

Author: nick
Date: 2009-01-25 12:12:31 +0000 (Sun, 25 Jan 2009)
New Revision: 29340

Modified:
   thunar/trunk/ChangeLog
   thunar/trunk/NEWS
   thunar/trunk/thunar/thunar-path-entry.c
Log:
	* thunar/thunar-path-entry.c: Fix crash when entering the same 
	  hidden directory twice in the location entry (bug #4847).

Modified: thunar/trunk/ChangeLog
===================================================================
--- thunar/trunk/ChangeLog	2009-01-25 11:24:45 UTC (rev 29339)
+++ thunar/trunk/ChangeLog	2009-01-25 12:12:31 UTC (rev 29340)
@@ -1,3 +1,8 @@
+2009-01-25	Nick Schermer <nick at xfce.org>
+
+	* thunar/thunar-path-entry.c: Fix crash when entering the same 
+	  hidden directory twice in the location entry (bug #4847).
+
 2009-01-25	Jannis Pohlmann <jannis at xfce.org>
 
 	* == Released 0.9.99.1 ==

Modified: thunar/trunk/NEWS
===================================================================
--- thunar/trunk/NEWS	2009-01-25 11:24:45 UTC (rev 29339)
+++ thunar/trunk/NEWS	2009-01-25 12:12:31 UTC (rev 29340)
@@ -1,3 +1,8 @@
+x.x.xx.x
+========
+- Fix crash when entering the same hidden directory twice in the
+  location entry (bug #4847).
+
 0.9.99.1
 ========
 - Optional nano version added to configure.in.in.

Modified: thunar/trunk/thunar/thunar-path-entry.c
===================================================================
--- thunar/trunk/thunar/thunar-path-entry.c	2009-01-25 11:24:45 UTC (rev 29339)
+++ thunar/trunk/thunar/thunar-path-entry.c	2009-01-25 12:12:31 UTC (rev 29340)
@@ -1144,6 +1144,11 @@
   /* determine the model from the completion */
   model = gtk_entry_completion_get_model (completion);
 
+  /* leave if the model is null, we do this in thunar_path_entry_changed() to speed
+   * things up, but that causes http://bugzilla.xfce.org/show_bug.cgi?id=4847. */
+  if (G_UNLIKELY (model == NULL))
+    return FALSE;
+
   /* determine the current text (UTF-8 normalized) */
   text_normalized = g_utf8_normalize (gtk_entry_get_text (GTK_ENTRY (user_data)), -1, G_NORMALIZE_ALL);