[libcryptui] daemon: Fall back to displaying the key ID if the key is not found

[Stefan Walter <stefw src gnome org>]

commit 6a4d4b83bd1d82bcc21bf66143fecd04f8e872a6
Author: Colomban Wendling <ban herbesfolles org>
Date:   Wed Nov 16 22:44:43 2016 +0100

    daemon: Fall back to displaying the key ID if the key is not found
    
    Better display a key ID in the notification than nothing at all.
    
    Signed-off-by: Stef Walter <stefw redhat com>
     * Fixed indentation
    
    https://bugzilla.gnome.org/show_bug.cgi?id=774611

 daemon/seahorse-notification.c |   25 ++++++++++++++++++-------
 1 files changed, 18 insertions(+), 7 deletions(-)
---
diff --git a/daemon/seahorse-notification.c b/daemon/seahorse-notification.c
index 0f713c2..342258a 100644
--- a/daemon/seahorse-notification.c
+++ b/daemon/seahorse-notification.c
@@ -77,18 +77,18 @@ G_DEFINE_TYPE (SeahorseNotification, seahorse_notification, G_TYPE_OBJECT);
 /* Forward Declaration */
 static void object_notify (SeahorseObject *sobj, GParamSpec *spec, SeahorseNotification *snotif);
 
-static void
+static gboolean
 insert_key_field (GString *res, const gchar *id, const gchar *field)
 {
     SeahorseObject *sobj;
     GValue value;
     GValue svalue;
-    gchar *str;
+    gchar *str = NULL;
     
     sobj = seahorse_context_object_from_dbus (SCTX_APP (), id);
     if (!sobj || !SEAHORSE_IS_OBJECT (sobj)) {
         g_warning ("key '%s' in key text does not exist", id);
-        return;
+        return FALSE;
     }
     
     /* A default field */
@@ -108,6 +108,8 @@ insert_key_field (GString *res, const gchar *id, const gchar *field)
         g_value_unset (&svalue);
         g_value_unset (&value);
     }
+
+    return str != NULL;
 }
 
 static void
@@ -133,12 +135,21 @@ format_start_element (GMarkupParseContext *ctx, const gchar *element_name,
                 field = *attribute_values;
         }
         
-        if (!key)
+        if (!key) {
             g_warning ("key text <key> element requires the following attributes\n"
                        "     <key id=\"xxxxx\" field=\"xxxxx\"/>");
-        else 
-            insert_key_field (res, key, field);
-        
+       } else if (!insert_key_field (res, key, field)) {
+            gchar *str;
+            const gchar *p = strchr (key, ':');
+
+            if (p && p[1])
+                key = &p[1];
+
+            str = g_markup_escape_text (key, -1);
+            g_string_append (res, str);
+            g_free (str);
+        }
+
         return;
     }