diff options
Diffstat (limited to 'gtk/gtkactionhelper.c')
| -rw-r--r-- | gtk/gtkactionhelper.c | 18 |
1 files changed, 12 insertions, 6 deletions
diff --git a/gtk/gtkactionhelper.c b/gtk/gtkactionhelper.c index c5f4356b2b..8e4fa8fa06 100644 --- a/gtk/gtkactionhelper.c +++ b/gtk/gtkactionhelper.c @@ -147,12 +147,18 @@ gtk_action_helper_action_added (GtkActionHelper *helper, if (!helper->can_activate) { - g_warning ("%s: action %s can't be activated due to parameter type mismatch " - "(parameter type %s, target type %s)", - "actionhelper", - helper->action_name, - parameter_type ? g_variant_type_peek_string (parameter_type) : "NULL", - helper->target ? g_variant_get_type_string (helper->target) : "NULL"); + /* If target is null, just treat it as being disabled, otherwise + warn about the incorrect type. */ + if (helper->target != NULL) + { + g_warning ("%s: action %s can't be activated due to parameter type mismatch " + "(parameter type %s, target type %s)", + "actionhelper", + helper->action_name, + parameter_type ? g_variant_type_peek_string (parameter_type) : "NULL", + g_variant_get_type_string (helper->target)); + } + return; } |