about summary refs log tree commit diff stats
diff options
context:
space:
mode:
-rw-r--r--src/command/cmd_defs.c4
-rw-r--r--src/config/preferences.c2
-rw-r--r--src/config/theme.c2
-rw-r--r--src/pgp/gpg.c6
-rw-r--r--src/plugins/api.c4
-rw-r--r--src/ui/console.c8
-rw-r--r--src/ui/mucwin.c2
-rw-r--r--src/ui/window_list.c2
-rw-r--r--src/xmpp/iq.c6
-rw-r--r--src/xmpp/ox.c2
-rw-r--r--src/xmpp/xmpp.h2
11 files changed, 20 insertions, 20 deletions
diff --git a/src/command/cmd_defs.c b/src/command/cmd_defs.c
index 5058a573..e944aa66 100644
--- a/src/command/cmd_defs.c
+++ b/src/command/cmd_defs.c
@@ -1430,7 +1430,7 @@ static struct cmd_t command_defs[] = {
               "To configure presence update messages in the console, chat and chat room windows, see '/help presence'.")
       CMD_ARGS(
               { "chat on|off", "Notifications for regular chat messages." },
-              { "chat current on|off", "Whether to show regular chat message notifications when the window is focussed." },
+              { "chat current on|off", "Whether to show regular chat message notifications when the window is focused." },
               { "chat text on|off", "Show message text in regular message notifications." },
               { "room on|off", "Notifications for all chat room messages." },
               { "room mention on|off", "Notifications for chat room messages when your nick is mentioned." },
@@ -1438,7 +1438,7 @@ static struct cmd_t command_defs[] = {
               { "room mention case_insensitive", "Set room mention notifications as case insensitive." },
               { "room mention word_whole", "Set room mention notifications only on whole word match, i.e. when nickname is not part of a larger word." },
               { "room mention word_part", "Set room mention notifications on partial word match, i.e. nickname may be part of a larger word." },
-              { "room current on|off", "Whether to show all chat room messages notifications when the window is focussed." },
+              { "room current on|off", "Whether to show all chat room messages notifications when the window is focused." },
               { "room text on|off", "Show message text in chat room message notifications." },
               { "room trigger add <text>", "Notify when specified text included in all chat room messages." },
               { "room trigger remove <text>", "Remove chat room notification trigger." },
diff --git a/src/config/preferences.c b/src/config/preferences.c
index 98ac5a0d..b47d3667 100644
--- a/src/config/preferences.c
+++ b/src/config/preferences.c
@@ -183,7 +183,7 @@ _prefs_load(void)
         g_key_file_remove_key(prefs, PREF_GROUP_LOGGING, "avatar.cmd", NULL);
     }
     
-    // 0.10 will have omemo media sharing. so disabling of senfile introduced in 0.9 is not needed (#1270)
+    // 0.10 will have omemo media sharing. so disabling of sendfile introduced in 0.9 is not needed (#1270)
     if (g_key_file_has_key(prefs, PREF_GROUP_OMEMO, "sendfile", NULL)) {
         g_key_file_remove_key(prefs, PREF_GROUP_OMEMO, "sendfile", NULL);
     }
diff --git a/src/config/theme.c b/src/config/theme.c
index 404a34d3..14e9ba1f 100644
--- a/src/config/theme.c
+++ b/src/config/theme.c
@@ -721,7 +721,7 @@ theme_attrs(theme_item_t attrs)
     GString* lookup_str = g_string_new("");
     gboolean bold = FALSE;
 
-    // get forground colour
+    // get foreground colour
     switch (attrs) {
     case THEME_TEXT:
         _theme_prep_fgnd("main.text", lookup_str, &bold);
diff --git a/src/pgp/gpg.c b/src/pgp/gpg.c
index 73b985fb..bb701c3f 100644
--- a/src/pgp/gpg.c
+++ b/src/pgp/gpg.c
@@ -1169,8 +1169,8 @@ p_ox_gpg_decrypt(char* base64)
     gpgme_data_t cipher = NULL;
 
     gsize s;
-    guchar* encypted = g_base64_decode(base64, &s);
-    error = gpgme_data_new_from_mem(&cipher, (char*)encypted, s, 0);
+    guchar* encrypted = g_base64_decode(base64, &s);
+    error = gpgme_data_new_from_mem(&cipher, (char*)encrypted, s, 0);
     if (error != 0) {
         log_error("GpgME Error gpgme_data_new_from_mem: %s", gpgme_strerror(error));
         return NULL;
@@ -1215,7 +1215,7 @@ p_ox_gpg_decrypt(char* base64)
  * 
  * Only one key in the file.
  *
- * \param filename filname to read the file.
+ * \param filename filename to read the file.
  * \param key result with base64 encode key or NULL
  * \param fp result with the fingerprint or NULL
  *
diff --git a/src/plugins/api.c b/src/plugins/api.c
index 26d78a6e..ee5ceb77 100644
--- a/src/plugins/api.c
+++ b/src/plugins/api.c
@@ -688,7 +688,7 @@ api_room_set_titlebar_enctext(const char* const roomjid, const char* const encte
 
     ProfMucWin* mucwin = wins_get_muc(roomjid);
     if (mucwin == NULL) {
-        log_warning("%s", "api_room_set_titlebar_enctext failed, coudl not find room window for %s", roomjid);
+        log_warning("%s", "api_room_set_titlebar_enctext failed, could not find room window for %s", roomjid);
         return 0;
     }
 
@@ -707,7 +707,7 @@ api_room_unset_titlebar_enctext(const char* const roomjid)
 
     ProfMucWin* mucwin = wins_get_muc(roomjid);
     if (mucwin == NULL) {
-        log_warning("%s", "api_room_unset_titlebar_enctext failed, coudl not find room window for %s", roomjid);
+        log_warning("%s", "api_room_unset_titlebar_enctext failed, could not find room window for %s", roomjid);
         return 0;
     }
 
diff --git a/src/ui/console.c b/src/ui/console.c
index 306b13d5..e35e4350 100644
--- a/src/ui/console.c
+++ b/src/ui/console.c
@@ -1850,10 +1850,10 @@ void
 cons_winpos_setting(void)
 {
     ProfWinPlacement* placement = prefs_get_win_placement();
-    cons_show("Title bar postion (/titlebar)       : %d", placement->titlebar_pos);
-    cons_show("Main window postion (/mainwin)      : %d", placement->mainwin_pos);
-    cons_show("Status bar postion (/statusbar)     : %d", placement->statusbar_pos);
-    cons_show("Input window postion (/inputwin)    : %d", placement->inputwin_pos);
+    cons_show("Title bar position (/titlebar)       : %d", placement->titlebar_pos);
+    cons_show("Main window position (/mainwin)      : %d", placement->mainwin_pos);
+    cons_show("Status bar position (/statusbar)     : %d", placement->statusbar_pos);
+    cons_show("Input window position (/inputwin)    : %d", placement->inputwin_pos);
     prefs_free_win_placement(placement);
 }
 
diff --git a/src/ui/mucwin.c b/src/ui/mucwin.c
index b89a990f..104d0564 100644
--- a/src/ui/mucwin.c
+++ b/src/ui/mucwin.c
@@ -450,7 +450,7 @@ _mucwin_print_triggers(ProfWin* window, const char* const message, GList* trigge
             continue;
         }
 
-        // found, repace vars if earlier than previous
+        // found, replace vars if earlier than previous
         int trigger_pos = trigger_ptr - message_lower;
         if (first_trigger_pos == -1 || trigger_pos < first_trigger_pos) {
             first_trigger_pos = trigger_pos;
diff --git a/src/ui/window_list.c b/src/ui/window_list.c
index c9ae8ba9..475a8867 100644
--- a/src/ui/window_list.c
+++ b/src/ui/window_list.c
@@ -528,7 +528,7 @@ wins_close_by_num(int i)
 
         ProfWin* window = wins_get_by_num(i);
         if (window) {
-            // cancel upload proccesses of this window
+            // cancel upload processes of this window
             http_upload_cancel_processes(window);
 
             switch (window->type) {
diff --git a/src/xmpp/iq.c b/src/xmpp/iq.c
index 07acdf14..d1797a72 100644
--- a/src/xmpp/iq.c
+++ b/src/xmpp/iq.c
@@ -875,7 +875,7 @@ _caps_response_id_handler(xmpp_stanza_t* const stanza, void* const userdata)
         log_debug("Valid SHA-1 hash found: %s", given_sha1);
 
         if (caps_cache_contains(given_sha1)) {
-            log_debug("Capabilties already cached: %s", given_sha1);
+            log_debug("Capabilities already cached: %s", given_sha1);
         } else {
             log_debug("Capabilities not cached: %s, storing", given_sha1);
             EntityCapabilities* capabilities = stanza_create_caps_from_query_element(query);
@@ -1003,7 +1003,7 @@ _caps_response_legacy_id_handler(xmpp_stanza_t* const stanza, void* const userda
     if (g_strcmp0(expected_node, node) == 0) {
         log_debug("Legacy capabilities, nodes match %s", node);
         if (caps_cache_contains(node)) {
-            log_debug("Capabilties already cached: %s", node);
+            log_debug("Capabilities already cached: %s", node);
         } else {
             log_debug("Capabilities not cached: %s, storing", node);
             EntityCapabilities* capabilities = stanza_create_caps_from_query_element(query);
@@ -1015,7 +1015,7 @@ _caps_response_legacy_id_handler(xmpp_stanza_t* const stanza, void* const userda
 
         // node match fail
     } else {
-        log_info("Legacy Capabilities nodes do not match, expeceted %s, given %s.", expected_node, node);
+        log_info("Legacy Capabilities nodes do not match, expected %s, given %s.", expected_node, node);
     }
 
     return 0;
diff --git a/src/xmpp/ox.c b/src/xmpp/ox.c
index e8b579d4..e083ad12 100644
--- a/src/xmpp/ox.c
+++ b/src/xmpp/ox.c
@@ -262,7 +262,7 @@ _ox_metadata_node__public_key(const char* const fingerprint)
 static int
 _ox_metadata_result(xmpp_conn_t* const conn, xmpp_stanza_t* const stanza, void* const userdata)
 {
-    log_debug("OX: Processing result %s's meatadata.", (char*)userdata);
+    log_debug("OX: Processing result %s's metadata.", (char*)userdata);
 
     if (g_strcmp0(xmpp_stanza_get_type(stanza), "result") != 0) {
         cons_show("OX: Error:");
diff --git a/src/xmpp/xmpp.h b/src/xmpp/xmpp.h
index 9bd72aec..e368b683 100644
--- a/src/xmpp/xmpp.h
+++ b/src/xmpp/xmpp.h
@@ -96,7 +96,7 @@ typedef struct bookmark_t
     char* password;
     char* name;
     gboolean autojoin;
-    int ext_gajim_minimize; //0 - non existant, 1 - true, 2 - false
+    int ext_gajim_minimize; //0 - non existent, 1 - true, 2 - false
 } Bookmark;
 
 typedef struct disco_identity_t