summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorWill Thompson <will.thompson@collabora.co.uk>2011-10-11 15:54:47 +0100
committerWill Thompson <will.thompson@collabora.co.uk>2011-11-04 09:02:19 +0000
commit9b81a8da064954b714474208d2fb4e7d5cb2d6b4 (patch)
tree88d5607dac891c700b332628ef160bc34bbaab63
parent54104dac1cbfa6a13e8aba199a2043eb061e9a87 (diff)
ImFactory new_im_channel: remove redundant typecheck
By the time we get this far we can be sure that the factory really is a factory.
-rw-r--r--src/im-factory.c8
1 files changed, 2 insertions, 6 deletions
diff --git a/src/im-factory.c b/src/im-factory.c
index f481a3612..45856eef4 100644
--- a/src/im-factory.c
+++ b/src/im-factory.c
@@ -344,18 +344,14 @@ new_im_channel (GabbleImFactory *fac,
TpHandle handle,
gpointer request_token)
{
- GabbleImFactoryPrivate *priv;
- TpBaseConnection *conn;
+ GabbleImFactoryPrivate *priv = fac->priv;
+ TpBaseConnection *conn = (TpBaseConnection *) priv->conn;
GabbleIMChannel *chan;
GSList *request_tokens;
TpHandle initiator;
- g_return_val_if_fail (GABBLE_IS_IM_FACTORY (fac), NULL);
g_return_val_if_fail (handle != 0, NULL);
- priv = fac->priv;
- conn = (TpBaseConnection *) priv->conn;
-
if (request_token != NULL)
initiator = conn->self_handle;
else