From 27de0b98c6433d56b7dd4112817c49a1bca7ddce Mon Sep 17 00:00:00 2001 From: Guillaume Desmottes Date: Mon, 28 Nov 2011 14:07:27 +0100 Subject: individual-menu: allow priv->store to be NULL We already checks if it's a IndividualStoreChannel before using it so that's safe. https://bugzilla.gnome.org/show_bug.cgi?id=665038 --- libempathy-gtk/empathy-individual-menu.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'libempathy-gtk') diff --git a/libempathy-gtk/empathy-individual-menu.c b/libempathy-gtk/empathy-individual-menu.c index e19fde3dd..2882a9e45 100644 --- a/libempathy-gtk/empathy-individual-menu.c +++ b/libempathy-gtk/empathy-individual-menu.c @@ -60,7 +60,7 @@ typedef struct { FolksIndividual *individual; /* owned */ EmpathyIndividualFeatureFlags features; - EmpathyIndividualStore *store; + EmpathyIndividualStore *store; /* may be NULL */ } EmpathyIndividualMenuPriv; enum { @@ -705,7 +705,8 @@ empathy_individual_menu_new (FolksIndividual *individual, EmpathyIndividualStore *store) { g_return_val_if_fail (FOLKS_IS_INDIVIDUAL (individual), NULL); - g_return_val_if_fail (EMPATHY_IS_INDIVIDUAL_STORE (store), NULL); + g_return_val_if_fail (store == NULL || + EMPATHY_IS_INDIVIDUAL_STORE (store), NULL); g_return_val_if_fail (features != EMPATHY_INDIVIDUAL_FEATURE_NONE, NULL); return g_object_new (EMPATHY_TYPE_INDIVIDUAL_MENU, -- cgit v1.2.3