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

Reverted a tiny part of my latest change since the old code was OK while 

my change did introduce a memleak. Oooops.
This commit is contained in:
Sven Neumann 2000-11-08 16:57:47 +00:00
parent 3bf5c53997
commit 9aefcf627a
2 changed files with 26 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
plug-ins/script-fu/script-fu-interface.c
View File

@ -301,9 +301,15 @@ script_fu_find_scripts (void)
while (token) while (token)
{ {
if (*token == '~') if (*token == '~')
path = g_strdup_printf ("%s%s", home, token + 1); {
else path = g_malloc (strlen (home) + strlen (token) + 2);
path = g_strdup (token); sprintf (path, "%s%s", home, token + 1);
}
else
{
path = g_malloc (strlen (token) + 2);
strcpy (path, token);
}
/* Check if directory exists and if it has any items in it */ /* Check if directory exists and if it has any items in it */
my_err = stat (path, &filestat); my_err = stat (path, &filestat);
@ -311,8 +317,8 @@ script_fu_find_scripts (void)
if (!my_err && S_ISDIR (filestat.st_mode)) if (!my_err && S_ISDIR (filestat.st_mode))
{ {
if (path[strlen (path) - 1] != G_DIR_SEPARATOR) if (path[strlen (path) - 1] != G_DIR_SEPARATOR)
path = g_strconcat (path, G_DIR_SEPARATOR_S, NULL); strcat (path, G_DIR_SEPARATOR_S);
/* Open directory */ /* Open directory */
dir = opendir (path); dir = opendir (path);
@ -775,6 +781,8 @@ script_fu_report_cc (gchar *command)
g_free (sf_interface->last_command); g_free (sf_interface->last_command);
sf_interface->last_command = g_strdup (command); sf_interface->last_command = g_strdup (command);
} }
gdk_flush ();
} }

18
plug-ins/script-fu/script-fu-scripts.c
View File

@ -301,9 +301,15 @@ script_fu_find_scripts (void)
while (token) while (token)
{ {
if (*token == '~') if (*token == '~')
path = g_strdup_printf ("%s%s", home, token + 1); {
else path = g_malloc (strlen (home) + strlen (token) + 2);
path = g_strdup (token); sprintf (path, "%s%s", home, token + 1);
}
else
{
path = g_malloc (strlen (token) + 2);
strcpy (path, token);
}
/* Check if directory exists and if it has any items in it */ /* Check if directory exists and if it has any items in it */
my_err = stat (path, &filestat); my_err = stat (path, &filestat);
@ -311,8 +317,8 @@ script_fu_find_scripts (void)
if (!my_err && S_ISDIR (filestat.st_mode)) if (!my_err && S_ISDIR (filestat.st_mode))
{ {
if (path[strlen (path) - 1] != G_DIR_SEPARATOR) if (path[strlen (path) - 1] != G_DIR_SEPARATOR)
path = g_strconcat (path, G_DIR_SEPARATOR_S, NULL); strcat (path, G_DIR_SEPARATOR_S);
/* Open directory */ /* Open directory */
dir = opendir (path); dir = opendir (path);
@ -775,6 +781,8 @@ script_fu_report_cc (gchar *command)
g_free (sf_interface->last_command); g_free (sf_interface->last_command);
sf_interface->last_command = g_strdup (command); sf_interface->last_command = g_strdup (command);
} }
gdk_flush ();
} }