[gnome-initial-setup/cherry-pick-51a57728] Merge branch 'wip/wjt/fix-missing-symbol-without-cheese' into 'master'
- From: Will Thompson <wjt src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnome-initial-setup/cherry-pick-51a57728] Merge branch 'wip/wjt/fix-missing-symbol-without-cheese' into 'master'
- Date: Wed, 14 Oct 2020 08:12:43 +0000 (UTC)
commit ae8e4c1cbad57ffc0741cabd99a5c36bf2576a21
Author: Will Thompson <will willthompson co uk>
Date: Wed Oct 14 08:12:27 2020 +0000
Merge branch 'wip/wjt/fix-missing-symbol-without-cheese' into 'master'
account: Always define all callbacks mentioned in .ui
Closes #114
See merge request GNOME/gnome-initial-setup!107
(cherry picked from commit 51a577286e61ac4d2bffcd797410ef4049d27ed1)
7787adbb account: Always define all callbacks mentioned in .ui
gnome-initial-setup/pages/account/um-photo-dialog.c | 8 ++++++--
1 file changed, 6 insertions(+), 2 deletions(-)
---
diff --git a/gnome-initial-setup/pages/account/um-photo-dialog.c
b/gnome-initial-setup/pages/account/um-photo-dialog.c
index 709c619d..32f90c15 100644
--- a/gnome-initial-setup/pages/account/um-photo-dialog.c
+++ b/gnome-initial-setup/pages/account/um-photo-dialog.c
@@ -158,6 +158,12 @@ cheese_camera_device_monitor_new_cb (GObject *source,
um->monitor = CHEESE_CAMERA_DEVICE_MONITOR (ret);
setup_cheese_camera_device_monitor (um);
}
+#else /* ! HAVE_CHEESE */
+static void
+webcam_icon_selected (UmPhotoDialog *um)
+{
+ g_warning ("Webcam icon selected, but compiled without Cheese support");
+}
#endif /* HAVE_CHEESE */
static void
@@ -463,9 +469,7 @@ um_photo_dialog_class_init (UmPhotoDialogClass *klass)
gtk_widget_class_bind_template_child (wclass, UmPhotoDialog, flowbox);
gtk_widget_class_bind_template_child (wclass, UmPhotoDialog, recent_pictures);
gtk_widget_class_bind_template_child (wclass, UmPhotoDialog, take_picture_button);
-#ifdef HAVE_CHEESE
gtk_widget_class_bind_template_callback (wclass, webcam_icon_selected);
-#endif
oclass->dispose = um_photo_dialog_dispose;
}
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]