@@ -211,9 +211,8 @@ fn on_btn_clicked(param: &[glib::Value]) -> Option<glib::Value> {
211
211
let widget = param[ 0 ] . get :: < gtk:: Button > ( ) . unwrap ( ) ;
212
212
let name = widget. widget_name ( ) ;
213
213
214
- let builder_ref = unsafe { & G_HELLO_WINDOW . as_ref ( ) . unwrap ( ) . builder } ;
215
- let stack: & gtk:: Stack = & builder_ref. object ( "stack" ) . unwrap ( ) ;
216
- stack. set_visible_child_name ( & format ! ( "{name}page" ) ) ;
214
+ let child_name = format ! ( "{name}page" ) ;
215
+ unsafe { G_HELLO_WINDOW . as_ref ( ) . unwrap ( ) . set_stack_child_visible ( & child_name) } ;
217
216
218
217
None
219
218
}
@@ -222,11 +221,10 @@ fn on_link_clicked(param: &[glib::Value]) -> Option<glib::Value> {
222
221
let widget = param[ 0 ] . get :: < gtk:: Widget > ( ) . unwrap ( ) ;
223
222
let name = widget. widget_name ( ) ;
224
223
225
- let window_ref = unsafe { & G_HELLO_WINDOW . as_ref ( ) . unwrap ( ) . window } ;
226
224
let preferences = unsafe { G_HELLO_WINDOW . as_ref ( ) . unwrap ( ) . get_preferences ( "urls" ) } ;
227
225
228
226
let uri = preferences[ name. as_str ( ) ] . as_str ( ) . unwrap ( ) ;
229
- let _ = gtk :: show_uri_on_window ( Some ( window_ref ) , uri, 0 ) ;
227
+ unsafe { G_HELLO_WINDOW . as_ref ( ) . unwrap ( ) . open_uri ( uri) } ;
230
228
231
229
None
232
230
}
@@ -235,11 +233,10 @@ fn on_link1_clicked(param: &[glib::Value]) -> Option<glib::Value> {
235
233
let widget = param[ 0 ] . get :: < gtk:: Widget > ( ) . unwrap ( ) ;
236
234
let name = widget. widget_name ( ) ;
237
235
238
- let window_ref = unsafe { & G_HELLO_WINDOW . as_ref ( ) . unwrap ( ) . window } ;
239
236
let preferences = unsafe { G_HELLO_WINDOW . as_ref ( ) . unwrap ( ) . get_preferences ( "urls" ) } ;
240
237
241
238
let uri = preferences[ name. as_str ( ) ] . as_str ( ) . unwrap ( ) ;
242
- let _ = gtk :: show_uri_on_window ( Some ( window_ref ) , uri, 0 ) ;
239
+ unsafe { G_HELLO_WINDOW . as_ref ( ) . unwrap ( ) . open_uri ( uri) } ;
243
240
244
241
Some ( false . to_value ( ) )
245
242
}
0 commit comments