[gimp] app: Add and use gimp_image_get_uri()

[Martin Nordholts <martinn src gnome org>]

commit 480d6e0cf23bd38d7cdfd8b103a11c4dd9e0be63
Author: Martin Nordholts <martinn src gnome org>
Date:   Wed Jan 26 08:19:39 2011 +0100

    app: Add and use gimp_image_get_uri()

 app/actions/file-actions.c           |    2 +-
 app/actions/file-commands.c          |    8 ++++----
 app/core/gimpimage-duplicate.c       |    2 +-
 app/core/gimpimage.c                 |   20 ++++++++++++++++++--
 app/core/gimpimage.h                 |    3 ++-
 app/display/gimpdisplayshell-close.c |    2 +-
 app/file/file-utils.c                |    2 +-
 app/pdb/image-cmds.c                 |    2 +-
 app/widgets/gimpfiledialog.c         |   10 +++++-----
 app/widgets/gimpimagepropview.c      |    2 +-
 tools/pdbgen/pdb/image.pdb           |    2 +-
 11 files changed, 36 insertions(+), 19 deletions(-)
---
diff --git a/app/actions/file-actions.c b/app/actions/file-actions.c
index 6b77b42..9e15422 100644
--- a/app/actions/file-actions.c
+++ b/app/actions/file-actions.c
@@ -279,7 +279,7 @@ file_actions_update (GimpActionGroup *group,
   SET_SENSITIVE ("file-save",            image && drawable);
   SET_SENSITIVE ("file-save-as",         image && drawable);
   SET_SENSITIVE ("file-save-a-copy",     image && drawable);
-  SET_SENSITIVE ("file-revert",          image && (gimp_object_get_name (image) || source));
+  SET_SENSITIVE ("file-revert",          image && (gimp_image_get_uri (image) || source));
   SET_SENSITIVE ("file-export-to",       export_to);
   SET_VISIBLE   ("file-export-to",       export_to || ! show_overwrite);
   SET_SENSITIVE ("file-overwrite",       show_overwrite);
diff --git a/app/actions/file-commands.c b/app/actions/file-commands.c
index 022c16c..5179d15 100644
--- a/app/actions/file-commands.c
+++ b/app/actions/file-commands.c
@@ -226,7 +226,7 @@ file_save_cmd_callback (GtkAction *action,
   if (! gimp_image_get_active_drawable (image))
     return;
 
-  uri = gimp_object_get_name (image);
+  uri = gimp_image_get_uri (image);
 
   switch (save_mode)
     {
@@ -359,7 +359,7 @@ file_revert_cmd_callback (GtkAction *action,
 
   image = gimp_display_get_image (display);
 
-  uri = gimp_object_get_name (image);
+  uri = gimp_image_get_uri (image);
 
   if (! uri)
     {
@@ -497,7 +497,7 @@ file_open_dialog_show (Gimp        *gimp,
   if (dialog)
     {
       if (! uri && image)
-        uri = gimp_object_get_name (image);
+        uri = gimp_image_get_uri (image);
 
       if (! uri)
         uri = g_object_get_data (G_OBJECT (gimp), GIMP_FILE_OPEN_LAST_URI_KEY);
@@ -662,7 +662,7 @@ file_revert_confirm_response (GtkWidget   *dialog,
       GimpPDBStatusType  status;
       GError            *error = NULL;
 
-      uri = gimp_object_get_name (old_image);
+      uri = gimp_image_get_uri (old_image);
 
       if (! uri)
         uri = g_object_get_data (G_OBJECT (old_image),
diff --git a/app/core/gimpimage-duplicate.c b/app/core/gimpimage-duplicate.c
index 8eee220..183de98 100644
--- a/app/core/gimpimage-duplicate.c
+++ b/app/core/gimpimage-duplicate.c
@@ -173,7 +173,7 @@ gimp_image_duplicate_save_source_uri (GimpImage *image,
                                       GimpImage *new_image)
 {
   g_object_set_data_full (G_OBJECT (new_image), "gimp-image-source-uri",
-                          g_strdup (gimp_object_get_name (image)),
+                          g_strdup (gimp_image_get_uri (image)),
                           (GDestroyNotify) g_free);
 }
 
diff --git a/app/core/gimpimage.c b/app/core/gimpimage.c
index 0961414..5b234f3 100644
--- a/app/core/gimpimage.c
+++ b/app/core/gimpimage.c
@@ -1532,11 +1532,27 @@ gimp_image_get_uri_or_untitled (const GimpImage *image)
 
   g_return_val_if_fail (GIMP_IS_IMAGE (image), NULL);
 
-  uri = gimp_object_get_name (image);
+  uri = gimp_image_get_uri (image);
 
   return uri ? uri : _("Untitled");
 }
 
+/**
+ * gimp_image_get_uri:
+ * @image: A #GimpImage.
+ *
+ * Get the URI of the XCF image, or NULL if there is no URI.
+ *
+ * Returns: The URI, or NULL.
+ **/
+const gchar *
+gimp_image_get_uri (const GimpImage *image)
+{
+  g_return_val_if_fail (GIMP_IS_IMAGE (image), NULL);
+
+  return gimp_object_get_name (image);
+}
+
 void
 gimp_image_set_filename (GimpImage   *image,
                          const gchar *filename)
@@ -1563,7 +1579,7 @@ gimp_image_get_filename (const GimpImage *image)
 
   g_return_val_if_fail (GIMP_IS_IMAGE (image), NULL);
 
-  uri = gimp_object_get_name (image);
+  uri = gimp_image_get_uri (image);
 
   if (! uri)
     return NULL;
diff --git a/app/core/gimpimage.h b/app/core/gimpimage.h
index 9a26a54..6d7cf91 100644
--- a/app/core/gimpimage.h
+++ b/app/core/gimpimage.h
@@ -172,7 +172,8 @@ GimpImage     * gimp_image_get_by_ID             (Gimp               *gimp,
 
 void            gimp_image_set_uri               (GimpImage          *image,
                                                   const gchar        *uri);
-const gchar   * gimp_image_get_uri_or_untitled               (const GimpImage    *image);
+const gchar   * gimp_image_get_uri               (const GimpImage    *image);
+const gchar   * gimp_image_get_uri_or_untitled   (const GimpImage    *image);
 
 void            gimp_image_set_filename          (GimpImage          *image,
                                                   const gchar        *filename);
diff --git a/app/display/gimpdisplayshell-close.c b/app/display/gimpdisplayshell-close.c
index 8dc8fff..c90a662 100644
--- a/app/display/gimpdisplayshell-close.c
+++ b/app/display/gimpdisplayshell-close.c
@@ -148,7 +148,7 @@ gimp_display_shell_close_dialog (GimpDisplayShell *shell,
       return;
     }
 
-  uri = gimp_object_get_name (image);
+  uri = gimp_image_get_uri (image);
 
   title = g_strdup_printf (_("Close %s"), gimp_image_get_display_name (image));
 
diff --git a/app/file/file-utils.c b/app/file/file-utils.c
index 35d9ecf..a50fec5 100644
--- a/app/file/file-utils.c
+++ b/app/file/file-utils.c
@@ -451,7 +451,7 @@ file_utils_save_thumbnail (GimpImage   *image,
   g_return_val_if_fail (GIMP_IS_IMAGE (image), FALSE);
   g_return_val_if_fail (filename != NULL, FALSE);
 
-  image_uri = gimp_object_get_name (image);
+  image_uri = gimp_image_get_uri (image);
 
   if (image_uri)
     {
diff --git a/app/pdb/image-cmds.c b/app/pdb/image-cmds.c
index 8b1b859..14c2955 100644
--- a/app/pdb/image-cmds.c
+++ b/app/pdb/image-cmds.c
@@ -2548,7 +2548,7 @@ image_get_uri_invoker (GimpProcedure      *procedure,
 
   if (success)
     {
-      uri = g_strdup (gimp_object_get_name (image));
+      uri = g_strdup (gimp_image_get_uri (image));
     }
 
   return_vals = gimp_procedure_get_return_values (procedure, success,
diff --git a/app/widgets/gimpfiledialog.c b/app/widgets/gimpfiledialog.c
index 6f29168..deace29 100644
--- a/app/widgets/gimpfiledialog.c
+++ b/app/widgets/gimpfiledialog.c
@@ -523,7 +523,7 @@ gimp_file_dialog_set_save_image (GimpFileDialog *dialog,
                                      GIMP_FILE_SAVE_A_COPY_URI_KEY);
 
       if (! dir_uri)
-        dir_uri = gimp_object_get_name (image);
+        dir_uri = gimp_image_get_uri (image);
 
       if (! dir_uri)
         dir_uri = g_object_get_data (G_OBJECT (image),
@@ -555,7 +555,7 @@ gimp_file_dialog_set_save_image (GimpFileDialog *dialog,
                                       GIMP_FILE_SAVE_A_COPY_URI_KEY);
 
       if (! name_uri)
-        name_uri = gimp_object_get_name (image);
+        name_uri = gimp_image_get_uri (image);
 
       if (! name_uri)
         name_uri = g_object_get_data (G_OBJECT (image),
@@ -574,7 +574,7 @@ gimp_file_dialog_set_save_image (GimpFileDialog *dialog,
        *   1. Type of last Save
        *   2. .xcf (which we don't explicitly append)
        */
-      ext_uri = gimp_object_get_name (image);
+      ext_uri = gimp_image_get_uri (image);
 
       if (! ext_uri)
         ext_uri = "file:///we/only/care/about/extension.xcf";
@@ -604,7 +604,7 @@ gimp_file_dialog_set_save_image (GimpFileDialog *dialog,
                                      GIMP_FILE_IMPORT_SOURCE_URI_KEY);
 
       if (! dir_uri)
-        dir_uri = gimp_object_get_name (image);
+        dir_uri = gimp_image_get_uri (image);
 
       if (! dir_uri)
         dir_uri = g_object_get_data (G_OBJECT (gimp),
@@ -630,7 +630,7 @@ gimp_file_dialog_set_save_image (GimpFileDialog *dialog,
                                     GIMP_FILE_EXPORT_URI_KEY);
 
       if (! name_uri)
-        name_uri = gimp_object_get_name (image);
+        name_uri = gimp_image_get_uri (image);
 
       if (! name_uri)
         name_uri = g_object_get_data (G_OBJECT (image),
diff --git a/app/widgets/gimpimagepropview.c b/app/widgets/gimpimagepropview.c
index 607b67a..f6fe1f8 100644
--- a/app/widgets/gimpimagepropview.c
+++ b/app/widgets/gimpimagepropview.c
@@ -311,7 +311,7 @@ static void
 gimp_image_prop_view_label_set_filename (GtkWidget *label,
                                          GimpImage *image)
 {
-  const gchar *uri = gimp_object_get_name (image);
+  const gchar *uri = gimp_image_get_uri (image);
 
   if (uri)
     {
diff --git a/tools/pdbgen/pdb/image.pdb b/tools/pdbgen/pdb/image.pdb
index 5e83d3d..349b27e 100644
--- a/tools/pdbgen/pdb/image.pdb
+++ b/tools/pdbgen/pdb/image.pdb
@@ -2489,7 +2489,7 @@ HELP
     %invoke = (
 	code => <<'CODE'
 {
-  uri = g_strdup (gimp_object_get_name (image));
+  uri = g_strdup (gimp_image_get_uri (image));
 }
 CODE
     );