SHA256
1
0
forked from pool/nemo

Accepting request 624430 from X11:Cinnamon:Factory

OBS-URL: https://build.opensuse.org/request/show/624430
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/nemo?expand=0&rev=27
This commit is contained in:
Dominique Leuenberger 2018-07-22 21:05:49 +00:00 committed by Git OBS Bridge
commit 1e15fb69e8
5 changed files with 20 additions and 11 deletions

View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:d9397d7d67e9e45011273ff73c1ce9f7b9586ff6d7dbda4f143601b6387ac29d
size 1424841

3
nemo-3.8.5.tar.gz Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:cc5fa5f9ce7781297c6dd00ce2e30b6dfaa0498794dbab74dc0c995ca0a05b9c
size 1424948

View File

@ -1,15 +1,16 @@
--- a/eel/eel-gtk-extensions.c --- a/eel/eel-gtk-extensions.c
+++ b/eel/eel-gtk-extensions.c +++ b/eel/eel-gtk-extensions.c
@@ -287,7 +287,12 @@ eel_pop_up_context_menu (GtkMenu *menu, @@ -285,9 +285,13 @@ eel_pop_up_context_menu (GtkMenu *menu,
button = 0; button = 0;
} }
+#if GTK_CHECK_VERSION (3, 22, 0) +#if GTK_CHECK_VERSION (3, 22, 0)
if (button > 0) {
gtk_menu_popup_at_pointer (menu, (GdkEvent *) event); gtk_menu_popup_at_pointer (menu, (GdkEvent *) event);
} else {
+#else +#else
+ gtk_menu_popup (menu, NULL, NULL, NULL, NULL, + if (TRUE) {
+ button, event ? event->time : GDK_CURRENT_TIME);
+#endif +#endif
gtk_menu_popup (menu, /* menu */
g_object_ref_sink (menu); NULL, /* parent_menu_shell */
g_object_unref (menu); NULL, /* parent_menu_item */

View File

@ -1,3 +1,11 @@
-------------------------------------------------------------------
Fri Jul 20 09:32:54 UTC 2018 - sor.alexei@meowr.ru
- Update to version 3.8.5:
* eel-gtk-extensions.c: Fix menu popups when a valid event is not
provided.
- Rebase nemo-gtk-3.20.patch.
------------------------------------------------------------------- -------------------------------------------------------------------
Thu Jul 5 13:05:25 UTC 2018 - sor.alexei@meowr.ru Thu Jul 5 13:05:25 UTC 2018 - sor.alexei@meowr.ru

View File

@ -20,7 +20,7 @@
%define sover 1 %define sover 1
%define typelib typelib-1_0-Nemo-3_0 %define typelib typelib-1_0-Nemo-3_0
Name: nemo Name: nemo
Version: 3.8.4 Version: 3.8.5
Release: 0 Release: 0
Summary: File browser for Cinnamon Summary: File browser for Cinnamon
License: GPL-2.0-or-later License: GPL-2.0-or-later