unified-data: Rename UpgradeResult to make more generic

mjakeman · mjakeman · commit 050436108ea5 · 2024-02-15T23:40:26.000+11:00
diff --git a/po/POTFILES b/po/POTFILES
@@ -29,7 +29,7 @@ src/exm-search-row.blp
 src/exm-search-row.c
 src/exm-upgrade-assistant.blp
 src/exm-upgrade-assistant.c
-src/exm-upgrade-result.c
+src/exm-unified-data.c
 src/exm-utils.c
 src/exm-window.blp
 src/exm-window.c
diff --git a/src/exm-unified-data.c b/src/exm-unified-data.c
@@ -1,4 +1,4 @@
-/* exm-upgrade-result.c
+/* exm-unified-data.c
  *
  * Copyright 2022 Matthew Jakeman <mjakeman26@outlook.co.nz>
  *
@@ -18,17 +18,17 @@
  * SPDX-License-Identifier: GPL-3.0-or-later
  */
 
-#include "exm-upgrade-result.h"
+#include "exm-unified-data.h"
 
-struct _ExmUpgradeResult
+struct _ExmUnifiedData
 {
     GObject parent_instance;
 
     ExmSearchResult *web_data;
     ExmExtension *local_data;
 };
 
-G_DEFINE_FINAL_TYPE (ExmUpgradeResult, exm_upgrade_result, G_TYPE_OBJECT)
+G_DEFINE_FINAL_TYPE (ExmUnifiedData, exm_unified_data, G_TYPE_OBJECT)
 
 enum {
     PROP_0,
@@ -38,51 +38,51 @@ enum {
 
 static GParamSpec *properties [N_PROPS];
 
-ExmUpgradeResult *
-exm_upgrade_result_new (void)
+ExmUnifiedData *
+exm_unified_data_new (void)
 {
-    return g_object_new (EXM_TYPE_UPGRADE_RESULT, NULL);
+    return g_object_new (EXM_TYPE_UNIFIED_DATA, NULL);
 }
 
 static void
-exm_upgrade_result_finalize (GObject *object)
+exm_unified_data_finalize (GObject *object)
 {
-    ExmUpgradeResult *self = (ExmUpgradeResult *)object;
+    ExmUnifiedData *self = (ExmUnifiedData *)object;
 
     if (self->web_data)
         g_object_unref (self->web_data);
 
     if (self->local_data)
         g_object_unref (self->local_data);
 
-    G_OBJECT_CLASS (exm_upgrade_result_parent_class)->finalize (object);
+    G_OBJECT_CLASS (exm_unified_data_parent_class)->finalize (object);
 }
 
 static void
-exm_upgrade_result_get_property (GObject    *object,
+exm_unified_data_get_property (GObject    *object,
                                  guint       prop_id,
                                  GValue     *value,
                                  GParamSpec *pspec)
 {
-    ExmUpgradeResult *self = EXM_UPGRADE_RESULT (object);
+    ExmUnifiedData *self = EXM_UNIFIED_DATA (object);
 
     switch (prop_id)
     {
     case PROP_NAME:
-        g_value_set_string (value, exm_upgrade_result_get_name (self));
+        g_value_set_string (value, exm_unified_data_get_name (self));
         break;
     default:
         G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
     }
 }
 
 static void
-exm_upgrade_result_set_property (GObject      *object,
+exm_unified_data_set_property (GObject      *object,
                                  guint         prop_id,
                                  const GValue *value,
                                  GParamSpec   *pspec)
 {
-    ExmUpgradeResult *self = EXM_UPGRADE_RESULT (object);
+    ExmUnifiedData *self = EXM_UNIFIED_DATA (object);
 
     switch (prop_id)
       {
@@ -92,33 +92,33 @@ exm_upgrade_result_set_property (GObject      *object,
 }
 
 ExmExtension *
-exm_upgrade_result_get_local_data (ExmUpgradeResult *self)
+exm_unified_data_get_local_data (ExmUnifiedData *self)
 {
     return self->local_data;
 }
 
 void
-exm_upgrade_result_set_local_data (ExmUpgradeResult *self,
+exm_unified_data_set_local_data (ExmUnifiedData *self,
                                    ExmExtension     *extension)
 {
     self->local_data = g_object_ref (extension);
 }
 
 ExmSearchResult *
-exm_upgrade_result_get_web_data (ExmUpgradeResult *self)
+exm_unified_data_get_web_data (ExmUnifiedData *self)
 {
     return self->web_data;
 }
 
 void
-exm_upgrade_result_set_web_data (ExmUpgradeResult *self,
+exm_unified_data_set_web_data (ExmUnifiedData *self,
                                  ExmSearchResult  *extension)
 {
     self->web_data = g_object_ref (extension);
 }
 
 const char *
-exm_upgrade_result_get_name (ExmUpgradeResult *self)
+exm_unified_data_get_name (ExmUnifiedData *self)
 {
     const char *name;
 
@@ -138,7 +138,7 @@ exm_upgrade_result_get_name (ExmUpgradeResult *self)
 }
 
 const char *
-exm_upgrade_result_get_creator (ExmUpgradeResult *self)
+exm_unified_data_get_creator (ExmUnifiedData *self)
 {
     const char *creator;
 
@@ -152,7 +152,7 @@ exm_upgrade_result_get_creator (ExmUpgradeResult *self)
 }
 
 const char *
-exm_upgrade_result_get_uuid (ExmUpgradeResult *self)
+exm_unified_data_get_uuid (ExmUnifiedData *self)
 {
     const char *uuid;
 
@@ -172,13 +172,13 @@ exm_upgrade_result_get_uuid (ExmUpgradeResult *self)
 }
 
 static void
-exm_upgrade_result_class_init (ExmUpgradeResultClass *klass)
+exm_unified_data_class_init (ExmUnifiedDataClass *klass)
 {
     GObjectClass *object_class = G_OBJECT_CLASS (klass);
 
-    object_class->finalize = exm_upgrade_result_finalize;
-    object_class->get_property = exm_upgrade_result_get_property;
-    object_class->set_property = exm_upgrade_result_set_property;
+    object_class->finalize = exm_unified_data_finalize;
+    object_class->get_property = exm_unified_data_get_property;
+    object_class->set_property = exm_unified_data_set_property;
 
     properties [PROP_NAME] =
         g_param_spec_string ("name", "Name", "Name", NULL, G_PARAM_READABLE);
@@ -187,7 +187,7 @@ exm_upgrade_result_class_init (ExmUpgradeResultClass *klass)
 }
 
 static void
-exm_upgrade_result_init (ExmUpgradeResult *self)
+exm_unified_data_init (ExmUnifiedData *self)
 {
     self->local_data = NULL;
     self->web_data = NULL;
diff --git a/src/exm-unified-data.h b/src/exm-unified-data.h
@@ -1,4 +1,4 @@
-/* exm-upgrade-result.h
+/* exm-unified-data.h
  *
  * Copyright 2022 Matthew Jakeman <mjakeman26@outlook.co.nz>
  *
@@ -27,33 +27,33 @@
 
 G_BEGIN_DECLS
 
-#define EXM_TYPE_UPGRADE_RESULT (exm_upgrade_result_get_type())
+#define EXM_TYPE_UNIFIED_DATA (exm_unified_data_get_type())
 
-G_DECLARE_FINAL_TYPE (ExmUpgradeResult, exm_upgrade_result, EXM, UPGRADE_RESULT, GObject)
+G_DECLARE_FINAL_TYPE (ExmUnifiedData, exm_unified_data, EXM, UNIFIED_DATA, GObject)
 
-ExmUpgradeResult *exm_upgrade_result_new (void);
+ExmUnifiedData *exm_unified_data_new (void);
 
 ExmExtension *
-exm_upgrade_result_get_local_data (ExmUpgradeResult *self);
+exm_unified_data_get_local_data (ExmUnifiedData *self);
 
 void
-exm_upgrade_result_set_local_data (ExmUpgradeResult *self,
+exm_unified_data_set_local_data (ExmUnifiedData *self,
                                    ExmExtension     *extension);
 
 ExmSearchResult *
-exm_upgrade_result_get_web_data (ExmUpgradeResult *self);
+exm_unified_data_get_web_data (ExmUnifiedData *self);
 
 void
-exm_upgrade_result_set_web_data (ExmUpgradeResult *self,
+exm_unified_data_set_web_data (ExmUnifiedData *self,
                                  ExmSearchResult  *extension);
 
 const char *
-exm_upgrade_result_get_name (ExmUpgradeResult *self);
+exm_unified_data_get_name (ExmUnifiedData *self);
 
 const char *
-exm_upgrade_result_get_creator (ExmUpgradeResult *self);
+exm_unified_data_get_creator (ExmUnifiedData *self);
 
 const char *
-exm_upgrade_result_get_uuid (ExmUpgradeResult *self);
+exm_unified_data_get_uuid (ExmUnifiedData *self);
 
 G_END_DECLS
diff --git a/src/exm-upgrade-assistant.c b/src/exm-upgrade-assistant.c
@@ -22,7 +22,7 @@
 #include "exm-upgrade-assistant.h"
 
 #include "web/exm-data-provider.h"
-#include "exm-upgrade-result.h"
+#include "exm-unified-data.h"
 
 #include <glib/gi18n.h>
 
@@ -221,12 +221,12 @@ display_results (ExmUpgradeAssistant *self)
 }
 
 static SupportStatus
-get_support_status (ExmUpgradeResult *result, const char *target_version)
+get_support_status (ExmUnifiedData *result, const char *target_version)
 {
     SupportStatus supported;
     ExmSearchResult *web_data;
 
-    web_data = exm_upgrade_result_get_web_data (result);
+    web_data = exm_unified_data_get_web_data (result);
 
     if (web_data && exm_search_result_supports_shell_version (web_data, target_version))
         supported = STATUS_SUPPORTED;
@@ -249,15 +249,15 @@ print_list_model (GListModel  *model,
 
     num_extensions = g_list_model_get_n_items (model);
     for (i = 0; i < num_extensions; i++) {
-        ExmUpgradeResult *result;
+        ExmUnifiedData *result;
         const gchar *name, *creator, *uuid, *url, *supported_text;
         SupportStatus supported;
 
         result = g_list_model_get_item (model, i);
 
-        name = exm_upgrade_result_get_name (result);
-        creator = exm_upgrade_result_get_creator (result);
-        uuid = exm_upgrade_result_get_uuid (result);
+        name = exm_unified_data_get_name (result);
+        creator = exm_unified_data_get_creator (result);
+        uuid = exm_unified_data_get_uuid (result);
 
         supported = get_support_status (result, target_shell_version);
 
@@ -341,7 +341,7 @@ copy_to_clipboard (ExmUpgradeAssistant *self)
 
 static void
 display_extension_result (ExmUpgradeAssistant *self,
-                          ExmUpgradeResult    *result,
+                          ExmUnifiedData    *result,
                           gboolean             is_user)
 {
     if (get_support_status (result, self->target_shell_version) == STATUS_SUPPORTED) {
@@ -364,7 +364,7 @@ on_extension_processed (GObject      *source,
     GError *error = NULL;
     ExmUpgradeAssistant *self;
     ExtensionCheckData *data;
-    ExmUpgradeResult *result;
+    ExmUnifiedData *result;
 
     g_return_if_fail (user_data != NULL);
 
@@ -374,12 +374,12 @@ on_extension_processed (GObject      *source,
     self->number_checked++;
     update_checked_count (self);
 
-    result = exm_upgrade_result_new ();
-    exm_upgrade_result_set_local_data (result, data->local_data);
+    result = exm_unified_data_new ();
+    exm_unified_data_set_local_data (result, data->local_data);
 
     if ((web_info = exm_data_provider_get_finish (EXM_DATA_PROVIDER (source), async_result, &error)) != FALSE)
     {
-        exm_upgrade_result_set_web_data (result, web_info);
+        exm_unified_data_set_web_data (result, web_info);
     }
 
     display_extension_result (self, result, data->is_user);
@@ -475,17 +475,17 @@ do_compatibility_check (ExmUpgradeAssistant *self)
 }
 
 static GtkWidget *
-widget_factory (ExmUpgradeResult    *result,
+widget_factory (ExmUnifiedData    *result,
                 ExmUpgradeAssistant *self)
 {
     SupportStatus supported;
     const gchar *name, *creator;
     GtkWidget *hbox, *vbox, *label, *status;
 
-    g_return_val_if_fail (EXM_IS_UPGRADE_RESULT (result), NULL);
+    g_return_val_if_fail (EXM_IS_UNIFIED_DATA (result), NULL);
 
-    name = exm_upgrade_result_get_name (result);
-    creator = exm_upgrade_result_get_creator (result);
+    name = exm_unified_data_get_name (result);
+    creator = exm_unified_data_get_creator (result);
 
     supported = get_support_status (result, self->target_shell_version);
 
@@ -542,7 +542,7 @@ bind_list_box (ExmUpgradeAssistant *self,
     g_return_if_fail (G_IS_LIST_MODEL (model));
 
     // Sort alphabetically
-    expression = gtk_property_expression_new (EXM_TYPE_UPGRADE_RESULT, NULL, "name");
+    expression = gtk_property_expression_new (EXM_TYPE_UNIFIED_DATA, NULL, "name");
     alphabetical_sorter = gtk_string_sorter_new (expression);
 
     sorted_model = gtk_sort_list_model_new (model, GTK_SORTER (alphabetical_sorter));
@@ -682,8 +682,8 @@ exm_upgrade_assistant_init (ExmUpgradeAssistant *self)
     self->data_provider = exm_data_provider_new ();
     self->target_shell_version = NULL;
 
-    self->user_results_store = g_list_store_new (EXM_TYPE_UPGRADE_RESULT);
-    self->system_results_store = g_list_store_new (EXM_TYPE_UPGRADE_RESULT);
+    self->user_results_store = g_list_store_new (EXM_TYPE_UNIFIED_DATA);
+    self->system_results_store = g_list_store_new (EXM_TYPE_UNIFIED_DATA);
     bind_list_box (self, self->user_list_box, G_LIST_MODEL (self->user_results_store));
     bind_list_box (self, self->system_list_box, G_LIST_MODEL (self->system_results_store));
 
diff --git a/src/meson.build b/src/meson.build
@@ -24,7 +24,7 @@ exm_sources = [
   # Misc
   'exm-error-dialog.c',
   'exm-upgrade-assistant.c',
-  'exm-upgrade-result.c',
+  'exm-unified-data.c',
   'exm-install-button.c',
   'exm-backtrace.c',
   'exm-utils.c'

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-/* exm-upgrade-result.c`
	`1`	`+/* exm-unified-data.c`
`2`	`2`	`*`
`3`	`3`	`* Copyright 2022 Matthew Jakeman <mjakeman26@outlook.co.nz>`
`4`	`4`	`*`
`@@ -18,17 +18,17 @@`
`18`	`18`	`* SPDX-License-Identifier: GPL-3.0-or-later`
`19`	`19`	`*/`
`20`	`20`
`21`		`-#include "exm-upgrade-result.h"`
	`21`	`+#include "exm-unified-data.h"`
`22`	`22`
`23`		`-struct _ExmUpgradeResult`
	`23`	`+struct _ExmUnifiedData`
`24`	`24`	`{`
`25`	`25`	`GObject parent_instance;`
`26`	`26`
`27`	`27`	`ExmSearchResult *web_data;`
`28`	`28`	`ExmExtension *local_data;`
`29`	`29`	`};`
`30`	`30`
`31`		`-G_DEFINE_FINAL_TYPE (ExmUpgradeResult, exm_upgrade_result, G_TYPE_OBJECT)`
	`31`	`+G_DEFINE_FINAL_TYPE (ExmUnifiedData, exm_unified_data, G_TYPE_OBJECT)`
`32`	`32`
`33`	`33`	`enum {`
`34`	`34`	`PROP_0,`
`@@ -38,51 +38,51 @@ enum {`
`38`	`38`
`39`	`39`	`static GParamSpec *properties [N_PROPS];`
`40`	`40`
`41`		`-ExmUpgradeResult *`
`42`		`-exm_upgrade_result_new (void)`
	`41`	`+ExmUnifiedData *`
	`42`	`+exm_unified_data_new (void)`
`43`	`43`	`{`
`44`		`- return g_object_new (EXM_TYPE_UPGRADE_RESULT, NULL);`
	`44`	`+ return g_object_new (EXM_TYPE_UNIFIED_DATA, NULL);`
`45`	`45`	`}`
`46`	`46`
`47`	`47`	`static void`
`48`		`-exm_upgrade_result_finalize (GObject *object)`
	`48`	`+exm_unified_data_finalize (GObject *object)`
`49`	`49`	`{`
`50`		`- ExmUpgradeResult self = (ExmUpgradeResult )object;`
	`50`	`+ ExmUnifiedData self = (ExmUnifiedData )object;`
`51`	`51`
`52`	`52`	`if (self->web_data)`
`53`	`53`	`g_object_unref (self->web_data);`
`54`	`54`
`55`	`55`	`if (self->local_data)`
`56`	`56`	`g_object_unref (self->local_data);`
`57`	`57`
`58`		`- G_OBJECT_CLASS (exm_upgrade_result_parent_class)->finalize (object);`
	`58`	`+ G_OBJECT_CLASS (exm_unified_data_parent_class)->finalize (object);`
`59`	`59`	`}`
`60`	`60`
`61`	`61`	`static void`
`62`		`-exm_upgrade_result_get_property (GObject *object,`
	`62`	`+exm_unified_data_get_property (GObject *object,`
`63`	`63`	`guint prop_id,`
`64`	`64`	`GValue *value,`
`65`	`65`	`GParamSpec *pspec)`
`66`	`66`	`{`
`67`		`- ExmUpgradeResult *self = EXM_UPGRADE_RESULT (object);`
	`67`	`+ ExmUnifiedData *self = EXM_UNIFIED_DATA (object);`
`68`	`68`
`69`	`69`	`switch (prop_id)`
`70`	`70`	`{`
`71`	`71`	`case PROP_NAME:`
`72`		`- g_value_set_string (value, exm_upgrade_result_get_name (self));`
	`72`	`+ g_value_set_string (value, exm_unified_data_get_name (self));`
`73`	`73`	`break;`
`74`	`74`	`default:`
`75`	`75`	`G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);`
`76`	`76`	`}`
`77`	`77`	`}`
`78`	`78`
`79`	`79`	`static void`
`80`		`-exm_upgrade_result_set_property (GObject *object,`
	`80`	`+exm_unified_data_set_property (GObject *object,`
`81`	`81`	`guint prop_id,`
`82`	`82`	`const GValue *value,`
`83`	`83`	`GParamSpec *pspec)`
`84`	`84`	`{`
`85`		`- ExmUpgradeResult *self = EXM_UPGRADE_RESULT (object);`
	`85`	`+ ExmUnifiedData *self = EXM_UNIFIED_DATA (object);`
`86`	`86`
`87`	`87`	`switch (prop_id)`
`88`	`88`	`{`
`@@ -92,33 +92,33 @@ exm_upgrade_result_set_property (GObject *object,`
`92`	`92`	`}`
`93`	`93`
`94`	`94`	`ExmExtension *`
`95`		`-exm_upgrade_result_get_local_data (ExmUpgradeResult *self)`
	`95`	`+exm_unified_data_get_local_data (ExmUnifiedData *self)`
`96`	`96`	`{`
`97`	`97`	`return self->local_data;`
`98`	`98`	`}`
`99`	`99`
`100`	`100`	`void`
`101`		`-exm_upgrade_result_set_local_data (ExmUpgradeResult *self,`
	`101`	`+exm_unified_data_set_local_data (ExmUnifiedData *self,`
`102`	`102`	`ExmExtension *extension)`
`103`	`103`	`{`
`104`	`104`	`self->local_data = g_object_ref (extension);`
`105`	`105`	`}`
`106`	`106`
`107`	`107`	`ExmSearchResult *`
`108`		`-exm_upgrade_result_get_web_data (ExmUpgradeResult *self)`
	`108`	`+exm_unified_data_get_web_data (ExmUnifiedData *self)`
`109`	`109`	`{`
`110`	`110`	`return self->web_data;`
`111`	`111`	`}`
`112`	`112`
`113`	`113`	`void`
`114`		`-exm_upgrade_result_set_web_data (ExmUpgradeResult *self,`
	`114`	`+exm_unified_data_set_web_data (ExmUnifiedData *self,`
`115`	`115`	`ExmSearchResult *extension)`
`116`	`116`	`{`
`117`	`117`	`self->web_data = g_object_ref (extension);`
`118`	`118`	`}`
`119`	`119`
`120`	`120`	`const char *`
`121`		`-exm_upgrade_result_get_name (ExmUpgradeResult *self)`
	`121`	`+exm_unified_data_get_name (ExmUnifiedData *self)`
`122`	`122`	`{`
`123`	`123`	`const char *name;`
`124`	`124`
`@@ -138,7 +138,7 @@ exm_upgrade_result_get_name (ExmUpgradeResult *self)`
`138`	`138`	`}`
`139`	`139`
`140`	`140`	`const char *`
`141`		`-exm_upgrade_result_get_creator (ExmUpgradeResult *self)`
	`141`	`+exm_unified_data_get_creator (ExmUnifiedData *self)`
`142`	`142`	`{`
`143`	`143`	`const char *creator;`
`144`	`144`
`@@ -152,7 +152,7 @@ exm_upgrade_result_get_creator (ExmUpgradeResult *self)`
`152`	`152`	`}`
`153`	`153`
`154`	`154`	`const char *`
`155`		`-exm_upgrade_result_get_uuid (ExmUpgradeResult *self)`
	`155`	`+exm_unified_data_get_uuid (ExmUnifiedData *self)`
`156`	`156`	`{`
`157`	`157`	`const char *uuid;`
`158`	`158`
`@@ -172,13 +172,13 @@ exm_upgrade_result_get_uuid (ExmUpgradeResult *self)`
`172`	`172`	`}`
`173`	`173`
`174`	`174`	`static void`
`175`		`-exm_upgrade_result_class_init (ExmUpgradeResultClass *klass)`
	`175`	`+exm_unified_data_class_init (ExmUnifiedDataClass *klass)`
`176`	`176`	`{`
`177`	`177`	`GObjectClass *object_class = G_OBJECT_CLASS (klass);`
`178`	`178`
`179`		`- object_class->finalize = exm_upgrade_result_finalize;`
`180`		`- object_class->get_property = exm_upgrade_result_get_property;`
`181`		`- object_class->set_property = exm_upgrade_result_set_property;`
	`179`	`+ object_class->finalize = exm_unified_data_finalize;`
	`180`	`+ object_class->get_property = exm_unified_data_get_property;`
	`181`	`+ object_class->set_property = exm_unified_data_set_property;`
`182`	`182`
`183`	`183`	`properties [PROP_NAME] =`
`184`	`184`	`g_param_spec_string ("name", "Name", "Name", NULL, G_PARAM_READABLE);`
`@@ -187,7 +187,7 @@ exm_upgrade_result_class_init (ExmUpgradeResultClass *klass)`
`187`	`187`	`}`
`188`	`188`
`189`	`189`	`static void`
`190`		`-exm_upgrade_result_init (ExmUpgradeResult *self)`
	`190`	`+exm_unified_data_init (ExmUnifiedData *self)`
`191`	`191`	`{`
`192`	`192`	`self->local_data = NULL;`
`193`	`193`	`self->web_data = NULL;`