author | Myhailo Danylenko <isbear@ukrpost.net> |
Sat, 07 Nov 2015 17:39:49 +0200 | |
changeset 88 | 0a87df8ad9c1 |
parent 87 | 78238d26911a |
child 92 | 66f7e2aa040c |
permissions | -rw-r--r-- |
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 |
51
5e5992999357
Fiddling with time formatting
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff
changeset
|
3 |
Fix empty prefix filling |
5e5992999357
Fiddling with time formatting
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff
changeset
|
4 |
Not useful in vanilla, as there's no prefixes |
5e5992999357
Fiddling with time formatting
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff
changeset
|
5 |
longer than that static string. Also not add spaces |
5e5992999357
Fiddling with time formatting
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff
changeset
|
6 |
to prefixes - they are already in format string. |
5e5992999357
Fiddling with time formatting
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff
changeset
|
7 |
|
87
78238d26911a
Update series to current dev version
Myhailo Danylenko <isbear@ukrpost.net>
parents:
51
diff
changeset
|
8 |
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
|
9 |
|
78238d26911a
Update series to current dev version
Myhailo Danylenko <isbear@ukrpost.net>
parents:
51
diff
changeset
|
10 |
diff -r 634cc23e8c1c mcabber/mcabber/screen.c |
78238d26911a
Update series to current dev version
Myhailo Danylenko <isbear@ukrpost.net>
parents:
51
diff
changeset
|
11 |
--- a/mcabber/mcabber/screen.c Fri Oct 17 22:42:07 2014 +0200 |
78238d26911a
Update series to current dev version
Myhailo Danylenko <isbear@ukrpost.net>
parents:
51
diff
changeset
|
12 |
+++ b/mcabber/mcabber/screen.c Tue Nov 11 20:58:44 2014 +0200 |
78238d26911a
Update series to current dev version
Myhailo Danylenko <isbear@ukrpost.net>
parents:
51
diff
changeset
|
13 |
@@ -1087,9 +1087,9 @@ |
51
5e5992999357
Fiddling with time formatting
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff
changeset
|
14 |
|
5e5992999357
Fiddling with time formatting
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff
changeset
|
15 |
if (line->timestamp && |
5e5992999357
Fiddling with time formatting
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff
changeset
|
16 |
!(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
|
17 |
- timepreflen = strftime(date, 30, gettprefix(), localtime(&line->timestamp)); |
78238d26911a
Update series to current dev version
Myhailo Danylenko <isbear@ukrpost.net>
parents:
51
diff
changeset
|
18 |
+ timepreflen = strftime(date, 63, gettprefix(), localtime(&line->timestamp)); |
51
5e5992999357
Fiddling with time formatting
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff
changeset
|
19 |
} else |
5e5992999357
Fiddling with time formatting
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff
changeset
|
20 |
- strcpy(date, " "); |
5e5992999357
Fiddling with time formatting
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff
changeset
|
21 |
+ memset(date, ' ', (preflen>64) ? 64 : preflen); |
5e5992999357
Fiddling with time formatting
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff
changeset
|
22 |
|
5e5992999357
Fiddling with time formatting
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff
changeset
|
23 |
if (!(line->flags & HBB_PREFIX_CONT)) { |
5e5992999357
Fiddling with time formatting
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff
changeset
|
24 |
if (line->flags & HBB_PREFIX_INFO) { |
87
78238d26911a
Update series to current dev version
Myhailo Danylenko <isbear@ukrpost.net>
parents:
51
diff
changeset
|
25 |
@@ -1129,13 +1129,12 @@ |
51
5e5992999357
Fiddling with time formatting
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff
changeset
|
26 |
receiptflag = '-'; |
5e5992999357
Fiddling with time formatting
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff
changeset
|
27 |
g_snprintf(pref, preflen, "%s%c%c> ", date, receiptflag, cryptflag); |
5e5992999357
Fiddling with time formatting
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff
changeset
|
28 |
} else if (line->flags & HBB_PREFIX_SPECIAL) { |
87
78238d26911a
Update series to current dev version
Myhailo Danylenko <isbear@ukrpost.net>
parents:
51
diff
changeset
|
29 |
- timepreflen = strftime(date, 30, getspectprefix(), localtime(&line->timestamp)); |
51
5e5992999357
Fiddling with time formatting
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff
changeset
|
30 |
- g_snprintf(pref, preflen, "%s ", date); |
87
78238d26911a
Update series to current dev version
Myhailo Danylenko <isbear@ukrpost.net>
parents:
51
diff
changeset
|
31 |
+ timepreflen = strftime(pref, preflen, getspectprefix(), localtime(&line->timestamp)); |
51
5e5992999357
Fiddling with time formatting
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff
changeset
|
32 |
} else { |
5e5992999357
Fiddling with time formatting
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff
changeset
|
33 |
- g_snprintf(pref, preflen, "%s ", date); |
5e5992999357
Fiddling with time formatting
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff
changeset
|
34 |
+ strncpy(pref, date, preflen); |
5e5992999357
Fiddling with time formatting
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff
changeset
|
35 |
} |
5e5992999357
Fiddling with time formatting
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff
changeset
|
36 |
} else { |
5e5992999357
Fiddling with time formatting
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff
changeset
|
37 |
- g_snprintf(pref, preflen, " "); |
5e5992999357
Fiddling with time formatting
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff
changeset
|
38 |
+ strncpy(pref, date, preflen); |
5e5992999357
Fiddling with time formatting
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff
changeset
|
39 |
} |
87
78238d26911a
Update series to current dev version
Myhailo Danylenko <isbear@ukrpost.net>
parents:
51
diff
changeset
|
40 |
return timepreflen; |
51
5e5992999357
Fiddling with time formatting
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff
changeset
|
41 |
} |