infernap12/jdk
1
0
Fork 0
mirror of https://github.com/openjdk/jdk.git synced 2026-03-04 05:00:31 +00:00
Code Issues Packages Projects Releases Wiki Activity

8153526: [Unity] Taskbar.getTaskbar().setMenu(null) doesn't remove menu

Browse Source 
Reviewed-by: ssadetsky
This commit is contained in:
Alexander Zvegintsev 2016-10-17 12:37:09 +03:00
parent 3d64738234
commit dc8408ae5b
1 changed files with 2 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
jdk/src/java.desktop/unix/native/libawt_xawt/xawt/awt_Taskbar.c
View File

@ -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);