aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorLars Uebernickel <lars.uebernickel@canonical.com>2013-11-20 17:04:35 +0100
committerLars Uebernickel <lars.uebernickel@canonical.com>2013-11-20 17:04:35 +0100
commitf541df4bd1d88602d10566af519c5aeceb3de0b7 (patch)
tree620e95b4e48cf36f46b2688ca970c1ca898b2c35 /src
parent0ebdbd89a221f0d0ca706478084f2ff498317a3c (diff)
downloadayatana-indicator-messages-f541df4bd1d88602d10566af519c5aeceb3de0b7.tar.gz
ayatana-indicator-messages-f541df4bd1d88602d10566af519c5aeceb3de0b7.tar.bz2
ayatana-indicator-messages-f541df4bd1d88602d10566af519c5aeceb3de0b7.zip
g_action_muxer_insert: don't warn when passing a NULL action group
This is legitimate use of the API.
Diffstat (limited to 'src')
-rw-r--r--src/gactionmuxer.c5
1 files changed, 4 insertions, 1 deletions
diff --git a/src/gactionmuxer.c b/src/gactionmuxer.c
index 0f3cda4..1aae9fb 100644
--- a/src/gactionmuxer.c
+++ b/src/gactionmuxer.c
@@ -429,10 +429,13 @@ g_action_muxer_insert (GActionMuxer *muxer,
gchar **action;
g_return_if_fail (G_IS_ACTION_MUXER (muxer));
- g_return_if_fail (G_IS_ACTION_GROUP (group));
+ g_return_if_fail (group == NULL || G_IS_ACTION_GROUP (group));
g_action_muxer_remove (muxer, prefix);
+ if (group == NULL)
+ return;
+
if (prefix)
{
prefix_copy = g_strdup (prefix);