diff options
| author | Sebastian Wüst <sebi@timewaster.de> | 2013-10-20 15:32:08 +0000 |
|---|---|---|
| committer | Sebastian Wüst <sebi@timewaster.de> | 2013-10-20 15:32:08 +0000 |
| commit | 82908f949129e1fcbf62002799ee7b1b77986eed (patch) | |
| tree | c02098dd7720cdf424f2793ecd3ddac2ea86b969 /src/helper/gnome-utils.cpp | |
| parent | changed text (diff) | |
| parent | Fix build errors with clang 3.3 and c++11 enabled. (diff) | |
| download | inkscape-82908f949129e1fcbf62002799ee7b1b77986eed.tar.gz inkscape-82908f949129e1fcbf62002799ee7b1b77986eed.zip | |
merge from trunk
(bzr r12417.1.24)
Diffstat (limited to 'src/helper/gnome-utils.cpp')
| -rw-r--r-- | src/helper/gnome-utils.cpp | 8 |
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)) { |