From 94a3c35e225d7322747ba4eeab58c50082211d9b Mon Sep 17 00:00:00 2001
From: Ashley Wulber <ashley@system76.com>
Date: Thu, 18 Jan 2024 21:19:18 -0500
Subject: [PATCH] fix: use the correct version of app list config

---
 cosmic-app-list/src/app.rs    | 14 ++++++++------
 cosmic-app-list/src/config.rs |  2 +-
 cosmic-app-list/src/main.rs   |  5 ++---
 3 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/cosmic-app-list/src/app.rs b/cosmic-app-list/src/app.rs
index 34c859c2..57b8c176 100755
--- a/cosmic-app-list/src/app.rs
+++ b/cosmic-app-list/src/app.rs
@@ -398,7 +398,7 @@ impl cosmic::Application for CosmicAppList {
         core: cosmic::app::Core,
         _flags: Self::Flags,
     ) -> (Self, iced::Command<cosmic::app::Message<Self::Message>>) {
-        let config = Config::new(APP_ID, 1)
+        let config = Config::new(APP_ID, AppListConfig::VERSION)
             .ok()
             .and_then(|c| AppListConfig::get_entry(&c).ok())
             .unwrap_or_default();
@@ -485,14 +485,16 @@ impl cosmic::Application for CosmicAppList {
                 }
 
                 self.config
-                    .add_favorite(id, &Config::new(APP_ID, 1).unwrap());
+                    .add_favorite(id, &Config::new(APP_ID, AppListConfig::VERSION).unwrap());
                 if let Some((popup_id, _toplevel)) = self.popup.take() {
                     return destroy_popup(popup_id);
                 }
             }
             Message::UnFavorite(id) => {
-                self.config
-                    .remove_favorite(id.clone(), &Config::new(APP_ID, 1).unwrap());
+                self.config.remove_favorite(
+                    id.clone(),
+                    &Config::new(APP_ID, AppListConfig::VERSION).unwrap(),
+                );
                 if let Some(i) = self
                     .favorite_list
                     .iter()
@@ -555,7 +557,7 @@ impl cosmic::Application for CosmicAppList {
                             let t = self.favorite_list.remove(pos);
                             self.config.remove_favorite(
                                 t.desktop_info.id.clone(),
-                                &Config::new(APP_ID, 1).unwrap(),
+                                &Config::new(APP_ID, AppListConfig::VERSION).unwrap(),
                             );
                             Some((true, t))
                         } else {
@@ -706,7 +708,7 @@ impl cosmic::Application for CosmicAppList {
                             .iter()
                             .map(|dock_item| dock_item.desktop_info.id.clone())
                             .collect(),
-                        &Config::new(APP_ID, 1).unwrap(),
+                        &Config::new(APP_ID, AppListConfig::VERSION).unwrap(),
                     );
                 }
                 return finish_dnd();
diff --git a/cosmic-app-list/src/config.rs b/cosmic-app-list/src/config.rs
index c5025e1b..5b34acc7 100644
--- a/cosmic-app-list/src/config.rs
+++ b/cosmic-app-list/src/config.rs
@@ -3,7 +3,6 @@ use cosmic::cosmic_config::{self, Config, CosmicConfigEntry};
 use serde::{Deserialize, Serialize};
 use std::fmt::Debug;
 pub const APP_ID: &str = "com.system76.CosmicAppList";
-pub const VERSION: &str = "0.1.0";
 
 #[derive(Debug, Clone, Deserialize, Serialize, Default, PartialEq, Eq)]
 pub enum TopLevelFilter {
@@ -13,6 +12,7 @@ pub enum TopLevelFilter {
 }
 
 #[derive(Debug, Clone, Default, Deserialize, Serialize, PartialEq, Eq, CosmicConfigEntry)]
+#[version = 1]
 pub struct AppListConfig {
     pub filter_top_levels: Option<TopLevelFilter>,
     pub favorites: Vec<String>,
diff --git a/cosmic-app-list/src/main.rs b/cosmic-app-list/src/main.rs
index e46afc57..ad175a8e 100644
--- a/cosmic-app-list/src/main.rs
+++ b/cosmic-app-list/src/main.rs
@@ -10,14 +10,13 @@ use log::info;
 
 use localize::localize;
 
-use crate::config::{APP_ID, VERSION};
+pub const VERSION: &str = env!("CARGO_PKG_VERSION");
 
 fn main() -> cosmic::iced::Result {
     // Initialize logger
     tracing_subscriber::fmt::init();
     let _ = tracing_log::LogTracer::init();
-    info!("Iced Workspaces Applet ({})", APP_ID);
-    info!("Version: {}", VERSION);
+    info!("Iced Workspaces Applet ({VERSION})");
     // Prepare i18n
     localize();