--- src/main.c	2008-11-20 19:58:37.000000000 -0400
+++ src/main2.c	2008-11-23 17:30:49.000000000 -0400
@@ -694,18 +694,21 @@
 status_icon_clicked(GtkStatusIcon *status_icon, gpointer user_data)
 {
   /* Check what type of click was recieved */
-  GdkEvent* current_event = gtk_get_current_event();
+  GdkModifierType state;
+  gtk_get_current_event_state(&state);
   /* Control click */
-  if (current_event->button.state == (GDK_MOD2_MASK | GDK_CONTROL_MASK))
+  if (state == GDK_MOD2_MASK+GDK_CONTROL_MASK || state == GDK_CONTROL_MASK)
   {
-    if (!actions_lock)
+    if (actions_lock == FALSE)
+    {
       g_timeout_add(POPUP_DELAY, show_actions_menu, NULL);
+    }
   }
   /* Normal click */
   else
+  {
     g_timeout_add(POPUP_DELAY, show_history_menu, NULL);
-  /* Free the event */
-  gdk_event_free(current_event);
+  }
 }
 
 /* Called when history global hotkey is pressed */