[Xfce4-commits] [xfce/xfce4-panel] 01/01: systray: Don't lookup hash table for null keys (Bug #11929)

[noreply at xfce.org]

This is an automated email from the git hooks/post-receive script.

o   c   h   o   s   i       p   u   s   h   e   d       a       c   o   m   m   i   t       t   o       b   r   a   n   c   h       m   a   s   t   e   r   
   in repository xfce/xfce4-panel.

commit 4de1909f476f394074470464e4088a347c3fdeff
Author: Viktor Odintsev <ninetls at xfce.org>
Date:   Sun Aug 20 15:47:12 2017 +0300

    systray: Don't lookup hash table for null keys (Bug #11929)
    
    This is a small regression of the implementation of reordering systray
    items, hence the same bug report is referenced.
---
 plugins/systray/systray-box.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/plugins/systray/systray-box.c b/plugins/systray/systray-box.c
index 0ca7ffd..686c727 100644
--- a/plugins/systray/systray-box.c
+++ b/plugins/systray/systray-box.c
@@ -715,9 +715,9 @@ systray_box_compare_function (gconstpointer a,
   name_a = systray_socket_get_name (XFCE_SYSTRAY_SOCKET (a));
   name_b = systray_socket_get_name (XFCE_SYSTRAY_SOCKET (b));
 
-  if (g_hash_table_lookup_extended (box->names_ordered, name_a, NULL, &value))
+  if (name_a != NULL && g_hash_table_lookup_extended (box->names_ordered, name_a, NULL, &value))
     index_a = GPOINTER_TO_INT (value);
-  if (g_hash_table_lookup_extended (box->names_ordered, name_b, NULL, &value))
+  if (name_b != NULL && g_hash_table_lookup_extended (box->names_ordered, name_b, NULL, &value))
     index_b = GPOINTER_TO_INT (value);
 
   /* sort ordered icons before unordered ones */

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.