diff options
| author | David King <amigadave@amigadave.com> | 2013-07-07 23:12:59 +0100 |
|---|---|---|
| committer | David King <amigadave@amigadave.com> | 2013-07-07 23:19:47 +0100 |
| commit | 7f47fc46d92722780b2f72e0129f7e0cecbc3ad0 (patch) | |
| tree | ded0c5a15ee71b2e50864618a4d2a8537a7bdfc6 /src | |
| parent | 1083c461ff784cc1f84e3af1e78a4709446e0110 (diff) | |
| download | cheese-7f47fc46d92722780b2f72e0129f7e0cecbc3ad0.tar.gz | |
Move gettext initialization to main()
Ensure that gettext is always initialized, regardless of whether the
running instance is the primrary instance.
Diffstat (limited to 'src')
| -rw-r--r-- | src/cheese-application.vala | 5 | ||||
| -rw-r--r-- | src/cheese-main.vala | 4 |
2 files changed, 4 insertions, 5 deletions
diff --git a/src/cheese-application.vala b/src/cheese-application.vala index 99f2dd74..4cbfa495 100644 --- a/src/cheese-application.vala +++ b/src/cheese-application.vala @@ -73,11 +73,6 @@ public class Cheese.Application : Gtk.Application */ protected override void startup () { - Environment.set_prgname ("cheese"); - Intl.bindtextdomain (Config.GETTEXT_PACKAGE, Config.PACKAGE_LOCALEDIR); - Intl.bind_textdomain_codeset (Config.GETTEXT_PACKAGE, "UTF-8"); - Intl.textdomain (Config.GETTEXT_PACKAGE); - settings = new GLib.Settings ("org.gnome.Cheese"); add_action_entries (action_entries, this); diff --git a/src/cheese-main.vala b/src/cheese-main.vala index fafeb674..f500fa2b 100644 --- a/src/cheese-main.vala +++ b/src/cheese-main.vala @@ -20,5 +20,9 @@ int main (string[] args) { + Intl.bindtextdomain (Config.GETTEXT_PACKAGE, Config.PACKAGE_LOCALEDIR); + Intl.bind_textdomain_codeset (Config.GETTEXT_PACKAGE, "UTF-8"); + Intl.textdomain (Config.GETTEXT_PACKAGE); + return new Cheese.Application ().run (args); } |