From 67de92042bdff81e7883d29c6aeae79e91091cdb Mon Sep 17 00:00:00 2001
From: Alexander Larsson <alexl@redhat.com>
Date: Thu, 17 Dec 2015 20:07:14 +0100
Subject: [PATCH] apps: Use "branch", not "version" when talking about app
 branches

---
 builder/builder-manifest.c | 20 ++++++++++----------
 common/xdg-app-dir.c       |  4 ++--
 common/xdg-app-utils.c     |  2 +-
 doc/xdg-app-builder.xml    |  4 ++--
 4 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/builder/builder-manifest.c b/builder/builder-manifest.c
index c2cc111c..7e352695 100644
--- a/builder/builder-manifest.c
+++ b/builder/builder-manifest.c
@@ -38,7 +38,7 @@ struct BuilderManifest {
   GObject parent;
 
   char *app_id;
-  char *version;
+  char *branch;
   char *runtime;
   char *runtime_version;
   char *sdk;
@@ -69,7 +69,7 @@ G_DEFINE_TYPE_WITH_CODE (BuilderManifest, builder_manifest, G_TYPE_OBJECT,
 enum {
   PROP_0,
   PROP_APP_ID,
-  PROP_VERSION,
+  PROP_BRANCH,
   PROP_RUNTIME,
   PROP_RUNTIME_VERSION,
   PROP_SDK,
@@ -95,7 +95,7 @@ builder_manifest_finalize (GObject *object)
   BuilderManifest *self = (BuilderManifest *)object;
 
   g_free (self->app_id);
-  g_free (self->version);
+  g_free (self->branch);
   g_free (self->runtime);
   g_free (self->runtime_version);
   g_free (self->sdk);
@@ -127,8 +127,8 @@ builder_manifest_get_property (GObject    *object,
       g_value_set_string (value, self->app_id);
       break;
 
-    case PROP_VERSION:
-      g_value_set_string (value, self->version);
+    case PROP_BRANCH:
+      g_value_set_string (value, self->branch);
       break;
 
     case PROP_RUNTIME:
@@ -216,9 +216,9 @@ builder_manifest_set_property (GObject       *object,
       self->app_id = g_value_dup_string (value);
       break;
 
-    case PROP_VERSION:
-      g_free (self->version);
-      self->version = g_value_dup_string (value);
+    case PROP_BRANCH:
+      g_free (self->branch);
+      self->branch = g_value_dup_string (value);
       break;
 
     case PROP_RUNTIME:
@@ -323,8 +323,8 @@ builder_manifest_class_init (BuilderManifestClass *klass)
                                                         NULL,
                                                         G_PARAM_READWRITE));
   g_object_class_install_property (object_class,
-                                   PROP_VERSION,
-                                   g_param_spec_string ("version",
+                                   PROP_BRANCH,
+                                   g_param_spec_string ("branch",
                                                         "",
                                                         "",
                                                         NULL,
diff --git a/common/xdg-app-dir.c b/common/xdg-app-dir.c
index 364d1b0a..d1fd7d99 100644
--- a/common/xdg-app-dir.c
+++ b/common/xdg-app-dir.c
@@ -1604,7 +1604,7 @@ xdg_app_dir_deploy (XdgAppDir *self,
     {
       g_set_error (error, XDG_APP_DIR_ERROR,
                    XDG_APP_DIR_ERROR_ALREADY_DEPLOYED,
-                   "%s version %s already deployed", ref, checksum);
+                   "%s branch %s already deployed", ref, checksum);
       goto out;
     }
 
@@ -1882,7 +1882,7 @@ xdg_app_dir_undeploy (XdgAppDir *self,
     {
       g_set_error (error, XDG_APP_DIR_ERROR,
                    XDG_APP_DIR_ERROR_ALREADY_UNDEPLOYED,
-                   "%s version %s already undeployed", ref, checksum);
+                   "%s branch %s already undeployed", ref, checksum);
       goto out;
     }
 
diff --git a/common/xdg-app-utils.c b/common/xdg-app-utils.c
index b6b1811f..fb8cb615 100644
--- a/common/xdg-app-utils.c
+++ b/common/xdg-app-utils.c
@@ -313,7 +313,7 @@ xdg_app_compose_ref (gboolean app,
 
   if (!xdg_app_is_valid_branch (branch))
     {
-      xdg_app_fail (error, "'%s' is not a valid version name", branch);
+      xdg_app_fail (error, "'%s' is not a valid branch name", branch);
       return NULL;
     }
 
diff --git a/doc/xdg-app-builder.xml b/doc/xdg-app-builder.xml
index 4372d6e7..fc46acd4 100644
--- a/doc/xdg-app-builder.xml
+++ b/doc/xdg-app-builder.xml
@@ -103,8 +103,8 @@
                     <listitem><para>A string defining the application id.</para></listitem>
                 </varlistentry>
                 <varlistentry>
-                    <term><option>version</option></term>
-                    <listitem><para>The version of the application, defaults to master.</para></listitem>
+                    <term><option>branch</option></term>
+                    <listitem><para>The branch of the application, defaults to master.</para></listitem>
                 </varlistentry>
                 <varlistentry>
                     <term><option>runtime</option></term>