Updating branch refs/heads/master
to 30f7bafb370cf1b281c87fbc662e853820194c2a (commit)
from 4bded49a31e58b85305d176490d8e08f7a5408da (commit)
commit 30f7bafb370cf1b281c87fbc662e853820194c2a
Author: Nick Schermer <[email protected]>
Date: Tue Jan 4 23:01:46 2011 +0100
Small fix in previous commit.
I always fail to see why this function does not accept NULL...
libxfce4kbd-private/xfce-shortcuts-provider.c | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/libxfce4kbd-private/xfce-shortcuts-provider.c
b/libxfce4kbd-private/xfce-shortcuts-provider.c
index 061c1fe..528503d 100644
--- a/libxfce4kbd-private/xfce-shortcuts-provider.c
+++ b/libxfce4kbd-private/xfce-shortcuts-provider.c
@@ -253,7 +253,7 @@ xfce_shortcuts_provider_register (XfceShortcutsProvider
*provider)
if (G_UNLIKELY (!already_registered))
{
- names = g_new0 (gchar *, g_strv_length (provider_names) + 2);
+ names = g_new0 (gchar *, (provider_names != NULL ? g_strv_length
(provider_names) : 0) + 2);
i = 0;
if (provider_names != NULL)
_______________________________________________
Xfce4-commits mailing list
[email protected]
http://foo-projects.org/mailman/listinfo/xfce4-commits
