[gnome-control-center/wip/hadess/version-xml: 2/5] info-overview: Don't load version.xml info we don't use
- From: Robert Ancell <rancell src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnome-control-center/wip/hadess/version-xml: 2/5] info-overview: Don't load version.xml info we don't use
- Date: Tue, 10 May 2022 23:01:03 +0000 (UTC)
commit 8914fae8daba71e255285e6ca58f1ec894785b2f
Author: Bastien Nocera <hadess hadess net>
Date: Wed May 4 09:38:38 2022 +0200
info-overview: Don't load version.xml info we don't use
We don't use the distributor or date info from gnome-desktop's version.xml
so no need to parse it.
panels/info-overview/cc-info-overview-panel.c | 18 ++----------------
1 file changed, 2 insertions(+), 16 deletions(-)
---
diff --git a/panels/info-overview/cc-info-overview-panel.c b/panels/info-overview/cc-info-overview-panel.c
index b348c0fc6..d2fc3cf0f 100644
--- a/panels/info-overview/cc-info-overview-panel.c
+++ b/panels/info-overview/cc-info-overview-panel.c
@@ -79,8 +79,6 @@ typedef struct
{
char *major;
char *minor;
- char *distributor;
- char *date;
char **current;
} VersionData;
@@ -89,8 +87,6 @@ version_data_free (VersionData *data)
{
g_free (data->major);
g_free (data->minor);
- g_free (data->distributor);
- g_free (data->date);
g_free (data);
}
@@ -111,10 +107,6 @@ version_start_element_handler (GMarkupParseContext *ctx,
data->current = &data->major;
else if (g_str_equal (element_name, "minor"))
data->current = &data->minor;
- else if (g_str_equal (element_name, "distributor"))
- data->current = &data->distributor;
- else if (g_str_equal (element_name, "date"))
- data->current = &data->date;
else
data->current = NULL;
}
@@ -148,9 +140,7 @@ version_text_handler (GMarkupParseContext *ctx,
}
static gboolean
-load_gnome_version (char **version,
- char **distributor,
- char **date)
+load_gnome_version (char **version)
{
GMarkupParser version_parser = {
version_start_element_handler,
@@ -182,10 +172,6 @@ load_gnome_version (char **version,
{
if (version != NULL)
*version = g_strdup_printf ("%s.%s", data->major, data->minor);
- if (distributor != NULL)
- *distributor = g_strdup (data->distributor);
- if (date != NULL)
- *date = g_strdup (data->date);
return TRUE;
}
@@ -771,7 +757,7 @@ info_overview_panel_setup_overview (CcInfoOverviewPanel *self)
g_autofree char *os_name_text = NULL;
g_autofree gchar *graphics_hardware_string = NULL;
- if (load_gnome_version (&gnome_version, NULL, NULL))
+ if (load_gnome_version (&gnome_version))
cc_list_row_set_secondary_label (self->gnome_version_row, gnome_version);
cc_list_row_set_secondary_label (self->windowing_system_row, get_windowing_system ());
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]