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

bumped version number to 2.1.5. 

2004-09-05  Sven Neumann  <sven@gimp.org>

	* configure.in: bumped version number to 2.1.5.

	* app/widgets/gimpfiledialog.c (gimp_file_dialog_set_uri): select
	the image file, not only the folder it lives in. Fixes bug #151638.
This commit is contained in:
Sven Neumann 2004-09-05 20:17:53 +00:00 committed by Sven Neumann
parent 7cc418aab4
commit 4bfbd2c5c3
3 changed files with 17 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
ChangeLog
View File

@ -1,3 +1,10 @@
2004-09-05 Sven Neumann <sven@gimp.org>
* configure.in: bumped version number to 2.1.5.
* app/widgets/gimpfiledialog.c (gimp_file_dialog_set_uri): select
the image file, not only the folder it lives in. Fixes bug #151638.
2004-09-05 DindinX <david@dindinx.org>
* plug-ins/common/cartoon.c: Added a preview.

29
app/widgets/gimpfiledialog.c
View File

@ -371,8 +371,7 @@ gimp_file_dialog_set_uri (GimpFileDialog *dialog,
GimpImage *gimage,
const gchar *uri)
{
gchar *real_uri = NULL;
gboolean is_folder = FALSE;
gchar *real_uri = NULL;
g_return_if_fail (GIMP_IS_FILE_DIALOG (dialog));
g_return_if_fail (gimage == NULL || GIMP_IS_IMAGE (gimage));
@ -382,38 +381,28 @@ gimp_file_dialog_set_uri (GimpFileDialog *dialog,
gchar *filename = gimp_image_get_filename (gimage);
if (filename)
{
gchar *dirname = g_path_get_dirname (filename);
g_free (filename);
real_uri = g_filename_to_uri (dirname, NULL, NULL);
g_free (dirname);
is_folder = TRUE;
}
real_uri = g_filename_to_uri (filename, NULL, NULL);
}
else if (uri)
{
real_uri = g_strdup (uri);
}
if (! real_uri)
if (real_uri)
{
gtk_file_chooser_set_uri (GTK_FILE_CHOOSER (dialog), real_uri);
}
else
{
gchar *current = g_get_current_dir ();
real_uri = g_filename_to_uri (current, NULL, NULL);
g_free (current);
is_folder = TRUE;
gtk_file_chooser_set_current_folder_uri (GTK_FILE_CHOOSER (dialog),
real_uri);
}
if (is_folder)
gtk_file_chooser_set_current_folder_uri (GTK_FILE_CHOOSER (dialog),
real_uri);
else
gtk_file_chooser_set_uri (GTK_FILE_CHOOSER (dialog), real_uri);
g_free (real_uri);
}

2
configure.in
View File

@ -12,7 +12,7 @@ AC_PREREQ(2.54)
m4_define([gimp_major_version], [2])
m4_define([gimp_minor_version], [1])
m4_define([gimp_micro_version], [4])
m4_define([gimp_micro_version], [5])
m4_define([gimp_real_version],
[gimp_major_version.gimp_minor_version.gimp_micro_version])
m4_define([gimp_version], [gimp_real_version])