diff options
| author | Emilio Pozuelo Monfort <emilio.pozuelo@collabora.co.uk> | 2011-08-30 17:37:29 +0800 |
|---|---|---|
| committer | Emilio Pozuelo Monfort <emilio.pozuelo@collabora.co.uk> | 2011-08-30 17:46:10 +0800 |
| commit | 5cdfd1e0d6c5df35f07530b9cdcdbd6c74d33247 (patch) | |
| tree | 004c9b1bde73865be562d044ca090830680549c2 | |
| parent | 44f6461a975b9b2e309fae4ff052eb12df99704a (diff) | |
| download | gsoc2013-empathy-5cdfd1e0d6c5df35f07530b9cdcdbd6c74d33247.tar gsoc2013-empathy-5cdfd1e0d6c5df35f07530b9cdcdbd6c74d33247.tar.gz gsoc2013-empathy-5cdfd1e0d6c5df35f07530b9cdcdbd6c74d33247.tar.bz2 gsoc2013-empathy-5cdfd1e0d6c5df35f07530b9cdcdbd6c74d33247.tar.lz gsoc2013-empathy-5cdfd1e0d6c5df35f07530b9cdcdbd6c74d33247.tar.xz gsoc2013-empathy-5cdfd1e0d6c5df35f07530b9cdcdbd6c74d33247.tar.zst gsoc2013-empathy-5cdfd1e0d6c5df35f07530b9cdcdbd6c74d33247.zip | |
CallWindow: don't spit unnecessary criticals
There's no guarantee that an actor has an allocation all the time,
so gracefully handle the case when it doesn't.
https://bugzilla.gnome.org/show_bug.cgi?id=656911
| -rw-r--r-- | src/empathy-call-window.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/empathy-call-window.c b/src/empathy-call-window.c index 0fd81ee04..dac9b6462 100644 --- a/src/empathy-call-window.c +++ b/src/empathy-call-window.c @@ -707,8 +707,8 @@ empathy_call_window_get_preview_position (EmpathyCallWindow *self, ClutterGeometry box; PreviewPosition pos = PREVIEW_POS_NONE; - g_return_val_if_fail (clutter_actor_has_allocation (self->priv->video_box), - pos); + if (!clutter_actor_has_allocation (self->priv->video_box)) + return pos; clutter_actor_get_geometry (self->priv->video_box, &box); |