[cheese] Move gettext initialization to main()



commit 7f47fc46d92722780b2f72e0129f7e0cecbc3ad0
Author: David King <amigadave amigadave com>
Date:   Sun Jul 7 23:12:59 2013 +0100

    Move gettext initialization to main()
    
    Ensure that gettext is always initialized, regardless of whether the
    running instance is the primrary instance.

 src/cheese-application.vala |    5 -----
 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 99f2dd7..4cbfa49 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 fafeb67..f500fa2 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);
 }


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]