diff options
author | Lars Uebernickel <lars.uebernickel@canonical.com> | 2013-11-20 20:09:25 +0000 |
---|---|---|
committer | Tarmac <Unknown> | 2013-11-20 20:09:25 +0000 |
commit | 64bad031bda168d637489bdaef45aaf8c726dd68 (patch) | |
tree | b22ee1cf85dae0a32f2a1360cfdd8e144eec9f74 /src/gactionmuxer.c | |
parent | 0ebdbd89a221f0d0ca706478084f2ff498317a3c (diff) | |
parent | 0daa47af4401f10c58016437ab05d5cc57a2f50d (diff) | |
download | ayatana-indicator-messages-64bad031bda168d637489bdaef45aaf8c726dd68.tar.gz ayatana-indicator-messages-64bad031bda168d637489bdaef45aaf8c726dd68.tar.bz2 ayatana-indicator-messages-64bad031bda168d637489bdaef45aaf8c726dd68.zip |
Stop showing expected warnings in the actionmuxer test.
Approved by Charles Kerr, PS Jenkins bot.
Diffstat (limited to 'src/gactionmuxer.c')
-rw-r--r-- | src/gactionmuxer.c | 5 |
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); |