author | Myhailo Danylenko <isbear@ukrpost.net> |
Wed, 15 May 2013 13:07:05 +0300 | |
changeset 85 | 93c3cc0d7891 |
parent 51 | 5e5992999357 |
child 87 | 78238d26911a |
permissions | -rw-r--r-- |
51
5e5992999357
Fiddling with time formatting
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff
changeset
|
1 |
# HG changeset patch |
5e5992999357
Fiddling with time formatting
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff
changeset
|
2 |
# Parent 450e74018eb436aef07e67ef7ae49cd05f48b3c9 |
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 |
|
5e5992999357
Fiddling with time formatting
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff
changeset
|
8 |
diff -r 450e74018eb4 mcabber/mcabber/screen.c |
5e5992999357
Fiddling with time formatting
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff
changeset
|
9 |
--- a/mcabber/mcabber/screen.c Thu Oct 18 01:49:44 2012 +0300 |
5e5992999357
Fiddling with time formatting
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff
changeset
|
10 |
+++ b/mcabber/mcabber/screen.c Thu Oct 18 02:08:24 2012 +0300 |
5e5992999357
Fiddling with time formatting
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff
changeset
|
11 |
@@ -1139,9 +1139,9 @@ |
5e5992999357
Fiddling with time formatting
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff
changeset
|
12 |
|
5e5992999357
Fiddling with time formatting
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff
changeset
|
13 |
if (line->timestamp && |
5e5992999357
Fiddling with time formatting
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff
changeset
|
14 |
!(line->flags & (HBB_PREFIX_SPECIAL|HBB_PREFIX_CONT))) { |
5e5992999357
Fiddling with time formatting
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff
changeset
|
15 |
- strftime(date, 30, gettprefix(), localtime(&line->timestamp)); |
5e5992999357
Fiddling with time formatting
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff
changeset
|
16 |
+ strftime(date, 63, gettprefix(), localtime(&line->timestamp)); |
5e5992999357
Fiddling with time formatting
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff
changeset
|
17 |
} else |
5e5992999357
Fiddling with time formatting
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff
changeset
|
18 |
- strcpy(date, " "); |
5e5992999357
Fiddling with time formatting
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff
changeset
|
19 |
+ memset(date, ' ', (preflen>64) ? 64 : preflen); |
5e5992999357
Fiddling with time formatting
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff
changeset
|
20 |
|
5e5992999357
Fiddling with time formatting
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff
changeset
|
21 |
if (!(line->flags & HBB_PREFIX_CONT)) { |
5e5992999357
Fiddling with time formatting
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff
changeset
|
22 |
if (line->flags & HBB_PREFIX_INFO) { |
5e5992999357
Fiddling with time formatting
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff
changeset
|
23 |
@@ -1181,13 +1181,12 @@ |
5e5992999357
Fiddling with time formatting
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff
changeset
|
24 |
receiptflag = '-'; |
5e5992999357
Fiddling with time formatting
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff
changeset
|
25 |
g_snprintf(pref, preflen, "%s%c%c> ", date, receiptflag, cryptflag); |
5e5992999357
Fiddling with time formatting
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff
changeset
|
26 |
} else if (line->flags & HBB_PREFIX_SPECIAL) { |
5e5992999357
Fiddling with time formatting
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff
changeset
|
27 |
- strftime(date, 30, getspectprefix(), localtime(&line->timestamp)); |
5e5992999357
Fiddling with time formatting
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff
changeset
|
28 |
- g_snprintf(pref, preflen, "%s ", date); |
5e5992999357
Fiddling with time formatting
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff
changeset
|
29 |
+ strftime(pref, preflen, getspectprefix(), localtime(&line->timestamp)); |
5e5992999357
Fiddling with time formatting
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff
changeset
|
30 |
} else { |
5e5992999357
Fiddling with time formatting
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff
changeset
|
31 |
- g_snprintf(pref, preflen, "%s ", date); |
5e5992999357
Fiddling with time formatting
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff
changeset
|
32 |
+ strncpy(pref, date, preflen); |
5e5992999357
Fiddling with time formatting
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff
changeset
|
33 |
} |
5e5992999357
Fiddling with time formatting
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff
changeset
|
34 |
} else { |
5e5992999357
Fiddling with time formatting
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff
changeset
|
35 |
- g_snprintf(pref, preflen, " "); |
5e5992999357
Fiddling with time formatting
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff
changeset
|
36 |
+ strncpy(pref, date, preflen); |
5e5992999357
Fiddling with time formatting
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff
changeset
|
37 |
} |
5e5992999357
Fiddling with time formatting
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff
changeset
|
38 |
} |
5e5992999357
Fiddling with time formatting
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff
changeset
|
39 |