summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEskil Heyn Olsen <eskil@src.gnome.org>2000-08-03 00:54:25 +0000
committerEskil Heyn Olsen <eskil@src.gnome.org>2000-08-03 00:54:25 +0000
commit20fda801cc640b8dd3f8bd0c819f9e8cfc3411f7 (patch)
treedf0aa5a81a2dd971d9a8818863704b906a91b872
parentca4a910e312a3391f52df179ed1522ac08b0b4c6 (diff)
downloadnautilus-20fda801cc640b8dd3f8bd0c819f9e8cfc3411f7.tar.gz
if gnome-vfs-uri-extract-short-name returns NULL, default to
* src/nautilus-window-manage-views.c: (compute_default_title): if gnome-vfs-uri-extract-short-name returns NULL, default to _("(untitled)") instead of g_assert. (bug#1892)
-rw-r--r--ChangeLog6
-rw-r--r--src/nautilus-window-manage-views.c4
2 files changed, 9 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 3b8498e08..1ea6d23f0 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2000-08-02 Eskil Heyn Olsen <eskil@eazel.com>
+
+ * src/nautilus-window-manage-views.c: (compute_default_title):
+ if gnome-vfs-uri-extract-short-name returns NULL, default to
+ _("(untitled)") instead of g_assert. (bug#1892)
+
2000-08-02 Seth Nickell <seth@eazel.com>
* src/file-manager/dfos-xfer.c: (get_duplicate_lettering),
diff --git a/src/nautilus-window-manage-views.c b/src/nautilus-window-manage-views.c
index 11107403c..da995657e 100644
--- a/src/nautilus-window-manage-views.c
+++ b/src/nautilus-window-manage-views.c
@@ -169,7 +169,9 @@ compute_default_title (const char *text_uri)
if (vfs_uri != NULL) {
short_name = gnome_vfs_uri_extract_short_name (vfs_uri);
gnome_vfs_uri_unref (vfs_uri);
- g_assert (short_name != NULL);
+ if (short_name == NULL) {
+ short_name = g_strdup (_("(untitled)"));
+ }
return short_name;
} else {
colon_pos = strchr (text_uri, ':');