[network-manager-applet/lr/pkcs11] fixup! libnma: add certificate chooser button

[Thomas Haller <thaller src gnome org>]

commit 273dd1e5bf203813243c00cb8a8d702ffa70208e
Author: Thomas Haller <thaller redhat com>
Date:   Thu Mar 2 23:44:31 2017 +0100

    fixup! libnma: add certificate chooser button

 src/libnma/nma-cert-chooser-button.c |   42 +++++++++-------------------------
 1 files changed, 11 insertions(+), 31 deletions(-)
---
diff --git a/src/libnma/nma-cert-chooser-button.c b/src/libnma/nma-cert-chooser-button.c
index 7cf65d4..88eb229 100644
--- a/src/libnma/nma-cert-chooser-button.c
+++ b/src/libnma/nma-cert-chooser-button.c
@@ -227,56 +227,36 @@ select_from_token (NMACertChooserButton *button, GckSlot *slot)
 
 
 static gboolean
-file_has_extension (const char *filename, const char *extensions[])
+file_has_extension (const char *filename, const char *const*extensions)
 {
-       char *p, *ext;
-       int i = 0;
-       gboolean found = FALSE;
+       const char *p;
+       gs_free char *ext = NULL;
+
+       if (!filename)
+               return FALSE;
 
        p = strrchr (filename, '.');
        if (!p)
                return FALSE;
 
        ext = g_ascii_strdown (p, -1);
-       if (ext) {
-               while (extensions[i]) {
-                       if (!strcmp (ext, extensions[i++])) {
-                               found = TRUE;
-                               break;
-                       }
-               }
-       }
-       g_free (ext);
-
-       return found;
+       return g_strv_contains (extensions, ext);
 }
 
 static gboolean
 cert_filter (const GtkFileFilterInfo *filter_info, gpointer data)
 {
-       const char *extensions[] = { ".der", ".pem", ".crt", ".cer", ".p12", NULL };
-
-       if (!filter_info->filename)
-               return FALSE;
-
-       if (!file_has_extension (filter_info->filename, extensions))
-               return FALSE;
+       static const char *const extensions[] = { ".der", ".pem", ".crt", ".cer", ".p12", NULL };
 
-       return TRUE;
+       return file_has_extension (filter_info->filename, extensions);
 }
 
 static gboolean
 privkey_filter (const GtkFileFilterInfo *filter_info, gpointer user_data)
 {
-       const char *extensions[] = { ".der", ".pem", ".p12", ".key", NULL };
-
-       if (!filter_info->filename)
-               return FALSE;
-
-       if (!file_has_extension (filter_info->filename, extensions))
-               return FALSE;
+       static const char *const extensions[] = { ".der", ".pem", ".p12", ".key", NULL };
 
-       return TRUE;
+       return file_has_extension (filter_info->filename, extensions);
 }