Merge lp:~codygarver/scratch/fix-about-menu into lp:~registry/scratch/scratch

Proposed by Cody Garver
Status: Merged
Approved by: Mario Guerriero
Approved revision: 113
Merged at revision: 116
Proposed branch: lp:~codygarver/scratch/fix-about-menu
Merge into: lp:~registry/scratch/scratch
Diff against target: 57 lines (+21/-9)
1 file modified
src/scratch.vala (+21/-9)
To merge this branch: bzr merge lp:~codygarver/scratch/fix-about-menu
Reviewer Review Type Date Requested Status
Registry Administrators Pending
Review via email: mp+73128@code.launchpad.net

Description of the change

The About menu now works and displays License

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
1=== modified file 'src/scratch.vala'
2--- src/scratch.vala 2011-08-19 10:42:12 +0000
3+++ src/scratch.vala 2011-08-27 05:51:25 +0000
4@@ -4,8 +4,8 @@
5
6 Copyright (C) 2011 Giulio Collura <random.cpp@gmail.com>
7 This program is free software: you can redistribute it and/or modify it
8- under the terms of the GNU Lesser General Public License version 3, as published
9- by the Free Software Foundation.
10+ under the terms of the GNU Lesser General Public License version 3, as
11+ published by the Free Software Foundation.
12
13 This program is distributed in the hope that it will be useful, but
14 WITHOUT ANY WARRANTY; without even the implied warranties of
15@@ -13,7 +13,7 @@
16 PURPOSE. See the GNU General Public License for more details.
17
18 You should have received a copy of the GNU General Public License along
19- with this program. If not, see <http://www.gnu.org/licenses/>
20+ with this program. If not, see <http://www.gnu.org/licenses>
21
22 END LICENSE
23 ***/
24@@ -53,16 +53,28 @@
25 bug_url = "https://bugs.launchpad.net/scratch";
26 help_url = "https://answers.launchpad.net/scratch";
27 translate_url = "https://translations.launchpad.net/scratch";
28-
29 about_authors = {"Mario Guerriero <mefrio.g@gmail.com>",
30 "Giulio Collura <random.cpp@gmail.com>",
31- "Gabriele Coletta <gdmg92@gmail.com>"
32+ "Gabriele Coletta <gdmg92@gmail.com>",
33+ null
34 };
35-
36 //about_documenters = {"",""};
37- about_artists = {"Harvey Cabaguio 'BassUltra' <harveycabaguio@gmail.com>"};
38- about_translators = "Launchpad Translators";
39-
40+ about_artists = {"Harvey Cabaguio 'BassUltra' <harveycabaguio@gmail.com>",
41+ null
42+ };
43+ about_translators = "Launchpad Translators";
44+ about_license = """This program is free software: you can redistribute it and/or modify it
45+under the terms of the GNU Lesser General Public License version 3,
46+as published by the Free Software Foundation.
47+
48+This program is distributed in the hope that it will be useful, but
49+WITHOUT ANY WARRANTY; without even the implied warranties of
50+MERCHANTABILITY, SATISFACTORY QUALITY, or FITNESS FOR A
51+PARTICULAR PURPOSE. See the GNU General Public License for
52+more details.
53+
54+You should have received a copy of the GNU General Public License
55+along with this program. If not, see <http://www.gnu.org/licenses>""";
56
57 }
58

Subscribers

People subscribed via source and target branches