From b076314018e4b53d745823754a26eb6fb73a2801 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Frings-F=C3=BCrst?= Date: Wed, 19 Oct 2016 05:08:19 +0200 Subject: New upstream version 0.24.1 --- src/main.c | 628 +++++++++++++++++++++++++++++++------------------------------ 1 file changed, 321 insertions(+), 307 deletions(-) (limited to 'src/main.c') diff --git a/src/main.c b/src/main.c index bef5186..8d1726b 100644 --- a/src/main.c +++ b/src/main.c @@ -1,4 +1,4 @@ -/* main.c generated by valac 0.32.1, the Vala compiler +/* main.c generated by valac 0.34.1, the Vala compiler * generated from main.vala, do not modify */ /* Copyright 2016 Software Freedom Conservancy Inc. @@ -381,6 +381,7 @@ typedef struct _ImportUIQuestionParamsClass ImportUIQuestionParamsClass; typedef struct _DirectWindow DirectWindow; typedef struct _DirectWindowClass DirectWindowClass; +#define _g_date_time_unref0(var) ((var == NULL) ? NULL : (var = (g_date_time_unref (var), NULL))) #define _g_timer_destroy0(var) ((var == NULL) ? NULL : (var = (g_timer_destroy (var), NULL))) typedef enum { @@ -698,7 +699,7 @@ static gboolean _progress_dialog_monitor_progress_monitor (guint64 current, guin result = progress_dialog_monitor ((ProgressDialog*) self, current, total, do_event_loop); #line 114 "/home/jens/Source/shotwell/src/main.vala" return result; -#line 702 "main.c" +#line 703 "main.c" } @@ -707,14 +708,14 @@ static gboolean _aggregate_progress_monitor_monitor_progress_monitor (guint64 cu result = aggregate_progress_monitor_monitor ((AggregateProgressMonitor*) self, current, total); #line 115 "/home/jens/Source/shotwell/src/main.vala" return result; -#line 711 "main.c" +#line 712 "main.c" } static gpointer _g_object_ref0 (gpointer self) { #line 185 "/home/jens/Source/shotwell/src/main.vala" return self ? g_object_ref (self) : NULL; -#line 718 "main.c" +#line 719 "main.c" } @@ -798,7 +799,7 @@ void library_exec (gchar** mounts, int mounts_length1) { _tmp1_ = was_already_running; #line 18 "/home/jens/Source/shotwell/src/main.vala" if (_tmp1_) { -#line 802 "main.c" +#line 803 "main.c" gchar** _tmp2_ = NULL; gint _tmp2__length1 = 0; #line 25 "/home/jens/Source/shotwell/src/main.vala" @@ -811,7 +812,7 @@ void library_exec (gchar** mounts, int mounts_length1) { application_send_to_primary_instance (_tmp2_, _tmp2__length1); #line 27 "/home/jens/Source/shotwell/src/main.vala" return; -#line 815 "main.c" +#line 816 "main.c" } #line 31 "/home/jens/Source/shotwell/src/main.vala" _tmp3_ = app_dirs_get_data_subdir ("data", NULL); @@ -827,13 +828,13 @@ void library_exec (gchar** mounts, int mounts_length1) { _g_object_unref0 (_tmp6_); #line 31 "/home/jens/Source/shotwell/src/main.vala" _g_object_unref0 (_tmp4_); -#line 831 "main.c" +#line 832 "main.c" { #line 35 "/home/jens/Source/shotwell/src/main.vala" library_app_init (&_inner_error_); #line 35 "/home/jens/Source/shotwell/src/main.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 837 "main.c" +#line 838 "main.c" goto __catch206_g_error; } } @@ -857,7 +858,7 @@ void library_exec (gchar** mounts, int mounts_length1) { _g_error_free0 (err); #line 39 "/home/jens/Source/shotwell/src/main.vala" return; -#line 861 "main.c" +#line 862 "main.c" } __finally206: #line 34 "/home/jens/Source/shotwell/src/main.vala" @@ -868,7 +869,7 @@ void library_exec (gchar** mounts, int mounts_length1) { g_clear_error (&_inner_error_); #line 34 "/home/jens/Source/shotwell/src/main.vala" return; -#line 872 "main.c" +#line 873 "main.c" } #line 43 "/home/jens/Source/shotwell/src/main.vala" g_message ("main.vala:43: Verifying database ..."); @@ -890,15 +891,15 @@ void library_exec (gchar** mounts, int mounts_length1) { switch (_tmp12_) { #line 48 "/home/jens/Source/shotwell/src/main.vala" case DB_VERIFY_RESULT_OK: -#line 894 "main.c" +#line 895 "main.c" { #line 51 "/home/jens/Source/shotwell/src/main.vala" break; -#line 898 "main.c" +#line 899 "main.c" } #line 48 "/home/jens/Source/shotwell/src/main.vala" case DB_VERIFY_RESULT_FUTURE_VERSION: -#line 902 "main.c" +#line 903 "main.c" { const gchar* _tmp13_ = NULL; const gchar* _tmp14_ = NULL; @@ -920,11 +921,11 @@ void library_exec (gchar** mounts, int mounts_length1) { errormsg = _tmp16_; #line 56 "/home/jens/Source/shotwell/src/main.vala" break; -#line 922 "main.c" +#line 923 "main.c" } #line 48 "/home/jens/Source/shotwell/src/main.vala" case DB_VERIFY_RESULT_UPGRADE_ERROR: -#line 926 "main.c" +#line 927 "main.c" { const gchar* _tmp17_ = NULL; const gchar* _tmp18_ = NULL; @@ -946,11 +947,11 @@ void library_exec (gchar** mounts, int mounts_length1) { errormsg = _tmp20_; #line 62 "/home/jens/Source/shotwell/src/main.vala" break; -#line 946 "main.c" +#line 947 "main.c" } #line 48 "/home/jens/Source/shotwell/src/main.vala" case DB_VERIFY_RESULT_NO_UPGRADE_AVAILABLE: -#line 950 "main.c" +#line 951 "main.c" { const gchar* _tmp21_ = NULL; const gchar* _tmp22_ = NULL; @@ -989,7 +990,7 @@ void library_exec (gchar** mounts, int mounts_length1) { _g_object_unref0 (_tmp25_); #line 68 "/home/jens/Source/shotwell/src/main.vala" break; -#line 986 "main.c" +#line 987 "main.c" } default: { @@ -1011,14 +1012,14 @@ void library_exec (gchar** mounts, int mounts_length1) { errormsg = _tmp32_; #line 73 "/home/jens/Source/shotwell/src/main.vala" break; -#line 1008 "main.c" +#line 1009 "main.c" } } #line 76 "/home/jens/Source/shotwell/src/main.vala" _tmp33_ = errormsg; #line 76 "/home/jens/Source/shotwell/src/main.vala" if (_tmp33_ != NULL) { -#line 1015 "main.c" +#line 1016 "main.c" GtkMessageDialog* dialog = NULL; const gchar* _tmp34_ = NULL; GtkMessageDialog* _tmp35_ = NULL; @@ -1055,7 +1056,7 @@ void library_exec (gchar** mounts, int mounts_length1) { _g_free0 (errormsg); #line 85 "/home/jens/Source/shotwell/src/main.vala" return; -#line 1052 "main.c" +#line 1053 "main.c" } #line 88 "/home/jens/Source/shotwell/src/main.vala" upgrades_init (); @@ -1073,7 +1074,7 @@ void library_exec (gchar** mounts, int mounts_length1) { _tmp39_ = commandline_options_no_startup_progress; #line 94 "/home/jens/Source/shotwell/src/main.vala" if (!_tmp39_) { -#line 1070 "main.c" +#line 1071 "main.c" guint64 grand_total = 0ULL; PhotoTable* _tmp40_ = NULL; PhotoTable* _tmp41_ = NULL; @@ -1140,7 +1141,7 @@ void library_exec (gchar** mounts, int mounts_length1) { _tmp56_ = grand_total; #line 103 "/home/jens/Source/shotwell/src/main.vala" if (_tmp56_ > ((guint64) 5000)) { -#line 1137 "main.c" +#line 1138 "main.c" const gchar* _tmp57_ = NULL; ProgressDialog* _tmp58_ = NULL; ProgressDialog* _tmp59_ = NULL; @@ -1167,7 +1168,7 @@ void library_exec (gchar** mounts, int mounts_length1) { _tmp60_ = progress_dialog; #line 106 "/home/jens/Source/shotwell/src/main.vala" progress_dialog_set_minimum_on_screen_time_msec (_tmp60_, 250); -#line 1164 "main.c" +#line 1165 "main.c" { gchar* icon_path = NULL; GFile* _tmp61_ = NULL; @@ -1216,7 +1217,7 @@ void library_exec (gchar** mounts, int mounts_length1) { if (G_UNLIKELY (_inner_error_ != NULL)) { #line 109 "/home/jens/Source/shotwell/src/main.vala" _g_free0 (icon_path); -#line 1213 "main.c" +#line 1214 "main.c" goto __catch207_g_error; } #line 109 "/home/jens/Source/shotwell/src/main.vala" @@ -1227,7 +1228,7 @@ void library_exec (gchar** mounts, int mounts_length1) { _g_object_unref0 (_tmp69_); #line 107 "/home/jens/Source/shotwell/src/main.vala" _g_free0 (icon_path); -#line 1224 "main.c" +#line 1225 "main.c" } goto __finally207; __catch207_g_error: @@ -1248,7 +1249,7 @@ void library_exec (gchar** mounts, int mounts_length1) { "indow: %s", _tmp74_); #line 107 "/home/jens/Source/shotwell/src/main.vala" _g_error_free0 (err); -#line 1244 "main.c" +#line 1245 "main.c" } __finally207: #line 107 "/home/jens/Source/shotwell/src/main.vala" @@ -1275,7 +1276,7 @@ void library_exec (gchar** mounts, int mounts_length1) { g_clear_error (&_inner_error_); #line 107 "/home/jens/Source/shotwell/src/main.vala" return; -#line 1271 "main.c" +#line 1272 "main.c" } #line 114 "/home/jens/Source/shotwell/src/main.vala" _tmp75_ = grand_total; @@ -1303,7 +1304,7 @@ void library_exec (gchar** mounts, int mounts_length1) { monitor_target = aggregate_progress_monitor_ref (_tmp78_); #line 115 "/home/jens/Source/shotwell/src/main.vala" monitor_target_destroy_notify = aggregate_progress_monitor_unref; -#line 1299 "main.c" +#line 1300 "main.c" } } #line 119 "/home/jens/Source/shotwell/src/main.vala" @@ -1314,13 +1315,13 @@ void library_exec (gchar** mounts, int mounts_length1) { _tmp79_ = aggregate_monitor; #line 122 "/home/jens/Source/shotwell/src/main.vala" if (_tmp79_ != NULL) { -#line 1310 "main.c" +#line 1311 "main.c" AggregateProgressMonitor* _tmp80_ = NULL; #line 123 "/home/jens/Source/shotwell/src/main.vala" _tmp80_ = aggregate_monitor; #line 123 "/home/jens/Source/shotwell/src/main.vala" aggregate_progress_monitor_next_step (_tmp80_, "LibraryPhoto.init"); -#line 1316 "main.c" +#line 1317 "main.c" } #line 124 "/home/jens/Source/shotwell/src/main.vala" _tmp81_ = monitor; @@ -1332,13 +1333,13 @@ void library_exec (gchar** mounts, int mounts_length1) { _tmp82_ = aggregate_monitor; #line 125 "/home/jens/Source/shotwell/src/main.vala" if (_tmp82_ != NULL) { -#line 1328 "main.c" +#line 1329 "main.c" AggregateProgressMonitor* _tmp83_ = NULL; #line 126 "/home/jens/Source/shotwell/src/main.vala" _tmp83_ = aggregate_monitor; #line 126 "/home/jens/Source/shotwell/src/main.vala" aggregate_progress_monitor_next_step (_tmp83_, "Video.init"); -#line 1334 "main.c" +#line 1335 "main.c" } #line 127 "/home/jens/Source/shotwell/src/main.vala" _tmp84_ = monitor; @@ -1350,13 +1351,13 @@ void library_exec (gchar** mounts, int mounts_length1) { _tmp85_ = aggregate_monitor; #line 128 "/home/jens/Source/shotwell/src/main.vala" if (_tmp85_ != NULL) { -#line 1346 "main.c" +#line 1347 "main.c" AggregateProgressMonitor* _tmp86_ = NULL; #line 129 "/home/jens/Source/shotwell/src/main.vala" _tmp86_ = aggregate_monitor; #line 129 "/home/jens/Source/shotwell/src/main.vala" aggregate_progress_monitor_next_step (_tmp86_, "Upgrades.execute"); -#line 1352 "main.c" +#line 1353 "main.c" } #line 130 "/home/jens/Source/shotwell/src/main.vala" _tmp87_ = upgrades_get_instance (); @@ -1390,13 +1391,13 @@ void library_exec (gchar** mounts, int mounts_length1) { _tmp94_ = aggregate_monitor; #line 138 "/home/jens/Source/shotwell/src/main.vala" if (_tmp94_ != NULL) { -#line 1386 "main.c" +#line 1387 "main.c" AggregateProgressMonitor* _tmp95_ = NULL; #line 139 "/home/jens/Source/shotwell/src/main.vala" _tmp95_ = aggregate_monitor; #line 139 "/home/jens/Source/shotwell/src/main.vala" aggregate_progress_monitor_next_step (_tmp95_, "Event.init"); -#line 1392 "main.c" +#line 1393 "main.c" } #line 140 "/home/jens/Source/shotwell/src/main.vala" _tmp96_ = monitor; @@ -1408,13 +1409,13 @@ void library_exec (gchar** mounts, int mounts_length1) { _tmp97_ = aggregate_monitor; #line 141 "/home/jens/Source/shotwell/src/main.vala" if (_tmp97_ != NULL) { -#line 1404 "main.c" +#line 1405 "main.c" AggregateProgressMonitor* _tmp98_ = NULL; #line 142 "/home/jens/Source/shotwell/src/main.vala" _tmp98_ = aggregate_monitor; #line 142 "/home/jens/Source/shotwell/src/main.vala" aggregate_progress_monitor_next_step (_tmp98_, "Tag.init"); -#line 1410 "main.c" +#line 1411 "main.c" } #line 143 "/home/jens/Source/shotwell/src/main.vala" _tmp99_ = monitor; @@ -1438,13 +1439,13 @@ void library_exec (gchar** mounts, int mounts_length1) { _tmp102_ = aggregate_monitor; #line 151 "/home/jens/Source/shotwell/src/main.vala" if (_tmp102_ != NULL) { -#line 1434 "main.c" +#line 1435 "main.c" AggregateProgressMonitor* _tmp103_ = NULL; #line 152 "/home/jens/Source/shotwell/src/main.vala" _tmp103_ = aggregate_monitor; #line 152 "/home/jens/Source/shotwell/src/main.vala" aggregate_progress_monitor_next_step (_tmp103_, "LibraryWindow"); -#line 1440 "main.c" +#line 1441 "main.c" } #line 153 "/home/jens/Source/shotwell/src/main.vala" _tmp104_ = monitor; @@ -1460,13 +1461,13 @@ void library_exec (gchar** mounts, int mounts_length1) { _tmp106_ = aggregate_monitor; #line 155 "/home/jens/Source/shotwell/src/main.vala" if (_tmp106_ != NULL) { -#line 1456 "main.c" +#line 1457 "main.c" AggregateProgressMonitor* _tmp107_ = NULL; #line 156 "/home/jens/Source/shotwell/src/main.vala" _tmp107_ = aggregate_monitor; #line 156 "/home/jens/Source/shotwell/src/main.vala" aggregate_progress_monitor_next_step (_tmp107_, "done"); -#line 1462 "main.c" +#line 1463 "main.c" } #line 161 "/home/jens/Source/shotwell/src/main.vala" (monitor_target_destroy_notify == NULL) ? NULL : (monitor_target_destroy_notify (monitor_target), NULL); @@ -1490,13 +1491,13 @@ void library_exec (gchar** mounts, int mounts_length1) { _tmp108_ = progress_dialog; #line 163 "/home/jens/Source/shotwell/src/main.vala" if (_tmp108_ != NULL) { -#line 1486 "main.c" +#line 1487 "main.c" ProgressDialog* _tmp109_ = NULL; #line 164 "/home/jens/Source/shotwell/src/main.vala" _tmp109_ = progress_dialog; #line 164 "/home/jens/Source/shotwell/src/main.vala" gtk_widget_destroy (G_TYPE_CHECK_INSTANCE_CAST (_tmp109_, gtk_widget_get_type (), GtkWidget)); -#line 1492 "main.c" +#line 1493 "main.c" } #line 165 "/home/jens/Source/shotwell/src/main.vala" _g_object_unref0 (progress_dialog); @@ -1506,7 +1507,7 @@ void library_exec (gchar** mounts, int mounts_length1) { _tmp110_ = mounts; #line 168 "/home/jens/Source/shotwell/src/main.vala" _tmp110__length1 = mounts_length1; -#line 1502 "main.c" +#line 1503 "main.c" { gchar** mount_collection = NULL; gint mount_collection_length1 = 0; @@ -1518,14 +1519,14 @@ void library_exec (gchar** mounts, int mounts_length1) { mount_collection_length1 = _tmp110__length1; #line 168 "/home/jens/Source/shotwell/src/main.vala" for (mount_it = 0; mount_it < _tmp110__length1; mount_it = mount_it + 1) { -#line 1514 "main.c" +#line 1515 "main.c" gchar* _tmp111_ = NULL; gchar* mount = NULL; #line 168 "/home/jens/Source/shotwell/src/main.vala" _tmp111_ = g_strdup (mount_collection[mount_it]); #line 168 "/home/jens/Source/shotwell/src/main.vala" mount = _tmp111_; -#line 1521 "main.c" +#line 1522 "main.c" { LibraryWindow* _tmp112_ = NULL; const gchar* _tmp113_ = NULL; @@ -1537,7 +1538,7 @@ void library_exec (gchar** mounts, int mounts_length1) { library_window_mounted_camera_shell_notification (_tmp112_, _tmp113_, TRUE); #line 168 "/home/jens/Source/shotwell/src/main.vala" _g_free0 (mount); -#line 1533 "main.c" +#line 1534 "main.c" } } } @@ -1565,7 +1566,7 @@ void library_exec (gchar** mounts, int mounts_length1) { _g_object_unref0 (_tmp118_); #line 174 "/home/jens/Source/shotwell/src/main.vala" if (_tmp120_) { -#line 1561 "main.c" +#line 1562 "main.c" LibraryPhotoSourceCollection* _tmp121_ = NULL; gint _tmp122_ = 0; #line 175 "/home/jens/Source/shotwell/src/main.vala" @@ -1574,15 +1575,15 @@ void library_exec (gchar** mounts, int mounts_length1) { _tmp122_ = data_collection_get_count (G_TYPE_CHECK_INSTANCE_CAST (_tmp121_, TYPE_DATA_COLLECTION, DataCollection)); #line 175 "/home/jens/Source/shotwell/src/main.vala" _tmp116_ = _tmp122_ == 0; -#line 1570 "main.c" +#line 1571 "main.c" } else { #line 174 "/home/jens/Source/shotwell/src/main.vala" _tmp116_ = FALSE; -#line 1574 "main.c" +#line 1575 "main.c" } #line 174 "/home/jens/Source/shotwell/src/main.vala" if (_tmp116_) { -#line 1578 "main.c" +#line 1579 "main.c" WelcomeDialog* welcome = NULL; LibraryWindow* _tmp123_ = NULL; WelcomeDialog* _tmp124_ = NULL; @@ -1625,7 +1626,7 @@ void library_exec (gchar** mounts, int mounts_length1) { _g_object_unref0 (_tmp126_); #line 174 "/home/jens/Source/shotwell/src/main.vala" _g_object_unref0 (welcome); -#line 1621 "main.c" +#line 1622 "main.c" } else { ConfigFacade* _tmp132_ = NULL; ConfigFacade* _tmp133_ = NULL; @@ -1637,7 +1638,7 @@ void library_exec (gchar** mounts, int mounts_length1) { configuration_facade_set_show_welcome_dialog (G_TYPE_CHECK_INSTANCE_CAST (_tmp133_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade), FALSE); #line 180 "/home/jens/Source/shotwell/src/main.vala" _g_object_unref0 (_tmp133_); -#line 1633 "main.c" +#line 1634 "main.c" } #line 183 "/home/jens/Source/shotwell/src/main.vala" _tmp134_ = selected_import_entries; @@ -1645,7 +1646,7 @@ void library_exec (gchar** mounts, int mounts_length1) { _tmp134__length1 = selected_import_entries_length1; #line 183 "/home/jens/Source/shotwell/src/main.vala" if (_tmp134__length1 > 0) { -#line 1641 "main.c" +#line 1642 "main.c" WelcomeServiceEntry** _tmp135_ = NULL; gint _tmp135__length1 = 0; #line 184 "/home/jens/Source/shotwell/src/main.vala" @@ -1654,7 +1655,7 @@ void library_exec (gchar** mounts, int mounts_length1) { _tmp135_ = selected_import_entries; #line 185 "/home/jens/Source/shotwell/src/main.vala" _tmp135__length1 = selected_import_entries_length1; -#line 1650 "main.c" +#line 1651 "main.c" { WelcomeServiceEntry** entry_collection = NULL; gint entry_collection_length1 = 0; @@ -1666,14 +1667,14 @@ void library_exec (gchar** mounts, int mounts_length1) { entry_collection_length1 = _tmp135__length1; #line 185 "/home/jens/Source/shotwell/src/main.vala" for (entry_it = 0; entry_it < _tmp135__length1; entry_it = entry_it + 1) { -#line 1662 "main.c" +#line 1663 "main.c" WelcomeServiceEntry* _tmp136_ = NULL; WelcomeServiceEntry* entry = NULL; #line 185 "/home/jens/Source/shotwell/src/main.vala" _tmp136_ = _g_object_ref0 (entry_collection[entry_it]); #line 185 "/home/jens/Source/shotwell/src/main.vala" entry = _tmp136_; -#line 1669 "main.c" +#line 1670 "main.c" { WelcomeServiceEntry* _tmp137_ = NULL; #line 186 "/home/jens/Source/shotwell/src/main.vala" @@ -1682,7 +1683,7 @@ void library_exec (gchar** mounts, int mounts_length1) { welcome_service_entry_execute (_tmp137_); #line 185 "/home/jens/Source/shotwell/src/main.vala" _g_object_unref0 (entry); -#line 1678 "main.c" +#line 1679 "main.c" } } } @@ -1693,7 +1694,7 @@ void library_exec (gchar** mounts, int mounts_length1) { if (_tmp138_) { #line 192 "/home/jens/Source/shotwell/src/main.vala" run_system_pictures_import (NULL); -#line 1689 "main.c" +#line 1690 "main.c" } #line 195 "/home/jens/Source/shotwell/src/main.vala" _tmp139_ = startup_timer; @@ -1753,14 +1754,14 @@ void library_exec (gchar** mounts, int mounts_length1) { _g_free0 (app_version); #line 15 "/home/jens/Source/shotwell/src/main.vala" _g_free0 (errormsg); -#line 1749 "main.c" +#line 1750 "main.c" } static void _report_system_pictures_import_batch_import_import_reporter (ImportManifest* manifest, BatchImportRoll* import_roll, gpointer self) { #line 224 "/home/jens/Source/shotwell/src/main.vala" report_system_pictures_import (manifest, import_roll); -#line 1756 "main.c" +#line 1757 "main.c" } @@ -1790,7 +1791,7 @@ void run_system_pictures_import (ImportManifest* external_exclusion_manifest) { if (!_tmp0_) { #line 217 "/home/jens/Source/shotwell/src/main.vala" return; -#line 1786 "main.c" +#line 1787 "main.c" } #line 219 "/home/jens/Source/shotwell/src/main.vala" _tmp1_ = gee_array_list_new (TYPE_FILE_IMPORT_JOB, (GBoxedCopyFunc) batch_import_job_ref, batch_import_job_unref, NULL, NULL, NULL); @@ -1840,7 +1841,7 @@ void run_system_pictures_import (ImportManifest* external_exclusion_manifest) { _g_object_unref0 (library_window); #line 215 "/home/jens/Source/shotwell/src/main.vala" _g_object_unref0 (jobs); -#line 1836 "main.c" +#line 1837 "main.c" } @@ -1856,7 +1857,7 @@ void report_system_pictures_import (ImportManifest* manifest, BatchImportRoll* i _tmp1_ = do_external_import; #line 238 "/home/jens/Source/shotwell/src/main.vala" if (_tmp1_) { -#line 1852 "main.c" +#line 1853 "main.c" ImportManifest* _tmp2_ = NULL; GeeList* _tmp3_ = NULL; gint _tmp4_ = 0; @@ -1871,23 +1872,23 @@ void report_system_pictures_import (ImportManifest* manifest, BatchImportRoll* i _tmp5_ = _tmp4_; #line 238 "/home/jens/Source/shotwell/src/main.vala" _tmp0_ = _tmp5_ == 0; -#line 1867 "main.c" +#line 1868 "main.c" } else { #line 238 "/home/jens/Source/shotwell/src/main.vala" _tmp0_ = FALSE; -#line 1871 "main.c" +#line 1872 "main.c" } #line 238 "/home/jens/Source/shotwell/src/main.vala" if (_tmp0_) { #line 239 "/home/jens/Source/shotwell/src/main.vala" return; -#line 1877 "main.c" +#line 1878 "main.c" } #line 241 "/home/jens/Source/shotwell/src/main.vala" _tmp6_ = manifest; #line 241 "/home/jens/Source/shotwell/src/main.vala" import_ui_report_manifest (_tmp6_, TRUE, NULL); -#line 1883 "main.c" +#line 1884 "main.c" } @@ -1919,13 +1920,13 @@ void editing_exec (const gchar* filename) { direct_preconfigure (_tmp2_); #line 249 "/home/jens/Source/shotwell/src/main.vala" db_preconfigure (NULL); -#line 1915 "main.c" +#line 1916 "main.c" { #line 253 "/home/jens/Source/shotwell/src/main.vala" direct_app_init (&_inner_error_); #line 253 "/home/jens/Source/shotwell/src/main.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 1921 "main.c" +#line 1922 "main.c" goto __catch208_g_error; } } @@ -1951,7 +1952,7 @@ void editing_exec (const gchar* filename) { _g_object_unref0 (initial_file); #line 257 "/home/jens/Source/shotwell/src/main.vala" return; -#line 1947 "main.c" +#line 1948 "main.c" } __finally208: #line 252 "/home/jens/Source/shotwell/src/main.vala" @@ -1964,7 +1965,7 @@ void editing_exec (const gchar* filename) { g_clear_error (&_inner_error_); #line 252 "/home/jens/Source/shotwell/src/main.vala" return; -#line 1960 "main.c" +#line 1961 "main.c" } #line 261 "/home/jens/Source/shotwell/src/main.vala" desktop_integration_init (); @@ -2002,14 +2003,14 @@ void editing_exec (const gchar* filename) { _g_object_unref0 (direct_window); #line 244 "/home/jens/Source/shotwell/src/main.vala" _g_object_unref0 (initial_file); -#line 1998 "main.c" +#line 1999 "main.c" } static GOptionEntry* _vala_array_dup26 (GOptionEntry* self, int length) { #line 291 "/home/jens/Source/shotwell/src/main.vala" return g_memdup (self, length * sizeof (GOptionEntry)); -#line 2005 "main.c" +#line 2006 "main.c" } @@ -2020,11 +2021,11 @@ static void _vala_array_add152 (GOptionEntry** array, int* length, int* size, co *size = (*size) ? (2 * (*size)) : 4; #line 295 "/home/jens/Source/shotwell/src/main.vala" *array = g_renew (GOptionEntry, *array, *size); -#line 2016 "main.c" +#line 2017 "main.c" } #line 295 "/home/jens/Source/shotwell/src/main.vala" (*array)[(*length)++] = *value; -#line 2020 "main.c" +#line 2021 "main.c" } @@ -2035,11 +2036,11 @@ static void _vala_array_add153 (GOptionEntry** array, int* length, int* size, co *size = (*size) ? (2 * (*size)) : 4; #line 299 "/home/jens/Source/shotwell/src/main.vala" *array = g_renew (GOptionEntry, *array, *size); -#line 2031 "main.c" +#line 2032 "main.c" } #line 299 "/home/jens/Source/shotwell/src/main.vala" (*array)[(*length)++] = *value; -#line 2035 "main.c" +#line 2036 "main.c" } @@ -2050,11 +2051,11 @@ static void _vala_array_add154 (GOptionEntry** array, int* length, int* size, co *size = (*size) ? (2 * (*size)) : 4; #line 303 "/home/jens/Source/shotwell/src/main.vala" *array = g_renew (GOptionEntry, *array, *size); -#line 2046 "main.c" +#line 2047 "main.c" } #line 303 "/home/jens/Source/shotwell/src/main.vala" (*array)[(*length)++] = *value; -#line 2050 "main.c" +#line 2051 "main.c" } @@ -2065,11 +2066,11 @@ static void _vala_array_add155 (GOptionEntry** array, int* length, int* size, co *size = (*size) ? (2 * (*size)) : 4; #line 307 "/home/jens/Source/shotwell/src/main.vala" *array = g_renew (GOptionEntry, *array, *size); -#line 2061 "main.c" +#line 2062 "main.c" } #line 307 "/home/jens/Source/shotwell/src/main.vala" (*array)[(*length)++] = *value; -#line 2065 "main.c" +#line 2066 "main.c" } @@ -2080,18 +2081,18 @@ static void _vala_array_add156 (GOptionEntry** array, int* length, int* size, co *size = (*size) ? (2 * (*size)) : 4; #line 310 "/home/jens/Source/shotwell/src/main.vala" *array = g_renew (GOptionEntry, *array, *size); -#line 2076 "main.c" +#line 2077 "main.c" } #line 310 "/home/jens/Source/shotwell/src/main.vala" (*array)[(*length)++] = *value; -#line 2080 "main.c" +#line 2081 "main.c" } static GOptionEntry* _vala_array_dup27 (GOptionEntry* self, int length) { #line 312 "/home/jens/Source/shotwell/src/main.vala" return g_memdup (self, length * sizeof (GOptionEntry)); -#line 2087 "main.c" +#line 2088 "main.c" } @@ -2141,7 +2142,7 @@ GOptionEntry* commandline_options_get_options (int* result_length1) { _tmp0__length1 = commandline_options_entries_length1; #line 290 "/home/jens/Source/shotwell/src/main.vala" if (_tmp0_ != NULL) { -#line 2137 "main.c" +#line 2138 "main.c" GOptionEntry* _tmp1_ = NULL; gint _tmp1__length1 = 0; GOptionEntry* _tmp2_ = NULL; @@ -2164,13 +2165,13 @@ GOptionEntry* commandline_options_get_options (int* result_length1) { if (result_length1) { #line 291 "/home/jens/Source/shotwell/src/main.vala" *result_length1 = _tmp3__length1; -#line 2160 "main.c" +#line 2161 "main.c" } #line 291 "/home/jens/Source/shotwell/src/main.vala" result = _tmp3_; #line 291 "/home/jens/Source/shotwell/src/main.vala" return result; -#line 2166 "main.c" +#line 2167 "main.c" } #line 293 "/home/jens/Source/shotwell/src/main.vala" _tmp4_ = _ ("Path to Shotwell's private data"); @@ -2318,13 +2319,13 @@ GOptionEntry* commandline_options_get_options (int* result_length1) { if (result_length1) { #line 312 "/home/jens/Source/shotwell/src/main.vala" *result_length1 = _tmp26__length1; -#line 2314 "main.c" +#line 2315 "main.c" } #line 312 "/home/jens/Source/shotwell/src/main.vala" result = _tmp26_; #line 312 "/home/jens/Source/shotwell/src/main.vala" return result; -#line 2320 "main.c" +#line 2321 "main.c" } @@ -2335,13 +2336,13 @@ static void _vala_array_add157 (gchar*** array, int* length, int* size, gchar* v *size = (*size) ? (2 * (*size)) : 4; #line 372 "/home/jens/Source/shotwell/src/main.vala" *array = g_renew (gchar*, *array, (*size) + 1); -#line 2331 "main.c" +#line 2332 "main.c" } #line 372 "/home/jens/Source/shotwell/src/main.vala" (*array)[(*length)++] = value; #line 372 "/home/jens/Source/shotwell/src/main.vala" (*array)[*length] = NULL; -#line 2337 "main.c" +#line 2338 "main.c" } @@ -2349,19 +2350,19 @@ static gboolean string_contains (const gchar* self, const gchar* needle) { gboolean result = FALSE; const gchar* _tmp0_ = NULL; gchar* _tmp1_ = NULL; -#line 1376 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1376 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" g_return_val_if_fail (self != NULL, FALSE); -#line 1376 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1376 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" g_return_val_if_fail (needle != NULL, FALSE); -#line 1377 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1377 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp0_ = needle; -#line 1377 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1377 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp1_ = strstr ((gchar*) self, (gchar*) _tmp0_); -#line 1377 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1377 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" result = _tmp1_ != NULL; -#line 1377 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1377 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" return result; -#line 2357 "main.c" +#line 2358 "main.c" } @@ -2381,18 +2382,21 @@ void _vala_main (gchar** args, int args_length1) { const gchar* _tmp44_ = NULL; const gchar* _tmp45_ = NULL; gboolean _tmp46_ = FALSE; - const gchar* _tmp53_ = NULL; - gboolean _tmp54_ = FALSE; + GDateTime* _tmp53_ = NULL; + GDateTime* _tmp54_ = NULL; const gchar* _tmp55_ = NULL; - gchar** _tmp57_ = NULL; - gint _tmp57__length1 = 0; - GTimer* _tmp58_ = NULL; - GTimer* _tmp59_ = NULL; - const gchar* _tmp60_ = NULL; - gboolean _tmp61_ = FALSE; + const gchar* _tmp56_ = NULL; + gboolean _tmp57_ = FALSE; + const gchar* _tmp58_ = NULL; + gchar** _tmp60_ = NULL; + gint _tmp60__length1 = 0; + GTimer* _tmp61_ = NULL; + GTimer* _tmp62_ = NULL; + const gchar* _tmp63_ = NULL; gboolean _tmp64_ = FALSE; - const gchar* _tmp65_ = NULL; - gboolean _tmp66_ = FALSE; + gboolean _tmp67_ = FALSE; + const gchar* _tmp68_ = NULL; + gboolean _tmp69_ = FALSE; GError * _inner_error_ = NULL; #line 320 "/home/jens/Source/shotwell/src/main.vala" _tmp0_ = args; @@ -2414,7 +2418,7 @@ void _vala_main (gchar** args, int args_length1) { _g_object_unref0 (_tmp3_); #line 331 "/home/jens/Source/shotwell/src/main.vala" if (_tmp4_) { -#line 2410 "main.c" +#line 2414 "main.c" GFile* _tmp5_ = NULL; GFile* _tmp6_ = NULL; gchar* _tmp7_ = NULL; @@ -2441,7 +2445,7 @@ void _vala_main (gchar** args, int args_length1) { _g_free0 (_tmp8_); #line 332 "/home/jens/Source/shotwell/src/main.vala" _g_object_unref0 (_tmp6_); -#line 2437 "main.c" +#line 2441 "main.c" } { const gchar* _tmp11_ = NULL; @@ -2463,7 +2467,7 @@ void _vala_main (gchar** args, int args_length1) { _tmp14_ = (g_free (_tmp14_), NULL); #line 338 "/home/jens/Source/shotwell/src/main.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 2459 "main.c" +#line 2463 "main.c" goto __catch209_g_error; } } @@ -2511,7 +2515,7 @@ void _vala_main (gchar** args, int args_length1) { _g_error_free0 (e); #line 344 "/home/jens/Source/shotwell/src/main.vala" return; -#line 2507 "main.c" +#line 2511 "main.c" } __finally209: #line 337 "/home/jens/Source/shotwell/src/main.vala" @@ -2522,7 +2526,7 @@ void _vala_main (gchar** args, int args_length1) { g_clear_error (&_inner_error_); #line 337 "/home/jens/Source/shotwell/src/main.vala" return; -#line 2518 "main.c" +#line 2522 "main.c" } #line 347 "/home/jens/Source/shotwell/src/main.vala" _tmp22_ = commandline_options_show_version; @@ -2532,17 +2536,17 @@ void _vala_main (gchar** args, int args_length1) { if (RESOURCES_GIT_VERSION != NULL) { #line 349 "/home/jens/Source/shotwell/src/main.vala" g_print ("%s %s (%s)\n", RESOURCES_APP_TITLE, RESOURCES_APP_VERSION, RESOURCES_GIT_VERSION); -#line 2528 "main.c" +#line 2532 "main.c" } else { #line 351 "/home/jens/Source/shotwell/src/main.vala" g_print ("%s %s\n", RESOURCES_APP_TITLE, RESOURCES_APP_VERSION); -#line 2532 "main.c" +#line 2536 "main.c" } #line 353 "/home/jens/Source/shotwell/src/main.vala" app_dirs_terminate (); #line 355 "/home/jens/Source/shotwell/src/main.vala" return; -#line 2538 "main.c" +#line 2542 "main.c" } #line 365 "/home/jens/Source/shotwell/src/main.vala" _tmp23_ = g_new0 (gchar*, 0 + 1); @@ -2554,19 +2558,19 @@ void _vala_main (gchar** args, int args_length1) { _mounts_size_ = mounts_length1; #line 366 "/home/jens/Source/shotwell/src/main.vala" filename = NULL; -#line 2550 "main.c" +#line 2554 "main.c" { gint ctr = 0; #line 368 "/home/jens/Source/shotwell/src/main.vala" ctr = 1; -#line 2555 "main.c" +#line 2559 "main.c" { gboolean _tmp24_ = FALSE; #line 368 "/home/jens/Source/shotwell/src/main.vala" _tmp24_ = TRUE; #line 368 "/home/jens/Source/shotwell/src/main.vala" while (TRUE) { -#line 2562 "main.c" +#line 2566 "main.c" gint _tmp26_ = 0; gchar** _tmp27_ = NULL; gint _tmp27__length1 = 0; @@ -2580,13 +2584,13 @@ void _vala_main (gchar** args, int args_length1) { gboolean _tmp33_ = FALSE; #line 368 "/home/jens/Source/shotwell/src/main.vala" if (!_tmp24_) { -#line 2576 "main.c" +#line 2580 "main.c" gint _tmp25_ = 0; #line 368 "/home/jens/Source/shotwell/src/main.vala" _tmp25_ = ctr; #line 368 "/home/jens/Source/shotwell/src/main.vala" ctr = _tmp25_ + 1; -#line 2582 "main.c" +#line 2586 "main.c" } #line 368 "/home/jens/Source/shotwell/src/main.vala" _tmp24_ = FALSE; @@ -2600,7 +2604,7 @@ void _vala_main (gchar** args, int args_length1) { if (!(_tmp26_ < _tmp27__length1)) { #line 368 "/home/jens/Source/shotwell/src/main.vala" break; -#line 2596 "main.c" +#line 2600 "main.c" } #line 369 "/home/jens/Source/shotwell/src/main.vala" _tmp28_ = args; @@ -2620,7 +2624,7 @@ void _vala_main (gchar** args, int args_length1) { _tmp33_ = library_window_is_mount_uri_supported (_tmp32_); #line 371 "/home/jens/Source/shotwell/src/main.vala" if (_tmp33_) { -#line 2616 "main.c" +#line 2620 "main.c" gchar** _tmp34_ = NULL; gint _tmp34__length1 = 0; const gchar* _tmp35_ = NULL; @@ -2635,7 +2639,7 @@ void _vala_main (gchar** args, int args_length1) { _tmp36_ = g_strdup (_tmp35_); #line 372 "/home/jens/Source/shotwell/src/main.vala" _vala_array_add157 (&mounts, &mounts_length1, &_mounts_size_, _tmp36_); -#line 2631 "main.c" +#line 2635 "main.c" } else { gboolean _tmp37_ = FALSE; const gchar* _tmp38_ = NULL; @@ -2646,7 +2650,7 @@ void _vala_main (gchar** args, int args_length1) { _tmp39_ = is_string_empty (_tmp38_); #line 373 "/home/jens/Source/shotwell/src/main.vala" if (_tmp39_) { -#line 2642 "main.c" +#line 2646 "main.c" const gchar* _tmp40_ = NULL; gboolean _tmp41_ = FALSE; #line 373 "/home/jens/Source/shotwell/src/main.vala" @@ -2655,15 +2659,15 @@ void _vala_main (gchar** args, int args_length1) { _tmp41_ = string_contains (_tmp40_, "://"); #line 373 "/home/jens/Source/shotwell/src/main.vala" _tmp37_ = !_tmp41_; -#line 2651 "main.c" +#line 2655 "main.c" } else { #line 373 "/home/jens/Source/shotwell/src/main.vala" _tmp37_ = FALSE; -#line 2655 "main.c" +#line 2659 "main.c" } #line 373 "/home/jens/Source/shotwell/src/main.vala" if (_tmp37_) { -#line 2659 "main.c" +#line 2663 "main.c" const gchar* _tmp42_ = NULL; gchar* _tmp43_ = NULL; #line 374 "/home/jens/Source/shotwell/src/main.vala" @@ -2674,12 +2678,12 @@ void _vala_main (gchar** args, int args_length1) { _g_free0 (filename); #line 374 "/home/jens/Source/shotwell/src/main.vala" filename = _tmp43_; -#line 2670 "main.c" +#line 2674 "main.c" } } #line 368 "/home/jens/Source/shotwell/src/main.vala" _g_free0 (arg); -#line 2675 "main.c" +#line 2679 "main.c" } } } @@ -2691,17 +2695,17 @@ void _vala_main (gchar** args, int args_length1) { if (_tmp46_) { #line 378 "/home/jens/Source/shotwell/src/main.vala" _tmp44_ = DEBUG_LIBRARY_PREFIX; -#line 2687 "main.c" +#line 2691 "main.c" } else { #line 378 "/home/jens/Source/shotwell/src/main.vala" _tmp44_ = DEBUG_VIEWER_PREFIX; -#line 2691 "main.c" +#line 2695 "main.c" } #line 378 "/home/jens/Source/shotwell/src/main.vala" debug_init (_tmp44_); #line 380 "/home/jens/Source/shotwell/src/main.vala" if (RESOURCES_GIT_VERSION != NULL) { -#line 2697 "main.c" +#line 2701 "main.c" const gchar* _tmp47_ = NULL; const gchar* _tmp48_ = NULL; gboolean _tmp49_ = FALSE; @@ -2713,15 +2717,15 @@ void _vala_main (gchar** args, int args_length1) { if (_tmp49_) { #line 382 "/home/jens/Source/shotwell/src/main.vala" _tmp47_ = RESOURCES_APP_LIBRARY_ROLE; -#line 2709 "main.c" +#line 2713 "main.c" } else { #line 382 "/home/jens/Source/shotwell/src/main.vala" _tmp47_ = RESOURCES_APP_DIRECT_ROLE; -#line 2713 "main.c" +#line 2717 "main.c" } #line 381 "/home/jens/Source/shotwell/src/main.vala" g_message ("main.vala:381: Shotwell %s %s (%s)", _tmp47_, RESOURCES_APP_VERSION, RESOURCES_GIT_VERSION); -#line 2717 "main.c" +#line 2721 "main.c" } else { const gchar* _tmp50_ = NULL; const gchar* _tmp51_ = NULL; @@ -2734,244 +2738,254 @@ void _vala_main (gchar** args, int args_length1) { if (_tmp52_) { #line 386 "/home/jens/Source/shotwell/src/main.vala" _tmp50_ = RESOURCES_APP_LIBRARY_ROLE; -#line 2730 "main.c" +#line 2734 "main.c" } else { #line 386 "/home/jens/Source/shotwell/src/main.vala" _tmp50_ = RESOURCES_APP_DIRECT_ROLE; -#line 2734 "main.c" +#line 2738 "main.c" } #line 385 "/home/jens/Source/shotwell/src/main.vala" g_message ("main.vala:385: Shotwell %s %s", _tmp50_, RESOURCES_APP_VERSION); -#line 2738 "main.c" +#line 2742 "main.c" } -#line 391 "/home/jens/Source/shotwell/src/main.vala" - _tmp53_ = filename; -#line 391 "/home/jens/Source/shotwell/src/main.vala" - _tmp54_ = is_string_empty (_tmp53_); -#line 391 "/home/jens/Source/shotwell/src/main.vala" - application_init (!_tmp54_); +#line 389 "/home/jens/Source/shotwell/src/main.vala" + _tmp53_ = g_date_time_new_now_local (); +#line 389 "/home/jens/Source/shotwell/src/main.vala" + _tmp54_ = _tmp53_; +#line 389 "/home/jens/Source/shotwell/src/main.vala" + _tmp55_ = g_date_time_get_timezone_abbreviation (_tmp54_); +#line 389 "/home/jens/Source/shotwell/src/main.vala" + g_debug ("main.vala:389: Shotwell is running in timezone %s", _tmp55_); +#line 389 "/home/jens/Source/shotwell/src/main.vala" + _g_date_time_unref0 (_tmp54_); #line 394 "/home/jens/Source/shotwell/src/main.vala" - _tmp55_ = commandline_options_data_dir; + _tmp56_ = filename; #line 394 "/home/jens/Source/shotwell/src/main.vala" - if (_tmp55_ != NULL) { -#line 2750 "main.c" - const gchar* _tmp56_ = NULL; -#line 395 "/home/jens/Source/shotwell/src/main.vala" - _tmp56_ = commandline_options_data_dir; -#line 395 "/home/jens/Source/shotwell/src/main.vala" - app_dirs_set_data_dir (_tmp56_); -#line 2756 "main.c" - } else { + _tmp57_ = is_string_empty (_tmp56_); +#line 394 "/home/jens/Source/shotwell/src/main.vala" + application_init (!_tmp57_); #line 397 "/home/jens/Source/shotwell/src/main.vala" + _tmp58_ = commandline_options_data_dir; +#line 397 "/home/jens/Source/shotwell/src/main.vala" + if (_tmp58_ != NULL) { +#line 2764 "main.c" + const gchar* _tmp59_ = NULL; +#line 398 "/home/jens/Source/shotwell/src/main.vala" + _tmp59_ = commandline_options_data_dir; +#line 398 "/home/jens/Source/shotwell/src/main.vala" + app_dirs_set_data_dir (_tmp59_); +#line 2770 "main.c" + } else { +#line 400 "/home/jens/Source/shotwell/src/main.vala" app_dirs_try_migrate_data (); -#line 2760 "main.c" +#line 2774 "main.c" } -#line 400 "/home/jens/Source/shotwell/src/main.vala" +#line 403 "/home/jens/Source/shotwell/src/main.vala" app_dirs_verify_data_dir (); -#line 401 "/home/jens/Source/shotwell/src/main.vala" - app_dirs_verify_cache_dir (); -#line 404 "/home/jens/Source/shotwell/src/main.vala" - _tmp57_ = args; #line 404 "/home/jens/Source/shotwell/src/main.vala" - _tmp57__length1 = args_length1; -#line 404 "/home/jens/Source/shotwell/src/main.vala" - international_support_init (RESOURCES_APP_GETTEXT_PACKAGE, _tmp57_, _tmp57__length1, INTERNATIONAL_SUPPORT_SYSTEM_LOCALE); -#line 406 "/home/jens/Source/shotwell/src/main.vala" - _tmp58_ = g_timer_new (); -#line 406 "/home/jens/Source/shotwell/src/main.vala" - _g_timer_destroy0 (startup_timer); -#line 406 "/home/jens/Source/shotwell/src/main.vala" - startup_timer = _tmp58_; + app_dirs_verify_cache_dir (); #line 407 "/home/jens/Source/shotwell/src/main.vala" - _tmp59_ = startup_timer; + _tmp60_ = args; #line 407 "/home/jens/Source/shotwell/src/main.vala" - g_timer_start (_tmp59_); + _tmp60__length1 = args_length1; +#line 407 "/home/jens/Source/shotwell/src/main.vala" + international_support_init (RESOURCES_APP_GETTEXT_PACKAGE, _tmp60_, _tmp60__length1, INTERNATIONAL_SUPPORT_SYSTEM_LOCALE); +#line 409 "/home/jens/Source/shotwell/src/main.vala" + _tmp61_ = g_timer_new (); +#line 409 "/home/jens/Source/shotwell/src/main.vala" + _g_timer_destroy0 (startup_timer); +#line 409 "/home/jens/Source/shotwell/src/main.vala" + startup_timer = _tmp61_; #line 410 "/home/jens/Source/shotwell/src/main.vala" + _tmp62_ = startup_timer; +#line 410 "/home/jens/Source/shotwell/src/main.vala" + g_timer_start (_tmp62_); +#line 413 "/home/jens/Source/shotwell/src/main.vala" g_set_application_name (RESOURCES_APP_TITLE); -#line 414 "/home/jens/Source/shotwell/src/main.vala" +#line 417 "/home/jens/Source/shotwell/src/main.vala" resources_init (); -#line 419 "/home/jens/Source/shotwell/src/main.vala" - _tmp60_ = filename; -#line 419 "/home/jens/Source/shotwell/src/main.vala" - _tmp61_ = is_string_empty (_tmp60_); -#line 419 "/home/jens/Source/shotwell/src/main.vala" - if (_tmp61_) { -#line 2792 "main.c" - gchar** _tmp62_ = NULL; - gint _tmp62__length1 = 0; -#line 420 "/home/jens/Source/shotwell/src/main.vala" - _tmp62_ = mounts; -#line 420 "/home/jens/Source/shotwell/src/main.vala" - _tmp62__length1 = mounts_length1; -#line 420 "/home/jens/Source/shotwell/src/main.vala" - library_exec (_tmp62_, _tmp62__length1); -#line 2801 "main.c" - } else { - const gchar* _tmp63_ = NULL; #line 422 "/home/jens/Source/shotwell/src/main.vala" - _tmp63_ = filename; + _tmp63_ = filename; #line 422 "/home/jens/Source/shotwell/src/main.vala" - editing_exec (_tmp63_); -#line 2808 "main.c" - } + _tmp64_ = is_string_empty (_tmp63_); +#line 422 "/home/jens/Source/shotwell/src/main.vala" + if (_tmp64_) { +#line 2806 "main.c" + gchar** _tmp65_ = NULL; + gint _tmp65__length1 = 0; +#line 423 "/home/jens/Source/shotwell/src/main.vala" + _tmp65_ = mounts; +#line 423 "/home/jens/Source/shotwell/src/main.vala" + _tmp65__length1 = mounts_length1; +#line 423 "/home/jens/Source/shotwell/src/main.vala" + library_exec (_tmp65_, _tmp65__length1); +#line 2815 "main.c" + } else { + const gchar* _tmp66_ = NULL; +#line 425 "/home/jens/Source/shotwell/src/main.vala" + _tmp66_ = filename; #line 425 "/home/jens/Source/shotwell/src/main.vala" + editing_exec (_tmp66_); +#line 2822 "main.c" + } +#line 428 "/home/jens/Source/shotwell/src/main.vala" resources_terminate (); -#line 426 "/home/jens/Source/shotwell/src/main.vala" +#line 429 "/home/jens/Source/shotwell/src/main.vala" application_terminate (); -#line 427 "/home/jens/Source/shotwell/src/main.vala" +#line 430 "/home/jens/Source/shotwell/src/main.vala" debug_terminate (); -#line 428 "/home/jens/Source/shotwell/src/main.vala" +#line 431 "/home/jens/Source/shotwell/src/main.vala" app_dirs_terminate (); -#line 433 "/home/jens/Source/shotwell/src/main.vala" - _tmp65_ = filename; -#line 433 "/home/jens/Source/shotwell/src/main.vala" - _tmp66_ = is_string_empty (_tmp65_); -#line 433 "/home/jens/Source/shotwell/src/main.vala" - if (_tmp66_) { -#line 2824 "main.c" - gboolean _tmp67_ = FALSE; -#line 433 "/home/jens/Source/shotwell/src/main.vala" - _tmp67_ = was_already_running; -#line 433 "/home/jens/Source/shotwell/src/main.vala" - _tmp64_ = !_tmp67_; -#line 2830 "main.c" +#line 436 "/home/jens/Source/shotwell/src/main.vala" + _tmp68_ = filename; +#line 436 "/home/jens/Source/shotwell/src/main.vala" + _tmp69_ = is_string_empty (_tmp68_); +#line 436 "/home/jens/Source/shotwell/src/main.vala" + if (_tmp69_) { +#line 2838 "main.c" + gboolean _tmp70_ = FALSE; +#line 436 "/home/jens/Source/shotwell/src/main.vala" + _tmp70_ = was_already_running; +#line 436 "/home/jens/Source/shotwell/src/main.vala" + _tmp67_ = !_tmp70_; +#line 2844 "main.c" } else { -#line 433 "/home/jens/Source/shotwell/src/main.vala" - _tmp64_ = FALSE; -#line 2834 "main.c" +#line 436 "/home/jens/Source/shotwell/src/main.vala" + _tmp67_ = FALSE; +#line 2848 "main.c" } -#line 433 "/home/jens/Source/shotwell/src/main.vala" - if (_tmp64_) { -#line 2838 "main.c" +#line 436 "/home/jens/Source/shotwell/src/main.vala" + if (_tmp67_) { +#line 2852 "main.c" gchar* orig_path = NULL; - GFile* _tmp68_ = NULL; - GFile* _tmp69_ = NULL; - GFile* _tmp70_ = NULL; GFile* _tmp71_ = NULL; - gchar* _tmp72_ = NULL; - gchar* _tmp73_ = NULL; - gchar* backup_path = NULL; - const gchar* _tmp74_ = NULL; + GFile* _tmp72_ = NULL; + GFile* _tmp73_ = NULL; + GFile* _tmp74_ = NULL; gchar* _tmp75_ = NULL; -#line 434 "/home/jens/Source/shotwell/src/main.vala" - _tmp68_ = app_dirs_get_data_subdir ("data", NULL); -#line 434 "/home/jens/Source/shotwell/src/main.vala" - _tmp69_ = _tmp68_; -#line 434 "/home/jens/Source/shotwell/src/main.vala" - _tmp70_ = g_file_get_child (_tmp69_, "photo.db"); -#line 434 "/home/jens/Source/shotwell/src/main.vala" - _tmp71_ = _tmp70_; -#line 434 "/home/jens/Source/shotwell/src/main.vala" - _tmp72_ = g_file_get_path (_tmp71_); -#line 434 "/home/jens/Source/shotwell/src/main.vala" - _tmp73_ = _tmp72_; -#line 434 "/home/jens/Source/shotwell/src/main.vala" - _g_object_unref0 (_tmp71_); -#line 434 "/home/jens/Source/shotwell/src/main.vala" - _g_object_unref0 (_tmp69_); -#line 434 "/home/jens/Source/shotwell/src/main.vala" - orig_path = _tmp73_; -#line 435 "/home/jens/Source/shotwell/src/main.vala" - _tmp74_ = orig_path; -#line 435 "/home/jens/Source/shotwell/src/main.vala" - _tmp75_ = g_strconcat (_tmp74_, ".bak", NULL); -#line 435 "/home/jens/Source/shotwell/src/main.vala" - backup_path = _tmp75_; -#line 2873 "main.c" - { - GFile* src = NULL; - const gchar* _tmp76_ = NULL; - GFile* _tmp77_ = NULL; - GFile* dest = NULL; - const gchar* _tmp78_ = NULL; - GFile* _tmp79_ = NULL; - GFile* _tmp80_ = NULL; - GFile* _tmp81_ = NULL; + gchar* _tmp76_ = NULL; + gchar* backup_path = NULL; + const gchar* _tmp77_ = NULL; + gchar* _tmp78_ = NULL; +#line 437 "/home/jens/Source/shotwell/src/main.vala" + _tmp71_ = app_dirs_get_data_subdir ("data", NULL); +#line 437 "/home/jens/Source/shotwell/src/main.vala" + _tmp72_ = _tmp71_; +#line 437 "/home/jens/Source/shotwell/src/main.vala" + _tmp73_ = g_file_get_child (_tmp72_, "photo.db"); +#line 437 "/home/jens/Source/shotwell/src/main.vala" + _tmp74_ = _tmp73_; +#line 437 "/home/jens/Source/shotwell/src/main.vala" + _tmp75_ = g_file_get_path (_tmp74_); #line 437 "/home/jens/Source/shotwell/src/main.vala" - _tmp76_ = orig_path; + _tmp76_ = _tmp75_; #line 437 "/home/jens/Source/shotwell/src/main.vala" - _tmp77_ = g_file_new_for_commandline_arg (_tmp76_); + _g_object_unref0 (_tmp74_); #line 437 "/home/jens/Source/shotwell/src/main.vala" - src = _tmp77_; + _g_object_unref0 (_tmp72_); +#line 437 "/home/jens/Source/shotwell/src/main.vala" + orig_path = _tmp76_; #line 438 "/home/jens/Source/shotwell/src/main.vala" - _tmp78_ = backup_path; + _tmp77_ = orig_path; #line 438 "/home/jens/Source/shotwell/src/main.vala" - _tmp79_ = g_file_new_for_commandline_arg (_tmp78_); + _tmp78_ = g_strconcat (_tmp77_, ".bak", NULL); #line 438 "/home/jens/Source/shotwell/src/main.vala" - dest = _tmp79_; -#line 439 "/home/jens/Source/shotwell/src/main.vala" - _tmp80_ = src; -#line 439 "/home/jens/Source/shotwell/src/main.vala" - _tmp81_ = dest; -#line 439 "/home/jens/Source/shotwell/src/main.vala" - g_file_copy (_tmp80_, _tmp81_, G_FILE_COPY_OVERWRITE | G_FILE_COPY_ALL_METADATA, NULL, NULL, NULL, &_inner_error_); -#line 439 "/home/jens/Source/shotwell/src/main.vala" + backup_path = _tmp78_; +#line 2887 "main.c" + { + GFile* src = NULL; + const gchar* _tmp79_ = NULL; + GFile* _tmp80_ = NULL; + GFile* dest = NULL; + const gchar* _tmp81_ = NULL; + GFile* _tmp82_ = NULL; + GFile* _tmp83_ = NULL; + GFile* _tmp84_ = NULL; +#line 440 "/home/jens/Source/shotwell/src/main.vala" + _tmp79_ = orig_path; +#line 440 "/home/jens/Source/shotwell/src/main.vala" + _tmp80_ = g_file_new_for_commandline_arg (_tmp79_); +#line 440 "/home/jens/Source/shotwell/src/main.vala" + src = _tmp80_; +#line 441 "/home/jens/Source/shotwell/src/main.vala" + _tmp81_ = backup_path; +#line 441 "/home/jens/Source/shotwell/src/main.vala" + _tmp82_ = g_file_new_for_commandline_arg (_tmp81_); +#line 441 "/home/jens/Source/shotwell/src/main.vala" + dest = _tmp82_; +#line 442 "/home/jens/Source/shotwell/src/main.vala" + _tmp83_ = src; +#line 442 "/home/jens/Source/shotwell/src/main.vala" + _tmp84_ = dest; +#line 442 "/home/jens/Source/shotwell/src/main.vala" + g_file_copy (_tmp83_, _tmp84_, G_FILE_COPY_OVERWRITE | G_FILE_COPY_ALL_METADATA, NULL, NULL, NULL, &_inner_error_); +#line 442 "/home/jens/Source/shotwell/src/main.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 439 "/home/jens/Source/shotwell/src/main.vala" +#line 442 "/home/jens/Source/shotwell/src/main.vala" _g_object_unref0 (dest); -#line 439 "/home/jens/Source/shotwell/src/main.vala" +#line 442 "/home/jens/Source/shotwell/src/main.vala" _g_object_unref0 (src); -#line 2907 "main.c" +#line 2921 "main.c" goto __catch210_g_error; } -#line 436 "/home/jens/Source/shotwell/src/main.vala" +#line 439 "/home/jens/Source/shotwell/src/main.vala" _g_object_unref0 (dest); -#line 436 "/home/jens/Source/shotwell/src/main.vala" +#line 439 "/home/jens/Source/shotwell/src/main.vala" _g_object_unref0 (src); -#line 2914 "main.c" +#line 2928 "main.c" } goto __finally210; __catch210_g_error: { GError* _error_ = NULL; - GError* _tmp82_ = NULL; - const gchar* _tmp83_ = NULL; -#line 436 "/home/jens/Source/shotwell/src/main.vala" + GError* _tmp85_ = NULL; + const gchar* _tmp86_ = NULL; +#line 439 "/home/jens/Source/shotwell/src/main.vala" _error_ = _inner_error_; -#line 436 "/home/jens/Source/shotwell/src/main.vala" +#line 439 "/home/jens/Source/shotwell/src/main.vala" _inner_error_ = NULL; -#line 443 "/home/jens/Source/shotwell/src/main.vala" - _tmp82_ = _error_; -#line 443 "/home/jens/Source/shotwell/src/main.vala" - _tmp83_ = _tmp82_->message; -#line 443 "/home/jens/Source/shotwell/src/main.vala" - g_warning ("main.vala:443: Failed to create backup file of database: %s", _tmp83_); -#line 436 "/home/jens/Source/shotwell/src/main.vala" +#line 446 "/home/jens/Source/shotwell/src/main.vala" + _tmp85_ = _error_; +#line 446 "/home/jens/Source/shotwell/src/main.vala" + _tmp86_ = _tmp85_->message; +#line 446 "/home/jens/Source/shotwell/src/main.vala" + g_warning ("main.vala:446: Failed to create backup file of database: %s", _tmp86_); +#line 439 "/home/jens/Source/shotwell/src/main.vala" _g_error_free0 (_error_); -#line 2934 "main.c" +#line 2948 "main.c" } __finally210: -#line 436 "/home/jens/Source/shotwell/src/main.vala" +#line 439 "/home/jens/Source/shotwell/src/main.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 436 "/home/jens/Source/shotwell/src/main.vala" +#line 439 "/home/jens/Source/shotwell/src/main.vala" _g_free0 (backup_path); -#line 436 "/home/jens/Source/shotwell/src/main.vala" +#line 439 "/home/jens/Source/shotwell/src/main.vala" _g_free0 (orig_path); -#line 436 "/home/jens/Source/shotwell/src/main.vala" +#line 439 "/home/jens/Source/shotwell/src/main.vala" _g_free0 (filename); -#line 436 "/home/jens/Source/shotwell/src/main.vala" +#line 439 "/home/jens/Source/shotwell/src/main.vala" mounts = (_vala_array_free (mounts, mounts_length1, (GDestroyNotify) g_free), NULL); -#line 436 "/home/jens/Source/shotwell/src/main.vala" +#line 439 "/home/jens/Source/shotwell/src/main.vala" g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code); -#line 436 "/home/jens/Source/shotwell/src/main.vala" +#line 439 "/home/jens/Source/shotwell/src/main.vala" g_clear_error (&_inner_error_); -#line 436 "/home/jens/Source/shotwell/src/main.vala" +#line 439 "/home/jens/Source/shotwell/src/main.vala" return; -#line 2953 "main.c" +#line 2967 "main.c" } -#line 446 "/home/jens/Source/shotwell/src/main.vala" +#line 449 "/home/jens/Source/shotwell/src/main.vala" sync (); -#line 433 "/home/jens/Source/shotwell/src/main.vala" +#line 436 "/home/jens/Source/shotwell/src/main.vala" _g_free0 (backup_path); -#line 433 "/home/jens/Source/shotwell/src/main.vala" +#line 436 "/home/jens/Source/shotwell/src/main.vala" _g_free0 (orig_path); -#line 2961 "main.c" +#line 2975 "main.c" } #line 317 "/home/jens/Source/shotwell/src/main.vala" _g_free0 (filename); #line 317 "/home/jens/Source/shotwell/src/main.vala" mounts = (_vala_array_free (mounts, mounts_length1, (GDestroyNotify) g_free), NULL); -#line 2967 "main.c" +#line 2981 "main.c" } @@ -2986,7 +3000,7 @@ int main (int argc, char ** argv) { _vala_main (argv, argc); #line 317 "/home/jens/Source/shotwell/src/main.vala" return 0; -#line 2982 "main.c" +#line 2996 "main.c" } -- cgit v1.2.3