dnrops
/
gimp
mirror of https://github.com/GNOME/gimp.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Implemented a heuristics that tries to start the gimp in the same 

2003-01-08  Simon Budig  <simon@gimp.or>

        * tools/gimp-remote.c: Implemented a heuristics that tries to
        start the gimp in the same directory as gimp-remote-1.3.
        If this fails it falls back to the regular PATH search.

        For sanity checks this feature requires that the command name
        starts with "gimp-remote". If you do weird symlinks the heuristics
        will fall back to the PATH search silently.
This commit is contained in:
Simon Budig 2003-01-08 21:09:53 +00:00 committed by Simon Budig
parent 2249372b13
commit c8751919f0
2 changed files with 66 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
ChangeLog
View File

@ -1,3 +1,13 @@
2003-01-08 Simon Budig <simon@gimp.or>
* tools/gimp-remote.c: Implemented a heuristics that tries to
start the gimp in the same directory as gimp-remote-1.3.
If this fails it falls back to the regular PATH search.
For sanity checks this feature requires that the command name
starts with "gimp-remote". If you do weird symlinks the heuristics
will fall back to the PATH search silently.
2003-01-08 Sven Neumann <sven@gimp.org>
* plug-ins/gfig/images/stock-*.png: a new set of icons drawn by

64
tools/gimp-remote.c
View File

@ -38,11 +38,6 @@
* Simon
*/
/* TODO:
*
* Should try to execv the gimp in the same path as the gimp-remote
* executable, then fall back to execvp ("gimp", argv).
*/
#include "config.h"
@ -174,23 +169,76 @@ usage (const gchar *name)
}
static void
start_new_gimp (GString *file_list)
start_new_gimp (gchar *argv0, GString *file_list)
{
gint i;
gchar **argv;
gchar *gimp, *path, *name, *pwd;
const gchar *spath;
file_list = g_string_prepend (file_list, "gimp\n");
argv = g_strsplit (file_list->str, "\n", 0);
g_string_free (file_list, TRUE);
/* We are searching for the path the gimp-remote executable lives in */
/*
* the "_" environment variable usually gets set by the sh-family of
* shells. We have to sanity-check it. If we do not find anything
* usable in it try argv[0], then fall back to search the path.
*/
gimp = NULL;
spath = NULL;
for (i=0; i < 2; i++)
{
if (i == 0)
spath = g_getenv ("_");
else if (i == 1)
spath = argv0;
if (spath)
{
name = g_path_get_basename (spath);
if (!strncmp (name, "gimp-remote", 11))
{
if (g_path_is_absolute (spath))
{
path = g_path_get_dirname (spath);
gimp = g_strconcat (path, G_DIR_SEPARATOR_S,
"gimp-1.3", NULL);
g_free (path);
}
else
{
pwd = g_get_current_dir ();
path = g_path_get_dirname (spath);
gimp = g_strconcat (pwd, G_DIR_SEPARATOR_S, path,
G_DIR_SEPARATOR_S, "gimp-1.3", NULL);
g_free (path);
g_free (pwd);
}
}
g_free (name);
}
if (gimp)
break;
}
for (i = 1; argv[i]; i++)
{
if (g_ascii_strncasecmp ("file:", argv[i], 5) == 0)
argv[i] += 5;
}
execv (gimp, argv);
execvp ("gimp-1.3", argv);
/* if execvp returns, there was an arror */
/* if execv and execvp return, there was an arror */
g_printerr ("Couldn't start gimp-1.3 for the following reason: %s\n",
g_strerror (errno));
exit (-1);
@ -302,7 +350,7 @@ main (gint argc,
if (!gimp_window)
{
if (start_new)
start_new_gimp (file_list);
start_new_gimp (argv[0], file_list);
g_printerr ("No gimp window found on display %s\n", gdk_get_display ());
return EXIT_FAILURE;