[geary/wip/gtkapp] Fix crash when not installed



commit 3c3990287e671c771e1d6cabe733080e393a49db
Author: Charles Lindsay <chaz yorba org>
Date:   Fri Dec 6 12:30:26 2013 -0800

    Fix crash when not installed

 src/client/application/geary-application.vala |    8 ++++----
 1 files changed, 4 insertions(+), 4 deletions(-)
---
diff --git a/src/client/application/geary-application.vala b/src/client/application/geary-application.vala
index 21c21e6..a88ae74 100644
--- a/src/client/application/geary-application.vala
+++ b/src/client/application/geary-application.vala
@@ -118,6 +118,7 @@ along with Geary; if not, write to the Free Software Foundation, Inc.,
     // Application.run() calls this as an entry point.
     public override bool local_command_line(ref unowned string[] args, out int exit_status) {
         bin = args[0];
+        exec_dir = (File.new_for_path(Posix.realpath(Environment.find_program_in_path(bin)))).get_parent();
         
         try {
             register();
@@ -139,19 +140,18 @@ along with Geary; if not, write to the Free Software Foundation, Inc.,
     }
     
     public override void startup() {
-        base.startup();
+        Configuration.init(is_installed(), GSETTINGS_DIR);
         
         Environment.set_application_name(NAME);
         Environment.set_prgname(PRGNAME);
         International.init(GETTEXT_PACKAGE, bin);
         
-        exec_dir = (File.new_for_path(Posix.realpath(Environment.find_program_in_path(bin)))).get_parent();
-        
         Geary.Logging.init();
-        Configuration.init(is_installed(), GSETTINGS_DIR);
         Date.init();
         WebKit.set_cache_model(WebKit.CacheModel.DOCUMENT_BROWSER);
         
+        base.startup();
+        
         add_action_entries(action_entries, this);
     }
     


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