aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--libempathy/empathy-dispatcher.c4
-rw-r--r--libempathy/empathy-ft-factory.c4
-rw-r--r--libempathy/empathy-ft-handler.c26
-rw-r--r--libempathy/empathy-tp-file.c10
-rw-r--r--src/empathy-ft-manager.c4
5 files changed, 24 insertions, 24 deletions
diff --git a/libempathy/empathy-dispatcher.c b/libempathy/empathy-dispatcher.c
index 28364d554..b8a185fed 100644
--- a/libempathy/empathy-dispatcher.c
+++ b/libempathy/empathy-dispatcher.c
@@ -758,7 +758,7 @@ dispatcher_connection_got_all (TpProxy *proxy,
if (requests)
g_list_free (requests);
-
+
g_hash_table_remove (priv->outstanding_classes_requests, proxy);
}
}
@@ -1469,7 +1469,7 @@ empathy_dispatcher_find_channel_class_async (EmpathyDispatcher *dispatcher,
g_return_if_fail (TP_IS_CONNECTION (connection));
g_return_if_fail (channel_type != NULL);
g_return_if_fail (handle_type != 0);
-
+
/* append another request for this connection */
request = g_slice_new0 (FindChannelRequest);
request->dispatcher = dispatcher;
diff --git a/libempathy/empathy-ft-factory.c b/libempathy/empathy-ft-factory.c
index c64ef305b..7e19973aa 100644
--- a/libempathy/empathy-ft-factory.c
+++ b/libempathy/empathy-ft-factory.c
@@ -18,7 +18,7 @@
*
* Author: Cosimo Cecchi <cosimo.cecchi@collabora.co.uk>
*/
-
+
/* empathy-ft-factory.c */
#include <glib.h>
@@ -162,7 +162,7 @@ ft_handler_incoming_ready_cb (EmpathyFTHandler *handler,
*
* Return value: an #EmpathyFTFactory object
*/
-EmpathyFTFactory*
+EmpathyFTFactory *
empathy_ft_factory_dup_singleton (void)
{
return g_object_new (EMPATHY_TYPE_FT_FACTORY, NULL);
diff --git a/libempathy/empathy-ft-handler.c b/libempathy/empathy-ft-handler.c
index bd789ff29..4f37206ad 100644
--- a/libempathy/empathy-ft-handler.c
+++ b/libempathy/empathy-ft-handler.c
@@ -18,7 +18,7 @@
*
* Author: Cosimo Cecchi <cosimo.cecchi@collabora.co.uk>
*/
-
+
/* empathy-ft-handler.c */
#include <glib.h>
@@ -63,7 +63,7 @@
* will be emitted before or after the transfer, depending on the direction
* (respectively outgoing and incoming) of the handler.
* At any time between the call to empathy_ft_handler_start_transfer() and
- * the last signal, a ::transfer-error can be emitted, indicating that an
+ * the last signal, a ::transfer-error can be emitted, indicating that an
* error has happened in the operation. The message of the error is localized
* to use in an UI.
*/
@@ -177,7 +177,7 @@ do_get_property (GObject *object,
static void
do_set_property (GObject *object,
- guint property_id,
+ guint property_id,
const GValue *value,
GParamSpec *pspec)
{
@@ -244,7 +244,7 @@ do_dispose (GObject *object)
g_object_unref (priv->dispatcher);
priv->dispatcher = NULL;
}
-
+
G_OBJECT_CLASS (empathy_ft_handler_parent_class)->dispose (object);
}
@@ -386,7 +386,7 @@ empathy_ft_handler_class_init (EmpathyFTHandlerClass *klass)
* to be completed
* @speed: the current speed of the transfer (in KB/s)
*
- * This signal is emitted to notify clients of the progress of the
+ * This signal is emitted to notify clients of the progress of the
* transfer.
*/
signals[TRANSFER_PROGRESS] =
@@ -418,8 +418,8 @@ empathy_ft_handler_class_init (EmpathyFTHandlerClass *klass)
* @current_bytes: the bytes currently hashed
* @total_bytes: the total bytes of the handler
*
- * This signal is emitted to notify clients of the progress of the
- * hashing operation.
+ * This signal is emitted to notify clients of the progress of the
+ * hashing operation.
*/
signals[HASHING_PROGRESS] =
g_signal_new ("hashing-progress", G_TYPE_FROM_CLASS (klass),
@@ -561,7 +561,7 @@ ft_transfer_operation_callback (EmpathyTpFile *tp_file,
{
emit_error_signal (handler, error);
}
- else
+ else
{
priv->is_completed = TRUE;
g_signal_emit (handler, signals[TRANSFER_DONE], 0, tp_file);
@@ -777,7 +777,7 @@ hash_job_done (gpointer user_data)
value = tp_g_value_slice_new_string
(g_checksum_get_string (hash_data->checksum));
g_hash_table_insert (priv->request,
- TP_IFACE_CHANNEL_TYPE_FILE_TRANSFER ".ContentHash", value);
+ TP_IFACE_CHANNEL_TYPE_FILE_TRANSFER ".ContentHash", value);
}
cleanup:
@@ -973,7 +973,7 @@ find_channel_class_cb (GStrv channel_class,
static void
ft_handler_complete_request (EmpathyFTHandler *handler)
-{
+{
EmpathyFTHandlerPriv *priv = GET_PRIV (handler);
TpConnection *connection;
@@ -1041,7 +1041,7 @@ out:
callbacks_data_free (cb_data);
}
-static void
+static void
contact_factory_contact_cb (EmpathyTpContactFactory *factory,
EmpathyContact *contact,
const GError *error,
@@ -1420,7 +1420,7 @@ empathy_ft_handler_is_incoming (EmpathyFTHandler *handler)
if (priv->tpfile == NULL)
return FALSE;
- return empathy_tp_file_is_incoming (priv->tpfile);
+ return empathy_tp_file_is_incoming (priv->tpfile);
}
/**
@@ -1492,7 +1492,7 @@ empathy_ft_handler_is_completed (EmpathyFTHandler *handler)
* Returns whether the transfer for @handler has been cancelled or has stopped
* due to an error.
*
- * Return value: %TRUE if the transfer for @handler has been cancelled
+ * Return value: %TRUE if the transfer for @handler has been cancelled
* or has stopped due to an error, %FALSE otherwise.
*/
gboolean
diff --git a/libempathy/empathy-tp-file.c b/libempathy/empathy-tp-file.c
index 6a2887251..bf9a6da20 100644
--- a/libempathy/empathy-tp-file.c
+++ b/libempathy/empathy-tp-file.c
@@ -290,7 +290,7 @@ static GError *
error_from_state_change_reason (TpFileTransferStateChangeReason reason)
{
const char *string;
- GError *retval;
+ GError *retval = NULL;
string = NULL;
@@ -333,7 +333,7 @@ tp_file_state_changed_cb (TpChannel *proxy,
GObject *weak_object)
{
EmpathyTpFilePriv *priv = GET_PRIV (weak_object);
- GError *error;
+ GError *error = NULL;
if (state == priv->state)
return;
@@ -526,7 +526,7 @@ channel_closed_cb (TpChannel *proxy,
if (priv->cancellable != NULL &&
!g_cancellable_is_cancelled (priv->cancellable) && cancel)
- g_cancellable_cancel (priv->cancellable);
+ g_cancellable_cancel (priv->cancellable);
}
static void
@@ -655,7 +655,7 @@ do_constructor (GType type,
file_obj = G_OBJECT_CLASS (empathy_tp_file_parent_class)->constructor (type,
n_props, props);
-
+
tp_file = EMPATHY_TP_FILE (file_obj);
priv = GET_PRIV (tp_file);
@@ -856,7 +856,7 @@ empathy_tp_file_is_incoming (EmpathyTpFile *tp_file)
EmpathyTpFilePriv *priv;
g_return_val_if_fail (EMPATHY_IS_TP_FILE (tp_file), FALSE);
-
+
priv = GET_PRIV (tp_file);
return priv->incoming;
diff --git a/src/empathy-ft-manager.c b/src/empathy-ft-manager.c
index 7b3e88a24..b4f74ec89 100644
--- a/src/empathy-ft-manager.c
+++ b/src/empathy-ft-manager.c
@@ -281,7 +281,7 @@ ft_manager_format_progress_bytes_and_percentage (guint64 current,
if (percentage != NULL)
{
- if (total != 0)
+ if (total != 0)
*percentage = current * 100 / total;
else
*percentage = -1;
@@ -896,7 +896,7 @@ ft_manager_delete_event_cb (GtkWidget *widget,
/* There is still FTs on flight, just hide the window */
DEBUG ("Hiding window");
gtk_widget_hide (widget);
- return TRUE;
+ return TRUE;
}
return FALSE;
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-05 19:43:27 +0800