summaryrefslogtreecommitdiff
path: root/src/main.c
diff options
context:
space:
mode:
authorJörg Frings-Fürst <debian@jff-webhosting.net>2018-05-01 14:34:32 +0200
committerJörg Frings-Fürst <debian@jff-webhosting.net>2018-05-01 14:34:32 +0200
commit49120f48474fc8fdc2448c75d961bc238213cfac (patch)
tree05bcdb95d65a807cf0f1ffffd066c09074b5cf56 /src/main.c
parent2492891f112caac6076ce49721d9d5d78a152c3a (diff)
New upstream version 0.28.2upstream/0.28.2
Diffstat (limited to 'src/main.c')
-rw-r--r--src/main.c1745
1 files changed, 916 insertions, 829 deletions
diff --git a/src/main.c b/src/main.c
index 0cc8e90..5659731 100644
--- a/src/main.c
+++ b/src/main.c
@@ -418,6 +418,7 @@ struct _ImportManifest {
GeeList* already_imported;
GeeList* corrupt_files;
GeeList* all;
+ GTimer* timer;
};
struct _ImportManifestClass {
@@ -444,6 +445,8 @@ extern gboolean commandline_options_show_version;
gboolean commandline_options_show_version = FALSE;
extern gboolean commandline_options_no_runtime_monitoring;
gboolean commandline_options_no_runtime_monitoring = FALSE;
+extern gboolean commandline_options_fullscreen;
+gboolean commandline_options_fullscreen = FALSE;
extern GOptionEntry* commandline_options_entries;
extern gint commandline_options_entries_length1;
GOptionEntry* commandline_options_entries = NULL;
@@ -514,6 +517,7 @@ gboolean aggregate_progress_monitor_monitor (AggregateProgressMonitor* self, gui
static gboolean _aggregate_progress_monitor_monitor_progress_monitor (guint64 current, guint64 total, gboolean do_event_loop, gpointer self);
void thumbnail_cache_init (void);
void tombstone_init (void);
+void library_files_select_copy_function (void);
void aggregate_progress_monitor_next_step (AggregateProgressMonitor* self, const gchar* name);
void library_photo_init (ProgressMonitor monitor, void* monitor_target);
void video_init (ProgressMonitor monitor, void* monitor_target);
@@ -600,8 +604,8 @@ gpointer value_get_batch_import_job (const GValue* value);
GType batch_import_job_get_type (void) G_GNUC_CONST;
GType file_import_job_get_type (void) G_GNUC_CONST;
GFile* app_dirs_get_import_dir (void);
-FileImportJob* file_import_job_new (GFile* file_or_dir, gboolean copy_to_library);
-FileImportJob* file_import_job_construct (GType object_type, GFile* file_or_dir, gboolean copy_to_library);
+FileImportJob* file_import_job_new (GFile* file_or_dir, gboolean copy_to_library, gboolean recurse);
+FileImportJob* file_import_job_construct (GType object_type, GFile* file_or_dir, gboolean copy_to_library, gboolean recurse);
AppWindow* app_window_get_instance (void);
GType batch_import_get_type (void) G_GNUC_CONST;
gpointer batch_import_roll_ref (gpointer instance);
@@ -636,30 +640,32 @@ void import_ui_value_take_question_params (GValue* value, gpointer v_object);
gpointer import_ui_value_get_question_params (const GValue* value);
GType import_ui_question_params_get_type (void) G_GNUC_CONST;
gboolean import_ui_report_manifest (ImportManifest* manifest, gboolean show_dest_id, ImportUIQuestionParams* question);
-void editing_exec (const gchar* filename);
+void editing_exec (const gchar* filename, gboolean fullscreen);
void direct_preconfigure (GFile* initial_file);
void direct_app_init (GError** error);
GType direct_window_get_type (void) G_GNUC_CONST;
DirectWindow* direct_window_new (GFile* file);
DirectWindow* direct_window_construct (GType object_type, GFile* file);
+GAction* app_window_get_common_action (AppWindow* self, const gchar* name);
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 GOptionEntry* _vala_array_dup22 (GOptionEntry* self, int length);
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);
+static void _vala_array_add75 (GOptionEntry* * array, int* length, int* size, const GOptionEntry* value);
+static void _vala_array_add76 (GOptionEntry* * array, int* length, int* size, const GOptionEntry* value);
+static void _vala_array_add77 (GOptionEntry* * array, int* length, int* size, const GOptionEntry* value);
+static void _vala_array_add78 (GOptionEntry* * array, int* length, int* size, const GOptionEntry* value);
+static GOptionEntry* _vala_array_dup23 (GOptionEntry* self, int length);
void _vala_main (gchar** args, int args_length1);
void app_dirs_init (const gchar* arg0);
GFile* app_dirs_get_install_dir (void);
-GFile* app_dirs_get_exec_dir (void);
+GFile* app_dirs_get_lib_dir (void);
#define RESOURCES_APP_GETTEXT_PACKAGE GETTEXT_PACKAGE
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_add79 (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"
@@ -698,7 +704,7 @@ static gboolean _progress_dialog_monitor_progress_monitor (guint64 current, guin
result = progress_dialog_monitor ((ProgressDialog*) self, current, total, do_event_loop);
#line 113 "/home/jens/Source/shotwell/src/main.vala"
return result;
-#line 702 "main.c"
+#line 708 "main.c"
}
@@ -707,14 +713,14 @@ static gboolean _aggregate_progress_monitor_monitor_progress_monitor (guint64 cu
result = aggregate_progress_monitor_monitor ((AggregateProgressMonitor*) self, current, total);
#line 114 "/home/jens/Source/shotwell/src/main.vala"
return result;
-#line 711 "main.c"
+#line 717 "main.c"
}
static gpointer _g_object_ref0 (gpointer self) {
-#line 184 "/home/jens/Source/shotwell/src/main.vala"
+#line 186 "/home/jens/Source/shotwell/src/main.vala"
return self ? g_object_ref (self) : NULL;
-#line 718 "main.c"
+#line 724 "main.c"
}
@@ -798,7 +804,7 @@ void library_exec (gchar** mounts, int mounts_length1) {
_tmp1_ = was_already_running;
#line 18 "/home/jens/Source/shotwell/src/main.vala"
if (_tmp1_) {
-#line 802 "main.c"
+#line 808 "main.c"
gchar** _tmp2_;
gint _tmp2__length1;
#line 25 "/home/jens/Source/shotwell/src/main.vala"
@@ -811,7 +817,7 @@ void library_exec (gchar** mounts, int mounts_length1) {
application_send_to_primary_instance (_tmp2_, _tmp2__length1);
#line 27 "/home/jens/Source/shotwell/src/main.vala"
return;
-#line 815 "main.c"
+#line 821 "main.c"
}
#line 31 "/home/jens/Source/shotwell/src/main.vala"
_tmp3_ = app_dirs_get_data_subdir ("data", NULL);
@@ -827,18 +833,18 @@ void library_exec (gchar** mounts, int mounts_length1) {
_g_object_unref0 (_tmp6_);
#line 31 "/home/jens/Source/shotwell/src/main.vala"
_g_object_unref0 (_tmp4_);
-#line 831 "main.c"
+#line 837 "main.c"
{
#line 35 "/home/jens/Source/shotwell/src/main.vala"
library_app_init (&_inner_error_);
#line 35 "/home/jens/Source/shotwell/src/main.vala"
if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 837 "main.c"
- goto __catch222_g_error;
+#line 843 "main.c"
+ goto __catch233_g_error;
}
}
- goto __finally222;
- __catch222_g_error:
+ goto __finally233;
+ __catch233_g_error:
{
GError* err = NULL;
GError* _tmp7_;
@@ -857,9 +863,9 @@ void library_exec (gchar** mounts, int mounts_length1) {
_g_error_free0 (err);
#line 39 "/home/jens/Source/shotwell/src/main.vala"
return;
-#line 861 "main.c"
+#line 867 "main.c"
}
- __finally222:
+ __finally233:
#line 34 "/home/jens/Source/shotwell/src/main.vala"
if (G_UNLIKELY (_inner_error_ != NULL)) {
#line 34 "/home/jens/Source/shotwell/src/main.vala"
@@ -868,7 +874,7 @@ void library_exec (gchar** mounts, int mounts_length1) {
g_clear_error (&_inner_error_);
#line 34 "/home/jens/Source/shotwell/src/main.vala"
return;
-#line 872 "main.c"
+#line 878 "main.c"
}
#line 43 "/home/jens/Source/shotwell/src/main.vala"
g_message ("main.vala:43: Verifying database…");
@@ -890,15 +896,15 @@ void library_exec (gchar** mounts, int mounts_length1) {
switch (_tmp12_) {
#line 48 "/home/jens/Source/shotwell/src/main.vala"
case DB_VERIFY_RESULT_OK:
-#line 894 "main.c"
+#line 900 "main.c"
{
#line 51 "/home/jens/Source/shotwell/src/main.vala"
break;
-#line 898 "main.c"
+#line 904 "main.c"
}
#line 48 "/home/jens/Source/shotwell/src/main.vala"
case DB_VERIFY_RESULT_FUTURE_VERSION:
-#line 902 "main.c"
+#line 908 "main.c"
{
const gchar* _tmp13_;
gint _tmp14_;
@@ -917,11 +923,11 @@ void library_exec (gchar** mounts, int mounts_length1) {
errormsg = _tmp15_;
#line 56 "/home/jens/Source/shotwell/src/main.vala"
break;
-#line 919 "main.c"
+#line 925 "main.c"
}
#line 48 "/home/jens/Source/shotwell/src/main.vala"
case DB_VERIFY_RESULT_UPGRADE_ERROR:
-#line 923 "main.c"
+#line 929 "main.c"
{
const gchar* _tmp16_;
gint _tmp17_;
@@ -940,11 +946,11 @@ void library_exec (gchar** mounts, int mounts_length1) {
errormsg = _tmp18_;
#line 62 "/home/jens/Source/shotwell/src/main.vala"
break;
-#line 940 "main.c"
+#line 946 "main.c"
}
#line 48 "/home/jens/Source/shotwell/src/main.vala"
case DB_VERIFY_RESULT_NO_UPGRADE_AVAILABLE:
-#line 944 "main.c"
+#line 950 "main.c"
{
const gchar* _tmp19_;
gint _tmp20_;
@@ -980,7 +986,7 @@ void library_exec (gchar** mounts, int mounts_length1) {
_g_object_unref0 (_tmp22_);
#line 68 "/home/jens/Source/shotwell/src/main.vala"
break;
-#line 977 "main.c"
+#line 983 "main.c"
}
default:
{
@@ -999,14 +1005,14 @@ void library_exec (gchar** mounts, int mounts_length1) {
errormsg = _tmp28_;
#line 73 "/home/jens/Source/shotwell/src/main.vala"
break;
-#line 996 "main.c"
+#line 1002 "main.c"
}
}
#line 76 "/home/jens/Source/shotwell/src/main.vala"
_tmp29_ = errormsg;
#line 76 "/home/jens/Source/shotwell/src/main.vala"
if (_tmp29_ != NULL) {
-#line 1003 "main.c"
+#line 1009 "main.c"
GtkMessageDialog* dialog = NULL;
const gchar* _tmp30_;
GtkMessageDialog* _tmp31_;
@@ -1043,7 +1049,7 @@ void library_exec (gchar** mounts, int mounts_length1) {
_g_free0 (errormsg);
#line 85 "/home/jens/Source/shotwell/src/main.vala"
return;
-#line 1040 "main.c"
+#line 1046 "main.c"
}
#line 88 "/home/jens/Source/shotwell/src/main.vala"
upgrades_init ();
@@ -1061,7 +1067,7 @@ void library_exec (gchar** mounts, int mounts_length1) {
_tmp35_ = commandline_options_no_startup_progress;
#line 94 "/home/jens/Source/shotwell/src/main.vala"
if (!_tmp35_) {
-#line 1058 "main.c"
+#line 1064 "main.c"
guint64 grand_total = 0ULL;
PhotoTable* _tmp36_;
PhotoTable* _tmp37_;
@@ -1128,7 +1134,7 @@ void library_exec (gchar** mounts, int mounts_length1) {
_tmp52_ = grand_total;
#line 103 "/home/jens/Source/shotwell/src/main.vala"
if (_tmp52_ > ((guint64) 5000)) {
-#line 1125 "main.c"
+#line 1131 "main.c"
ProgressDialog* _tmp53_;
ProgressDialog* _tmp54_;
ProgressDialog* _tmp55_;
@@ -1152,7 +1158,7 @@ void library_exec (gchar** mounts, int mounts_length1) {
_tmp55_ = progress_dialog;
#line 106 "/home/jens/Source/shotwell/src/main.vala"
progress_dialog_set_minimum_on_screen_time_msec (_tmp55_, 250);
-#line 1149 "main.c"
+#line 1155 "main.c"
{
GdkPixbuf* _tmp56_ = NULL;
GdkPixbuf* _tmp57_;
@@ -1163,8 +1169,8 @@ void library_exec (gchar** mounts, int mounts_length1) {
_tmp56_ = _tmp57_;
#line 108 "/home/jens/Source/shotwell/src/main.vala"
if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 1160 "main.c"
- goto __catch223_g_error;
+#line 1166 "main.c"
+ goto __catch234_g_error;
}
#line 108 "/home/jens/Source/shotwell/src/main.vala"
_tmp58_ = progress_dialog;
@@ -1172,10 +1178,10 @@ void library_exec (gchar** mounts, int mounts_length1) {
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 (_tmp56_);
-#line 1169 "main.c"
+#line 1175 "main.c"
}
- goto __finally223;
- __catch223_g_error:
+ goto __finally234;
+ __catch234_g_error:
{
GError* err = NULL;
GError* _tmp59_;
@@ -1193,9 +1199,9 @@ void library_exec (gchar** mounts, int mounts_length1) {
"indow: %s", _tmp60_);
#line 107 "/home/jens/Source/shotwell/src/main.vala"
_g_error_free0 (err);
-#line 1189 "main.c"
+#line 1195 "main.c"
}
- __finally223:
+ __finally234:
#line 107 "/home/jens/Source/shotwell/src/main.vala"
if (G_UNLIKELY (_inner_error_ != NULL)) {
#line 107 "/home/jens/Source/shotwell/src/main.vala"
@@ -1220,7 +1226,7 @@ void library_exec (gchar** mounts, int mounts_length1) {
g_clear_error (&_inner_error_);
#line 107 "/home/jens/Source/shotwell/src/main.vala"
return;
-#line 1216 "main.c"
+#line 1222 "main.c"
}
#line 113 "/home/jens/Source/shotwell/src/main.vala"
_tmp61_ = grand_total;
@@ -1248,7 +1254,7 @@ void library_exec (gchar** mounts, int mounts_length1) {
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 1244 "main.c"
+#line 1250 "main.c"
}
}
#line 118 "/home/jens/Source/shotwell/src/main.vala"
@@ -1256,278 +1262,280 @@ 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"
+ library_files_select_copy_function ();
+#line 123 "/home/jens/Source/shotwell/src/main.vala"
_tmp65_ = aggregate_monitor;
-#line 121 "/home/jens/Source/shotwell/src/main.vala"
+#line 123 "/home/jens/Source/shotwell/src/main.vala"
if (_tmp65_ != NULL) {
-#line 1255 "main.c"
+#line 1263 "main.c"
AggregateProgressMonitor* _tmp66_;
-#line 122 "/home/jens/Source/shotwell/src/main.vala"
+#line 124 "/home/jens/Source/shotwell/src/main.vala"
_tmp66_ = aggregate_monitor;
-#line 122 "/home/jens/Source/shotwell/src/main.vala"
+#line 124 "/home/jens/Source/shotwell/src/main.vala"
aggregate_progress_monitor_next_step (_tmp66_, "LibraryPhoto.init");
-#line 1261 "main.c"
+#line 1269 "main.c"
}
-#line 123 "/home/jens/Source/shotwell/src/main.vala"
+#line 125 "/home/jens/Source/shotwell/src/main.vala"
_tmp67_ = monitor;
-#line 123 "/home/jens/Source/shotwell/src/main.vala"
+#line 125 "/home/jens/Source/shotwell/src/main.vala"
_tmp67__target = monitor_target;
-#line 123 "/home/jens/Source/shotwell/src/main.vala"
+#line 125 "/home/jens/Source/shotwell/src/main.vala"
library_photo_init (_tmp67_, _tmp67__target);
-#line 124 "/home/jens/Source/shotwell/src/main.vala"
+#line 126 "/home/jens/Source/shotwell/src/main.vala"
_tmp68_ = aggregate_monitor;
-#line 124 "/home/jens/Source/shotwell/src/main.vala"
+#line 126 "/home/jens/Source/shotwell/src/main.vala"
if (_tmp68_ != NULL) {
-#line 1273 "main.c"
+#line 1281 "main.c"
AggregateProgressMonitor* _tmp69_;
-#line 125 "/home/jens/Source/shotwell/src/main.vala"
+#line 127 "/home/jens/Source/shotwell/src/main.vala"
_tmp69_ = aggregate_monitor;
-#line 125 "/home/jens/Source/shotwell/src/main.vala"
+#line 127 "/home/jens/Source/shotwell/src/main.vala"
aggregate_progress_monitor_next_step (_tmp69_, "Video.init");
-#line 1279 "main.c"
+#line 1287 "main.c"
}
-#line 126 "/home/jens/Source/shotwell/src/main.vala"
+#line 128 "/home/jens/Source/shotwell/src/main.vala"
_tmp70_ = monitor;
-#line 126 "/home/jens/Source/shotwell/src/main.vala"
+#line 128 "/home/jens/Source/shotwell/src/main.vala"
_tmp70__target = monitor_target;
-#line 126 "/home/jens/Source/shotwell/src/main.vala"
+#line 128 "/home/jens/Source/shotwell/src/main.vala"
video_init (_tmp70_, _tmp70__target);
-#line 127 "/home/jens/Source/shotwell/src/main.vala"
+#line 129 "/home/jens/Source/shotwell/src/main.vala"
_tmp71_ = aggregate_monitor;
-#line 127 "/home/jens/Source/shotwell/src/main.vala"
+#line 129 "/home/jens/Source/shotwell/src/main.vala"
if (_tmp71_ != NULL) {
-#line 1291 "main.c"
+#line 1299 "main.c"
AggregateProgressMonitor* _tmp72_;
-#line 128 "/home/jens/Source/shotwell/src/main.vala"
+#line 130 "/home/jens/Source/shotwell/src/main.vala"
_tmp72_ = aggregate_monitor;
-#line 128 "/home/jens/Source/shotwell/src/main.vala"
+#line 130 "/home/jens/Source/shotwell/src/main.vala"
aggregate_progress_monitor_next_step (_tmp72_, "Upgrades.execute");
-#line 1297 "main.c"
+#line 1305 "main.c"
}
-#line 129 "/home/jens/Source/shotwell/src/main.vala"
+#line 131 "/home/jens/Source/shotwell/src/main.vala"
_tmp73_ = upgrades_get_instance ();
-#line 129 "/home/jens/Source/shotwell/src/main.vala"
+#line 131 "/home/jens/Source/shotwell/src/main.vala"
_tmp74_ = _tmp73_;
-#line 129 "/home/jens/Source/shotwell/src/main.vala"
+#line 131 "/home/jens/Source/shotwell/src/main.vala"
upgrades_execute (_tmp74_, NULL, NULL);
-#line 129 "/home/jens/Source/shotwell/src/main.vala"
- _upgrades_unref0 (_tmp74_);
#line 131 "/home/jens/Source/shotwell/src/main.vala"
+ _upgrades_unref0 (_tmp74_);
+#line 133 "/home/jens/Source/shotwell/src/main.vala"
library_monitor_pool_init ();
-#line 132 "/home/jens/Source/shotwell/src/main.vala"
+#line 134 "/home/jens/Source/shotwell/src/main.vala"
media_collection_registry_init ();
-#line 133 "/home/jens/Source/shotwell/src/main.vala"
+#line 135 "/home/jens/Source/shotwell/src/main.vala"
_tmp75_ = media_collection_registry_get_instance ();
-#line 133 "/home/jens/Source/shotwell/src/main.vala"
+#line 135 "/home/jens/Source/shotwell/src/main.vala"
registry = _tmp75_;
-#line 134 "/home/jens/Source/shotwell/src/main.vala"
+#line 136 "/home/jens/Source/shotwell/src/main.vala"
_tmp76_ = registry;
-#line 134 "/home/jens/Source/shotwell/src/main.vala"
+#line 136 "/home/jens/Source/shotwell/src/main.vala"
_tmp77_ = library_photo_global;
-#line 134 "/home/jens/Source/shotwell/src/main.vala"
+#line 136 "/home/jens/Source/shotwell/src/main.vala"
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"
+#line 137 "/home/jens/Source/shotwell/src/main.vala"
_tmp78_ = registry;
-#line 135 "/home/jens/Source/shotwell/src/main.vala"
+#line 137 "/home/jens/Source/shotwell/src/main.vala"
_tmp79_ = video_global;
-#line 135 "/home/jens/Source/shotwell/src/main.vala"
- 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"
+ media_collection_registry_register_collection (_tmp78_, G_TYPE_CHECK_INSTANCE_CAST (_tmp79_, TYPE_MEDIA_SOURCE_COLLECTION, MediaSourceCollection));
+#line 139 "/home/jens/Source/shotwell/src/main.vala"
_tmp80_ = aggregate_monitor;
-#line 137 "/home/jens/Source/shotwell/src/main.vala"
+#line 139 "/home/jens/Source/shotwell/src/main.vala"
if (_tmp80_ != NULL) {
-#line 1331 "main.c"
+#line 1339 "main.c"
AggregateProgressMonitor* _tmp81_;
-#line 138 "/home/jens/Source/shotwell/src/main.vala"
+#line 140 "/home/jens/Source/shotwell/src/main.vala"
_tmp81_ = aggregate_monitor;
-#line 138 "/home/jens/Source/shotwell/src/main.vala"
+#line 140 "/home/jens/Source/shotwell/src/main.vala"
aggregate_progress_monitor_next_step (_tmp81_, "Event.init");
-#line 1337 "main.c"
+#line 1345 "main.c"
}
-#line 139 "/home/jens/Source/shotwell/src/main.vala"
+#line 141 "/home/jens/Source/shotwell/src/main.vala"
_tmp82_ = monitor;
-#line 139 "/home/jens/Source/shotwell/src/main.vala"
+#line 141 "/home/jens/Source/shotwell/src/main.vala"
_tmp82__target = monitor_target;
-#line 139 "/home/jens/Source/shotwell/src/main.vala"
+#line 141 "/home/jens/Source/shotwell/src/main.vala"
event_init (_tmp82_, _tmp82__target);
-#line 140 "/home/jens/Source/shotwell/src/main.vala"
+#line 142 "/home/jens/Source/shotwell/src/main.vala"
_tmp83_ = aggregate_monitor;
-#line 140 "/home/jens/Source/shotwell/src/main.vala"
+#line 142 "/home/jens/Source/shotwell/src/main.vala"
if (_tmp83_ != NULL) {
-#line 1349 "main.c"
+#line 1357 "main.c"
AggregateProgressMonitor* _tmp84_;
-#line 141 "/home/jens/Source/shotwell/src/main.vala"
+#line 143 "/home/jens/Source/shotwell/src/main.vala"
_tmp84_ = aggregate_monitor;
-#line 141 "/home/jens/Source/shotwell/src/main.vala"
+#line 143 "/home/jens/Source/shotwell/src/main.vala"
aggregate_progress_monitor_next_step (_tmp84_, "Tag.init");
-#line 1355 "main.c"
+#line 1363 "main.c"
}
-#line 142 "/home/jens/Source/shotwell/src/main.vala"
+#line 144 "/home/jens/Source/shotwell/src/main.vala"
_tmp85_ = monitor;
-#line 142 "/home/jens/Source/shotwell/src/main.vala"
+#line 144 "/home/jens/Source/shotwell/src/main.vala"
_tmp85__target = monitor_target;
-#line 142 "/home/jens/Source/shotwell/src/main.vala"
- tag_init (_tmp85_, _tmp85__target);
#line 144 "/home/jens/Source/shotwell/src/main.vala"
+ tag_init (_tmp85_, _tmp85__target);
+#line 146 "/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"
+ desktop_integration_init ();
+#line 149 "/home/jens/Source/shotwell/src/main.vala"
_tmp86_ = application_get_instance ();
-#line 147 "/home/jens/Source/shotwell/src/main.vala"
+#line 149 "/home/jens/Source/shotwell/src/main.vala"
_tmp87_ = _tmp86_;
-#line 147 "/home/jens/Source/shotwell/src/main.vala"
+#line 149 "/home/jens/Source/shotwell/src/main.vala"
g_signal_emit_by_name (_tmp87_, "init-done");
-#line 147 "/home/jens/Source/shotwell/src/main.vala"
+#line 149 "/home/jens/Source/shotwell/src/main.vala"
_application_unref0 (_tmp87_);
-#line 150 "/home/jens/Source/shotwell/src/main.vala"
+#line 152 "/home/jens/Source/shotwell/src/main.vala"
_tmp88_ = aggregate_monitor;
-#line 150 "/home/jens/Source/shotwell/src/main.vala"
+#line 152 "/home/jens/Source/shotwell/src/main.vala"
if (_tmp88_ != NULL) {
-#line 1379 "main.c"
+#line 1387 "main.c"
AggregateProgressMonitor* _tmp89_;
-#line 151 "/home/jens/Source/shotwell/src/main.vala"
+#line 153 "/home/jens/Source/shotwell/src/main.vala"
_tmp89_ = aggregate_monitor;
-#line 151 "/home/jens/Source/shotwell/src/main.vala"
+#line 153 "/home/jens/Source/shotwell/src/main.vala"
aggregate_progress_monitor_next_step (_tmp89_, "LibraryWindow");
-#line 1385 "main.c"
+#line 1393 "main.c"
}
-#line 152 "/home/jens/Source/shotwell/src/main.vala"
+#line 154 "/home/jens/Source/shotwell/src/main.vala"
_tmp90_ = monitor;
-#line 152 "/home/jens/Source/shotwell/src/main.vala"
+#line 154 "/home/jens/Source/shotwell/src/main.vala"
_tmp90__target = monitor_target;
-#line 152 "/home/jens/Source/shotwell/src/main.vala"
+#line 154 "/home/jens/Source/shotwell/src/main.vala"
_tmp91_ = library_window_new (_tmp90_, _tmp90__target);
-#line 152 "/home/jens/Source/shotwell/src/main.vala"
+#line 154 "/home/jens/Source/shotwell/src/main.vala"
g_object_ref_sink (_tmp91_);
-#line 152 "/home/jens/Source/shotwell/src/main.vala"
- library_window = _tmp91_;
#line 154 "/home/jens/Source/shotwell/src/main.vala"
+ library_window = _tmp91_;
+#line 156 "/home/jens/Source/shotwell/src/main.vala"
_tmp92_ = aggregate_monitor;
-#line 154 "/home/jens/Source/shotwell/src/main.vala"
+#line 156 "/home/jens/Source/shotwell/src/main.vala"
if (_tmp92_ != NULL) {
-#line 1401 "main.c"
+#line 1409 "main.c"
AggregateProgressMonitor* _tmp93_;
-#line 155 "/home/jens/Source/shotwell/src/main.vala"
+#line 157 "/home/jens/Source/shotwell/src/main.vala"
_tmp93_ = aggregate_monitor;
-#line 155 "/home/jens/Source/shotwell/src/main.vala"
+#line 157 "/home/jens/Source/shotwell/src/main.vala"
aggregate_progress_monitor_next_step (_tmp93_, "done");
-#line 1407 "main.c"
+#line 1415 "main.c"
}
-#line 160 "/home/jens/Source/shotwell/src/main.vala"
+#line 162 "/home/jens/Source/shotwell/src/main.vala"
(monitor_target_destroy_notify == NULL) ? NULL : (monitor_target_destroy_notify (monitor_target), NULL);
-#line 160 "/home/jens/Source/shotwell/src/main.vala"
+#line 162 "/home/jens/Source/shotwell/src/main.vala"
monitor = NULL;
-#line 160 "/home/jens/Source/shotwell/src/main.vala"
+#line 162 "/home/jens/Source/shotwell/src/main.vala"
monitor_target = NULL;
-#line 160 "/home/jens/Source/shotwell/src/main.vala"
+#line 162 "/home/jens/Source/shotwell/src/main.vala"
monitor_target_destroy_notify = NULL;
-#line 160 "/home/jens/Source/shotwell/src/main.vala"
+#line 162 "/home/jens/Source/shotwell/src/main.vala"
monitor = NULL;
-#line 160 "/home/jens/Source/shotwell/src/main.vala"
+#line 162 "/home/jens/Source/shotwell/src/main.vala"
monitor_target = NULL;
-#line 160 "/home/jens/Source/shotwell/src/main.vala"
+#line 162 "/home/jens/Source/shotwell/src/main.vala"
monitor_target_destroy_notify = NULL;
-#line 161 "/home/jens/Source/shotwell/src/main.vala"
+#line 163 "/home/jens/Source/shotwell/src/main.vala"
_aggregate_progress_monitor_unref0 (aggregate_monitor);
-#line 161 "/home/jens/Source/shotwell/src/main.vala"
+#line 163 "/home/jens/Source/shotwell/src/main.vala"
aggregate_monitor = NULL;
-#line 162 "/home/jens/Source/shotwell/src/main.vala"
+#line 164 "/home/jens/Source/shotwell/src/main.vala"
_tmp94_ = progress_dialog;
-#line 162 "/home/jens/Source/shotwell/src/main.vala"
+#line 164 "/home/jens/Source/shotwell/src/main.vala"
if (_tmp94_ != NULL) {
-#line 1431 "main.c"
+#line 1439 "main.c"
ProgressDialog* _tmp95_;
-#line 163 "/home/jens/Source/shotwell/src/main.vala"
+#line 165 "/home/jens/Source/shotwell/src/main.vala"
_tmp95_ = progress_dialog;
-#line 163 "/home/jens/Source/shotwell/src/main.vala"
+#line 165 "/home/jens/Source/shotwell/src/main.vala"
gtk_widget_destroy (G_TYPE_CHECK_INSTANCE_CAST (_tmp95_, gtk_widget_get_type (), GtkWidget));
-#line 1437 "main.c"
+#line 1445 "main.c"
}
-#line 164 "/home/jens/Source/shotwell/src/main.vala"
+#line 166 "/home/jens/Source/shotwell/src/main.vala"
_g_object_unref0 (progress_dialog);
-#line 164 "/home/jens/Source/shotwell/src/main.vala"
+#line 166 "/home/jens/Source/shotwell/src/main.vala"
progress_dialog = NULL;
-#line 167 "/home/jens/Source/shotwell/src/main.vala"
+#line 169 "/home/jens/Source/shotwell/src/main.vala"
_tmp96_ = mounts;
-#line 167 "/home/jens/Source/shotwell/src/main.vala"
+#line 169 "/home/jens/Source/shotwell/src/main.vala"
_tmp96__length1 = mounts_length1;
-#line 1447 "main.c"
+#line 1455 "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"
+#line 169 "/home/jens/Source/shotwell/src/main.vala"
mount_collection = _tmp96_;
-#line 167 "/home/jens/Source/shotwell/src/main.vala"
+#line 169 "/home/jens/Source/shotwell/src/main.vala"
mount_collection_length1 = _tmp96__length1;
-#line 167 "/home/jens/Source/shotwell/src/main.vala"
+#line 169 "/home/jens/Source/shotwell/src/main.vala"
for (mount_it = 0; mount_it < _tmp96__length1; mount_it = mount_it + 1) {
-#line 1459 "main.c"
+#line 1467 "main.c"
gchar* _tmp97_;
gchar* mount = NULL;
-#line 167 "/home/jens/Source/shotwell/src/main.vala"
+#line 169 "/home/jens/Source/shotwell/src/main.vala"
_tmp97_ = g_strdup (mount_collection[mount_it]);
-#line 167 "/home/jens/Source/shotwell/src/main.vala"
+#line 169 "/home/jens/Source/shotwell/src/main.vala"
mount = _tmp97_;
-#line 1466 "main.c"
+#line 1474 "main.c"
{
LibraryWindow* _tmp98_;
const gchar* _tmp99_;
-#line 168 "/home/jens/Source/shotwell/src/main.vala"
+#line 170 "/home/jens/Source/shotwell/src/main.vala"
_tmp98_ = library_window;
-#line 168 "/home/jens/Source/shotwell/src/main.vala"
+#line 170 "/home/jens/Source/shotwell/src/main.vala"
_tmp99_ = mount;
-#line 168 "/home/jens/Source/shotwell/src/main.vala"
+#line 170 "/home/jens/Source/shotwell/src/main.vala"
library_window_mounted_camera_shell_notification (_tmp98_, _tmp99_, TRUE);
-#line 167 "/home/jens/Source/shotwell/src/main.vala"
+#line 169 "/home/jens/Source/shotwell/src/main.vala"
_g_free0 (mount);
-#line 1478 "main.c"
+#line 1486 "main.c"
}
}
}
-#line 170 "/home/jens/Source/shotwell/src/main.vala"
+#line 172 "/home/jens/Source/shotwell/src/main.vala"
_tmp100_ = library_window;
-#line 170 "/home/jens/Source/shotwell/src/main.vala"
- gtk_widget_show_all (G_TYPE_CHECK_INSTANCE_CAST (_tmp100_, gtk_widget_get_type (), GtkWidget));
#line 172 "/home/jens/Source/shotwell/src/main.vala"
+ gtk_widget_show_all (G_TYPE_CHECK_INSTANCE_CAST (_tmp100_, gtk_widget_get_type (), GtkWidget));
+#line 174 "/home/jens/Source/shotwell/src/main.vala"
_tmp101_ = g_new0 (WelcomeServiceEntry*, 0 + 1);
-#line 172 "/home/jens/Source/shotwell/src/main.vala"
+#line 174 "/home/jens/Source/shotwell/src/main.vala"
selected_import_entries = _tmp101_;
-#line 172 "/home/jens/Source/shotwell/src/main.vala"
+#line 174 "/home/jens/Source/shotwell/src/main.vala"
selected_import_entries_length1 = 0;
-#line 172 "/home/jens/Source/shotwell/src/main.vala"
+#line 174 "/home/jens/Source/shotwell/src/main.vala"
_selected_import_entries_size_ = selected_import_entries_length1;
-#line 173 "/home/jens/Source/shotwell/src/main.vala"
+#line 175 "/home/jens/Source/shotwell/src/main.vala"
_tmp103_ = config_facade_get_instance ();
-#line 173 "/home/jens/Source/shotwell/src/main.vala"
+#line 175 "/home/jens/Source/shotwell/src/main.vala"
_tmp104_ = _tmp103_;
-#line 173 "/home/jens/Source/shotwell/src/main.vala"
+#line 175 "/home/jens/Source/shotwell/src/main.vala"
_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"
+#line 175 "/home/jens/Source/shotwell/src/main.vala"
_tmp106_ = _tmp105_;
-#line 173 "/home/jens/Source/shotwell/src/main.vala"
+#line 175 "/home/jens/Source/shotwell/src/main.vala"
_g_object_unref0 (_tmp104_);
-#line 173 "/home/jens/Source/shotwell/src/main.vala"
+#line 175 "/home/jens/Source/shotwell/src/main.vala"
if (_tmp106_) {
-#line 1506 "main.c"
+#line 1514 "main.c"
LibraryPhotoSourceCollection* _tmp107_;
gint _tmp108_;
-#line 174 "/home/jens/Source/shotwell/src/main.vala"
+#line 176 "/home/jens/Source/shotwell/src/main.vala"
_tmp107_ = library_photo_global;
-#line 174 "/home/jens/Source/shotwell/src/main.vala"
+#line 176 "/home/jens/Source/shotwell/src/main.vala"
_tmp108_ = data_collection_get_count (G_TYPE_CHECK_INSTANCE_CAST (_tmp107_, TYPE_DATA_COLLECTION, DataCollection));
-#line 174 "/home/jens/Source/shotwell/src/main.vala"
+#line 176 "/home/jens/Source/shotwell/src/main.vala"
_tmp102_ = _tmp108_ == 0;
-#line 1515 "main.c"
+#line 1523 "main.c"
} else {
-#line 173 "/home/jens/Source/shotwell/src/main.vala"
+#line 175 "/home/jens/Source/shotwell/src/main.vala"
_tmp102_ = FALSE;
-#line 1519 "main.c"
+#line 1527 "main.c"
}
-#line 173 "/home/jens/Source/shotwell/src/main.vala"
+#line 175 "/home/jens/Source/shotwell/src/main.vala"
if (_tmp102_) {
-#line 1523 "main.c"
+#line 1531 "main.c"
WelcomeDialog* welcome = NULL;
LibraryWindow* _tmp109_;
WelcomeDialog* _tmp110_;
@@ -1538,143 +1546,143 @@ void library_exec (gchar** mounts, int mounts_length1) {
gint _tmp115_;
gboolean _tmp116_ = FALSE;
gboolean _tmp117_;
-#line 175 "/home/jens/Source/shotwell/src/main.vala"
+#line 177 "/home/jens/Source/shotwell/src/main.vala"
_tmp109_ = library_window;
-#line 175 "/home/jens/Source/shotwell/src/main.vala"
+#line 177 "/home/jens/Source/shotwell/src/main.vala"
_tmp110_ = welcome_dialog_new (G_TYPE_CHECK_INSTANCE_CAST (_tmp109_, gtk_window_get_type (), GtkWindow));
-#line 175 "/home/jens/Source/shotwell/src/main.vala"
+#line 177 "/home/jens/Source/shotwell/src/main.vala"
g_object_ref_sink (_tmp110_);
-#line 175 "/home/jens/Source/shotwell/src/main.vala"
+#line 177 "/home/jens/Source/shotwell/src/main.vala"
welcome = _tmp110_;
-#line 176 "/home/jens/Source/shotwell/src/main.vala"
+#line 178 "/home/jens/Source/shotwell/src/main.vala"
_tmp111_ = config_facade_get_instance ();
-#line 176 "/home/jens/Source/shotwell/src/main.vala"
+#line 178 "/home/jens/Source/shotwell/src/main.vala"
_tmp112_ = _tmp111_;
-#line 176 "/home/jens/Source/shotwell/src/main.vala"
+#line 178 "/home/jens/Source/shotwell/src/main.vala"
_tmp113_ = welcome;
-#line 176 "/home/jens/Source/shotwell/src/main.vala"
+#line 178 "/home/jens/Source/shotwell/src/main.vala"
_tmp117_ = welcome_dialog_execute (_tmp113_, &_tmp114_, &_tmp115_, &_tmp116_);
-#line 176 "/home/jens/Source/shotwell/src/main.vala"
+#line 178 "/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"
+#line 178 "/home/jens/Source/shotwell/src/main.vala"
selected_import_entries = _tmp114_;
-#line 176 "/home/jens/Source/shotwell/src/main.vala"
+#line 178 "/home/jens/Source/shotwell/src/main.vala"
selected_import_entries_length1 = _tmp115_;
-#line 176 "/home/jens/Source/shotwell/src/main.vala"
+#line 178 "/home/jens/Source/shotwell/src/main.vala"
_selected_import_entries_size_ = selected_import_entries_length1;
-#line 176 "/home/jens/Source/shotwell/src/main.vala"
+#line 178 "/home/jens/Source/shotwell/src/main.vala"
do_system_pictures_import = _tmp116_;
-#line 176 "/home/jens/Source/shotwell/src/main.vala"
+#line 178 "/home/jens/Source/shotwell/src/main.vala"
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"
+#line 178 "/home/jens/Source/shotwell/src/main.vala"
_g_object_unref0 (_tmp112_);
-#line 173 "/home/jens/Source/shotwell/src/main.vala"
+#line 175 "/home/jens/Source/shotwell/src/main.vala"
_g_object_unref0 (welcome);
-#line 1566 "main.c"
+#line 1574 "main.c"
} else {
ConfigFacade* _tmp118_;
ConfigFacade* _tmp119_;
-#line 179 "/home/jens/Source/shotwell/src/main.vala"
+#line 181 "/home/jens/Source/shotwell/src/main.vala"
_tmp118_ = config_facade_get_instance ();
-#line 179 "/home/jens/Source/shotwell/src/main.vala"
+#line 181 "/home/jens/Source/shotwell/src/main.vala"
_tmp119_ = _tmp118_;
-#line 179 "/home/jens/Source/shotwell/src/main.vala"
+#line 181 "/home/jens/Source/shotwell/src/main.vala"
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"
+#line 181 "/home/jens/Source/shotwell/src/main.vala"
_g_object_unref0 (_tmp119_);
-#line 1578 "main.c"
+#line 1586 "main.c"
}
-#line 182 "/home/jens/Source/shotwell/src/main.vala"
+#line 184 "/home/jens/Source/shotwell/src/main.vala"
_tmp120_ = selected_import_entries;
-#line 182 "/home/jens/Source/shotwell/src/main.vala"
+#line 184 "/home/jens/Source/shotwell/src/main.vala"
_tmp120__length1 = selected_import_entries_length1;
-#line 182 "/home/jens/Source/shotwell/src/main.vala"
+#line 184 "/home/jens/Source/shotwell/src/main.vala"
if (_tmp120__length1 > 0) {
-#line 1586 "main.c"
+#line 1594 "main.c"
WelcomeServiceEntry** _tmp121_;
gint _tmp121__length1;
-#line 183 "/home/jens/Source/shotwell/src/main.vala"
+#line 185 "/home/jens/Source/shotwell/src/main.vala"
do_external_import = TRUE;
-#line 184 "/home/jens/Source/shotwell/src/main.vala"
+#line 186 "/home/jens/Source/shotwell/src/main.vala"
_tmp121_ = selected_import_entries;
-#line 184 "/home/jens/Source/shotwell/src/main.vala"
+#line 186 "/home/jens/Source/shotwell/src/main.vala"
_tmp121__length1 = selected_import_entries_length1;
-#line 1595 "main.c"
+#line 1603 "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"
+#line 186 "/home/jens/Source/shotwell/src/main.vala"
entry_collection = _tmp121_;
-#line 184 "/home/jens/Source/shotwell/src/main.vala"
+#line 186 "/home/jens/Source/shotwell/src/main.vala"
entry_collection_length1 = _tmp121__length1;
-#line 184 "/home/jens/Source/shotwell/src/main.vala"
+#line 186 "/home/jens/Source/shotwell/src/main.vala"
for (entry_it = 0; entry_it < _tmp121__length1; entry_it = entry_it + 1) {
-#line 1607 "main.c"
+#line 1615 "main.c"
WelcomeServiceEntry* _tmp122_;
WelcomeServiceEntry* entry = NULL;
-#line 184 "/home/jens/Source/shotwell/src/main.vala"
+#line 186 "/home/jens/Source/shotwell/src/main.vala"
_tmp122_ = _g_object_ref0 (entry_collection[entry_it]);
-#line 184 "/home/jens/Source/shotwell/src/main.vala"
+#line 186 "/home/jens/Source/shotwell/src/main.vala"
entry = _tmp122_;
-#line 1614 "main.c"
+#line 1622 "main.c"
{
WelcomeServiceEntry* _tmp123_;
-#line 185 "/home/jens/Source/shotwell/src/main.vala"
+#line 187 "/home/jens/Source/shotwell/src/main.vala"
_tmp123_ = entry;
-#line 185 "/home/jens/Source/shotwell/src/main.vala"
+#line 187 "/home/jens/Source/shotwell/src/main.vala"
welcome_service_entry_execute (_tmp123_);
-#line 184 "/home/jens/Source/shotwell/src/main.vala"
+#line 186 "/home/jens/Source/shotwell/src/main.vala"
_g_object_unref0 (entry);
-#line 1623 "main.c"
+#line 1631 "main.c"
}
}
}
}
-#line 187 "/home/jens/Source/shotwell/src/main.vala"
+#line 189 "/home/jens/Source/shotwell/src/main.vala"
_tmp124_ = do_system_pictures_import;
-#line 187 "/home/jens/Source/shotwell/src/main.vala"
+#line 189 "/home/jens/Source/shotwell/src/main.vala"
if (_tmp124_) {
-#line 191 "/home/jens/Source/shotwell/src/main.vala"
+#line 193 "/home/jens/Source/shotwell/src/main.vala"
run_system_pictures_import (NULL);
-#line 1634 "main.c"
+#line 1642 "main.c"
}
-#line 194 "/home/jens/Source/shotwell/src/main.vala"
+#line 196 "/home/jens/Source/shotwell/src/main.vala"
_tmp125_ = startup_timer;
-#line 194 "/home/jens/Source/shotwell/src/main.vala"
+#line 196 "/home/jens/Source/shotwell/src/main.vala"
_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()", _tmp126_);
#line 196 "/home/jens/Source/shotwell/src/main.vala"
+ g_debug ("main.vala:196: %lf seconds to Gtk.main()", _tmp126_);
+#line 198 "/home/jens/Source/shotwell/src/main.vala"
_tmp127_ = application_get_instance ();
-#line 196 "/home/jens/Source/shotwell/src/main.vala"
+#line 198 "/home/jens/Source/shotwell/src/main.vala"
_tmp128_ = _tmp127_;
-#line 196 "/home/jens/Source/shotwell/src/main.vala"
+#line 198 "/home/jens/Source/shotwell/src/main.vala"
application_start (_tmp128_, NULL, 0);
-#line 196 "/home/jens/Source/shotwell/src/main.vala"
- _application_unref0 (_tmp128_);
#line 198 "/home/jens/Source/shotwell/src/main.vala"
+ _application_unref0 (_tmp128_);
+#line 200 "/home/jens/Source/shotwell/src/main.vala"
desktop_integration_terminate ();
-#line 199 "/home/jens/Source/shotwell/src/main.vala"
+#line 201 "/home/jens/Source/shotwell/src/main.vala"
metadata_writer_terminate ();
-#line 200 "/home/jens/Source/shotwell/src/main.vala"
+#line 202 "/home/jens/Source/shotwell/src/main.vala"
tag_terminate ();
-#line 201 "/home/jens/Source/shotwell/src/main.vala"
+#line 203 "/home/jens/Source/shotwell/src/main.vala"
event_terminate ();
-#line 202 "/home/jens/Source/shotwell/src/main.vala"
+#line 204 "/home/jens/Source/shotwell/src/main.vala"
library_photo_terminate ();
-#line 203 "/home/jens/Source/shotwell/src/main.vala"
+#line 205 "/home/jens/Source/shotwell/src/main.vala"
media_collection_registry_terminate ();
-#line 204 "/home/jens/Source/shotwell/src/main.vala"
+#line 206 "/home/jens/Source/shotwell/src/main.vala"
library_monitor_pool_terminate ();
-#line 205 "/home/jens/Source/shotwell/src/main.vala"
+#line 207 "/home/jens/Source/shotwell/src/main.vala"
tombstone_terminate ();
-#line 206 "/home/jens/Source/shotwell/src/main.vala"
+#line 208 "/home/jens/Source/shotwell/src/main.vala"
thumbnail_cache_terminate ();
-#line 207 "/home/jens/Source/shotwell/src/main.vala"
+#line 209 "/home/jens/Source/shotwell/src/main.vala"
video_terminate ();
-#line 208 "/home/jens/Source/shotwell/src/main.vala"
+#line 210 "/home/jens/Source/shotwell/src/main.vala"
library_app_terminate ();
#line 15 "/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);
@@ -1698,14 +1706,14 @@ void library_exec (gchar** mounts, int mounts_length1) {
_g_free0 (app_version);
#line 15 "/home/jens/Source/shotwell/src/main.vala"
_g_free0 (errormsg);
-#line 1694 "main.c"
+#line 1702 "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"
+#line 225 "/home/jens/Source/shotwell/src/main.vala"
report_system_pictures_import (manifest, import_roll);
-#line 1701 "main.c"
+#line 1709 "main.c"
}
@@ -1727,65 +1735,65 @@ void run_system_pictures_import (ImportManifest* external_exclusion_manifest) {
LibraryWindow* _tmp11_;
BatchImport* _tmp12_;
LibraryWindow* _tmp13_;
-#line 214 "/home/jens/Source/shotwell/src/main.vala"
+#line 216 "/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"
+#line 217 "/home/jens/Source/shotwell/src/main.vala"
_tmp0_ = do_system_pictures_import;
-#line 215 "/home/jens/Source/shotwell/src/main.vala"
+#line 217 "/home/jens/Source/shotwell/src/main.vala"
if (!_tmp0_) {
-#line 216 "/home/jens/Source/shotwell/src/main.vala"
+#line 218 "/home/jens/Source/shotwell/src/main.vala"
return;
-#line 1731 "main.c"
+#line 1739 "main.c"
}
-#line 218 "/home/jens/Source/shotwell/src/main.vala"
+#line 220 "/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);
-#line 218 "/home/jens/Source/shotwell/src/main.vala"
+#line 220 "/home/jens/Source/shotwell/src/main.vala"
jobs = _tmp1_;
-#line 219 "/home/jens/Source/shotwell/src/main.vala"
+#line 221 "/home/jens/Source/shotwell/src/main.vala"
_tmp2_ = jobs;
-#line 219 "/home/jens/Source/shotwell/src/main.vala"
+#line 221 "/home/jens/Source/shotwell/src/main.vala"
_tmp3_ = app_dirs_get_import_dir ();
-#line 219 "/home/jens/Source/shotwell/src/main.vala"
+#line 221 "/home/jens/Source/shotwell/src/main.vala"
_tmp4_ = _tmp3_;
-#line 219 "/home/jens/Source/shotwell/src/main.vala"
- _tmp5_ = file_import_job_new (_tmp4_, FALSE);
-#line 219 "/home/jens/Source/shotwell/src/main.vala"
+#line 221 "/home/jens/Source/shotwell/src/main.vala"
+ _tmp5_ = file_import_job_new (_tmp4_, FALSE, TRUE);
+#line 221 "/home/jens/Source/shotwell/src/main.vala"
_tmp6_ = _tmp5_;
-#line 219 "/home/jens/Source/shotwell/src/main.vala"
+#line 221 "/home/jens/Source/shotwell/src/main.vala"
gee_abstract_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), _tmp6_);
-#line 219 "/home/jens/Source/shotwell/src/main.vala"
+#line 221 "/home/jens/Source/shotwell/src/main.vala"
_batch_import_job_unref0 (_tmp6_);
-#line 219 "/home/jens/Source/shotwell/src/main.vala"
- _g_object_unref0 (_tmp4_);
#line 221 "/home/jens/Source/shotwell/src/main.vala"
+ _g_object_unref0 (_tmp4_);
+#line 223 "/home/jens/Source/shotwell/src/main.vala"
_tmp7_ = app_window_get_instance ();
-#line 221 "/home/jens/Source/shotwell/src/main.vala"
- library_window = G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, TYPE_LIBRARY_WINDOW, LibraryWindow);
#line 223 "/home/jens/Source/shotwell/src/main.vala"
+ library_window = G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, TYPE_LIBRARY_WINDOW, LibraryWindow);
+#line 225 "/home/jens/Source/shotwell/src/main.vala"
_tmp8_ = jobs;
-#line 223 "/home/jens/Source/shotwell/src/main.vala"
+#line 225 "/home/jens/Source/shotwell/src/main.vala"
_tmp9_ = external_exclusion_manifest;
-#line 223 "/home/jens/Source/shotwell/src/main.vala"
+#line 225 "/home/jens/Source/shotwell/src/main.vala"
_tmp10_ = batch_import_new (G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, GEE_TYPE_ITERABLE, GeeIterable), "startup_import", _report_system_pictures_import_batch_import_import_reporter, NULL, NULL, NULL, NULL, NULL, _tmp9_);
-#line 223 "/home/jens/Source/shotwell/src/main.vala"
- batch_import = _tmp10_;
#line 225 "/home/jens/Source/shotwell/src/main.vala"
+ batch_import = _tmp10_;
+#line 227 "/home/jens/Source/shotwell/src/main.vala"
_tmp11_ = library_window;
-#line 225 "/home/jens/Source/shotwell/src/main.vala"
+#line 227 "/home/jens/Source/shotwell/src/main.vala"
_tmp12_ = batch_import;
-#line 225 "/home/jens/Source/shotwell/src/main.vala"
- library_window_enqueue_batch_import (_tmp11_, _tmp12_, TRUE);
#line 227 "/home/jens/Source/shotwell/src/main.vala"
+ library_window_enqueue_batch_import (_tmp11_, _tmp12_, TRUE);
+#line 229 "/home/jens/Source/shotwell/src/main.vala"
_tmp13_ = library_window;
-#line 227 "/home/jens/Source/shotwell/src/main.vala"
+#line 229 "/home/jens/Source/shotwell/src/main.vala"
library_window_switch_to_import_queue_page (_tmp13_);
-#line 214 "/home/jens/Source/shotwell/src/main.vala"
+#line 216 "/home/jens/Source/shotwell/src/main.vala"
_g_object_unref0 (batch_import);
-#line 214 "/home/jens/Source/shotwell/src/main.vala"
+#line 216 "/home/jens/Source/shotwell/src/main.vala"
_g_object_unref0 (library_window);
-#line 214 "/home/jens/Source/shotwell/src/main.vala"
+#line 216 "/home/jens/Source/shotwell/src/main.vala"
_g_object_unref0 (jobs);
-#line 1781 "main.c"
+#line 1789 "main.c"
}
@@ -1793,50 +1801,50 @@ void report_system_pictures_import (ImportManifest* manifest, BatchImportRoll* i
gboolean _tmp0_ = FALSE;
gboolean _tmp1_;
ImportManifest* _tmp6_;
-#line 230 "/home/jens/Source/shotwell/src/main.vala"
+#line 232 "/home/jens/Source/shotwell/src/main.vala"
g_return_if_fail (IS_IMPORT_MANIFEST (manifest));
-#line 230 "/home/jens/Source/shotwell/src/main.vala"
+#line 232 "/home/jens/Source/shotwell/src/main.vala"
g_return_if_fail (IS_BATCH_IMPORT_ROLL (import_roll));
-#line 237 "/home/jens/Source/shotwell/src/main.vala"
+#line 239 "/home/jens/Source/shotwell/src/main.vala"
_tmp1_ = do_external_import;
-#line 237 "/home/jens/Source/shotwell/src/main.vala"
+#line 239 "/home/jens/Source/shotwell/src/main.vala"
if (_tmp1_) {
-#line 1797 "main.c"
+#line 1805 "main.c"
ImportManifest* _tmp2_;
GeeList* _tmp3_;
gint _tmp4_;
gint _tmp5_;
-#line 237 "/home/jens/Source/shotwell/src/main.vala"
+#line 239 "/home/jens/Source/shotwell/src/main.vala"
_tmp2_ = manifest;
-#line 237 "/home/jens/Source/shotwell/src/main.vala"
+#line 239 "/home/jens/Source/shotwell/src/main.vala"
_tmp3_ = _tmp2_->all;
-#line 237 "/home/jens/Source/shotwell/src/main.vala"
+#line 239 "/home/jens/Source/shotwell/src/main.vala"
_tmp4_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, GEE_TYPE_COLLECTION, GeeCollection));
-#line 237 "/home/jens/Source/shotwell/src/main.vala"
+#line 239 "/home/jens/Source/shotwell/src/main.vala"
_tmp5_ = _tmp4_;
-#line 237 "/home/jens/Source/shotwell/src/main.vala"
+#line 239 "/home/jens/Source/shotwell/src/main.vala"
_tmp0_ = _tmp5_ == 0;
-#line 1812 "main.c"
+#line 1820 "main.c"
} else {
-#line 237 "/home/jens/Source/shotwell/src/main.vala"
+#line 239 "/home/jens/Source/shotwell/src/main.vala"
_tmp0_ = FALSE;
-#line 1816 "main.c"
+#line 1824 "main.c"
}
-#line 237 "/home/jens/Source/shotwell/src/main.vala"
+#line 239 "/home/jens/Source/shotwell/src/main.vala"
if (_tmp0_) {
-#line 238 "/home/jens/Source/shotwell/src/main.vala"
+#line 240 "/home/jens/Source/shotwell/src/main.vala"
return;
-#line 1822 "main.c"
+#line 1830 "main.c"
}
-#line 240 "/home/jens/Source/shotwell/src/main.vala"
+#line 242 "/home/jens/Source/shotwell/src/main.vala"
_tmp6_ = manifest;
-#line 240 "/home/jens/Source/shotwell/src/main.vala"
+#line 242 "/home/jens/Source/shotwell/src/main.vala"
import_ui_report_manifest (_tmp6_, TRUE, NULL);
-#line 1828 "main.c"
+#line 1836 "main.c"
}
-void editing_exec (const gchar* filename) {
+void editing_exec (const gchar* filename, gboolean fullscreen) {
GFile* initial_file = NULL;
const gchar* _tmp0_;
GFile* _tmp1_;
@@ -1847,196 +1855,243 @@ void editing_exec (const gchar* filename) {
DirectWindow* _tmp7_;
GTimer* _tmp8_;
gdouble _tmp9_;
- Application* _tmp10_;
- Application* _tmp11_;
+ gboolean _tmp10_;
+ Application* _tmp15_;
+ Application* _tmp16_;
GError * _inner_error_ = NULL;
-#line 243 "/home/jens/Source/shotwell/src/main.vala"
+#line 245 "/home/jens/Source/shotwell/src/main.vala"
g_return_if_fail (filename != NULL);
-#line 244 "/home/jens/Source/shotwell/src/main.vala"
+#line 246 "/home/jens/Source/shotwell/src/main.vala"
_tmp0_ = filename;
-#line 244 "/home/jens/Source/shotwell/src/main.vala"
+#line 246 "/home/jens/Source/shotwell/src/main.vala"
_tmp1_ = g_file_new_for_commandline_arg (_tmp0_);
-#line 244 "/home/jens/Source/shotwell/src/main.vala"
+#line 246 "/home/jens/Source/shotwell/src/main.vala"
initial_file = _tmp1_;
-#line 247 "/home/jens/Source/shotwell/src/main.vala"
+#line 249 "/home/jens/Source/shotwell/src/main.vala"
_tmp2_ = initial_file;
-#line 247 "/home/jens/Source/shotwell/src/main.vala"
+#line 249 "/home/jens/Source/shotwell/src/main.vala"
direct_preconfigure (_tmp2_);
-#line 248 "/home/jens/Source/shotwell/src/main.vala"
+#line 250 "/home/jens/Source/shotwell/src/main.vala"
db_preconfigure (NULL);
-#line 1860 "main.c"
+#line 1869 "main.c"
{
-#line 252 "/home/jens/Source/shotwell/src/main.vala"
+#line 254 "/home/jens/Source/shotwell/src/main.vala"
direct_app_init (&_inner_error_);
-#line 252 "/home/jens/Source/shotwell/src/main.vala"
+#line 254 "/home/jens/Source/shotwell/src/main.vala"
if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 1866 "main.c"
- goto __catch224_g_error;
+#line 1875 "main.c"
+ goto __catch235_g_error;
}
}
- goto __finally224;
- __catch224_g_error:
+ goto __finally235;
+ __catch235_g_error:
{
GError* err = NULL;
GError* _tmp3_;
const gchar* _tmp4_;
-#line 251 "/home/jens/Source/shotwell/src/main.vala"
+#line 253 "/home/jens/Source/shotwell/src/main.vala"
err = _inner_error_;
-#line 251 "/home/jens/Source/shotwell/src/main.vala"
+#line 253 "/home/jens/Source/shotwell/src/main.vala"
_inner_error_ = NULL;
-#line 254 "/home/jens/Source/shotwell/src/main.vala"
+#line 256 "/home/jens/Source/shotwell/src/main.vala"
_tmp3_ = err;
-#line 254 "/home/jens/Source/shotwell/src/main.vala"
+#line 256 "/home/jens/Source/shotwell/src/main.vala"
_tmp4_ = _tmp3_->message;
-#line 254 "/home/jens/Source/shotwell/src/main.vala"
- app_window_panic (_tmp4_);
#line 256 "/home/jens/Source/shotwell/src/main.vala"
+ app_window_panic (_tmp4_);
+#line 258 "/home/jens/Source/shotwell/src/main.vala"
_g_error_free0 (err);
-#line 256 "/home/jens/Source/shotwell/src/main.vala"
+#line 258 "/home/jens/Source/shotwell/src/main.vala"
_g_object_unref0 (initial_file);
-#line 256 "/home/jens/Source/shotwell/src/main.vala"
+#line 258 "/home/jens/Source/shotwell/src/main.vala"
return;
-#line 1892 "main.c"
+#line 1901 "main.c"
}
- __finally224:
-#line 251 "/home/jens/Source/shotwell/src/main.vala"
+ __finally235:
+#line 253 "/home/jens/Source/shotwell/src/main.vala"
if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 251 "/home/jens/Source/shotwell/src/main.vala"
+#line 253 "/home/jens/Source/shotwell/src/main.vala"
_g_object_unref0 (initial_file);
-#line 251 "/home/jens/Source/shotwell/src/main.vala"
+#line 253 "/home/jens/Source/shotwell/src/main.vala"
g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 251 "/home/jens/Source/shotwell/src/main.vala"
+#line 253 "/home/jens/Source/shotwell/src/main.vala"
g_clear_error (&_inner_error_);
-#line 251 "/home/jens/Source/shotwell/src/main.vala"
+#line 253 "/home/jens/Source/shotwell/src/main.vala"
return;
-#line 1905 "main.c"
+#line 1914 "main.c"
}
-#line 260 "/home/jens/Source/shotwell/src/main.vala"
+#line 262 "/home/jens/Source/shotwell/src/main.vala"
desktop_integration_init ();
-#line 266 "/home/jens/Source/shotwell/src/main.vala"
+#line 268 "/home/jens/Source/shotwell/src/main.vala"
_tmp5_ = initial_file;
-#line 266 "/home/jens/Source/shotwell/src/main.vala"
+#line 268 "/home/jens/Source/shotwell/src/main.vala"
_tmp6_ = direct_window_new (_tmp5_);
-#line 266 "/home/jens/Source/shotwell/src/main.vala"
+#line 268 "/home/jens/Source/shotwell/src/main.vala"
g_object_ref_sink (_tmp6_);
-#line 266 "/home/jens/Source/shotwell/src/main.vala"
+#line 268 "/home/jens/Source/shotwell/src/main.vala"
direct_window = _tmp6_;
-#line 267 "/home/jens/Source/shotwell/src/main.vala"
- _tmp7_ = direct_window;
-#line 267 "/home/jens/Source/shotwell/src/main.vala"
- gtk_widget_show_all (G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, gtk_widget_get_type (), GtkWidget));
#line 269 "/home/jens/Source/shotwell/src/main.vala"
- _tmp8_ = startup_timer;
-#line 269 "/home/jens/Source/shotwell/src/main.vala"
- _tmp9_ = g_timer_elapsed (_tmp8_, NULL);
+ _tmp7_ = direct_window;
#line 269 "/home/jens/Source/shotwell/src/main.vala"
- g_debug ("main.vala:269: %lf seconds to Gtk.main()", _tmp9_);
-#line 271 "/home/jens/Source/shotwell/src/main.vala"
- _tmp10_ = application_get_instance ();
+ gtk_widget_show_all (G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, gtk_widget_get_type (), GtkWidget));
#line 271 "/home/jens/Source/shotwell/src/main.vala"
- _tmp11_ = _tmp10_;
+ _tmp8_ = startup_timer;
#line 271 "/home/jens/Source/shotwell/src/main.vala"
- application_start (_tmp11_, NULL, 0);
+ _tmp9_ = g_timer_elapsed (_tmp8_, NULL);
#line 271 "/home/jens/Source/shotwell/src/main.vala"
- _application_unref0 (_tmp11_);
+ g_debug ("main.vala:271: %lf seconds to Gtk.main()", _tmp9_);
#line 273 "/home/jens/Source/shotwell/src/main.vala"
- desktop_integration_terminate ();
+ _tmp10_ = fullscreen;
+#line 273 "/home/jens/Source/shotwell/src/main.vala"
+ if (_tmp10_) {
+#line 1940 "main.c"
+ GAction* action = NULL;
+ DirectWindow* _tmp11_;
+ GAction* _tmp12_;
+ GAction* _tmp13_;
+#line 274 "/home/jens/Source/shotwell/src/main.vala"
+ _tmp11_ = direct_window;
+#line 274 "/home/jens/Source/shotwell/src/main.vala"
+ _tmp12_ = app_window_get_common_action (G_TYPE_CHECK_INSTANCE_CAST (_tmp11_, TYPE_APP_WINDOW, AppWindow), "CommonFullscreen");
+#line 274 "/home/jens/Source/shotwell/src/main.vala"
+ action = _tmp12_;
+#line 275 "/home/jens/Source/shotwell/src/main.vala"
+ _tmp13_ = action;
+#line 275 "/home/jens/Source/shotwell/src/main.vala"
+ if (_tmp13_ != NULL) {
+#line 1955 "main.c"
+ GAction* _tmp14_;
+#line 276 "/home/jens/Source/shotwell/src/main.vala"
+ _tmp14_ = action;
#line 276 "/home/jens/Source/shotwell/src/main.vala"
+ g_action_activate (_tmp14_, NULL);
+#line 1961 "main.c"
+ }
+#line 273 "/home/jens/Source/shotwell/src/main.vala"
+ _g_object_unref0 (action);
+#line 1965 "main.c"
+ }
+#line 280 "/home/jens/Source/shotwell/src/main.vala"
+ _tmp15_ = application_get_instance ();
+#line 280 "/home/jens/Source/shotwell/src/main.vala"
+ _tmp16_ = _tmp15_;
+#line 280 "/home/jens/Source/shotwell/src/main.vala"
+ application_start (_tmp16_, NULL, 0);
+#line 280 "/home/jens/Source/shotwell/src/main.vala"
+ _application_unref0 (_tmp16_);
+#line 282 "/home/jens/Source/shotwell/src/main.vala"
+ desktop_integration_terminate ();
+#line 285 "/home/jens/Source/shotwell/src/main.vala"
direct_app_terminate ();
-#line 243 "/home/jens/Source/shotwell/src/main.vala"
+#line 245 "/home/jens/Source/shotwell/src/main.vala"
_g_object_unref0 (direct_window);
-#line 243 "/home/jens/Source/shotwell/src/main.vala"
+#line 245 "/home/jens/Source/shotwell/src/main.vala"
_g_object_unref0 (initial_file);
-#line 1943 "main.c"
+#line 1983 "main.c"
}
-static GOptionEntry* _vala_array_dup26 (GOptionEntry* self, int length) {
-#line 290 "/home/jens/Source/shotwell/src/main.vala"
+static GOptionEntry* _vala_array_dup22 (GOptionEntry* self, int length) {
+#line 300 "/home/jens/Source/shotwell/src/main.vala"
return g_memdup (self, length * sizeof (GOptionEntry));
-#line 1950 "main.c"
+#line 1990 "main.c"
}
-static void _vala_array_add70 (GOptionEntry* * array, int* length, int* size, const GOptionEntry* value) {
-#line 294 "/home/jens/Source/shotwell/src/main.vala"
+static void _vala_array_add73 (GOptionEntry* * array, int* length, int* size, const GOptionEntry* value) {
+#line 304 "/home/jens/Source/shotwell/src/main.vala"
if ((*length) == (*size)) {
-#line 294 "/home/jens/Source/shotwell/src/main.vala"
+#line 304 "/home/jens/Source/shotwell/src/main.vala"
*size = (*size) ? (2 * (*size)) : 4;
-#line 294 "/home/jens/Source/shotwell/src/main.vala"
+#line 304 "/home/jens/Source/shotwell/src/main.vala"
*array = g_renew (GOptionEntry, *array, *size);
-#line 1961 "main.c"
+#line 2001 "main.c"
}
-#line 294 "/home/jens/Source/shotwell/src/main.vala"
+#line 304 "/home/jens/Source/shotwell/src/main.vala"
(*array)[(*length)++] = *value;
-#line 1965 "main.c"
+#line 2005 "main.c"
}
-static void _vala_array_add71 (GOptionEntry* * array, int* length, int* size, const GOptionEntry* value) {
-#line 298 "/home/jens/Source/shotwell/src/main.vala"
+static void _vala_array_add74 (GOptionEntry* * array, int* length, int* size, const GOptionEntry* value) {
+#line 308 "/home/jens/Source/shotwell/src/main.vala"
if ((*length) == (*size)) {
-#line 298 "/home/jens/Source/shotwell/src/main.vala"
+#line 308 "/home/jens/Source/shotwell/src/main.vala"
*size = (*size) ? (2 * (*size)) : 4;
-#line 298 "/home/jens/Source/shotwell/src/main.vala"
+#line 308 "/home/jens/Source/shotwell/src/main.vala"
*array = g_renew (GOptionEntry, *array, *size);
-#line 1976 "main.c"
+#line 2016 "main.c"
}
-#line 298 "/home/jens/Source/shotwell/src/main.vala"
+#line 308 "/home/jens/Source/shotwell/src/main.vala"
(*array)[(*length)++] = *value;
-#line 1980 "main.c"
+#line 2020 "main.c"
}
-static void _vala_array_add72 (GOptionEntry* * array, int* length, int* size, const GOptionEntry* value) {
-#line 302 "/home/jens/Source/shotwell/src/main.vala"
+static void _vala_array_add75 (GOptionEntry* * array, int* length, int* size, const GOptionEntry* value) {
+#line 312 "/home/jens/Source/shotwell/src/main.vala"
if ((*length) == (*size)) {
-#line 302 "/home/jens/Source/shotwell/src/main.vala"
+#line 312 "/home/jens/Source/shotwell/src/main.vala"
*size = (*size) ? (2 * (*size)) : 4;
-#line 302 "/home/jens/Source/shotwell/src/main.vala"
+#line 312 "/home/jens/Source/shotwell/src/main.vala"
*array = g_renew (GOptionEntry, *array, *size);
-#line 1991 "main.c"
+#line 2031 "main.c"
}
-#line 302 "/home/jens/Source/shotwell/src/main.vala"
+#line 312 "/home/jens/Source/shotwell/src/main.vala"
(*array)[(*length)++] = *value;
-#line 1995 "main.c"
+#line 2035 "main.c"
}
-static void _vala_array_add73 (GOptionEntry* * array, int* length, int* size, const GOptionEntry* value) {
-#line 306 "/home/jens/Source/shotwell/src/main.vala"
+static void _vala_array_add76 (GOptionEntry* * array, int* length, int* size, const GOptionEntry* value) {
+#line 316 "/home/jens/Source/shotwell/src/main.vala"
if ((*length) == (*size)) {
-#line 306 "/home/jens/Source/shotwell/src/main.vala"
+#line 316 "/home/jens/Source/shotwell/src/main.vala"
*size = (*size) ? (2 * (*size)) : 4;
-#line 306 "/home/jens/Source/shotwell/src/main.vala"
+#line 316 "/home/jens/Source/shotwell/src/main.vala"
*array = g_renew (GOptionEntry, *array, *size);
-#line 2006 "main.c"
+#line 2046 "main.c"
}
-#line 306 "/home/jens/Source/shotwell/src/main.vala"
+#line 316 "/home/jens/Source/shotwell/src/main.vala"
(*array)[(*length)++] = *value;
-#line 2010 "main.c"
+#line 2050 "main.c"
}
-static void _vala_array_add74 (GOptionEntry* * array, int* length, int* size, const GOptionEntry* value) {
-#line 309 "/home/jens/Source/shotwell/src/main.vala"
+static void _vala_array_add77 (GOptionEntry* * array, int* length, int* size, const GOptionEntry* value) {
+#line 320 "/home/jens/Source/shotwell/src/main.vala"
+ if ((*length) == (*size)) {
+#line 320 "/home/jens/Source/shotwell/src/main.vala"
+ *size = (*size) ? (2 * (*size)) : 4;
+#line 320 "/home/jens/Source/shotwell/src/main.vala"
+ *array = g_renew (GOptionEntry, *array, *size);
+#line 2061 "main.c"
+ }
+#line 320 "/home/jens/Source/shotwell/src/main.vala"
+ (*array)[(*length)++] = *value;
+#line 2065 "main.c"
+}
+
+
+static void _vala_array_add78 (GOptionEntry* * array, int* length, int* size, const GOptionEntry* value) {
+#line 323 "/home/jens/Source/shotwell/src/main.vala"
if ((*length) == (*size)) {
-#line 309 "/home/jens/Source/shotwell/src/main.vala"
+#line 323 "/home/jens/Source/shotwell/src/main.vala"
*size = (*size) ? (2 * (*size)) : 4;
-#line 309 "/home/jens/Source/shotwell/src/main.vala"
+#line 323 "/home/jens/Source/shotwell/src/main.vala"
*array = g_renew (GOptionEntry, *array, *size);
-#line 2021 "main.c"
+#line 2076 "main.c"
}
-#line 309 "/home/jens/Source/shotwell/src/main.vala"
+#line 323 "/home/jens/Source/shotwell/src/main.vala"
(*array)[(*length)++] = *value;
-#line 2025 "main.c"
+#line 2080 "main.c"
}
-static GOptionEntry* _vala_array_dup27 (GOptionEntry* self, int length) {
-#line 311 "/home/jens/Source/shotwell/src/main.vala"
+static GOptionEntry* _vala_array_dup23 (GOptionEntry* self, int length) {
+#line 325 "/home/jens/Source/shotwell/src/main.vala"
return g_memdup (self, length * sizeof (GOptionEntry));
-#line 2032 "main.c"
+#line 2087 "main.c"
}
@@ -2064,214 +2119,243 @@ GOptionEntry* commandline_options_get_options (int* result_length1) {
GOptionEntry* _tmp14_;
gint _tmp14__length1;
GOptionEntry _tmp15_;
- GOptionEntry terminator = {0};
+ GOptionEntry fullscreen = {0};
GOptionEntry _tmp16_ = {0};
GOptionEntry* _tmp17_;
gint _tmp17__length1;
GOptionEntry _tmp18_;
- GOptionEntry* _tmp19_;
- gint _tmp19__length1;
+ GOptionEntry terminator = {0};
+ GOptionEntry _tmp19_ = {0};
GOptionEntry* _tmp20_;
gint _tmp20__length1;
- GOptionEntry* _tmp21_;
- gint _tmp21__length1;
-#line 289 "/home/jens/Source/shotwell/src/main.vala"
+ GOptionEntry _tmp21_;
+ GOptionEntry* _tmp22_;
+ gint _tmp22__length1;
+ GOptionEntry* _tmp23_;
+ gint _tmp23__length1;
+ GOptionEntry* _tmp24_;
+ gint _tmp24__length1;
+#line 299 "/home/jens/Source/shotwell/src/main.vala"
_tmp0_ = commandline_options_entries;
-#line 289 "/home/jens/Source/shotwell/src/main.vala"
+#line 299 "/home/jens/Source/shotwell/src/main.vala"
_tmp0__length1 = commandline_options_entries_length1;
-#line 289 "/home/jens/Source/shotwell/src/main.vala"
+#line 299 "/home/jens/Source/shotwell/src/main.vala"
if (_tmp0_ != NULL) {
-#line 2077 "main.c"
+#line 2137 "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"
+#line 300 "/home/jens/Source/shotwell/src/main.vala"
_tmp1_ = commandline_options_entries;
-#line 290 "/home/jens/Source/shotwell/src/main.vala"
+#line 300 "/home/jens/Source/shotwell/src/main.vala"
_tmp1__length1 = commandline_options_entries_length1;
-#line 290 "/home/jens/Source/shotwell/src/main.vala"
- _tmp2_ = (_tmp1_ != NULL) ? _vala_array_dup26 (_tmp1_, _tmp1__length1) : ((gpointer) _tmp1_);
-#line 290 "/home/jens/Source/shotwell/src/main.vala"
+#line 300 "/home/jens/Source/shotwell/src/main.vala"
+ _tmp2_ = (_tmp1_ != NULL) ? _vala_array_dup22 (_tmp1_, _tmp1__length1) : ((gpointer) _tmp1_);
+#line 300 "/home/jens/Source/shotwell/src/main.vala"
_tmp2__length1 = _tmp1__length1;
-#line 290 "/home/jens/Source/shotwell/src/main.vala"
+#line 300 "/home/jens/Source/shotwell/src/main.vala"
_tmp3_ = _tmp2_;
-#line 290 "/home/jens/Source/shotwell/src/main.vala"
+#line 300 "/home/jens/Source/shotwell/src/main.vala"
_tmp3__length1 = _tmp2__length1;
-#line 290 "/home/jens/Source/shotwell/src/main.vala"
+#line 300 "/home/jens/Source/shotwell/src/main.vala"
if (result_length1) {
-#line 290 "/home/jens/Source/shotwell/src/main.vala"
+#line 300 "/home/jens/Source/shotwell/src/main.vala"
*result_length1 = _tmp3__length1;
-#line 2100 "main.c"
+#line 2160 "main.c"
}
-#line 290 "/home/jens/Source/shotwell/src/main.vala"
+#line 300 "/home/jens/Source/shotwell/src/main.vala"
result = _tmp3_;
-#line 290 "/home/jens/Source/shotwell/src/main.vala"
+#line 300 "/home/jens/Source/shotwell/src/main.vala"
return result;
-#line 2106 "main.c"
+#line 2166 "main.c"
}
-#line 292 "/home/jens/Source/shotwell/src/main.vala"
+#line 302 "/home/jens/Source/shotwell/src/main.vala"
_tmp4_.long_name = "datadir";
-#line 292 "/home/jens/Source/shotwell/src/main.vala"
+#line 302 "/home/jens/Source/shotwell/src/main.vala"
_tmp4_.short_name = 'd';
-#line 292 "/home/jens/Source/shotwell/src/main.vala"
+#line 302 "/home/jens/Source/shotwell/src/main.vala"
_tmp4_.flags = 0;
-#line 292 "/home/jens/Source/shotwell/src/main.vala"
+#line 302 "/home/jens/Source/shotwell/src/main.vala"
_tmp4_.arg = G_OPTION_ARG_FILENAME;
-#line 292 "/home/jens/Source/shotwell/src/main.vala"
+#line 302 "/home/jens/Source/shotwell/src/main.vala"
_tmp4_.arg_data = &commandline_options_data_dir;
-#line 292 "/home/jens/Source/shotwell/src/main.vala"
+#line 302 "/home/jens/Source/shotwell/src/main.vala"
_tmp4_.description = _ ("Path to Shotwell’s private data");
-#line 292 "/home/jens/Source/shotwell/src/main.vala"
+#line 302 "/home/jens/Source/shotwell/src/main.vala"
_tmp4_.arg_description = _ ("DIRECTORY");
-#line 292 "/home/jens/Source/shotwell/src/main.vala"
+#line 302 "/home/jens/Source/shotwell/src/main.vala"
datadir = _tmp4_;
-#line 294 "/home/jens/Source/shotwell/src/main.vala"
+#line 304 "/home/jens/Source/shotwell/src/main.vala"
_tmp5_ = commandline_options_entries;
-#line 294 "/home/jens/Source/shotwell/src/main.vala"
+#line 304 "/home/jens/Source/shotwell/src/main.vala"
_tmp5__length1 = commandline_options_entries_length1;
-#line 294 "/home/jens/Source/shotwell/src/main.vala"
+#line 304 "/home/jens/Source/shotwell/src/main.vala"
_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_, &_tmp6_);
-#line 296 "/home/jens/Source/shotwell/src/main.vala"
+#line 304 "/home/jens/Source/shotwell/src/main.vala"
+ _vala_array_add73 (&commandline_options_entries, &commandline_options_entries_length1, &_commandline_options_entries_size_, &_tmp6_);
+#line 306 "/home/jens/Source/shotwell/src/main.vala"
_tmp7_.long_name = "no-runtime-monitoring";
-#line 296 "/home/jens/Source/shotwell/src/main.vala"
+#line 306 "/home/jens/Source/shotwell/src/main.vala"
_tmp7_.short_name = (gchar) 0;
-#line 296 "/home/jens/Source/shotwell/src/main.vala"
+#line 306 "/home/jens/Source/shotwell/src/main.vala"
_tmp7_.flags = 0;
-#line 296 "/home/jens/Source/shotwell/src/main.vala"
+#line 306 "/home/jens/Source/shotwell/src/main.vala"
_tmp7_.arg = G_OPTION_ARG_NONE;
-#line 296 "/home/jens/Source/shotwell/src/main.vala"
+#line 306 "/home/jens/Source/shotwell/src/main.vala"
_tmp7_.arg_data = &commandline_options_no_runtime_monitoring;
-#line 296 "/home/jens/Source/shotwell/src/main.vala"
+#line 306 "/home/jens/Source/shotwell/src/main.vala"
_tmp7_.description = _ ("Do not monitor library directory at runtime for changes");
-#line 296 "/home/jens/Source/shotwell/src/main.vala"
+#line 306 "/home/jens/Source/shotwell/src/main.vala"
_tmp7_.arg_description = NULL;
-#line 296 "/home/jens/Source/shotwell/src/main.vala"
+#line 306 "/home/jens/Source/shotwell/src/main.vala"
no_monitoring = _tmp7_;
-#line 298 "/home/jens/Source/shotwell/src/main.vala"
+#line 308 "/home/jens/Source/shotwell/src/main.vala"
_tmp8_ = commandline_options_entries;
-#line 298 "/home/jens/Source/shotwell/src/main.vala"
+#line 308 "/home/jens/Source/shotwell/src/main.vala"
_tmp8__length1 = commandline_options_entries_length1;
-#line 298 "/home/jens/Source/shotwell/src/main.vala"
+#line 308 "/home/jens/Source/shotwell/src/main.vala"
_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_, &_tmp9_);
-#line 300 "/home/jens/Source/shotwell/src/main.vala"
+#line 308 "/home/jens/Source/shotwell/src/main.vala"
+ _vala_array_add74 (&commandline_options_entries, &commandline_options_entries_length1, &_commandline_options_entries_size_, &_tmp9_);
+#line 310 "/home/jens/Source/shotwell/src/main.vala"
_tmp10_.long_name = "no-startup-progress";
-#line 300 "/home/jens/Source/shotwell/src/main.vala"
+#line 310 "/home/jens/Source/shotwell/src/main.vala"
_tmp10_.short_name = (gchar) 0;
-#line 300 "/home/jens/Source/shotwell/src/main.vala"
+#line 310 "/home/jens/Source/shotwell/src/main.vala"
_tmp10_.flags = 0;
-#line 300 "/home/jens/Source/shotwell/src/main.vala"
+#line 310 "/home/jens/Source/shotwell/src/main.vala"
_tmp10_.arg = G_OPTION_ARG_NONE;
-#line 300 "/home/jens/Source/shotwell/src/main.vala"
+#line 310 "/home/jens/Source/shotwell/src/main.vala"
_tmp10_.arg_data = &commandline_options_no_startup_progress;
-#line 300 "/home/jens/Source/shotwell/src/main.vala"
+#line 310 "/home/jens/Source/shotwell/src/main.vala"
_tmp10_.description = _ ("Don’t display startup progress meter");
-#line 300 "/home/jens/Source/shotwell/src/main.vala"
+#line 310 "/home/jens/Source/shotwell/src/main.vala"
_tmp10_.arg_description = NULL;
-#line 300 "/home/jens/Source/shotwell/src/main.vala"
+#line 310 "/home/jens/Source/shotwell/src/main.vala"
no_startup = _tmp10_;
-#line 302 "/home/jens/Source/shotwell/src/main.vala"
+#line 312 "/home/jens/Source/shotwell/src/main.vala"
_tmp11_ = commandline_options_entries;
-#line 302 "/home/jens/Source/shotwell/src/main.vala"
+#line 312 "/home/jens/Source/shotwell/src/main.vala"
_tmp11__length1 = commandline_options_entries_length1;
-#line 302 "/home/jens/Source/shotwell/src/main.vala"
+#line 312 "/home/jens/Source/shotwell/src/main.vala"
_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_, &_tmp12_);
-#line 304 "/home/jens/Source/shotwell/src/main.vala"
+#line 312 "/home/jens/Source/shotwell/src/main.vala"
+ _vala_array_add75 (&commandline_options_entries, &commandline_options_entries_length1, &_commandline_options_entries_size_, &_tmp12_);
+#line 314 "/home/jens/Source/shotwell/src/main.vala"
_tmp13_.long_name = "version";
-#line 304 "/home/jens/Source/shotwell/src/main.vala"
+#line 314 "/home/jens/Source/shotwell/src/main.vala"
_tmp13_.short_name = 'V';
-#line 304 "/home/jens/Source/shotwell/src/main.vala"
+#line 314 "/home/jens/Source/shotwell/src/main.vala"
_tmp13_.flags = 0;
-#line 304 "/home/jens/Source/shotwell/src/main.vala"
+#line 314 "/home/jens/Source/shotwell/src/main.vala"
_tmp13_.arg = G_OPTION_ARG_NONE;
-#line 304 "/home/jens/Source/shotwell/src/main.vala"
+#line 314 "/home/jens/Source/shotwell/src/main.vala"
_tmp13_.arg_data = &commandline_options_show_version;
-#line 304 "/home/jens/Source/shotwell/src/main.vala"
+#line 314 "/home/jens/Source/shotwell/src/main.vala"
_tmp13_.description = _ ("Show the application’s version");
-#line 304 "/home/jens/Source/shotwell/src/main.vala"
+#line 314 "/home/jens/Source/shotwell/src/main.vala"
_tmp13_.arg_description = NULL;
-#line 304 "/home/jens/Source/shotwell/src/main.vala"
+#line 314 "/home/jens/Source/shotwell/src/main.vala"
version = _tmp13_;
-#line 306 "/home/jens/Source/shotwell/src/main.vala"
+#line 316 "/home/jens/Source/shotwell/src/main.vala"
_tmp14_ = commandline_options_entries;
-#line 306 "/home/jens/Source/shotwell/src/main.vala"
+#line 316 "/home/jens/Source/shotwell/src/main.vala"
_tmp14__length1 = commandline_options_entries_length1;
-#line 306 "/home/jens/Source/shotwell/src/main.vala"
+#line 316 "/home/jens/Source/shotwell/src/main.vala"
_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_, &_tmp15_);
-#line 308 "/home/jens/Source/shotwell/src/main.vala"
- _tmp16_.long_name = NULL;
-#line 308 "/home/jens/Source/shotwell/src/main.vala"
- _tmp16_.short_name = (gchar) 0;
-#line 308 "/home/jens/Source/shotwell/src/main.vala"
+#line 316 "/home/jens/Source/shotwell/src/main.vala"
+ _vala_array_add76 (&commandline_options_entries, &commandline_options_entries_length1, &_commandline_options_entries_size_, &_tmp15_);
+#line 318 "/home/jens/Source/shotwell/src/main.vala"
+ _tmp16_.long_name = "fullscreen";
+#line 318 "/home/jens/Source/shotwell/src/main.vala"
+ _tmp16_.short_name = 'f';
+#line 318 "/home/jens/Source/shotwell/src/main.vala"
_tmp16_.flags = 0;
-#line 308 "/home/jens/Source/shotwell/src/main.vala"
- _tmp16_.arg = 0;
-#line 308 "/home/jens/Source/shotwell/src/main.vala"
- _tmp16_.arg_data = NULL;
-#line 308 "/home/jens/Source/shotwell/src/main.vala"
- _tmp16_.description = NULL;
-#line 308 "/home/jens/Source/shotwell/src/main.vala"
+#line 318 "/home/jens/Source/shotwell/src/main.vala"
+ _tmp16_.arg = G_OPTION_ARG_NONE;
+#line 318 "/home/jens/Source/shotwell/src/main.vala"
+ _tmp16_.arg_data = &commandline_options_fullscreen;
+#line 318 "/home/jens/Source/shotwell/src/main.vala"
+ _tmp16_.description = _ ("Start the application in fullscreen mode");
+#line 318 "/home/jens/Source/shotwell/src/main.vala"
_tmp16_.arg_description = NULL;
-#line 308 "/home/jens/Source/shotwell/src/main.vala"
- terminator = _tmp16_;
-#line 309 "/home/jens/Source/shotwell/src/main.vala"
+#line 318 "/home/jens/Source/shotwell/src/main.vala"
+ fullscreen = _tmp16_;
+#line 320 "/home/jens/Source/shotwell/src/main.vala"
_tmp17_ = commandline_options_entries;
-#line 309 "/home/jens/Source/shotwell/src/main.vala"
+#line 320 "/home/jens/Source/shotwell/src/main.vala"
_tmp17__length1 = commandline_options_entries_length1;
-#line 309 "/home/jens/Source/shotwell/src/main.vala"
- _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_, &_tmp18_);
-#line 311 "/home/jens/Source/shotwell/src/main.vala"
- _tmp19_ = commandline_options_entries;
-#line 311 "/home/jens/Source/shotwell/src/main.vala"
- _tmp19__length1 = commandline_options_entries_length1;
-#line 311 "/home/jens/Source/shotwell/src/main.vala"
- _tmp20_ = (_tmp19_ != NULL) ? _vala_array_dup27 (_tmp19_, _tmp19__length1) : ((gpointer) _tmp19_);
-#line 311 "/home/jens/Source/shotwell/src/main.vala"
- _tmp20__length1 = _tmp19__length1;
-#line 311 "/home/jens/Source/shotwell/src/main.vala"
- _tmp21_ = _tmp20_;
-#line 311 "/home/jens/Source/shotwell/src/main.vala"
- _tmp21__length1 = _tmp20__length1;
-#line 311 "/home/jens/Source/shotwell/src/main.vala"
+#line 320 "/home/jens/Source/shotwell/src/main.vala"
+ _tmp18_ = fullscreen;
+#line 320 "/home/jens/Source/shotwell/src/main.vala"
+ _vala_array_add77 (&commandline_options_entries, &commandline_options_entries_length1, &_commandline_options_entries_size_, &_tmp18_);
+#line 322 "/home/jens/Source/shotwell/src/main.vala"
+ _tmp19_.long_name = NULL;
+#line 322 "/home/jens/Source/shotwell/src/main.vala"
+ _tmp19_.short_name = (gchar) 0;
+#line 322 "/home/jens/Source/shotwell/src/main.vala"
+ _tmp19_.flags = 0;
+#line 322 "/home/jens/Source/shotwell/src/main.vala"
+ _tmp19_.arg = 0;
+#line 322 "/home/jens/Source/shotwell/src/main.vala"
+ _tmp19_.arg_data = NULL;
+#line 322 "/home/jens/Source/shotwell/src/main.vala"
+ _tmp19_.description = NULL;
+#line 322 "/home/jens/Source/shotwell/src/main.vala"
+ _tmp19_.arg_description = NULL;
+#line 322 "/home/jens/Source/shotwell/src/main.vala"
+ terminator = _tmp19_;
+#line 323 "/home/jens/Source/shotwell/src/main.vala"
+ _tmp20_ = commandline_options_entries;
+#line 323 "/home/jens/Source/shotwell/src/main.vala"
+ _tmp20__length1 = commandline_options_entries_length1;
+#line 323 "/home/jens/Source/shotwell/src/main.vala"
+ _tmp21_ = terminator;
+#line 323 "/home/jens/Source/shotwell/src/main.vala"
+ _vala_array_add78 (&commandline_options_entries, &commandline_options_entries_length1, &_commandline_options_entries_size_, &_tmp21_);
+#line 325 "/home/jens/Source/shotwell/src/main.vala"
+ _tmp22_ = commandline_options_entries;
+#line 325 "/home/jens/Source/shotwell/src/main.vala"
+ _tmp22__length1 = commandline_options_entries_length1;
+#line 325 "/home/jens/Source/shotwell/src/main.vala"
+ _tmp23_ = (_tmp22_ != NULL) ? _vala_array_dup23 (_tmp22_, _tmp22__length1) : ((gpointer) _tmp22_);
+#line 325 "/home/jens/Source/shotwell/src/main.vala"
+ _tmp23__length1 = _tmp22__length1;
+#line 325 "/home/jens/Source/shotwell/src/main.vala"
+ _tmp24_ = _tmp23_;
+#line 325 "/home/jens/Source/shotwell/src/main.vala"
+ _tmp24__length1 = _tmp23__length1;
+#line 325 "/home/jens/Source/shotwell/src/main.vala"
if (result_length1) {
-#line 311 "/home/jens/Source/shotwell/src/main.vala"
- *result_length1 = _tmp21__length1;
-#line 2244 "main.c"
+#line 325 "/home/jens/Source/shotwell/src/main.vala"
+ *result_length1 = _tmp24__length1;
+#line 2328 "main.c"
}
-#line 311 "/home/jens/Source/shotwell/src/main.vala"
- result = _tmp21_;
-#line 311 "/home/jens/Source/shotwell/src/main.vala"
+#line 325 "/home/jens/Source/shotwell/src/main.vala"
+ result = _tmp24_;
+#line 325 "/home/jens/Source/shotwell/src/main.vala"
return result;
-#line 2250 "main.c"
+#line 2334 "main.c"
}
-static void _vala_array_add75 (gchar** * array, int* length, int* size, gchar* value) {
-#line 376 "/home/jens/Source/shotwell/src/main.vala"
+static void _vala_array_add79 (gchar** * array, int* length, int* size, gchar* value) {
+#line 390 "/home/jens/Source/shotwell/src/main.vala"
if ((*length) == (*size)) {
-#line 376 "/home/jens/Source/shotwell/src/main.vala"
+#line 390 "/home/jens/Source/shotwell/src/main.vala"
*size = (*size) ? (2 * (*size)) : 4;
-#line 376 "/home/jens/Source/shotwell/src/main.vala"
+#line 390 "/home/jens/Source/shotwell/src/main.vala"
*array = g_renew (gchar*, *array, (*size) + 1);
-#line 2261 "main.c"
+#line 2345 "main.c"
}
-#line 376 "/home/jens/Source/shotwell/src/main.vala"
+#line 390 "/home/jens/Source/shotwell/src/main.vala"
(*array)[(*length)++] = value;
-#line 376 "/home/jens/Source/shotwell/src/main.vala"
+#line 390 "/home/jens/Source/shotwell/src/main.vala"
(*array)[*length] = NULL;
-#line 2267 "main.c"
+#line 2351 "main.c"
}
@@ -2291,7 +2375,7 @@ static gboolean string_contains (const gchar* self, const gchar* needle) {
result = _tmp1_ != NULL;
#line 1404 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
return result;
-#line 2287 "main.c"
+#line 2371 "main.c"
}
@@ -2323,86 +2407,86 @@ void _vala_main (gchar** args, int args_length1) {
GTimer* _tmp60_;
const gchar* _tmp61_;
gboolean _tmp62_;
- gboolean _tmp65_ = FALSE;
- const gchar* _tmp66_;
- gboolean _tmp67_;
+ gboolean _tmp66_ = FALSE;
+ const gchar* _tmp67_;
+ gboolean _tmp68_;
GError * _inner_error_ = NULL;
-#line 319 "/home/jens/Source/shotwell/src/main.vala"
+#line 333 "/home/jens/Source/shotwell/src/main.vala"
_tmp0_ = args;
-#line 319 "/home/jens/Source/shotwell/src/main.vala"
+#line 333 "/home/jens/Source/shotwell/src/main.vala"
_tmp0__length1 = args_length1;
-#line 319 "/home/jens/Source/shotwell/src/main.vala"
+#line 333 "/home/jens/Source/shotwell/src/main.vala"
_tmp1_ = _tmp0_[0];
-#line 319 "/home/jens/Source/shotwell/src/main.vala"
+#line 333 "/home/jens/Source/shotwell/src/main.vala"
app_dirs_init (_tmp1_);
-#line 324 "/home/jens/Source/shotwell/src/main.vala"
+#line 338 "/home/jens/Source/shotwell/src/main.vala"
gexiv2_initialize ();
-#line 325 "/home/jens/Source/shotwell/src/main.vala"
+#line 339 "/home/jens/Source/shotwell/src/main.vala"
gexiv2_log_use_glib_logging ();
-#line 329 "/home/jens/Source/shotwell/src/main.vala"
+#line 343 "/home/jens/Source/shotwell/src/main.vala"
gexiv2_log_set_level (GEXIV2_LOG_LEVEL_DEBUG);
-#line 335 "/home/jens/Source/shotwell/src/main.vala"
+#line 349 "/home/jens/Source/shotwell/src/main.vala"
_tmp2_ = app_dirs_get_install_dir ();
-#line 335 "/home/jens/Source/shotwell/src/main.vala"
+#line 349 "/home/jens/Source/shotwell/src/main.vala"
_tmp3_ = _tmp2_;
-#line 335 "/home/jens/Source/shotwell/src/main.vala"
+#line 349 "/home/jens/Source/shotwell/src/main.vala"
_tmp4_ = _tmp3_ == NULL;
-#line 335 "/home/jens/Source/shotwell/src/main.vala"
+#line 349 "/home/jens/Source/shotwell/src/main.vala"
_g_object_unref0 (_tmp3_);
-#line 335 "/home/jens/Source/shotwell/src/main.vala"
+#line 349 "/home/jens/Source/shotwell/src/main.vala"
if (_tmp4_) {
-#line 2347 "main.c"
+#line 2431 "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"
+#line 350 "/home/jens/Source/shotwell/src/main.vala"
+ _tmp5_ = app_dirs_get_lib_dir ();
+#line 350 "/home/jens/Source/shotwell/src/main.vala"
_tmp6_ = _tmp5_;
-#line 336 "/home/jens/Source/shotwell/src/main.vala"
+#line 350 "/home/jens/Source/shotwell/src/main.vala"
_tmp7_ = g_file_get_path (_tmp6_);
-#line 336 "/home/jens/Source/shotwell/src/main.vala"
+#line 350 "/home/jens/Source/shotwell/src/main.vala"
_tmp8_ = _tmp7_;
-#line 336 "/home/jens/Source/shotwell/src/main.vala"
+#line 350 "/home/jens/Source/shotwell/src/main.vala"
_tmp9_ = g_strconcat (_tmp8_, "/misc", NULL);
-#line 336 "/home/jens/Source/shotwell/src/main.vala"
+#line 350 "/home/jens/Source/shotwell/src/main.vala"
_tmp10_ = _tmp9_;
-#line 336 "/home/jens/Source/shotwell/src/main.vala"
+#line 350 "/home/jens/Source/shotwell/src/main.vala"
g_setenv ("GSETTINGS_SCHEMA_DIR", _tmp10_, TRUE);
-#line 336 "/home/jens/Source/shotwell/src/main.vala"
+#line 350 "/home/jens/Source/shotwell/src/main.vala"
_g_free0 (_tmp10_);
-#line 336 "/home/jens/Source/shotwell/src/main.vala"
+#line 350 "/home/jens/Source/shotwell/src/main.vala"
_g_free0 (_tmp8_);
-#line 336 "/home/jens/Source/shotwell/src/main.vala"
+#line 350 "/home/jens/Source/shotwell/src/main.vala"
_g_object_unref0 (_tmp6_);
-#line 2374 "main.c"
+#line 2458 "main.c"
}
{
gint _tmp11_;
GOptionEntry* _tmp12_;
GOptionEntry* _tmp13_;
gint _tmp13__length1;
-#line 342 "/home/jens/Source/shotwell/src/main.vala"
+#line 356 "/home/jens/Source/shotwell/src/main.vala"
_tmp12_ = commandline_options_get_options (&_tmp11_);
-#line 342 "/home/jens/Source/shotwell/src/main.vala"
+#line 356 "/home/jens/Source/shotwell/src/main.vala"
_tmp13_ = _tmp12_;
-#line 342 "/home/jens/Source/shotwell/src/main.vala"
+#line 356 "/home/jens/Source/shotwell/src/main.vala"
_tmp13__length1 = _tmp11_;
-#line 342 "/home/jens/Source/shotwell/src/main.vala"
+#line 356 "/home/jens/Source/shotwell/src/main.vala"
gtk_init_with_args (&args_length1, &args, _ ("[FILE]"), _tmp13_, RESOURCES_APP_GETTEXT_PACKAGE, &_inner_error_);
-#line 342 "/home/jens/Source/shotwell/src/main.vala"
+#line 356 "/home/jens/Source/shotwell/src/main.vala"
_tmp13_ = (g_free (_tmp13_), NULL);
-#line 342 "/home/jens/Source/shotwell/src/main.vala"
+#line 356 "/home/jens/Source/shotwell/src/main.vala"
if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 2393 "main.c"
- goto __catch225_g_error;
+#line 2477 "main.c"
+ goto __catch236_g_error;
}
}
- goto __finally225;
- __catch225_g_error:
+ goto __finally236;
+ __catch236_g_error:
{
GError* e = NULL;
GError* _tmp14_;
@@ -2412,92 +2496,92 @@ void _vala_main (gchar** args, int args_length1) {
gchar** _tmp18_;
gint _tmp18__length1;
const gchar* _tmp19_;
-#line 341 "/home/jens/Source/shotwell/src/main.vala"
+#line 355 "/home/jens/Source/shotwell/src/main.vala"
e = _inner_error_;
-#line 341 "/home/jens/Source/shotwell/src/main.vala"
+#line 355 "/home/jens/Source/shotwell/src/main.vala"
_inner_error_ = NULL;
-#line 345 "/home/jens/Source/shotwell/src/main.vala"
+#line 359 "/home/jens/Source/shotwell/src/main.vala"
_tmp14_ = e;
-#line 345 "/home/jens/Source/shotwell/src/main.vala"
+#line 359 "/home/jens/Source/shotwell/src/main.vala"
_tmp15_ = _tmp14_->message;
-#line 345 "/home/jens/Source/shotwell/src/main.vala"
+#line 359 "/home/jens/Source/shotwell/src/main.vala"
_tmp16_ = g_strconcat (_tmp15_, "\n", NULL);
-#line 345 "/home/jens/Source/shotwell/src/main.vala"
+#line 359 "/home/jens/Source/shotwell/src/main.vala"
_tmp17_ = _tmp16_;
-#line 345 "/home/jens/Source/shotwell/src/main.vala"
+#line 359 "/home/jens/Source/shotwell/src/main.vala"
g_print ("%s", _tmp17_);
-#line 345 "/home/jens/Source/shotwell/src/main.vala"
+#line 359 "/home/jens/Source/shotwell/src/main.vala"
_g_free0 (_tmp17_);
-#line 346 "/home/jens/Source/shotwell/src/main.vala"
+#line 360 "/home/jens/Source/shotwell/src/main.vala"
_tmp18_ = args;
-#line 346 "/home/jens/Source/shotwell/src/main.vala"
+#line 360 "/home/jens/Source/shotwell/src/main.vala"
_tmp18__length1 = args_length1;
-#line 346 "/home/jens/Source/shotwell/src/main.vala"
+#line 360 "/home/jens/Source/shotwell/src/main.vala"
_tmp19_ = _tmp18_[0];
-#line 346 "/home/jens/Source/shotwell/src/main.vala"
+#line 360 "/home/jens/Source/shotwell/src/main.vala"
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"
+#line 361 "/home/jens/Source/shotwell/src/main.vala"
app_dirs_terminate ();
-#line 348 "/home/jens/Source/shotwell/src/main.vala"
+#line 362 "/home/jens/Source/shotwell/src/main.vala"
_g_error_free0 (e);
-#line 348 "/home/jens/Source/shotwell/src/main.vala"
+#line 362 "/home/jens/Source/shotwell/src/main.vala"
return;
-#line 2438 "main.c"
+#line 2522 "main.c"
}
- __finally225:
-#line 341 "/home/jens/Source/shotwell/src/main.vala"
+ __finally236:
+#line 355 "/home/jens/Source/shotwell/src/main.vala"
if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 341 "/home/jens/Source/shotwell/src/main.vala"
+#line 355 "/home/jens/Source/shotwell/src/main.vala"
g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 341 "/home/jens/Source/shotwell/src/main.vala"
+#line 355 "/home/jens/Source/shotwell/src/main.vala"
g_clear_error (&_inner_error_);
-#line 341 "/home/jens/Source/shotwell/src/main.vala"
+#line 355 "/home/jens/Source/shotwell/src/main.vala"
return;
-#line 2449 "main.c"
+#line 2533 "main.c"
}
-#line 351 "/home/jens/Source/shotwell/src/main.vala"
+#line 365 "/home/jens/Source/shotwell/src/main.vala"
_tmp20_ = commandline_options_show_version;
-#line 351 "/home/jens/Source/shotwell/src/main.vala"
+#line 365 "/home/jens/Source/shotwell/src/main.vala"
if (_tmp20_) {
-#line 352 "/home/jens/Source/shotwell/src/main.vala"
+#line 366 "/home/jens/Source/shotwell/src/main.vala"
if (RESOURCES_GIT_VERSION != NULL) {
-#line 353 "/home/jens/Source/shotwell/src/main.vala"
+#line 367 "/home/jens/Source/shotwell/src/main.vala"
g_print ("%s %s (%s)\n", RESOURCES_APP_TITLE, RESOURCES_APP_VERSION, RESOURCES_GIT_VERSION);
-#line 2459 "main.c"
+#line 2543 "main.c"
} else {
-#line 355 "/home/jens/Source/shotwell/src/main.vala"
+#line 369 "/home/jens/Source/shotwell/src/main.vala"
g_print ("%s %s\n", RESOURCES_APP_TITLE, RESOURCES_APP_VERSION);
-#line 2463 "main.c"
+#line 2547 "main.c"
}
-#line 357 "/home/jens/Source/shotwell/src/main.vala"
+#line 371 "/home/jens/Source/shotwell/src/main.vala"
app_dirs_terminate ();
-#line 359 "/home/jens/Source/shotwell/src/main.vala"
+#line 373 "/home/jens/Source/shotwell/src/main.vala"
return;
-#line 2469 "main.c"
+#line 2553 "main.c"
}
-#line 369 "/home/jens/Source/shotwell/src/main.vala"
+#line 383 "/home/jens/Source/shotwell/src/main.vala"
_tmp21_ = g_new0 (gchar*, 0 + 1);
-#line 369 "/home/jens/Source/shotwell/src/main.vala"
+#line 383 "/home/jens/Source/shotwell/src/main.vala"
mounts = _tmp21_;
-#line 369 "/home/jens/Source/shotwell/src/main.vala"
+#line 383 "/home/jens/Source/shotwell/src/main.vala"
mounts_length1 = 0;
-#line 369 "/home/jens/Source/shotwell/src/main.vala"
+#line 383 "/home/jens/Source/shotwell/src/main.vala"
_mounts_size_ = mounts_length1;
-#line 370 "/home/jens/Source/shotwell/src/main.vala"
+#line 384 "/home/jens/Source/shotwell/src/main.vala"
filename = NULL;
-#line 2481 "main.c"
+#line 2565 "main.c"
{
gint ctr = 0;
-#line 372 "/home/jens/Source/shotwell/src/main.vala"
+#line 386 "/home/jens/Source/shotwell/src/main.vala"
ctr = 1;
-#line 2486 "main.c"
+#line 2570 "main.c"
{
gboolean _tmp22_ = FALSE;
-#line 372 "/home/jens/Source/shotwell/src/main.vala"
+#line 386 "/home/jens/Source/shotwell/src/main.vala"
_tmp22_ = TRUE;
-#line 372 "/home/jens/Source/shotwell/src/main.vala"
+#line 386 "/home/jens/Source/shotwell/src/main.vala"
while (TRUE) {
-#line 2493 "main.c"
+#line 2577 "main.c"
gint _tmp24_;
gchar** _tmp25_;
gint _tmp25__length1;
@@ -2509,410 +2593,413 @@ void _vala_main (gchar** args, int args_length1) {
gchar* _tmp29_;
const gchar* _tmp30_;
gboolean _tmp31_;
-#line 372 "/home/jens/Source/shotwell/src/main.vala"
+#line 386 "/home/jens/Source/shotwell/src/main.vala"
if (!_tmp22_) {
-#line 2507 "main.c"
+#line 2591 "main.c"
gint _tmp23_;
-#line 372 "/home/jens/Source/shotwell/src/main.vala"
+#line 386 "/home/jens/Source/shotwell/src/main.vala"
_tmp23_ = ctr;
-#line 372 "/home/jens/Source/shotwell/src/main.vala"
+#line 386 "/home/jens/Source/shotwell/src/main.vala"
ctr = _tmp23_ + 1;
-#line 2513 "main.c"
+#line 2597 "main.c"
}
-#line 372 "/home/jens/Source/shotwell/src/main.vala"
+#line 386 "/home/jens/Source/shotwell/src/main.vala"
_tmp22_ = FALSE;
-#line 372 "/home/jens/Source/shotwell/src/main.vala"
+#line 386 "/home/jens/Source/shotwell/src/main.vala"
_tmp24_ = ctr;
-#line 372 "/home/jens/Source/shotwell/src/main.vala"
+#line 386 "/home/jens/Source/shotwell/src/main.vala"
_tmp25_ = args;
-#line 372 "/home/jens/Source/shotwell/src/main.vala"
+#line 386 "/home/jens/Source/shotwell/src/main.vala"
_tmp25__length1 = args_length1;
-#line 372 "/home/jens/Source/shotwell/src/main.vala"
+#line 386 "/home/jens/Source/shotwell/src/main.vala"
if (!(_tmp24_ < _tmp25__length1)) {
-#line 372 "/home/jens/Source/shotwell/src/main.vala"
+#line 386 "/home/jens/Source/shotwell/src/main.vala"
break;
-#line 2527 "main.c"
+#line 2611 "main.c"
}
-#line 373 "/home/jens/Source/shotwell/src/main.vala"
+#line 387 "/home/jens/Source/shotwell/src/main.vala"
_tmp26_ = args;
-#line 373 "/home/jens/Source/shotwell/src/main.vala"
+#line 387 "/home/jens/Source/shotwell/src/main.vala"
_tmp26__length1 = args_length1;
-#line 373 "/home/jens/Source/shotwell/src/main.vala"
+#line 387 "/home/jens/Source/shotwell/src/main.vala"
_tmp27_ = ctr;
-#line 373 "/home/jens/Source/shotwell/src/main.vala"
+#line 387 "/home/jens/Source/shotwell/src/main.vala"
_tmp28_ = _tmp26_[_tmp27_];
-#line 373 "/home/jens/Source/shotwell/src/main.vala"
+#line 387 "/home/jens/Source/shotwell/src/main.vala"
_tmp29_ = g_strdup (_tmp28_);
-#line 373 "/home/jens/Source/shotwell/src/main.vala"
+#line 387 "/home/jens/Source/shotwell/src/main.vala"
arg = _tmp29_;
-#line 375 "/home/jens/Source/shotwell/src/main.vala"
+#line 389 "/home/jens/Source/shotwell/src/main.vala"
_tmp30_ = arg;
-#line 375 "/home/jens/Source/shotwell/src/main.vala"
+#line 389 "/home/jens/Source/shotwell/src/main.vala"
_tmp31_ = library_window_is_mount_uri_supported (_tmp30_);
-#line 375 "/home/jens/Source/shotwell/src/main.vala"
+#line 389 "/home/jens/Source/shotwell/src/main.vala"
if (_tmp31_) {
-#line 2547 "main.c"
+#line 2631 "main.c"
gchar** _tmp32_;
gint _tmp32__length1;
const gchar* _tmp33_;
gchar* _tmp34_;
-#line 376 "/home/jens/Source/shotwell/src/main.vala"
+#line 390 "/home/jens/Source/shotwell/src/main.vala"
_tmp32_ = mounts;
-#line 376 "/home/jens/Source/shotwell/src/main.vala"
+#line 390 "/home/jens/Source/shotwell/src/main.vala"
_tmp32__length1 = mounts_length1;
-#line 376 "/home/jens/Source/shotwell/src/main.vala"
+#line 390 "/home/jens/Source/shotwell/src/main.vala"
_tmp33_ = arg;
-#line 376 "/home/jens/Source/shotwell/src/main.vala"
+#line 390 "/home/jens/Source/shotwell/src/main.vala"
_tmp34_ = g_strdup (_tmp33_);
-#line 376 "/home/jens/Source/shotwell/src/main.vala"
- _vala_array_add75 (&mounts, &mounts_length1, &_mounts_size_, _tmp34_);
-#line 2562 "main.c"
+#line 390 "/home/jens/Source/shotwell/src/main.vala"
+ _vala_array_add79 (&mounts, &mounts_length1, &_mounts_size_, _tmp34_);
+#line 2646 "main.c"
} else {
gboolean _tmp35_ = FALSE;
const gchar* _tmp36_;
gboolean _tmp37_;
-#line 377 "/home/jens/Source/shotwell/src/main.vala"
+#line 391 "/home/jens/Source/shotwell/src/main.vala"
_tmp36_ = filename;
-#line 377 "/home/jens/Source/shotwell/src/main.vala"
+#line 391 "/home/jens/Source/shotwell/src/main.vala"
_tmp37_ = is_string_empty (_tmp36_);
-#line 377 "/home/jens/Source/shotwell/src/main.vala"
+#line 391 "/home/jens/Source/shotwell/src/main.vala"
if (_tmp37_) {
-#line 2573 "main.c"
+#line 2657 "main.c"
const gchar* _tmp38_;
gboolean _tmp39_;
-#line 377 "/home/jens/Source/shotwell/src/main.vala"
+#line 391 "/home/jens/Source/shotwell/src/main.vala"
_tmp38_ = arg;
-#line 377 "/home/jens/Source/shotwell/src/main.vala"
+#line 391 "/home/jens/Source/shotwell/src/main.vala"
_tmp39_ = string_contains (_tmp38_, "://");
-#line 377 "/home/jens/Source/shotwell/src/main.vala"
+#line 391 "/home/jens/Source/shotwell/src/main.vala"
_tmp35_ = !_tmp39_;
-#line 2582 "main.c"
+#line 2666 "main.c"
} else {
-#line 377 "/home/jens/Source/shotwell/src/main.vala"
+#line 391 "/home/jens/Source/shotwell/src/main.vala"
_tmp35_ = FALSE;
-#line 2586 "main.c"
+#line 2670 "main.c"
}
-#line 377 "/home/jens/Source/shotwell/src/main.vala"
+#line 391 "/home/jens/Source/shotwell/src/main.vala"
if (_tmp35_) {
-#line 2590 "main.c"
+#line 2674 "main.c"
const gchar* _tmp40_;
gchar* _tmp41_;
-#line 378 "/home/jens/Source/shotwell/src/main.vala"
+#line 392 "/home/jens/Source/shotwell/src/main.vala"
_tmp40_ = arg;
-#line 378 "/home/jens/Source/shotwell/src/main.vala"
+#line 392 "/home/jens/Source/shotwell/src/main.vala"
_tmp41_ = g_strdup (_tmp40_);
-#line 378 "/home/jens/Source/shotwell/src/main.vala"
+#line 392 "/home/jens/Source/shotwell/src/main.vala"
_g_free0 (filename);
-#line 378 "/home/jens/Source/shotwell/src/main.vala"
+#line 392 "/home/jens/Source/shotwell/src/main.vala"
filename = _tmp41_;
-#line 2601 "main.c"
+#line 2685 "main.c"
}
}
-#line 372 "/home/jens/Source/shotwell/src/main.vala"
+#line 386 "/home/jens/Source/shotwell/src/main.vala"
_g_free0 (arg);
-#line 2606 "main.c"
+#line 2690 "main.c"
}
}
}
-#line 382 "/home/jens/Source/shotwell/src/main.vala"
+#line 396 "/home/jens/Source/shotwell/src/main.vala"
_tmp43_ = filename;
-#line 382 "/home/jens/Source/shotwell/src/main.vala"
+#line 396 "/home/jens/Source/shotwell/src/main.vala"
_tmp44_ = is_string_empty (_tmp43_);
-#line 382 "/home/jens/Source/shotwell/src/main.vala"
+#line 396 "/home/jens/Source/shotwell/src/main.vala"
if (_tmp44_) {
-#line 382 "/home/jens/Source/shotwell/src/main.vala"
+#line 396 "/home/jens/Source/shotwell/src/main.vala"
_tmp42_ = DEBUG_LIBRARY_PREFIX;
-#line 2618 "main.c"
+#line 2702 "main.c"
} else {
-#line 382 "/home/jens/Source/shotwell/src/main.vala"
+#line 396 "/home/jens/Source/shotwell/src/main.vala"
_tmp42_ = DEBUG_VIEWER_PREFIX;
-#line 2622 "main.c"
+#line 2706 "main.c"
}
-#line 382 "/home/jens/Source/shotwell/src/main.vala"
+#line 396 "/home/jens/Source/shotwell/src/main.vala"
debug_init (_tmp42_);
-#line 384 "/home/jens/Source/shotwell/src/main.vala"
+#line 398 "/home/jens/Source/shotwell/src/main.vala"
if (RESOURCES_GIT_VERSION != NULL) {
-#line 2628 "main.c"
+#line 2712 "main.c"
const gchar* _tmp45_ = NULL;
const gchar* _tmp46_;
gboolean _tmp47_;
-#line 386 "/home/jens/Source/shotwell/src/main.vala"
+#line 400 "/home/jens/Source/shotwell/src/main.vala"
_tmp46_ = filename;
-#line 386 "/home/jens/Source/shotwell/src/main.vala"
+#line 400 "/home/jens/Source/shotwell/src/main.vala"
_tmp47_ = is_string_empty (_tmp46_);
-#line 386 "/home/jens/Source/shotwell/src/main.vala"
+#line 400 "/home/jens/Source/shotwell/src/main.vala"
if (_tmp47_) {
-#line 386 "/home/jens/Source/shotwell/src/main.vala"
+#line 400 "/home/jens/Source/shotwell/src/main.vala"
_tmp45_ = RESOURCES_APP_LIBRARY_ROLE;
-#line 2640 "main.c"
+#line 2724 "main.c"
} else {
-#line 386 "/home/jens/Source/shotwell/src/main.vala"
+#line 400 "/home/jens/Source/shotwell/src/main.vala"
_tmp45_ = RESOURCES_APP_DIRECT_ROLE;
-#line 2644 "main.c"
+#line 2728 "main.c"
}
-#line 385 "/home/jens/Source/shotwell/src/main.vala"
- g_message ("main.vala:385: Shotwell %s %s (%s)", _tmp45_, RESOURCES_APP_VERSION, RESOURCES_GIT_VERSION);
-#line 2648 "main.c"
+#line 399 "/home/jens/Source/shotwell/src/main.vala"
+ g_message ("main.vala:399: Shotwell %s %s (%s)", _tmp45_, RESOURCES_APP_VERSION, RESOURCES_GIT_VERSION);
+#line 2732 "main.c"
} else {
const gchar* _tmp48_ = NULL;
const gchar* _tmp49_;
gboolean _tmp50_;
-#line 390 "/home/jens/Source/shotwell/src/main.vala"
+#line 404 "/home/jens/Source/shotwell/src/main.vala"
_tmp49_ = filename;
-#line 390 "/home/jens/Source/shotwell/src/main.vala"
+#line 404 "/home/jens/Source/shotwell/src/main.vala"
_tmp50_ = is_string_empty (_tmp49_);
-#line 390 "/home/jens/Source/shotwell/src/main.vala"
+#line 404 "/home/jens/Source/shotwell/src/main.vala"
if (_tmp50_) {
-#line 390 "/home/jens/Source/shotwell/src/main.vala"
+#line 404 "/home/jens/Source/shotwell/src/main.vala"
_tmp48_ = RESOURCES_APP_LIBRARY_ROLE;
-#line 2661 "main.c"
+#line 2745 "main.c"
} else {
-#line 390 "/home/jens/Source/shotwell/src/main.vala"
+#line 404 "/home/jens/Source/shotwell/src/main.vala"
_tmp48_ = RESOURCES_APP_DIRECT_ROLE;
-#line 2665 "main.c"
+#line 2749 "main.c"
}
-#line 389 "/home/jens/Source/shotwell/src/main.vala"
- g_message ("main.vala:389: Shotwell %s %s", _tmp48_, RESOURCES_APP_VERSION);
-#line 2669 "main.c"
+#line 403 "/home/jens/Source/shotwell/src/main.vala"
+ g_message ("main.vala:403: Shotwell %s %s", _tmp48_, RESOURCES_APP_VERSION);
+#line 2753 "main.c"
}
-#line 393 "/home/jens/Source/shotwell/src/main.vala"
+#line 407 "/home/jens/Source/shotwell/src/main.vala"
_tmp51_ = g_date_time_new_now_local ();
-#line 393 "/home/jens/Source/shotwell/src/main.vala"
+#line 407 "/home/jens/Source/shotwell/src/main.vala"
_tmp52_ = _tmp51_;
-#line 393 "/home/jens/Source/shotwell/src/main.vala"
+#line 407 "/home/jens/Source/shotwell/src/main.vala"
_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", _tmp53_);
-#line 393 "/home/jens/Source/shotwell/src/main.vala"
+#line 407 "/home/jens/Source/shotwell/src/main.vala"
+ g_debug ("main.vala:407: Shotwell is running in timezone %s", _tmp53_);
+#line 407 "/home/jens/Source/shotwell/src/main.vala"
_g_date_time_unref0 (_tmp52_);
-#line 398 "/home/jens/Source/shotwell/src/main.vala"
+#line 412 "/home/jens/Source/shotwell/src/main.vala"
_tmp54_ = filename;
-#line 398 "/home/jens/Source/shotwell/src/main.vala"
+#line 412 "/home/jens/Source/shotwell/src/main.vala"
_tmp55_ = is_string_empty (_tmp54_);
-#line 398 "/home/jens/Source/shotwell/src/main.vala"
+#line 412 "/home/jens/Source/shotwell/src/main.vala"
application_init (!_tmp55_);
-#line 401 "/home/jens/Source/shotwell/src/main.vala"
+#line 415 "/home/jens/Source/shotwell/src/main.vala"
_tmp56_ = commandline_options_data_dir;
-#line 401 "/home/jens/Source/shotwell/src/main.vala"
+#line 415 "/home/jens/Source/shotwell/src/main.vala"
if (_tmp56_ != NULL) {
-#line 2691 "main.c"
+#line 2775 "main.c"
const gchar* _tmp57_;
-#line 402 "/home/jens/Source/shotwell/src/main.vala"
+#line 416 "/home/jens/Source/shotwell/src/main.vala"
_tmp57_ = commandline_options_data_dir;
-#line 402 "/home/jens/Source/shotwell/src/main.vala"
+#line 416 "/home/jens/Source/shotwell/src/main.vala"
app_dirs_set_data_dir (_tmp57_);
-#line 2697 "main.c"
+#line 2781 "main.c"
} else {
-#line 404 "/home/jens/Source/shotwell/src/main.vala"
+#line 418 "/home/jens/Source/shotwell/src/main.vala"
app_dirs_try_migrate_data ();
-#line 2701 "main.c"
+#line 2785 "main.c"
}
-#line 407 "/home/jens/Source/shotwell/src/main.vala"
+#line 421 "/home/jens/Source/shotwell/src/main.vala"
app_dirs_verify_data_dir ();
-#line 408 "/home/jens/Source/shotwell/src/main.vala"
+#line 422 "/home/jens/Source/shotwell/src/main.vala"
app_dirs_verify_cache_dir ();
-#line 411 "/home/jens/Source/shotwell/src/main.vala"
+#line 425 "/home/jens/Source/shotwell/src/main.vala"
_tmp58_ = args;
-#line 411 "/home/jens/Source/shotwell/src/main.vala"
+#line 425 "/home/jens/Source/shotwell/src/main.vala"
_tmp58__length1 = args_length1;
-#line 411 "/home/jens/Source/shotwell/src/main.vala"
+#line 425 "/home/jens/Source/shotwell/src/main.vala"
international_support_init (RESOURCES_APP_GETTEXT_PACKAGE, _tmp58_, _tmp58__length1, INTERNATIONAL_SUPPORT_SYSTEM_LOCALE);
-#line 413 "/home/jens/Source/shotwell/src/main.vala"
+#line 427 "/home/jens/Source/shotwell/src/main.vala"
_tmp59_ = g_timer_new ();
-#line 413 "/home/jens/Source/shotwell/src/main.vala"
+#line 427 "/home/jens/Source/shotwell/src/main.vala"
_g_timer_destroy0 (startup_timer);
-#line 413 "/home/jens/Source/shotwell/src/main.vala"
+#line 427 "/home/jens/Source/shotwell/src/main.vala"
startup_timer = _tmp59_;
-#line 414 "/home/jens/Source/shotwell/src/main.vala"
+#line 428 "/home/jens/Source/shotwell/src/main.vala"
_tmp60_ = startup_timer;
-#line 414 "/home/jens/Source/shotwell/src/main.vala"
+#line 428 "/home/jens/Source/shotwell/src/main.vala"
g_timer_start (_tmp60_);
-#line 417 "/home/jens/Source/shotwell/src/main.vala"
+#line 431 "/home/jens/Source/shotwell/src/main.vala"
g_set_application_name (RESOURCES_APP_TITLE);
-#line 421 "/home/jens/Source/shotwell/src/main.vala"
+#line 435 "/home/jens/Source/shotwell/src/main.vala"
resources_init ();
-#line 426 "/home/jens/Source/shotwell/src/main.vala"
+#line 440 "/home/jens/Source/shotwell/src/main.vala"
_tmp61_ = filename;
-#line 426 "/home/jens/Source/shotwell/src/main.vala"
+#line 440 "/home/jens/Source/shotwell/src/main.vala"
_tmp62_ = is_string_empty (_tmp61_);
-#line 426 "/home/jens/Source/shotwell/src/main.vala"
+#line 440 "/home/jens/Source/shotwell/src/main.vala"
if (_tmp62_) {
-#line 2733 "main.c"
+#line 2817 "main.c"
gchar** _tmp63_;
gint _tmp63__length1;
-#line 427 "/home/jens/Source/shotwell/src/main.vala"
+#line 441 "/home/jens/Source/shotwell/src/main.vala"
_tmp63_ = mounts;
-#line 427 "/home/jens/Source/shotwell/src/main.vala"
+#line 441 "/home/jens/Source/shotwell/src/main.vala"
_tmp63__length1 = mounts_length1;
-#line 427 "/home/jens/Source/shotwell/src/main.vala"
+#line 441 "/home/jens/Source/shotwell/src/main.vala"
library_exec (_tmp63_, _tmp63__length1);
-#line 2742 "main.c"
+#line 2826 "main.c"
} else {
const gchar* _tmp64_;
-#line 429 "/home/jens/Source/shotwell/src/main.vala"
+ gboolean _tmp65_;
+#line 443 "/home/jens/Source/shotwell/src/main.vala"
_tmp64_ = filename;
-#line 429 "/home/jens/Source/shotwell/src/main.vala"
- editing_exec (_tmp64_);
-#line 2749 "main.c"
+#line 443 "/home/jens/Source/shotwell/src/main.vala"
+ _tmp65_ = commandline_options_fullscreen;
+#line 443 "/home/jens/Source/shotwell/src/main.vala"
+ editing_exec (_tmp64_, _tmp65_);
+#line 2836 "main.c"
}
-#line 432 "/home/jens/Source/shotwell/src/main.vala"
+#line 446 "/home/jens/Source/shotwell/src/main.vala"
resources_terminate ();
-#line 433 "/home/jens/Source/shotwell/src/main.vala"
+#line 447 "/home/jens/Source/shotwell/src/main.vala"
application_terminate ();
-#line 434 "/home/jens/Source/shotwell/src/main.vala"
+#line 448 "/home/jens/Source/shotwell/src/main.vala"
debug_terminate ();
-#line 435 "/home/jens/Source/shotwell/src/main.vala"
+#line 449 "/home/jens/Source/shotwell/src/main.vala"
app_dirs_terminate ();
-#line 440 "/home/jens/Source/shotwell/src/main.vala"
- _tmp66_ = filename;
-#line 440 "/home/jens/Source/shotwell/src/main.vala"
- _tmp67_ = is_string_empty (_tmp66_);
-#line 440 "/home/jens/Source/shotwell/src/main.vala"
- if (_tmp67_) {
-#line 2765 "main.c"
- gboolean _tmp68_;
-#line 440 "/home/jens/Source/shotwell/src/main.vala"
- _tmp68_ = was_already_running;
-#line 440 "/home/jens/Source/shotwell/src/main.vala"
- _tmp65_ = !_tmp68_;
-#line 2771 "main.c"
+#line 454 "/home/jens/Source/shotwell/src/main.vala"
+ _tmp67_ = filename;
+#line 454 "/home/jens/Source/shotwell/src/main.vala"
+ _tmp68_ = is_string_empty (_tmp67_);
+#line 454 "/home/jens/Source/shotwell/src/main.vala"
+ if (_tmp68_) {
+#line 2852 "main.c"
+ gboolean _tmp69_;
+#line 454 "/home/jens/Source/shotwell/src/main.vala"
+ _tmp69_ = was_already_running;
+#line 454 "/home/jens/Source/shotwell/src/main.vala"
+ _tmp66_ = !_tmp69_;
+#line 2858 "main.c"
} else {
-#line 440 "/home/jens/Source/shotwell/src/main.vala"
- _tmp65_ = FALSE;
-#line 2775 "main.c"
+#line 454 "/home/jens/Source/shotwell/src/main.vala"
+ _tmp66_ = FALSE;
+#line 2862 "main.c"
}
-#line 440 "/home/jens/Source/shotwell/src/main.vala"
- if (_tmp65_) {
-#line 2779 "main.c"
+#line 454 "/home/jens/Source/shotwell/src/main.vala"
+ if (_tmp66_) {
+#line 2866 "main.c"
gchar* orig_path = NULL;
- GFile* _tmp69_;
GFile* _tmp70_;
GFile* _tmp71_;
GFile* _tmp72_;
- gchar* _tmp73_;
+ GFile* _tmp73_;
gchar* _tmp74_;
+ gchar* _tmp75_;
gchar* backup_path = NULL;
- const gchar* _tmp75_;
- gchar* _tmp76_;
-#line 441 "/home/jens/Source/shotwell/src/main.vala"
- _tmp69_ = app_dirs_get_data_subdir ("data", NULL);
-#line 441 "/home/jens/Source/shotwell/src/main.vala"
- _tmp70_ = _tmp69_;
-#line 441 "/home/jens/Source/shotwell/src/main.vala"
- _tmp71_ = g_file_get_child (_tmp70_, "photo.db");
-#line 441 "/home/jens/Source/shotwell/src/main.vala"
- _tmp72_ = _tmp71_;
-#line 441 "/home/jens/Source/shotwell/src/main.vala"
- _tmp73_ = g_file_get_path (_tmp72_);
-#line 441 "/home/jens/Source/shotwell/src/main.vala"
- _tmp74_ = _tmp73_;
-#line 441 "/home/jens/Source/shotwell/src/main.vala"
- _g_object_unref0 (_tmp72_);
-#line 441 "/home/jens/Source/shotwell/src/main.vala"
- _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"
- _tmp75_ = orig_path;
-#line 442 "/home/jens/Source/shotwell/src/main.vala"
- _tmp76_ = g_strconcat (_tmp75_, ".bak", NULL);
-#line 442 "/home/jens/Source/shotwell/src/main.vala"
- backup_path = _tmp76_;
-#line 2814 "main.c"
+ const gchar* _tmp76_;
+ gchar* _tmp77_;
+#line 455 "/home/jens/Source/shotwell/src/main.vala"
+ _tmp70_ = app_dirs_get_data_subdir ("data", NULL);
+#line 455 "/home/jens/Source/shotwell/src/main.vala"
+ _tmp71_ = _tmp70_;
+#line 455 "/home/jens/Source/shotwell/src/main.vala"
+ _tmp72_ = g_file_get_child (_tmp71_, "photo.db");
+#line 455 "/home/jens/Source/shotwell/src/main.vala"
+ _tmp73_ = _tmp72_;
+#line 455 "/home/jens/Source/shotwell/src/main.vala"
+ _tmp74_ = g_file_get_path (_tmp73_);
+#line 455 "/home/jens/Source/shotwell/src/main.vala"
+ _tmp75_ = _tmp74_;
+#line 455 "/home/jens/Source/shotwell/src/main.vala"
+ _g_object_unref0 (_tmp73_);
+#line 455 "/home/jens/Source/shotwell/src/main.vala"
+ _g_object_unref0 (_tmp71_);
+#line 455 "/home/jens/Source/shotwell/src/main.vala"
+ orig_path = _tmp75_;
+#line 456 "/home/jens/Source/shotwell/src/main.vala"
+ _tmp76_ = orig_path;
+#line 456 "/home/jens/Source/shotwell/src/main.vala"
+ _tmp77_ = g_strconcat (_tmp76_, ".bak", NULL);
+#line 456 "/home/jens/Source/shotwell/src/main.vala"
+ backup_path = _tmp77_;
+#line 2901 "main.c"
{
GFile* src = NULL;
- const gchar* _tmp77_;
- GFile* _tmp78_;
+ const gchar* _tmp78_;
+ GFile* _tmp79_;
GFile* dest = NULL;
- const gchar* _tmp79_;
- GFile* _tmp80_;
+ const gchar* _tmp80_;
GFile* _tmp81_;
GFile* _tmp82_;
-#line 444 "/home/jens/Source/shotwell/src/main.vala"
- _tmp77_ = orig_path;
-#line 444 "/home/jens/Source/shotwell/src/main.vala"
- _tmp78_ = g_file_new_for_commandline_arg (_tmp77_);
-#line 444 "/home/jens/Source/shotwell/src/main.vala"
- src = _tmp78_;
-#line 445 "/home/jens/Source/shotwell/src/main.vala"
- _tmp79_ = backup_path;
-#line 445 "/home/jens/Source/shotwell/src/main.vala"
- _tmp80_ = g_file_new_for_commandline_arg (_tmp79_);
-#line 445 "/home/jens/Source/shotwell/src/main.vala"
- dest = _tmp80_;
-#line 446 "/home/jens/Source/shotwell/src/main.vala"
- _tmp81_ = src;
-#line 446 "/home/jens/Source/shotwell/src/main.vala"
- _tmp82_ = dest;
-#line 446 "/home/jens/Source/shotwell/src/main.vala"
- 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"
+ GFile* _tmp83_;
+#line 458 "/home/jens/Source/shotwell/src/main.vala"
+ _tmp78_ = orig_path;
+#line 458 "/home/jens/Source/shotwell/src/main.vala"
+ _tmp79_ = g_file_new_for_commandline_arg (_tmp78_);
+#line 458 "/home/jens/Source/shotwell/src/main.vala"
+ src = _tmp79_;
+#line 459 "/home/jens/Source/shotwell/src/main.vala"
+ _tmp80_ = backup_path;
+#line 459 "/home/jens/Source/shotwell/src/main.vala"
+ _tmp81_ = g_file_new_for_commandline_arg (_tmp80_);
+#line 459 "/home/jens/Source/shotwell/src/main.vala"
+ dest = _tmp81_;
+#line 460 "/home/jens/Source/shotwell/src/main.vala"
+ _tmp82_ = src;
+#line 460 "/home/jens/Source/shotwell/src/main.vala"
+ _tmp83_ = dest;
+#line 460 "/home/jens/Source/shotwell/src/main.vala"
+ g_file_copy (_tmp82_, _tmp83_, G_FILE_COPY_OVERWRITE | G_FILE_COPY_ALL_METADATA, NULL, NULL, NULL, &_inner_error_);
+#line 460 "/home/jens/Source/shotwell/src/main.vala"
if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 446 "/home/jens/Source/shotwell/src/main.vala"
+#line 460 "/home/jens/Source/shotwell/src/main.vala"
_g_object_unref0 (dest);
-#line 446 "/home/jens/Source/shotwell/src/main.vala"
+#line 460 "/home/jens/Source/shotwell/src/main.vala"
_g_object_unref0 (src);
-#line 2848 "main.c"
- goto __catch226_g_error;
+#line 2935 "main.c"
+ goto __catch237_g_error;
}
-#line 443 "/home/jens/Source/shotwell/src/main.vala"
+#line 457 "/home/jens/Source/shotwell/src/main.vala"
_g_object_unref0 (dest);
-#line 443 "/home/jens/Source/shotwell/src/main.vala"
+#line 457 "/home/jens/Source/shotwell/src/main.vala"
_g_object_unref0 (src);
-#line 2855 "main.c"
+#line 2942 "main.c"
}
- goto __finally226;
- __catch226_g_error:
+ goto __finally237;
+ __catch237_g_error:
{
GError* _error_ = NULL;
- GError* _tmp83_;
- const gchar* _tmp84_;
-#line 443 "/home/jens/Source/shotwell/src/main.vala"
+ GError* _tmp84_;
+ const gchar* _tmp85_;
+#line 457 "/home/jens/Source/shotwell/src/main.vala"
_error_ = _inner_error_;
-#line 443 "/home/jens/Source/shotwell/src/main.vala"
+#line 457 "/home/jens/Source/shotwell/src/main.vala"
_inner_error_ = NULL;
-#line 450 "/home/jens/Source/shotwell/src/main.vala"
- _tmp83_ = _error_;
-#line 450 "/home/jens/Source/shotwell/src/main.vala"
- _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", _tmp84_);
-#line 443 "/home/jens/Source/shotwell/src/main.vala"
+#line 464 "/home/jens/Source/shotwell/src/main.vala"
+ _tmp84_ = _error_;
+#line 464 "/home/jens/Source/shotwell/src/main.vala"
+ _tmp85_ = _tmp84_->message;
+#line 464 "/home/jens/Source/shotwell/src/main.vala"
+ g_warning ("main.vala:464: Failed to create backup file of database: %s", _tmp85_);
+#line 457 "/home/jens/Source/shotwell/src/main.vala"
_g_error_free0 (_error_);
-#line 2875 "main.c"
+#line 2962 "main.c"
}
- __finally226:
-#line 443 "/home/jens/Source/shotwell/src/main.vala"
+ __finally237:
+#line 457 "/home/jens/Source/shotwell/src/main.vala"
if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 443 "/home/jens/Source/shotwell/src/main.vala"
+#line 457 "/home/jens/Source/shotwell/src/main.vala"
_g_free0 (backup_path);
-#line 443 "/home/jens/Source/shotwell/src/main.vala"
+#line 457 "/home/jens/Source/shotwell/src/main.vala"
_g_free0 (orig_path);
-#line 443 "/home/jens/Source/shotwell/src/main.vala"
+#line 457 "/home/jens/Source/shotwell/src/main.vala"
_g_free0 (filename);
-#line 443 "/home/jens/Source/shotwell/src/main.vala"
+#line 457 "/home/jens/Source/shotwell/src/main.vala"
mounts = (_vala_array_free (mounts, mounts_length1, (GDestroyNotify) g_free), NULL);
-#line 443 "/home/jens/Source/shotwell/src/main.vala"
+#line 457 "/home/jens/Source/shotwell/src/main.vala"
g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 443 "/home/jens/Source/shotwell/src/main.vala"
+#line 457 "/home/jens/Source/shotwell/src/main.vala"
g_clear_error (&_inner_error_);
-#line 443 "/home/jens/Source/shotwell/src/main.vala"
+#line 457 "/home/jens/Source/shotwell/src/main.vala"
return;
-#line 2894 "main.c"
+#line 2981 "main.c"
}
-#line 453 "/home/jens/Source/shotwell/src/main.vala"
+#line 467 "/home/jens/Source/shotwell/src/main.vala"
sync ();
-#line 440 "/home/jens/Source/shotwell/src/main.vala"
+#line 454 "/home/jens/Source/shotwell/src/main.vala"
_g_free0 (backup_path);
-#line 440 "/home/jens/Source/shotwell/src/main.vala"
+#line 454 "/home/jens/Source/shotwell/src/main.vala"
_g_free0 (orig_path);
-#line 2902 "main.c"
+#line 2989 "main.c"
}
-#line 316 "/home/jens/Source/shotwell/src/main.vala"
+#line 330 "/home/jens/Source/shotwell/src/main.vala"
_g_free0 (filename);
-#line 316 "/home/jens/Source/shotwell/src/main.vala"
+#line 330 "/home/jens/Source/shotwell/src/main.vala"
mounts = (_vala_array_free (mounts, mounts_length1, (GDestroyNotify) g_free), NULL);
-#line 2908 "main.c"
+#line 2995 "main.c"
}
@@ -2920,11 +3007,11 @@ int main (int argc, char ** argv) {
#if !GLIB_CHECK_VERSION (2,35,0)
g_type_init ();
#endif
-#line 316 "/home/jens/Source/shotwell/src/main.vala"
+#line 330 "/home/jens/Source/shotwell/src/main.vala"
_vala_main (argv, argc);
-#line 316 "/home/jens/Source/shotwell/src/main.vala"
+#line 330 "/home/jens/Source/shotwell/src/main.vala"
return 0;
-#line 2920 "main.c"
+#line 3007 "main.c"
}
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-13 10:53:46 +0000