garcon: fix issues 10967, 12700

https://bugzilla.xfce.org/show_bug.cgi?id=10967
https://bugzilla.xfce.org/show_bug.cgi?id=12700

+59 -1
+14
pkgs/desktops/xfce/core/garcon-10967.patch
··· 1 + diff -urNZ a/garcon-gtk/garcon-gtk-menu.c b/garcon-gtk/garcon-gtk-menu.c 2 + --- a/garcon-gtk/garcon-gtk-menu.c 2017-11-16 19:22:33.551926068 +0000 3 + +++ b/garcon-gtk/garcon-gtk-menu.c 2017-11-16 19:23:33.055497211 +0000 4 + @@ -676,6 +676,9 @@ 5 + G_CALLBACK (garcon_gtk_menu_deactivate), menu); 6 + gtk_widget_show (mi); 7 + 8 + + /* submenu are child items, too. */ 9 + + has_children = TRUE; 10 + + 11 + if (menu->priv->show_menu_icons) 12 + { 13 + icon_name = garcon_menu_element_get_icon_name (li->data); 14 + Binary files a/.git/index and b/.git/index differ
+44
pkgs/desktops/xfce/core/garcon-12700.patch
··· 1 + From 222080e6d5fce85eb2a8a5c33df671bd9f21add8 Mon Sep 17 00:00:00 2001 2 + From: Yegor Timoshenko <yegortimoshenko@gmail.com> 3 + Date: Thu, 14 Dec 2017 22:04:04 +0000 4 + Subject: [PATCH] Decrement allocation counter on item unref (#12700) 5 + 6 + --- 7 + garcon/garcon-menu-item-pool.c | 7 ++++++- 8 + garcon/garcon-menu-item.c | 2 ++ 9 + 2 files changed, 8 insertions(+), 1 deletion(-) 10 + 11 + diff --git a/garcon/garcon-menu-item-pool.c b/garcon/garcon-menu-item-pool.c 12 + index 2017180..355e520 100644 13 + --- a/garcon/garcon-menu-item-pool.c 14 + +++ b/garcon/garcon-menu-item-pool.c 15 + @@ -191,7 +191,12 @@ garcon_menu_item_pool_filter_exclude (const gchar *desktop_id, 16 + g_return_val_if_fail (GARCON_IS_MENU_ITEM (item), FALSE); 17 + g_return_val_if_fail (node != NULL, FALSE); 18 + 19 + - return garcon_menu_node_tree_rule_matches (node, item); 20 + + gboolean matches = garcon_menu_node_tree_rule_matches (node, item); 21 + + 22 + + if (matches) 23 + + garcon_menu_item_increment_allocated (item); 24 + + 25 + + return matches; 26 + } 27 + 28 + 29 + diff --git a/garcon/garcon-menu-item.c b/garcon/garcon-menu-item.c 30 + index 66a86bf..d61c88f 100644 31 + --- a/garcon/garcon-menu-item.c 32 + +++ b/garcon/garcon-menu-item.c 33 + @@ -1516,6 +1516,8 @@ garcon_menu_item_unref (GarconMenuItem *item) 34 + { 35 + g_return_if_fail (GARCON_IS_MENU_ITEM (item)); 36 + 37 + + garcon_menu_item_decrement_allocated (item); 38 + + 39 + /* Decrement the reference counter */ 40 + g_object_unref (G_OBJECT (item)); 41 + } 42 + -- 43 + 2.15.1 44 +
+1 -1
pkgs/desktops/xfce/core/garcon.nix
··· 13 13 }; 14 14 15 15 outputs = [ "out" "dev" ]; 16 + patches = [ ./garcon-10967.patch ./garcon-12700.patch ]; 16 17 17 18 nativeBuildInputs = [ pkgconfig ]; 18 19 buildInputs = [ intltool glib libxfce4util gtk libxfce4ui ]; ··· 24 25 platforms = platforms.linux; 25 26 }; 26 27 } 27 -