From 91611193293bda1fc76d1d95ffc1bbca40fe5ce3 Mon Sep 17 00:00:00 2001
From: Matthias Clasen <mclasen@redhat.com>
Date: Tue, 31 Jan 2012 00:39:00 -0500
Subject: [PATCH] No popup menu on the button

---
 gtk/gtkcolorswatch.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/gtk/gtkcolorswatch.c b/gtk/gtkcolorswatch.c
index bf5edf654d..4211f60a97 100644
--- a/gtk/gtkcolorswatch.c
+++ b/gtk/gtkcolorswatch.c
@@ -451,7 +451,8 @@ swatch_button_press (GtkWidget      *widget,
 
   gtk_widget_grab_focus (GTK_WIDGET (swatch));
 
-  if (gdk_event_triggers_context_menu ((GdkEvent *) event))
+  if (gdk_event_triggers_context_menu ((GdkEvent *) event) &&
+      swatch->priv->has_color)
     {
       do_popup (widget, event);
       return TRUE;