graphics/gimp
graphics/gimp
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/gimp synced 2024-10-19 22:34:37 +00:00
Code Issues Packages Projects Releases Wiki Activity

unset the filename if the image is unnamed.

Browse source 
2004-06-22  Sven Neumann  <sven@gimp.org>

	* app/widgets/gimpfiledialog.c (gimp_file_dialog_set_image): unset
	the filename if the image is unnamed.

	* configure.in
	* app/sanity.c: depend on gtk+ >= 2.4.1.

	* app/widgets/gimpthumbbox.[ch]: changed gimp_thumb_box_set_uris()
	to gimp_thumb_box_take_uris() since the function takes ownership
	of the list,

	* app/widgets/gimpfiledialog.c: changed accordingly. Removed code
	that worked around a problem in gtk+ < 2.4.1.
This commit is contained in:
Sven Neumann 2004-06-22 15:11:35 +00:00 committed by Sven Neumann
parent dd81320e5c
commit a5fcdf28c7
6 changed files with 30 additions and 25 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
ChangeLog
View file

@ -1,3 +1,18 @@
2004-06-22 Sven Neumann <sven@gimp.org>
* app/widgets/gimpfiledialog.c (gimp_file_dialog_set_image): unset
the filename if the image is unnamed.
* configure.in
* app/sanity.c: depend on gtk+ >= 2.4.1.
* app/widgets/gimpthumbbox.[ch]: changed gimp_thumb_box_set_uris()
to gimp_thumb_box_take_uris() since the function takes ownership
of the list,
* app/widgets/gimpfiledialog.c: changed accordingly. Removed code
that worked around a problem in gtk+ < 2.4.1.
2004-06-22 Sven Neumann <sven@gimp.org>
* libgimpwidgets/gimpcolorarea.c (gimp_color_area_set_color): use

2
app/sanity.c
View file

@ -36,7 +36,7 @@ sanity_check (gboolean no_interface)
#define GTK_REQUIRED_MAJOR 2
#define GTK_REQUIRED_MINOR 4
#define GTK_REQUIRED_MICRO 0
#define GTK_REQUIRED_MICRO 1
mismatch = gtk_check_version (GTK_REQUIRED_MAJOR,
GTK_REQUIRED_MINOR,

18
app/widgets/gimpfiledialog.c
View file

@ -380,6 +380,8 @@ gimp_file_dialog_set_image (GimpFileDialog *dialog,
if (uri)
gtk_file_chooser_set_uri (GTK_FILE_CHOOSER (dialog), uri);
else
gtk_file_chooser_set_current_name (GTK_FILE_CHOOSER (dialog), "");
gimp_ui_manager_update (dialog->manager,
gimp_image_active_drawable (gimage));
@ -392,20 +394,8 @@ static void
gimp_file_dialog_selection_changed (GtkFileChooser *chooser,
GimpFileDialog *dialog)
{
GSList *uris = gtk_file_chooser_get_uris (chooser);
#ifdef __GNUC__
#warning FIXME: remove version check as soon as we depend on GTK+ 2.4.1
#endif
if (gtk_check_version (2, 4, 1))
{
if (uris)
gimp_thumb_box_set_uri (GIMP_THUMB_BOX (dialog->thumb_box), uris->data);
else
gimp_thumb_box_set_uri (GIMP_THUMB_BOX (dialog->thumb_box), NULL);
}
gimp_thumb_box_set_uris (GIMP_THUMB_BOX (dialog->thumb_box), uris);
gimp_thumb_box_take_uris (GIMP_THUMB_BOX (dialog->thumb_box),
gtk_file_chooser_get_uris (chooser));
}
static void

6
app/widgets/gimpthumbbox.c
View file

@ -124,7 +124,7 @@ gimp_thumb_box_finalize (GObject *object)
{
GimpThumbBox *box = GIMP_THUMB_BOX (object);
gimp_thumb_box_set_uris (box, NULL);
gimp_thumb_box_take_uris (box, NULL);
if (box->imagefile)
{
@ -304,8 +304,8 @@ gimp_thumb_box_set_uri (GimpThumbBox *box,
}
void
gimp_thumb_box_set_uris (GimpThumbBox *box,
GSList *uris)
gimp_thumb_box_take_uris (GimpThumbBox *box,
GSList *uris)
{
g_return_if_fail (GIMP_IS_THUMB_BOX (box));

12
app/widgets/gimpthumbbox.h
View file

@ -49,14 +49,14 @@ struct _GimpThumbBoxClass
};
GType gimp_thumb_box_get_type (void) G_GNUC_CONST;
GType gimp_thumb_box_get_type (void) G_GNUC_CONST;
GtkWidget * gimp_thumb_box_new (Gimp *gimp);
GtkWidget * gimp_thumb_box_new (Gimp *gimp);
void gimp_thumb_box_set_uri (GimpThumbBox *box,
const gchar *uri);
void gimp_thumb_box_set_uris (GimpThumbBox *box,
GSList *uris);
void gimp_thumb_box_set_uri (GimpThumbBox *box,
const gchar *uri);
void gimp_thumb_box_take_uris (GimpThumbBox *box,
GSList *uris);
#endif /* __GIMP_THUMB_BOX_H__ */

2
configure.in
View file

@ -44,7 +44,7 @@ m4_define([gimp_full_name], [The GIMP])
# required versions of other packages
m4_define([glib_required_version], [2.4.0])
m4_define([gtk_required_version], [2.4.0])
m4_define([gtk_required_version], [2.4.1])
m4_define([gdk_pixbuf_required_version], [gtk_required_version])
m4_define([pangoft2_required_version], [1.4.0])
m4_define([fontconfig_required_version], [2.2.0])