[gimp] plug-ins: simplify the file-jpeg file size displaying code
- From: Michael Natterer <mitch src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gimp] plug-ins: simplify the file-jpeg file size displaying code
- Date: Sat, 12 Oct 2013 16:54:14 +0000 (UTC)
commit 54ead10b57f6979c9aafc094e4cb361aef62901f
Author: Michael Natterer <mitch gimp org>
Date: Sat Oct 12 18:53:03 2013 +0200
plug-ins: simplify the file-jpeg file size displaying code
and display errors returned by g_file_query_info().
plug-ins/file-jpeg/jpeg-save.c | 56 ++++++++++++++++++---------------------
1 files changed, 26 insertions(+), 30 deletions(-)
---
diff --git a/plug-ins/file-jpeg/jpeg-save.c b/plug-ins/file-jpeg/jpeg-save.c
index f8547ee..9aa0c81 100644
--- a/plug-ins/file-jpeg/jpeg-save.c
+++ b/plug-ins/file-jpeg/jpeg-save.c
@@ -191,43 +191,38 @@ background_jpeg_save (PreviewPersistent *pp)
/* display the preview stuff */
if (!pp->abort_me)
{
- GFile *file = g_file_new_for_path (pp->file_name);
+ GFile *file = g_file_new_for_path (pp->file_name);
+ GFileInfo *info;
+ gchar *text;
+ GError *error = NULL;
- if (file)
+ info = g_file_query_info (file,
+ G_FILE_ATTRIBUTE_STANDARD_SIZE,
+ G_FILE_QUERY_INFO_NONE,
+ NULL, &error);
+
+ if (info)
{
- GFileInfo *info = g_file_query_info (file,
- G_FILE_ATTRIBUTE_STANDARD_SIZE,
- G_FILE_QUERY_INFO_NONE,
- NULL, NULL);
-
- if (info)
- {
- goffset size = g_file_info_get_size (info);
- gchar *size_text;
- gchar *text;
-
- size_text = g_format_size (size);
- text = g_strdup_printf (_("File size: %s"), size_text);
- gtk_label_set_text (GTK_LABEL (preview_size), text);
- g_free (text);
- g_free (size_text);
-
- g_object_unref (info);
- }
- else
- {
- gtk_label_set_text (GTK_LABEL (preview_size),
- _("File size: unknown"));
- }
-
- g_object_unref (file);
+ goffset size = g_file_info_get_size (info);
+ gchar *size_text;
+
+ size_text = g_format_size (size);
+ text = g_strdup_printf (_("File size: %s"), size_text);
+ g_free (size_text);
+
+ g_object_unref (info);
}
else
{
- gtk_label_set_text (GTK_LABEL (preview_size),
- _("File size: unknown"));
+ text = g_strdup_printf (_("File size: %s"), error->message);
+ g_clear_error (&error);
}
+ gtk_label_set_text (GTK_LABEL (preview_size), text);
+ g_free (text);
+
+ g_object_unref (file);
+
/* and load the preview */
load_image (pp->file_name, GIMP_RUN_NONINTERACTIVE, TRUE, NULL);
}
@@ -879,6 +874,7 @@ save_dialog (void)
preview_size = gtk_label_new (_("File size: unknown"));
gtk_misc_set_alignment (GTK_MISC (preview_size), 0.0, 0.5);
+ gtk_label_set_ellipsize (GTK_LABEL (preview_size), PANGO_ELLIPSIZE_END);
gimp_label_set_attributes (GTK_LABEL (preview_size),
PANGO_ATTR_STYLE, PANGO_STYLE_ITALIC,
-1);
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]