Skip to content

Commit c7bd6c3

Browse files
committed
🧹 window: dont expose raw prefs
1 parent 51e1021 commit c7bd6c3

File tree

2 files changed

+6
-6
lines changed

2 files changed

+6
-6
lines changed

‎src/main.rs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -223,7 +223,7 @@ fn on_link_clicked(param: &[glib::Value]) -> Option<glib::Value> {
223223
let name = widget.widget_name();
224224

225225
let window_ref = unsafe { &G_HELLO_WINDOW.as_ref().unwrap().window };
226-
let preferences = unsafe { &G_HELLO_WINDOW.as_ref().unwrap().preferences["urls"] };
226+
let preferences = unsafe { G_HELLO_WINDOW.as_ref().unwrap().get_preferences("urls") };
227227

228228
let uri = preferences[name.as_str()].as_str().unwrap();
229229
let _ = gtk::show_uri_on_window(Some(window_ref), uri, 0);
@@ -236,7 +236,7 @@ fn on_link1_clicked(param: &[glib::Value]) -> Option<glib::Value> {
236236
let name = widget.widget_name();
237237

238238
let window_ref = unsafe { &G_HELLO_WINDOW.as_ref().unwrap().window };
239-
let preferences = unsafe { &G_HELLO_WINDOW.as_ref().unwrap().preferences["urls"] };
239+
let preferences = unsafe { G_HELLO_WINDOW.as_ref().unwrap().get_preferences("urls") };
240240

241241
let uri = preferences[name.as_str()].as_str().unwrap();
242242
let _ = gtk::show_uri_on_window(Some(window_ref), uri, 0);
@@ -246,7 +246,7 @@ fn on_link1_clicked(param: &[glib::Value]) -> Option<glib::Value> {
246246

247247
fn on_delete_window(_param: &[glib::Value]) -> Option<glib::Value> {
248248
let saved_json = &*G_SAVE_JSON.lock().unwrap();
249-
let preferences = unsafe { &G_HELLO_WINDOW.as_ref().unwrap().preferences["save_path"] };
249+
let preferences = unsafe { G_HELLO_WINDOW.as_ref().unwrap().get_preferences("save_path") };
250250
write_json(preferences.as_str().unwrap(), saved_json);
251251

252252
Some(false.to_value())

‎src/window.rs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ use unic_langid::LanguageIdentifier;
1717
pub struct HelloWindow {
1818
pub builder: gtk::Builder,
1919
pub window: gtk::Window,
20-
pub preferences: serde_json::Value,
20+
preferences: serde_json::Value,
2121
}
2222

2323
impl HelloWindow {
@@ -295,8 +295,8 @@ impl HelloWindow {
295295
}
296296
}
297297

298-
fn get_preferences(&self) -> &serde_json::Value {
299-
&self.preferences
298+
pub fn get_preferences(&self, entry: &str) -> &serde_json::Value {
299+
&self.preferences[entry]
300300
}
301301
}
302302

0 commit comments

Comments
 (0)