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

unset the filename if gtk_file_chooser_set_uri() failed. 

2004-08-23  Sven Neumann  <sven@gimp.org>

	* app/widgets/gimpfiledialog.c (gimp_file_dialog_set_image): unset
	the filename if gtk_file_chooser_set_uri() failed.

	* app/actions/file-commands.c
	* app/gui/file-save-dialog.c: trivial cleanups.

	* app/widgets/gimpwidgets-utils.c: removed an unused extern
	variable declaration.
This commit is contained in:
Sven Neumann 2004-08-23 09:32:06 +00:00 committed by Sven Neumann
parent f672ae9169
commit 509b48a48b
6 changed files with 18 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
ChangeLog
View File

@ -1,3 +1,14 @@
2004-08-23 Sven Neumann <sven@gimp.org>
* app/widgets/gimpfiledialog.c (gimp_file_dialog_set_image): unset
the filename if gtk_file_chooser_set_uri() failed.
* app/actions/file-commands.c
* app/gui/file-save-dialog.c: trivial cleanups.
* app/widgets/gimpwidgets-utils.c: removed an unused extern
variable declaration.
2004-08-23 DindinX <david@dindinx.org> 2004-08-23 DindinX <david@dindinx.org>
* app/tools/tools-utils.c: fixed a typo that broke the build. * app/tools/tools-utils.c: fixed a typo that broke the build.

4
app/actions/file-commands.c
View File

@ -165,9 +165,7 @@ file_save_cmd_callback (GtkAction *action,
if (gdisp->gimage->dirty || if (gdisp->gimage->dirty ||
! GIMP_GUI_CONFIG (gdisp->gimage->gimp->config)->trust_dirty_flag) ! GIMP_GUI_CONFIG (gdisp->gimage->gimp->config)->trust_dirty_flag)
{ {
const gchar *uri; const gchar *uri = gimp_object_get_name (GIMP_OBJECT (gdisp->gimage));
uri = gimp_object_get_name (GIMP_OBJECT (gdisp->gimage));
if (! uri) if (! uri)
{ {

3
app/dialogs/file-save-dialog.c
View File

@ -97,8 +97,7 @@ file_save_dialog_show (GimpImage *gimage,
gtk_window_set_title (GTK_WINDOW (filesave), _("Save Image")); gtk_window_set_title (GTK_WINDOW (filesave), _("Save Image"));
gimp_file_dialog_set_image (GIMP_FILE_DIALOG (filesave), gimp_file_dialog_set_image (GIMP_FILE_DIALOG (filesave), gimage, TRUE, TRUE);
gimage, TRUE, TRUE);
file_dialog_show (filesave, parent); file_dialog_show (filesave, parent);
} }

3
app/gui/file-save-dialog.c
View File

@ -97,8 +97,7 @@ file_save_dialog_show (GimpImage *gimage,
gtk_window_set_title (GTK_WINDOW (filesave), _("Save Image")); gtk_window_set_title (GTK_WINDOW (filesave), _("Save Image"));
gimp_file_dialog_set_image (GIMP_FILE_DIALOG (filesave), gimp_file_dialog_set_image (GIMP_FILE_DIALOG (filesave), gimage, TRUE, TRUE);
gimage, TRUE, TRUE);
file_dialog_show (filesave, parent); file_dialog_show (filesave, parent);
} }

6
app/widgets/gimpfiledialog.c
View File

@ -424,6 +424,7 @@ gimp_file_dialog_set_image (GimpFileDialog *dialog,
gboolean set_image_clean) gboolean set_image_clean)
{ {
const gchar *uri; const gchar *uri;
gboolean uri_set = FALSE;
g_return_if_fail (GIMP_IS_FILE_DIALOG (dialog)); g_return_if_fail (GIMP_IS_FILE_DIALOG (dialog));
g_return_if_fail (GIMP_IS_IMAGE (gimage)); g_return_if_fail (GIMP_IS_IMAGE (gimage));
@ -435,8 +436,9 @@ gimp_file_dialog_set_image (GimpFileDialog *dialog,
uri = gimp_object_get_name (GIMP_OBJECT (gimage)); uri = gimp_object_get_name (GIMP_OBJECT (gimage));
if (uri) if (uri)
gtk_file_chooser_set_uri (GTK_FILE_CHOOSER (dialog), uri); uri_set = gtk_file_chooser_set_uri (GTK_FILE_CHOOSER (dialog), uri);
else
if (! uri_set)
gtk_file_chooser_set_current_name (GTK_FILE_CHOOSER (dialog), ""); gtk_file_chooser_set_current_name (GTK_FILE_CHOOSER (dialog), "");
gimp_file_dialog_set_file_proc (dialog, NULL); gimp_file_dialog_set_file_proc (dialog, NULL);

2
app/widgets/gimpwidgets-utils.c
View File

@ -65,8 +65,6 @@ static void gimp_message_box_response (GtkWidget *widget,
MessageBox *msg_box); MessageBox *msg_box);
extern gchar *prog_name;
static GList *message_boxes = NULL; static GList *message_boxes = NULL;