aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGuillaume Desmottes <guillaume.desmottes@collabora.co.uk>2010-03-19 22:34:25 +0800
committerGuillaume Desmottes <guillaume.desmottes@collabora.co.uk>2010-03-29 23:36:24 +0800
commitb8cc8019e97c48c259c04e100443f2ce526a821c (patch)
tree62375dcc2c54f24b904aa2607db85457c467b8d1
parent66d8d07abade96645aca23d9c0dd526a9ed5481c (diff)
downloadgsoc2013-empathy-b8cc8019e97c48c259c04e100443f2ce526a821c.tar
gsoc2013-empathy-b8cc8019e97c48c259c04e100443f2ce526a821c.tar.gz
gsoc2013-empathy-b8cc8019e97c48c259c04e100443f2ce526a821c.tar.bz2
gsoc2013-empathy-b8cc8019e97c48c259c04e100443f2ce526a821c.tar.lz
gsoc2013-empathy-b8cc8019e97c48c259c04e100443f2ce526a821c.tar.xz
gsoc2013-empathy-b8cc8019e97c48c259c04e100443f2ce526a821c.tar.zst
gsoc2013-empathy-b8cc8019e97c48c259c04e100443f2ce526a821c.zip
coding style fixes
-rw-r--r--src/empathy-call-window.c11
1 files changed, 5 insertions, 6 deletions
diff --git a/src/empathy-call-window.c b/src/empathy-call-window.c
index e984d4060..0d6cf1ce4 100644
--- a/src/empathy-call-window.c
+++ b/src/empathy-call-window.c
@@ -1705,8 +1705,6 @@ empathy_call_window_get_video_sink_pad (EmpathyCallWindow *self)
priv->funnel = NULL;
return NULL;
-
-
}
/* Called with global lock held */
@@ -1755,7 +1753,7 @@ empathy_call_window_get_audio_sink_pad (EmpathyCallWindow *self)
filter = gst_parse_bin_from_description (
"audioconvert ! audioresample ! audioconvert", TRUE, &gerror);
- if (!filter)
+ if (filter == NULL)
{
g_warning ("Could not make audio conversion filter: %s", gerror->message);
g_clear_error (&gerror);
@@ -1783,7 +1781,7 @@ empathy_call_window_get_audio_sink_pad (EmpathyCallWindow *self)
pad = gst_element_get_static_pad (filter, "sink");
- if (!pad)
+ if (pad == NULL)
{
g_warning ("Could not get sink pad from filter");
goto error_filter;
@@ -1816,11 +1814,12 @@ empathy_call_window_get_audio_sink_pad (EmpathyCallWindow *self)
error_add_liveadder:
- if (priv->liveadder)
+ if (priv->liveadder != NULL)
{
gst_object_unref (priv->liveadder);
priv->liveadder = NULL;
}
+
return NULL;
}
@@ -2121,7 +2120,7 @@ empathy_call_window_src_added_cb (EmpathyCallHandler *handler,
g_assert_not_reached ();
}
- if (!pad)
+ if (pad == NULL)
goto out;
if (GST_PAD_LINK_FAILED (gst_pad_link (src, pad)))