From 8b4793f5f97afef54c7b9a718168fe5892649759 Mon Sep 17 00:00:00 2001
From: CentOS Sources <bugs@centos.org>
Date: Nov 26 2020 14:10:07 +0000
Subject: import cheese-3.28.0-3.el8


---

diff --git a/SOURCES/cheese-3.28.0-fix-accelerators.patch b/SOURCES/cheese-3.28.0-fix-accelerators.patch
index 6d325ec..62e6246 100644
--- a/SOURCES/cheese-3.28.0-fix-accelerators.patch
+++ b/SOURCES/cheese-3.28.0-fix-accelerators.patch
@@ -1,50 +1,49 @@
-From 0b1b07980f621184dfa6c11a8eab25badd72cdf1 Mon Sep 17 00:00:00 2001
+From 446da7884914d471ce50f8b327edddbaf0d75ccb Mon Sep 17 00:00:00 2001
 From: esoleyman <emil@soleyman.com>
-Date: Fri, 24 May 2019 15:27:47 -0500
-Subject: [PATCH] Replace deprecated functions
+Date: Fri, 24 May 2019 15:25:02 -0500
+Subject: [PATCH] Fix the accelerators
 
-The thumbnail menu popup functions were updated to match GTK
+The thumbnail view did not allow users to execute commands such as open,
+save as, trash, or delete for one or more photo / video thumbnails using
+keyboard shortcuts such as ctrl+o, ctrl+s, etc...
 
 https://gitlab.gnome.org/GNOME/cheese/issues/9
 ---
- src/cheese-window.vala | 13 +++++--------
- 1 file changed, 5 insertions(+), 8 deletions(-)
+ src/cheese-application.vala | 2 +-
+ src/cheese-window.vala      | 7 +++++++
+ 2 files changed, 8 insertions(+), 1 deletion(-)
 
+diff --git a/src/cheese-application.vala b/src/cheese-application.vala
+index c4542be0..f46f3165 100644
+--- a/src/cheese-application.vala
++++ b/src/cheese-application.vala
+@@ -116,7 +116,7 @@ public class Cheese.Application : Gtk.Application
+             Environment.set_application_name (_("Cheese"));
+             Window.set_default_icon_name ("org.gnome.Cheese");
+ 
+-            this.add_accelerator ("space", "app.shoot", null);
++            this.set_accels_for_action ("app.shoot", {"space"});
+ 
+             // FIXME: Push these into the main window initialization.
+             main_window.setup_ui ();
 diff --git a/src/cheese-window.vala b/src/cheese-window.vala
-index 25df09e7..ff069808 100644
+index 09879fc5..25df09e7 100644
 --- a/src/cheese-window.vala
 +++ b/src/cheese-window.vala
-@@ -149,16 +149,14 @@ public class Cheese.MainWindow : Gtk.ApplicationWindow
-         return false;
-     }
- 
--    private void do_thumb_view_popup_menu (Gtk.Widget widget,
--                                           uint button,
--                                           uint time)
-+    private void do_thumb_view_popup_menu ()
-     {
--        thumbnail_popup.popup (null, widget, null, button, time);
-+        thumbnail_popup.popup_at_pointer (null);
-     }
+@@ -1312,6 +1312,13 @@ public class Cheese.MainWindow : Gtk.ApplicationWindow
  
--    private bool on_thumb_view_popup_menu (Gtk.Widget thumbview)
-+    private bool on_thumb_view_popup_menu ()
-     {
--        do_thumb_view_popup_menu (thumbview, 0, 0);
-+        do_thumb_view_popup_menu ();
+         var menu = application.get_menu_by_id ("thumbview-menu");
+         thumbnail_popup = new Gtk.Menu.from_model (menu);
++        
++        application.set_accels_for_action ("app.quit", {"<Primary>q"});
++        application.set_accels_for_action ("app.fullscreen", {"F11"});
++        application.set_accels_for_action ("win.file-open", {"<Primary>o"});
++        application.set_accels_for_action ("win.file-saveas", {"<Primary>s"});
++        application.set_accels_for_action ("win.file-trash", {"Delete"});
++        application.set_accels_for_action ("win.file-delete", {"<Shift>Delete"});
  
-         return true;
-     }
-@@ -195,8 +193,7 @@ public class Cheese.MainWindow : Gtk.ApplicationWindow
+         this.add_action_entries (actions, this);
  
-             if (button_press->triggers_context_menu ())
-             {
--                do_thumb_view_popup_menu (thumb_view, event.button,
--                                          event.time);
-+                do_thumb_view_popup_menu ();
-                 return true;
-             }
-         }
 -- 
 GitLab
 
diff --git a/SPECS/cheese.spec b/SPECS/cheese.spec
index 24289b9..0c432c9 100644
--- a/SPECS/cheese.spec
+++ b/SPECS/cheese.spec
@@ -1,7 +1,7 @@
 Name:           cheese
 Epoch:          2
 Version:        3.28.0
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Application for taking pictures and movies from a webcam
 
 License:        GPLv2+
@@ -120,6 +120,9 @@ desktop-file-validate %{buildroot}%{_datadir}/applications/org.gnome.Cheese.desk
 
 
 %changelog
+* Wed Nov 25 2020 David King <dking@redhat.com> - 2:3.28.0-3
+- Fix keyboard accelerator patch (#1625735)
+
 * Tue Oct 20 2020 David King <dking@redhat.com> - 2:3.28.0-2
 - Fix keyboard accelerators (#1625735)