From 6c5d983f134ae32eeecb1dd7011e9c955b1bf541 Mon Sep 17 00:00:00 2001
From: Michael Vetter <jubalh@iodoru.org>
Date: Thu, 28 Apr 2022 19:29:27 +0200
Subject: [PATCH] Rename stamp preference variable

PREF_INCOMING_STR -> PREF_INCOMING_STAMP
PREF_OUTGOING_STR -> PREF_OUTGOING_STAMP
---
 src/command/cmd_funcs.c  | 12 ++++++------
 src/config/preferences.c | 12 ++++++------
 src/config/preferences.h |  4 ++--
 src/ui/window.c          |  2 +-
 src/xmpp/roster_list.c   |  2 +-
 5 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/src/command/cmd_funcs.c b/src/command/cmd_funcs.c
index 39fc087a..b007a2a1 100644
--- a/src/command/cmd_funcs.c
+++ b/src/command/cmd_funcs.c
@@ -9023,14 +9023,14 @@ gboolean
 cmd_stamp(ProfWin* window, const char* const command, gchar** args)
 {
     if (g_strv_length(args) == 0) {
-        char* def = prefs_get_string(PREF_OUTGOING_STR);
+        char* def = prefs_get_string(PREF_OUTGOING_STAMP);
         if (def) {
             cons_show("The outgoing stamp is: %s", def);
             free(def);
         } else {
             cons_show("No outgoing stamp.");
         }
-        def = prefs_get_string(PREF_INCOMING_STR);
+        def = prefs_get_string(PREF_INCOMING_STAMP);
         if (def) {
             cons_show("The incoming stamp is: %s", def);
             free(def);
@@ -9047,17 +9047,17 @@ cmd_stamp(ProfWin* window, const char* const command, gchar** args)
 
     if (g_strv_length(args) == 2) {
         if (g_strcmp0(args[0], "outgoing") == 0) {
-            prefs_set_string(PREF_OUTGOING_STR, args[1]);
+            prefs_set_string(PREF_OUTGOING_STAMP, args[1]);
             cons_show("Outgoing stamp set to: %s", args[1]);
         } else if (g_strcmp0(args[0], "incoming") == 0) {
-            prefs_set_string(PREF_INCOMING_STR, args[1]);
+            prefs_set_string(PREF_INCOMING_STAMP, args[1]);
             cons_show("Incoming stamp set to: %s", args[1]);
         } else if (g_strcmp0(args[0], "unset") == 0) {
             if (g_strcmp0(args[1], "incoming") == 0) {
-                prefs_set_string(PREF_INCOMING_STR, NULL);
+                prefs_set_string(PREF_INCOMING_STAMP, NULL);
                 cons_show("Incoming stamp unset");
             } else if (g_strcmp0(args[1], "outgoing") == 0) {
-                prefs_set_string(PREF_OUTGOING_STR, NULL);
+                prefs_set_string(PREF_OUTGOING_STAMP, NULL);
                 cons_show("Outgoing stamp unset");
             } else {
                 cons_bad_cmd_usage(command);
diff --git a/src/config/preferences.c b/src/config/preferences.c
index 8914c65e..ec536762 100644
--- a/src/config/preferences.c
+++ b/src/config/preferences.c
@@ -1817,8 +1817,8 @@ _get_group(preference_t pref)
     case PREF_TITLEBAR_MUC_TITLE_NAME:
     case PREF_SLASH_GUARD:
     case PREF_COMPOSE_EDITOR:
-    case PREF_OUTGOING_STR:
-    case PREF_INCOMING_STR:
+    case PREF_OUTGOING_STAMP:
+    case PREF_INCOMING_STAMP:
         return PREF_GROUP_UI;
     case PREF_STATES:
     case PREF_OUTTYPE:
@@ -2146,9 +2146,9 @@ _get_key(preference_t pref)
         return "compose.editor";
     case PREF_SILENCE_NON_ROSTER:
         return "silence.incoming.nonroster";
-    case PREF_OUTGOING_STR:
+    case PREF_OUTGOING_STAMP:
         return "stamp.outgoing";
-    case PREF_INCOMING_STR:
+    case PREF_INCOMING_STAMP:
         return "stamp.incoming";
     default:
         return NULL;
@@ -2287,9 +2287,9 @@ _get_default_string(preference_t pref)
         gchar* editor = getenv("EDITOR");
         return editor ? editor : "vim";
     }
-    case PREF_OUTGOING_STR:
+    case PREF_OUTGOING_STAMP:
         return "me:";
-    case PREF_INCOMING_STR:
+    case PREF_INCOMING_STAMP:
         return NULL;
     case PREF_URL_SAVE_CMD:
         return NULL; // Default to built-in method.
diff --git a/src/config/preferences.h b/src/config/preferences.h
index 2bfceb9b..6c8ad125 100644
--- a/src/config/preferences.h
+++ b/src/config/preferences.h
@@ -176,8 +176,8 @@ typedef enum {
     PREF_URL_SAVE_CMD,
     PREF_COMPOSE_EDITOR,
     PREF_SILENCE_NON_ROSTER,
-    PREF_OUTGOING_STR,
-    PREF_INCOMING_STR,
+    PREF_OUTGOING_STAMP,
+    PREF_INCOMING_STAMP,
 } preference_t;
 
 typedef struct prof_alias_t
diff --git a/src/ui/window.c b/src/ui/window.c
index 227ed07d..4283d61a 100644
--- a/src/ui/window.c
+++ b/src/ui/window.c
@@ -1248,7 +1248,7 @@ win_print_outgoing(ProfWin* window, const char* show_char, const char* const id,
     if (replace_id) {
         _win_correct(window, message, id, replace_id, myjid);
     } else {
-        char* outgoing_str = prefs_get_string(PREF_OUTGOING_STR);
+        char* outgoing_str = prefs_get_string(PREF_OUTGOING_STAMP);
         _win_printf(window, show_char, 0, timestamp, 0, THEME_TEXT_ME, outgoing_str, myjid, id, "%s", message);
     }
 
diff --git a/src/xmpp/roster_list.c b/src/xmpp/roster_list.c
index 5ecff145..a06c44c9 100644
--- a/src/xmpp/roster_list.c
+++ b/src/xmpp/roster_list.c
@@ -199,7 +199,7 @@ roster_get_msg_display_name(const char* const barejid, const char* const resourc
 {
     assert(roster != NULL);
 
-    char* incoming_str = prefs_get_string(PREF_INCOMING_STR);
+    char* incoming_str = prefs_get_string(PREF_INCOMING_STAMP);
 
     if (incoming_str) {
         return incoming_str;