Merge branch 'release/debian/0.32.10-1'HEADdebian/0.32.10-1master

1 files changed, 6 insertions, 3 deletions

diff --git a/src/main.vala b/src/main.vala
index 25a0690..e619178 100644
--- a/src/main.vala
+++ b/src/main.vala
@@ -420,6 +420,8 @@ const OptionEntry[] entries = {
 }
 
 void main(string[] args) {
+    Application.timezone = new TimeZone.local();
+
     // Call AppDirs init *before* calling Gtk.init_with_args, as it will strip the
     // exec file from the array
     AppDirs.init(args[0]);
@@ -563,9 +565,9 @@ void main(string[] args) {
         message("Shotwell %s %s",
             is_string_empty(filename) ? Resources.APP_LIBRARY_ROLE : Resources.APP_DIRECT_ROLE,
             Resources.APP_VERSION);
-    debug ("Shotwell is running in timezone %s", new
-           DateTime.now_local().get_timezone_abbreviation ());
-        
+
+    debug ("Shotwell is running in timezone %s", Application.timezone.get_identifier());
+    message ("Shotwell is runing inside %s", AppDirs.get_runtime().to_string());
     // Have a filename here?  If so, configure ourselves for direct
     // mode, otherwise, default to library mode.
     Application.init(!is_string_empty(filename));
@@ -591,6 +593,7 @@ void main(string[] args) {
     
     // set up GLib environment
     GLib.Environment.set_application_name(Resources.APP_TITLE);
+    GLib.Environment.set_prgname("org.gnome.Shotwell");
     
     // in both the case of running as the library or an editor, Resources is always
     // initialized