bump glib/gtk versions (#16)

Author: davidmhewitt

examples/Cargo.toml

@@ -4,7 +4,7 @@ version = "0.1.0"
 edition = "2021"
 
 [dependencies]
-glib-macros = "0.19"
+glib-macros = "0.20"
 once_cell = "1.17.1"
 
 [dependencies.granite]
@@ -13,11 +13,11 @@ path = "../granite"
 features = ["v7_1"]
 
 [dependencies.glib]
-version = "0.19"
+version = "0.20"
 
 [dependencies.gio]
-version = "0.19"
+version = "0.20"
 
 [dependencies.gtk]
 package = "gtk4"
-version = "0.8"
+version = "0.9"

examples/src/css_view.rs

@@ -221,17 +221,19 @@ mod imp {
 
             obj.append(&scrolled);
 
-            primary_color_button.connect_color_set(
-                glib::clone!(@weak obj => move |primary_color_button| {
+            primary_color_button.connect_color_set(glib::clone!(
+                #[weak]
+                obj,
+                move |primary_color_button| {
                     granite::widgets_utils_set_color_primary(
                         &obj.window(),
                         &mut primary_color_button.rgba(),
                         gtk::STYLE_PROVIDER_PRIORITY_APPLICATION
                             .try_into()
                             .expect("Unable to convert style provider priority"),
                     );
-                }),
-            );
+                }
+            ));
         }
     }
     impl WidgetImpl for CssView {}

examples/src/date_time_picker_view.rs

@@ -110,12 +110,20 @@ mod imp {
             self.relative_datetime.set(Some(&relative_datetime));
 
             obj.set_selected_datetime();
-            date_picker.connect_changed(glib::clone!(@weak obj => move |_| {
-                obj.set_selected_datetime();
-            }));
-            time_picker.connect_changed(glib::clone!(@weak obj => move |_| {
-                obj.set_selected_datetime();
-            }));
+            date_picker.connect_changed(glib::clone!(
+                #[weak]
+                obj,
+                move |_| {
+                    obj.set_selected_datetime();
+                }
+            ));
+            time_picker.connect_changed(glib::clone!(
+                #[weak]
+                obj,
+                move |_| {
+                    obj.set_selected_datetime();
+                }
+            ));
 
             obj.attach(&pickers_label, 0, 0, 1, 1);
             obj.attach(&date_label, 0, 1, 1, 1);

examples/src/dialogs_view.rs

@@ -68,7 +68,11 @@ mod imp {
 
             obj.imp().toast.set(toast).expect("Unable to set toast");
 
-            dialog_button.connect_clicked(clone!(@weak obj => move |_| obj.show_dialog()));
+            dialog_button.connect_clicked(clone!(
+                #[weak]
+                obj,
+                move |_| obj.show_dialog()
+            ));
         }
     }
     impl WidgetImpl for DialogsView {}
@@ -92,15 +96,19 @@ impl DialogsView {
     fn show_dialog(&self) {
         let dialog = SampleDialog::new();
         dialog.set_transient_for(Some(&self.window()));
-        dialog.connect_response(
-            clone!(@strong dialog, @weak self as view => move |_, resp| {
+        dialog.connect_response(clone!(
+            #[strong]
+            dialog,
+            #[weak(rename_to = view)]
+            self,
+            move |_, resp| {
                 if resp == gtk::ResponseType::Accept {
                     view.toast().send_notification();
                 }
 
                 dialog.close();
-            }),
-        );
+            }
+        ));
 
         dialog.show();
     }

examples/src/main.rs

@@ -84,11 +84,13 @@ fn build_ui(app: &Application) {
 
     window.present();
 
-    granite_settings.connect_prefers_color_scheme_notify(
-        clone!(@weak gtk_settings => move |granite_settings| {
+    granite_settings.connect_prefers_color_scheme_notify(clone!(
+        #[weak]
+        gtk_settings,
+        move |granite_settings| {
             gtk_settings.set_gtk_application_prefer_dark_theme(
                 granite_settings.prefers_color_scheme() == granite::SettingsColorScheme::Dark,
             );
-        }),
-    );
+        }
+    ));
 }

examples/src/settings_view/settings_page.rs

@@ -43,9 +43,13 @@ mod imp {
 
             obj.set_child(&content_area);
 
-            title_entry.connect_changed(clone!(@weak obj as settings_page => move |title_entry| {
-                settings_page.set_title(&title_entry.text());
-            }));
+            title_entry.connect_changed(clone!(
+                #[weak(rename_to = settings_page)]
+                obj,
+                move |title_entry| {
+                    settings_page.set_title(&title_entry.text());
+                }
+            ));
         }
     }
     impl WidgetImpl for SettingsPage {}

examples/src/settings_view/simple_settings_page.rs

@@ -64,27 +64,41 @@ mod imp {
 
             obj.update_status();
 
-            description_entry.connect_changed(
-                clone!(@weak obj as settings_page => move |desc_entry| {
+            description_entry.connect_changed(clone!(
+                #[weak(rename_to = settings_page)]
+                obj,
+                move |desc_entry| {
                     settings_page.set_description(&desc_entry.text());
-                }),
-            );
-
-            icon_entry.connect_changed(clone!(@weak obj as settings_page => move |icon_entry| {
-                settings_page.set_icon_name(Some(&icon_entry.text()));
-            }));
-
-            title_entry.connect_changed(clone!(@weak obj as settings_page => move |title_entry| {
-                settings_page.set_title(&title_entry.text());
-            }));
+                }
+            ));
+
+            icon_entry.connect_changed(clone!(
+                #[weak(rename_to = settings_page)]
+                obj,
+                move |icon_entry| {
+                    settings_page.set_icon_name(Some(&icon_entry.text()));
+                }
+            ));
+
+            title_entry.connect_changed(clone!(
+                #[weak(rename_to = settings_page)]
+                obj,
+                move |title_entry| {
+                    settings_page.set_title(&title_entry.text());
+                }
+            ));
 
             obj.status_switch()
                 .expect("Couldn't get status switch")
                 .connect_notify_local(
                     Some("active"),
-                    clone!(@weak obj as settings_page => move |_, _| {
-                        settings_page.update_status();
-                    }),
+                    clone!(
+                        #[weak(rename_to = settings_page)]
+                        obj,
+                        move |_, _| {
+                            settings_page.update_status();
+                        }
+                    ),
                 );
         }
     }

examples/src/welcome_view.rs

@@ -153,10 +153,14 @@ mod test {
         let main_loop = glib::MainLoop::new(None, false);
         glib::timeout_add(
             std::time::Duration::from_millis(ms as u64),
-            glib::clone!(@strong main_loop => move || {
-                main_loop.quit();
-                glib::ControlFlow::Break
-            }),
+            glib::clone!(
+                #[strong]
+                main_loop,
+                move || {
+                    main_loop.quit();
+                    glib::ControlFlow::Break
+                }
+            ),
         );
 
         main_loop.run();