diff options
| author | Will Thompson <will.thompson@collabora.co.uk> | 2008-11-18 16:00:24 +0000 |
|---|---|---|
| committer | Will Thompson <will.thompson@collabora.co.uk> | 2008-11-18 16:00:24 +0000 |
| commit | 6a9297f28cf496352a457f251627c33876f98e59 (patch) | |
| tree | 3225797be15ce16d0aaf754cf2e3056bd3f12b83 /src/im-factory.c | |
| parent | 9c1db1a587751fc3896c594f47e65bd82849c5bd (diff) | |
| parent | 99d02aca906087861dfab9dd4dde252957d53386 (diff) | |
Merge branch 'master' into messages
Diffstat (limited to 'src/im-factory.c')
| -rw-r--r-- | src/im-factory.c | 12 |
1 files changed, 2 insertions, 10 deletions
diff --git a/src/im-factory.c b/src/im-factory.c index fb762e17f..e81e5b61e 100644 --- a/src/im-factory.c +++ b/src/im-factory.c @@ -304,11 +304,6 @@ im_channel_closed_cb (GabbleIMChannel *chan, gpointer user_data) DEBUG ("%p, channel %p", self, chan); - g_object_get (chan, - "handle", &contact_handle, - "channel-destroyed", &really_destroyed, - NULL); - tp_channel_manager_emit_channel_closed_for_object (self, (TpExportableChannel *) chan); @@ -520,8 +515,6 @@ gabble_im_factory_requestotron (GabbleImFactory *self, gboolean require_new) { TpBaseConnection *base_conn = (TpBaseConnection *) self->priv->conn; - TpHandleRepoIface *contact_repo = tp_base_connection_get_handles ( - base_conn, TP_HANDLE_TYPE_CONTACT); TpHandle handle; GError *error = NULL; TpExportableChannel *channel; @@ -534,11 +527,10 @@ gabble_im_factory_requestotron (GabbleImFactory *self, TP_IFACE_CHANNEL ".TargetHandleType", NULL) != TP_HANDLE_TYPE_CONTACT) return FALSE; + /* validity already checked by TpBaseConnection */ handle = tp_asv_get_uint32 (request_properties, TP_IFACE_CHANNEL ".TargetHandle", NULL); - - if (!tp_handle_is_valid (contact_repo, handle, &error)) - goto error; + g_assert (handle != 0); if (tp_channel_manager_asv_has_unknown_properties (request_properties, im_channel_fixed_properties, im_channel_allowed_properties, |