gimp r25215 - in trunk: . app/actions

[neo svn gnome org]

Author: neo
Date: Tue Mar 25 09:33:28 2008
New Revision: 25215
URL: http://svn.gnome.org/viewvc/gimp?rev=25215&view=rev

Log:
2008-03-25  Sven Neumann  <sven gimp org>

	* app/actions/file-actions.c
	* app/actions/file-commands.[ch]: renamed
	file_last_opened_cmd_callaback() to file_open_recent_cmd_callback().
	Use the empty display as progress object.


Modified:
   trunk/ChangeLog
   trunk/app/actions/file-actions.c
   trunk/app/actions/file-commands.c
   trunk/app/actions/file-commands.h

Modified: trunk/app/actions/file-actions.c
==============================================================================
--- trunk/app/actions/file-actions.c	(original)
+++ trunk/app/actions/file-actions.c	Tue Mar 25 09:33:28 2008
@@ -177,7 +177,7 @@
     }
 
   gimp_action_group_add_enum_actions (group, entries, n_entries,
-                                      G_CALLBACK (file_last_opened_cmd_callback));
+                                      G_CALLBACK (file_open_recent_cmd_callback));
 
   for (i = 0; i < n_entries; i++)
     {

Modified: trunk/app/actions/file-commands.c
==============================================================================
--- trunk/app/actions/file-commands.c	(original)
+++ trunk/app/actions/file-commands.c	Tue Mar 25 09:33:28 2008
@@ -133,7 +133,7 @@
 }
 
 void
-file_last_opened_cmd_callback (GtkAction *action,
+file_open_recent_cmd_callback (GtkAction *action,
                                gint       value,
                                gpointer   data)
 {
@@ -152,12 +152,17 @@
 
   if (imagefile)
     {
+      GimpDisplay       *display;
+      GimpProgress      *progress;
       GimpImage         *image;
       GimpPDBStatusType  status;
       GError            *error = NULL;
+      return_if_no_display (display, data);
+
+      progress = display->image ? NULL : GIMP_PROGRESS (display);
 
       image = file_open_with_display (gimp, action_data_get_context (data),
-                                      NULL,
+                                      progress,
                                       GIMP_OBJECT (imagefile)->name, FALSE,
                                       &status, &error);
 
@@ -166,7 +171,7 @@
           gchar *filename =
             file_utils_uri_display_name (GIMP_OBJECT (imagefile)->name);
 
-          gimp_message (gimp, NULL, GIMP_MESSAGE_ERROR,
+          gimp_message (gimp, G_OBJECT (display), GIMP_MESSAGE_ERROR,
                         _("Opening '%s' failed:\n\n%s"),
                         filename, error->message);
           g_clear_error (&error);

Modified: trunk/app/actions/file-commands.h
==============================================================================
--- trunk/app/actions/file-commands.h	(original)
+++ trunk/app/actions/file-commands.h	Tue Mar 25 09:33:28 2008
@@ -26,7 +26,7 @@
                                           gpointer     data);
 void   file_open_location_cmd_callback   (GtkAction   *action,
                                           gpointer     data);
-void   file_last_opened_cmd_callback     (GtkAction   *action,
+void   file_open_recent_cmd_callback     (GtkAction   *action,
                                           gint         value,
                                           gpointer     data);