summaryrefslogtreecommitdiffstats
path: root/src/helper/gnome-utils.cpp
diff options
context:
space:
mode:
authorsu_v <suv-sf@users.sourceforge.net>2013-08-29 21:06:10 +0000
committer~suv <suv-sf@users.sourceforge.net>2013-08-29 21:06:10 +0000
commit4d331e73a76dce7d703716093923ca01b3cc5936 (patch)
treeb444657ba269b25f60684e66858a138b74fe240d /src/helper/gnome-utils.cpp
parentFix compiler warnings (diff)
parentUpdating outdated test. Fixes bug #1202271. (diff)
downloadinkscape-4d331e73a76dce7d703716093923ca01b3cc5936.tar.gz
inkscape-4d331e73a76dce7d703716093923ca01b3cc5936.zip
merge from trunk (r12487)
(bzr r11668.1.75)
Diffstat (limited to 'src/helper/gnome-utils.cpp')
-rw-r--r--src/helper/gnome-utils.cpp8
1 files changed, 3 insertions, 5 deletions
diff --git a/src/helper/gnome-utils.cpp b/src/helper/gnome-utils.cpp
index d0bcaf8cd..957b7ea5e 100644
--- a/src/helper/gnome-utils.cpp
+++ b/src/helper/gnome-utils.cpp
@@ -83,17 +83,15 @@ gnome_uri_list_extract_uris (const gchar* uri_list)
GList*
gnome_uri_list_extract_filenames (const gchar* uri_list)
{
- GList *tmp_list, *node, *result;
-
g_return_val_if_fail (uri_list != NULL, NULL);
- result = gnome_uri_list_extract_uris (uri_list);
+ GList *result = gnome_uri_list_extract_uris (uri_list);
- tmp_list = result;
+ GList *tmp_list = result;
while (tmp_list) {
gchar *s = (gchar*)tmp_list->data;
- node = tmp_list;
+ GList *node = tmp_list;
tmp_list = tmp_list->next;
if (!strncmp (s, "file:", 5)) {