[Xfce4-commits] <gigolo:master> Minor fixes

[Enrico Tröger]

Updating branch refs/heads/master
         to f05d445ecbfc8e5ddfb08c2073ec72b6782df520 (commit)
       from 4cc13a5a6ca3e29e035896c7225da726b2f58b7d (commit)

commit f05d445ecbfc8e5ddfb08c2073ec72b6782df520
Author: Enrico Tröger <enrico at xfce.org>
Date:   Mon Oct 5 19:46:43 2009 +0200

    Minor fixes

 src/backendgvfs.c |    8 ++++++--
 1 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/src/backendgvfs.c b/src/backendgvfs.c
index 8ce95cd..1146de4 100644
--- a/src/backendgvfs.c
+++ b/src/backendgvfs.c
@@ -229,9 +229,13 @@ static gchar *get_tooltip_text(GigoloBackendGVFS *backend, gpointer ref, gint re
 			clean_uri = g_uri_unescape_string(uri, G_URI_RESERVED_CHARS_ALLOWED_IN_USERINFO);
 
 			settings = gigolo_window_get_settings(GIGOLO_WINDOW(priv->parent));
-			b = gigolo_settings_get_bookmark_by_uri(settings, clean_uri);
+			b = gigolo_settings_get_bookmark_by_uri(settings, uri);
 			if (b != NULL)
-				setptr(clean_uri, g_build_filename(clean_uri, gigolo_bookmark_get_folder(b), NULL));
+			{
+				const gchar *folder = gigolo_bookmark_get_folder(b);
+				if (NZV(folder))
+					setptr(clean_uri, g_build_filename(clean_uri, folder, NULL));
+			}
 
 			result = g_strdup_printf(
 				_("<b>%s</b>\n\nURI: %s\nConnected: Yes\nService Type: %s"), name, clean_uri, type);