diff options
| author | Martin Owens <doctormo@gmail.com> | 2014-03-27 01:33:44 +0000 |
|---|---|---|
| committer | Martin Owens <doctormo@gmail.com> | 2014-03-27 01:33:44 +0000 |
| commit | 5a4fb2325f60d292b47330f540b26a3279341c90 (patch) | |
| tree | d2aa7967be25450b83e625025366c618101ae49f /src/helper/gnome-utils.cpp | |
| parent | The Polar Arrange Tab of the Arrange Dialog now hides the parametric (diff) | |
| parent | Remove Snap menu item and improve grid menu item text (diff) | |
| download | inkscape-5a4fb2325f60d292b47330f540b26a3279341c90.tar.gz inkscape-5a4fb2325f60d292b47330f540b26a3279341c90.zip | |
Commit a merge to trunk, with probabal errors
(bzr r11073.1.36)
Diffstat (limited to 'src/helper/gnome-utils.cpp')
| -rw-r--r-- | src/helper/gnome-utils.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/helper/gnome-utils.cpp b/src/helper/gnome-utils.cpp index aa70dd1a2..957b7ea5e 100644 --- a/src/helper/gnome-utils.cpp +++ b/src/helper/gnome-utils.cpp @@ -16,6 +16,8 @@ #include <ctype.h> #include <glib.h> +#include "gnome-utils.h" + /** * gnome_uri_list_extract_uris: * @uri_list: an uri-list in the standard format. @@ -81,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)) { |