diff options
| author | Stefano Karapetsas <[email protected]> | 2014-01-28 20:16:00 +0100 |
|---|---|---|
| committer | Stefano Karapetsas <[email protected]> | 2014-01-28 20:16:00 +0100 |
| commit | a3c69729467538e2821f0a27efbf0a8477d35791 (patch) | |
| tree | 2f2add9b2477b400fef28613d6661ec2f6f8a414 /capplets/appearance/mate-wp-item.c | |
| parent | ee511ba9f042c64be34af0f7d8123391605a34c3 (diff) | |
| parent | 38f7a4c66ec15897c05eb0f3577aaca4cb1b884d (diff) | |
| download | mate-control-center-a3c69729467538e2821f0a27efbf0a8477d35791.tar.bz2 mate-control-center-a3c69729467538e2821f0a27efbf0a8477d35791.tar.xz | |
Merge branch 'master' of github.com:mate-desktop/mate-control-center
Diffstat (limited to 'capplets/appearance/mate-wp-item.c')
| -rw-r--r-- | capplets/appearance/mate-wp-item.c | 21 |
1 files changed, 17 insertions, 4 deletions
diff --git a/capplets/appearance/mate-wp-item.c b/capplets/appearance/mate-wp-item.c index d11fa896..96e7d67a 100644 --- a/capplets/appearance/mate-wp-item.c +++ b/capplets/appearance/mate-wp-item.c @@ -279,10 +279,16 @@ void mate_wp_item_update_description (MateWPItem * item) { const gchar *description; gchar *size; gchar *dirname = g_path_get_dirname (item->filename); + gchar *artist; description = NULL; size = NULL; + if (!item->artist || item->artist[0] == 0 || !g_strcmp0(item->artist, "(none)")) + artist = g_strdup (_("unknown")); + else + artist = g_strdup (item->artist); + if (strcmp (item->fileinfo->mime_type, "application/xml") == 0) { if (mate_bg_changes_with_time (item->bg)) @@ -308,28 +314,35 @@ void mate_wp_item_update_description (MateWPItem * item) { /* translators: <b>wallpaper name</b> * mime type, size * Folder: /path/to/file + * Artist: wallpaper author */ item->description = g_markup_printf_escaped (_("<b>%s</b>\n" "%s, %s\n" - "Folder: %s"), + "Folder: %s\n" + "Artist: %s"), item->name, description, size, - dirname); + dirname, + artist); } else { /* translators: <b>wallpaper name</b> * Image missing * Folder: /path/to/file + * Artist: wallpaper author */ item->description = g_markup_printf_escaped (_("<b>%s</b>\n" "%s\n" - "Folder: %s"), + "Folder: %s\n" + "Artist: %s"), item->name, _("Image missing"), - dirname); + dirname, + artist); } g_free (size); g_free (dirname); + g_free (artist); } } |