[gnome-builder] transfer: be more tolerant of NULL branches

[Christian Hergert <chergert src gnome org>]

commit 6485e3ac34527c4953653ec30adfd888b9f703d1
Author: Christian Hergert <chergert redhat com>
Date:   Mon Jan 15 20:25:10 2018 -0800

    transfer: be more tolerant of NULL branches
    
    This allows trying to locate any match when branch is NULL.

 src/plugins/flatpak/gbp-flatpak-transfer.c | 19 ++++++++++++-------
 1 file changed, 12 insertions(+), 7 deletions(-)
---
diff --git a/src/plugins/flatpak/gbp-flatpak-transfer.c b/src/plugins/flatpak/gbp-flatpak-transfer.c
index d0400c53d..4c54abd16 100644
--- a/src/plugins/flatpak/gbp-flatpak-transfer.c
+++ b/src/plugins/flatpak/gbp-flatpak-transfer.c
@@ -64,19 +64,19 @@ gbp_flatpak_transfer_update_title (GbpFlatpakTransfer *self)
         {
           if (self->finished)
             /* Translators: %s %s is used for replacing the runtime id (org.gnome.Platform) and the branch 
(3.24, master, etc) */
-            title = g_strdup_printf (_("Updated %s %s"), self->id, self->branch);
+            title = g_strdup_printf (_("Updated %s %s"), self->id, self->branch ?: "");
           else
             /* Translators: %s %s is used for replacing the runtime id (org.gnome.Platform) and the branch 
(3.24, master, etc) */
-            title = g_strdup_printf (_("Updating %s %s"), self->id, self->branch);
+            title = g_strdup_printf (_("Updating %s %s"), self->id, self->branch ?: "");
         }
       else
         {
           if (self->finished)
             /* Translators: %s %s is used for replacing the runtime id (org.gnome.Platform) and the branch 
(3.24, master, etc) */
-            title = g_strdup_printf (_("Installed %s %s"), self->id, self->branch);
+            title = g_strdup_printf (_("Installed %s %s"), self->id, self->branch ?: "");
           else
             /* Translators: %s %s is used for replacing the runtime id (org.gnome.Platform) and the branch 
(3.24, master, etc) */
-            title = g_strdup_printf (_("Installing %s %s"), self->id, self->branch);
+            title = g_strdup_printf (_("Installing %s %s"), self->id, self->branch ?: "");
         }
     }
 
@@ -173,6 +173,14 @@ gbp_flatpak_transfer_execute_async (IdeTransfer         *transfer,
 
   addin = gbp_flatpak_application_addin_get_default ();
 
+  if (self->branch == NULL &&
+      gbp_flatpak_application_addin_has_runtime (addin, self->id, self->arch, "stable"))
+    self->branch = g_strdup ("stable");
+
+  if (self->branch == NULL &&
+      gbp_flatpak_application_addin_has_runtime (addin, self->id, self->arch, "master"))
+    self->branch = g_strdup ("master");
+
   self->failed = FALSE;
   self->finished = FALSE;
   self->has_runtime = gbp_flatpak_application_addin_has_runtime (addin, self->id, self->arch, self->branch);
@@ -370,9 +378,6 @@ gbp_flatpak_transfer_new (const gchar *id,
   if (arch == NULL)
     arch = flatpak_get_default_arch ();
 
-  if (branch == NULL)
-    branch = "stable";
-
   return g_object_new (GBP_TYPE_FLATPAK_TRANSFER,
                        "id", id,
                        "arch", arch,