diff options
| -rw-r--r-- | examples/cm/contactlist/contact-list.c | 8 | ||||
| -rw-r--r-- | telepathy-glib/base-client.c | 2 |
2 files changed, 7 insertions, 3 deletions
diff --git a/examples/cm/contactlist/contact-list.c b/examples/cm/contactlist/contact-list.c index 36fa74f40..a23d18651 100644 --- a/examples/cm/contactlist/contact-list.c +++ b/examples/cm/contactlist/contact-list.c @@ -838,8 +838,12 @@ receive_auth_request (ExampleContactList *self, g_message ("From server: %s has cancelled their publish request", tp_handle_inspect (self->priv->contact_repo, contact)); - d->publish = FALSE; - d->pre_approved = FALSE; + if (d) + { + d->publish = FALSE; + d->pre_approved = FALSE; + } + g_hash_table_remove (self->priv->publish_requests, GUINT_TO_POINTER (contact)); tp_handle_set_add (self->priv->cancelled_publish_requests, contact); diff --git a/telepathy-glib/base-client.c b/telepathy-glib/base-client.c index dbe153f6f..600f29211 100644 --- a/telepathy-glib/base-client.c +++ b/telepathy-glib/base-client.c @@ -2604,7 +2604,7 @@ _tp_base_client_add_request (TpSvcClientInterfaceRequests *iface, { TpBaseClient *self = TP_BASE_CLIENT (iface); TpChannelRequest *request; - TpAccount *account; + TpAccount *account = NULL; GError *error = NULL; channel_request_prepare_account_ctx *ctx; GArray *account_features; |