Gwibber

Merge lp:~ken-vandine/gwibber/time-diff into lp:gwibber

  1. time-diff
  2. Merge into trunk
Proposed by Ken VanDine
Status: Merged
Merged at revision: 1230
Proposed branch: lp:~ken-vandine/gwibber/time-diff
Merge into: lp:gwibber
Diff against target: 74 lines (+8/-8)
2 files modified
libgwibber/utils.vala (+1/-1)
test/vala/test-utils.vala (+7/-7)
To merge this branch: bzr merge lp:~ken-vandine/gwibber/time-diff
Reviewer Review Type Date Requested Status
Michael Terry (community) Approve
Review via email: mp+84877@code.launchpad.net

Description of the change

Dropped a seemingly arbitrary subtraction of 3600 seconds when calculating the time difference. This was needed to work around some other problem in the past, but now it is making the delta off by an hour.

To post a comment you must log in.
Revision history for this message
Michael Terry (mterry) wrote :

Seems fine. Assuming the changed offset for seconds and minutes was intentional.

review: Approve
Revision history for this message
Ken VanDine (ken-vandine) wrote :

Thanks, yeah intentional. Makes more sense for the tests.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'libgwibber/utils.vala'
--- libgwibber/utils.vala 2011-10-02 08:10:09 +0000
+++ libgwibber/utils.vala 2011-12-08 02:17:23 +0000
@@ -79,7 +79,7 @@
7979
80 public string generate_time_string(uint t)80 public string generate_time_string(uint t)
81 {81 {
82 var now = (int)Time.gm (time_t ()).mktime() - 3600;82 var now = (int)Time.gm (time_t ()).mktime();
83 var d = (int)(now - t);83 var d = (int)(now - t);
84 if(d < 60)84 if(d < 60)
85 return _("a few seconds ago");85 return _("a few seconds ago");
8686
=== modified file 'test/vala/test-utils.vala'
--- test/vala/test-utils.vala 2011-11-05 14:10:38 +0000
+++ test/vala/test-utils.vala 2011-12-08 02:17:23 +0000
@@ -46,7 +46,7 @@
46 internal static void test_time_string_seconds ()46 internal static void test_time_string_seconds ()
47 {47 {
48 var utils = new Gwibber.Utils ();48 var utils = new Gwibber.Utils ();
49 var t = ((int)Time.gm (time_t ()).mktime() - 3600) - 29;49 var t = ((int)Time.gm (time_t ()).mktime()) - 59;
50 var ts = utils.generate_time_string (t);50 var ts = utils.generate_time_string (t);
51 assert (ts == "a few seconds ago");51 assert (ts == "a few seconds ago");
52 }52 }
@@ -54,42 +54,42 @@
54 internal static void test_time_string_minute ()54 internal static void test_time_string_minute ()
55 {55 {
56 var utils = new Gwibber.Utils ();56 var utils = new Gwibber.Utils ();
57 var t = ((int)Time.gm (time_t ()).mktime() - 3600) - 60;57 var t = ((int)Time.gm (time_t ()).mktime()) - 60;
58 var ts = utils.generate_time_string (t);58 var ts = utils.generate_time_string (t);
59 assert (ts == "1 minute ago");59 assert (ts == "1 minute ago");
60 }60 }
61 internal static void test_time_string_minutes ()61 internal static void test_time_string_minutes ()
62 {62 {
63 var utils = new Gwibber.Utils ();63 var utils = new Gwibber.Utils ();
64 var t = ((int)Time.gm (time_t ()).mktime() - 3600) - 121;64 var t = ((int)Time.gm (time_t ()).mktime()) - 3559;
65 var ts = utils.generate_time_string (t);65 var ts = utils.generate_time_string (t);
66 assert (ts.contains ("minutes ago"));66 assert (ts.contains ("minutes ago"));
67 }67 }
68 internal static void test_time_string_hour ()68 internal static void test_time_string_hour ()
69 {69 {
70 var utils = new Gwibber.Utils ();70 var utils = new Gwibber.Utils ();
71 var t = ((int)Time.gm (time_t ()).mktime() - 3600) - 3601;71 var t = ((int)Time.gm (time_t ()).mktime()) - 3601;
72 var ts = utils.generate_time_string (t);72 var ts = utils.generate_time_string (t);
73 assert (ts == "1 hour ago");73 assert (ts == "1 hour ago");
74 }74 }
75 internal static void test_time_string_hours ()75 internal static void test_time_string_hours ()
76 {76 {
77 var utils = new Gwibber.Utils ();77 var utils = new Gwibber.Utils ();
78 var t = ((int)Time.gm (time_t ()).mktime() - 3600) - 7201;78 var t = ((int)Time.gm (time_t ()).mktime()) - 7201;
79 var ts = utils.generate_time_string (t);79 var ts = utils.generate_time_string (t);
80 assert (ts.contains ("hours ago"));80 assert (ts.contains ("hours ago"));
81 }81 }
82 internal static void test_time_string_day ()82 internal static void test_time_string_day ()
83 {83 {
84 var utils = new Gwibber.Utils ();84 var utils = new Gwibber.Utils ();
85 var t = ((int)Time.gm (time_t ()).mktime() - 3600) - 86400;85 var t = ((int)Time.gm (time_t ()).mktime()) - 86400;
86 var ts = utils.generate_time_string (t);86 var ts = utils.generate_time_string (t);
87 assert (ts == "1 day ago");87 assert (ts == "1 day ago");
88 }88 }
89 internal static void test_time_string_days ()89 internal static void test_time_string_days ()
90 {90 {
91 var utils = new Gwibber.Utils ();91 var utils = new Gwibber.Utils ();
92 var t = ((int)Time.gm (time_t ()).mktime() - 3600) - 172800;92 var t = ((int)Time.gm (time_t ()).mktime()) - 172800;
93 var ts = utils.generate_time_string (t);93 var ts = utils.generate_time_string (t);
94 assert (ts.contains ("days ago"));94 assert (ts.contains ("days ago"));
95 }95 }