Activity Log Manager

Merge lp:~kelemeng/activity-log-manager/bug1409550 into lp:activity-log-manager

  1. bug1409550
  2. Merge into redesign
Proposed by Gabor Kelemen
Status: Merged
Merge reported by: Robert Ancell
Merged at revision: not available
Proposed branch: lp:~kelemeng/activity-log-manager/bug1409550
Merge into: lp:activity-log-manager
Diff against target: 44 lines (+17/-17)
1 file modified
src/security-widget.vala (+17/-17)
To merge this branch: bzr merge lp:~kelemeng/activity-log-manager/bug1409550
Reviewer Review Type Date Requested Status
Activity Log Manager Pending
Review via email: mp+246083@code.launchpad.net
To post a comment you must log in.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'src/security-widget.vala'
--- src/security-widget.vala 2014-02-06 16:12:21 +0000
+++ src/security-widget.vala 2015-01-11 23:14:15 +0000
@@ -42,23 +42,23 @@
42 var liststore_delay = new ListStore (2, typeof (string), typeof (int));42 var liststore_delay = new ListStore (2, typeof (string), typeof (int));
43 TreeIter iter;43 TreeIter iter;
44 liststore_delay.append (out iter);44 liststore_delay.append (out iter);
45 liststore_delay.set (iter, 0, "1 second", 1, 0);45 liststore_delay.set (iter, 0, _("1 second"), 1, 0);
46 liststore_delay.append (out iter);46 liststore_delay.append (out iter);
47 liststore_delay.set (iter, 0, "30 seconds", 1, 30);47 liststore_delay.set (iter, 0, _("30 seconds"), 1, 30);
48 liststore_delay.append (out iter);48 liststore_delay.append (out iter);
49 liststore_delay.set (iter, 0, "1 minute", 1, 60);49 liststore_delay.set (iter, 0, _("1 minute"), 1, 60);
50 liststore_delay.append (out iter);50 liststore_delay.append (out iter);
51 liststore_delay.set (iter, 0, "2 minutes", 1, 120);51 liststore_delay.set (iter, 0, _("2 minutes"), 1, 120);
52 liststore_delay.append (out iter);52 liststore_delay.append (out iter);
53 liststore_delay.set (iter, 0, "3 minutes", 1, 180);53 liststore_delay.set (iter, 0, _("3 minutes"), 1, 180);
54 liststore_delay.append (out iter);54 liststore_delay.append (out iter);
55 liststore_delay.set (iter, 0, "5 minutes", 1, 300);55 liststore_delay.set (iter, 0, _("5 minutes"), 1, 300);
56 liststore_delay.append (out iter);56 liststore_delay.append (out iter);
57 liststore_delay.set (iter, 0, "10 minutes", 1, 600);57 liststore_delay.set (iter, 0, _("10 minutes"), 1, 600);
58 liststore_delay.append (out iter);58 liststore_delay.append (out iter);
59 liststore_delay.set (iter, 0, "30 minutes", 1, 1800);59 liststore_delay.set (iter, 0, _("30 minutes"), 1, 1800);
60 liststore_delay.append (out iter);60 liststore_delay.append (out iter);
61 liststore_delay.set (iter, 0, "1 hour", 1, 3600);61 liststore_delay.set (iter, 0, _("1 hour"), 1, 3600);
6262
63 var grid = new Grid();63 var grid = new Grid();
64 grid.set_halign(Align.START);64 grid.set_halign(Align.START);

Subscribers

People subscribed via source and target branches