[Libreoffice-commits] core.git: Branch 'libreoffice-5-1' - vcl/unx
Caolán McNamara
caolanm at redhat.com
Wed Mar 2 16:19:04 UTC 2016
vcl/unx/gtk/gtksalmenu.cxx | 6 ++++++
1 file changed, 6 insertions(+)
New commits:
commit 90c2dffbd7c1162697e4fed5d0806d52a89fb0c8
Author: Caolán McNamara <caolanm at redhat.com>
Date: Tue Mar 1 15:49:39 2016 +0000
valgrind: fix g_variant leak
Change-Id: I6d10c7d20f9bc1dfcaa60ad89a9092fe06922074
(cherry picked from commit 9f61007bb01ac7f47fa164e4cb252a4338ee9bdc)
Reviewed-on: https://gerrit.libreoffice.org/22816
Tested-by: Jenkins <ci at libreoffice.org>
Reviewed-by: Miklos Vajna <vmiklos at collabora.co.uk>
diff --git a/vcl/unx/gtk/gtksalmenu.cxx b/vcl/unx/gtk/gtksalmenu.cxx
index a0cc977..6b977fe 100644
--- a/vcl/unx/gtk/gtksalmenu.cxx
+++ b/vcl/unx/gtk/gtksalmenu.cxx
@@ -615,13 +615,19 @@ void GtkSalMenu::NativeSetItemCommand( unsigned nSection,
if ( bIsSubmenu )
g_lo_menu_set_submenu_action_to_item_in_section( pMenu, nSection, nItemPos, aItemCommand );
else
+ {
g_lo_menu_set_action_and_target_value_to_item_in_section( pMenu, nSection, nItemPos, aItemCommand, pTarget );
+ pTarget = nullptr;
+ }
g_free( aItemCommand );
}
if ( aCurrentCommand )
g_free( aCurrentCommand );
+
+ if (pTarget)
+ g_variant_unref(pTarget);
}
GtkSalMenu* GtkSalMenu::GetMenuForItemCommand( gchar* aCommand, gboolean bGetSubmenu )
More information about the Libreoffice-commits
mailing list