summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorA. Walton <awalton@gnome.org>2009-03-03 19:14:37 +0000
committerAndrew Walton <awalton@src.gnome.org>2009-03-03 19:14:37 +0000
commitfd7ab08dbaace603e490d854bc6ccbe0c32b0eb1 (patch)
tree4f7e9124348b791595f98672439af93b33a07a6c
parent2c2111ccead4b7447039ebc53dd2352bb2527e56 (diff)
downloadnautilus-fd7ab08dbaace603e490d854bc6ccbe0c32b0eb1.tar.gz
Don't localize 'Icon=' keys. Fixes Launchpad Bug #336679.
2009-03-02 A. Walton <awalton@gnome.org> * libnautilus-private/nautilus-link.c (nautilus_link_local_set_key), (nautilus_link_local_set_text), (nautilus_link_local_set_icon): Don't localize 'Icon=' keys. Fixes Launchpad Bug #336679. svn path=/trunk/; revision=15048
-rw-r--r--ChangeLog9
-rw-r--r--libnautilus-private/nautilus-link.c22
2 files changed, 22 insertions, 9 deletions
diff --git a/ChangeLog b/ChangeLog
index 46dbdc1ef..47deb3188 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2009-03-02 A. Walton <awalton@gnome.org>
+
+ * libnautilus-private/nautilus-link.c
+ (nautilus_link_local_set_key),
+ (nautilus_link_local_set_text),
+ (nautilus_link_local_set_icon):
+ Don't localize 'Icon=' keys.
+ Fixes Launchpad Bug #336679.
+
2009-03-03 Cosimo Cecchi <cosimoc@gnome.org>
* src/nautilus-application.c (nautilus_application_finalize),
diff --git a/libnautilus-private/nautilus-link.c b/libnautilus-private/nautilus-link.c
index 3886e4478..8e210cc40 100644
--- a/libnautilus-private/nautilus-link.c
+++ b/libnautilus-private/nautilus-link.c
@@ -312,7 +312,8 @@ get_language (void)
static gboolean
nautilus_link_local_set_key (const char *uri,
const char *key,
- const char *value)
+ const char *value,
+ gboolean localize)
{
gboolean success;
GKeyFile *key_file;
@@ -325,12 +326,15 @@ nautilus_link_local_set_key (const char *uri,
g_object_unref (file);
return FALSE;
}
-
- g_key_file_set_locale_string (key_file,
- MAIN_GROUP,
- key,
- get_language (),
- value);
+ if (localize) {
+ g_key_file_set_locale_string (key_file,
+ MAIN_GROUP,
+ key,
+ get_language (),
+ value);
+ } else {
+ g_key_file_set_string (key_file, MAIN_GROUP, key, value);
+ }
success = _g_key_file_save_to_gfile (key_file, file, NULL);
@@ -343,7 +347,7 @@ gboolean
nautilus_link_local_set_text (const char *uri,
const char *text)
{
- return nautilus_link_local_set_key (uri, "Name", text);
+ return nautilus_link_local_set_key (uri, "Name", text, TRUE);
}
@@ -351,7 +355,7 @@ gboolean
nautilus_link_local_set_icon (const char *uri,
const char *icon)
{
- return nautilus_link_local_set_key (uri, "Icon", icon);
+ return nautilus_link_local_set_key (uri, "Icon", icon, FALSE);
}
char *