callisto-debian/gimp
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

correctly convert relative paths to URIs. Append the resulting URI only if

Browse Source 
2004-07-22  Michael Natterer  <mitch@gimp.org>

	* tools/gimp-remote.c (main): correctly convert relative paths to
	URIs. Append the resulting URI only if it's not NULL.
This commit is contained in:
Michael Natterer
2004-07-22 11:32:50 +00:00
committed by Michael Natterer
parent a5760e33fe
commit fe9580449a
2 changed files with 15 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
ChangeLog
View File

@ -1,3 +1,8 @@
2004-07-22 Michael Natterer <mitch@gimp.org>
* tools/gimp-remote.c (main): correctly convert relative paths to
URIs. Append the resulting URI only if it's not NULL.
2004-07-22 Michael Natterer <mitch@gimp.org> 2004-07-22 Michael Natterer <mitch@gimp.org>
* app/widgets/gimptoolbox.c (toolbox_create_tools): connect to * app/widgets/gimptoolbox.c (toolbox_create_tools): connect to

17
tools/gimp-remote.c
View File

@ -349,8 +349,8 @@ main (gint argc,
for (i = 1; i < argc; i++) for (i = 1; i < argc; i++)
{ {
gchar *file_uri = NULL; gchar *file_uri = NULL;
gboolean options = TRUE; gboolean options = TRUE;
if (strlen (argv[i]) == 0) if (strlen (argv[i]) == 0)
continue; continue;
@ -384,7 +384,7 @@ main (gint argc,
{ {
gchar *abs = g_build_filename (cwd, argv[i], NULL); gchar *abs = g_build_filename (cwd, argv[i], NULL);
file_uri = g_strconcat (abs, NULL, NULL); file_uri = g_filename_to_uri (abs, NULL, NULL);
g_free (abs); g_free (abs);
} }
@ -394,11 +394,14 @@ main (gint argc,
file_uri = g_strdup (argv[i]); file_uri = g_strdup (argv[i]);
} }
if (file_list->len > 0) if (file_uri)
file_list = g_string_append_c (file_list, '\n'); {
if (file_list->len > 0)
file_list = g_string_append_c (file_list, '\n');
file_list = g_string_append (file_list, file_uri); file_list = g_string_append (file_list, file_uri);
g_free (file_uri); g_free (file_uri);
}
} }
display = gdk_display_get_default (); display = gdk_display_get_default ();