[nautilus] link: fix code to parse additional description for links
- From: Cosimo Cecchi <cosimoc src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [nautilus] link: fix code to parse additional description for links
- Date: Thu, 8 Mar 2012 00:31:14 +0000 (UTC)
commit 5a47a484e45218e83202c508b421b1a2707af270
Author: Cosimo Cecchi <cosimoc gnome org>
Date: Wed Mar 7 14:12:25 2012 -0500
link: fix code to parse additional description for links
For some reason, this was ifdeffed out.
libnautilus-private/nautilus-link.c | 13 +++----------
src/nautilus-icon-view-container.c | 7 ++-----
2 files changed, 5 insertions(+), 15 deletions(-)
---
diff --git a/libnautilus-private/nautilus-link.c b/libnautilus-private/nautilus-link.c
index 30d010c..a4d43bc 100644
--- a/libnautilus-private/nautilus-link.c
+++ b/libnautilus-private/nautilus-link.c
@@ -351,14 +351,8 @@ nautilus_link_local_get_text (const char *path)
}
char *
-nautilus_link_local_get_additional_text (const char *path)
+nautilus_link_local_get_additional_text (const char *uri)
{
- /* The comment field of current .desktop files is often bad.
- * It just contains a copy of the name. This is probably because the
- * panel shows the comment field as a tooltip.
- */
- return NULL;
-#ifdef THIS_IS_NOT_USED_RIGHT_NOW
char *type;
char *retval;
@@ -366,20 +360,19 @@ nautilus_link_local_get_additional_text (const char *path)
return NULL;
}
- type = slurp_key_string (path, "Type", FALSE);
+ type = slurp_key_string (uri, "Type", FALSE);
retval = NULL;
if (type == NULL) {
return NULL;
}
if (strcmp (type, "Application") == 0) {
- retval = slurp_key_string (path, "Comment", TRUE);
+ retval = slurp_key_string (uri, "Comment", TRUE);
}
g_free (type);
return retval;
-#endif
}
static char *
diff --git a/src/nautilus-icon-view-container.c b/src/nautilus-icon-view-container.c
index dd6f1ee..ba66cf5 100644
--- a/src/nautilus-icon-view-container.c
+++ b/src/nautilus-icon-view-container.c
@@ -311,7 +311,6 @@ nautilus_icon_view_container_get_icon_text (NautilusIconContainer *container,
gboolean include_invisible)
{
char *actual_uri;
- gchar *description;
GQuark *attributes;
char *text_array[4];
int i, j, num_attributes;
@@ -359,10 +358,8 @@ nautilus_icon_view_container_get_icon_text (NautilusIconContainer *container,
*additional_text = NULL;
if (nautilus_file_is_local (file)) {
actual_uri = nautilus_file_get_uri (file);
- description = nautilus_link_local_get_additional_text (actual_uri);
- if (description)
- *additional_text = g_strdup_printf (" \n%s\n ", description);
- g_free (description);
+ *additional_text = nautilus_link_local_get_additional_text (actual_uri);
+
g_free (actual_uri);
}
/* Don't show the normal extra information for desktop files, it doesn't
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]