src/java.desktop/unix/native/libawt_xawt/xawt/awt_Taskbar.c

@@ -149,12 +149,12 @@
 JNIEXPORT void JNICALL Java_sun_awt_X11_XTaskbarPeer_setBadge
 (JNIEnv *env, jobject obj, jlong value, jboolean visible) {
     gtk->gdk_threads_enter();
     fp_unity_launcher_entry_set_count(entry, value);
     fp_unity_launcher_entry_set_count_visible(entry, visible);
-    DbusmenuMenuitem* m;
-    if (m = fp_unity_launcher_entry_get_quicklist(entry)) {
+    DbusmenuMenuitem* m = fp_unity_launcher_entry_get_quicklist(entry);
+    if (m != NULL) {
         fp_unity_launcher_entry_set_quicklist(entry, m);
     }
     gtk->gdk_threads_leave();
 }
 

@@ -165,12 +165,12 @@
  */
 JNIEXPORT void JNICALL Java_sun_awt_X11_XTaskbarPeer_setUrgent
 (JNIEnv *env, jobject obj, jboolean urgent) {
     gtk->gdk_threads_enter();
     fp_unity_launcher_entry_set_urgent(entry, urgent);
-    DbusmenuMenuitem* m;
-    if (m = fp_unity_launcher_entry_get_quicklist(entry)) {
+    DbusmenuMenuitem* m = fp_unity_launcher_entry_get_quicklist(entry);
+    if (m != NULL) {
         fp_unity_launcher_entry_set_quicklist(entry, m);
     }
     gtk->gdk_threads_leave();
 }
 

@@ -182,12 +182,12 @@
 JNIEXPORT void JNICALL Java_sun_awt_X11_XTaskbarPeer_updateProgress
 (JNIEnv *env, jobject obj, jdouble value, jboolean visible) {
     gtk->gdk_threads_enter();
     fp_unity_launcher_entry_set_progress(entry, value);
     fp_unity_launcher_entry_set_progress_visible(entry, visible);
-    DbusmenuMenuitem* m;
-    if (m = fp_unity_launcher_entry_get_quicklist(entry)) {
+    DbusmenuMenuitem* m = fp_unity_launcher_entry_get_quicklist(entry);
+    if (m != NULL) {
         fp_unity_launcher_entry_set_quicklist(entry, m);
     }
     gtk->gdk_threads_leave();
 }