[Telepathy-commits] [telepathy-salut/master] s/canceled/cancelled

[Guillaume Desmottes]

---
 lib/gibber/gibber-file-transfer.c     |    4 ++--
 lib/gibber/gibber-oob-file-transfer.c |    4 ++--
 src/salut-file-transfer-channel.c     |    8 ++++----
 3 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/lib/gibber/gibber-file-transfer.c b/lib/gibber/gibber-file-transfer.c
index 8be767c..0f15b68 100644
--- a/lib/gibber/gibber-file-transfer.c
+++ b/lib/gibber/gibber-file-transfer.c
@@ -41,7 +41,7 @@ enum
   FINISHED,
   ERROR,
   TRANSFERRED_CHUNK,
-  CANCELED,
+  CANCELLED,
   LAST_SIGNAL
 };
 
@@ -290,7 +290,7 @@ gibber_file_transfer_class_init (GibberFileTransferClass *gibber_file_transfer_c
       _gibber_signals_marshal_VOID__UINT64,
       G_TYPE_NONE, 1, G_TYPE_UINT64);
 
-  signals[CANCELED] = g_signal_new ("canceled",
+  signals[CANCELLED] = g_signal_new ("cancelled",
       G_OBJECT_CLASS_TYPE (gibber_file_transfer_class),
       G_SIGNAL_RUN_LAST | G_SIGNAL_DETAILED,
       0, NULL, NULL,
diff --git a/lib/gibber/gibber-oob-file-transfer.c b/lib/gibber/gibber-oob-file-transfer.c
index 80442ff..c231c3b 100644
--- a/lib/gibber/gibber-oob-file-transfer.c
+++ b/lib/gibber/gibber-oob-file-transfer.c
@@ -302,7 +302,7 @@ http_client_finished_chunks_cb (SoupMessage *msg,
       DEBUG ("File transfer incomplete (size is %"G_GUINT64_FORMAT
              " and only got %"G_GUINT64_FORMAT")",
              size, self->priv->transferred_bytes);
-      g_signal_emit_by_name (self, "canceled");
+      g_signal_emit_by_name (self, "cancelled");
       return;
     }
 
@@ -729,7 +729,7 @@ gibber_oob_file_transfer_received_stanza (GibberFileTransfer *ft,
       error_code_str = gibber_xmpp_node_get_attribute (error_node, "code");
       if (g_ascii_strtoll (error_code_str, NULL, 10) == 406)
         {
-          g_signal_emit_by_name (self, "canceled");
+          g_signal_emit_by_name (self, "cancelled");
           return;
         }
 
diff --git a/src/salut-file-transfer-channel.c b/src/salut-file-transfer-channel.c
index f899ab7..514ef2b 100644
--- a/src/salut-file-transfer-channel.c
+++ b/src/salut-file-transfer-channel.c
@@ -901,8 +901,8 @@ ft_finished_cb (GibberFileTransfer *ft,
 }
 
 static void
-ft_remote_canceled_cb (GibberFileTransfer *ft,
-                       SalutFileTransferChannel *self)
+ft_remote_cancelled_cb (GibberFileTransfer *ft,
+                        SalutFileTransferChannel *self)
 {
   gibber_file_transfer_cancel (ft, 406);
   salut_file_transfer_channel_set_state (
@@ -965,7 +965,7 @@ send_file_offer (SalutFileTransferChannel *self)
   g_signal_connect (ft, "remote-accepted",
       G_CALLBACK (remote_accepted_cb), self);
   g_signal_connect (ft, "error", G_CALLBACK (error_cb), self);
-  g_signal_connect (ft, "canceled", G_CALLBACK (ft_remote_canceled_cb), self);
+  g_signal_connect (ft, "cancelled", G_CALLBACK (ft_remote_cancelled_cb), self);
 
   self->priv->ft = ft;
 
@@ -1191,7 +1191,7 @@ salut_file_transfer_channel_accept_file (SalutSvcChannelTypeFileTransfer *iface,
   g_signal_connect (ft, "finished", G_CALLBACK (ft_finished_cb), self);
   g_signal_connect (ft, "transferred-chunk",
       G_CALLBACK (ft_transferred_chunk_cb), self);
-  g_signal_connect (ft, "canceled", G_CALLBACK (ft_remote_canceled_cb), self);
+  g_signal_connect (ft, "cancelled", G_CALLBACK (ft_remote_cancelled_cb), self);
 
   if (!setup_local_socket (self))
     {
-- 
1.5.6.5