summaryrefslogtreecommitdiffstats
path: root/src/helper/gnome-utils.cpp
diff options
context:
space:
mode:
authorMarkus Engel <markus.engel@tum.de>2013-08-30 21:35:42 +0000
committerMarkus Engel <markus.engel@tum.de>2013-08-30 21:35:42 +0000
commit8756c49b91fd4262b6770ac3b2f229209bdae96b (patch)
tree67ac89d7bc7c69e04e811324734dccafc07f33c9 /src/helper/gnome-utils.cpp
parentMerged from trunk (r12465). (diff)
parentMerge emf/wmf work (diff)
downloadinkscape-8756c49b91fd4262b6770ac3b2f229209bdae96b.tar.gz
inkscape-8756c49b91fd4262b6770ac3b2f229209bdae96b.zip
Merged from trunk (r12488).
(bzr r11608.1.120)
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)) {