Draw no trough for color scales

[~andy/gtk] / gtk / gtkstatusicon.c

diff --git a/gtk/gtkstatusicon.c b/gtk/gtkstatusicon.c
index e6d5520d2ed395592638244ca8666ad06eecd5e2..6f7bf89824a7b48ab73f89ab1891ca91f0aee80c 100644 (file)
--- a/gtk/gtkstatusicon.c
+++ b/gtk/gtkstatusicon.c
@@ -682,7 +682,7 @@ button_callback (gpointer data)
   gdk_event_free ((GdkEvent *) bc->event);
   g_free (data);
 
-  return FALSE;
+  return G_SOURCE_REMOVE;
 }
 
 static UINT taskbar_created_msg = 0;
@@ -1625,7 +1625,7 @@ gtk_status_icon_button_press (GtkStatusIcon  *status_icon,
       emit_popup_menu_signal (status_icon, event->button, event->time);
       return TRUE;
     }
-  else if (event->button == 1 && event->type == GDK_BUTTON_PRESS)
+  else if (event->button == GDK_BUTTON_PRIMARY && event->type == GDK_BUTTON_PRESS)
     {
       emit_activate_signal (status_icon);
       return TRUE;