diff options
| -rw-r--r-- | ChangeLog | 7 | ||||
| -rw-r--r-- | libnautilus-private/nautilus-ui-utilities.c | 2 |
2 files changed, 8 insertions, 1 deletions
@@ -1,3 +1,10 @@ +2007-01-11 Alexander Larsson <alexl@redhat.com> + + * libnautilus-private/nautilus-ui-utilities.c: + (nautilus_ui_string_get): + Handle ui file load error better. + Patch from Tom Parker + 2006-12-31 Martin Wehner <martin.wehner@gmail.com> Add svn:externals property to include libbackground from trunk. diff --git a/libnautilus-private/nautilus-ui-utilities.c b/libnautilus-private/nautilus-ui-utilities.c index 502145db2..a3a833d96 100644 --- a/libnautilus-private/nautilus-ui-utilities.c +++ b/libnautilus-private/nautilus-ui-utilities.c @@ -94,7 +94,7 @@ nautilus_ui_string_get (const char *filename) ui = g_hash_table_lookup (ui_cache, filename); if (ui == NULL) { path = nautilus_ui_file (filename); - if (!g_file_get_contents (path, &ui, NULL, NULL)) { + if (path == NULL || !g_file_get_contents (path, &ui, NULL, NULL)) { g_warning ("Unable to load ui file %s\n", filename); } g_free (path); |