Audience

Merge lp:~codygarver/audience/program_name-APP_NAME into lp:~audience-members/audience/trunk

  1. program_name-APP_NAME
  2. Merge into trunk
Proposed by Cody Garver
Status: Merged
Approved by: Felipe Escoto
Approved revision: 626
Merged at revision: 626
Proposed branch: lp:~codygarver/audience/program_name-APP_NAME
Merge into: lp:~audience-members/audience/trunk
Diff against target: 23 lines (+2/-1)
2 files modified
src/Audience.vala (+1/-1)
src/Config.vala.cmake (+1/-0)
To merge this branch: bzr merge lp:~codygarver/audience/program_name-APP_NAME
Reviewer Review Type Date Requested Status
Audience Members Pending
Review via email: mp+302340@code.launchpad.net

Commit message

 Get program_name from CMake APP_NAME

Description of the change

Fixes the titlebar always displaying Audience instead of Videos

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/Audience.vala'
2--- src/Audience.vala 2016-08-01 16:48:33 +0000
3+++ src/Audience.vala 2016-08-08 20:16:16 +0000
4@@ -43,7 +43,7 @@
5 public GLib.VolumeMonitor monitor;
6
7 construct {
8- program_name = "Audience";
9+ program_name = _(Constants.APP_NAME);
10 exec_name = "audience";
11
12 build_data_dir = Constants.DATADIR;
13
14=== modified file 'src/Config.vala.cmake'
15--- src/Config.vala.cmake 2012-02-18 08:04:30 +0000
16+++ src/Config.vala.cmake 2016-08-08 20:16:16 +0000
17@@ -1,5 +1,6 @@
18
19 namespace Constants {
20+ public const string APP_NAME = "@APP_NAME@";
21 public const string DATADIR = "@DATADIR@";
22 public const string PKGDATADIR = "@PKGDATADIR@";
23 public const string GETTEXT_PACKAGE = "@GETTEXT_PACKAGE@";

Subscribers

People subscribed via source and target branches

to all changes: