aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTor Lillqvist <tml@novell.com>2005-11-25 22:56:22 +0800
committerTor Lillqvist <tml@src.gnome.org>2005-11-25 22:56:22 +0800
commitf5b079e688fd0e644e2526aaf048b60f2f3a90fa (patch)
treee1e48fb79b05e16fecf40b10d84bbd2774b43beb
parent6dc1dc5620c653d17d467d129c64dad94f8f82ac (diff)
downloadgsoc2013-evolution-f5b079e688fd0e644e2526aaf048b60f2f3a90fa.tar
gsoc2013-evolution-f5b079e688fd0e644e2526aaf048b60f2f3a90fa.tar.gz
gsoc2013-evolution-f5b079e688fd0e644e2526aaf048b60f2f3a90fa.tar.bz2
gsoc2013-evolution-f5b079e688fd0e644e2526aaf048b60f2f3a90fa.tar.lz
gsoc2013-evolution-f5b079e688fd0e644e2526aaf048b60f2f3a90fa.tar.xz
gsoc2013-evolution-f5b079e688fd0e644e2526aaf048b60f2f3a90fa.tar.zst
gsoc2013-evolution-f5b079e688fd0e644e2526aaf048b60f2f3a90fa.zip
Use g_filename_from_uri() instead of just stripping off the "file://"
2005-11-25 Tor Lillqvist <tml@novell.com> * gui/widgets/eab-gui-util.c (eab_load_error_dialog): Use g_filename_from_uri() instead of just stripping off the "file://" prefix for Win32 portability. svn path=/trunk/; revision=30671
-rw-r--r--addressbook/ChangeLog4
-rw-r--r--addressbook/gui/widgets/eab-gui-util.c3
2 files changed, 6 insertions, 1 deletions
diff --git a/addressbook/ChangeLog b/addressbook/ChangeLog
index 8f63a60fcd..e8ee5b536d 100644
--- a/addressbook/ChangeLog
+++ b/addressbook/ChangeLog
@@ -1,5 +1,9 @@
2005-11-25 Tor Lillqvist <tml@novell.com>
+ * gui/widgets/eab-gui-util.c (eab_load_error_dialog): Use
+ g_filename_from_uri() instead of just stripping off the "file://"
+ prefix for Win32 portability.
+
* gui/component/addressbook-component.c (ensure_sources): Use
g_filename_to_uri() instead of just prefixing "file://" for Win32
portability.
diff --git a/addressbook/gui/widgets/eab-gui-util.c b/addressbook/gui/widgets/eab-gui-util.c
index aeb259d3e8..7d210fcdbe 100644
--- a/addressbook/gui/widgets/eab-gui-util.c
+++ b/addressbook/gui/widgets/eab-gui-util.c
@@ -97,10 +97,11 @@ eab_load_error_dialog (GtkWidget *parent, ESource *source, EBookStatus status)
}
else if (!strncmp (uri, "file:", 5)) {
- const char *path = uri+7; /* file:// */
+ char *path = g_filename_from_uri (uri, NULL, NULL);
label = g_strdup_printf (
_("We were unable to open this addressbook. Please check that the "
"path %s exists and that you have permission to access it."), path);
+ g_free (path);
label_string = label;
}
else if (!strncmp (uri, "ldap:", 5)) {