Merge lp:~leonardolemos/cerbere/bump-years into lp:~elementary-pantheon/cerbere/cerbere

Proposed by Leonardo Lemos on 2017-01-01
Status: Rejected
Rejected by: Cody Garver on 2017-01-03
Proposed branch: lp:~leonardolemos/cerbere/bump-years
Merge into: lp:~elementary-pantheon/cerbere/cerbere
Diff against target: 108 lines (+11/-11)
5 files modified
src/Cerbere.vala (+2/-2)
src/ProcessWrapper.vala (+1/-1)
src/SessionManager.vala (+1/-1)
src/SettingsManager.vala (+1/-1)
src/Watchdog.vala (+6/-6)
To merge this branch: bzr merge lp:~leonardolemos/cerbere/bump-years
Reviewer Review Type Date Requested Status
Cody Garver 2017-01-01 Disapprove on 2017-01-03
Review via email: mp+313947@code.launchpad.net

Commit message

Add 2017 to license copyright and app years.

Description of the change

Add 2017 to license copyright and app years.

To post a comment you must log in.
Cody Garver (codygarver) wrote :

I don't think you should bump copyright years for inactive individuals.

review: Disapprove

Unmerged revisions

53. By Leonardo Lemos on 2016-12-31

Bump app and copyright years

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'src/Cerbere.vala'
2--- src/Cerbere.vala 2013-05-03 04:52:31 +0000
3+++ src/Cerbere.vala 2017-01-01 22:10:39 +0000
4@@ -3,7 +3,7 @@
5 * Cerbere.vala
6 * This file is part of cerbere, a watchdog for the Pantheon Desktop
7 *
8- * Copyright (C) 2011-2012 - Allen Lowe
9+ * Copyright (C) 2011-2017 - Allen Lowe
10 *
11 * Cerbere is free software; you can redistribute it and/or modify
12 * it under the terms of the GNU General Public License as published by
13@@ -74,7 +74,7 @@
14 private void start_processes (string[] process_list) {
15 if (watchdog == null)
16 watchdog = new Watchdog ();
17-
18+
19 foreach (string cmd in process_list)
20 watchdog.add_process (cmd);
21 }
22
23=== modified file 'src/ProcessWrapper.vala'
24--- src/ProcessWrapper.vala 2012-11-22 23:12:01 +0000
25+++ src/ProcessWrapper.vala 2017-01-01 22:10:39 +0000
26@@ -1,6 +1,6 @@
27 /* -*- Mode: vala; indent-tabs-mode: nil; tab-width: 4 -*- */
28 /*
29- * Copyright (C) 2012 Victor Eduardo <victoreduardm@gmail.com>
30+ * Copyright (C) 2012-2017 Victor Eduardo <victoreduardm@gmail.com>
31 *
32 * Cerbere is free software; you can redistribute it and/or modify
33 * it under the terms of the GNU General Public License as published by
34
35=== modified file 'src/SessionManager.vala'
36--- src/SessionManager.vala 2013-04-19 04:09:47 +0000
37+++ src/SessionManager.vala 2017-01-01 22:10:39 +0000
38@@ -1,6 +1,6 @@
39 /* -*- Mode: vala; indent-tabs-mode: nil; tab-width: 4 -*- */
40 /*
41- * Copyright (C) 2012 Victor Eduardo <victoreduardm@gmail.com>
42+ * Copyright (C) 2012-2017 Victor Eduardo <victoreduardm@gmail.com>
43 *
44 * Cerbere is free software; you can redistribute it and/or modify
45 * it under the terms of the GNU General Public License as published by
46
47=== modified file 'src/SettingsManager.vala'
48--- src/SettingsManager.vala 2015-04-21 17:37:04 +0000
49+++ src/SettingsManager.vala 2017-01-01 22:10:39 +0000
50@@ -1,6 +1,6 @@
51 /* -*- Mode: vala; indent-tabs-mode: nil; tab-width: 4 -*- */
52 /*
53- * Copyright (C) 2012 Victor Eduardo <victoreduardm@gmail.com>
54+ * Copyright (C) 2012-2017 Victor Eduardo <victoreduardm@gmail.com>
55 *
56 * Cerbere is free software; you can redistribute it and/or modify
57 * it under the terms of the GNU General Public License as published by
58
59=== modified file 'src/Watchdog.vala'
60--- src/Watchdog.vala 2013-11-09 18:17:23 +0000
61+++ src/Watchdog.vala 2017-01-01 22:10:39 +0000
62@@ -3,7 +3,7 @@
63 * Watchdog.vala
64 * This file is part of cerbere, a watchdog for the Pantheon Desktop
65 *
66- * Copyright (C) 2011-2012 - Allen Lowe
67+ * Copyright (C) 2011-2017 - Allen Lowe
68 *
69 * Cerbere is free software; you can redistribute it and/or modify
70 * it under the terms of the GNU General Public License as published by
71@@ -36,12 +36,12 @@
72
73 public void add_process (string command)
74 requires (is_valid_command (command)) {
75-
76+
77 if (command_is_monitored (command)) {
78 warning ("Command '%s' is already being monitored.", command);
79 return;
80 }
81-
82+
83 monitor_and_run_command (command);
84 }
85
86@@ -52,7 +52,7 @@
87 private bool command_is_monitored (string command) {
88 return processes.has_key (command);
89 }
90-
91+
92 private void monitor_and_run_command (string command) {
93 var process = new ProcessWrapper (command);
94 processes[command] = process;
95@@ -97,11 +97,11 @@
96
97 process.run_async ();
98 }
99-
100+
101 private bool is_not_in_settings (string command) {
102 return !(command in App.settings.process_list);
103 }
104-
105+
106 private void unmonitor_command (string command) {
107 processes.unset (command);
108 }

Subscribers

People subscribed via source and target branches

to all changes: