Merge lp:~codygarver/switchboard-plug-startup-applications/fix-branding into lp:switchboard-plug-startup-applications

Proposed by Cody Garver
Status: Merged
Approved by: Avi Romanoff
Approved revision: 71
Merged at revision: 71
Proposed branch: lp:~codygarver/switchboard-plug-startup-applications/fix-branding
Merge into: lp:switchboard-plug-startup-applications
Diff against target: 44 lines (+6/-6)
2 files modified
debian/control (+4/-4)
src/Plug.vala (+2/-2)
To merge this branch: bzr merge lp:~codygarver/switchboard-plug-startup-applications/fix-branding
Reviewer Review Type Date Requested Status
Danielle Foré Approve
Review via email: mp+218047@code.launchpad.net

Commit message

Update inconsistent and missing branding

To post a comment you must log in.
Revision history for this message
Danielle Foré (danrabbit) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'debian/control'
--- debian/control 2014-04-09 08:47:43 +0000
+++ debian/control 2014-05-02 11:34:38 +0000
@@ -10,8 +10,8 @@
10Architecture: any10Architecture: any
11Depends: ${shlibs:Depends}, ${misc:Depends}11Depends: ${shlibs:Depends}, ${misc:Depends}
12Enhances: switchboard12Enhances: switchboard
13Description: <insert up to 60 chars description>13Description: Startup Applications plug for Switchboard
14 <insert long description, indented with spaces>14 Manage apps that run at startup
1515
16Package: switchboard-plug-startup-applications-dbg16Package: switchboard-plug-startup-applications-dbg
17Architecture: any17Architecture: any
@@ -19,7 +19,7 @@
19Priority: extra19Priority: extra
20Depends: switchboard-plug-startup-applications (= ${binary:Version}), ${misc:Depends}20Depends: switchboard-plug-startup-applications (= ${binary:Version}), ${misc:Depends}
21Enhances: switchboard-plug-startup-applications21Enhances: switchboard-plug-startup-applications
22Description: <insert up to 60 chars description> (debugging symbols)22Description: Startup Applications plug for Switchboard (debugging symbols)
23 <insert long description, indented with spaces>23 Manage apps that run at startup
24 .24 .
25 This package contains debugging symbols for switchboard-plug-startup-applications.25 This package contains debugging symbols for switchboard-plug-startup-applications.
2626
=== modified file 'src/Plug.vala'
--- src/Plug.vala 2014-04-21 19:46:20 +0000
+++ src/Plug.vala 2014-05-02 11:34:38 +0000
@@ -30,7 +30,7 @@
30 Object (category: Category.PERSONAL,30 Object (category: Category.PERSONAL,
31 code_name: "personal-pantheon-startup",31 code_name: "personal-pantheon-startup",
32 display_name: _("Startup Apps"),32 display_name: _("Startup Apps"),
33 description: _("Shows Startup Applications Settings…"),33 description: _("Manage apps that run at startup"),
34 icon: "preferences-system-session");34 icon: "preferences-system-session");
3535
36 Backend.KeyFileFactory.init ();36 Backend.KeyFileFactory.init ();
@@ -59,4 +59,4 @@
59 public override async Gee.TreeMap <string, string> search (string search) {59 public override async Gee.TreeMap <string, string> search (string search) {
60 return new Gee.TreeMap <string, string> (null, null);60 return new Gee.TreeMap <string, string> (null, null);
61 }61 }
62}
63\ No newline at end of file62\ No newline at end of file
63}

Subscribers

People subscribed via source and target branches

to all changes: