diff options
| author | Guillaume Desmottes <guillaume.desmottes@collabora.co.uk> | 2011-11-28 21:07:27 +0800 |
|---|---|---|
| committer | Guillaume Desmottes <guillaume.desmottes@collabora.co.uk> | 2011-12-14 17:59:50 +0800 |
| commit | 27de0b98c6433d56b7dd4112817c49a1bca7ddce (patch) | |
| tree | 73355366e4c27b4f9bee27c0ac37c52914200926 /libempathy-gtk | |
| parent | aa802500fc09133e196a5087867a1743d3911100 (diff) | |
| download | gsoc2013-empathy-27de0b98c6433d56b7dd4112817c49a1bca7ddce.tar gsoc2013-empathy-27de0b98c6433d56b7dd4112817c49a1bca7ddce.tar.gz gsoc2013-empathy-27de0b98c6433d56b7dd4112817c49a1bca7ddce.tar.bz2 gsoc2013-empathy-27de0b98c6433d56b7dd4112817c49a1bca7ddce.tar.lz gsoc2013-empathy-27de0b98c6433d56b7dd4112817c49a1bca7ddce.tar.xz gsoc2013-empathy-27de0b98c6433d56b7dd4112817c49a1bca7ddce.tar.zst gsoc2013-empathy-27de0b98c6433d56b7dd4112817c49a1bca7ddce.zip | |
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
Diffstat (limited to 'libempathy-gtk')
| -rw-r--r-- | libempathy-gtk/empathy-individual-menu.c | 5 |
1 files changed, 3 insertions, 2 deletions
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, |