diff options
| author | Jörg Frings-Fürst <debian@jff-webhosting.net> | 2017-11-12 15:55:20 +0100 |
|---|---|---|
| committer | Jörg Frings-Fürst <debian@jff-webhosting.net> | 2017-11-12 15:55:20 +0100 |
| commit | f6140ff1c9ec493d947da5b346508846e7a1a06f (patch) | |
| tree | c01b9164ee4b0d46b6670ccee45f6181c6237d7f /src/main.c | |
| parent | 0f67b3cc674377559e66c5a6729fd499049a992f (diff) | |
| parent | 2492891f112caac6076ce49721d9d5d78a152c3a (diff) | |
Update upstream source from tag 'upstream/0.26.4'
Update to upstream version '0.26.4'
with Debian dir fae3cc48a8ec2f37979206f90dc828cbebee14c4
Diffstat (limited to 'src/main.c')
| -rw-r--r-- | src/main.c | 1813 |
1 files changed, 887 insertions, 926 deletions
@@ -1,4 +1,4 @@ -/* main.c generated by valac 0.34.7, the Vala compiler +/* main.c generated by valac 0.36.6, the Vala compiler * generated from main.vala, do not modify */ /* Copyright 2016 Software Freedom Conservancy Inc. @@ -460,7 +460,7 @@ GFile* app_dirs_get_data_subdir (const gchar* name, const gchar* subname); void library_app_init (GError** error); void app_window_panic (const gchar* msg); GType db_verify_result_get_type (void) G_GNUC_CONST; -DbVerifyResult db_verify_database (gchar** app_version, gint* schema_version); +DbVerifyResult db_verify_database (gchar* * app_version, gint* schema_version); #define RESOURCES_APP_VERSION _VERSION #define DATABASE_TABLE_SCHEMA_VERSION 20 #define RESOURCES_HOME_URL "https://wiki.gnome.org/Apps/Shotwell" @@ -645,11 +645,11 @@ DirectWindow* direct_window_construct (GType object_type, GFile* file); void direct_app_terminate (void); GOptionEntry* commandline_options_get_options (int* result_length1); static GOptionEntry* _vala_array_dup26 (GOptionEntry* self, int length); -static void _vala_array_add70 (GOptionEntry** array, int* length, int* size, const GOptionEntry* value); -static void _vala_array_add71 (GOptionEntry** array, int* length, int* size, const GOptionEntry* value); -static void _vala_array_add72 (GOptionEntry** array, int* length, int* size, const GOptionEntry* value); -static void _vala_array_add73 (GOptionEntry** array, int* length, int* size, const GOptionEntry* value); -static void _vala_array_add74 (GOptionEntry** array, int* length, int* size, const GOptionEntry* value); +static void _vala_array_add70 (GOptionEntry* * array, int* length, int* size, const GOptionEntry* value); +static void _vala_array_add71 (GOptionEntry* * array, int* length, int* size, const GOptionEntry* value); +static void _vala_array_add72 (GOptionEntry* * array, int* length, int* size, const GOptionEntry* value); +static void _vala_array_add73 (GOptionEntry* * array, int* length, int* size, const GOptionEntry* value); +static void _vala_array_add74 (GOptionEntry* * array, int* length, int* size, const GOptionEntry* value); static GOptionEntry* _vala_array_dup27 (GOptionEntry* self, int length); void _vala_main (gchar** args, int args_length1); void app_dirs_init (const gchar* arg0); @@ -659,7 +659,7 @@ GFile* app_dirs_get_exec_dir (void); void app_dirs_terminate (void); #define RESOURCES_GIT_VERSION _GIT_VERSION gboolean library_window_is_mount_uri_supported (const gchar* uri); -static void _vala_array_add75 (gchar*** array, int* length, int* size, gchar* value); +static void _vala_array_add75 (gchar** * array, int* length, int* size, gchar* value); gboolean is_string_empty (const gchar* s); #define DEBUG_LIBRARY_PREFIX "L" #define DEBUG_VIEWER_PREFIX "V" @@ -719,76 +719,76 @@ static gpointer _g_object_ref0 (gpointer self) { void library_exec (gchar** mounts, int mounts_length1) { - gboolean _tmp0_ = FALSE; - gboolean _tmp1_ = FALSE; - GFile* _tmp3_ = NULL; - GFile* _tmp4_ = NULL; - GFile* _tmp5_ = NULL; - GFile* _tmp6_ = NULL; + gboolean _tmp0_; + gboolean _tmp1_; + GFile* _tmp3_; + GFile* _tmp4_; + GFile* _tmp5_; + GFile* _tmp6_; gchar* errormsg = NULL; gchar* app_version = NULL; gint schema_version = 0; DbVerifyResult _result_ = 0; gchar* _tmp9_ = NULL; gint _tmp10_ = 0; - DbVerifyResult _tmp11_ = 0; - DbVerifyResult _tmp12_ = 0; - const gchar* _tmp33_ = NULL; + DbVerifyResult _tmp11_; + DbVerifyResult _tmp12_; + const gchar* _tmp29_; ProgressDialog* progress_dialog = NULL; AggregateProgressMonitor* aggregate_monitor = NULL; ProgressMonitor monitor = NULL; - void* monitor_target = NULL; - GDestroyNotify monitor_target_destroy_notify = NULL; - gboolean _tmp39_ = FALSE; - AggregateProgressMonitor* _tmp70_ = NULL; - ProgressMonitor _tmp72_ = NULL; - void* _tmp72__target = NULL; - AggregateProgressMonitor* _tmp73_ = NULL; - ProgressMonitor _tmp75_ = NULL; - void* _tmp75__target = NULL; - AggregateProgressMonitor* _tmp76_ = NULL; - Upgrades* _tmp78_ = NULL; - Upgrades* _tmp79_ = NULL; + void* monitor_target; + GDestroyNotify monitor_target_destroy_notify; + gboolean _tmp35_; + AggregateProgressMonitor* _tmp65_; + ProgressMonitor _tmp67_; + void* _tmp67__target; + AggregateProgressMonitor* _tmp68_; + ProgressMonitor _tmp70_; + void* _tmp70__target; + AggregateProgressMonitor* _tmp71_; + Upgrades* _tmp73_; + Upgrades* _tmp74_; MediaCollectionRegistry* registry = NULL; - MediaCollectionRegistry* _tmp80_ = NULL; - MediaCollectionRegistry* _tmp81_ = NULL; - LibraryPhotoSourceCollection* _tmp82_ = NULL; - MediaCollectionRegistry* _tmp83_ = NULL; - VideoSourceCollection* _tmp84_ = NULL; - AggregateProgressMonitor* _tmp85_ = NULL; - ProgressMonitor _tmp87_ = NULL; - void* _tmp87__target = NULL; - AggregateProgressMonitor* _tmp88_ = NULL; - ProgressMonitor _tmp90_ = NULL; - void* _tmp90__target = NULL; - Application* _tmp91_ = NULL; - Application* _tmp92_ = NULL; - AggregateProgressMonitor* _tmp93_ = NULL; + MediaCollectionRegistry* _tmp75_; + MediaCollectionRegistry* _tmp76_; + LibraryPhotoSourceCollection* _tmp77_; + MediaCollectionRegistry* _tmp78_; + VideoSourceCollection* _tmp79_; + AggregateProgressMonitor* _tmp80_; + ProgressMonitor _tmp82_; + void* _tmp82__target; + AggregateProgressMonitor* _tmp83_; + ProgressMonitor _tmp85_; + void* _tmp85__target; + Application* _tmp86_; + Application* _tmp87_; + AggregateProgressMonitor* _tmp88_; LibraryWindow* library_window = NULL; - ProgressMonitor _tmp95_ = NULL; - void* _tmp95__target = NULL; - LibraryWindow* _tmp96_ = NULL; - AggregateProgressMonitor* _tmp97_ = NULL; - ProgressDialog* _tmp99_ = NULL; - gchar** _tmp101_ = NULL; - gint _tmp101__length1 = 0; - LibraryWindow* _tmp105_ = NULL; + ProgressMonitor _tmp90_; + void* _tmp90__target; + LibraryWindow* _tmp91_; + AggregateProgressMonitor* _tmp92_; + ProgressDialog* _tmp94_; + gchar** _tmp96_; + gint _tmp96__length1; + LibraryWindow* _tmp100_; WelcomeServiceEntry** selected_import_entries = NULL; - WelcomeServiceEntry** _tmp106_ = NULL; - gint selected_import_entries_length1 = 0; - gint _selected_import_entries_size_ = 0; - gboolean _tmp107_ = FALSE; - ConfigFacade* _tmp108_ = NULL; - ConfigFacade* _tmp109_ = NULL; - gboolean _tmp110_ = FALSE; - gboolean _tmp111_ = FALSE; - WelcomeServiceEntry** _tmp125_ = NULL; - gint _tmp125__length1 = 0; - gboolean _tmp129_ = FALSE; - GTimer* _tmp130_ = NULL; - gdouble _tmp131_ = 0.0; - Application* _tmp132_ = NULL; - Application* _tmp133_ = NULL; + WelcomeServiceEntry** _tmp101_; + gint selected_import_entries_length1; + gint _selected_import_entries_size_; + gboolean _tmp102_ = FALSE; + ConfigFacade* _tmp103_; + ConfigFacade* _tmp104_; + gboolean _tmp105_; + gboolean _tmp106_; + WelcomeServiceEntry** _tmp120_; + gint _tmp120__length1; + gboolean _tmp124_; + GTimer* _tmp125_; + gdouble _tmp126_; + Application* _tmp127_; + Application* _tmp128_; GError * _inner_error_ = NULL; #line 16 "/home/jens/Source/shotwell/src/main.vala" _tmp0_ = application_get_is_remote (); @@ -799,8 +799,8 @@ void library_exec (gchar** mounts, int mounts_length1) { #line 18 "/home/jens/Source/shotwell/src/main.vala" if (_tmp1_) { #line 802 "main.c" - gchar** _tmp2_ = NULL; - gint _tmp2__length1 = 0; + gchar** _tmp2_; + gint _tmp2__length1; #line 25 "/home/jens/Source/shotwell/src/main.vala" application_present_primary_instance (); #line 26 "/home/jens/Source/shotwell/src/main.vala" @@ -834,15 +834,15 @@ void library_exec (gchar** mounts, int mounts_length1) { #line 35 "/home/jens/Source/shotwell/src/main.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { #line 837 "main.c" - goto __catch221_g_error; + goto __catch222_g_error; } } - goto __finally221; - __catch221_g_error: + goto __finally222; + __catch222_g_error: { GError* err = NULL; - GError* _tmp7_ = NULL; - const gchar* _tmp8_ = NULL; + GError* _tmp7_; + const gchar* _tmp8_; #line 34 "/home/jens/Source/shotwell/src/main.vala" err = _inner_error_; #line 34 "/home/jens/Source/shotwell/src/main.vala" @@ -859,7 +859,7 @@ void library_exec (gchar** mounts, int mounts_length1) { return; #line 861 "main.c" } - __finally221: + __finally222: #line 34 "/home/jens/Source/shotwell/src/main.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { #line 34 "/home/jens/Source/shotwell/src/main.vala" @@ -900,151 +900,139 @@ void library_exec (gchar** mounts, int mounts_length1) { case DB_VERIFY_RESULT_FUTURE_VERSION: #line 902 "main.c" { - const gchar* _tmp13_ = NULL; - const gchar* _tmp14_ = NULL; - gint _tmp15_ = 0; - gchar* _tmp16_ = NULL; -#line 54 "/home/jens/Source/shotwell/src/main.vala" - _tmp13_ = _ ("Your photo library is not compatible with this version of Shotwell. It" \ -" appears it was created by Shotwell %s (schema %d). This version is %s" \ -" (schema %d). Please use the latest version of Shotwell."); + const gchar* _tmp13_; + gint _tmp14_; + gchar* _tmp15_; #line 54 "/home/jens/Source/shotwell/src/main.vala" - _tmp14_ = app_version; + _tmp13_ = app_version; #line 54 "/home/jens/Source/shotwell/src/main.vala" - _tmp15_ = schema_version; + _tmp14_ = schema_version; #line 54 "/home/jens/Source/shotwell/src/main.vala" - _tmp16_ = g_strdup_printf (_tmp13_, _tmp14_, _tmp15_, RESOURCES_APP_VERSION, DATABASE_TABLE_SCHEMA_VERSION); + _tmp15_ = g_strdup_printf (_ ("Your photo library is not compatible with this version of Shotwell. It" \ +" appears it was created by Shotwell %s (schema %d). This version is %s" \ +" (schema %d). Please use the latest version of Shotwell."), _tmp13_, _tmp14_, RESOURCES_APP_VERSION, DATABASE_TABLE_SCHEMA_VERSION); #line 54 "/home/jens/Source/shotwell/src/main.vala" _g_free0 (errormsg); #line 54 "/home/jens/Source/shotwell/src/main.vala" - errormsg = _tmp16_; + errormsg = _tmp15_; #line 56 "/home/jens/Source/shotwell/src/main.vala" break; -#line 922 "main.c" +#line 919 "main.c" } #line 48 "/home/jens/Source/shotwell/src/main.vala" case DB_VERIFY_RESULT_UPGRADE_ERROR: -#line 926 "main.c" +#line 923 "main.c" { - const gchar* _tmp17_ = NULL; - const gchar* _tmp18_ = NULL; - gint _tmp19_ = 0; - gchar* _tmp20_ = NULL; + const gchar* _tmp16_; + gint _tmp17_; + gchar* _tmp18_; #line 59 "/home/jens/Source/shotwell/src/main.vala" - _tmp17_ = _ ("Shotwell was unable to upgrade your photo library from version %s (sch" \ -"ema %d) to %s (schema %d). For more information please check the Shotw" \ -"ell Wiki at %s"); -#line 59 "/home/jens/Source/shotwell/src/main.vala" - _tmp18_ = app_version; + _tmp16_ = app_version; #line 59 "/home/jens/Source/shotwell/src/main.vala" - _tmp19_ = schema_version; + _tmp17_ = schema_version; #line 59 "/home/jens/Source/shotwell/src/main.vala" - _tmp20_ = g_strdup_printf (_tmp17_, _tmp18_, _tmp19_, RESOURCES_APP_VERSION, DATABASE_TABLE_SCHEMA_VERSION, RESOURCES_HOME_URL); + _tmp18_ = g_strdup_printf (_ ("Shotwell was unable to upgrade your photo library from version %s (sch" \ +"ema %d) to %s (schema %d). For more information please check the Shotw" \ +"ell Wiki at %s"), _tmp16_, _tmp17_, RESOURCES_APP_VERSION, DATABASE_TABLE_SCHEMA_VERSION, RESOURCES_HOME_URL); #line 59 "/home/jens/Source/shotwell/src/main.vala" _g_free0 (errormsg); #line 59 "/home/jens/Source/shotwell/src/main.vala" - errormsg = _tmp20_; + errormsg = _tmp18_; #line 62 "/home/jens/Source/shotwell/src/main.vala" break; -#line 946 "main.c" +#line 940 "main.c" } #line 48 "/home/jens/Source/shotwell/src/main.vala" case DB_VERIFY_RESULT_NO_UPGRADE_AVAILABLE: -#line 950 "main.c" +#line 944 "main.c" { - const gchar* _tmp21_ = NULL; - const gchar* _tmp22_ = NULL; - gint _tmp23_ = 0; - GFile* _tmp24_ = NULL; - GFile* _tmp25_ = NULL; - gchar* _tmp26_ = NULL; - gchar* _tmp27_ = NULL; - gchar* _tmp28_ = NULL; + const gchar* _tmp19_; + gint _tmp20_; + GFile* _tmp21_; + GFile* _tmp22_; + gchar* _tmp23_; + gchar* _tmp24_; + gchar* _tmp25_; #line 65 "/home/jens/Source/shotwell/src/main.vala" - _tmp21_ = _ ("Your photo library is not compatible with this version of Shotwell. It" \ -" appears it was created by Shotwell %s (schema %d). This version is %s" \ -" (schema %d). Please clear your library by deleting %s and re-import y" \ -"our photos."); + _tmp19_ = app_version; #line 65 "/home/jens/Source/shotwell/src/main.vala" - _tmp22_ = app_version; + _tmp20_ = schema_version; #line 65 "/home/jens/Source/shotwell/src/main.vala" - _tmp23_ = schema_version; + _tmp21_ = app_dirs_get_data_dir (); #line 65 "/home/jens/Source/shotwell/src/main.vala" - _tmp24_ = app_dirs_get_data_dir (); + _tmp22_ = _tmp21_; #line 65 "/home/jens/Source/shotwell/src/main.vala" - _tmp25_ = _tmp24_; + _tmp23_ = g_file_get_path (_tmp22_); #line 65 "/home/jens/Source/shotwell/src/main.vala" - _tmp26_ = g_file_get_path (_tmp25_); + _tmp24_ = _tmp23_; #line 65 "/home/jens/Source/shotwell/src/main.vala" - _tmp27_ = _tmp26_; -#line 65 "/home/jens/Source/shotwell/src/main.vala" - _tmp28_ = g_strdup_printf (_tmp21_, _tmp22_, _tmp23_, RESOURCES_APP_VERSION, DATABASE_TABLE_SCHEMA_VERSION, _tmp27_); + _tmp25_ = g_strdup_printf (_ ("Your photo library is not compatible with this version of Shotwell. It" \ +" appears it was created by Shotwell %s (schema %d). This version is %s" \ +" (schema %d). Please clear your library by deleting %s and re-import y" \ +"our photos."), _tmp19_, _tmp20_, RESOURCES_APP_VERSION, DATABASE_TABLE_SCHEMA_VERSION, _tmp24_); #line 65 "/home/jens/Source/shotwell/src/main.vala" _g_free0 (errormsg); #line 65 "/home/jens/Source/shotwell/src/main.vala" - errormsg = _tmp28_; + errormsg = _tmp25_; #line 65 "/home/jens/Source/shotwell/src/main.vala" - _g_free0 (_tmp27_); + _g_free0 (_tmp24_); #line 65 "/home/jens/Source/shotwell/src/main.vala" - _g_object_unref0 (_tmp25_); + _g_object_unref0 (_tmp22_); #line 68 "/home/jens/Source/shotwell/src/main.vala" break; -#line 986 "main.c" +#line 977 "main.c" } default: { - const gchar* _tmp29_ = NULL; - DbVerifyResult _tmp30_ = 0; - GEnumValue* _tmp31_; - gchar* _tmp32_ = NULL; -#line 71 "/home/jens/Source/shotwell/src/main.vala" - _tmp29_ = _ ("Unknown error attempting to verify Shotwell’s database: %s"); + DbVerifyResult _tmp26_; + GEnumValue* _tmp27_; + gchar* _tmp28_; #line 71 "/home/jens/Source/shotwell/src/main.vala" - _tmp30_ = _result_; + _tmp26_ = _result_; #line 72 "/home/jens/Source/shotwell/src/main.vala" - _tmp31_ = g_enum_get_value (g_type_class_ref (DB_TYPE_VERIFY_RESULT), _tmp30_); + _tmp27_ = g_enum_get_value (g_type_class_ref (DB_TYPE_VERIFY_RESULT), _tmp26_); #line 71 "/home/jens/Source/shotwell/src/main.vala" - _tmp32_ = g_strdup_printf (_tmp29_, (_tmp31_ != NULL) ? _tmp31_->value_name : NULL); + _tmp28_ = g_strdup_printf (_ ("Unknown error attempting to verify Shotwell’s database: %s"), (_tmp27_ != NULL) ? _tmp27_->value_name : NULL); #line 71 "/home/jens/Source/shotwell/src/main.vala" _g_free0 (errormsg); #line 71 "/home/jens/Source/shotwell/src/main.vala" - errormsg = _tmp32_; + errormsg = _tmp28_; #line 73 "/home/jens/Source/shotwell/src/main.vala" break; -#line 1008 "main.c" +#line 996 "main.c" } } #line 76 "/home/jens/Source/shotwell/src/main.vala" - _tmp33_ = errormsg; + _tmp29_ = errormsg; #line 76 "/home/jens/Source/shotwell/src/main.vala" - if (_tmp33_ != NULL) { -#line 1015 "main.c" + if (_tmp29_ != NULL) { +#line 1003 "main.c" GtkMessageDialog* dialog = NULL; - const gchar* _tmp34_ = NULL; - GtkMessageDialog* _tmp35_ = NULL; - GtkMessageDialog* _tmp36_ = NULL; - GtkMessageDialog* _tmp37_ = NULL; - GtkMessageDialog* _tmp38_ = NULL; + const gchar* _tmp30_; + GtkMessageDialog* _tmp31_; + GtkMessageDialog* _tmp32_; + GtkMessageDialog* _tmp33_; + GtkMessageDialog* _tmp34_; #line 77 "/home/jens/Source/shotwell/src/main.vala" - _tmp34_ = errormsg; + _tmp30_ = errormsg; #line 77 "/home/jens/Source/shotwell/src/main.vala" - _tmp35_ = (GtkMessageDialog*) gtk_message_dialog_new (NULL, GTK_DIALOG_MODAL, GTK_MESSAGE_ERROR, GTK_BUTTONS_OK, "%s", _tmp34_); + _tmp31_ = (GtkMessageDialog*) gtk_message_dialog_new (NULL, GTK_DIALOG_MODAL, GTK_MESSAGE_ERROR, GTK_BUTTONS_OK, "%s", _tmp30_); #line 77 "/home/jens/Source/shotwell/src/main.vala" - g_object_ref_sink (_tmp35_); + g_object_ref_sink (_tmp31_); #line 77 "/home/jens/Source/shotwell/src/main.vala" - dialog = _tmp35_; + dialog = _tmp31_; #line 79 "/home/jens/Source/shotwell/src/main.vala" - _tmp36_ = dialog; + _tmp32_ = dialog; #line 79 "/home/jens/Source/shotwell/src/main.vala" - gtk_window_set_title (G_TYPE_CHECK_INSTANCE_CAST (_tmp36_, gtk_window_get_type (), GtkWindow), RESOURCES_APP_TITLE); + gtk_window_set_title (G_TYPE_CHECK_INSTANCE_CAST (_tmp32_, gtk_window_get_type (), GtkWindow), RESOURCES_APP_TITLE); #line 80 "/home/jens/Source/shotwell/src/main.vala" - _tmp37_ = dialog; + _tmp33_ = dialog; #line 80 "/home/jens/Source/shotwell/src/main.vala" - gtk_dialog_run (G_TYPE_CHECK_INSTANCE_CAST (_tmp37_, gtk_dialog_get_type (), GtkDialog)); + gtk_dialog_run (G_TYPE_CHECK_INSTANCE_CAST (_tmp33_, gtk_dialog_get_type (), GtkDialog)); #line 81 "/home/jens/Source/shotwell/src/main.vala" - _tmp38_ = dialog; + _tmp34_ = dialog; #line 81 "/home/jens/Source/shotwell/src/main.vala" - gtk_widget_destroy (G_TYPE_CHECK_INSTANCE_CAST (_tmp38_, gtk_widget_get_type (), GtkWidget)); + gtk_widget_destroy (G_TYPE_CHECK_INSTANCE_CAST (_tmp34_, gtk_widget_get_type (), GtkWidget)); #line 83 "/home/jens/Source/shotwell/src/main.vala" database_table_terminate (); #line 85 "/home/jens/Source/shotwell/src/main.vala" @@ -1055,7 +1043,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 1040 "main.c" } #line 88 "/home/jens/Source/shotwell/src/main.vala" upgrades_init (); @@ -1070,147 +1058,144 @@ void library_exec (gchar** mounts, int mounts_length1) { #line 92 "/home/jens/Source/shotwell/src/main.vala" monitor_target_destroy_notify = NULL; #line 94 "/home/jens/Source/shotwell/src/main.vala" - _tmp39_ = commandline_options_no_startup_progress; + _tmp35_ = commandline_options_no_startup_progress; #line 94 "/home/jens/Source/shotwell/src/main.vala" - if (!_tmp39_) { -#line 1070 "main.c" + if (!_tmp35_) { +#line 1058 "main.c" guint64 grand_total = 0ULL; - PhotoTable* _tmp40_ = NULL; - PhotoTable* _tmp41_ = NULL; - gint _tmp42_ = 0; - EventTable* _tmp43_ = NULL; - EventTable* _tmp44_ = NULL; - gint _tmp45_ = 0; - TagTable* _tmp46_ = NULL; - TagTable* _tmp47_ = NULL; - gint _tmp48_ = 0; - VideoTable* _tmp49_ = NULL; - VideoTable* _tmp50_ = NULL; - gint _tmp51_ = 0; - Upgrades* _tmp52_ = NULL; - Upgrades* _tmp53_ = NULL; - guint64 _tmp54_ = 0ULL; - guint64 _tmp55_ = 0ULL; - guint64 _tmp56_ = 0ULL; + PhotoTable* _tmp36_; + PhotoTable* _tmp37_; + gint _tmp38_; + EventTable* _tmp39_; + EventTable* _tmp40_; + gint _tmp41_; + TagTable* _tmp42_; + TagTable* _tmp43_; + gint _tmp44_; + VideoTable* _tmp45_; + VideoTable* _tmp46_; + gint _tmp47_; + Upgrades* _tmp48_; + Upgrades* _tmp49_; + guint64 _tmp50_; + guint64 _tmp51_; + guint64 _tmp52_; #line 98 "/home/jens/Source/shotwell/src/main.vala" - _tmp40_ = photo_table_get_instance (); + _tmp36_ = photo_table_get_instance (); #line 98 "/home/jens/Source/shotwell/src/main.vala" - _tmp41_ = _tmp40_; + _tmp37_ = _tmp36_; #line 98 "/home/jens/Source/shotwell/src/main.vala" - _tmp42_ = database_table_get_row_count (G_TYPE_CHECK_INSTANCE_CAST (_tmp41_, TYPE_DATABASE_TABLE, DatabaseTable)); + _tmp38_ = database_table_get_row_count (G_TYPE_CHECK_INSTANCE_CAST (_tmp37_, TYPE_DATABASE_TABLE, DatabaseTable)); #line 98 "/home/jens/Source/shotwell/src/main.vala" - _tmp43_ = event_table_get_instance (); + _tmp39_ = event_table_get_instance (); #line 98 "/home/jens/Source/shotwell/src/main.vala" - _tmp44_ = _tmp43_; + _tmp40_ = _tmp39_; #line 98 "/home/jens/Source/shotwell/src/main.vala" - _tmp45_ = database_table_get_row_count (G_TYPE_CHECK_INSTANCE_CAST (_tmp44_, TYPE_DATABASE_TABLE, DatabaseTable)); + _tmp41_ = database_table_get_row_count (G_TYPE_CHECK_INSTANCE_CAST (_tmp40_, TYPE_DATABASE_TABLE, DatabaseTable)); #line 98 "/home/jens/Source/shotwell/src/main.vala" - _tmp46_ = tag_table_get_instance (); + _tmp42_ = tag_table_get_instance (); #line 98 "/home/jens/Source/shotwell/src/main.vala" - _tmp47_ = _tmp46_; + _tmp43_ = _tmp42_; #line 98 "/home/jens/Source/shotwell/src/main.vala" - _tmp48_ = database_table_get_row_count (G_TYPE_CHECK_INSTANCE_CAST (_tmp47_, TYPE_DATABASE_TABLE, DatabaseTable)); + _tmp44_ = database_table_get_row_count (G_TYPE_CHECK_INSTANCE_CAST (_tmp43_, TYPE_DATABASE_TABLE, DatabaseTable)); #line 98 "/home/jens/Source/shotwell/src/main.vala" - _tmp49_ = video_table_get_instance (); + _tmp45_ = video_table_get_instance (); #line 98 "/home/jens/Source/shotwell/src/main.vala" - _tmp50_ = _tmp49_; + _tmp46_ = _tmp45_; #line 98 "/home/jens/Source/shotwell/src/main.vala" - _tmp51_ = database_table_get_row_count (G_TYPE_CHECK_INSTANCE_CAST (_tmp50_, TYPE_DATABASE_TABLE, DatabaseTable)); + _tmp47_ = database_table_get_row_count (G_TYPE_CHECK_INSTANCE_CAST (_tmp46_, TYPE_DATABASE_TABLE, DatabaseTable)); #line 98 "/home/jens/Source/shotwell/src/main.vala" - _tmp52_ = upgrades_get_instance (); + _tmp48_ = upgrades_get_instance (); #line 98 "/home/jens/Source/shotwell/src/main.vala" - _tmp53_ = _tmp52_; + _tmp49_ = _tmp48_; #line 98 "/home/jens/Source/shotwell/src/main.vala" - _tmp54_ = upgrades_get_step_count (_tmp53_); + _tmp50_ = upgrades_get_step_count (_tmp49_); #line 98 "/home/jens/Source/shotwell/src/main.vala" - _tmp55_ = (((_tmp42_ + _tmp45_) + _tmp48_) + _tmp51_) + _tmp54_; + _tmp51_ = (((_tmp38_ + _tmp41_) + _tmp44_) + _tmp47_) + _tmp50_; #line 98 "/home/jens/Source/shotwell/src/main.vala" - _upgrades_unref0 (_tmp53_); + _upgrades_unref0 (_tmp49_); #line 98 "/home/jens/Source/shotwell/src/main.vala" - _database_table_unref0 (_tmp50_); + _database_table_unref0 (_tmp46_); #line 98 "/home/jens/Source/shotwell/src/main.vala" - _database_table_unref0 (_tmp47_); + _database_table_unref0 (_tmp43_); #line 98 "/home/jens/Source/shotwell/src/main.vala" - _database_table_unref0 (_tmp44_); + _database_table_unref0 (_tmp40_); #line 98 "/home/jens/Source/shotwell/src/main.vala" - _database_table_unref0 (_tmp41_); + _database_table_unref0 (_tmp37_); #line 98 "/home/jens/Source/shotwell/src/main.vala" - grand_total = _tmp55_; + grand_total = _tmp51_; #line 103 "/home/jens/Source/shotwell/src/main.vala" - _tmp56_ = grand_total; + _tmp52_ = grand_total; #line 103 "/home/jens/Source/shotwell/src/main.vala" - if (_tmp56_ > ((guint64) 5000)) { -#line 1137 "main.c" - const gchar* _tmp57_ = NULL; - ProgressDialog* _tmp58_ = NULL; - ProgressDialog* _tmp59_ = NULL; - ProgressDialog* _tmp60_ = NULL; - guint64 _tmp66_ = 0ULL; - ProgressDialog* _tmp67_ = NULL; - AggregateProgressMonitor* _tmp68_ = NULL; - AggregateProgressMonitor* _tmp69_ = NULL; -#line 104 "/home/jens/Source/shotwell/src/main.vala" - _tmp57_ = _ ("Loading Shotwell"); + if (_tmp52_ > ((guint64) 5000)) { +#line 1125 "main.c" + ProgressDialog* _tmp53_; + ProgressDialog* _tmp54_; + ProgressDialog* _tmp55_; + guint64 _tmp61_; + ProgressDialog* _tmp62_; + AggregateProgressMonitor* _tmp63_; + AggregateProgressMonitor* _tmp64_; #line 104 "/home/jens/Source/shotwell/src/main.vala" - _tmp58_ = progress_dialog_new (NULL, _tmp57_, NULL); + _tmp53_ = progress_dialog_new (NULL, _ ("Loading Shotwell"), NULL); #line 104 "/home/jens/Source/shotwell/src/main.vala" - g_object_ref_sink (_tmp58_); + g_object_ref_sink (_tmp53_); #line 104 "/home/jens/Source/shotwell/src/main.vala" _g_object_unref0 (progress_dialog); #line 104 "/home/jens/Source/shotwell/src/main.vala" - progress_dialog = _tmp58_; + progress_dialog = _tmp53_; #line 105 "/home/jens/Source/shotwell/src/main.vala" - _tmp59_ = progress_dialog; + _tmp54_ = progress_dialog; #line 105 "/home/jens/Source/shotwell/src/main.vala" - progress_dialog_update_display_every (_tmp59_, 100); + progress_dialog_update_display_every (_tmp54_, 100); #line 106 "/home/jens/Source/shotwell/src/main.vala" - _tmp60_ = progress_dialog; + _tmp55_ = 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" + progress_dialog_set_minimum_on_screen_time_msec (_tmp55_, 250); +#line 1149 "main.c" { - GdkPixbuf* _tmp61_ = NULL; - GdkPixbuf* _tmp62_ = NULL; - ProgressDialog* _tmp63_ = NULL; + GdkPixbuf* _tmp56_ = NULL; + GdkPixbuf* _tmp57_; + ProgressDialog* _tmp58_; #line 108 "/home/jens/Source/shotwell/src/main.vala" - _tmp62_ = gdk_pixbuf_new_from_resource ("/org/gnome/Shotwell/icons/shotwell.svg", &_inner_error_); + _tmp57_ = gdk_pixbuf_new_from_resource ("/org/gnome/Shotwell/icons/shotwell.svg", &_inner_error_); #line 108 "/home/jens/Source/shotwell/src/main.vala" - _tmp61_ = _tmp62_; + _tmp56_ = _tmp57_; #line 108 "/home/jens/Source/shotwell/src/main.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 1175 "main.c" - goto __catch222_g_error; +#line 1160 "main.c" + goto __catch223_g_error; } #line 108 "/home/jens/Source/shotwell/src/main.vala" - _tmp63_ = progress_dialog; + _tmp58_ = progress_dialog; #line 108 "/home/jens/Source/shotwell/src/main.vala" - gtk_window_set_icon (G_TYPE_CHECK_INSTANCE_CAST (_tmp63_, gtk_window_get_type (), GtkWindow), _tmp61_); + gtk_window_set_icon (G_TYPE_CHECK_INSTANCE_CAST (_tmp58_, gtk_window_get_type (), GtkWindow), _tmp56_); #line 107 "/home/jens/Source/shotwell/src/main.vala" - _g_object_unref0 (_tmp61_); -#line 1184 "main.c" + _g_object_unref0 (_tmp56_); +#line 1169 "main.c" } - goto __finally222; - __catch222_g_error: + goto __finally223; + __catch223_g_error: { GError* err = NULL; - GError* _tmp64_ = NULL; - const gchar* _tmp65_ = NULL; + GError* _tmp59_; + const gchar* _tmp60_; #line 107 "/home/jens/Source/shotwell/src/main.vala" err = _inner_error_; #line 107 "/home/jens/Source/shotwell/src/main.vala" _inner_error_ = NULL; #line 110 "/home/jens/Source/shotwell/src/main.vala" - _tmp64_ = err; + _tmp59_ = err; #line 110 "/home/jens/Source/shotwell/src/main.vala" - _tmp65_ = _tmp64_->message; + _tmp60_ = _tmp59_->message; #line 110 "/home/jens/Source/shotwell/src/main.vala" g_debug ("main.vala:110: Warning - could not load application icon for loading w" \ -"indow: %s", _tmp65_); +"indow: %s", _tmp60_); #line 107 "/home/jens/Source/shotwell/src/main.vala" _g_error_free0 (err); -#line 1204 "main.c" +#line 1189 "main.c" } - __finally222: + __finally223: #line 107 "/home/jens/Source/shotwell/src/main.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { #line 107 "/home/jens/Source/shotwell/src/main.vala" @@ -1235,20 +1220,20 @@ void library_exec (gchar** mounts, int mounts_length1) { g_clear_error (&_inner_error_); #line 107 "/home/jens/Source/shotwell/src/main.vala" return; -#line 1231 "main.c" +#line 1216 "main.c" } #line 113 "/home/jens/Source/shotwell/src/main.vala" - _tmp66_ = grand_total; + _tmp61_ = grand_total; #line 113 "/home/jens/Source/shotwell/src/main.vala" - _tmp67_ = progress_dialog; + _tmp62_ = progress_dialog; #line 113 "/home/jens/Source/shotwell/src/main.vala" - _tmp68_ = aggregate_progress_monitor_new (_tmp66_, _progress_dialog_monitor_progress_monitor, _tmp67_); + _tmp63_ = aggregate_progress_monitor_new (_tmp61_, _progress_dialog_monitor_progress_monitor, _tmp62_); #line 113 "/home/jens/Source/shotwell/src/main.vala" _aggregate_progress_monitor_unref0 (aggregate_monitor); #line 113 "/home/jens/Source/shotwell/src/main.vala" - aggregate_monitor = _tmp68_; + aggregate_monitor = _tmp63_; #line 114 "/home/jens/Source/shotwell/src/main.vala" - _tmp69_ = aggregate_monitor; + _tmp64_ = aggregate_monitor; #line 114 "/home/jens/Source/shotwell/src/main.vala" (monitor_target_destroy_notify == NULL) ? NULL : (monitor_target_destroy_notify (monitor_target), NULL); #line 114 "/home/jens/Source/shotwell/src/main.vala" @@ -1260,10 +1245,10 @@ void library_exec (gchar** mounts, int mounts_length1) { #line 114 "/home/jens/Source/shotwell/src/main.vala" monitor = _aggregate_progress_monitor_monitor_progress_monitor; #line 114 "/home/jens/Source/shotwell/src/main.vala" - monitor_target = aggregate_progress_monitor_ref (_tmp69_); + monitor_target = aggregate_progress_monitor_ref (_tmp64_); #line 114 "/home/jens/Source/shotwell/src/main.vala" monitor_target_destroy_notify = aggregate_progress_monitor_unref; -#line 1259 "main.c" +#line 1244 "main.c" } } #line 118 "/home/jens/Source/shotwell/src/main.vala" @@ -1271,162 +1256,162 @@ void library_exec (gchar** mounts, int mounts_length1) { #line 119 "/home/jens/Source/shotwell/src/main.vala" tombstone_init (); #line 121 "/home/jens/Source/shotwell/src/main.vala" - _tmp70_ = aggregate_monitor; + _tmp65_ = aggregate_monitor; #line 121 "/home/jens/Source/shotwell/src/main.vala" - if (_tmp70_ != NULL) { -#line 1270 "main.c" - AggregateProgressMonitor* _tmp71_ = NULL; + if (_tmp65_ != NULL) { +#line 1255 "main.c" + AggregateProgressMonitor* _tmp66_; #line 122 "/home/jens/Source/shotwell/src/main.vala" - _tmp71_ = aggregate_monitor; + _tmp66_ = aggregate_monitor; #line 122 "/home/jens/Source/shotwell/src/main.vala" - aggregate_progress_monitor_next_step (_tmp71_, "LibraryPhoto.init"); -#line 1276 "main.c" + aggregate_progress_monitor_next_step (_tmp66_, "LibraryPhoto.init"); +#line 1261 "main.c" } #line 123 "/home/jens/Source/shotwell/src/main.vala" - _tmp72_ = monitor; + _tmp67_ = monitor; #line 123 "/home/jens/Source/shotwell/src/main.vala" - _tmp72__target = monitor_target; + _tmp67__target = monitor_target; #line 123 "/home/jens/Source/shotwell/src/main.vala" - library_photo_init (_tmp72_, _tmp72__target); + library_photo_init (_tmp67_, _tmp67__target); #line 124 "/home/jens/Source/shotwell/src/main.vala" - _tmp73_ = aggregate_monitor; + _tmp68_ = aggregate_monitor; #line 124 "/home/jens/Source/shotwell/src/main.vala" - if (_tmp73_ != NULL) { -#line 1288 "main.c" - AggregateProgressMonitor* _tmp74_ = NULL; + if (_tmp68_ != NULL) { +#line 1273 "main.c" + AggregateProgressMonitor* _tmp69_; #line 125 "/home/jens/Source/shotwell/src/main.vala" - _tmp74_ = aggregate_monitor; + _tmp69_ = aggregate_monitor; #line 125 "/home/jens/Source/shotwell/src/main.vala" - aggregate_progress_monitor_next_step (_tmp74_, "Video.init"); -#line 1294 "main.c" + aggregate_progress_monitor_next_step (_tmp69_, "Video.init"); +#line 1279 "main.c" } #line 126 "/home/jens/Source/shotwell/src/main.vala" - _tmp75_ = monitor; + _tmp70_ = monitor; #line 126 "/home/jens/Source/shotwell/src/main.vala" - _tmp75__target = monitor_target; + _tmp70__target = monitor_target; #line 126 "/home/jens/Source/shotwell/src/main.vala" - video_init (_tmp75_, _tmp75__target); + video_init (_tmp70_, _tmp70__target); #line 127 "/home/jens/Source/shotwell/src/main.vala" - _tmp76_ = aggregate_monitor; + _tmp71_ = aggregate_monitor; #line 127 "/home/jens/Source/shotwell/src/main.vala" - if (_tmp76_ != NULL) { -#line 1306 "main.c" - AggregateProgressMonitor* _tmp77_ = NULL; + if (_tmp71_ != NULL) { +#line 1291 "main.c" + AggregateProgressMonitor* _tmp72_; #line 128 "/home/jens/Source/shotwell/src/main.vala" - _tmp77_ = aggregate_monitor; + _tmp72_ = aggregate_monitor; #line 128 "/home/jens/Source/shotwell/src/main.vala" - aggregate_progress_monitor_next_step (_tmp77_, "Upgrades.execute"); -#line 1312 "main.c" + aggregate_progress_monitor_next_step (_tmp72_, "Upgrades.execute"); +#line 1297 "main.c" } #line 129 "/home/jens/Source/shotwell/src/main.vala" - _tmp78_ = upgrades_get_instance (); + _tmp73_ = upgrades_get_instance (); #line 129 "/home/jens/Source/shotwell/src/main.vala" - _tmp79_ = _tmp78_; + _tmp74_ = _tmp73_; #line 129 "/home/jens/Source/shotwell/src/main.vala" - upgrades_execute (_tmp79_, NULL, NULL); + upgrades_execute (_tmp74_, NULL, NULL); #line 129 "/home/jens/Source/shotwell/src/main.vala" - _upgrades_unref0 (_tmp79_); + _upgrades_unref0 (_tmp74_); #line 131 "/home/jens/Source/shotwell/src/main.vala" library_monitor_pool_init (); #line 132 "/home/jens/Source/shotwell/src/main.vala" media_collection_registry_init (); #line 133 "/home/jens/Source/shotwell/src/main.vala" - _tmp80_ = media_collection_registry_get_instance (); + _tmp75_ = media_collection_registry_get_instance (); #line 133 "/home/jens/Source/shotwell/src/main.vala" - registry = _tmp80_; + registry = _tmp75_; #line 134 "/home/jens/Source/shotwell/src/main.vala" - _tmp81_ = registry; + _tmp76_ = registry; #line 134 "/home/jens/Source/shotwell/src/main.vala" - _tmp82_ = library_photo_global; + _tmp77_ = library_photo_global; #line 134 "/home/jens/Source/shotwell/src/main.vala" - media_collection_registry_register_collection (_tmp81_, G_TYPE_CHECK_INSTANCE_CAST (_tmp82_, TYPE_MEDIA_SOURCE_COLLECTION, MediaSourceCollection)); + media_collection_registry_register_collection (_tmp76_, G_TYPE_CHECK_INSTANCE_CAST (_tmp77_, TYPE_MEDIA_SOURCE_COLLECTION, MediaSourceCollection)); #line 135 "/home/jens/Source/shotwell/src/main.vala" - _tmp83_ = registry; + _tmp78_ = registry; #line 135 "/home/jens/Source/shotwell/src/main.vala" - _tmp84_ = video_global; + _tmp79_ = video_global; #line 135 "/home/jens/Source/shotwell/src/main.vala" - media_collection_registry_register_collection (_tmp83_, G_TYPE_CHECK_INSTANCE_CAST (_tmp84_, TYPE_MEDIA_SOURCE_COLLECTION, MediaSourceCollection)); + media_collection_registry_register_collection (_tmp78_, G_TYPE_CHECK_INSTANCE_CAST (_tmp79_, TYPE_MEDIA_SOURCE_COLLECTION, MediaSourceCollection)); #line 137 "/home/jens/Source/shotwell/src/main.vala" - _tmp85_ = aggregate_monitor; + _tmp80_ = aggregate_monitor; #line 137 "/home/jens/Source/shotwell/src/main.vala" - if (_tmp85_ != NULL) { -#line 1346 "main.c" - AggregateProgressMonitor* _tmp86_ = NULL; + if (_tmp80_ != NULL) { +#line 1331 "main.c" + AggregateProgressMonitor* _tmp81_; #line 138 "/home/jens/Source/shotwell/src/main.vala" - _tmp86_ = aggregate_monitor; + _tmp81_ = aggregate_monitor; #line 138 "/home/jens/Source/shotwell/src/main.vala" - aggregate_progress_monitor_next_step (_tmp86_, "Event.init"); -#line 1352 "main.c" + aggregate_progress_monitor_next_step (_tmp81_, "Event.init"); +#line 1337 "main.c" } #line 139 "/home/jens/Source/shotwell/src/main.vala" - _tmp87_ = monitor; + _tmp82_ = monitor; #line 139 "/home/jens/Source/shotwell/src/main.vala" - _tmp87__target = monitor_target; + _tmp82__target = monitor_target; #line 139 "/home/jens/Source/shotwell/src/main.vala" - event_init (_tmp87_, _tmp87__target); + event_init (_tmp82_, _tmp82__target); #line 140 "/home/jens/Source/shotwell/src/main.vala" - _tmp88_ = aggregate_monitor; + _tmp83_ = aggregate_monitor; #line 140 "/home/jens/Source/shotwell/src/main.vala" - if (_tmp88_ != NULL) { -#line 1364 "main.c" - AggregateProgressMonitor* _tmp89_ = NULL; + if (_tmp83_ != NULL) { +#line 1349 "main.c" + AggregateProgressMonitor* _tmp84_; #line 141 "/home/jens/Source/shotwell/src/main.vala" - _tmp89_ = aggregate_monitor; + _tmp84_ = aggregate_monitor; #line 141 "/home/jens/Source/shotwell/src/main.vala" - aggregate_progress_monitor_next_step (_tmp89_, "Tag.init"); -#line 1370 "main.c" + aggregate_progress_monitor_next_step (_tmp84_, "Tag.init"); +#line 1355 "main.c" } #line 142 "/home/jens/Source/shotwell/src/main.vala" - _tmp90_ = monitor; + _tmp85_ = monitor; #line 142 "/home/jens/Source/shotwell/src/main.vala" - _tmp90__target = monitor_target; + _tmp85__target = monitor_target; #line 142 "/home/jens/Source/shotwell/src/main.vala" - tag_init (_tmp90_, _tmp90__target); + tag_init (_tmp85_, _tmp85__target); #line 144 "/home/jens/Source/shotwell/src/main.vala" metadata_writer_init (); #line 145 "/home/jens/Source/shotwell/src/main.vala" desktop_integration_init (); #line 147 "/home/jens/Source/shotwell/src/main.vala" - _tmp91_ = application_get_instance (); + _tmp86_ = application_get_instance (); #line 147 "/home/jens/Source/shotwell/src/main.vala" - _tmp92_ = _tmp91_; + _tmp87_ = _tmp86_; #line 147 "/home/jens/Source/shotwell/src/main.vala" - g_signal_emit_by_name (_tmp92_, "init-done"); + g_signal_emit_by_name (_tmp87_, "init-done"); #line 147 "/home/jens/Source/shotwell/src/main.vala" - _application_unref0 (_tmp92_); + _application_unref0 (_tmp87_); #line 150 "/home/jens/Source/shotwell/src/main.vala" - _tmp93_ = aggregate_monitor; + _tmp88_ = aggregate_monitor; #line 150 "/home/jens/Source/shotwell/src/main.vala" - if (_tmp93_ != NULL) { -#line 1394 "main.c" - AggregateProgressMonitor* _tmp94_ = NULL; + if (_tmp88_ != NULL) { +#line 1379 "main.c" + AggregateProgressMonitor* _tmp89_; #line 151 "/home/jens/Source/shotwell/src/main.vala" - _tmp94_ = aggregate_monitor; + _tmp89_ = aggregate_monitor; #line 151 "/home/jens/Source/shotwell/src/main.vala" - aggregate_progress_monitor_next_step (_tmp94_, "LibraryWindow"); -#line 1400 "main.c" + aggregate_progress_monitor_next_step (_tmp89_, "LibraryWindow"); +#line 1385 "main.c" } #line 152 "/home/jens/Source/shotwell/src/main.vala" - _tmp95_ = monitor; + _tmp90_ = monitor; #line 152 "/home/jens/Source/shotwell/src/main.vala" - _tmp95__target = monitor_target; + _tmp90__target = monitor_target; #line 152 "/home/jens/Source/shotwell/src/main.vala" - _tmp96_ = library_window_new (_tmp95_, _tmp95__target); + _tmp91_ = library_window_new (_tmp90_, _tmp90__target); #line 152 "/home/jens/Source/shotwell/src/main.vala" - g_object_ref_sink (_tmp96_); + g_object_ref_sink (_tmp91_); #line 152 "/home/jens/Source/shotwell/src/main.vala" - library_window = _tmp96_; + library_window = _tmp91_; #line 154 "/home/jens/Source/shotwell/src/main.vala" - _tmp97_ = aggregate_monitor; + _tmp92_ = aggregate_monitor; #line 154 "/home/jens/Source/shotwell/src/main.vala" - if (_tmp97_ != NULL) { -#line 1416 "main.c" - AggregateProgressMonitor* _tmp98_ = NULL; + if (_tmp92_ != NULL) { +#line 1401 "main.c" + AggregateProgressMonitor* _tmp93_; #line 155 "/home/jens/Source/shotwell/src/main.vala" - _tmp98_ = aggregate_monitor; + _tmp93_ = aggregate_monitor; #line 155 "/home/jens/Source/shotwell/src/main.vala" - aggregate_progress_monitor_next_step (_tmp98_, "done"); -#line 1422 "main.c" + aggregate_progress_monitor_next_step (_tmp93_, "done"); +#line 1407 "main.c" } #line 160 "/home/jens/Source/shotwell/src/main.vala" (monitor_target_destroy_notify == NULL) ? NULL : (monitor_target_destroy_notify (monitor_target), NULL); @@ -1447,228 +1432,228 @@ void library_exec (gchar** mounts, int mounts_length1) { #line 161 "/home/jens/Source/shotwell/src/main.vala" aggregate_monitor = NULL; #line 162 "/home/jens/Source/shotwell/src/main.vala" - _tmp99_ = progress_dialog; + _tmp94_ = progress_dialog; #line 162 "/home/jens/Source/shotwell/src/main.vala" - if (_tmp99_ != NULL) { -#line 1446 "main.c" - ProgressDialog* _tmp100_ = NULL; + if (_tmp94_ != NULL) { +#line 1431 "main.c" + ProgressDialog* _tmp95_; #line 163 "/home/jens/Source/shotwell/src/main.vala" - _tmp100_ = progress_dialog; + _tmp95_ = progress_dialog; #line 163 "/home/jens/Source/shotwell/src/main.vala" - gtk_widget_destroy (G_TYPE_CHECK_INSTANCE_CAST (_tmp100_, gtk_widget_get_type (), GtkWidget)); -#line 1452 "main.c" + gtk_widget_destroy (G_TYPE_CHECK_INSTANCE_CAST (_tmp95_, gtk_widget_get_type (), GtkWidget)); +#line 1437 "main.c" } #line 164 "/home/jens/Source/shotwell/src/main.vala" _g_object_unref0 (progress_dialog); #line 164 "/home/jens/Source/shotwell/src/main.vala" progress_dialog = NULL; #line 167 "/home/jens/Source/shotwell/src/main.vala" - _tmp101_ = mounts; + _tmp96_ = mounts; #line 167 "/home/jens/Source/shotwell/src/main.vala" - _tmp101__length1 = mounts_length1; -#line 1462 "main.c" + _tmp96__length1 = mounts_length1; +#line 1447 "main.c" { gchar** mount_collection = NULL; gint mount_collection_length1 = 0; gint _mount_collection_size_ = 0; gint mount_it = 0; #line 167 "/home/jens/Source/shotwell/src/main.vala" - mount_collection = _tmp101_; + mount_collection = _tmp96_; #line 167 "/home/jens/Source/shotwell/src/main.vala" - mount_collection_length1 = _tmp101__length1; + mount_collection_length1 = _tmp96__length1; #line 167 "/home/jens/Source/shotwell/src/main.vala" - for (mount_it = 0; mount_it < _tmp101__length1; mount_it = mount_it + 1) { -#line 1474 "main.c" - gchar* _tmp102_ = NULL; + for (mount_it = 0; mount_it < _tmp96__length1; mount_it = mount_it + 1) { +#line 1459 "main.c" + gchar* _tmp97_; gchar* mount = NULL; #line 167 "/home/jens/Source/shotwell/src/main.vala" - _tmp102_ = g_strdup (mount_collection[mount_it]); + _tmp97_ = g_strdup (mount_collection[mount_it]); #line 167 "/home/jens/Source/shotwell/src/main.vala" - mount = _tmp102_; -#line 1481 "main.c" + mount = _tmp97_; +#line 1466 "main.c" { - LibraryWindow* _tmp103_ = NULL; - const gchar* _tmp104_ = NULL; + LibraryWindow* _tmp98_; + const gchar* _tmp99_; #line 168 "/home/jens/Source/shotwell/src/main.vala" - _tmp103_ = library_window; + _tmp98_ = library_window; #line 168 "/home/jens/Source/shotwell/src/main.vala" - _tmp104_ = mount; + _tmp99_ = mount; #line 168 "/home/jens/Source/shotwell/src/main.vala" - library_window_mounted_camera_shell_notification (_tmp103_, _tmp104_, TRUE); + library_window_mounted_camera_shell_notification (_tmp98_, _tmp99_, TRUE); #line 167 "/home/jens/Source/shotwell/src/main.vala" _g_free0 (mount); -#line 1493 "main.c" +#line 1478 "main.c" } } } #line 170 "/home/jens/Source/shotwell/src/main.vala" - _tmp105_ = library_window; + _tmp100_ = library_window; #line 170 "/home/jens/Source/shotwell/src/main.vala" - gtk_widget_show_all (G_TYPE_CHECK_INSTANCE_CAST (_tmp105_, gtk_widget_get_type (), GtkWidget)); + gtk_widget_show_all (G_TYPE_CHECK_INSTANCE_CAST (_tmp100_, gtk_widget_get_type (), GtkWidget)); #line 172 "/home/jens/Source/shotwell/src/main.vala" - _tmp106_ = g_new0 (WelcomeServiceEntry*, 0 + 1); + _tmp101_ = g_new0 (WelcomeServiceEntry*, 0 + 1); #line 172 "/home/jens/Source/shotwell/src/main.vala" - selected_import_entries = _tmp106_; + selected_import_entries = _tmp101_; #line 172 "/home/jens/Source/shotwell/src/main.vala" selected_import_entries_length1 = 0; #line 172 "/home/jens/Source/shotwell/src/main.vala" _selected_import_entries_size_ = selected_import_entries_length1; #line 173 "/home/jens/Source/shotwell/src/main.vala" - _tmp108_ = config_facade_get_instance (); + _tmp103_ = config_facade_get_instance (); #line 173 "/home/jens/Source/shotwell/src/main.vala" - _tmp109_ = _tmp108_; + _tmp104_ = _tmp103_; #line 173 "/home/jens/Source/shotwell/src/main.vala" - _tmp110_ = configuration_facade_get_show_welcome_dialog (G_TYPE_CHECK_INSTANCE_CAST (_tmp109_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade)); + _tmp105_ = configuration_facade_get_show_welcome_dialog (G_TYPE_CHECK_INSTANCE_CAST (_tmp104_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade)); #line 173 "/home/jens/Source/shotwell/src/main.vala" - _tmp111_ = _tmp110_; + _tmp106_ = _tmp105_; #line 173 "/home/jens/Source/shotwell/src/main.vala" - _g_object_unref0 (_tmp109_); + _g_object_unref0 (_tmp104_); #line 173 "/home/jens/Source/shotwell/src/main.vala" - if (_tmp111_) { -#line 1521 "main.c" - LibraryPhotoSourceCollection* _tmp112_ = NULL; - gint _tmp113_ = 0; + if (_tmp106_) { +#line 1506 "main.c" + LibraryPhotoSourceCollection* _tmp107_; + gint _tmp108_; #line 174 "/home/jens/Source/shotwell/src/main.vala" - _tmp112_ = library_photo_global; + _tmp107_ = library_photo_global; #line 174 "/home/jens/Source/shotwell/src/main.vala" - _tmp113_ = data_collection_get_count (G_TYPE_CHECK_INSTANCE_CAST (_tmp112_, TYPE_DATA_COLLECTION, DataCollection)); + _tmp108_ = data_collection_get_count (G_TYPE_CHECK_INSTANCE_CAST (_tmp107_, TYPE_DATA_COLLECTION, DataCollection)); #line 174 "/home/jens/Source/shotwell/src/main.vala" - _tmp107_ = _tmp113_ == 0; -#line 1530 "main.c" + _tmp102_ = _tmp108_ == 0; +#line 1515 "main.c" } else { #line 173 "/home/jens/Source/shotwell/src/main.vala" - _tmp107_ = FALSE; -#line 1534 "main.c" + _tmp102_ = FALSE; +#line 1519 "main.c" } #line 173 "/home/jens/Source/shotwell/src/main.vala" - if (_tmp107_) { -#line 1538 "main.c" + if (_tmp102_) { +#line 1523 "main.c" WelcomeDialog* welcome = NULL; - LibraryWindow* _tmp114_ = NULL; - WelcomeDialog* _tmp115_ = NULL; - ConfigFacade* _tmp116_ = NULL; - ConfigFacade* _tmp117_ = NULL; - WelcomeDialog* _tmp118_ = NULL; - WelcomeServiceEntry** _tmp119_ = NULL; - gint _tmp120_ = 0; - gboolean _tmp121_ = FALSE; - gboolean _tmp122_ = FALSE; + LibraryWindow* _tmp109_; + WelcomeDialog* _tmp110_; + ConfigFacade* _tmp111_; + ConfigFacade* _tmp112_; + WelcomeDialog* _tmp113_; + WelcomeServiceEntry** _tmp114_ = NULL; + gint _tmp115_; + gboolean _tmp116_ = FALSE; + gboolean _tmp117_; #line 175 "/home/jens/Source/shotwell/src/main.vala" - _tmp114_ = library_window; + _tmp109_ = library_window; #line 175 "/home/jens/Source/shotwell/src/main.vala" - _tmp115_ = welcome_dialog_new (G_TYPE_CHECK_INSTANCE_CAST (_tmp114_, gtk_window_get_type (), GtkWindow)); + _tmp110_ = welcome_dialog_new (G_TYPE_CHECK_INSTANCE_CAST (_tmp109_, gtk_window_get_type (), GtkWindow)); #line 175 "/home/jens/Source/shotwell/src/main.vala" - g_object_ref_sink (_tmp115_); + g_object_ref_sink (_tmp110_); #line 175 "/home/jens/Source/shotwell/src/main.vala" - welcome = _tmp115_; + welcome = _tmp110_; #line 176 "/home/jens/Source/shotwell/src/main.vala" - _tmp116_ = config_facade_get_instance (); + _tmp111_ = config_facade_get_instance (); #line 176 "/home/jens/Source/shotwell/src/main.vala" - _tmp117_ = _tmp116_; + _tmp112_ = _tmp111_; #line 176 "/home/jens/Source/shotwell/src/main.vala" - _tmp118_ = welcome; + _tmp113_ = welcome; #line 176 "/home/jens/Source/shotwell/src/main.vala" - _tmp122_ = welcome_dialog_execute (_tmp118_, &_tmp119_, &_tmp120_, &_tmp121_); + _tmp117_ = welcome_dialog_execute (_tmp113_, &_tmp114_, &_tmp115_, &_tmp116_); #line 176 "/home/jens/Source/shotwell/src/main.vala" selected_import_entries = (_vala_array_free (selected_import_entries, selected_import_entries_length1, (GDestroyNotify) g_object_unref), NULL); #line 176 "/home/jens/Source/shotwell/src/main.vala" - selected_import_entries = _tmp119_; + selected_import_entries = _tmp114_; #line 176 "/home/jens/Source/shotwell/src/main.vala" - selected_import_entries_length1 = _tmp120_; + selected_import_entries_length1 = _tmp115_; #line 176 "/home/jens/Source/shotwell/src/main.vala" _selected_import_entries_size_ = selected_import_entries_length1; #line 176 "/home/jens/Source/shotwell/src/main.vala" - do_system_pictures_import = _tmp121_; + do_system_pictures_import = _tmp116_; #line 176 "/home/jens/Source/shotwell/src/main.vala" - configuration_facade_set_show_welcome_dialog (G_TYPE_CHECK_INSTANCE_CAST (_tmp117_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade), _tmp122_); + configuration_facade_set_show_welcome_dialog (G_TYPE_CHECK_INSTANCE_CAST (_tmp112_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade), _tmp117_); #line 176 "/home/jens/Source/shotwell/src/main.vala" - _g_object_unref0 (_tmp117_); + _g_object_unref0 (_tmp112_); #line 173 "/home/jens/Source/shotwell/src/main.vala" _g_object_unref0 (welcome); -#line 1581 "main.c" +#line 1566 "main.c" } else { - ConfigFacade* _tmp123_ = NULL; - ConfigFacade* _tmp124_ = NULL; + ConfigFacade* _tmp118_; + ConfigFacade* _tmp119_; #line 179 "/home/jens/Source/shotwell/src/main.vala" - _tmp123_ = config_facade_get_instance (); + _tmp118_ = config_facade_get_instance (); #line 179 "/home/jens/Source/shotwell/src/main.vala" - _tmp124_ = _tmp123_; + _tmp119_ = _tmp118_; #line 179 "/home/jens/Source/shotwell/src/main.vala" - configuration_facade_set_show_welcome_dialog (G_TYPE_CHECK_INSTANCE_CAST (_tmp124_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade), FALSE); + configuration_facade_set_show_welcome_dialog (G_TYPE_CHECK_INSTANCE_CAST (_tmp119_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade), FALSE); #line 179 "/home/jens/Source/shotwell/src/main.vala" - _g_object_unref0 (_tmp124_); -#line 1593 "main.c" + _g_object_unref0 (_tmp119_); +#line 1578 "main.c" } #line 182 "/home/jens/Source/shotwell/src/main.vala" - _tmp125_ = selected_import_entries; + _tmp120_ = selected_import_entries; #line 182 "/home/jens/Source/shotwell/src/main.vala" - _tmp125__length1 = selected_import_entries_length1; + _tmp120__length1 = selected_import_entries_length1; #line 182 "/home/jens/Source/shotwell/src/main.vala" - if (_tmp125__length1 > 0) { -#line 1601 "main.c" - WelcomeServiceEntry** _tmp126_ = NULL; - gint _tmp126__length1 = 0; + if (_tmp120__length1 > 0) { +#line 1586 "main.c" + WelcomeServiceEntry** _tmp121_; + gint _tmp121__length1; #line 183 "/home/jens/Source/shotwell/src/main.vala" do_external_import = TRUE; #line 184 "/home/jens/Source/shotwell/src/main.vala" - _tmp126_ = selected_import_entries; + _tmp121_ = selected_import_entries; #line 184 "/home/jens/Source/shotwell/src/main.vala" - _tmp126__length1 = selected_import_entries_length1; -#line 1610 "main.c" + _tmp121__length1 = selected_import_entries_length1; +#line 1595 "main.c" { WelcomeServiceEntry** entry_collection = NULL; gint entry_collection_length1 = 0; gint _entry_collection_size_ = 0; gint entry_it = 0; #line 184 "/home/jens/Source/shotwell/src/main.vala" - entry_collection = _tmp126_; + entry_collection = _tmp121_; #line 184 "/home/jens/Source/shotwell/src/main.vala" - entry_collection_length1 = _tmp126__length1; + entry_collection_length1 = _tmp121__length1; #line 184 "/home/jens/Source/shotwell/src/main.vala" - for (entry_it = 0; entry_it < _tmp126__length1; entry_it = entry_it + 1) { -#line 1622 "main.c" - WelcomeServiceEntry* _tmp127_ = NULL; + for (entry_it = 0; entry_it < _tmp121__length1; entry_it = entry_it + 1) { +#line 1607 "main.c" + WelcomeServiceEntry* _tmp122_; WelcomeServiceEntry* entry = NULL; #line 184 "/home/jens/Source/shotwell/src/main.vala" - _tmp127_ = _g_object_ref0 (entry_collection[entry_it]); + _tmp122_ = _g_object_ref0 (entry_collection[entry_it]); #line 184 "/home/jens/Source/shotwell/src/main.vala" - entry = _tmp127_; -#line 1629 "main.c" + entry = _tmp122_; +#line 1614 "main.c" { - WelcomeServiceEntry* _tmp128_ = NULL; + WelcomeServiceEntry* _tmp123_; #line 185 "/home/jens/Source/shotwell/src/main.vala" - _tmp128_ = entry; + _tmp123_ = entry; #line 185 "/home/jens/Source/shotwell/src/main.vala" - welcome_service_entry_execute (_tmp128_); + welcome_service_entry_execute (_tmp123_); #line 184 "/home/jens/Source/shotwell/src/main.vala" _g_object_unref0 (entry); -#line 1638 "main.c" +#line 1623 "main.c" } } } } #line 187 "/home/jens/Source/shotwell/src/main.vala" - _tmp129_ = do_system_pictures_import; + _tmp124_ = do_system_pictures_import; #line 187 "/home/jens/Source/shotwell/src/main.vala" - if (_tmp129_) { + if (_tmp124_) { #line 191 "/home/jens/Source/shotwell/src/main.vala" run_system_pictures_import (NULL); -#line 1649 "main.c" +#line 1634 "main.c" } #line 194 "/home/jens/Source/shotwell/src/main.vala" - _tmp130_ = startup_timer; + _tmp125_ = startup_timer; #line 194 "/home/jens/Source/shotwell/src/main.vala" - _tmp131_ = g_timer_elapsed (_tmp130_, NULL); + _tmp126_ = g_timer_elapsed (_tmp125_, NULL); #line 194 "/home/jens/Source/shotwell/src/main.vala" - g_debug ("main.vala:194: %lf seconds to Gtk.main()", _tmp131_); + g_debug ("main.vala:194: %lf seconds to Gtk.main()", _tmp126_); #line 196 "/home/jens/Source/shotwell/src/main.vala" - _tmp132_ = application_get_instance (); + _tmp127_ = application_get_instance (); #line 196 "/home/jens/Source/shotwell/src/main.vala" - _tmp133_ = _tmp132_; + _tmp128_ = _tmp127_; #line 196 "/home/jens/Source/shotwell/src/main.vala" - application_start (_tmp133_, NULL, 0); + application_start (_tmp128_, NULL, 0); #line 196 "/home/jens/Source/shotwell/src/main.vala" - _application_unref0 (_tmp133_); + _application_unref0 (_tmp128_); #line 198 "/home/jens/Source/shotwell/src/main.vala" desktop_integration_terminate (); #line 199 "/home/jens/Source/shotwell/src/main.vala" @@ -1713,35 +1698,35 @@ 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 1709 "main.c" +#line 1694 "main.c" } static void _report_system_pictures_import_batch_import_import_reporter (ImportManifest* manifest, BatchImportRoll* import_roll, gpointer self) { #line 223 "/home/jens/Source/shotwell/src/main.vala" report_system_pictures_import (manifest, import_roll); -#line 1716 "main.c" +#line 1701 "main.c" } void run_system_pictures_import (ImportManifest* external_exclusion_manifest) { - gboolean _tmp0_ = FALSE; + gboolean _tmp0_; GeeArrayList* jobs = NULL; - GeeArrayList* _tmp1_ = NULL; - GeeArrayList* _tmp2_ = NULL; - GFile* _tmp3_ = NULL; - GFile* _tmp4_ = NULL; - FileImportJob* _tmp5_ = NULL; - FileImportJob* _tmp6_ = NULL; + GeeArrayList* _tmp1_; + GeeArrayList* _tmp2_; + GFile* _tmp3_; + GFile* _tmp4_; + FileImportJob* _tmp5_; + FileImportJob* _tmp6_; LibraryWindow* library_window = NULL; - AppWindow* _tmp7_ = NULL; + AppWindow* _tmp7_; BatchImport* batch_import = NULL; - GeeArrayList* _tmp8_ = NULL; - ImportManifest* _tmp9_ = NULL; - BatchImport* _tmp10_ = NULL; - LibraryWindow* _tmp11_ = NULL; - BatchImport* _tmp12_ = NULL; - LibraryWindow* _tmp13_ = NULL; + GeeArrayList* _tmp8_; + ImportManifest* _tmp9_; + BatchImport* _tmp10_; + LibraryWindow* _tmp11_; + BatchImport* _tmp12_; + LibraryWindow* _tmp13_; #line 214 "/home/jens/Source/shotwell/src/main.vala" g_return_if_fail ((external_exclusion_manifest == NULL) || IS_IMPORT_MANIFEST (external_exclusion_manifest)); #line 215 "/home/jens/Source/shotwell/src/main.vala" @@ -1750,7 +1735,7 @@ void run_system_pictures_import (ImportManifest* external_exclusion_manifest) { if (!_tmp0_) { #line 216 "/home/jens/Source/shotwell/src/main.vala" return; -#line 1746 "main.c" +#line 1731 "main.c" } #line 218 "/home/jens/Source/shotwell/src/main.vala" _tmp1_ = gee_array_list_new (TYPE_FILE_IMPORT_JOB, (GBoxedCopyFunc) batch_import_job_ref, (GDestroyNotify) batch_import_job_unref, NULL, NULL, NULL); @@ -1800,14 +1785,14 @@ void run_system_pictures_import (ImportManifest* external_exclusion_manifest) { _g_object_unref0 (library_window); #line 214 "/home/jens/Source/shotwell/src/main.vala" _g_object_unref0 (jobs); -#line 1796 "main.c" +#line 1781 "main.c" } void report_system_pictures_import (ImportManifest* manifest, BatchImportRoll* import_roll) { gboolean _tmp0_ = FALSE; - gboolean _tmp1_ = FALSE; - ImportManifest* _tmp6_ = NULL; + gboolean _tmp1_; + ImportManifest* _tmp6_; #line 230 "/home/jens/Source/shotwell/src/main.vala" g_return_if_fail (IS_IMPORT_MANIFEST (manifest)); #line 230 "/home/jens/Source/shotwell/src/main.vala" @@ -1816,11 +1801,11 @@ void report_system_pictures_import (ImportManifest* manifest, BatchImportRoll* i _tmp1_ = do_external_import; #line 237 "/home/jens/Source/shotwell/src/main.vala" if (_tmp1_) { -#line 1812 "main.c" - ImportManifest* _tmp2_ = NULL; - GeeList* _tmp3_ = NULL; - gint _tmp4_ = 0; - gint _tmp5_ = 0; +#line 1797 "main.c" + ImportManifest* _tmp2_; + GeeList* _tmp3_; + gint _tmp4_; + gint _tmp5_; #line 237 "/home/jens/Source/shotwell/src/main.vala" _tmp2_ = manifest; #line 237 "/home/jens/Source/shotwell/src/main.vala" @@ -1831,39 +1816,39 @@ void report_system_pictures_import (ImportManifest* manifest, BatchImportRoll* i _tmp5_ = _tmp4_; #line 237 "/home/jens/Source/shotwell/src/main.vala" _tmp0_ = _tmp5_ == 0; -#line 1827 "main.c" +#line 1812 "main.c" } else { #line 237 "/home/jens/Source/shotwell/src/main.vala" _tmp0_ = FALSE; -#line 1831 "main.c" +#line 1816 "main.c" } #line 237 "/home/jens/Source/shotwell/src/main.vala" if (_tmp0_) { #line 238 "/home/jens/Source/shotwell/src/main.vala" return; -#line 1837 "main.c" +#line 1822 "main.c" } #line 240 "/home/jens/Source/shotwell/src/main.vala" _tmp6_ = manifest; #line 240 "/home/jens/Source/shotwell/src/main.vala" import_ui_report_manifest (_tmp6_, TRUE, NULL); -#line 1843 "main.c" +#line 1828 "main.c" } void editing_exec (const gchar* filename) { GFile* initial_file = NULL; - const gchar* _tmp0_ = NULL; - GFile* _tmp1_ = NULL; - GFile* _tmp2_ = NULL; + const gchar* _tmp0_; + GFile* _tmp1_; + GFile* _tmp2_; DirectWindow* direct_window = NULL; - GFile* _tmp5_ = NULL; - DirectWindow* _tmp6_ = NULL; - DirectWindow* _tmp7_ = NULL; - GTimer* _tmp8_ = NULL; - gdouble _tmp9_ = 0.0; - Application* _tmp10_ = NULL; - Application* _tmp11_ = NULL; + GFile* _tmp5_; + DirectWindow* _tmp6_; + DirectWindow* _tmp7_; + GTimer* _tmp8_; + gdouble _tmp9_; + Application* _tmp10_; + Application* _tmp11_; GError * _inner_error_ = NULL; #line 243 "/home/jens/Source/shotwell/src/main.vala" g_return_if_fail (filename != NULL); @@ -1879,22 +1864,22 @@ void editing_exec (const gchar* filename) { direct_preconfigure (_tmp2_); #line 248 "/home/jens/Source/shotwell/src/main.vala" db_preconfigure (NULL); -#line 1875 "main.c" +#line 1860 "main.c" { #line 252 "/home/jens/Source/shotwell/src/main.vala" direct_app_init (&_inner_error_); #line 252 "/home/jens/Source/shotwell/src/main.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 1881 "main.c" - goto __catch223_g_error; +#line 1866 "main.c" + goto __catch224_g_error; } } - goto __finally223; - __catch223_g_error: + goto __finally224; + __catch224_g_error: { GError* err = NULL; - GError* _tmp3_ = NULL; - const gchar* _tmp4_ = NULL; + GError* _tmp3_; + const gchar* _tmp4_; #line 251 "/home/jens/Source/shotwell/src/main.vala" err = _inner_error_; #line 251 "/home/jens/Source/shotwell/src/main.vala" @@ -1911,9 +1896,9 @@ void editing_exec (const gchar* filename) { _g_object_unref0 (initial_file); #line 256 "/home/jens/Source/shotwell/src/main.vala" return; -#line 1907 "main.c" +#line 1892 "main.c" } - __finally223: + __finally224: #line 251 "/home/jens/Source/shotwell/src/main.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { #line 251 "/home/jens/Source/shotwell/src/main.vala" @@ -1924,7 +1909,7 @@ void editing_exec (const gchar* filename) { g_clear_error (&_inner_error_); #line 251 "/home/jens/Source/shotwell/src/main.vala" return; -#line 1920 "main.c" +#line 1905 "main.c" } #line 260 "/home/jens/Source/shotwell/src/main.vala" desktop_integration_init (); @@ -1962,152 +1947,147 @@ void editing_exec (const gchar* filename) { _g_object_unref0 (direct_window); #line 243 "/home/jens/Source/shotwell/src/main.vala" _g_object_unref0 (initial_file); -#line 1958 "main.c" +#line 1943 "main.c" } static GOptionEntry* _vala_array_dup26 (GOptionEntry* self, int length) { #line 290 "/home/jens/Source/shotwell/src/main.vala" return g_memdup (self, length * sizeof (GOptionEntry)); -#line 1965 "main.c" +#line 1950 "main.c" } -static void _vala_array_add70 (GOptionEntry** array, int* length, int* size, const GOptionEntry* value) { +static void _vala_array_add70 (GOptionEntry* * array, int* length, int* size, const GOptionEntry* value) { #line 294 "/home/jens/Source/shotwell/src/main.vala" if ((*length) == (*size)) { #line 294 "/home/jens/Source/shotwell/src/main.vala" *size = (*size) ? (2 * (*size)) : 4; #line 294 "/home/jens/Source/shotwell/src/main.vala" *array = g_renew (GOptionEntry, *array, *size); -#line 1976 "main.c" +#line 1961 "main.c" } #line 294 "/home/jens/Source/shotwell/src/main.vala" (*array)[(*length)++] = *value; -#line 1980 "main.c" +#line 1965 "main.c" } -static void _vala_array_add71 (GOptionEntry** array, int* length, int* size, const GOptionEntry* value) { +static void _vala_array_add71 (GOptionEntry* * array, int* length, int* size, const GOptionEntry* value) { #line 298 "/home/jens/Source/shotwell/src/main.vala" if ((*length) == (*size)) { #line 298 "/home/jens/Source/shotwell/src/main.vala" *size = (*size) ? (2 * (*size)) : 4; #line 298 "/home/jens/Source/shotwell/src/main.vala" *array = g_renew (GOptionEntry, *array, *size); -#line 1991 "main.c" +#line 1976 "main.c" } #line 298 "/home/jens/Source/shotwell/src/main.vala" (*array)[(*length)++] = *value; -#line 1995 "main.c" +#line 1980 "main.c" } -static void _vala_array_add72 (GOptionEntry** array, int* length, int* size, const GOptionEntry* value) { +static void _vala_array_add72 (GOptionEntry* * array, int* length, int* size, const GOptionEntry* value) { #line 302 "/home/jens/Source/shotwell/src/main.vala" if ((*length) == (*size)) { #line 302 "/home/jens/Source/shotwell/src/main.vala" *size = (*size) ? (2 * (*size)) : 4; #line 302 "/home/jens/Source/shotwell/src/main.vala" *array = g_renew (GOptionEntry, *array, *size); -#line 2006 "main.c" +#line 1991 "main.c" } #line 302 "/home/jens/Source/shotwell/src/main.vala" (*array)[(*length)++] = *value; -#line 2010 "main.c" +#line 1995 "main.c" } -static void _vala_array_add73 (GOptionEntry** array, int* length, int* size, const GOptionEntry* value) { +static void _vala_array_add73 (GOptionEntry* * array, int* length, int* size, const GOptionEntry* value) { #line 306 "/home/jens/Source/shotwell/src/main.vala" if ((*length) == (*size)) { #line 306 "/home/jens/Source/shotwell/src/main.vala" *size = (*size) ? (2 * (*size)) : 4; #line 306 "/home/jens/Source/shotwell/src/main.vala" *array = g_renew (GOptionEntry, *array, *size); -#line 2021 "main.c" +#line 2006 "main.c" } #line 306 "/home/jens/Source/shotwell/src/main.vala" (*array)[(*length)++] = *value; -#line 2025 "main.c" +#line 2010 "main.c" } -static void _vala_array_add74 (GOptionEntry** array, int* length, int* size, const GOptionEntry* value) { +static void _vala_array_add74 (GOptionEntry* * array, int* length, int* size, const GOptionEntry* value) { #line 309 "/home/jens/Source/shotwell/src/main.vala" if ((*length) == (*size)) { #line 309 "/home/jens/Source/shotwell/src/main.vala" *size = (*size) ? (2 * (*size)) : 4; #line 309 "/home/jens/Source/shotwell/src/main.vala" *array = g_renew (GOptionEntry, *array, *size); -#line 2036 "main.c" +#line 2021 "main.c" } #line 309 "/home/jens/Source/shotwell/src/main.vala" (*array)[(*length)++] = *value; -#line 2040 "main.c" +#line 2025 "main.c" } static GOptionEntry* _vala_array_dup27 (GOptionEntry* self, int length) { #line 311 "/home/jens/Source/shotwell/src/main.vala" return g_memdup (self, length * sizeof (GOptionEntry)); -#line 2047 "main.c" +#line 2032 "main.c" } GOptionEntry* commandline_options_get_options (int* result_length1) { GOptionEntry* result = NULL; - GOptionEntry* _tmp0_ = NULL; - gint _tmp0__length1 = 0; + GOptionEntry* _tmp0_; + gint _tmp0__length1; GOptionEntry datadir = {0}; - const gchar* _tmp4_ = NULL; - const gchar* _tmp5_ = NULL; - GOptionEntry _tmp6_ = {0}; - GOptionEntry* _tmp7_ = NULL; - gint _tmp7__length1 = 0; - GOptionEntry _tmp8_ = {0}; + GOptionEntry _tmp4_ = {0}; + GOptionEntry* _tmp5_; + gint _tmp5__length1; + GOptionEntry _tmp6_; GOptionEntry no_monitoring = {0}; - const gchar* _tmp9_ = NULL; - GOptionEntry _tmp10_ = {0}; - GOptionEntry* _tmp11_ = NULL; - gint _tmp11__length1 = 0; - GOptionEntry _tmp12_ = {0}; + GOptionEntry _tmp7_ = {0}; + GOptionEntry* _tmp8_; + gint _tmp8__length1; + GOptionEntry _tmp9_; GOptionEntry no_startup = {0}; - const gchar* _tmp13_ = NULL; - GOptionEntry _tmp14_ = {0}; - GOptionEntry* _tmp15_ = NULL; - gint _tmp15__length1 = 0; - GOptionEntry _tmp16_ = {0}; + GOptionEntry _tmp10_ = {0}; + GOptionEntry* _tmp11_; + gint _tmp11__length1; + GOptionEntry _tmp12_; GOptionEntry version = {0}; - const gchar* _tmp17_ = NULL; - GOptionEntry _tmp18_ = {0}; - GOptionEntry* _tmp19_ = NULL; - gint _tmp19__length1 = 0; - GOptionEntry _tmp20_ = {0}; + GOptionEntry _tmp13_ = {0}; + GOptionEntry* _tmp14_; + gint _tmp14__length1; + GOptionEntry _tmp15_; GOptionEntry terminator = {0}; - GOptionEntry _tmp21_ = {0}; - GOptionEntry* _tmp22_ = NULL; - gint _tmp22__length1 = 0; - GOptionEntry _tmp23_ = {0}; - GOptionEntry* _tmp24_ = NULL; - gint _tmp24__length1 = 0; - GOptionEntry* _tmp25_ = NULL; - gint _tmp25__length1 = 0; - GOptionEntry* _tmp26_ = NULL; - gint _tmp26__length1 = 0; + GOptionEntry _tmp16_ = {0}; + GOptionEntry* _tmp17_; + gint _tmp17__length1; + GOptionEntry _tmp18_; + GOptionEntry* _tmp19_; + gint _tmp19__length1; + GOptionEntry* _tmp20_; + gint _tmp20__length1; + GOptionEntry* _tmp21_; + gint _tmp21__length1; #line 289 "/home/jens/Source/shotwell/src/main.vala" _tmp0_ = commandline_options_entries; #line 289 "/home/jens/Source/shotwell/src/main.vala" _tmp0__length1 = commandline_options_entries_length1; #line 289 "/home/jens/Source/shotwell/src/main.vala" if (_tmp0_ != NULL) { -#line 2097 "main.c" - GOptionEntry* _tmp1_ = NULL; - gint _tmp1__length1 = 0; - GOptionEntry* _tmp2_ = NULL; - gint _tmp2__length1 = 0; - GOptionEntry* _tmp3_ = NULL; - gint _tmp3__length1 = 0; +#line 2077 "main.c" + GOptionEntry* _tmp1_; + gint _tmp1__length1; + GOptionEntry* _tmp2_; + gint _tmp2__length1; + GOptionEntry* _tmp3_; + gint _tmp3__length1; #line 290 "/home/jens/Source/shotwell/src/main.vala" _tmp1_ = commandline_options_entries; #line 290 "/home/jens/Source/shotwell/src/main.vala" @@ -2124,238 +2104,228 @@ GOptionEntry* commandline_options_get_options (int* result_length1) { if (result_length1) { #line 290 "/home/jens/Source/shotwell/src/main.vala" *result_length1 = _tmp3__length1; -#line 2120 "main.c" +#line 2100 "main.c" } #line 290 "/home/jens/Source/shotwell/src/main.vala" result = _tmp3_; #line 290 "/home/jens/Source/shotwell/src/main.vala" return result; -#line 2126 "main.c" +#line 2106 "main.c" } #line 292 "/home/jens/Source/shotwell/src/main.vala" - _tmp4_ = _ ("Path to Shotwell’s private data"); + _tmp4_.long_name = "datadir"; #line 292 "/home/jens/Source/shotwell/src/main.vala" - _tmp5_ = _ ("DIRECTORY"); + _tmp4_.short_name = 'd'; #line 292 "/home/jens/Source/shotwell/src/main.vala" - _tmp6_.long_name = "datadir"; + _tmp4_.flags = 0; #line 292 "/home/jens/Source/shotwell/src/main.vala" - _tmp6_.short_name = 'd'; + _tmp4_.arg = G_OPTION_ARG_FILENAME; #line 292 "/home/jens/Source/shotwell/src/main.vala" - _tmp6_.flags = 0; + _tmp4_.arg_data = &commandline_options_data_dir; #line 292 "/home/jens/Source/shotwell/src/main.vala" - _tmp6_.arg = G_OPTION_ARG_FILENAME; + _tmp4_.description = _ ("Path to Shotwell’s private data"); #line 292 "/home/jens/Source/shotwell/src/main.vala" - _tmp6_.arg_data = &commandline_options_data_dir; + _tmp4_.arg_description = _ ("DIRECTORY"); #line 292 "/home/jens/Source/shotwell/src/main.vala" - _tmp6_.description = _tmp4_; -#line 292 "/home/jens/Source/shotwell/src/main.vala" - _tmp6_.arg_description = _tmp5_; -#line 292 "/home/jens/Source/shotwell/src/main.vala" - datadir = _tmp6_; + datadir = _tmp4_; #line 294 "/home/jens/Source/shotwell/src/main.vala" - _tmp7_ = commandline_options_entries; + _tmp5_ = commandline_options_entries; #line 294 "/home/jens/Source/shotwell/src/main.vala" - _tmp7__length1 = commandline_options_entries_length1; + _tmp5__length1 = commandline_options_entries_length1; #line 294 "/home/jens/Source/shotwell/src/main.vala" - _tmp8_ = datadir; + _tmp6_ = datadir; #line 294 "/home/jens/Source/shotwell/src/main.vala" - _vala_array_add70 (&commandline_options_entries, &commandline_options_entries_length1, &_commandline_options_entries_size_, &_tmp8_); + _vala_array_add70 (&commandline_options_entries, &commandline_options_entries_length1, &_commandline_options_entries_size_, &_tmp6_); #line 296 "/home/jens/Source/shotwell/src/main.vala" - _tmp9_ = _ ("Do not monitor library directory at runtime for changes"); + _tmp7_.long_name = "no-runtime-monitoring"; #line 296 "/home/jens/Source/shotwell/src/main.vala" - _tmp10_.long_name = "no-runtime-monitoring"; + _tmp7_.short_name = (gchar) 0; #line 296 "/home/jens/Source/shotwell/src/main.vala" - _tmp10_.short_name = (gchar) 0; + _tmp7_.flags = 0; #line 296 "/home/jens/Source/shotwell/src/main.vala" - _tmp10_.flags = 0; + _tmp7_.arg = G_OPTION_ARG_NONE; #line 296 "/home/jens/Source/shotwell/src/main.vala" - _tmp10_.arg = G_OPTION_ARG_NONE; -#line 296 "/home/jens/Source/shotwell/src/main.vala" - _tmp10_.arg_data = &commandline_options_no_runtime_monitoring; + _tmp7_.arg_data = &commandline_options_no_runtime_monitoring; #line 296 "/home/jens/Source/shotwell/src/main.vala" - _tmp10_.description = _tmp9_; + _tmp7_.description = _ ("Do not monitor library directory at runtime for changes"); #line 296 "/home/jens/Source/shotwell/src/main.vala" - _tmp10_.arg_description = NULL; + _tmp7_.arg_description = NULL; #line 296 "/home/jens/Source/shotwell/src/main.vala" - no_monitoring = _tmp10_; + no_monitoring = _tmp7_; #line 298 "/home/jens/Source/shotwell/src/main.vala" - _tmp11_ = commandline_options_entries; + _tmp8_ = commandline_options_entries; #line 298 "/home/jens/Source/shotwell/src/main.vala" - _tmp11__length1 = commandline_options_entries_length1; + _tmp8__length1 = commandline_options_entries_length1; #line 298 "/home/jens/Source/shotwell/src/main.vala" - _tmp12_ = no_monitoring; + _tmp9_ = no_monitoring; #line 298 "/home/jens/Source/shotwell/src/main.vala" - _vala_array_add71 (&commandline_options_entries, &commandline_options_entries_length1, &_commandline_options_entries_size_, &_tmp12_); + _vala_array_add71 (&commandline_options_entries, &commandline_options_entries_length1, &_commandline_options_entries_size_, &_tmp9_); #line 300 "/home/jens/Source/shotwell/src/main.vala" - _tmp13_ = _ ("Don’t display startup progress meter"); + _tmp10_.long_name = "no-startup-progress"; #line 300 "/home/jens/Source/shotwell/src/main.vala" - _tmp14_.long_name = "no-startup-progress"; -#line 300 "/home/jens/Source/shotwell/src/main.vala" - _tmp14_.short_name = (gchar) 0; + _tmp10_.short_name = (gchar) 0; #line 300 "/home/jens/Source/shotwell/src/main.vala" - _tmp14_.flags = 0; + _tmp10_.flags = 0; #line 300 "/home/jens/Source/shotwell/src/main.vala" - _tmp14_.arg = G_OPTION_ARG_NONE; + _tmp10_.arg = G_OPTION_ARG_NONE; #line 300 "/home/jens/Source/shotwell/src/main.vala" - _tmp14_.arg_data = &commandline_options_no_startup_progress; + _tmp10_.arg_data = &commandline_options_no_startup_progress; #line 300 "/home/jens/Source/shotwell/src/main.vala" - _tmp14_.description = _tmp13_; + _tmp10_.description = _ ("Don’t display startup progress meter"); #line 300 "/home/jens/Source/shotwell/src/main.vala" - _tmp14_.arg_description = NULL; + _tmp10_.arg_description = NULL; #line 300 "/home/jens/Source/shotwell/src/main.vala" - no_startup = _tmp14_; + no_startup = _tmp10_; #line 302 "/home/jens/Source/shotwell/src/main.vala" - _tmp15_ = commandline_options_entries; + _tmp11_ = commandline_options_entries; #line 302 "/home/jens/Source/shotwell/src/main.vala" - _tmp15__length1 = commandline_options_entries_length1; + _tmp11__length1 = commandline_options_entries_length1; #line 302 "/home/jens/Source/shotwell/src/main.vala" - _tmp16_ = no_startup; + _tmp12_ = no_startup; #line 302 "/home/jens/Source/shotwell/src/main.vala" - _vala_array_add72 (&commandline_options_entries, &commandline_options_entries_length1, &_commandline_options_entries_size_, &_tmp16_); + _vala_array_add72 (&commandline_options_entries, &commandline_options_entries_length1, &_commandline_options_entries_size_, &_tmp12_); #line 304 "/home/jens/Source/shotwell/src/main.vala" - _tmp17_ = _ ("Show the application’s version"); + _tmp13_.long_name = "version"; #line 304 "/home/jens/Source/shotwell/src/main.vala" - _tmp18_.long_name = "version"; + _tmp13_.short_name = 'V'; #line 304 "/home/jens/Source/shotwell/src/main.vala" - _tmp18_.short_name = 'V'; + _tmp13_.flags = 0; #line 304 "/home/jens/Source/shotwell/src/main.vala" - _tmp18_.flags = 0; + _tmp13_.arg = G_OPTION_ARG_NONE; #line 304 "/home/jens/Source/shotwell/src/main.vala" - _tmp18_.arg = G_OPTION_ARG_NONE; + _tmp13_.arg_data = &commandline_options_show_version; #line 304 "/home/jens/Source/shotwell/src/main.vala" - _tmp18_.arg_data = &commandline_options_show_version; + _tmp13_.description = _ ("Show the application’s version"); #line 304 "/home/jens/Source/shotwell/src/main.vala" - _tmp18_.description = _tmp17_; + _tmp13_.arg_description = NULL; #line 304 "/home/jens/Source/shotwell/src/main.vala" - _tmp18_.arg_description = NULL; -#line 304 "/home/jens/Source/shotwell/src/main.vala" - version = _tmp18_; + version = _tmp13_; #line 306 "/home/jens/Source/shotwell/src/main.vala" - _tmp19_ = commandline_options_entries; + _tmp14_ = commandline_options_entries; #line 306 "/home/jens/Source/shotwell/src/main.vala" - _tmp19__length1 = commandline_options_entries_length1; + _tmp14__length1 = commandline_options_entries_length1; #line 306 "/home/jens/Source/shotwell/src/main.vala" - _tmp20_ = version; + _tmp15_ = version; #line 306 "/home/jens/Source/shotwell/src/main.vala" - _vala_array_add73 (&commandline_options_entries, &commandline_options_entries_length1, &_commandline_options_entries_size_, &_tmp20_); + _vala_array_add73 (&commandline_options_entries, &commandline_options_entries_length1, &_commandline_options_entries_size_, &_tmp15_); #line 308 "/home/jens/Source/shotwell/src/main.vala" - _tmp21_.long_name = NULL; + _tmp16_.long_name = NULL; #line 308 "/home/jens/Source/shotwell/src/main.vala" - _tmp21_.short_name = (gchar) 0; + _tmp16_.short_name = (gchar) 0; #line 308 "/home/jens/Source/shotwell/src/main.vala" - _tmp21_.flags = 0; + _tmp16_.flags = 0; #line 308 "/home/jens/Source/shotwell/src/main.vala" - _tmp21_.arg = 0; + _tmp16_.arg = 0; #line 308 "/home/jens/Source/shotwell/src/main.vala" - _tmp21_.arg_data = NULL; + _tmp16_.arg_data = NULL; #line 308 "/home/jens/Source/shotwell/src/main.vala" - _tmp21_.description = NULL; + _tmp16_.description = NULL; #line 308 "/home/jens/Source/shotwell/src/main.vala" - _tmp21_.arg_description = NULL; + _tmp16_.arg_description = NULL; #line 308 "/home/jens/Source/shotwell/src/main.vala" - terminator = _tmp21_; + terminator = _tmp16_; #line 309 "/home/jens/Source/shotwell/src/main.vala" - _tmp22_ = commandline_options_entries; + _tmp17_ = commandline_options_entries; #line 309 "/home/jens/Source/shotwell/src/main.vala" - _tmp22__length1 = commandline_options_entries_length1; + _tmp17__length1 = commandline_options_entries_length1; #line 309 "/home/jens/Source/shotwell/src/main.vala" - _tmp23_ = terminator; + _tmp18_ = terminator; #line 309 "/home/jens/Source/shotwell/src/main.vala" - _vala_array_add74 (&commandline_options_entries, &commandline_options_entries_length1, &_commandline_options_entries_size_, &_tmp23_); + _vala_array_add74 (&commandline_options_entries, &commandline_options_entries_length1, &_commandline_options_entries_size_, &_tmp18_); #line 311 "/home/jens/Source/shotwell/src/main.vala" - _tmp24_ = commandline_options_entries; + _tmp19_ = commandline_options_entries; #line 311 "/home/jens/Source/shotwell/src/main.vala" - _tmp24__length1 = commandline_options_entries_length1; + _tmp19__length1 = commandline_options_entries_length1; #line 311 "/home/jens/Source/shotwell/src/main.vala" - _tmp25_ = (_tmp24_ != NULL) ? _vala_array_dup27 (_tmp24_, _tmp24__length1) : ((gpointer) _tmp24_); + _tmp20_ = (_tmp19_ != NULL) ? _vala_array_dup27 (_tmp19_, _tmp19__length1) : ((gpointer) _tmp19_); #line 311 "/home/jens/Source/shotwell/src/main.vala" - _tmp25__length1 = _tmp24__length1; + _tmp20__length1 = _tmp19__length1; #line 311 "/home/jens/Source/shotwell/src/main.vala" - _tmp26_ = _tmp25_; + _tmp21_ = _tmp20_; #line 311 "/home/jens/Source/shotwell/src/main.vala" - _tmp26__length1 = _tmp25__length1; + _tmp21__length1 = _tmp20__length1; #line 311 "/home/jens/Source/shotwell/src/main.vala" if (result_length1) { #line 311 "/home/jens/Source/shotwell/src/main.vala" - *result_length1 = _tmp26__length1; -#line 2274 "main.c" + *result_length1 = _tmp21__length1; +#line 2244 "main.c" } #line 311 "/home/jens/Source/shotwell/src/main.vala" - result = _tmp26_; + result = _tmp21_; #line 311 "/home/jens/Source/shotwell/src/main.vala" return result; -#line 2280 "main.c" +#line 2250 "main.c" } -static void _vala_array_add75 (gchar*** array, int* length, int* size, gchar* value) { +static void _vala_array_add75 (gchar** * array, int* length, int* size, gchar* value) { #line 376 "/home/jens/Source/shotwell/src/main.vala" if ((*length) == (*size)) { #line 376 "/home/jens/Source/shotwell/src/main.vala" *size = (*size) ? (2 * (*size)) : 4; #line 376 "/home/jens/Source/shotwell/src/main.vala" *array = g_renew (gchar*, *array, (*size) + 1); -#line 2291 "main.c" +#line 2261 "main.c" } #line 376 "/home/jens/Source/shotwell/src/main.vala" (*array)[(*length)++] = value; #line 376 "/home/jens/Source/shotwell/src/main.vala" (*array)[*length] = NULL; -#line 2297 "main.c" +#line 2267 "main.c" } 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.34/vapi/glib-2.0.vapi" + const gchar* _tmp0_; + gchar* _tmp1_; +#line 1403 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" g_return_val_if_fail (self != NULL, FALSE); -#line 1376 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1403 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" g_return_val_if_fail (needle != NULL, FALSE); -#line 1377 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1404 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp0_ = needle; -#line 1377 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1404 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp1_ = strstr ((gchar*) self, (gchar*) _tmp0_); -#line 1377 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1404 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" result = _tmp1_ != NULL; -#line 1377 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1404 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" return result; -#line 2317 "main.c" +#line 2287 "main.c" } void _vala_main (gchar** args, int args_length1) { - gchar** _tmp0_ = NULL; - gint _tmp0__length1 = 0; - const gchar* _tmp1_ = NULL; - GFile* _tmp2_ = NULL; - GFile* _tmp3_ = NULL; - gboolean _tmp4_ = FALSE; - gboolean _tmp22_ = FALSE; + gchar** _tmp0_; + gint _tmp0__length1; + const gchar* _tmp1_; + GFile* _tmp2_; + GFile* _tmp3_; + gboolean _tmp4_; + gboolean _tmp20_; gchar** mounts = NULL; - gchar** _tmp23_ = NULL; - gint mounts_length1 = 0; - gint _mounts_size_ = 0; + gchar** _tmp21_; + gint mounts_length1; + gint _mounts_size_; gchar* filename = NULL; - const gchar* _tmp44_ = NULL; - const gchar* _tmp45_ = NULL; - gboolean _tmp46_ = FALSE; - GDateTime* _tmp53_ = NULL; - GDateTime* _tmp54_ = NULL; - const gchar* _tmp55_ = NULL; - 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; - gboolean _tmp67_ = FALSE; - const gchar* _tmp68_ = NULL; - gboolean _tmp69_ = FALSE; + const gchar* _tmp42_ = NULL; + const gchar* _tmp43_; + gboolean _tmp44_; + GDateTime* _tmp51_; + GDateTime* _tmp52_; + const gchar* _tmp53_; + const gchar* _tmp54_; + gboolean _tmp55_; + const gchar* _tmp56_; + gchar** _tmp58_; + gint _tmp58__length1; + GTimer* _tmp59_; + GTimer* _tmp60_; + const gchar* _tmp61_; + gboolean _tmp62_; + gboolean _tmp65_ = FALSE; + const gchar* _tmp66_; + gboolean _tmp67_; GError * _inner_error_ = NULL; #line 319 "/home/jens/Source/shotwell/src/main.vala" _tmp0_ = args; @@ -2381,13 +2351,13 @@ void _vala_main (gchar** args, int args_length1) { _g_object_unref0 (_tmp3_); #line 335 "/home/jens/Source/shotwell/src/main.vala" if (_tmp4_) { -#line 2377 "main.c" - GFile* _tmp5_ = NULL; - GFile* _tmp6_ = NULL; - gchar* _tmp7_ = NULL; - gchar* _tmp8_ = NULL; - gchar* _tmp9_ = NULL; - gchar* _tmp10_ = NULL; +#line 2347 "main.c" + GFile* _tmp5_; + GFile* _tmp6_; + gchar* _tmp7_; + gchar* _tmp8_; + gchar* _tmp9_; + gchar* _tmp10_; #line 336 "/home/jens/Source/shotwell/src/main.vala" _tmp5_ = app_dirs_get_exec_dir (); #line 336 "/home/jens/Source/shotwell/src/main.vala" @@ -2408,79 +2378,73 @@ void _vala_main (gchar** args, int args_length1) { _g_free0 (_tmp8_); #line 336 "/home/jens/Source/shotwell/src/main.vala" _g_object_unref0 (_tmp6_); -#line 2404 "main.c" +#line 2374 "main.c" } { - const gchar* _tmp11_ = NULL; - gint _tmp12_ = 0; - GOptionEntry* _tmp13_ = NULL; - GOptionEntry* _tmp14_ = NULL; - gint _tmp14__length1 = 0; + gint _tmp11_; + GOptionEntry* _tmp12_; + GOptionEntry* _tmp13_; + gint _tmp13__length1; #line 342 "/home/jens/Source/shotwell/src/main.vala" - _tmp11_ = _ ("[FILE]"); + _tmp12_ = commandline_options_get_options (&_tmp11_); #line 342 "/home/jens/Source/shotwell/src/main.vala" - _tmp13_ = commandline_options_get_options (&_tmp12_); + _tmp13_ = _tmp12_; #line 342 "/home/jens/Source/shotwell/src/main.vala" - _tmp14_ = _tmp13_; + _tmp13__length1 = _tmp11_; #line 342 "/home/jens/Source/shotwell/src/main.vala" - _tmp14__length1 = _tmp12_; + gtk_init_with_args (&args_length1, &args, _ ("[FILE]"), _tmp13_, RESOURCES_APP_GETTEXT_PACKAGE, &_inner_error_); #line 342 "/home/jens/Source/shotwell/src/main.vala" - gtk_init_with_args (&args_length1, &args, _tmp11_, _tmp14_, RESOURCES_APP_GETTEXT_PACKAGE, &_inner_error_); -#line 342 "/home/jens/Source/shotwell/src/main.vala" - _tmp14_ = (g_free (_tmp14_), NULL); + _tmp13_ = (g_free (_tmp13_), NULL); #line 342 "/home/jens/Source/shotwell/src/main.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 2426 "main.c" - goto __catch224_g_error; +#line 2393 "main.c" + goto __catch225_g_error; } } - goto __finally224; - __catch224_g_error: + goto __finally225; + __catch225_g_error: { GError* e = NULL; - GError* _tmp15_ = NULL; - const gchar* _tmp16_ = NULL; - gchar* _tmp17_ = NULL; - gchar* _tmp18_ = NULL; - const gchar* _tmp19_ = NULL; - gchar** _tmp20_ = NULL; - gint _tmp20__length1 = 0; - const gchar* _tmp21_ = NULL; + GError* _tmp14_; + const gchar* _tmp15_; + gchar* _tmp16_; + gchar* _tmp17_; + gchar** _tmp18_; + gint _tmp18__length1; + const gchar* _tmp19_; #line 341 "/home/jens/Source/shotwell/src/main.vala" e = _inner_error_; #line 341 "/home/jens/Source/shotwell/src/main.vala" _inner_error_ = NULL; #line 345 "/home/jens/Source/shotwell/src/main.vala" - _tmp15_ = e; + _tmp14_ = e; #line 345 "/home/jens/Source/shotwell/src/main.vala" - _tmp16_ = _tmp15_->message; + _tmp15_ = _tmp14_->message; #line 345 "/home/jens/Source/shotwell/src/main.vala" - _tmp17_ = g_strconcat (_tmp16_, "\n", NULL); + _tmp16_ = g_strconcat (_tmp15_, "\n", NULL); #line 345 "/home/jens/Source/shotwell/src/main.vala" - _tmp18_ = _tmp17_; + _tmp17_ = _tmp16_; #line 345 "/home/jens/Source/shotwell/src/main.vala" - g_print ("%s", _tmp18_); + g_print ("%s", _tmp17_); #line 345 "/home/jens/Source/shotwell/src/main.vala" - _g_free0 (_tmp18_); -#line 346 "/home/jens/Source/shotwell/src/main.vala" - _tmp19_ = _ ("Run “%s --help” to see a full list of available command line options.\n"); + _g_free0 (_tmp17_); #line 346 "/home/jens/Source/shotwell/src/main.vala" - _tmp20_ = args; + _tmp18_ = args; #line 346 "/home/jens/Source/shotwell/src/main.vala" - _tmp20__length1 = args_length1; + _tmp18__length1 = args_length1; #line 346 "/home/jens/Source/shotwell/src/main.vala" - _tmp21_ = _tmp20_[0]; + _tmp19_ = _tmp18_[0]; #line 346 "/home/jens/Source/shotwell/src/main.vala" - g_print (_tmp19_, _tmp21_); + g_print (_ ("Run “%s --help” to see a full list of available command line options.\n"), _tmp19_); #line 347 "/home/jens/Source/shotwell/src/main.vala" app_dirs_terminate (); #line 348 "/home/jens/Source/shotwell/src/main.vala" _g_error_free0 (e); #line 348 "/home/jens/Source/shotwell/src/main.vala" return; -#line 2474 "main.c" +#line 2438 "main.c" } - __finally224: + __finally225: #line 341 "/home/jens/Source/shotwell/src/main.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { #line 341 "/home/jens/Source/shotwell/src/main.vala" @@ -2489,307 +2453,307 @@ void _vala_main (gchar** args, int args_length1) { g_clear_error (&_inner_error_); #line 341 "/home/jens/Source/shotwell/src/main.vala" return; -#line 2485 "main.c" +#line 2449 "main.c" } #line 351 "/home/jens/Source/shotwell/src/main.vala" - _tmp22_ = commandline_options_show_version; + _tmp20_ = commandline_options_show_version; #line 351 "/home/jens/Source/shotwell/src/main.vala" - if (_tmp22_) { + if (_tmp20_) { #line 352 "/home/jens/Source/shotwell/src/main.vala" if (RESOURCES_GIT_VERSION != NULL) { #line 353 "/home/jens/Source/shotwell/src/main.vala" g_print ("%s %s (%s)\n", RESOURCES_APP_TITLE, RESOURCES_APP_VERSION, RESOURCES_GIT_VERSION); -#line 2495 "main.c" +#line 2459 "main.c" } else { #line 355 "/home/jens/Source/shotwell/src/main.vala" g_print ("%s %s\n", RESOURCES_APP_TITLE, RESOURCES_APP_VERSION); -#line 2499 "main.c" +#line 2463 "main.c" } #line 357 "/home/jens/Source/shotwell/src/main.vala" app_dirs_terminate (); #line 359 "/home/jens/Source/shotwell/src/main.vala" return; -#line 2505 "main.c" +#line 2469 "main.c" } #line 369 "/home/jens/Source/shotwell/src/main.vala" - _tmp23_ = g_new0 (gchar*, 0 + 1); + _tmp21_ = g_new0 (gchar*, 0 + 1); #line 369 "/home/jens/Source/shotwell/src/main.vala" - mounts = _tmp23_; + mounts = _tmp21_; #line 369 "/home/jens/Source/shotwell/src/main.vala" mounts_length1 = 0; #line 369 "/home/jens/Source/shotwell/src/main.vala" _mounts_size_ = mounts_length1; #line 370 "/home/jens/Source/shotwell/src/main.vala" filename = NULL; -#line 2517 "main.c" +#line 2481 "main.c" { gint ctr = 0; #line 372 "/home/jens/Source/shotwell/src/main.vala" ctr = 1; -#line 2522 "main.c" +#line 2486 "main.c" { - gboolean _tmp24_ = FALSE; + gboolean _tmp22_ = FALSE; #line 372 "/home/jens/Source/shotwell/src/main.vala" - _tmp24_ = TRUE; + _tmp22_ = TRUE; #line 372 "/home/jens/Source/shotwell/src/main.vala" while (TRUE) { -#line 2529 "main.c" - gint _tmp26_ = 0; - gchar** _tmp27_ = NULL; - gint _tmp27__length1 = 0; +#line 2493 "main.c" + gint _tmp24_; + gchar** _tmp25_; + gint _tmp25__length1; gchar* arg = NULL; - gchar** _tmp28_ = NULL; - gint _tmp28__length1 = 0; - gint _tmp29_ = 0; - const gchar* _tmp30_ = NULL; - gchar* _tmp31_ = NULL; - const gchar* _tmp32_ = NULL; - gboolean _tmp33_ = FALSE; + gchar** _tmp26_; + gint _tmp26__length1; + gint _tmp27_; + const gchar* _tmp28_; + gchar* _tmp29_; + const gchar* _tmp30_; + gboolean _tmp31_; #line 372 "/home/jens/Source/shotwell/src/main.vala" - if (!_tmp24_) { -#line 2543 "main.c" - gint _tmp25_ = 0; + if (!_tmp22_) { +#line 2507 "main.c" + gint _tmp23_; #line 372 "/home/jens/Source/shotwell/src/main.vala" - _tmp25_ = ctr; + _tmp23_ = ctr; #line 372 "/home/jens/Source/shotwell/src/main.vala" - ctr = _tmp25_ + 1; -#line 2549 "main.c" + ctr = _tmp23_ + 1; +#line 2513 "main.c" } #line 372 "/home/jens/Source/shotwell/src/main.vala" - _tmp24_ = FALSE; + _tmp22_ = FALSE; #line 372 "/home/jens/Source/shotwell/src/main.vala" - _tmp26_ = ctr; + _tmp24_ = ctr; #line 372 "/home/jens/Source/shotwell/src/main.vala" - _tmp27_ = args; + _tmp25_ = args; #line 372 "/home/jens/Source/shotwell/src/main.vala" - _tmp27__length1 = args_length1; + _tmp25__length1 = args_length1; #line 372 "/home/jens/Source/shotwell/src/main.vala" - if (!(_tmp26_ < _tmp27__length1)) { + if (!(_tmp24_ < _tmp25__length1)) { #line 372 "/home/jens/Source/shotwell/src/main.vala" break; -#line 2563 "main.c" +#line 2527 "main.c" } #line 373 "/home/jens/Source/shotwell/src/main.vala" - _tmp28_ = args; + _tmp26_ = args; #line 373 "/home/jens/Source/shotwell/src/main.vala" - _tmp28__length1 = args_length1; + _tmp26__length1 = args_length1; #line 373 "/home/jens/Source/shotwell/src/main.vala" - _tmp29_ = ctr; + _tmp27_ = ctr; #line 373 "/home/jens/Source/shotwell/src/main.vala" - _tmp30_ = _tmp28_[_tmp29_]; + _tmp28_ = _tmp26_[_tmp27_]; #line 373 "/home/jens/Source/shotwell/src/main.vala" - _tmp31_ = g_strdup (_tmp30_); + _tmp29_ = g_strdup (_tmp28_); #line 373 "/home/jens/Source/shotwell/src/main.vala" - arg = _tmp31_; + arg = _tmp29_; #line 375 "/home/jens/Source/shotwell/src/main.vala" - _tmp32_ = arg; + _tmp30_ = arg; #line 375 "/home/jens/Source/shotwell/src/main.vala" - _tmp33_ = library_window_is_mount_uri_supported (_tmp32_); + _tmp31_ = library_window_is_mount_uri_supported (_tmp30_); #line 375 "/home/jens/Source/shotwell/src/main.vala" - if (_tmp33_) { -#line 2583 "main.c" - gchar** _tmp34_ = NULL; - gint _tmp34__length1 = 0; - const gchar* _tmp35_ = NULL; - gchar* _tmp36_ = NULL; + if (_tmp31_) { +#line 2547 "main.c" + gchar** _tmp32_; + gint _tmp32__length1; + const gchar* _tmp33_; + gchar* _tmp34_; #line 376 "/home/jens/Source/shotwell/src/main.vala" - _tmp34_ = mounts; + _tmp32_ = mounts; #line 376 "/home/jens/Source/shotwell/src/main.vala" - _tmp34__length1 = mounts_length1; + _tmp32__length1 = mounts_length1; #line 376 "/home/jens/Source/shotwell/src/main.vala" - _tmp35_ = arg; + _tmp33_ = arg; #line 376 "/home/jens/Source/shotwell/src/main.vala" - _tmp36_ = g_strdup (_tmp35_); + _tmp34_ = g_strdup (_tmp33_); #line 376 "/home/jens/Source/shotwell/src/main.vala" - _vala_array_add75 (&mounts, &mounts_length1, &_mounts_size_, _tmp36_); -#line 2598 "main.c" + _vala_array_add75 (&mounts, &mounts_length1, &_mounts_size_, _tmp34_); +#line 2562 "main.c" } else { - gboolean _tmp37_ = FALSE; - const gchar* _tmp38_ = NULL; - gboolean _tmp39_ = FALSE; + gboolean _tmp35_ = FALSE; + const gchar* _tmp36_; + gboolean _tmp37_; #line 377 "/home/jens/Source/shotwell/src/main.vala" - _tmp38_ = filename; + _tmp36_ = filename; #line 377 "/home/jens/Source/shotwell/src/main.vala" - _tmp39_ = is_string_empty (_tmp38_); + _tmp37_ = is_string_empty (_tmp36_); #line 377 "/home/jens/Source/shotwell/src/main.vala" - if (_tmp39_) { -#line 2609 "main.c" - const gchar* _tmp40_ = NULL; - gboolean _tmp41_ = FALSE; + if (_tmp37_) { +#line 2573 "main.c" + const gchar* _tmp38_; + gboolean _tmp39_; #line 377 "/home/jens/Source/shotwell/src/main.vala" - _tmp40_ = arg; + _tmp38_ = arg; #line 377 "/home/jens/Source/shotwell/src/main.vala" - _tmp41_ = string_contains (_tmp40_, "://"); + _tmp39_ = string_contains (_tmp38_, "://"); #line 377 "/home/jens/Source/shotwell/src/main.vala" - _tmp37_ = !_tmp41_; -#line 2618 "main.c" + _tmp35_ = !_tmp39_; +#line 2582 "main.c" } else { #line 377 "/home/jens/Source/shotwell/src/main.vala" - _tmp37_ = FALSE; -#line 2622 "main.c" + _tmp35_ = FALSE; +#line 2586 "main.c" } #line 377 "/home/jens/Source/shotwell/src/main.vala" - if (_tmp37_) { -#line 2626 "main.c" - const gchar* _tmp42_ = NULL; - gchar* _tmp43_ = NULL; + if (_tmp35_) { +#line 2590 "main.c" + const gchar* _tmp40_; + gchar* _tmp41_; #line 378 "/home/jens/Source/shotwell/src/main.vala" - _tmp42_ = arg; + _tmp40_ = arg; #line 378 "/home/jens/Source/shotwell/src/main.vala" - _tmp43_ = g_strdup (_tmp42_); + _tmp41_ = g_strdup (_tmp40_); #line 378 "/home/jens/Source/shotwell/src/main.vala" _g_free0 (filename); #line 378 "/home/jens/Source/shotwell/src/main.vala" - filename = _tmp43_; -#line 2637 "main.c" + filename = _tmp41_; +#line 2601 "main.c" } } #line 372 "/home/jens/Source/shotwell/src/main.vala" _g_free0 (arg); -#line 2642 "main.c" +#line 2606 "main.c" } } } #line 382 "/home/jens/Source/shotwell/src/main.vala" - _tmp45_ = filename; + _tmp43_ = filename; #line 382 "/home/jens/Source/shotwell/src/main.vala" - _tmp46_ = is_string_empty (_tmp45_); + _tmp44_ = is_string_empty (_tmp43_); #line 382 "/home/jens/Source/shotwell/src/main.vala" - if (_tmp46_) { + if (_tmp44_) { #line 382 "/home/jens/Source/shotwell/src/main.vala" - _tmp44_ = DEBUG_LIBRARY_PREFIX; -#line 2654 "main.c" + _tmp42_ = DEBUG_LIBRARY_PREFIX; +#line 2618 "main.c" } else { #line 382 "/home/jens/Source/shotwell/src/main.vala" - _tmp44_ = DEBUG_VIEWER_PREFIX; -#line 2658 "main.c" + _tmp42_ = DEBUG_VIEWER_PREFIX; +#line 2622 "main.c" } #line 382 "/home/jens/Source/shotwell/src/main.vala" - debug_init (_tmp44_); + debug_init (_tmp42_); #line 384 "/home/jens/Source/shotwell/src/main.vala" if (RESOURCES_GIT_VERSION != NULL) { -#line 2664 "main.c" - const gchar* _tmp47_ = NULL; - const gchar* _tmp48_ = NULL; - gboolean _tmp49_ = FALSE; +#line 2628 "main.c" + const gchar* _tmp45_ = NULL; + const gchar* _tmp46_; + gboolean _tmp47_; #line 386 "/home/jens/Source/shotwell/src/main.vala" - _tmp48_ = filename; + _tmp46_ = filename; #line 386 "/home/jens/Source/shotwell/src/main.vala" - _tmp49_ = is_string_empty (_tmp48_); + _tmp47_ = is_string_empty (_tmp46_); #line 386 "/home/jens/Source/shotwell/src/main.vala" - if (_tmp49_) { + if (_tmp47_) { #line 386 "/home/jens/Source/shotwell/src/main.vala" - _tmp47_ = RESOURCES_APP_LIBRARY_ROLE; -#line 2676 "main.c" + _tmp45_ = RESOURCES_APP_LIBRARY_ROLE; +#line 2640 "main.c" } else { #line 386 "/home/jens/Source/shotwell/src/main.vala" - _tmp47_ = RESOURCES_APP_DIRECT_ROLE; -#line 2680 "main.c" + _tmp45_ = RESOURCES_APP_DIRECT_ROLE; +#line 2644 "main.c" } #line 385 "/home/jens/Source/shotwell/src/main.vala" - g_message ("main.vala:385: Shotwell %s %s (%s)", _tmp47_, RESOURCES_APP_VERSION, RESOURCES_GIT_VERSION); -#line 2684 "main.c" + g_message ("main.vala:385: Shotwell %s %s (%s)", _tmp45_, RESOURCES_APP_VERSION, RESOURCES_GIT_VERSION); +#line 2648 "main.c" } else { - const gchar* _tmp50_ = NULL; - const gchar* _tmp51_ = NULL; - gboolean _tmp52_ = FALSE; + const gchar* _tmp48_ = NULL; + const gchar* _tmp49_; + gboolean _tmp50_; #line 390 "/home/jens/Source/shotwell/src/main.vala" - _tmp51_ = filename; + _tmp49_ = filename; #line 390 "/home/jens/Source/shotwell/src/main.vala" - _tmp52_ = is_string_empty (_tmp51_); + _tmp50_ = is_string_empty (_tmp49_); #line 390 "/home/jens/Source/shotwell/src/main.vala" - if (_tmp52_) { + if (_tmp50_) { #line 390 "/home/jens/Source/shotwell/src/main.vala" - _tmp50_ = RESOURCES_APP_LIBRARY_ROLE; -#line 2697 "main.c" + _tmp48_ = RESOURCES_APP_LIBRARY_ROLE; +#line 2661 "main.c" } else { #line 390 "/home/jens/Source/shotwell/src/main.vala" - _tmp50_ = RESOURCES_APP_DIRECT_ROLE; -#line 2701 "main.c" + _tmp48_ = RESOURCES_APP_DIRECT_ROLE; +#line 2665 "main.c" } #line 389 "/home/jens/Source/shotwell/src/main.vala" - g_message ("main.vala:389: Shotwell %s %s", _tmp50_, RESOURCES_APP_VERSION); -#line 2705 "main.c" + g_message ("main.vala:389: Shotwell %s %s", _tmp48_, RESOURCES_APP_VERSION); +#line 2669 "main.c" } #line 393 "/home/jens/Source/shotwell/src/main.vala" - _tmp53_ = g_date_time_new_now_local (); + _tmp51_ = g_date_time_new_now_local (); #line 393 "/home/jens/Source/shotwell/src/main.vala" - _tmp54_ = _tmp53_; + _tmp52_ = _tmp51_; #line 393 "/home/jens/Source/shotwell/src/main.vala" - _tmp55_ = g_date_time_get_timezone_abbreviation (_tmp54_); + _tmp53_ = g_date_time_get_timezone_abbreviation (_tmp52_); #line 393 "/home/jens/Source/shotwell/src/main.vala" - g_debug ("main.vala:393: Shotwell is running in timezone %s", _tmp55_); + g_debug ("main.vala:393: Shotwell is running in timezone %s", _tmp53_); #line 393 "/home/jens/Source/shotwell/src/main.vala" - _g_date_time_unref0 (_tmp54_); + _g_date_time_unref0 (_tmp52_); #line 398 "/home/jens/Source/shotwell/src/main.vala" - _tmp56_ = filename; + _tmp54_ = filename; #line 398 "/home/jens/Source/shotwell/src/main.vala" - _tmp57_ = is_string_empty (_tmp56_); + _tmp55_ = is_string_empty (_tmp54_); #line 398 "/home/jens/Source/shotwell/src/main.vala" - application_init (!_tmp57_); + application_init (!_tmp55_); #line 401 "/home/jens/Source/shotwell/src/main.vala" - _tmp58_ = commandline_options_data_dir; + _tmp56_ = commandline_options_data_dir; #line 401 "/home/jens/Source/shotwell/src/main.vala" - if (_tmp58_ != NULL) { -#line 2727 "main.c" - const gchar* _tmp59_ = NULL; + if (_tmp56_ != NULL) { +#line 2691 "main.c" + const gchar* _tmp57_; #line 402 "/home/jens/Source/shotwell/src/main.vala" - _tmp59_ = commandline_options_data_dir; + _tmp57_ = commandline_options_data_dir; #line 402 "/home/jens/Source/shotwell/src/main.vala" - app_dirs_set_data_dir (_tmp59_); -#line 2733 "main.c" + app_dirs_set_data_dir (_tmp57_); +#line 2697 "main.c" } else { #line 404 "/home/jens/Source/shotwell/src/main.vala" app_dirs_try_migrate_data (); -#line 2737 "main.c" +#line 2701 "main.c" } #line 407 "/home/jens/Source/shotwell/src/main.vala" app_dirs_verify_data_dir (); #line 408 "/home/jens/Source/shotwell/src/main.vala" app_dirs_verify_cache_dir (); #line 411 "/home/jens/Source/shotwell/src/main.vala" - _tmp60_ = args; + _tmp58_ = args; #line 411 "/home/jens/Source/shotwell/src/main.vala" - _tmp60__length1 = args_length1; + _tmp58__length1 = args_length1; #line 411 "/home/jens/Source/shotwell/src/main.vala" - international_support_init (RESOURCES_APP_GETTEXT_PACKAGE, _tmp60_, _tmp60__length1, INTERNATIONAL_SUPPORT_SYSTEM_LOCALE); + international_support_init (RESOURCES_APP_GETTEXT_PACKAGE, _tmp58_, _tmp58__length1, INTERNATIONAL_SUPPORT_SYSTEM_LOCALE); #line 413 "/home/jens/Source/shotwell/src/main.vala" - _tmp61_ = g_timer_new (); + _tmp59_ = g_timer_new (); #line 413 "/home/jens/Source/shotwell/src/main.vala" _g_timer_destroy0 (startup_timer); #line 413 "/home/jens/Source/shotwell/src/main.vala" - startup_timer = _tmp61_; + startup_timer = _tmp59_; #line 414 "/home/jens/Source/shotwell/src/main.vala" - _tmp62_ = startup_timer; + _tmp60_ = startup_timer; #line 414 "/home/jens/Source/shotwell/src/main.vala" - g_timer_start (_tmp62_); + g_timer_start (_tmp60_); #line 417 "/home/jens/Source/shotwell/src/main.vala" g_set_application_name (RESOURCES_APP_TITLE); #line 421 "/home/jens/Source/shotwell/src/main.vala" resources_init (); #line 426 "/home/jens/Source/shotwell/src/main.vala" - _tmp63_ = filename; + _tmp61_ = filename; #line 426 "/home/jens/Source/shotwell/src/main.vala" - _tmp64_ = is_string_empty (_tmp63_); + _tmp62_ = is_string_empty (_tmp61_); #line 426 "/home/jens/Source/shotwell/src/main.vala" - if (_tmp64_) { -#line 2769 "main.c" - gchar** _tmp65_ = NULL; - gint _tmp65__length1 = 0; + if (_tmp62_) { +#line 2733 "main.c" + gchar** _tmp63_; + gint _tmp63__length1; #line 427 "/home/jens/Source/shotwell/src/main.vala" - _tmp65_ = mounts; + _tmp63_ = mounts; #line 427 "/home/jens/Source/shotwell/src/main.vala" - _tmp65__length1 = mounts_length1; + _tmp63__length1 = mounts_length1; #line 427 "/home/jens/Source/shotwell/src/main.vala" - library_exec (_tmp65_, _tmp65__length1); -#line 2778 "main.c" + library_exec (_tmp63_, _tmp63__length1); +#line 2742 "main.c" } else { - const gchar* _tmp66_ = NULL; + const gchar* _tmp64_; #line 429 "/home/jens/Source/shotwell/src/main.vala" - _tmp66_ = filename; + _tmp64_ = filename; #line 429 "/home/jens/Source/shotwell/src/main.vala" - editing_exec (_tmp66_); -#line 2785 "main.c" + editing_exec (_tmp64_); +#line 2749 "main.c" } #line 432 "/home/jens/Source/shotwell/src/main.vala" resources_terminate (); @@ -2800,124 +2764,124 @@ void _vala_main (gchar** args, int args_length1) { #line 435 "/home/jens/Source/shotwell/src/main.vala" app_dirs_terminate (); #line 440 "/home/jens/Source/shotwell/src/main.vala" - _tmp68_ = filename; + _tmp66_ = filename; #line 440 "/home/jens/Source/shotwell/src/main.vala" - _tmp69_ = is_string_empty (_tmp68_); + _tmp67_ = is_string_empty (_tmp66_); #line 440 "/home/jens/Source/shotwell/src/main.vala" - if (_tmp69_) { -#line 2801 "main.c" - gboolean _tmp70_ = FALSE; + if (_tmp67_) { +#line 2765 "main.c" + gboolean _tmp68_; #line 440 "/home/jens/Source/shotwell/src/main.vala" - _tmp70_ = was_already_running; + _tmp68_ = was_already_running; #line 440 "/home/jens/Source/shotwell/src/main.vala" - _tmp67_ = !_tmp70_; -#line 2807 "main.c" + _tmp65_ = !_tmp68_; +#line 2771 "main.c" } else { #line 440 "/home/jens/Source/shotwell/src/main.vala" - _tmp67_ = FALSE; -#line 2811 "main.c" + _tmp65_ = FALSE; +#line 2775 "main.c" } #line 440 "/home/jens/Source/shotwell/src/main.vala" - if (_tmp67_) { -#line 2815 "main.c" + if (_tmp65_) { +#line 2779 "main.c" gchar* orig_path = NULL; - GFile* _tmp71_ = NULL; - GFile* _tmp72_ = NULL; - GFile* _tmp73_ = NULL; - GFile* _tmp74_ = NULL; - gchar* _tmp75_ = NULL; - gchar* _tmp76_ = NULL; + GFile* _tmp69_; + GFile* _tmp70_; + GFile* _tmp71_; + GFile* _tmp72_; + gchar* _tmp73_; + gchar* _tmp74_; gchar* backup_path = NULL; - const gchar* _tmp77_ = NULL; - gchar* _tmp78_ = NULL; + const gchar* _tmp75_; + gchar* _tmp76_; #line 441 "/home/jens/Source/shotwell/src/main.vala" - _tmp71_ = app_dirs_get_data_subdir ("data", NULL); + _tmp69_ = app_dirs_get_data_subdir ("data", NULL); #line 441 "/home/jens/Source/shotwell/src/main.vala" - _tmp72_ = _tmp71_; -#line 441 "/home/jens/Source/shotwell/src/main.vala" - _tmp73_ = g_file_get_child (_tmp72_, "photo.db"); + _tmp70_ = _tmp69_; #line 441 "/home/jens/Source/shotwell/src/main.vala" - _tmp74_ = _tmp73_; + _tmp71_ = g_file_get_child (_tmp70_, "photo.db"); #line 441 "/home/jens/Source/shotwell/src/main.vala" - _tmp75_ = g_file_get_path (_tmp74_); + _tmp72_ = _tmp71_; #line 441 "/home/jens/Source/shotwell/src/main.vala" - _tmp76_ = _tmp75_; + _tmp73_ = g_file_get_path (_tmp72_); #line 441 "/home/jens/Source/shotwell/src/main.vala" - _g_object_unref0 (_tmp74_); + _tmp74_ = _tmp73_; #line 441 "/home/jens/Source/shotwell/src/main.vala" _g_object_unref0 (_tmp72_); #line 441 "/home/jens/Source/shotwell/src/main.vala" - orig_path = _tmp76_; + _g_object_unref0 (_tmp70_); +#line 441 "/home/jens/Source/shotwell/src/main.vala" + orig_path = _tmp74_; #line 442 "/home/jens/Source/shotwell/src/main.vala" - _tmp77_ = orig_path; + _tmp75_ = orig_path; #line 442 "/home/jens/Source/shotwell/src/main.vala" - _tmp78_ = g_strconcat (_tmp77_, ".bak", NULL); + _tmp76_ = g_strconcat (_tmp75_, ".bak", NULL); #line 442 "/home/jens/Source/shotwell/src/main.vala" - backup_path = _tmp78_; -#line 2850 "main.c" + backup_path = _tmp76_; +#line 2814 "main.c" { GFile* src = NULL; - const gchar* _tmp79_ = NULL; - GFile* _tmp80_ = NULL; + const gchar* _tmp77_; + GFile* _tmp78_; GFile* dest = NULL; - const gchar* _tmp81_ = NULL; - GFile* _tmp82_ = NULL; - GFile* _tmp83_ = NULL; - GFile* _tmp84_ = NULL; + const gchar* _tmp79_; + GFile* _tmp80_; + GFile* _tmp81_; + GFile* _tmp82_; #line 444 "/home/jens/Source/shotwell/src/main.vala" - _tmp79_ = orig_path; + _tmp77_ = orig_path; #line 444 "/home/jens/Source/shotwell/src/main.vala" - _tmp80_ = g_file_new_for_commandline_arg (_tmp79_); + _tmp78_ = g_file_new_for_commandline_arg (_tmp77_); #line 444 "/home/jens/Source/shotwell/src/main.vala" - src = _tmp80_; + src = _tmp78_; #line 445 "/home/jens/Source/shotwell/src/main.vala" - _tmp81_ = backup_path; + _tmp79_ = backup_path; #line 445 "/home/jens/Source/shotwell/src/main.vala" - _tmp82_ = g_file_new_for_commandline_arg (_tmp81_); + _tmp80_ = g_file_new_for_commandline_arg (_tmp79_); #line 445 "/home/jens/Source/shotwell/src/main.vala" - dest = _tmp82_; + dest = _tmp80_; #line 446 "/home/jens/Source/shotwell/src/main.vala" - _tmp83_ = src; + _tmp81_ = src; #line 446 "/home/jens/Source/shotwell/src/main.vala" - _tmp84_ = dest; + _tmp82_ = dest; #line 446 "/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_); + g_file_copy (_tmp81_, _tmp82_, G_FILE_COPY_OVERWRITE | G_FILE_COPY_ALL_METADATA, NULL, NULL, NULL, &_inner_error_); #line 446 "/home/jens/Source/shotwell/src/main.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { #line 446 "/home/jens/Source/shotwell/src/main.vala" _g_object_unref0 (dest); #line 446 "/home/jens/Source/shotwell/src/main.vala" _g_object_unref0 (src); -#line 2884 "main.c" - goto __catch225_g_error; +#line 2848 "main.c" + goto __catch226_g_error; } #line 443 "/home/jens/Source/shotwell/src/main.vala" _g_object_unref0 (dest); #line 443 "/home/jens/Source/shotwell/src/main.vala" _g_object_unref0 (src); -#line 2891 "main.c" +#line 2855 "main.c" } - goto __finally225; - __catch225_g_error: + goto __finally226; + __catch226_g_error: { GError* _error_ = NULL; - GError* _tmp85_ = NULL; - const gchar* _tmp86_ = NULL; + GError* _tmp83_; + const gchar* _tmp84_; #line 443 "/home/jens/Source/shotwell/src/main.vala" _error_ = _inner_error_; #line 443 "/home/jens/Source/shotwell/src/main.vala" _inner_error_ = NULL; #line 450 "/home/jens/Source/shotwell/src/main.vala" - _tmp85_ = _error_; + _tmp83_ = _error_; #line 450 "/home/jens/Source/shotwell/src/main.vala" - _tmp86_ = _tmp85_->message; + _tmp84_ = _tmp83_->message; #line 450 "/home/jens/Source/shotwell/src/main.vala" - g_warning ("main.vala:450: Failed to create backup file of database: %s", _tmp86_); + g_warning ("main.vala:450: Failed to create backup file of database: %s", _tmp84_); #line 443 "/home/jens/Source/shotwell/src/main.vala" _g_error_free0 (_error_); -#line 2911 "main.c" +#line 2875 "main.c" } - __finally225: + __finally226: #line 443 "/home/jens/Source/shotwell/src/main.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { #line 443 "/home/jens/Source/shotwell/src/main.vala" @@ -2934,7 +2898,7 @@ void _vala_main (gchar** args, int args_length1) { g_clear_error (&_inner_error_); #line 443 "/home/jens/Source/shotwell/src/main.vala" return; -#line 2930 "main.c" +#line 2894 "main.c" } #line 453 "/home/jens/Source/shotwell/src/main.vala" sync (); @@ -2942,20 +2906,17 @@ void _vala_main (gchar** args, int args_length1) { _g_free0 (backup_path); #line 440 "/home/jens/Source/shotwell/src/main.vala" _g_free0 (orig_path); -#line 2938 "main.c" +#line 2902 "main.c" } #line 316 "/home/jens/Source/shotwell/src/main.vala" _g_free0 (filename); #line 316 "/home/jens/Source/shotwell/src/main.vala" mounts = (_vala_array_free (mounts, mounts_length1, (GDestroyNotify) g_free), NULL); -#line 2944 "main.c" +#line 2908 "main.c" } int main (int argc, char ** argv) { -#if !GLIB_CHECK_VERSION (2,32,0) - g_thread_init (NULL); -#endif #if !GLIB_CHECK_VERSION (2,35,0) g_type_init (); #endif @@ -2963,7 +2924,7 @@ int main (int argc, char ** argv) { _vala_main (argv, argc); #line 316 "/home/jens/Source/shotwell/src/main.vala" return 0; -#line 2959 "main.c" +#line 2920 "main.c" } |