about summary refs log tree commit diff stats
diff options
context:
space:
mode:
authorJames Booth <boothj5@gmail.com>2016-09-27 20:32:48 +0100
committerJames Booth <boothj5@gmail.com>2016-09-27 20:32:48 +0100
commit51fd812d476f4dd4f90357606a096c867c9b29b4 (patch)
treeef97d53fa3b9cccd412e278d80b96d4f48d0f20f
parentb087f84d955e867b579523a7e4eb33588bfa9b2f (diff)
parent4b2f9448f70f9b4b4441f8b52fe69266e9aaf808 (diff)
downloadprofani-tty-51fd812d476f4dd4f90357606a096c867c9b29b4.tar.gz
Merge remote-tracking branch 'jacksgt/fix-spelling-errors'
-rw-r--r--src/command/cmd_funcs.c4
-rw-r--r--src/otr/otrlibv4.c2
-rw-r--r--src/ui/notifier.c2
3 files changed, 4 insertions, 4 deletions
diff --git a/src/command/cmd_funcs.c b/src/command/cmd_funcs.c
index d79b713c..fba45d93 100644
--- a/src/command/cmd_funcs.c
+++ b/src/command/cmd_funcs.c
@@ -6486,7 +6486,7 @@ cmd_pgp(ProfWin *window, const char *const command, gchar **args)
         }
 
         chatwin->pgp_send = TRUE;
-        ui_current_print_formatted_line('!', 0, "PGP encyption enabled.");
+        ui_current_print_formatted_line('!', 0, "PGP encryption enabled.");
         return TRUE;
     }
 
@@ -6509,7 +6509,7 @@ cmd_pgp(ProfWin *window, const char *const command, gchar **args)
         }
 
         chatwin->pgp_send = FALSE;
-        ui_current_print_formatted_line('!', 0, "PGP encyption disabled.");
+        ui_current_print_formatted_line('!', 0, "PGP encryption disabled.");
         return TRUE;
     }
 
diff --git a/src/otr/otrlibv4.c b/src/otr/otrlibv4.c
index ab39e81c..af41baed 100644
--- a/src/otr/otrlibv4.c
+++ b/src/otr/otrlibv4.c
@@ -120,7 +120,7 @@ cb_handle_msg_event(void *opdata, OtrlMessageEvent msg_event,
             ui_handle_otr_error(context->username, "OTR: Policy requires encryption, but attempting to send an unencrypted message.");
             break;
         case OTRL_MSGEVENT_ENCRYPTION_ERROR:
-             ui_handle_otr_error(context->username, "OTR: Error occured while encrypting a message, message not sent.");
+             ui_handle_otr_error(context->username, "OTR: Error occurred while encrypting a message, message not sent.");
             break;
         case OTRL_MSGEVENT_CONNECTION_ENDED:
             ui_handle_otr_error(context->username, "OTR: Message not sent because contact has ended the private conversation.");
diff --git a/src/ui/notifier.c b/src/ui/notifier.c
index 4c7bc8df..c2be3be7 100644
--- a/src/ui/notifier.c
+++ b/src/ui/notifier.c
@@ -140,7 +140,7 @@ notify_subscription(const char *const from)
 {
     GString *message = g_string_new("Subscription request: \n");
     g_string_append(message, from);
-    notify(message->str, 10000, "Incomming message");
+    notify(message->str, 10000, "Incoming message");
     g_string_free(message, TRUE);
 }