[gnome-photos/gnome-3-16] properties-dialog: Be more forgiving of unknown nmm:flash values

[Debarshi Ray <debarshir src gnome org>]

commit 3a9cf1b444c15277b60a8e5f5f2293ea28e19d6b
Author: Debarshi Ray <debarshir gnome org>
Date:   Fri Oct 30 11:38:53 2015 +0100

    properties-dialog: Be more forgiving of unknown nmm:flash values
    
    It's been a year and we still don't know what exactly happened. Who
    knows what is out there in the wild? So, instead of aborting let's try
    to handle this more elegantly.
    
    Keep the warning, remove the assertion and show an empty label.
    
    https://bugzilla.gnome.org/show_bug.cgi?id=734766

 src/photos-properties-dialog.c |    3 +--
 1 files changed, 1 insertions(+), 2 deletions(-)
---
diff --git a/src/photos-properties-dialog.c b/src/photos-properties-dialog.c
index e9e6523..1bd4558 100644
--- a/src/photos-properties-dialog.c
+++ b/src/photos-properties-dialog.c
@@ -478,7 +478,7 @@ photos_properties_dialog_constructed (GObject *object)
   if (flash_w != NULL)
     {
       GtkWidget *flash_data;
-      gchar *flash_str;
+      gchar *flash_str = NULL;
 
       if (flash == PHOTOS_FLASH_OFF)
         flash_str = g_strdup (_("Off, did not fire"));
@@ -490,7 +490,6 @@ photos_properties_dialog_constructed (GObject *object)
 
           str = g_quark_to_string (flash);
           g_warning ("Unknown value for nmm:flash: %s", str);
-          g_assert_not_reached ();
         }
 
       flash_data = gtk_label_new (flash_str);