From dc8408ae5b5a36742d1eaba07944e9bbf575fb5d Mon Sep 17 00:00:00 2001 From: Alexander Zvegintsev Date: Mon, 17 Oct 2016 12:37:09 +0300 Subject: [PATCH] 8153526: [Unity] Taskbar.getTaskbar().setMenu(null) doesn't remove menu Reviewed-by: ssadetsky --- .../unix/native/libawt_xawt/xawt/awt_Taskbar.c | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/jdk/src/java.desktop/unix/native/libawt_xawt/xawt/awt_Taskbar.c b/jdk/src/java.desktop/unix/native/libawt_xawt/xawt/awt_Taskbar.c index 210f2de4da4..9b415476f83 100644 --- a/jdk/src/java.desktop/unix/native/libawt_xawt/xawt/awt_Taskbar.c +++ b/jdk/src/java.desktop/unix/native/libawt_xawt/xawt/awt_Taskbar.c @@ -97,10 +97,7 @@ static gboolean unity_load() { void callback(DbusmenuMenuitem* mi, guint ts, jobject data) { JNIEnv* env = (JNIEnv*) JNU_GetEnv(jvm, JNI_VERSION_1_2); - (*env)->CallStaticVoidMethod(env, jTaskbarCls, jTaskbarCallback, data, - fp_dbusmenu_menuitem_property_get_int(mi, "toggle-state") - ? JNI_FALSE - : JNI_TRUE); + (*env)->CallStaticVoidMethod(env, jTaskbarCls, jTaskbarCallback, data); } /* @@ -243,10 +240,9 @@ JNIEXPORT void JNICALL Java_sun_awt_X11_XTaskbarPeer_setNativeMenu if (!menu) { menu = fp_dbusmenu_menuitem_new(); + fp_unity_launcher_entry_set_quicklist(entry, menu); } - fp_unity_launcher_entry_set_quicklist(entry, menu); - GList* list = fp_dbusmenu_menuitem_take_children(menu); gtk->g_list_free_full(list, gtk->g_object_unref);