fix-date-fill.diff
author Myhailo Danylenko <isbear@isbear.org.ua>
Fri, 09 Dec 2016 02:12:34 +0200
changeset 92 66f7e2aa040c
parent 87 78238d26911a
permissions -rw-r--r--
Add fix-compile-warning-xmpp_c, refresh queue
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
51
5e5992999357 Fiddling with time formatting
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff changeset
     1
# HG changeset patch
87
78238d26911a Update series to current dev version
Myhailo Danylenko <isbear@ukrpost.net>
parents: 51
diff changeset
     2
# Parent 634cc23e8c1c5764623d17d12170b3fb7d67e5d9
92
66f7e2aa040c Add fix-compile-warning-xmpp_c, refresh queue
Myhailo Danylenko <isbear@isbear.org.ua>
parents: 87
diff changeset
     3
# Parent  d1357df25a61fc92b64302ae645cce5b14b452f2
51
5e5992999357 Fiddling with time formatting
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff changeset
     4
Fix empty prefix filling
5e5992999357 Fiddling with time formatting
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff changeset
     5
Not useful in vanilla, as there's no prefixes
5e5992999357 Fiddling with time formatting
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff changeset
     6
longer than that static string. Also not add spaces
5e5992999357 Fiddling with time formatting
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff changeset
     7
to prefixes - they are already in format string.
5e5992999357 Fiddling with time formatting
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff changeset
     8
87
78238d26911a Update series to current dev version
Myhailo Danylenko <isbear@ukrpost.net>
parents: 51
diff changeset
     9
XXX: Not really sure about this all, why are we getting rid of spaces in the end?
78238d26911a Update series to current dev version
Myhailo Danylenko <isbear@ukrpost.net>
parents: 51
diff changeset
    10
92
66f7e2aa040c Add fix-compile-warning-xmpp_c, refresh queue
Myhailo Danylenko <isbear@isbear.org.ua>
parents: 87
diff changeset
    11
diff -r d1357df25a61 mcabber/mcabber/screen.c
66f7e2aa040c Add fix-compile-warning-xmpp_c, refresh queue
Myhailo Danylenko <isbear@isbear.org.ua>
parents: 87
diff changeset
    12
--- a/mcabber/mcabber/screen.c	Fri Dec 09 01:38:42 2016 +0200
66f7e2aa040c Add fix-compile-warning-xmpp_c, refresh queue
Myhailo Danylenko <isbear@isbear.org.ua>
parents: 87
diff changeset
    13
+++ b/mcabber/mcabber/screen.c	Fri Dec 09 01:48:22 2016 +0200
66f7e2aa040c Add fix-compile-warning-xmpp_c, refresh queue
Myhailo Danylenko <isbear@isbear.org.ua>
parents: 87
diff changeset
    14
@@ -1115,9 +1115,9 @@
51
5e5992999357 Fiddling with time formatting
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff changeset
    15
 
5e5992999357 Fiddling with time formatting
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff changeset
    16
   if (line->timestamp &&
5e5992999357 Fiddling with time formatting
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff changeset
    17
       !(line->flags & (HBB_PREFIX_SPECIAL|HBB_PREFIX_CONT))) {
87
78238d26911a Update series to current dev version
Myhailo Danylenko <isbear@ukrpost.net>
parents: 51
diff changeset
    18
-    timepreflen = strftime(date, 30, gettprefix(), localtime(&line->timestamp));
78238d26911a Update series to current dev version
Myhailo Danylenko <isbear@ukrpost.net>
parents: 51
diff changeset
    19
+    timepreflen = strftime(date, 63, gettprefix(), localtime(&line->timestamp));
51
5e5992999357 Fiddling with time formatting
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff changeset
    20
   } else
5e5992999357 Fiddling with time formatting
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff changeset
    21
-    strcpy(date, "           ");
5e5992999357 Fiddling with time formatting
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff changeset
    22
+    memset(date, ' ', (preflen>64) ? 64 : preflen);
5e5992999357 Fiddling with time formatting
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff changeset
    23
 
5e5992999357 Fiddling with time formatting
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff changeset
    24
   if (!(line->flags & HBB_PREFIX_CONT)) {
5e5992999357 Fiddling with time formatting
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff changeset
    25
     if (line->flags & HBB_PREFIX_INFO) {
92
66f7e2aa040c Add fix-compile-warning-xmpp_c, refresh queue
Myhailo Danylenko <isbear@isbear.org.ua>
parents: 87
diff changeset
    26
@@ -1157,13 +1157,12 @@
51
5e5992999357 Fiddling with time formatting
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff changeset
    27
         receiptflag = '-';
5e5992999357 Fiddling with time formatting
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff changeset
    28
       g_snprintf(pref, preflen, "%s%c%c> ", date, receiptflag, cryptflag);
5e5992999357 Fiddling with time formatting
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff changeset
    29
     } else if (line->flags & HBB_PREFIX_SPECIAL) {
87
78238d26911a Update series to current dev version
Myhailo Danylenko <isbear@ukrpost.net>
parents: 51
diff changeset
    30
-      timepreflen = strftime(date, 30, getspectprefix(), localtime(&line->timestamp));
51
5e5992999357 Fiddling with time formatting
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff changeset
    31
-      g_snprintf(pref, preflen, "%s   ", date);
87
78238d26911a Update series to current dev version
Myhailo Danylenko <isbear@ukrpost.net>
parents: 51
diff changeset
    32
+      timepreflen = strftime(pref, preflen, getspectprefix(), localtime(&line->timestamp));
51
5e5992999357 Fiddling with time formatting
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff changeset
    33
     } else {
5e5992999357 Fiddling with time formatting
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff changeset
    34
-      g_snprintf(pref, preflen, "%s    ", date);
5e5992999357 Fiddling with time formatting
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff changeset
    35
+      strncpy(pref, date, preflen);
5e5992999357 Fiddling with time formatting
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff changeset
    36
     }
5e5992999357 Fiddling with time formatting
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff changeset
    37
   } else {
5e5992999357 Fiddling with time formatting
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff changeset
    38
-    g_snprintf(pref, preflen, "                ");
5e5992999357 Fiddling with time formatting
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff changeset
    39
+    strncpy(pref, date, preflen);
5e5992999357 Fiddling with time formatting
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff changeset
    40
   }
87
78238d26911a Update series to current dev version
Myhailo Danylenko <isbear@ukrpost.net>
parents: 51
diff changeset
    41
   return timepreflen;
51
5e5992999357 Fiddling with time formatting
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff changeset
    42
 }