Commit a5fcdf28 authored by Sven Neumann's avatar Sven Neumann Committed by Sven Neumann
Browse files

unset the filename if the image is unnamed.

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.
parent dd81320e
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
......
......@@ -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,
......
......@@ -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
......
......@@ -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));
......
......@@ -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__ */
......@@ -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])
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment