diff options
| -rw-r--r-- | libempathy/empathy-dispatcher.c | 3 | ||||
| -rw-r--r-- | libempathy/empathy-ft-handler.c | 27 |
2 files changed, 7 insertions, 23 deletions
diff --git a/libempathy/empathy-dispatcher.c b/libempathy/empathy-dispatcher.c index b8a185fed..04e248d2d 100644 --- a/libempathy/empathy-dispatcher.c +++ b/libempathy/empathy-dispatcher.c @@ -756,8 +756,7 @@ dispatcher_connection_got_all (TpProxy *proxy, free_find_channel_request (request); } - if (requests) - g_list_free (requests); + g_list_free (requests); g_hash_table_remove (priv->outstanding_classes_requests, proxy); } diff --git a/libempathy/empathy-ft-handler.c b/libempathy/empathy-ft-handler.c index 9286e5646..d515c86f3 100644 --- a/libempathy/empathy-ft-handler.c +++ b/libempathy/empathy-ft-handler.c @@ -460,34 +460,19 @@ empathy_ft_handler_init (EmpathyFTHandler *self) static void hash_data_free (HashingData *data) { - if (data->buffer != NULL) - { - g_free (data->buffer); - data->buffer = NULL; - } + g_free (data->buffer); if (data->stream != NULL) - { - g_object_unref (data->stream); - data->stream = NULL; - } + g_object_unref (data->stream); if (data->checksum != NULL) - { - g_checksum_free (data->checksum); - data->checksum = NULL; - } + g_checksum_free (data->checksum); if (data->error != NULL) - { - g_error_free (data->error); - data->error = NULL; - } + g_error_free (data->error); + if (data->handler != NULL) - { - g_object_unref (data->handler); - data->handler = NULL; - } + g_object_unref (data->handler); g_slice_free (HashingData, data); } |