[gnome-software/wip/rancell/ubuntuone] f
- From: Richard Hughes <rhughes src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnome-software/wip/rancell/ubuntuone] f
- Date: Mon, 4 Jul 2016 08:00:33 +0000 (UTC)
commit 8b0bccbfebc14234ea4a7b9db23d28e17ba99749
Author: Richard Hughes <richard hughsie com>
Date: Mon Jul 4 08:58:38 2016 +0100
f
src/gs-os-release.c | 12 ++++++------
src/gs-os-release.h | 2 +-
src/plugins/gs-plugin-ubuntu-reviews.c | 2 +-
3 files changed, 8 insertions(+), 8 deletions(-)
---
diff --git a/src/gs-os-release.c b/src/gs-os-release.c
index 3559e5a..bcdbf79 100644
--- a/src/gs-os-release.c
+++ b/src/gs-os-release.c
@@ -45,7 +45,7 @@ struct _GsOsRelease
gchar *id;
gchar *version_id;
gchar *pretty_name;
- gchar *ubuntu_codename;
+ gchar *distro_codename;
};
static void gs_os_release_initable_iface_init (GInitableIface *iface);
@@ -118,7 +118,7 @@ gs_os_release_initable_init (GInitable *initable,
continue;
}
if (g_strcmp0 (lines[i], "UBUNTU_CODENAME") == 0) {
- os_release->ubuntu_codename = g_strdup (tmp);
+ os_release->distro_codename = g_strdup (tmp);
continue;
}
}
@@ -201,7 +201,7 @@ gs_os_release_get_pretty_name (GsOsRelease *os_release)
}
/**
- * gs_os_release_get_ubuntu_codename:
+ * gs_os_release_get_distro_codename:
* @os_release: A #GsOsRelease
*
* Gets the Ubuntu codename from the os-release parser.
@@ -209,10 +209,10 @@ gs_os_release_get_pretty_name (GsOsRelease *os_release)
* Returns: a string, or %NULL
**/
const gchar *
-gs_os_release_get_ubuntu_codename (GsOsRelease *os_release)
+gs_os_release_get_distro_codename (GsOsRelease *os_release)
{
g_return_val_if_fail (GS_IS_OS_RELEASE (os_release), NULL);
- return os_release->ubuntu_codename;
+ return os_release->distro_codename;
}
static void
@@ -224,7 +224,7 @@ gs_os_release_finalize (GObject *object)
g_free (os_release->id);
g_free (os_release->version_id);
g_free (os_release->pretty_name);
- g_free (os_release->ubuntu_codename);
+ g_free (os_release->distro_codename);
G_OBJECT_CLASS (gs_os_release_parent_class)->finalize (object);
}
diff --git a/src/gs-os-release.h b/src/gs-os-release.h
index d7e951b..7bf5b15 100644
--- a/src/gs-os-release.h
+++ b/src/gs-os-release.h
@@ -39,7 +39,7 @@ const gchar *gs_os_release_get_version (GsOsRelease *os_release);
const gchar *gs_os_release_get_id (GsOsRelease *os_release);
const gchar *gs_os_release_get_version_id (GsOsRelease *os_release);
const gchar *gs_os_release_get_pretty_name (GsOsRelease *os_release);
-const gchar *gs_os_release_get_ubuntu_codename (GsOsRelease *os_release);
+const gchar *gs_os_release_get_distro_codename (GsOsRelease *os_release);
G_END_DECLS
diff --git a/src/plugins/gs-plugin-ubuntu-reviews.c b/src/plugins/gs-plugin-ubuntu-reviews.c
index ba5ced0..821d1e4 100644
--- a/src/plugins/gs-plugin-ubuntu-reviews.c
+++ b/src/plugins/gs-plugin-ubuntu-reviews.c
@@ -85,7 +85,7 @@ gs_plugin_initialize (GsPlugin *plugin)
if (priv->origin == NULL)
priv->origin = g_strdup ("unknown");
if (strcmp (priv->origin, "ubuntu") == 0)
- priv->distroseries = g_strdup (gs_os_release_get_ubuntu_codename (os_release));
+ priv->distroseries = g_strdup (gs_os_release_get_distro_codename (os_release));
if (priv->distroseries == NULL)
priv->distroseries = g_strdup ("unknown");
}
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]