[balsa] More carefully check names of extra mime icons

[Peter Bloomfield <peterb src gnome org>]

commit 4c7e7b4c29234f5172ada63d83194bda95d5482f
Author: Peter Bloomfield <PeterBloomfield bellsouth net>
Date:   Mon Apr 24 20:47:02 2017 -0400

    More carefully check names of extra mime icons
    
        * libbalsa/files.c (libbalsa_icon_finder): more carefully check
          names of extra mime icons.

 ChangeLog        |    5 +++++
 libbalsa/files.c |   54 ++++++++++++++++++++++++++++--------------------------
 2 files changed, 33 insertions(+), 26 deletions(-)
---
diff --git a/ChangeLog b/ChangeLog
index cc60c4f..26cdc5a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,10 @@
 2017-04-24  Peter Bloomfield  <pbloomfield bellsouth net>
 
+       * libbalsa/files.c (libbalsa_icon_finder): more carefully check
+         names of extra mime icons.
+
+2017-04-24  Peter Bloomfield  <pbloomfield bellsouth net>
+
        * configure.ac: pass install directories on the compile command
        line instead of in config.h;
        * libbalsa/files.c: use the directories.
diff --git a/libbalsa/files.c b/libbalsa/files.c
index de37bae..330489e 100644
--- a/libbalsa/files.c
+++ b/libbalsa/files.c
@@ -129,7 +129,6 @@ libbalsa_icon_finder(GtkWidget         * widget,
                      GtkIconSize         size)
 {
     const gchar *content_type;
-    gchar *icon = NULL;
     GdkPixbuf *pixbuf = NULL;
     gint width, height;
     GtkIconTheme *icon_theme;
@@ -148,28 +147,43 @@ libbalsa_icon_finder(GtkWidget         * widget,
     if ((icon_theme = gtk_icon_theme_get_default())) {
         GIcon * icon = g_content_type_get_icon(content_type);
 
-        if (icon && G_IS_THEMED_ICON(icon)) {
-            int i = 0;
+        if (icon != NULL && G_IS_THEMED_ICON(icon)) {
+            gint i;
             GStrv icon_names;
 
             g_object_get(G_OBJECT(icon), "names", &icon_names, NULL);
-            while (!pixbuf && icon_names && icon_names[i]) {
-                pixbuf = gtk_icon_theme_load_icon(icon_theme, icon_names[i],
-                                                  width, GTK_ICON_LOOKUP_FORCE_SIZE, NULL);
-                i++;
+
+            if (icon_names != NULL) {
+                for (i = 0; pixbuf == NULL && icon_names[i] != NULL; i++) {
+                    pixbuf =
+                        gtk_icon_theme_load_icon(icon_theme, icon_names[i], width,
+                                                 GTK_ICON_LOOKUP_FORCE_SIZE, NULL);
+                }
             }
+
             g_strfreev(icon_names);
             g_object_unref(icon);
 
             /* last resort: try gnome-mime-<base mime type> */
-            if (!pixbuf) {
+            if (pixbuf == NULL) {
                 gchar * base_type_icon = g_strdup_printf("gnome-mime-%s", content_type);
                 gchar * slash = strchr(base_type_icon, '/');
+                gchar *hyphen;
 
                 if (slash)
-                    *slash = '\0';
-                pixbuf = gtk_icon_theme_load_icon(icon_theme, base_type_icon,
-                                                   width, GTK_ICON_LOOKUP_FORCE_SIZE, NULL);
+                    *slash = '-';
+
+                do {
+                    pixbuf = gtk_icon_theme_load_icon(icon_theme, base_type_icon,
+                                                      width, GTK_ICON_LOOKUP_FORCE_SIZE, NULL);
+                    if (pixbuf != NULL)
+                        break;
+
+                    if ((hyphen = strrchr(base_type_icon, '-')) != NULL) {
+                        *hyphen = '\0';
+                    }
+                } while (hyphen != NULL);
+
                 g_free(base_type_icon);
             }
 
@@ -183,22 +197,10 @@ libbalsa_icon_finder(GtkWidget         * widget,
     }
 
     /* load the pixbuf */
-    if (icon == NULL)
-       pixbuf = libbalsa_default_attachment_pixbuf(width);
-    else {
-       GdkPixbuf *tmp_pb;
-       
-       if ((tmp_pb = gdk_pixbuf_new_from_file(icon, NULL))) {
-           pixbuf = gdk_pixbuf_scale_simple(tmp_pb, width, width,
-                                            GDK_INTERP_BILINEAR);
-           g_object_unref(tmp_pb);
-       } else
-           pixbuf = libbalsa_default_attachment_pixbuf(width);
-       g_free(icon);
-    }
-    
+    pixbuf = libbalsa_default_attachment_pixbuf(width);
+
     if (used_type)
         *used_type = g_strdup(content_type);
-    
+
     return pixbuf;
 }