[gnome-initial-setup/mcatanzaro/gnome-version.xml] welcome: stop reading gnome-version.xml




commit fb0322a2289feb7288a38db275d2db123472519e
Author: Michael Catanzaro <mcatanzaro redhat com>
Date:   Wed May 4 12:16:32 2022 -0500

    welcome: stop reading gnome-version.xml
    
    This file is going away, see gnome-desktop!141. Instead we can simply
    say "Welcome to GNOME!" instead of "Welcome to GNOME 43!" It's not going
    to be displayed by default anyway, since this is only a fallback in case
    g_get_os_info() doesn't find the goods in /etc/os-release.

 .../pages/welcome/gis-welcome-page.c               | 129 +--------------------
 1 file changed, 1 insertion(+), 128 deletions(-)
---
diff --git a/gnome-initial-setup/pages/welcome/gis-welcome-page.c 
b/gnome-initial-setup/pages/welcome/gis-welcome-page.c
index 793d147d..1aa5165f 100644
--- a/gnome-initial-setup/pages/welcome/gis-welcome-page.c
+++ b/gnome-initial-setup/pages/welcome/gis-welcome-page.c
@@ -53,131 +53,6 @@ update_welcome_header (GisWelcomePage *page)
   gtk_image_set_from_pixbuf (GTK_IMAGE (priv->header), pixbuf);
 }
 
-typedef struct
-{
-  char *major;
-  char *minor;
-  char *micro;
-  char *distributor;
-  char *date;
-  char **current;
-} VersionData;
-
-static void
-version_data_free (VersionData *data)
-{
-  g_free (data->major);
-  g_free (data->minor);
-  g_free (data->micro);
-  g_free (data->distributor);
-  g_free (data->date);
-  g_free (data);
-}
-
-G_DEFINE_AUTOPTR_CLEANUP_FUNC (VersionData, version_data_free);
-
-static void
-version_start_element_handler (GMarkupParseContext      *ctx,
-                               const char               *element_name,
-                               const char              **attr_names,
-                               const char              **attr_values,
-                               gpointer                  user_data,
-                               GError                  **error)
-{
-  VersionData *data = user_data;
-  if (g_str_equal (element_name, "platform"))
-    data->current = &data->major;
-  else if (g_str_equal (element_name, "minor"))
-    data->current = &data->minor;
-  else if (g_str_equal (element_name, "micro"))
-    data->current = &data->micro;
-  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;
-}
-
-static void
-version_end_element_handler (GMarkupParseContext      *ctx,
-                             const char               *element_name,
-                             gpointer                  user_data,
-                             GError                  **error)
-{
-  VersionData *data = user_data;
-  data->current = NULL;
-}
-
-static void
-version_text_handler (GMarkupParseContext *ctx,
-                      const char          *text,
-                      gsize                text_len,
-                      gpointer             user_data,
-                      GError             **error)
-{
-  VersionData *data = user_data;
-  if (data->current != NULL)
-    {
-      g_autofree char *stripped = NULL;
-
-      stripped = g_strstrip (g_strdup (text));
-      g_free (*data->current);
-      *data->current = g_steal_pointer (&stripped);
-    }
-}
-
-static gboolean
-load_gnome_version (char **version,
-                    char **distributor,
-                    char **date)
-{
-  GMarkupParser version_parser = {
-    version_start_element_handler,
-    version_end_element_handler,
-    version_text_handler,
-    NULL,
-    NULL,
-  };
-  g_autoptr(GError) error = NULL;
-  g_autoptr(GMarkupParseContext) ctx = NULL;
-  g_autofree char *contents = NULL;
-  gsize length;
-  g_autoptr(VersionData) data = NULL;
-
-  if (!g_file_get_contents (DATADIR "/gnome/gnome-version.xml",
-                            &contents,
-                            &length,
-                            &error))
-    return FALSE;
-
-  data = g_new0 (VersionData, 1);
-  ctx = g_markup_parse_context_new (&version_parser, 0, data, NULL);
-  if (!g_markup_parse_context_parse (ctx, contents, length, &error))
-    {
-      g_warning ("Invalid version file: '%s'", error->message);
-    }
-  else
-    {
-      if (version != NULL)
-        {
-          if (strcmp (data->micro, "0") == 0)
-            *version = g_strdup_printf ("%s.%s", data->major, data->minor);
-          else
-            *version = g_strdup_printf ("%s.%s.%s", data->major, data->minor, data->micro);
-        }
-
-      if (distributor != NULL)
-        *distributor = g_strdup (data->distributor);
-      if (date != NULL)
-        *date = g_strdup (data->date);
-
-      return TRUE;
-    }
-
-  return FALSE;
-};
-
 static void
 update_welcome_title (GisWelcomePage *page)
 {
@@ -193,9 +68,7 @@ update_welcome_title (GisWelcomePage *page)
     }
   else
     {
-      g_autofree char *version = NULL;
-      load_gnome_version (&version, NULL, NULL);
-      entity = g_strdup_printf ("GNOME %s", version);
+      entity = g_strdup ("GNOME");
     }
 
   /* Translators: This is meant to be a warm, engaging welcome message,


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]