summaryrefslogtreecommitdiff
path: root/src/main.c
diff options
context:
space:
mode:
Diffstat (limited to 'src/main.c')
-rw-r--r--src/main.c2107
1 files changed, 1129 insertions, 978 deletions
diff --git a/src/main.c b/src/main.c
index 5659731..2bdd384 100644
--- a/src/main.c
+++ b/src/main.c
@@ -1,4 +1,4 @@
-/* main.c generated by valac 0.36.6, the Vala compiler
+/* main.c generated by valac 0.40.4, the Vala compiler
* generated from main.vala, do not modify */
/* Copyright 2016 Software Freedom Conservancy Inc.
@@ -7,6 +7,7 @@
* See the COPYING file in this distribution.
*/
+
#include <glib.h>
#include <glib-object.h>
#include <stdlib.h>
@@ -454,16 +455,20 @@ gint commandline_options_entries_length1 = 0;
static gint _commandline_options_entries_size_ = 0;
GType shotwell_command_get_type (void) G_GNUC_CONST;
-void library_exec (gchar** mounts, int mounts_length1);
+void library_exec (gchar** mounts,
+ int mounts_length1);
gboolean application_get_is_remote (void);
void application_present_primary_instance (void);
-void application_send_to_primary_instance (gchar** argv, int argv_length1);
+void application_send_to_primary_instance (gchar** argv,
+ int argv_length1);
void db_preconfigure (GFile* db_file);
-GFile* app_dirs_get_data_subdir (const gchar* name, const gchar* subname);
+GFile* app_dirs_get_data_subdir (const gchar* name,
+ const gchar* subname);
void library_app_init (GError** error);
void app_window_panic (const gchar* msg);
GType db_verify_result_get_type (void) G_GNUC_CONST;
-DbVerifyResult db_verify_database (gchar* * app_version, gint* schema_version);
+DbVerifyResult db_verify_database (gchar* * app_version,
+ gint* schema_version);
#define RESOURCES_APP_VERSION _VERSION
#define DATABASE_TABLE_SCHEMA_VERSION 20
#define RESOURCES_HOME_URL "https://wiki.gnome.org/Apps/Shotwell"
@@ -475,16 +480,28 @@ void upgrades_init (void);
GType progress_dialog_get_type (void) G_GNUC_CONST;
gpointer aggregate_progress_monitor_ref (gpointer instance);
void aggregate_progress_monitor_unref (gpointer instance);
-GParamSpec* param_spec_aggregate_progress_monitor (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags);
-void value_set_aggregate_progress_monitor (GValue* value, gpointer v_object);
-void value_take_aggregate_progress_monitor (GValue* value, gpointer v_object);
+GParamSpec* param_spec_aggregate_progress_monitor (const gchar* name,
+ const gchar* nick,
+ const gchar* blurb,
+ GType object_type,
+ GParamFlags flags);
+void value_set_aggregate_progress_monitor (GValue* value,
+ gpointer v_object);
+void value_take_aggregate_progress_monitor (GValue* value,
+ gpointer v_object);
gpointer value_get_aggregate_progress_monitor (const GValue* value);
GType aggregate_progress_monitor_get_type (void) G_GNUC_CONST;
gpointer database_table_ref (gpointer instance);
void database_table_unref (gpointer instance);
-GParamSpec* param_spec_database_table (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags);
-void value_set_database_table (GValue* value, gpointer v_object);
-void value_take_database_table (GValue* value, gpointer v_object);
+GParamSpec* param_spec_database_table (const gchar* name,
+ const gchar* nick,
+ const gchar* blurb,
+ GType object_type,
+ GParamFlags flags);
+void value_set_database_table (GValue* value,
+ gpointer v_object);
+void value_take_database_table (GValue* value,
+ gpointer v_object);
gpointer value_get_database_table (const GValue* value);
GType database_table_get_type (void) G_GNUC_CONST;
GType photo_table_get_type (void) G_GNUC_CONST;
@@ -498,71 +515,131 @@ GType video_table_get_type (void) G_GNUC_CONST;
VideoTable* video_table_get_instance (void);
gpointer upgrades_ref (gpointer instance);
void upgrades_unref (gpointer instance);
-GParamSpec* param_spec_upgrades (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags);
-void value_set_upgrades (GValue* value, gpointer v_object);
-void value_take_upgrades (GValue* value, gpointer v_object);
+GParamSpec* param_spec_upgrades (const gchar* name,
+ const gchar* nick,
+ const gchar* blurb,
+ GType object_type,
+ GParamFlags flags);
+void value_set_upgrades (GValue* value,
+ gpointer v_object);
+void value_take_upgrades (GValue* value,
+ gpointer v_object);
gpointer value_get_upgrades (const GValue* value);
GType upgrades_get_type (void) G_GNUC_CONST;
Upgrades* upgrades_get_instance (void);
guint64 upgrades_get_step_count (Upgrades* self);
-ProgressDialog* progress_dialog_new (GtkWindow* owner, const gchar* text, GCancellable* cancellable);
-ProgressDialog* progress_dialog_construct (GType object_type, GtkWindow* owner, const gchar* text, GCancellable* cancellable);
-void progress_dialog_update_display_every (ProgressDialog* self, gint update_every);
-void progress_dialog_set_minimum_on_screen_time_msec (ProgressDialog* self, gint minimum_on_screen_time_msec);
-gboolean progress_dialog_monitor (ProgressDialog* self, guint64 count, guint64 total, gboolean do_event_loop);
-static gboolean _progress_dialog_monitor_progress_monitor (guint64 current, guint64 total, gboolean do_event_loop, gpointer self);
-AggregateProgressMonitor* aggregate_progress_monitor_new (guint64 grand_total, ProgressMonitor wrapped_monitor, void* wrapped_monitor_target);
-AggregateProgressMonitor* aggregate_progress_monitor_construct (GType object_type, guint64 grand_total, ProgressMonitor wrapped_monitor, void* wrapped_monitor_target);
-gboolean aggregate_progress_monitor_monitor (AggregateProgressMonitor* self, guint64 count, guint64 total);
-static gboolean _aggregate_progress_monitor_monitor_progress_monitor (guint64 current, guint64 total, gboolean do_event_loop, gpointer self);
+ProgressDialog* progress_dialog_new (GtkWindow* owner,
+ const gchar* text,
+ GCancellable* cancellable);
+ProgressDialog* progress_dialog_construct (GType object_type,
+ GtkWindow* owner,
+ const gchar* text,
+ GCancellable* cancellable);
+void progress_dialog_update_display_every (ProgressDialog* self,
+ gint update_every);
+void progress_dialog_set_minimum_on_screen_time_msec (ProgressDialog* self,
+ gint minimum_on_screen_time_msec);
+gboolean progress_dialog_monitor (ProgressDialog* self,
+ guint64 count,
+ guint64 total,
+ gboolean do_event_loop);
+static gboolean _progress_dialog_monitor_progress_monitor (guint64 current,
+ guint64 total,
+ gboolean do_event_loop,
+ gpointer self);
+AggregateProgressMonitor* aggregate_progress_monitor_new (guint64 grand_total,
+ ProgressMonitor wrapped_monitor,
+ void* wrapped_monitor_target);
+AggregateProgressMonitor* aggregate_progress_monitor_construct (GType object_type,
+ guint64 grand_total,
+ ProgressMonitor wrapped_monitor,
+ void* wrapped_monitor_target);
+gboolean aggregate_progress_monitor_monitor (AggregateProgressMonitor* self,
+ guint64 count,
+ guint64 total);
+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);
-void upgrades_execute (Upgrades* self, ProgressMonitor monitor, void* monitor_target);
+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);
+void upgrades_execute (Upgrades* self,
+ ProgressMonitor monitor,
+ void* monitor_target);
void library_monitor_pool_init (void);
void media_collection_registry_init (void);
gpointer media_collection_registry_ref (gpointer instance);
void media_collection_registry_unref (gpointer instance);
-GParamSpec* param_spec_media_collection_registry (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags);
-void value_set_media_collection_registry (GValue* value, gpointer v_object);
-void value_take_media_collection_registry (GValue* value, gpointer v_object);
+GParamSpec* param_spec_media_collection_registry (const gchar* name,
+ const gchar* nick,
+ const gchar* blurb,
+ GType object_type,
+ GParamFlags flags);
+void value_set_media_collection_registry (GValue* value,
+ gpointer v_object);
+void value_take_media_collection_registry (GValue* value,
+ gpointer v_object);
gpointer value_get_media_collection_registry (const GValue* value);
GType media_collection_registry_get_type (void) G_GNUC_CONST;
MediaCollectionRegistry* media_collection_registry_get_instance (void);
gpointer data_collection_ref (gpointer instance);
void data_collection_unref (gpointer instance);
-GParamSpec* param_spec_data_collection (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags);
-void value_set_data_collection (GValue* value, gpointer v_object);
-void value_take_data_collection (GValue* value, gpointer v_object);
+GParamSpec* param_spec_data_collection (const gchar* name,
+ const gchar* nick,
+ const gchar* blurb,
+ GType object_type,
+ GParamFlags flags);
+void value_set_data_collection (GValue* value,
+ gpointer v_object);
+void value_take_data_collection (GValue* value,
+ gpointer v_object);
gpointer value_get_data_collection (const GValue* value);
GType data_collection_get_type (void) G_GNUC_CONST;
GType source_collection_get_type (void) G_GNUC_CONST;
GType database_source_collection_get_type (void) G_GNUC_CONST;
GType media_source_collection_get_type (void) G_GNUC_CONST;
-void media_collection_registry_register_collection (MediaCollectionRegistry* self, MediaSourceCollection* collection);
+void media_collection_registry_register_collection (MediaCollectionRegistry* self,
+ MediaSourceCollection* collection);
GType library_photo_source_collection_get_type (void) G_GNUC_CONST;
GType video_source_collection_get_type (void) G_GNUC_CONST;
-void event_init (ProgressMonitor monitor, void* monitor_target);
-void tag_init (ProgressMonitor monitor, void* monitor_target);
+void event_init (ProgressMonitor monitor,
+ void* monitor_target);
+void tag_init (ProgressMonitor monitor,
+ void* monitor_target);
void metadata_writer_init (void);
void desktop_integration_init (void);
gpointer application_ref (gpointer instance);
void application_unref (gpointer instance);
-GParamSpec* param_spec_application (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags);
-void value_set_application (GValue* value, gpointer v_object);
-void value_take_application (GValue* value, gpointer v_object);
+GParamSpec* param_spec_application (const gchar* name,
+ const gchar* nick,
+ const gchar* blurb,
+ GType object_type,
+ GParamFlags flags);
+void value_set_application (GValue* value,
+ gpointer v_object);
+void value_take_application (GValue* value,
+ gpointer v_object);
gpointer value_get_application (const GValue* value);
GType application_get_type (void) G_GNUC_CONST;
Application* application_get_instance (void);
GType page_window_get_type (void) G_GNUC_CONST;
GType app_window_get_type (void) G_GNUC_CONST;
GType library_window_get_type (void) G_GNUC_CONST;
-LibraryWindow* library_window_new (ProgressMonitor progress_monitor, void* progress_monitor_target);
-LibraryWindow* library_window_construct (GType object_type, ProgressMonitor progress_monitor, void* progress_monitor_target);
-void library_window_mounted_camera_shell_notification (LibraryWindow* self, const gchar* uri, gboolean at_startup);
+LibraryWindow* library_window_new (ProgressMonitor progress_monitor,
+ void* progress_monitor_target);
+LibraryWindow* library_window_construct (GType object_type,
+ ProgressMonitor progress_monitor,
+ void* progress_monitor_target);
+void library_window_mounted_camera_shell_notification (LibraryWindow* self,
+ const gchar* uri,
+ gboolean at_startup);
GType welcome_service_entry_get_type (void) G_GNUC_CONST;
GType configuration_facade_get_type (void) G_GNUC_CONST;
GType config_facade_get_type (void) G_GNUC_CONST;
@@ -571,19 +648,32 @@ gboolean configuration_facade_get_show_welcome_dialog (ConfigurationFacade* self
gint data_collection_get_count (DataCollection* self);
GType welcome_dialog_get_type (void) G_GNUC_CONST;
WelcomeDialog* welcome_dialog_new (GtkWindow* owner);
-WelcomeDialog* welcome_dialog_construct (GType object_type, GtkWindow* owner);
-void configuration_facade_set_show_welcome_dialog (ConfigurationFacade* self, gboolean show);
-gboolean welcome_dialog_execute (WelcomeDialog* self, WelcomeServiceEntry*** selected_import_entries, int* selected_import_entries_length1, gboolean* do_system_pictures_import);
+WelcomeDialog* welcome_dialog_construct (GType object_type,
+ GtkWindow* owner);
+void configuration_facade_set_show_welcome_dialog (ConfigurationFacade* self,
+ gboolean show);
+gboolean welcome_dialog_execute (WelcomeDialog* self,
+ WelcomeServiceEntry*** selected_import_entries,
+ int* selected_import_entries_length1,
+ gboolean* do_system_pictures_import);
void welcome_service_entry_execute (WelcomeServiceEntry* self);
gpointer import_manifest_ref (gpointer instance);
void import_manifest_unref (gpointer instance);
-GParamSpec* param_spec_import_manifest (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags);
-void value_set_import_manifest (GValue* value, gpointer v_object);
-void value_take_import_manifest (GValue* value, gpointer v_object);
+GParamSpec* param_spec_import_manifest (const gchar* name,
+ const gchar* nick,
+ const gchar* blurb,
+ GType object_type,
+ GParamFlags flags);
+void value_set_import_manifest (GValue* value,
+ gpointer v_object);
+void value_take_import_manifest (GValue* value,
+ gpointer v_object);
gpointer value_get_import_manifest (const GValue* value);
GType import_manifest_get_type (void) G_GNUC_CONST;
void run_system_pictures_import (ImportManifest* external_exclusion_manifest);
-void application_start (Application* self, gchar** argv, int argv_length1);
+void application_start (Application* self,
+ gchar** argv,
+ int argv_length1);
void desktop_integration_terminate (void);
void metadata_writer_terminate (void);
void tag_terminate (void);
@@ -597,29 +687,68 @@ void video_terminate (void);
void library_app_terminate (void);
gpointer batch_import_job_ref (gpointer instance);
void batch_import_job_unref (gpointer instance);
-GParamSpec* param_spec_batch_import_job (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags);
-void value_set_batch_import_job (GValue* value, gpointer v_object);
-void value_take_batch_import_job (GValue* value, gpointer v_object);
+GParamSpec* param_spec_batch_import_job (const gchar* name,
+ const gchar* nick,
+ const gchar* blurb,
+ GType object_type,
+ GParamFlags flags);
+void value_set_batch_import_job (GValue* value,
+ gpointer v_object);
+void value_take_batch_import_job (GValue* value,
+ gpointer v_object);
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, gboolean recurse);
-FileImportJob* file_import_job_construct (GType object_type, GFile* file_or_dir, gboolean copy_to_library, gboolean recurse);
+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);
void batch_import_roll_unref (gpointer instance);
-GParamSpec* param_spec_batch_import_roll (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags);
-void value_set_batch_import_roll (GValue* value, gpointer v_object);
-void value_take_batch_import_roll (GValue* value, gpointer v_object);
+GParamSpec* param_spec_batch_import_roll (const gchar* name,
+ const gchar* nick,
+ const gchar* blurb,
+ GType object_type,
+ GParamFlags flags);
+void value_set_batch_import_roll (GValue* value,
+ gpointer v_object);
+void value_take_batch_import_roll (GValue* value,
+ gpointer v_object);
gpointer value_get_batch_import_roll (const GValue* value);
GType batch_import_roll_get_type (void) G_GNUC_CONST;
-void report_system_pictures_import (ImportManifest* manifest, BatchImportRoll* import_roll);
-static void _report_system_pictures_import_batch_import_import_reporter (ImportManifest* manifest, BatchImportRoll* import_roll, gpointer self);
-BatchImport* batch_import_new (GeeIterable* jobs, const gchar* name, BatchImportImportReporter reporter, void* reporter_target, GeeArrayList* prefailed, GeeArrayList* pre_already_imported, GCancellable* cancellable, BatchImportRoll* import_roll, ImportManifest* skip_manifest);
-BatchImport* batch_import_construct (GType object_type, GeeIterable* jobs, const gchar* name, BatchImportImportReporter reporter, void* reporter_target, GeeArrayList* prefailed, GeeArrayList* pre_already_imported, GCancellable* cancellable, BatchImportRoll* import_roll, ImportManifest* skip_manifest);
-void library_window_enqueue_batch_import (LibraryWindow* self, BatchImport* batch_import, gboolean allow_user_cancel);
+void report_system_pictures_import (ImportManifest* manifest,
+ BatchImportRoll* import_roll);
+static void _report_system_pictures_import_batch_import_import_reporter (ImportManifest* manifest,
+ BatchImportRoll* import_roll,
+ gpointer self);
+BatchImport* batch_import_new (GeeIterable* jobs,
+ const gchar* name,
+ BatchImportImportReporter reporter,
+ void* reporter_target,
+ GeeArrayList* prefailed,
+ GeeArrayList* pre_already_imported,
+ GCancellable* cancellable,
+ BatchImportRoll* import_roll,
+ ImportManifest* skip_manifest);
+BatchImport* batch_import_construct (GType object_type,
+ GeeIterable* jobs,
+ const gchar* name,
+ BatchImportImportReporter reporter,
+ void* reporter_target,
+ GeeArrayList* prefailed,
+ GeeArrayList* pre_already_imported,
+ GCancellable* cancellable,
+ BatchImportRoll* import_roll,
+ ImportManifest* skip_manifest);
+void library_window_enqueue_batch_import (LibraryWindow* self,
+ BatchImport* batch_import,
+ gboolean allow_user_cancel);
void library_window_switch_to_import_queue_page (LibraryWindow* self);
GType data_object_get_type (void) G_GNUC_CONST;
GType data_source_get_type (void) G_GNUC_CONST;
@@ -627,37 +756,75 @@ GType thumbnail_source_get_type (void) G_GNUC_CONST;
GType media_source_get_type (void) G_GNUC_CONST;
gpointer batch_import_result_ref (gpointer instance);
void batch_import_result_unref (gpointer instance);
-GParamSpec* param_spec_batch_import_result (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags);
-void value_set_batch_import_result (GValue* value, gpointer v_object);
-void value_take_batch_import_result (GValue* value, gpointer v_object);
+GParamSpec* param_spec_batch_import_result (const gchar* name,
+ const gchar* nick,
+ const gchar* blurb,
+ GType object_type,
+ GParamFlags flags);
+void value_set_batch_import_result (GValue* value,
+ gpointer v_object);
+void value_take_batch_import_result (GValue* value,
+ gpointer v_object);
gpointer value_get_batch_import_result (const GValue* value);
GType batch_import_result_get_type (void) G_GNUC_CONST;
gpointer import_ui_question_params_ref (gpointer instance);
void import_ui_question_params_unref (gpointer instance);
-GParamSpec* import_ui_param_spec_question_params (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags);
-void import_ui_value_set_question_params (GValue* value, gpointer v_object);
-void import_ui_value_take_question_params (GValue* value, gpointer v_object);
+GParamSpec* import_ui_param_spec_question_params (const gchar* name,
+ const gchar* nick,
+ const gchar* blurb,
+ GType object_type,
+ GParamFlags flags);
+void import_ui_value_set_question_params (GValue* value,
+ gpointer v_object);
+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, gboolean fullscreen);
+gboolean import_ui_report_manifest (ImportManifest* manifest,
+ gboolean show_dest_id,
+ ImportUIQuestionParams* question);
+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);
+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_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 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);
+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 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_lib_dir (void);
@@ -665,7 +832,10 @@ GFile* app_dirs_get_lib_dir (void);
void app_dirs_terminate (void);
#define RESOURCES_GIT_VERSION _GIT_VERSION
gboolean library_window_is_mount_uri_supported (const gchar* uri);
-static void _vala_array_add79 (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"
@@ -677,17 +847,26 @@ void app_dirs_set_data_dir (const gchar* user_data_dir);
void app_dirs_try_migrate_data (void);
void app_dirs_verify_data_dir (void);
void app_dirs_verify_cache_dir (void);
-void international_support_init (const gchar* package_name, gchar** args, int args_length1, const gchar* locale);
+void international_support_init (const gchar* package_name,
+ gchar** args,
+ int args_length1,
+ const gchar* locale);
#define INTERNATIONAL_SUPPORT_SYSTEM_LOCALE ""
void resources_init (void);
void resources_terminate (void);
void application_terminate (void);
void debug_terminate (void);
-static void _vala_array_destroy (gpointer array, gint array_length, GDestroyNotify destroy_func);
-static void _vala_array_free (gpointer array, gint array_length, GDestroyNotify destroy_func);
+static void _vala_array_destroy (gpointer array,
+ gint array_length,
+ GDestroyNotify destroy_func);
+static void _vala_array_free (gpointer array,
+ gint array_length,
+ GDestroyNotify destroy_func);
-GType shotwell_command_get_type (void) {
+GType
+shotwell_command_get_type (void)
+{
static volatile gsize shotwell_command_type_id__volatile = 0;
if (g_once_init_enter (&shotwell_command_type_id__volatile)) {
static const GEnumValue values[] = {{SHOTWELL_COMMAND_MOUNTED_CAMERA, "SHOTWELL_COMMAND_MOUNTED_CAMERA", "mounted-camera"}, {0, NULL, NULL}};
@@ -699,147 +878,149 @@ GType shotwell_command_get_type (void) {
}
-static gboolean _progress_dialog_monitor_progress_monitor (guint64 current, guint64 total, gboolean do_event_loop, gpointer self) {
+static gboolean
+_progress_dialog_monitor_progress_monitor (guint64 current,
+ guint64 total,
+ gboolean do_event_loop,
+ gpointer self)
+{
gboolean result;
result = progress_dialog_monitor ((ProgressDialog*) self, current, total, do_event_loop);
#line 113 "/home/jens/Source/shotwell/src/main.vala"
return result;
-#line 708 "main.c"
+#line 892 "main.c"
}
-static gboolean _aggregate_progress_monitor_monitor_progress_monitor (guint64 current, guint64 total, gboolean do_event_loop, gpointer self) {
+static gboolean
+_aggregate_progress_monitor_monitor_progress_monitor (guint64 current,
+ guint64 total,
+ gboolean do_event_loop,
+ gpointer self)
+{
gboolean result;
result = aggregate_progress_monitor_monitor ((AggregateProgressMonitor*) self, current, total);
#line 114 "/home/jens/Source/shotwell/src/main.vala"
return result;
-#line 717 "main.c"
+#line 906 "main.c"
}
-static gpointer _g_object_ref0 (gpointer self) {
+static gpointer
+_g_object_ref0 (gpointer self)
+{
#line 186 "/home/jens/Source/shotwell/src/main.vala"
return self ? g_object_ref (self) : NULL;
-#line 724 "main.c"
+#line 915 "main.c"
}
-void library_exec (gchar** mounts, int mounts_length1) {
+void
+library_exec (gchar** mounts,
+ int mounts_length1)
+{
gboolean _tmp0_;
- gboolean _tmp1_;
+ GFile* _tmp1_;
+ GFile* _tmp2_;
GFile* _tmp3_;
GFile* _tmp4_;
- GFile* _tmp5_;
- GFile* _tmp6_;
gchar* errormsg = NULL;
gchar* app_version = NULL;
gint schema_version = 0;
DbVerifyResult _result_ = 0;
- gchar* _tmp9_ = NULL;
- gint _tmp10_ = 0;
- DbVerifyResult _tmp11_;
- DbVerifyResult _tmp12_;
- const gchar* _tmp29_;
+ gchar* _tmp7_ = NULL;
+ gint _tmp8_ = 0;
+ DbVerifyResult _tmp9_;
+ DbVerifyResult _tmp10_;
+ const gchar* _tmp27_;
ProgressDialog* progress_dialog = NULL;
AggregateProgressMonitor* aggregate_monitor = NULL;
ProgressMonitor monitor = NULL;
void* monitor_target;
GDestroyNotify monitor_target_destroy_notify;
- gboolean _tmp35_;
- AggregateProgressMonitor* _tmp65_;
- ProgressMonitor _tmp67_;
- void* _tmp67__target;
- AggregateProgressMonitor* _tmp68_;
- ProgressMonitor _tmp70_;
- void* _tmp70__target;
- AggregateProgressMonitor* _tmp71_;
- Upgrades* _tmp73_;
- Upgrades* _tmp74_;
+ gboolean _tmp33_;
+ AggregateProgressMonitor* _tmp58_;
+ ProgressMonitor _tmp60_;
+ void* _tmp60__target;
+ AggregateProgressMonitor* _tmp61_;
+ ProgressMonitor _tmp63_;
+ void* _tmp63__target;
+ AggregateProgressMonitor* _tmp64_;
+ Upgrades* _tmp66_;
+ Upgrades* _tmp67_;
MediaCollectionRegistry* registry = NULL;
- MediaCollectionRegistry* _tmp75_;
- MediaCollectionRegistry* _tmp76_;
- LibraryPhotoSourceCollection* _tmp77_;
- MediaCollectionRegistry* _tmp78_;
- VideoSourceCollection* _tmp79_;
- AggregateProgressMonitor* _tmp80_;
- ProgressMonitor _tmp82_;
- void* _tmp82__target;
- AggregateProgressMonitor* _tmp83_;
- ProgressMonitor _tmp85_;
- void* _tmp85__target;
- Application* _tmp86_;
- Application* _tmp87_;
- AggregateProgressMonitor* _tmp88_;
+ MediaCollectionRegistry* _tmp68_;
+ MediaCollectionRegistry* _tmp69_;
+ LibraryPhotoSourceCollection* _tmp70_;
+ MediaCollectionRegistry* _tmp71_;
+ VideoSourceCollection* _tmp72_;
+ AggregateProgressMonitor* _tmp73_;
+ ProgressMonitor _tmp75_;
+ void* _tmp75__target;
+ AggregateProgressMonitor* _tmp76_;
+ ProgressMonitor _tmp78_;
+ void* _tmp78__target;
+ Application* _tmp79_;
+ Application* _tmp80_;
+ AggregateProgressMonitor* _tmp81_;
LibraryWindow* library_window = NULL;
- ProgressMonitor _tmp90_;
- void* _tmp90__target;
- LibraryWindow* _tmp91_;
- AggregateProgressMonitor* _tmp92_;
- ProgressDialog* _tmp94_;
- gchar** _tmp96_;
- gint _tmp96__length1;
- LibraryWindow* _tmp100_;
+ ProgressMonitor _tmp83_;
+ void* _tmp83__target;
+ LibraryWindow* _tmp84_;
+ AggregateProgressMonitor* _tmp85_;
+ ProgressDialog* _tmp87_;
+ LibraryWindow* _tmp92_;
WelcomeServiceEntry** selected_import_entries = NULL;
- WelcomeServiceEntry** _tmp101_;
+ WelcomeServiceEntry** _tmp93_;
gint selected_import_entries_length1;
gint _selected_import_entries_size_;
- gboolean _tmp102_ = FALSE;
- ConfigFacade* _tmp103_;
- ConfigFacade* _tmp104_;
- gboolean _tmp105_;
- gboolean _tmp106_;
- WelcomeServiceEntry** _tmp120_;
- gint _tmp120__length1;
- gboolean _tmp124_;
- GTimer* _tmp125_;
- gdouble _tmp126_;
- Application* _tmp127_;
- Application* _tmp128_;
+ gboolean _tmp94_ = FALSE;
+ ConfigFacade* _tmp95_;
+ ConfigFacade* _tmp96_;
+ gboolean _tmp97_;
+ WelcomeServiceEntry** _tmp110_;
+ gint _tmp110__length1;
+ gboolean _tmp114_;
+ GTimer* _tmp115_;
+ gdouble _tmp116_;
+ Application* _tmp117_;
+ Application* _tmp118_;
GError * _inner_error_ = NULL;
#line 16 "/home/jens/Source/shotwell/src/main.vala"
- _tmp0_ = application_get_is_remote ();
-#line 16 "/home/jens/Source/shotwell/src/main.vala"
- was_already_running = _tmp0_;
+ was_already_running = application_get_is_remote ();
#line 18 "/home/jens/Source/shotwell/src/main.vala"
- _tmp1_ = was_already_running;
+ _tmp0_ = was_already_running;
#line 18 "/home/jens/Source/shotwell/src/main.vala"
- if (_tmp1_) {
-#line 808 "main.c"
- gchar** _tmp2_;
- gint _tmp2__length1;
+ if (_tmp0_) {
#line 25 "/home/jens/Source/shotwell/src/main.vala"
application_present_primary_instance ();
#line 26 "/home/jens/Source/shotwell/src/main.vala"
- _tmp2_ = mounts;
-#line 26 "/home/jens/Source/shotwell/src/main.vala"
- _tmp2__length1 = mounts_length1;
-#line 26 "/home/jens/Source/shotwell/src/main.vala"
- application_send_to_primary_instance (_tmp2_, _tmp2__length1);
+ application_send_to_primary_instance (mounts, mounts_length1);
#line 27 "/home/jens/Source/shotwell/src/main.vala"
return;
-#line 821 "main.c"
+#line 1002 "main.c"
}
#line 31 "/home/jens/Source/shotwell/src/main.vala"
- _tmp3_ = app_dirs_get_data_subdir ("data", NULL);
-#line 31 "/home/jens/Source/shotwell/src/main.vala"
- _tmp4_ = _tmp3_;
+ _tmp1_ = app_dirs_get_data_subdir ("data", NULL);
#line 31 "/home/jens/Source/shotwell/src/main.vala"
- _tmp5_ = g_file_get_child (_tmp4_, "photo.db");
+ _tmp2_ = _tmp1_;
#line 31 "/home/jens/Source/shotwell/src/main.vala"
- _tmp6_ = _tmp5_;
+ _tmp3_ = g_file_get_child (_tmp2_, "photo.db");
#line 31 "/home/jens/Source/shotwell/src/main.vala"
- db_preconfigure (_tmp6_);
+ _tmp4_ = _tmp3_;
#line 31 "/home/jens/Source/shotwell/src/main.vala"
- _g_object_unref0 (_tmp6_);
+ db_preconfigure (_tmp4_);
#line 31 "/home/jens/Source/shotwell/src/main.vala"
_g_object_unref0 (_tmp4_);
-#line 837 "main.c"
+#line 31 "/home/jens/Source/shotwell/src/main.vala"
+ _g_object_unref0 (_tmp2_);
+#line 1018 "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 843 "main.c"
+#line 1024 "main.c"
goto __catch233_g_error;
}
}
@@ -847,23 +1028,23 @@ void library_exec (gchar** mounts, int mounts_length1) {
__catch233_g_error:
{
GError* err = NULL;
- GError* _tmp7_;
- const gchar* _tmp8_;
+ GError* _tmp5_;
+ const gchar* _tmp6_;
#line 34 "/home/jens/Source/shotwell/src/main.vala"
err = _inner_error_;
#line 34 "/home/jens/Source/shotwell/src/main.vala"
_inner_error_ = NULL;
#line 37 "/home/jens/Source/shotwell/src/main.vala"
- _tmp7_ = err;
+ _tmp5_ = err;
#line 37 "/home/jens/Source/shotwell/src/main.vala"
- _tmp8_ = _tmp7_->message;
+ _tmp6_ = _tmp5_->message;
#line 37 "/home/jens/Source/shotwell/src/main.vala"
- app_window_panic (_tmp8_);
+ app_window_panic (_tmp6_);
#line 39 "/home/jens/Source/shotwell/src/main.vala"
_g_error_free0 (err);
#line 39 "/home/jens/Source/shotwell/src/main.vala"
return;
-#line 867 "main.c"
+#line 1048 "main.c"
}
__finally233:
#line 34 "/home/jens/Source/shotwell/src/main.vala"
@@ -874,171 +1055,171 @@ void library_exec (gchar** mounts, int mounts_length1) {
g_clear_error (&_inner_error_);
#line 34 "/home/jens/Source/shotwell/src/main.vala"
return;
-#line 878 "main.c"
+#line 1059 "main.c"
}
#line 43 "/home/jens/Source/shotwell/src/main.vala"
g_message ("main.vala:43: Verifying database…");
#line 44 "/home/jens/Source/shotwell/src/main.vala"
errormsg = NULL;
#line 47 "/home/jens/Source/shotwell/src/main.vala"
- _tmp11_ = db_verify_database (&_tmp9_, &_tmp10_);
+ _tmp9_ = db_verify_database (&_tmp7_, &_tmp8_);
#line 47 "/home/jens/Source/shotwell/src/main.vala"
_g_free0 (app_version);
#line 47 "/home/jens/Source/shotwell/src/main.vala"
- app_version = _tmp9_;
+ app_version = _tmp7_;
#line 47 "/home/jens/Source/shotwell/src/main.vala"
- schema_version = _tmp10_;
+ schema_version = _tmp8_;
#line 47 "/home/jens/Source/shotwell/src/main.vala"
- _result_ = _tmp11_;
+ _result_ = _tmp9_;
#line 48 "/home/jens/Source/shotwell/src/main.vala"
- _tmp12_ = _result_;
+ _tmp10_ = _result_;
#line 48 "/home/jens/Source/shotwell/src/main.vala"
- switch (_tmp12_) {
+ switch (_tmp10_) {
#line 48 "/home/jens/Source/shotwell/src/main.vala"
case DB_VERIFY_RESULT_OK:
-#line 900 "main.c"
+#line 1081 "main.c"
{
#line 51 "/home/jens/Source/shotwell/src/main.vala"
break;
-#line 904 "main.c"
+#line 1085 "main.c"
}
#line 48 "/home/jens/Source/shotwell/src/main.vala"
case DB_VERIFY_RESULT_FUTURE_VERSION:
-#line 908 "main.c"
+#line 1089 "main.c"
{
- const gchar* _tmp13_;
- gint _tmp14_;
- gchar* _tmp15_;
+ const gchar* _tmp11_;
+ gint _tmp12_;
+ gchar* _tmp13_;
#line 54 "/home/jens/Source/shotwell/src/main.vala"
- _tmp13_ = app_version;
+ _tmp11_ = app_version;
#line 54 "/home/jens/Source/shotwell/src/main.vala"
- _tmp14_ = schema_version;
+ _tmp12_ = schema_version;
#line 54 "/home/jens/Source/shotwell/src/main.vala"
- _tmp15_ = g_strdup_printf (_ ("Your photo library is not compatible with this version of Shotwell. It" \
+ _tmp13_ = g_strdup_printf (_ ("Your photo library is not compatible with this version of Shotwell. It" \
" appears it was created by Shotwell %s (schema %d). This version is %s" \
-" (schema %d). Please use the latest version of Shotwell."), _tmp13_, _tmp14_, RESOURCES_APP_VERSION, DATABASE_TABLE_SCHEMA_VERSION);
+" (schema %d). Please use the latest version of Shotwell."), _tmp11_, _tmp12_, RESOURCES_APP_VERSION, DATABASE_TABLE_SCHEMA_VERSION);
#line 54 "/home/jens/Source/shotwell/src/main.vala"
_g_free0 (errormsg);
#line 54 "/home/jens/Source/shotwell/src/main.vala"
- errormsg = _tmp15_;
+ errormsg = _tmp13_;
#line 56 "/home/jens/Source/shotwell/src/main.vala"
break;
-#line 925 "main.c"
+#line 1106 "main.c"
}
#line 48 "/home/jens/Source/shotwell/src/main.vala"
case DB_VERIFY_RESULT_UPGRADE_ERROR:
-#line 929 "main.c"
+#line 1110 "main.c"
{
- const gchar* _tmp16_;
- gint _tmp17_;
- gchar* _tmp18_;
+ const gchar* _tmp14_;
+ gint _tmp15_;
+ gchar* _tmp16_;
#line 59 "/home/jens/Source/shotwell/src/main.vala"
- _tmp16_ = app_version;
+ _tmp14_ = app_version;
#line 59 "/home/jens/Source/shotwell/src/main.vala"
- _tmp17_ = schema_version;
+ _tmp15_ = schema_version;
#line 59 "/home/jens/Source/shotwell/src/main.vala"
- _tmp18_ = g_strdup_printf (_ ("Shotwell was unable to upgrade your photo library from version %s (sch" \
+ _tmp16_ = g_strdup_printf (_ ("Shotwell was unable to upgrade your photo library from version %s (sch" \
"ema %d) to %s (schema %d). For more information please check the Shotw" \
-"ell Wiki at %s"), _tmp16_, _tmp17_, RESOURCES_APP_VERSION, DATABASE_TABLE_SCHEMA_VERSION, RESOURCES_HOME_URL);
+"ell Wiki at %s"), _tmp14_, _tmp15_, RESOURCES_APP_VERSION, DATABASE_TABLE_SCHEMA_VERSION, RESOURCES_HOME_URL);
#line 59 "/home/jens/Source/shotwell/src/main.vala"
_g_free0 (errormsg);
#line 59 "/home/jens/Source/shotwell/src/main.vala"
- errormsg = _tmp18_;
+ errormsg = _tmp16_;
#line 62 "/home/jens/Source/shotwell/src/main.vala"
break;
-#line 946 "main.c"
+#line 1127 "main.c"
}
#line 48 "/home/jens/Source/shotwell/src/main.vala"
case DB_VERIFY_RESULT_NO_UPGRADE_AVAILABLE:
-#line 950 "main.c"
+#line 1131 "main.c"
{
- const gchar* _tmp19_;
- gint _tmp20_;
- GFile* _tmp21_;
- GFile* _tmp22_;
+ const gchar* _tmp17_;
+ gint _tmp18_;
+ GFile* _tmp19_;
+ GFile* _tmp20_;
+ gchar* _tmp21_;
+ gchar* _tmp22_;
gchar* _tmp23_;
- gchar* _tmp24_;
- gchar* _tmp25_;
#line 65 "/home/jens/Source/shotwell/src/main.vala"
- _tmp19_ = app_version;
+ _tmp17_ = app_version;
#line 65 "/home/jens/Source/shotwell/src/main.vala"
- _tmp20_ = schema_version;
+ _tmp18_ = schema_version;
#line 65 "/home/jens/Source/shotwell/src/main.vala"
- _tmp21_ = app_dirs_get_data_dir ();
+ _tmp19_ = app_dirs_get_data_dir ();
#line 65 "/home/jens/Source/shotwell/src/main.vala"
- _tmp22_ = _tmp21_;
+ _tmp20_ = _tmp19_;
#line 65 "/home/jens/Source/shotwell/src/main.vala"
- _tmp23_ = g_file_get_path (_tmp22_);
+ _tmp21_ = g_file_get_path (_tmp20_);
#line 65 "/home/jens/Source/shotwell/src/main.vala"
- _tmp24_ = _tmp23_;
+ _tmp22_ = _tmp21_;
#line 65 "/home/jens/Source/shotwell/src/main.vala"
- _tmp25_ = g_strdup_printf (_ ("Your photo library is not compatible with this version of Shotwell. It" \
+ _tmp23_ = g_strdup_printf (_ ("Your photo library is not compatible with this version of Shotwell. It" \
" appears it was created by Shotwell %s (schema %d). This version is %s" \
" (schema %d). Please clear your library by deleting %s and re-import y" \
-"our photos."), _tmp19_, _tmp20_, RESOURCES_APP_VERSION, DATABASE_TABLE_SCHEMA_VERSION, _tmp24_);
+"our photos."), _tmp17_, _tmp18_, RESOURCES_APP_VERSION, DATABASE_TABLE_SCHEMA_VERSION, _tmp22_);
#line 65 "/home/jens/Source/shotwell/src/main.vala"
_g_free0 (errormsg);
#line 65 "/home/jens/Source/shotwell/src/main.vala"
- errormsg = _tmp25_;
+ errormsg = _tmp23_;
#line 65 "/home/jens/Source/shotwell/src/main.vala"
- _g_free0 (_tmp24_);
+ _g_free0 (_tmp22_);
#line 65 "/home/jens/Source/shotwell/src/main.vala"
- _g_object_unref0 (_tmp22_);
+ _g_object_unref0 (_tmp20_);
#line 68 "/home/jens/Source/shotwell/src/main.vala"
break;
-#line 983 "main.c"
+#line 1164 "main.c"
}
default:
{
- DbVerifyResult _tmp26_;
- GEnumValue* _tmp27_;
- gchar* _tmp28_;
+ DbVerifyResult _tmp24_;
+ GEnumValue* _tmp25_;
+ gchar* _tmp26_;
#line 71 "/home/jens/Source/shotwell/src/main.vala"
- _tmp26_ = _result_;
+ _tmp24_ = _result_;
#line 72 "/home/jens/Source/shotwell/src/main.vala"
- _tmp27_ = g_enum_get_value (g_type_class_ref (DB_TYPE_VERIFY_RESULT), _tmp26_);
+ _tmp25_ = g_enum_get_value (g_type_class_ref (DB_TYPE_VERIFY_RESULT), _tmp24_);
#line 71 "/home/jens/Source/shotwell/src/main.vala"
- _tmp28_ = g_strdup_printf (_ ("Unknown error attempting to verify Shotwell’s database: %s"), (_tmp27_ != NULL) ? _tmp27_->value_name : NULL);
+ _tmp26_ = g_strdup_printf (_ ("Unknown error attempting to verify Shotwell’s database: %s"), (_tmp25_ != NULL) ? _tmp25_->value_name : NULL);
#line 71 "/home/jens/Source/shotwell/src/main.vala"
_g_free0 (errormsg);
#line 71 "/home/jens/Source/shotwell/src/main.vala"
- errormsg = _tmp28_;
+ errormsg = _tmp26_;
#line 73 "/home/jens/Source/shotwell/src/main.vala"
break;
-#line 1002 "main.c"
+#line 1183 "main.c"
}
}
#line 76 "/home/jens/Source/shotwell/src/main.vala"
- _tmp29_ = errormsg;
+ _tmp27_ = errormsg;
#line 76 "/home/jens/Source/shotwell/src/main.vala"
- if (_tmp29_ != NULL) {
-#line 1009 "main.c"
+ if (_tmp27_ != NULL) {
+#line 1190 "main.c"
GtkMessageDialog* dialog = NULL;
- const gchar* _tmp30_;
+ const gchar* _tmp28_;
+ GtkMessageDialog* _tmp29_;
+ GtkMessageDialog* _tmp30_;
GtkMessageDialog* _tmp31_;
GtkMessageDialog* _tmp32_;
- GtkMessageDialog* _tmp33_;
- GtkMessageDialog* _tmp34_;
#line 77 "/home/jens/Source/shotwell/src/main.vala"
- _tmp30_ = errormsg;
+ _tmp28_ = errormsg;
#line 77 "/home/jens/Source/shotwell/src/main.vala"
- _tmp31_ = (GtkMessageDialog*) gtk_message_dialog_new (NULL, GTK_DIALOG_MODAL, GTK_MESSAGE_ERROR, GTK_BUTTONS_OK, "%s", _tmp30_);
+ _tmp29_ = (GtkMessageDialog*) gtk_message_dialog_new (NULL, GTK_DIALOG_MODAL, GTK_MESSAGE_ERROR, GTK_BUTTONS_OK, "%s", _tmp28_);
#line 77 "/home/jens/Source/shotwell/src/main.vala"
- g_object_ref_sink (_tmp31_);
+ g_object_ref_sink (_tmp29_);
#line 77 "/home/jens/Source/shotwell/src/main.vala"
- dialog = _tmp31_;
+ dialog = _tmp29_;
#line 79 "/home/jens/Source/shotwell/src/main.vala"
- _tmp32_ = dialog;
+ _tmp30_ = dialog;
#line 79 "/home/jens/Source/shotwell/src/main.vala"
- gtk_window_set_title (G_TYPE_CHECK_INSTANCE_CAST (_tmp32_, gtk_window_get_type (), GtkWindow), RESOURCES_APP_TITLE);
+ gtk_window_set_title (G_TYPE_CHECK_INSTANCE_CAST (_tmp30_, gtk_window_get_type (), GtkWindow), RESOURCES_APP_TITLE);
#line 80 "/home/jens/Source/shotwell/src/main.vala"
- _tmp33_ = dialog;
+ _tmp31_ = dialog;
#line 80 "/home/jens/Source/shotwell/src/main.vala"
- gtk_dialog_run (G_TYPE_CHECK_INSTANCE_CAST (_tmp33_, gtk_dialog_get_type (), GtkDialog));
+ gtk_dialog_run (G_TYPE_CHECK_INSTANCE_CAST (_tmp31_, gtk_dialog_get_type (), GtkDialog));
#line 81 "/home/jens/Source/shotwell/src/main.vala"
- _tmp34_ = dialog;
+ _tmp32_ = dialog;
#line 81 "/home/jens/Source/shotwell/src/main.vala"
- gtk_widget_destroy (G_TYPE_CHECK_INSTANCE_CAST (_tmp34_, gtk_widget_get_type (), GtkWidget));
+ gtk_widget_destroy (G_TYPE_CHECK_INSTANCE_CAST (_tmp32_, gtk_widget_get_type (), GtkWidget));
#line 83 "/home/jens/Source/shotwell/src/main.vala"
database_table_terminate ();
#line 85 "/home/jens/Source/shotwell/src/main.vala"
@@ -1049,7 +1230,7 @@ void library_exec (gchar** mounts, int mounts_length1) {
_g_free0 (errormsg);
#line 85 "/home/jens/Source/shotwell/src/main.vala"
return;
-#line 1046 "main.c"
+#line 1227 "main.c"
}
#line 88 "/home/jens/Source/shotwell/src/main.vala"
upgrades_init ();
@@ -1064,142 +1245,127 @@ void library_exec (gchar** mounts, int mounts_length1) {
#line 92 "/home/jens/Source/shotwell/src/main.vala"
monitor_target_destroy_notify = NULL;
#line 94 "/home/jens/Source/shotwell/src/main.vala"
- _tmp35_ = commandline_options_no_startup_progress;
+ _tmp33_ = commandline_options_no_startup_progress;
#line 94 "/home/jens/Source/shotwell/src/main.vala"
- if (!_tmp35_) {
-#line 1064 "main.c"
+ if (!_tmp33_) {
+#line 1245 "main.c"
guint64 grand_total = 0ULL;
- PhotoTable* _tmp36_;
- PhotoTable* _tmp37_;
- gint _tmp38_;
- EventTable* _tmp39_;
- EventTable* _tmp40_;
- gint _tmp41_;
- TagTable* _tmp42_;
- TagTable* _tmp43_;
- gint _tmp44_;
- VideoTable* _tmp45_;
- VideoTable* _tmp46_;
- gint _tmp47_;
- Upgrades* _tmp48_;
- Upgrades* _tmp49_;
- guint64 _tmp50_;
- guint64 _tmp51_;
- guint64 _tmp52_;
-#line 98 "/home/jens/Source/shotwell/src/main.vala"
- _tmp36_ = photo_table_get_instance ();
-#line 98 "/home/jens/Source/shotwell/src/main.vala"
- _tmp37_ = _tmp36_;
-#line 98 "/home/jens/Source/shotwell/src/main.vala"
- _tmp38_ = database_table_get_row_count (G_TYPE_CHECK_INSTANCE_CAST (_tmp37_, TYPE_DATABASE_TABLE, DatabaseTable));
-#line 98 "/home/jens/Source/shotwell/src/main.vala"
- _tmp39_ = event_table_get_instance ();
+ PhotoTable* _tmp34_;
+ PhotoTable* _tmp35_;
+ EventTable* _tmp36_;
+ EventTable* _tmp37_;
+ TagTable* _tmp38_;
+ TagTable* _tmp39_;
+ VideoTable* _tmp40_;
+ VideoTable* _tmp41_;
+ Upgrades* _tmp42_;
+ Upgrades* _tmp43_;
+ guint64 _tmp44_;
+ guint64 _tmp45_;
#line 98 "/home/jens/Source/shotwell/src/main.vala"
- _tmp40_ = _tmp39_;
+ _tmp34_ = photo_table_get_instance ();
#line 98 "/home/jens/Source/shotwell/src/main.vala"
- _tmp41_ = database_table_get_row_count (G_TYPE_CHECK_INSTANCE_CAST (_tmp40_, TYPE_DATABASE_TABLE, DatabaseTable));
-#line 98 "/home/jens/Source/shotwell/src/main.vala"
- _tmp42_ = tag_table_get_instance ();
-#line 98 "/home/jens/Source/shotwell/src/main.vala"
- _tmp43_ = _tmp42_;
+ _tmp35_ = _tmp34_;
#line 98 "/home/jens/Source/shotwell/src/main.vala"
- _tmp44_ = database_table_get_row_count (G_TYPE_CHECK_INSTANCE_CAST (_tmp43_, TYPE_DATABASE_TABLE, DatabaseTable));
+ _tmp36_ = event_table_get_instance ();
#line 98 "/home/jens/Source/shotwell/src/main.vala"
- _tmp45_ = video_table_get_instance ();
+ _tmp37_ = _tmp36_;
#line 98 "/home/jens/Source/shotwell/src/main.vala"
- _tmp46_ = _tmp45_;
+ _tmp38_ = tag_table_get_instance ();
#line 98 "/home/jens/Source/shotwell/src/main.vala"
- _tmp47_ = database_table_get_row_count (G_TYPE_CHECK_INSTANCE_CAST (_tmp46_, TYPE_DATABASE_TABLE, DatabaseTable));
+ _tmp39_ = _tmp38_;
#line 98 "/home/jens/Source/shotwell/src/main.vala"
- _tmp48_ = upgrades_get_instance ();
+ _tmp40_ = video_table_get_instance ();
#line 98 "/home/jens/Source/shotwell/src/main.vala"
- _tmp49_ = _tmp48_;
+ _tmp41_ = _tmp40_;
#line 98 "/home/jens/Source/shotwell/src/main.vala"
- _tmp50_ = upgrades_get_step_count (_tmp49_);
+ _tmp42_ = upgrades_get_instance ();
#line 98 "/home/jens/Source/shotwell/src/main.vala"
- _tmp51_ = (((_tmp38_ + _tmp41_) + _tmp44_) + _tmp47_) + _tmp50_;
+ _tmp43_ = _tmp42_;
#line 98 "/home/jens/Source/shotwell/src/main.vala"
- _upgrades_unref0 (_tmp49_);
+ _tmp44_ = (((database_table_get_row_count (G_TYPE_CHECK_INSTANCE_CAST (_tmp35_, TYPE_DATABASE_TABLE, DatabaseTable)) + database_table_get_row_count (G_TYPE_CHECK_INSTANCE_CAST (_tmp37_, TYPE_DATABASE_TABLE, DatabaseTable))) + database_table_get_row_count (G_TYPE_CHECK_INSTANCE_CAST (_tmp39_, TYPE_DATABASE_TABLE, DatabaseTable))) + database_table_get_row_count (G_TYPE_CHECK_INSTANCE_CAST (_tmp41_, TYPE_DATABASE_TABLE, DatabaseTable))) + upgrades_get_step_count (_tmp43_);
#line 98 "/home/jens/Source/shotwell/src/main.vala"
- _database_table_unref0 (_tmp46_);
+ _upgrades_unref0 (_tmp43_);
#line 98 "/home/jens/Source/shotwell/src/main.vala"
- _database_table_unref0 (_tmp43_);
+ _database_table_unref0 (_tmp41_);
#line 98 "/home/jens/Source/shotwell/src/main.vala"
- _database_table_unref0 (_tmp40_);
+ _database_table_unref0 (_tmp39_);
#line 98 "/home/jens/Source/shotwell/src/main.vala"
_database_table_unref0 (_tmp37_);
#line 98 "/home/jens/Source/shotwell/src/main.vala"
- grand_total = _tmp51_;
+ _database_table_unref0 (_tmp35_);
+#line 98 "/home/jens/Source/shotwell/src/main.vala"
+ grand_total = _tmp44_;
#line 103 "/home/jens/Source/shotwell/src/main.vala"
- _tmp52_ = grand_total;
+ _tmp45_ = grand_total;
#line 103 "/home/jens/Source/shotwell/src/main.vala"
- if (_tmp52_ > ((guint64) 5000)) {
-#line 1131 "main.c"
- ProgressDialog* _tmp53_;
- ProgressDialog* _tmp54_;
+ if (_tmp45_ > ((guint64) 5000)) {
+#line 1297 "main.c"
+ ProgressDialog* _tmp46_;
+ ProgressDialog* _tmp47_;
+ ProgressDialog* _tmp48_;
+ guint64 _tmp54_;
ProgressDialog* _tmp55_;
- guint64 _tmp61_;
- ProgressDialog* _tmp62_;
- AggregateProgressMonitor* _tmp63_;
- AggregateProgressMonitor* _tmp64_;
+ AggregateProgressMonitor* _tmp56_;
+ AggregateProgressMonitor* _tmp57_;
#line 104 "/home/jens/Source/shotwell/src/main.vala"
- _tmp53_ = progress_dialog_new (NULL, _ ("Loading Shotwell"), NULL);
+ _tmp46_ = progress_dialog_new (NULL, _ ("Loading Shotwell"), NULL);
#line 104 "/home/jens/Source/shotwell/src/main.vala"
- g_object_ref_sink (_tmp53_);
+ g_object_ref_sink (_tmp46_);
#line 104 "/home/jens/Source/shotwell/src/main.vala"
_g_object_unref0 (progress_dialog);
#line 104 "/home/jens/Source/shotwell/src/main.vala"
- progress_dialog = _tmp53_;
+ progress_dialog = _tmp46_;
#line 105 "/home/jens/Source/shotwell/src/main.vala"
- _tmp54_ = progress_dialog;
+ _tmp47_ = progress_dialog;
#line 105 "/home/jens/Source/shotwell/src/main.vala"
- progress_dialog_update_display_every (_tmp54_, 100);
+ progress_dialog_update_display_every (_tmp47_, 100);
#line 106 "/home/jens/Source/shotwell/src/main.vala"
- _tmp55_ = progress_dialog;
+ _tmp48_ = progress_dialog;
#line 106 "/home/jens/Source/shotwell/src/main.vala"
- progress_dialog_set_minimum_on_screen_time_msec (_tmp55_, 250);
-#line 1155 "main.c"
+ progress_dialog_set_minimum_on_screen_time_msec (_tmp48_, 250);
+#line 1321 "main.c"
{
- GdkPixbuf* _tmp56_ = NULL;
- GdkPixbuf* _tmp57_;
- ProgressDialog* _tmp58_;
+ GdkPixbuf* _tmp49_ = NULL;
+ GdkPixbuf* _tmp50_;
+ ProgressDialog* _tmp51_;
#line 108 "/home/jens/Source/shotwell/src/main.vala"
- _tmp57_ = gdk_pixbuf_new_from_resource ("/org/gnome/Shotwell/icons/shotwell.svg", &_inner_error_);
+ _tmp50_ = gdk_pixbuf_new_from_resource ("/org/gnome/Shotwell/icons/shotwell.svg", &_inner_error_);
#line 108 "/home/jens/Source/shotwell/src/main.vala"
- _tmp56_ = _tmp57_;
+ _tmp49_ = _tmp50_;
#line 108 "/home/jens/Source/shotwell/src/main.vala"
if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 1166 "main.c"
+#line 1332 "main.c"
goto __catch234_g_error;
}
#line 108 "/home/jens/Source/shotwell/src/main.vala"
- _tmp58_ = progress_dialog;
+ _tmp51_ = progress_dialog;
#line 108 "/home/jens/Source/shotwell/src/main.vala"
- gtk_window_set_icon (G_TYPE_CHECK_INSTANCE_CAST (_tmp58_, gtk_window_get_type (), GtkWindow), _tmp56_);
+ gtk_window_set_icon (G_TYPE_CHECK_INSTANCE_CAST (_tmp51_, gtk_window_get_type (), GtkWindow), _tmp49_);
#line 107 "/home/jens/Source/shotwell/src/main.vala"
- _g_object_unref0 (_tmp56_);
-#line 1175 "main.c"
+ _g_object_unref0 (_tmp49_);
+#line 1341 "main.c"
}
goto __finally234;
__catch234_g_error:
{
GError* err = NULL;
- GError* _tmp59_;
- const gchar* _tmp60_;
+ GError* _tmp52_;
+ const gchar* _tmp53_;
#line 107 "/home/jens/Source/shotwell/src/main.vala"
err = _inner_error_;
#line 107 "/home/jens/Source/shotwell/src/main.vala"
_inner_error_ = NULL;
#line 110 "/home/jens/Source/shotwell/src/main.vala"
- _tmp59_ = err;
+ _tmp52_ = err;
#line 110 "/home/jens/Source/shotwell/src/main.vala"
- _tmp60_ = _tmp59_->message;
+ _tmp53_ = _tmp52_->message;
#line 110 "/home/jens/Source/shotwell/src/main.vala"
g_debug ("main.vala:110: Warning - could not load application icon for loading w" \
-"indow: %s", _tmp60_);
+"indow: %s", _tmp53_);
#line 107 "/home/jens/Source/shotwell/src/main.vala"
_g_error_free0 (err);
-#line 1195 "main.c"
+#line 1361 "main.c"
}
__finally234:
#line 107 "/home/jens/Source/shotwell/src/main.vala"
@@ -1226,20 +1392,20 @@ void library_exec (gchar** mounts, int mounts_length1) {
g_clear_error (&_inner_error_);
#line 107 "/home/jens/Source/shotwell/src/main.vala"
return;
-#line 1222 "main.c"
+#line 1388 "main.c"
}
#line 113 "/home/jens/Source/shotwell/src/main.vala"
- _tmp61_ = grand_total;
+ _tmp54_ = grand_total;
#line 113 "/home/jens/Source/shotwell/src/main.vala"
- _tmp62_ = progress_dialog;
+ _tmp55_ = progress_dialog;
#line 113 "/home/jens/Source/shotwell/src/main.vala"
- _tmp63_ = aggregate_progress_monitor_new (_tmp61_, _progress_dialog_monitor_progress_monitor, _tmp62_);
+ _tmp56_ = aggregate_progress_monitor_new (_tmp54_, _progress_dialog_monitor_progress_monitor, _tmp55_);
#line 113 "/home/jens/Source/shotwell/src/main.vala"
_aggregate_progress_monitor_unref0 (aggregate_monitor);
#line 113 "/home/jens/Source/shotwell/src/main.vala"
- aggregate_monitor = _tmp63_;
+ aggregate_monitor = _tmp56_;
#line 114 "/home/jens/Source/shotwell/src/main.vala"
- _tmp64_ = aggregate_monitor;
+ _tmp57_ = aggregate_monitor;
#line 114 "/home/jens/Source/shotwell/src/main.vala"
(monitor_target_destroy_notify == NULL) ? NULL : (monitor_target_destroy_notify (monitor_target), NULL);
#line 114 "/home/jens/Source/shotwell/src/main.vala"
@@ -1251,10 +1417,10 @@ void library_exec (gchar** mounts, int mounts_length1) {
#line 114 "/home/jens/Source/shotwell/src/main.vala"
monitor = _aggregate_progress_monitor_monitor_progress_monitor;
#line 114 "/home/jens/Source/shotwell/src/main.vala"
- monitor_target = aggregate_progress_monitor_ref (_tmp64_);
+ monitor_target = aggregate_progress_monitor_ref (_tmp57_);
#line 114 "/home/jens/Source/shotwell/src/main.vala"
monitor_target_destroy_notify = aggregate_progress_monitor_unref;
-#line 1250 "main.c"
+#line 1416 "main.c"
}
}
#line 118 "/home/jens/Source/shotwell/src/main.vala"
@@ -1264,162 +1430,162 @@ void library_exec (gchar** mounts, int mounts_length1) {
#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;
+ _tmp58_ = aggregate_monitor;
#line 123 "/home/jens/Source/shotwell/src/main.vala"
- if (_tmp65_ != NULL) {
-#line 1263 "main.c"
- AggregateProgressMonitor* _tmp66_;
+ if (_tmp58_ != NULL) {
+#line 1429 "main.c"
+ AggregateProgressMonitor* _tmp59_;
#line 124 "/home/jens/Source/shotwell/src/main.vala"
- _tmp66_ = aggregate_monitor;
+ _tmp59_ = aggregate_monitor;
#line 124 "/home/jens/Source/shotwell/src/main.vala"
- aggregate_progress_monitor_next_step (_tmp66_, "LibraryPhoto.init");
-#line 1269 "main.c"
+ aggregate_progress_monitor_next_step (_tmp59_, "LibraryPhoto.init");
+#line 1435 "main.c"
}
#line 125 "/home/jens/Source/shotwell/src/main.vala"
- _tmp67_ = monitor;
+ _tmp60_ = monitor;
#line 125 "/home/jens/Source/shotwell/src/main.vala"
- _tmp67__target = monitor_target;
+ _tmp60__target = monitor_target;
#line 125 "/home/jens/Source/shotwell/src/main.vala"
- library_photo_init (_tmp67_, _tmp67__target);
+ library_photo_init (_tmp60_, _tmp60__target);
#line 126 "/home/jens/Source/shotwell/src/main.vala"
- _tmp68_ = aggregate_monitor;
+ _tmp61_ = aggregate_monitor;
#line 126 "/home/jens/Source/shotwell/src/main.vala"
- if (_tmp68_ != NULL) {
-#line 1281 "main.c"
- AggregateProgressMonitor* _tmp69_;
+ if (_tmp61_ != NULL) {
+#line 1447 "main.c"
+ AggregateProgressMonitor* _tmp62_;
#line 127 "/home/jens/Source/shotwell/src/main.vala"
- _tmp69_ = aggregate_monitor;
+ _tmp62_ = aggregate_monitor;
#line 127 "/home/jens/Source/shotwell/src/main.vala"
- aggregate_progress_monitor_next_step (_tmp69_, "Video.init");
-#line 1287 "main.c"
+ aggregate_progress_monitor_next_step (_tmp62_, "Video.init");
+#line 1453 "main.c"
}
#line 128 "/home/jens/Source/shotwell/src/main.vala"
- _tmp70_ = monitor;
+ _tmp63_ = monitor;
#line 128 "/home/jens/Source/shotwell/src/main.vala"
- _tmp70__target = monitor_target;
+ _tmp63__target = monitor_target;
#line 128 "/home/jens/Source/shotwell/src/main.vala"
- video_init (_tmp70_, _tmp70__target);
+ video_init (_tmp63_, _tmp63__target);
#line 129 "/home/jens/Source/shotwell/src/main.vala"
- _tmp71_ = aggregate_monitor;
+ _tmp64_ = aggregate_monitor;
#line 129 "/home/jens/Source/shotwell/src/main.vala"
- if (_tmp71_ != NULL) {
-#line 1299 "main.c"
- AggregateProgressMonitor* _tmp72_;
+ if (_tmp64_ != NULL) {
+#line 1465 "main.c"
+ AggregateProgressMonitor* _tmp65_;
#line 130 "/home/jens/Source/shotwell/src/main.vala"
- _tmp72_ = aggregate_monitor;
+ _tmp65_ = aggregate_monitor;
#line 130 "/home/jens/Source/shotwell/src/main.vala"
- aggregate_progress_monitor_next_step (_tmp72_, "Upgrades.execute");
-#line 1305 "main.c"
+ aggregate_progress_monitor_next_step (_tmp65_, "Upgrades.execute");
+#line 1471 "main.c"
}
#line 131 "/home/jens/Source/shotwell/src/main.vala"
- _tmp73_ = upgrades_get_instance ();
+ _tmp66_ = upgrades_get_instance ();
#line 131 "/home/jens/Source/shotwell/src/main.vala"
- _tmp74_ = _tmp73_;
+ _tmp67_ = _tmp66_;
#line 131 "/home/jens/Source/shotwell/src/main.vala"
- upgrades_execute (_tmp74_, NULL, NULL);
+ upgrades_execute (_tmp67_, NULL, NULL);
#line 131 "/home/jens/Source/shotwell/src/main.vala"
- _upgrades_unref0 (_tmp74_);
+ _upgrades_unref0 (_tmp67_);
#line 133 "/home/jens/Source/shotwell/src/main.vala"
library_monitor_pool_init ();
#line 134 "/home/jens/Source/shotwell/src/main.vala"
media_collection_registry_init ();
#line 135 "/home/jens/Source/shotwell/src/main.vala"
- _tmp75_ = media_collection_registry_get_instance ();
+ _tmp68_ = media_collection_registry_get_instance ();
#line 135 "/home/jens/Source/shotwell/src/main.vala"
- registry = _tmp75_;
+ registry = _tmp68_;
#line 136 "/home/jens/Source/shotwell/src/main.vala"
- _tmp76_ = registry;
+ _tmp69_ = registry;
#line 136 "/home/jens/Source/shotwell/src/main.vala"
- _tmp77_ = library_photo_global;
+ _tmp70_ = library_photo_global;
#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));
+ media_collection_registry_register_collection (_tmp69_, G_TYPE_CHECK_INSTANCE_CAST (_tmp70_, TYPE_MEDIA_SOURCE_COLLECTION, MediaSourceCollection));
#line 137 "/home/jens/Source/shotwell/src/main.vala"
- _tmp78_ = registry;
+ _tmp71_ = registry;
#line 137 "/home/jens/Source/shotwell/src/main.vala"
- _tmp79_ = video_global;
+ _tmp72_ = video_global;
#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));
+ media_collection_registry_register_collection (_tmp71_, G_TYPE_CHECK_INSTANCE_CAST (_tmp72_, TYPE_MEDIA_SOURCE_COLLECTION, MediaSourceCollection));
#line 139 "/home/jens/Source/shotwell/src/main.vala"
- _tmp80_ = aggregate_monitor;
+ _tmp73_ = aggregate_monitor;
#line 139 "/home/jens/Source/shotwell/src/main.vala"
- if (_tmp80_ != NULL) {
-#line 1339 "main.c"
- AggregateProgressMonitor* _tmp81_;
+ if (_tmp73_ != NULL) {
+#line 1505 "main.c"
+ AggregateProgressMonitor* _tmp74_;
#line 140 "/home/jens/Source/shotwell/src/main.vala"
- _tmp81_ = aggregate_monitor;
+ _tmp74_ = aggregate_monitor;
#line 140 "/home/jens/Source/shotwell/src/main.vala"
- aggregate_progress_monitor_next_step (_tmp81_, "Event.init");
-#line 1345 "main.c"
+ aggregate_progress_monitor_next_step (_tmp74_, "Event.init");
+#line 1511 "main.c"
}
#line 141 "/home/jens/Source/shotwell/src/main.vala"
- _tmp82_ = monitor;
+ _tmp75_ = monitor;
#line 141 "/home/jens/Source/shotwell/src/main.vala"
- _tmp82__target = monitor_target;
+ _tmp75__target = monitor_target;
#line 141 "/home/jens/Source/shotwell/src/main.vala"
- event_init (_tmp82_, _tmp82__target);
+ event_init (_tmp75_, _tmp75__target);
#line 142 "/home/jens/Source/shotwell/src/main.vala"
- _tmp83_ = aggregate_monitor;
+ _tmp76_ = aggregate_monitor;
#line 142 "/home/jens/Source/shotwell/src/main.vala"
- if (_tmp83_ != NULL) {
-#line 1357 "main.c"
- AggregateProgressMonitor* _tmp84_;
+ if (_tmp76_ != NULL) {
+#line 1523 "main.c"
+ AggregateProgressMonitor* _tmp77_;
#line 143 "/home/jens/Source/shotwell/src/main.vala"
- _tmp84_ = aggregate_monitor;
+ _tmp77_ = aggregate_monitor;
#line 143 "/home/jens/Source/shotwell/src/main.vala"
- aggregate_progress_monitor_next_step (_tmp84_, "Tag.init");
-#line 1363 "main.c"
+ aggregate_progress_monitor_next_step (_tmp77_, "Tag.init");
+#line 1529 "main.c"
}
#line 144 "/home/jens/Source/shotwell/src/main.vala"
- _tmp85_ = monitor;
+ _tmp78_ = monitor;
#line 144 "/home/jens/Source/shotwell/src/main.vala"
- _tmp85__target = monitor_target;
+ _tmp78__target = monitor_target;
#line 144 "/home/jens/Source/shotwell/src/main.vala"
- tag_init (_tmp85_, _tmp85__target);
+ tag_init (_tmp78_, _tmp78__target);
#line 146 "/home/jens/Source/shotwell/src/main.vala"
metadata_writer_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 ();
+ _tmp79_ = application_get_instance ();
#line 149 "/home/jens/Source/shotwell/src/main.vala"
- _tmp87_ = _tmp86_;
+ _tmp80_ = _tmp79_;
#line 149 "/home/jens/Source/shotwell/src/main.vala"
- g_signal_emit_by_name (_tmp87_, "init-done");
+ g_signal_emit_by_name (_tmp80_, "init-done");
#line 149 "/home/jens/Source/shotwell/src/main.vala"
- _application_unref0 (_tmp87_);
+ _application_unref0 (_tmp80_);
#line 152 "/home/jens/Source/shotwell/src/main.vala"
- _tmp88_ = aggregate_monitor;
+ _tmp81_ = aggregate_monitor;
#line 152 "/home/jens/Source/shotwell/src/main.vala"
- if (_tmp88_ != NULL) {
-#line 1387 "main.c"
- AggregateProgressMonitor* _tmp89_;
+ if (_tmp81_ != NULL) {
+#line 1553 "main.c"
+ AggregateProgressMonitor* _tmp82_;
#line 153 "/home/jens/Source/shotwell/src/main.vala"
- _tmp89_ = aggregate_monitor;
+ _tmp82_ = aggregate_monitor;
#line 153 "/home/jens/Source/shotwell/src/main.vala"
- aggregate_progress_monitor_next_step (_tmp89_, "LibraryWindow");
-#line 1393 "main.c"
+ aggregate_progress_monitor_next_step (_tmp82_, "LibraryWindow");
+#line 1559 "main.c"
}
#line 154 "/home/jens/Source/shotwell/src/main.vala"
- _tmp90_ = monitor;
+ _tmp83_ = monitor;
#line 154 "/home/jens/Source/shotwell/src/main.vala"
- _tmp90__target = monitor_target;
+ _tmp83__target = monitor_target;
#line 154 "/home/jens/Source/shotwell/src/main.vala"
- _tmp91_ = library_window_new (_tmp90_, _tmp90__target);
+ _tmp84_ = library_window_new (_tmp83_, _tmp83__target);
#line 154 "/home/jens/Source/shotwell/src/main.vala"
- g_object_ref_sink (_tmp91_);
+ g_object_ref_sink (_tmp84_);
#line 154 "/home/jens/Source/shotwell/src/main.vala"
- library_window = _tmp91_;
+ library_window = _tmp84_;
#line 156 "/home/jens/Source/shotwell/src/main.vala"
- _tmp92_ = aggregate_monitor;
+ _tmp85_ = aggregate_monitor;
#line 156 "/home/jens/Source/shotwell/src/main.vala"
- if (_tmp92_ != NULL) {
-#line 1409 "main.c"
- AggregateProgressMonitor* _tmp93_;
+ if (_tmp85_ != NULL) {
+#line 1575 "main.c"
+ AggregateProgressMonitor* _tmp86_;
#line 157 "/home/jens/Source/shotwell/src/main.vala"
- _tmp93_ = aggregate_monitor;
+ _tmp86_ = aggregate_monitor;
#line 157 "/home/jens/Source/shotwell/src/main.vala"
- aggregate_progress_monitor_next_step (_tmp93_, "done");
-#line 1415 "main.c"
+ aggregate_progress_monitor_next_step (_tmp86_, "done");
+#line 1581 "main.c"
}
#line 162 "/home/jens/Source/shotwell/src/main.vala"
(monitor_target_destroy_notify == NULL) ? NULL : (monitor_target_destroy_notify (monitor_target), NULL);
@@ -1440,228 +1606,219 @@ void library_exec (gchar** mounts, int mounts_length1) {
#line 163 "/home/jens/Source/shotwell/src/main.vala"
aggregate_monitor = NULL;
#line 164 "/home/jens/Source/shotwell/src/main.vala"
- _tmp94_ = progress_dialog;
+ _tmp87_ = progress_dialog;
#line 164 "/home/jens/Source/shotwell/src/main.vala"
- if (_tmp94_ != NULL) {
-#line 1439 "main.c"
- ProgressDialog* _tmp95_;
+ if (_tmp87_ != NULL) {
+#line 1605 "main.c"
+ ProgressDialog* _tmp88_;
#line 165 "/home/jens/Source/shotwell/src/main.vala"
- _tmp95_ = progress_dialog;
+ _tmp88_ = progress_dialog;
#line 165 "/home/jens/Source/shotwell/src/main.vala"
- gtk_widget_destroy (G_TYPE_CHECK_INSTANCE_CAST (_tmp95_, gtk_widget_get_type (), GtkWidget));
-#line 1445 "main.c"
+ gtk_widget_destroy (G_TYPE_CHECK_INSTANCE_CAST (_tmp88_, gtk_widget_get_type (), GtkWidget));
+#line 1611 "main.c"
}
#line 166 "/home/jens/Source/shotwell/src/main.vala"
_g_object_unref0 (progress_dialog);
#line 166 "/home/jens/Source/shotwell/src/main.vala"
progress_dialog = NULL;
-#line 169 "/home/jens/Source/shotwell/src/main.vala"
- _tmp96_ = mounts;
-#line 169 "/home/jens/Source/shotwell/src/main.vala"
- _tmp96__length1 = mounts_length1;
-#line 1455 "main.c"
+#line 1617 "main.c"
{
gchar** mount_collection = NULL;
gint mount_collection_length1 = 0;
gint _mount_collection_size_ = 0;
gint mount_it = 0;
#line 169 "/home/jens/Source/shotwell/src/main.vala"
- mount_collection = _tmp96_;
+ mount_collection = mounts;
#line 169 "/home/jens/Source/shotwell/src/main.vala"
- mount_collection_length1 = _tmp96__length1;
+ mount_collection_length1 = mounts_length1;
#line 169 "/home/jens/Source/shotwell/src/main.vala"
- for (mount_it = 0; mount_it < _tmp96__length1; mount_it = mount_it + 1) {
-#line 1467 "main.c"
- gchar* _tmp97_;
+ for (mount_it = 0; mount_it < mounts_length1; mount_it = mount_it + 1) {
+#line 1629 "main.c"
+ gchar* _tmp89_;
gchar* mount = NULL;
#line 169 "/home/jens/Source/shotwell/src/main.vala"
- _tmp97_ = g_strdup (mount_collection[mount_it]);
+ _tmp89_ = g_strdup (mount_collection[mount_it]);
#line 169 "/home/jens/Source/shotwell/src/main.vala"
- mount = _tmp97_;
-#line 1474 "main.c"
+ mount = _tmp89_;
+#line 1636 "main.c"
{
- LibraryWindow* _tmp98_;
- const gchar* _tmp99_;
+ LibraryWindow* _tmp90_;
+ const gchar* _tmp91_;
#line 170 "/home/jens/Source/shotwell/src/main.vala"
- _tmp98_ = library_window;
+ _tmp90_ = library_window;
#line 170 "/home/jens/Source/shotwell/src/main.vala"
- _tmp99_ = mount;
+ _tmp91_ = mount;
#line 170 "/home/jens/Source/shotwell/src/main.vala"
- library_window_mounted_camera_shell_notification (_tmp98_, _tmp99_, TRUE);
+ library_window_mounted_camera_shell_notification (_tmp90_, _tmp91_, TRUE);
#line 169 "/home/jens/Source/shotwell/src/main.vala"
_g_free0 (mount);
-#line 1486 "main.c"
+#line 1648 "main.c"
}
}
}
#line 172 "/home/jens/Source/shotwell/src/main.vala"
- _tmp100_ = library_window;
+ _tmp92_ = library_window;
#line 172 "/home/jens/Source/shotwell/src/main.vala"
- gtk_widget_show_all (G_TYPE_CHECK_INSTANCE_CAST (_tmp100_, gtk_widget_get_type (), GtkWidget));
+ gtk_widget_show_all (G_TYPE_CHECK_INSTANCE_CAST (_tmp92_, gtk_widget_get_type (), GtkWidget));
#line 174 "/home/jens/Source/shotwell/src/main.vala"
- _tmp101_ = g_new0 (WelcomeServiceEntry*, 0 + 1);
+ _tmp93_ = g_new0 (WelcomeServiceEntry*, 0 + 1);
#line 174 "/home/jens/Source/shotwell/src/main.vala"
- selected_import_entries = _tmp101_;
+ selected_import_entries = _tmp93_;
#line 174 "/home/jens/Source/shotwell/src/main.vala"
selected_import_entries_length1 = 0;
#line 174 "/home/jens/Source/shotwell/src/main.vala"
_selected_import_entries_size_ = selected_import_entries_length1;
#line 175 "/home/jens/Source/shotwell/src/main.vala"
- _tmp103_ = config_facade_get_instance ();
+ _tmp95_ = config_facade_get_instance ();
#line 175 "/home/jens/Source/shotwell/src/main.vala"
- _tmp104_ = _tmp103_;
+ _tmp96_ = _tmp95_;
#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));
+ _tmp97_ = configuration_facade_get_show_welcome_dialog (G_TYPE_CHECK_INSTANCE_CAST (_tmp96_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade));
#line 175 "/home/jens/Source/shotwell/src/main.vala"
- _tmp106_ = _tmp105_;
+ _g_object_unref0 (_tmp96_);
#line 175 "/home/jens/Source/shotwell/src/main.vala"
- _g_object_unref0 (_tmp104_);
-#line 175 "/home/jens/Source/shotwell/src/main.vala"
- if (_tmp106_) {
-#line 1514 "main.c"
- LibraryPhotoSourceCollection* _tmp107_;
- gint _tmp108_;
-#line 176 "/home/jens/Source/shotwell/src/main.vala"
- _tmp107_ = library_photo_global;
+ if (_tmp97_) {
+#line 1674 "main.c"
+ LibraryPhotoSourceCollection* _tmp98_;
#line 176 "/home/jens/Source/shotwell/src/main.vala"
- _tmp108_ = data_collection_get_count (G_TYPE_CHECK_INSTANCE_CAST (_tmp107_, TYPE_DATA_COLLECTION, DataCollection));
+ _tmp98_ = library_photo_global;
#line 176 "/home/jens/Source/shotwell/src/main.vala"
- _tmp102_ = _tmp108_ == 0;
-#line 1523 "main.c"
+ _tmp94_ = data_collection_get_count (G_TYPE_CHECK_INSTANCE_CAST (_tmp98_, TYPE_DATA_COLLECTION, DataCollection)) == 0;
+#line 1680 "main.c"
} else {
#line 175 "/home/jens/Source/shotwell/src/main.vala"
- _tmp102_ = FALSE;
-#line 1527 "main.c"
+ _tmp94_ = FALSE;
+#line 1684 "main.c"
}
#line 175 "/home/jens/Source/shotwell/src/main.vala"
- if (_tmp102_) {
-#line 1531 "main.c"
+ if (_tmp94_) {
+#line 1688 "main.c"
WelcomeDialog* welcome = NULL;
- LibraryWindow* _tmp109_;
- WelcomeDialog* _tmp110_;
- ConfigFacade* _tmp111_;
- ConfigFacade* _tmp112_;
- WelcomeDialog* _tmp113_;
- WelcomeServiceEntry** _tmp114_ = NULL;
- gint _tmp115_;
- gboolean _tmp116_ = FALSE;
- gboolean _tmp117_;
+ LibraryWindow* _tmp99_;
+ WelcomeDialog* _tmp100_;
+ ConfigFacade* _tmp101_;
+ ConfigFacade* _tmp102_;
+ WelcomeDialog* _tmp103_;
+ WelcomeServiceEntry** _tmp104_ = NULL;
+ gint _tmp105_;
+ gboolean _tmp106_ = FALSE;
+ gboolean _tmp107_;
#line 177 "/home/jens/Source/shotwell/src/main.vala"
- _tmp109_ = library_window;
+ _tmp99_ = library_window;
#line 177 "/home/jens/Source/shotwell/src/main.vala"
- _tmp110_ = welcome_dialog_new (G_TYPE_CHECK_INSTANCE_CAST (_tmp109_, gtk_window_get_type (), GtkWindow));
+ _tmp100_ = welcome_dialog_new (G_TYPE_CHECK_INSTANCE_CAST (_tmp99_, gtk_window_get_type (), GtkWindow));
#line 177 "/home/jens/Source/shotwell/src/main.vala"
- g_object_ref_sink (_tmp110_);
+ g_object_ref_sink (_tmp100_);
#line 177 "/home/jens/Source/shotwell/src/main.vala"
- welcome = _tmp110_;
+ welcome = _tmp100_;
#line 178 "/home/jens/Source/shotwell/src/main.vala"
- _tmp111_ = config_facade_get_instance ();
+ _tmp101_ = config_facade_get_instance ();
#line 178 "/home/jens/Source/shotwell/src/main.vala"
- _tmp112_ = _tmp111_;
+ _tmp102_ = _tmp101_;
#line 178 "/home/jens/Source/shotwell/src/main.vala"
- _tmp113_ = welcome;
+ _tmp103_ = welcome;
#line 178 "/home/jens/Source/shotwell/src/main.vala"
- _tmp117_ = welcome_dialog_execute (_tmp113_, &_tmp114_, &_tmp115_, &_tmp116_);
+ _tmp107_ = welcome_dialog_execute (_tmp103_, &_tmp104_, &_tmp105_, &_tmp106_);
#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 178 "/home/jens/Source/shotwell/src/main.vala"
- selected_import_entries = _tmp114_;
+ selected_import_entries = _tmp104_;
#line 178 "/home/jens/Source/shotwell/src/main.vala"
- selected_import_entries_length1 = _tmp115_;
+ selected_import_entries_length1 = _tmp105_;
#line 178 "/home/jens/Source/shotwell/src/main.vala"
_selected_import_entries_size_ = selected_import_entries_length1;
#line 178 "/home/jens/Source/shotwell/src/main.vala"
- do_system_pictures_import = _tmp116_;
+ do_system_pictures_import = _tmp106_;
#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_);
+ configuration_facade_set_show_welcome_dialog (G_TYPE_CHECK_INSTANCE_CAST (_tmp102_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade), _tmp107_);
#line 178 "/home/jens/Source/shotwell/src/main.vala"
- _g_object_unref0 (_tmp112_);
+ _g_object_unref0 (_tmp102_);
#line 175 "/home/jens/Source/shotwell/src/main.vala"
_g_object_unref0 (welcome);
-#line 1574 "main.c"
+#line 1731 "main.c"
} else {
- ConfigFacade* _tmp118_;
- ConfigFacade* _tmp119_;
+ ConfigFacade* _tmp108_;
+ ConfigFacade* _tmp109_;
#line 181 "/home/jens/Source/shotwell/src/main.vala"
- _tmp118_ = config_facade_get_instance ();
+ _tmp108_ = config_facade_get_instance ();
#line 181 "/home/jens/Source/shotwell/src/main.vala"
- _tmp119_ = _tmp118_;
+ _tmp109_ = _tmp108_;
#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);
+ configuration_facade_set_show_welcome_dialog (G_TYPE_CHECK_INSTANCE_CAST (_tmp109_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade), FALSE);
#line 181 "/home/jens/Source/shotwell/src/main.vala"
- _g_object_unref0 (_tmp119_);
-#line 1586 "main.c"
+ _g_object_unref0 (_tmp109_);
+#line 1743 "main.c"
}
#line 184 "/home/jens/Source/shotwell/src/main.vala"
- _tmp120_ = selected_import_entries;
+ _tmp110_ = selected_import_entries;
#line 184 "/home/jens/Source/shotwell/src/main.vala"
- _tmp120__length1 = selected_import_entries_length1;
+ _tmp110__length1 = selected_import_entries_length1;
#line 184 "/home/jens/Source/shotwell/src/main.vala"
- if (_tmp120__length1 > 0) {
-#line 1594 "main.c"
- WelcomeServiceEntry** _tmp121_;
- gint _tmp121__length1;
+ if (_tmp110__length1 > 0) {
+#line 1751 "main.c"
+ WelcomeServiceEntry** _tmp111_;
+ gint _tmp111__length1;
#line 185 "/home/jens/Source/shotwell/src/main.vala"
do_external_import = TRUE;
#line 186 "/home/jens/Source/shotwell/src/main.vala"
- _tmp121_ = selected_import_entries;
+ _tmp111_ = selected_import_entries;
#line 186 "/home/jens/Source/shotwell/src/main.vala"
- _tmp121__length1 = selected_import_entries_length1;
-#line 1603 "main.c"
+ _tmp111__length1 = selected_import_entries_length1;
+#line 1760 "main.c"
{
WelcomeServiceEntry** entry_collection = NULL;
gint entry_collection_length1 = 0;
gint _entry_collection_size_ = 0;
gint entry_it = 0;
#line 186 "/home/jens/Source/shotwell/src/main.vala"
- entry_collection = _tmp121_;
+ entry_collection = _tmp111_;
#line 186 "/home/jens/Source/shotwell/src/main.vala"
- entry_collection_length1 = _tmp121__length1;
+ entry_collection_length1 = _tmp111__length1;
#line 186 "/home/jens/Source/shotwell/src/main.vala"
- for (entry_it = 0; entry_it < _tmp121__length1; entry_it = entry_it + 1) {
-#line 1615 "main.c"
- WelcomeServiceEntry* _tmp122_;
+ for (entry_it = 0; entry_it < _tmp111__length1; entry_it = entry_it + 1) {
+#line 1772 "main.c"
+ WelcomeServiceEntry* _tmp112_;
WelcomeServiceEntry* entry = NULL;
#line 186 "/home/jens/Source/shotwell/src/main.vala"
- _tmp122_ = _g_object_ref0 (entry_collection[entry_it]);
+ _tmp112_ = _g_object_ref0 (entry_collection[entry_it]);
#line 186 "/home/jens/Source/shotwell/src/main.vala"
- entry = _tmp122_;
-#line 1622 "main.c"
+ entry = _tmp112_;
+#line 1779 "main.c"
{
- WelcomeServiceEntry* _tmp123_;
+ WelcomeServiceEntry* _tmp113_;
#line 187 "/home/jens/Source/shotwell/src/main.vala"
- _tmp123_ = entry;
+ _tmp113_ = entry;
#line 187 "/home/jens/Source/shotwell/src/main.vala"
- welcome_service_entry_execute (_tmp123_);
+ welcome_service_entry_execute (_tmp113_);
#line 186 "/home/jens/Source/shotwell/src/main.vala"
_g_object_unref0 (entry);
-#line 1631 "main.c"
+#line 1788 "main.c"
}
}
}
}
#line 189 "/home/jens/Source/shotwell/src/main.vala"
- _tmp124_ = do_system_pictures_import;
+ _tmp114_ = do_system_pictures_import;
#line 189 "/home/jens/Source/shotwell/src/main.vala"
- if (_tmp124_) {
+ if (_tmp114_) {
#line 193 "/home/jens/Source/shotwell/src/main.vala"
run_system_pictures_import (NULL);
-#line 1642 "main.c"
+#line 1799 "main.c"
}
#line 196 "/home/jens/Source/shotwell/src/main.vala"
- _tmp125_ = startup_timer;
+ _tmp115_ = startup_timer;
#line 196 "/home/jens/Source/shotwell/src/main.vala"
- _tmp126_ = g_timer_elapsed (_tmp125_, NULL);
+ _tmp116_ = g_timer_elapsed (_tmp115_, NULL);
#line 196 "/home/jens/Source/shotwell/src/main.vala"
- g_debug ("main.vala:196: %lf seconds to Gtk.main()", _tmp126_);
+ g_debug ("main.vala:196: %lf seconds to Gtk.main()", _tmp116_);
#line 198 "/home/jens/Source/shotwell/src/main.vala"
- _tmp127_ = application_get_instance ();
+ _tmp117_ = application_get_instance ();
#line 198 "/home/jens/Source/shotwell/src/main.vala"
- _tmp128_ = _tmp127_;
+ _tmp118_ = _tmp117_;
#line 198 "/home/jens/Source/shotwell/src/main.vala"
- application_start (_tmp128_, NULL, 0);
+ application_start (_tmp118_, NULL, 0);
#line 198 "/home/jens/Source/shotwell/src/main.vala"
- _application_unref0 (_tmp128_);
+ _application_unref0 (_tmp118_);
#line 200 "/home/jens/Source/shotwell/src/main.vala"
desktop_integration_terminate ();
#line 201 "/home/jens/Source/shotwell/src/main.vala"
@@ -1706,18 +1863,24 @@ 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 1702 "main.c"
+#line 1859 "main.c"
}
-static void _report_system_pictures_import_batch_import_import_reporter (ImportManifest* manifest, BatchImportRoll* import_roll, gpointer self) {
+static void
+_report_system_pictures_import_batch_import_import_reporter (ImportManifest* manifest,
+ BatchImportRoll* import_roll,
+ gpointer self)
+{
#line 225 "/home/jens/Source/shotwell/src/main.vala"
report_system_pictures_import (manifest, import_roll);
-#line 1709 "main.c"
+#line 1870 "main.c"
}
-void run_system_pictures_import (ImportManifest* external_exclusion_manifest) {
+void
+run_system_pictures_import (ImportManifest* external_exclusion_manifest)
+{
gboolean _tmp0_;
GeeArrayList* jobs = NULL;
GeeArrayList* _tmp1_;
@@ -1730,11 +1893,10 @@ void run_system_pictures_import (ImportManifest* external_exclusion_manifest) {
AppWindow* _tmp7_;
BatchImport* batch_import = NULL;
GeeArrayList* _tmp8_;
- ImportManifest* _tmp9_;
- BatchImport* _tmp10_;
- LibraryWindow* _tmp11_;
- BatchImport* _tmp12_;
- LibraryWindow* _tmp13_;
+ BatchImport* _tmp9_;
+ LibraryWindow* _tmp10_;
+ BatchImport* _tmp11_;
+ LibraryWindow* _tmp12_;
#line 216 "/home/jens/Source/shotwell/src/main.vala"
g_return_if_fail ((external_exclusion_manifest == NULL) || IS_IMPORT_MANIFEST (external_exclusion_manifest));
#line 217 "/home/jens/Source/shotwell/src/main.vala"
@@ -1743,7 +1905,7 @@ void run_system_pictures_import (ImportManifest* external_exclusion_manifest) {
if (!_tmp0_) {
#line 218 "/home/jens/Source/shotwell/src/main.vala"
return;
-#line 1739 "main.c"
+#line 1901 "main.c"
}
#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);
@@ -1772,35 +1934,35 @@ void run_system_pictures_import (ImportManifest* external_exclusion_manifest) {
#line 225 "/home/jens/Source/shotwell/src/main.vala"
_tmp8_ = jobs;
#line 225 "/home/jens/Source/shotwell/src/main.vala"
- _tmp9_ = external_exclusion_manifest;
-#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_);
+ _tmp9_ = 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, external_exclusion_manifest);
#line 225 "/home/jens/Source/shotwell/src/main.vala"
- batch_import = _tmp10_;
+ batch_import = _tmp9_;
#line 227 "/home/jens/Source/shotwell/src/main.vala"
- _tmp11_ = library_window;
+ _tmp10_ = library_window;
#line 227 "/home/jens/Source/shotwell/src/main.vala"
- _tmp12_ = batch_import;
+ _tmp11_ = batch_import;
#line 227 "/home/jens/Source/shotwell/src/main.vala"
- library_window_enqueue_batch_import (_tmp11_, _tmp12_, TRUE);
+ library_window_enqueue_batch_import (_tmp10_, _tmp11_, TRUE);
#line 229 "/home/jens/Source/shotwell/src/main.vala"
- _tmp13_ = library_window;
+ _tmp12_ = library_window;
#line 229 "/home/jens/Source/shotwell/src/main.vala"
- library_window_switch_to_import_queue_page (_tmp13_);
+ library_window_switch_to_import_queue_page (_tmp12_);
#line 216 "/home/jens/Source/shotwell/src/main.vala"
_g_object_unref0 (batch_import);
#line 216 "/home/jens/Source/shotwell/src/main.vala"
_g_object_unref0 (library_window);
#line 216 "/home/jens/Source/shotwell/src/main.vala"
_g_object_unref0 (jobs);
-#line 1789 "main.c"
+#line 1949 "main.c"
}
-void report_system_pictures_import (ImportManifest* manifest, BatchImportRoll* import_roll) {
+void
+report_system_pictures_import (ImportManifest* manifest,
+ BatchImportRoll* import_roll)
+{
gboolean _tmp0_ = FALSE;
gboolean _tmp1_;
- ImportManifest* _tmp6_;
#line 232 "/home/jens/Source/shotwell/src/main.vala"
g_return_if_fail (IS_IMPORT_MANIFEST (manifest));
#line 232 "/home/jens/Source/shotwell/src/main.vala"
@@ -1809,77 +1971,71 @@ void report_system_pictures_import (ImportManifest* manifest, BatchImportRoll* i
_tmp1_ = do_external_import;
#line 239 "/home/jens/Source/shotwell/src/main.vala"
if (_tmp1_) {
-#line 1805 "main.c"
- ImportManifest* _tmp2_;
- GeeList* _tmp3_;
+#line 1967 "main.c"
+ GeeList* _tmp2_;
+ gint _tmp3_;
gint _tmp4_;
- gint _tmp5_;
-#line 239 "/home/jens/Source/shotwell/src/main.vala"
- _tmp2_ = manifest;
#line 239 "/home/jens/Source/shotwell/src/main.vala"
- _tmp3_ = _tmp2_->all;
+ _tmp2_ = manifest->all;
#line 239 "/home/jens/Source/shotwell/src/main.vala"
- _tmp4_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, GEE_TYPE_COLLECTION, GeeCollection));
+ _tmp3_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, GEE_TYPE_COLLECTION, GeeCollection));
#line 239 "/home/jens/Source/shotwell/src/main.vala"
- _tmp5_ = _tmp4_;
+ _tmp4_ = _tmp3_;
#line 239 "/home/jens/Source/shotwell/src/main.vala"
- _tmp0_ = _tmp5_ == 0;
-#line 1820 "main.c"
+ _tmp0_ = _tmp4_ == 0;
+#line 1979 "main.c"
} else {
#line 239 "/home/jens/Source/shotwell/src/main.vala"
_tmp0_ = FALSE;
-#line 1824 "main.c"
+#line 1983 "main.c"
}
#line 239 "/home/jens/Source/shotwell/src/main.vala"
if (_tmp0_) {
#line 240 "/home/jens/Source/shotwell/src/main.vala"
return;
-#line 1830 "main.c"
+#line 1989 "main.c"
}
#line 242 "/home/jens/Source/shotwell/src/main.vala"
- _tmp6_ = manifest;
-#line 242 "/home/jens/Source/shotwell/src/main.vala"
- import_ui_report_manifest (_tmp6_, TRUE, NULL);
-#line 1836 "main.c"
+ import_ui_report_manifest (manifest, TRUE, NULL);
+#line 1993 "main.c"
}
-void editing_exec (const gchar* filename, gboolean fullscreen) {
+void
+editing_exec (const gchar* filename,
+ gboolean fullscreen)
+{
GFile* initial_file = NULL;
- const gchar* _tmp0_;
+ GFile* _tmp0_;
GFile* _tmp1_;
- GFile* _tmp2_;
DirectWindow* direct_window = NULL;
- GFile* _tmp5_;
+ GFile* _tmp4_;
+ DirectWindow* _tmp5_;
DirectWindow* _tmp6_;
- DirectWindow* _tmp7_;
- GTimer* _tmp8_;
- gdouble _tmp9_;
- gboolean _tmp10_;
- Application* _tmp15_;
- Application* _tmp16_;
+ GTimer* _tmp7_;
+ gdouble _tmp8_;
+ Application* _tmp13_;
+ Application* _tmp14_;
GError * _inner_error_ = NULL;
#line 245 "/home/jens/Source/shotwell/src/main.vala"
g_return_if_fail (filename != NULL);
#line 246 "/home/jens/Source/shotwell/src/main.vala"
- _tmp0_ = filename;
+ _tmp0_ = g_file_new_for_commandline_arg (filename);
#line 246 "/home/jens/Source/shotwell/src/main.vala"
- _tmp1_ = g_file_new_for_commandline_arg (_tmp0_);
-#line 246 "/home/jens/Source/shotwell/src/main.vala"
- initial_file = _tmp1_;
+ initial_file = _tmp0_;
#line 249 "/home/jens/Source/shotwell/src/main.vala"
- _tmp2_ = initial_file;
+ _tmp1_ = initial_file;
#line 249 "/home/jens/Source/shotwell/src/main.vala"
- direct_preconfigure (_tmp2_);
+ direct_preconfigure (_tmp1_);
#line 250 "/home/jens/Source/shotwell/src/main.vala"
db_preconfigure (NULL);
-#line 1869 "main.c"
+#line 2025 "main.c"
{
#line 254 "/home/jens/Source/shotwell/src/main.vala"
direct_app_init (&_inner_error_);
#line 254 "/home/jens/Source/shotwell/src/main.vala"
if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 1875 "main.c"
+#line 2031 "main.c"
goto __catch235_g_error;
}
}
@@ -1887,25 +2043,25 @@ void editing_exec (const gchar* filename, gboolean fullscreen) {
__catch235_g_error:
{
GError* err = NULL;
- GError* _tmp3_;
- const gchar* _tmp4_;
+ GError* _tmp2_;
+ const gchar* _tmp3_;
#line 253 "/home/jens/Source/shotwell/src/main.vala"
err = _inner_error_;
#line 253 "/home/jens/Source/shotwell/src/main.vala"
_inner_error_ = NULL;
#line 256 "/home/jens/Source/shotwell/src/main.vala"
- _tmp3_ = err;
+ _tmp2_ = err;
#line 256 "/home/jens/Source/shotwell/src/main.vala"
- _tmp4_ = _tmp3_->message;
+ _tmp3_ = _tmp2_->message;
#line 256 "/home/jens/Source/shotwell/src/main.vala"
- app_window_panic (_tmp4_);
+ app_window_panic (_tmp3_);
#line 258 "/home/jens/Source/shotwell/src/main.vala"
_g_error_free0 (err);
#line 258 "/home/jens/Source/shotwell/src/main.vala"
_g_object_unref0 (initial_file);
#line 258 "/home/jens/Source/shotwell/src/main.vala"
return;
-#line 1901 "main.c"
+#line 2057 "main.c"
}
__finally235:
#line 253 "/home/jens/Source/shotwell/src/main.vala"
@@ -1918,67 +2074,65 @@ void editing_exec (const gchar* filename, gboolean fullscreen) {
g_clear_error (&_inner_error_);
#line 253 "/home/jens/Source/shotwell/src/main.vala"
return;
-#line 1914 "main.c"
+#line 2070 "main.c"
}
#line 262 "/home/jens/Source/shotwell/src/main.vala"
desktop_integration_init ();
#line 268 "/home/jens/Source/shotwell/src/main.vala"
- _tmp5_ = initial_file;
+ _tmp4_ = initial_file;
#line 268 "/home/jens/Source/shotwell/src/main.vala"
- _tmp6_ = direct_window_new (_tmp5_);
+ _tmp5_ = direct_window_new (_tmp4_);
#line 268 "/home/jens/Source/shotwell/src/main.vala"
- g_object_ref_sink (_tmp6_);
+ g_object_ref_sink (_tmp5_);
#line 268 "/home/jens/Source/shotwell/src/main.vala"
- direct_window = _tmp6_;
+ direct_window = _tmp5_;
#line 269 "/home/jens/Source/shotwell/src/main.vala"
- _tmp7_ = direct_window;
+ _tmp6_ = direct_window;
#line 269 "/home/jens/Source/shotwell/src/main.vala"
- gtk_widget_show_all (G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, gtk_widget_get_type (), GtkWidget));
+ gtk_widget_show_all (G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, gtk_widget_get_type (), GtkWidget));
#line 271 "/home/jens/Source/shotwell/src/main.vala"
- _tmp8_ = startup_timer;
+ _tmp7_ = startup_timer;
#line 271 "/home/jens/Source/shotwell/src/main.vala"
- _tmp9_ = g_timer_elapsed (_tmp8_, NULL);
+ _tmp8_ = g_timer_elapsed (_tmp7_, NULL);
#line 271 "/home/jens/Source/shotwell/src/main.vala"
- g_debug ("main.vala:271: %lf seconds to Gtk.main()", _tmp9_);
+ g_debug ("main.vala:271: %lf seconds to Gtk.main()", _tmp8_);
#line 273 "/home/jens/Source/shotwell/src/main.vala"
- _tmp10_ = fullscreen;
-#line 273 "/home/jens/Source/shotwell/src/main.vala"
- if (_tmp10_) {
-#line 1940 "main.c"
+ if (fullscreen) {
+#line 2094 "main.c"
GAction* action = NULL;
- DirectWindow* _tmp11_;
- GAction* _tmp12_;
- GAction* _tmp13_;
+ DirectWindow* _tmp9_;
+ GAction* _tmp10_;
+ GAction* _tmp11_;
#line 274 "/home/jens/Source/shotwell/src/main.vala"
- _tmp11_ = direct_window;
+ _tmp9_ = 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");
+ _tmp10_ = app_window_get_common_action (G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, TYPE_APP_WINDOW, AppWindow), "CommonFullscreen");
#line 274 "/home/jens/Source/shotwell/src/main.vala"
- action = _tmp12_;
+ action = _tmp10_;
#line 275 "/home/jens/Source/shotwell/src/main.vala"
- _tmp13_ = action;
+ _tmp11_ = action;
#line 275 "/home/jens/Source/shotwell/src/main.vala"
- if (_tmp13_ != NULL) {
-#line 1955 "main.c"
- GAction* _tmp14_;
+ if (_tmp11_ != NULL) {
+#line 2109 "main.c"
+ GAction* _tmp12_;
#line 276 "/home/jens/Source/shotwell/src/main.vala"
- _tmp14_ = action;
+ _tmp12_ = action;
#line 276 "/home/jens/Source/shotwell/src/main.vala"
- g_action_activate (_tmp14_, NULL);
-#line 1961 "main.c"
+ g_action_activate (_tmp12_, NULL);
+#line 2115 "main.c"
}
#line 273 "/home/jens/Source/shotwell/src/main.vala"
_g_object_unref0 (action);
-#line 1965 "main.c"
+#line 2119 "main.c"
}
#line 280 "/home/jens/Source/shotwell/src/main.vala"
- _tmp15_ = application_get_instance ();
+ _tmp13_ = application_get_instance ();
#line 280 "/home/jens/Source/shotwell/src/main.vala"
- _tmp16_ = _tmp15_;
+ _tmp14_ = _tmp13_;
#line 280 "/home/jens/Source/shotwell/src/main.vala"
- application_start (_tmp16_, NULL, 0);
+ application_start (_tmp14_, NULL, 0);
#line 280 "/home/jens/Source/shotwell/src/main.vala"
- _application_unref0 (_tmp16_);
+ _application_unref0 (_tmp14_);
#line 282 "/home/jens/Source/shotwell/src/main.vala"
desktop_integration_terminate ();
#line 285 "/home/jens/Source/shotwell/src/main.vala"
@@ -1987,115 +2141,153 @@ void editing_exec (const gchar* filename, gboolean fullscreen) {
_g_object_unref0 (direct_window);
#line 245 "/home/jens/Source/shotwell/src/main.vala"
_g_object_unref0 (initial_file);
-#line 1983 "main.c"
+#line 2137 "main.c"
}
-static GOptionEntry* _vala_array_dup22 (GOptionEntry* self, int length) {
+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 1990 "main.c"
+#line 2147 "main.c"
}
-static void _vala_array_add73 (GOptionEntry* * array, int* length, int* size, const GOptionEntry* value) {
+static void
+_vala_array_add73 (GOptionEntry* * array,
+ int* length,
+ int* size,
+ const GOptionEntry* value)
+{
#line 304 "/home/jens/Source/shotwell/src/main.vala"
if ((*length) == (*size)) {
#line 304 "/home/jens/Source/shotwell/src/main.vala"
*size = (*size) ? (2 * (*size)) : 4;
#line 304 "/home/jens/Source/shotwell/src/main.vala"
*array = g_renew (GOptionEntry, *array, *size);
-#line 2001 "main.c"
+#line 2163 "main.c"
}
#line 304 "/home/jens/Source/shotwell/src/main.vala"
(*array)[(*length)++] = *value;
-#line 2005 "main.c"
+#line 2167 "main.c"
}
-static void _vala_array_add74 (GOptionEntry* * array, int* length, int* size, const GOptionEntry* value) {
+static void
+_vala_array_add74 (GOptionEntry* * array,
+ int* length,
+ int* size,
+ const GOptionEntry* value)
+{
#line 308 "/home/jens/Source/shotwell/src/main.vala"
if ((*length) == (*size)) {
#line 308 "/home/jens/Source/shotwell/src/main.vala"
*size = (*size) ? (2 * (*size)) : 4;
#line 308 "/home/jens/Source/shotwell/src/main.vala"
*array = g_renew (GOptionEntry, *array, *size);
-#line 2016 "main.c"
+#line 2183 "main.c"
}
#line 308 "/home/jens/Source/shotwell/src/main.vala"
(*array)[(*length)++] = *value;
-#line 2020 "main.c"
+#line 2187 "main.c"
}
-static void _vala_array_add75 (GOptionEntry* * array, int* length, int* size, const GOptionEntry* value) {
+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 312 "/home/jens/Source/shotwell/src/main.vala"
*size = (*size) ? (2 * (*size)) : 4;
#line 312 "/home/jens/Source/shotwell/src/main.vala"
*array = g_renew (GOptionEntry, *array, *size);
-#line 2031 "main.c"
+#line 2203 "main.c"
}
#line 312 "/home/jens/Source/shotwell/src/main.vala"
(*array)[(*length)++] = *value;
-#line 2035 "main.c"
+#line 2207 "main.c"
}
-static void _vala_array_add76 (GOptionEntry* * array, int* length, int* size, const GOptionEntry* value) {
+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 316 "/home/jens/Source/shotwell/src/main.vala"
*size = (*size) ? (2 * (*size)) : 4;
#line 316 "/home/jens/Source/shotwell/src/main.vala"
*array = g_renew (GOptionEntry, *array, *size);
-#line 2046 "main.c"
+#line 2223 "main.c"
}
#line 316 "/home/jens/Source/shotwell/src/main.vala"
(*array)[(*length)++] = *value;
-#line 2050 "main.c"
+#line 2227 "main.c"
}
-static void _vala_array_add77 (GOptionEntry* * array, int* length, int* size, const GOptionEntry* value) {
+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 2243 "main.c"
}
#line 320 "/home/jens/Source/shotwell/src/main.vala"
(*array)[(*length)++] = *value;
-#line 2065 "main.c"
+#line 2247 "main.c"
}
-static void _vala_array_add78 (GOptionEntry* * array, int* length, int* size, const GOptionEntry* value) {
+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 323 "/home/jens/Source/shotwell/src/main.vala"
*size = (*size) ? (2 * (*size)) : 4;
#line 323 "/home/jens/Source/shotwell/src/main.vala"
*array = g_renew (GOptionEntry, *array, *size);
-#line 2076 "main.c"
+#line 2263 "main.c"
}
#line 323 "/home/jens/Source/shotwell/src/main.vala"
(*array)[(*length)++] = *value;
-#line 2080 "main.c"
+#line 2267 "main.c"
}
-static GOptionEntry* _vala_array_dup23 (GOptionEntry* self, int length) {
+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 2087 "main.c"
+#line 2277 "main.c"
}
-GOptionEntry* commandline_options_get_options (int* result_length1) {
+GOptionEntry*
+commandline_options_get_options (int* result_length1)
+{
GOptionEntry* result = NULL;
GOptionEntry* _tmp0_;
gint _tmp0__length1;
@@ -2141,7 +2333,7 @@ GOptionEntry* commandline_options_get_options (int* result_length1) {
_tmp0__length1 = commandline_options_entries_length1;
#line 299 "/home/jens/Source/shotwell/src/main.vala"
if (_tmp0_ != NULL) {
-#line 2137 "main.c"
+#line 2329 "main.c"
GOptionEntry* _tmp1_;
gint _tmp1__length1;
GOptionEntry* _tmp2_;
@@ -2164,13 +2356,13 @@ GOptionEntry* commandline_options_get_options (int* result_length1) {
if (result_length1) {
#line 300 "/home/jens/Source/shotwell/src/main.vala"
*result_length1 = _tmp3__length1;
-#line 2160 "main.c"
+#line 2352 "main.c"
}
#line 300 "/home/jens/Source/shotwell/src/main.vala"
result = _tmp3_;
#line 300 "/home/jens/Source/shotwell/src/main.vala"
return result;
-#line 2166 "main.c"
+#line 2358 "main.c"
}
#line 302 "/home/jens/Source/shotwell/src/main.vala"
_tmp4_.long_name = "datadir";
@@ -2332,93 +2524,89 @@ GOptionEntry* commandline_options_get_options (int* result_length1) {
if (result_length1) {
#line 325 "/home/jens/Source/shotwell/src/main.vala"
*result_length1 = _tmp24__length1;
-#line 2328 "main.c"
+#line 2520 "main.c"
}
#line 325 "/home/jens/Source/shotwell/src/main.vala"
result = _tmp24_;
#line 325 "/home/jens/Source/shotwell/src/main.vala"
return result;
-#line 2334 "main.c"
+#line 2526 "main.c"
}
-static void _vala_array_add79 (gchar** * array, int* length, int* size, gchar* value) {
+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 390 "/home/jens/Source/shotwell/src/main.vala"
*size = (*size) ? (2 * (*size)) : 4;
#line 390 "/home/jens/Source/shotwell/src/main.vala"
*array = g_renew (gchar*, *array, (*size) + 1);
-#line 2345 "main.c"
+#line 2542 "main.c"
}
#line 390 "/home/jens/Source/shotwell/src/main.vala"
(*array)[(*length)++] = value;
#line 390 "/home/jens/Source/shotwell/src/main.vala"
(*array)[*length] = NULL;
-#line 2351 "main.c"
+#line 2548 "main.c"
}
-static gboolean string_contains (const gchar* self, const gchar* needle) {
+static gboolean
+string_contains (const gchar* self,
+ const gchar* needle)
+{
gboolean result = FALSE;
- const gchar* _tmp0_;
- gchar* _tmp1_;
-#line 1403 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+ gchar* _tmp0_;
+#line 1417 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
g_return_val_if_fail (self != NULL, FALSE);
-#line 1403 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+#line 1417 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
g_return_val_if_fail (needle != NULL, FALSE);
-#line 1404 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
- _tmp0_ = needle;
-#line 1404 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
- _tmp1_ = strstr ((gchar*) self, (gchar*) _tmp0_);
-#line 1404 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
- result = _tmp1_ != NULL;
-#line 1404 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+#line 1418 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+ _tmp0_ = strstr ((gchar*) self, (gchar*) needle);
+#line 1418 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+ result = _tmp0_ != NULL;
+#line 1418 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
return result;
-#line 2371 "main.c"
+#line 2568 "main.c"
}
-void _vala_main (gchar** args, int args_length1) {
- gchar** _tmp0_;
- gint _tmp0__length1;
- const gchar* _tmp1_;
+void
+_vala_main (gchar** args,
+ int args_length1)
+{
+ const gchar* _tmp0_;
+ GFile* _tmp1_;
GFile* _tmp2_;
- GFile* _tmp3_;
- gboolean _tmp4_;
- gboolean _tmp20_;
+ gboolean _tmp3_;
+ gboolean _tmp18_;
gchar** mounts = NULL;
- gchar** _tmp21_;
+ gchar** _tmp19_;
gint mounts_length1;
gint _mounts_size_;
gchar* filename = NULL;
- const gchar* _tmp42_ = NULL;
+ const gchar* _tmp35_ = NULL;
+ const gchar* _tmp36_;
+ GDateTime* _tmp41_;
+ GDateTime* _tmp42_;
const gchar* _tmp43_;
- gboolean _tmp44_;
- GDateTime* _tmp51_;
- GDateTime* _tmp52_;
- const gchar* _tmp53_;
+ const gchar* _tmp44_;
+ const gchar* _tmp45_;
+ GTimer* _tmp47_;
+ GTimer* _tmp48_;
+ const gchar* _tmp49_;
+ gboolean _tmp53_ = FALSE;
const gchar* _tmp54_;
- gboolean _tmp55_;
- const gchar* _tmp56_;
- gchar** _tmp58_;
- gint _tmp58__length1;
- GTimer* _tmp59_;
- GTimer* _tmp60_;
- const gchar* _tmp61_;
- gboolean _tmp62_;
- gboolean _tmp66_ = FALSE;
- const gchar* _tmp67_;
- gboolean _tmp68_;
GError * _inner_error_ = NULL;
#line 333 "/home/jens/Source/shotwell/src/main.vala"
- _tmp0_ = args;
-#line 333 "/home/jens/Source/shotwell/src/main.vala"
- _tmp0__length1 = args_length1;
-#line 333 "/home/jens/Source/shotwell/src/main.vala"
- _tmp1_ = _tmp0_[0];
+ _tmp0_ = args[0];
#line 333 "/home/jens/Source/shotwell/src/main.vala"
- app_dirs_init (_tmp1_);
+ app_dirs_init (_tmp0_);
#line 338 "/home/jens/Source/shotwell/src/main.vala"
gexiv2_initialize ();
#line 339 "/home/jens/Source/shotwell/src/main.vala"
@@ -2426,62 +2614,62 @@ void _vala_main (gchar** args, int args_length1) {
#line 343 "/home/jens/Source/shotwell/src/main.vala"
gexiv2_log_set_level (GEXIV2_LOG_LEVEL_DEBUG);
#line 349 "/home/jens/Source/shotwell/src/main.vala"
- _tmp2_ = app_dirs_get_install_dir ();
+ _tmp1_ = app_dirs_get_install_dir ();
#line 349 "/home/jens/Source/shotwell/src/main.vala"
- _tmp3_ = _tmp2_;
+ _tmp2_ = _tmp1_;
#line 349 "/home/jens/Source/shotwell/src/main.vala"
- _tmp4_ = _tmp3_ == NULL;
+ _tmp3_ = _tmp2_ == NULL;
#line 349 "/home/jens/Source/shotwell/src/main.vala"
- _g_object_unref0 (_tmp3_);
+ _g_object_unref0 (_tmp2_);
#line 349 "/home/jens/Source/shotwell/src/main.vala"
- if (_tmp4_) {
-#line 2431 "main.c"
+ if (_tmp3_) {
+#line 2619 "main.c"
+ GFile* _tmp4_;
GFile* _tmp5_;
- GFile* _tmp6_;
+ gchar* _tmp6_;
gchar* _tmp7_;
gchar* _tmp8_;
gchar* _tmp9_;
- gchar* _tmp10_;
#line 350 "/home/jens/Source/shotwell/src/main.vala"
- _tmp5_ = app_dirs_get_lib_dir ();
+ _tmp4_ = app_dirs_get_lib_dir ();
#line 350 "/home/jens/Source/shotwell/src/main.vala"
- _tmp6_ = _tmp5_;
+ _tmp5_ = _tmp4_;
#line 350 "/home/jens/Source/shotwell/src/main.vala"
- _tmp7_ = g_file_get_path (_tmp6_);
+ _tmp6_ = g_file_get_path (_tmp5_);
#line 350 "/home/jens/Source/shotwell/src/main.vala"
- _tmp8_ = _tmp7_;
+ _tmp7_ = _tmp6_;
#line 350 "/home/jens/Source/shotwell/src/main.vala"
- _tmp9_ = g_strconcat (_tmp8_, "/misc", NULL);
+ _tmp8_ = g_strconcat (_tmp7_, "/misc", NULL);
#line 350 "/home/jens/Source/shotwell/src/main.vala"
- _tmp10_ = _tmp9_;
+ _tmp9_ = _tmp8_;
#line 350 "/home/jens/Source/shotwell/src/main.vala"
- g_setenv ("GSETTINGS_SCHEMA_DIR", _tmp10_, TRUE);
+ g_setenv ("GSETTINGS_SCHEMA_DIR", _tmp9_, TRUE);
#line 350 "/home/jens/Source/shotwell/src/main.vala"
- _g_free0 (_tmp10_);
+ _g_free0 (_tmp9_);
#line 350 "/home/jens/Source/shotwell/src/main.vala"
- _g_free0 (_tmp8_);
+ _g_free0 (_tmp7_);
#line 350 "/home/jens/Source/shotwell/src/main.vala"
- _g_object_unref0 (_tmp6_);
-#line 2458 "main.c"
+ _g_object_unref0 (_tmp5_);
+#line 2646 "main.c"
}
{
- gint _tmp11_;
+ gint _tmp10_;
+ GOptionEntry* _tmp11_;
GOptionEntry* _tmp12_;
- GOptionEntry* _tmp13_;
- gint _tmp13__length1;
+ gint _tmp12__length1;
#line 356 "/home/jens/Source/shotwell/src/main.vala"
- _tmp12_ = commandline_options_get_options (&_tmp11_);
+ _tmp11_ = commandline_options_get_options (&_tmp10_);
#line 356 "/home/jens/Source/shotwell/src/main.vala"
- _tmp13_ = _tmp12_;
+ _tmp12_ = _tmp11_;
#line 356 "/home/jens/Source/shotwell/src/main.vala"
- _tmp13__length1 = _tmp11_;
+ _tmp12__length1 = _tmp10_;
#line 356 "/home/jens/Source/shotwell/src/main.vala"
- gtk_init_with_args (&args_length1, &args, _ ("[FILE]"), _tmp13_, RESOURCES_APP_GETTEXT_PACKAGE, &_inner_error_);
+ gtk_init_with_args (&args_length1, &args, _ ("[FILE]"), _tmp12_, RESOURCES_APP_GETTEXT_PACKAGE, &_inner_error_);
#line 356 "/home/jens/Source/shotwell/src/main.vala"
- _tmp13_ = (g_free (_tmp13_), NULL);
+ _tmp12_ = (g_free (_tmp12_), NULL);
#line 356 "/home/jens/Source/shotwell/src/main.vala"
if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 2477 "main.c"
+#line 2665 "main.c"
goto __catch236_g_error;
}
}
@@ -2489,44 +2677,38 @@ void _vala_main (gchar** args, int args_length1) {
__catch236_g_error:
{
GError* e = NULL;
- GError* _tmp14_;
- const gchar* _tmp15_;
+ GError* _tmp13_;
+ const gchar* _tmp14_;
+ gchar* _tmp15_;
gchar* _tmp16_;
- gchar* _tmp17_;
- gchar** _tmp18_;
- gint _tmp18__length1;
- const gchar* _tmp19_;
+ const gchar* _tmp17_;
#line 355 "/home/jens/Source/shotwell/src/main.vala"
e = _inner_error_;
#line 355 "/home/jens/Source/shotwell/src/main.vala"
_inner_error_ = NULL;
#line 359 "/home/jens/Source/shotwell/src/main.vala"
- _tmp14_ = e;
+ _tmp13_ = e;
#line 359 "/home/jens/Source/shotwell/src/main.vala"
- _tmp15_ = _tmp14_->message;
+ _tmp14_ = _tmp13_->message;
#line 359 "/home/jens/Source/shotwell/src/main.vala"
- _tmp16_ = g_strconcat (_tmp15_, "\n", NULL);
+ _tmp15_ = g_strconcat (_tmp14_, "\n", NULL);
#line 359 "/home/jens/Source/shotwell/src/main.vala"
- _tmp17_ = _tmp16_;
+ _tmp16_ = _tmp15_;
#line 359 "/home/jens/Source/shotwell/src/main.vala"
- g_print ("%s", _tmp17_);
+ g_print ("%s", _tmp16_);
#line 359 "/home/jens/Source/shotwell/src/main.vala"
- _g_free0 (_tmp17_);
-#line 360 "/home/jens/Source/shotwell/src/main.vala"
- _tmp18_ = args;
+ _g_free0 (_tmp16_);
#line 360 "/home/jens/Source/shotwell/src/main.vala"
- _tmp18__length1 = args_length1;
+ _tmp17_ = args[0];
#line 360 "/home/jens/Source/shotwell/src/main.vala"
- _tmp19_ = _tmp18_[0];
-#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_);
+ g_print (_ ("Run “%s --help” to see a full list of available command line options.\n"), _tmp17_);
#line 361 "/home/jens/Source/shotwell/src/main.vala"
app_dirs_terminate ();
#line 362 "/home/jens/Source/shotwell/src/main.vala"
_g_error_free0 (e);
#line 362 "/home/jens/Source/shotwell/src/main.vala"
return;
-#line 2522 "main.c"
+#line 2704 "main.c"
}
__finally236:
#line 355 "/home/jens/Source/shotwell/src/main.vala"
@@ -2537,310 +2719,273 @@ void _vala_main (gchar** args, int args_length1) {
g_clear_error (&_inner_error_);
#line 355 "/home/jens/Source/shotwell/src/main.vala"
return;
-#line 2533 "main.c"
+#line 2715 "main.c"
}
#line 365 "/home/jens/Source/shotwell/src/main.vala"
- _tmp20_ = commandline_options_show_version;
+ _tmp18_ = commandline_options_show_version;
#line 365 "/home/jens/Source/shotwell/src/main.vala"
- if (_tmp20_) {
+ if (_tmp18_) {
#line 366 "/home/jens/Source/shotwell/src/main.vala"
if (RESOURCES_GIT_VERSION != NULL) {
#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 2543 "main.c"
+#line 2725 "main.c"
} else {
#line 369 "/home/jens/Source/shotwell/src/main.vala"
g_print ("%s %s\n", RESOURCES_APP_TITLE, RESOURCES_APP_VERSION);
-#line 2547 "main.c"
+#line 2729 "main.c"
}
#line 371 "/home/jens/Source/shotwell/src/main.vala"
app_dirs_terminate ();
#line 373 "/home/jens/Source/shotwell/src/main.vala"
return;
-#line 2553 "main.c"
+#line 2735 "main.c"
}
#line 383 "/home/jens/Source/shotwell/src/main.vala"
- _tmp21_ = g_new0 (gchar*, 0 + 1);
+ _tmp19_ = g_new0 (gchar*, 0 + 1);
#line 383 "/home/jens/Source/shotwell/src/main.vala"
- mounts = _tmp21_;
+ mounts = _tmp19_;
#line 383 "/home/jens/Source/shotwell/src/main.vala"
mounts_length1 = 0;
#line 383 "/home/jens/Source/shotwell/src/main.vala"
_mounts_size_ = mounts_length1;
#line 384 "/home/jens/Source/shotwell/src/main.vala"
filename = NULL;
-#line 2565 "main.c"
+#line 2747 "main.c"
{
gint ctr = 0;
#line 386 "/home/jens/Source/shotwell/src/main.vala"
ctr = 1;
-#line 2570 "main.c"
+#line 2752 "main.c"
{
- gboolean _tmp22_ = FALSE;
+ gboolean _tmp20_ = FALSE;
#line 386 "/home/jens/Source/shotwell/src/main.vala"
- _tmp22_ = TRUE;
+ _tmp20_ = TRUE;
#line 386 "/home/jens/Source/shotwell/src/main.vala"
while (TRUE) {
-#line 2577 "main.c"
- gint _tmp24_;
- gchar** _tmp25_;
- gint _tmp25__length1;
+#line 2759 "main.c"
+ gint _tmp22_;
gchar* arg = NULL;
- gchar** _tmp26_;
- gint _tmp26__length1;
- gint _tmp27_;
- const gchar* _tmp28_;
- gchar* _tmp29_;
- const gchar* _tmp30_;
- gboolean _tmp31_;
+ gint _tmp23_;
+ const gchar* _tmp24_;
+ gchar* _tmp25_;
+ const gchar* _tmp26_;
#line 386 "/home/jens/Source/shotwell/src/main.vala"
- if (!_tmp22_) {
-#line 2591 "main.c"
- gint _tmp23_;
+ if (!_tmp20_) {
+#line 2768 "main.c"
+ gint _tmp21_;
#line 386 "/home/jens/Source/shotwell/src/main.vala"
- _tmp23_ = ctr;
+ _tmp21_ = ctr;
#line 386 "/home/jens/Source/shotwell/src/main.vala"
- ctr = _tmp23_ + 1;
-#line 2597 "main.c"
+ ctr = _tmp21_ + 1;
+#line 2774 "main.c"
}
#line 386 "/home/jens/Source/shotwell/src/main.vala"
- _tmp22_ = FALSE;
-#line 386 "/home/jens/Source/shotwell/src/main.vala"
- _tmp24_ = ctr;
-#line 386 "/home/jens/Source/shotwell/src/main.vala"
- _tmp25_ = args;
+ _tmp20_ = FALSE;
#line 386 "/home/jens/Source/shotwell/src/main.vala"
- _tmp25__length1 = args_length1;
+ _tmp22_ = ctr;
#line 386 "/home/jens/Source/shotwell/src/main.vala"
- if (!(_tmp24_ < _tmp25__length1)) {
+ if (!(_tmp22_ < args_length1)) {
#line 386 "/home/jens/Source/shotwell/src/main.vala"
break;
-#line 2611 "main.c"
+#line 2784 "main.c"
}
#line 387 "/home/jens/Source/shotwell/src/main.vala"
- _tmp26_ = args;
+ _tmp23_ = ctr;
#line 387 "/home/jens/Source/shotwell/src/main.vala"
- _tmp26__length1 = args_length1;
+ _tmp24_ = args[_tmp23_];
#line 387 "/home/jens/Source/shotwell/src/main.vala"
- _tmp27_ = ctr;
+ _tmp25_ = g_strdup (_tmp24_);
#line 387 "/home/jens/Source/shotwell/src/main.vala"
- _tmp28_ = _tmp26_[_tmp27_];
-#line 387 "/home/jens/Source/shotwell/src/main.vala"
- _tmp29_ = g_strdup (_tmp28_);
-#line 387 "/home/jens/Source/shotwell/src/main.vala"
- arg = _tmp29_;
-#line 389 "/home/jens/Source/shotwell/src/main.vala"
- _tmp30_ = arg;
+ arg = _tmp25_;
#line 389 "/home/jens/Source/shotwell/src/main.vala"
- _tmp31_ = library_window_is_mount_uri_supported (_tmp30_);
+ _tmp26_ = arg;
#line 389 "/home/jens/Source/shotwell/src/main.vala"
- if (_tmp31_) {
-#line 2631 "main.c"
- gchar** _tmp32_;
- gint _tmp32__length1;
- const gchar* _tmp33_;
- gchar* _tmp34_;
+ if (library_window_is_mount_uri_supported (_tmp26_)) {
+#line 2798 "main.c"
+ gchar** _tmp27_;
+ gint _tmp27__length1;
+ const gchar* _tmp28_;
+ gchar* _tmp29_;
#line 390 "/home/jens/Source/shotwell/src/main.vala"
- _tmp32_ = mounts;
+ _tmp27_ = mounts;
#line 390 "/home/jens/Source/shotwell/src/main.vala"
- _tmp32__length1 = mounts_length1;
+ _tmp27__length1 = mounts_length1;
#line 390 "/home/jens/Source/shotwell/src/main.vala"
- _tmp33_ = arg;
+ _tmp28_ = arg;
#line 390 "/home/jens/Source/shotwell/src/main.vala"
- _tmp34_ = g_strdup (_tmp33_);
+ _tmp29_ = g_strdup (_tmp28_);
#line 390 "/home/jens/Source/shotwell/src/main.vala"
- _vala_array_add79 (&mounts, &mounts_length1, &_mounts_size_, _tmp34_);
-#line 2646 "main.c"
+ _vala_array_add79 (&mounts, &mounts_length1, &_mounts_size_, _tmp29_);
+#line 2813 "main.c"
} else {
- gboolean _tmp35_ = FALSE;
- const gchar* _tmp36_;
- gboolean _tmp37_;
-#line 391 "/home/jens/Source/shotwell/src/main.vala"
- _tmp36_ = filename;
-#line 391 "/home/jens/Source/shotwell/src/main.vala"
- _tmp37_ = is_string_empty (_tmp36_);
+ gboolean _tmp30_ = FALSE;
+ const gchar* _tmp31_;
#line 391 "/home/jens/Source/shotwell/src/main.vala"
- if (_tmp37_) {
-#line 2657 "main.c"
- const gchar* _tmp38_;
- gboolean _tmp39_;
+ _tmp31_ = filename;
#line 391 "/home/jens/Source/shotwell/src/main.vala"
- _tmp38_ = arg;
+ if (is_string_empty (_tmp31_)) {
+#line 2821 "main.c"
+ const gchar* _tmp32_;
#line 391 "/home/jens/Source/shotwell/src/main.vala"
- _tmp39_ = string_contains (_tmp38_, "://");
+ _tmp32_ = arg;
#line 391 "/home/jens/Source/shotwell/src/main.vala"
- _tmp35_ = !_tmp39_;
-#line 2666 "main.c"
+ _tmp30_ = !string_contains (_tmp32_, "://");
+#line 2827 "main.c"
} else {
#line 391 "/home/jens/Source/shotwell/src/main.vala"
- _tmp35_ = FALSE;
-#line 2670 "main.c"
+ _tmp30_ = FALSE;
+#line 2831 "main.c"
}
#line 391 "/home/jens/Source/shotwell/src/main.vala"
- if (_tmp35_) {
-#line 2674 "main.c"
- const gchar* _tmp40_;
- gchar* _tmp41_;
+ if (_tmp30_) {
+#line 2835 "main.c"
+ const gchar* _tmp33_;
+ gchar* _tmp34_;
#line 392 "/home/jens/Source/shotwell/src/main.vala"
- _tmp40_ = arg;
+ _tmp33_ = arg;
#line 392 "/home/jens/Source/shotwell/src/main.vala"
- _tmp41_ = g_strdup (_tmp40_);
+ _tmp34_ = g_strdup (_tmp33_);
#line 392 "/home/jens/Source/shotwell/src/main.vala"
_g_free0 (filename);
#line 392 "/home/jens/Source/shotwell/src/main.vala"
- filename = _tmp41_;
-#line 2685 "main.c"
+ filename = _tmp34_;
+#line 2846 "main.c"
}
}
#line 386 "/home/jens/Source/shotwell/src/main.vala"
_g_free0 (arg);
-#line 2690 "main.c"
+#line 2851 "main.c"
}
}
}
#line 396 "/home/jens/Source/shotwell/src/main.vala"
- _tmp43_ = filename;
+ _tmp36_ = filename;
#line 396 "/home/jens/Source/shotwell/src/main.vala"
- _tmp44_ = is_string_empty (_tmp43_);
+ if (is_string_empty (_tmp36_)) {
#line 396 "/home/jens/Source/shotwell/src/main.vala"
- if (_tmp44_) {
-#line 396 "/home/jens/Source/shotwell/src/main.vala"
- _tmp42_ = DEBUG_LIBRARY_PREFIX;
-#line 2702 "main.c"
+ _tmp35_ = DEBUG_LIBRARY_PREFIX;
+#line 2861 "main.c"
} else {
#line 396 "/home/jens/Source/shotwell/src/main.vala"
- _tmp42_ = DEBUG_VIEWER_PREFIX;
-#line 2706 "main.c"
+ _tmp35_ = DEBUG_VIEWER_PREFIX;
+#line 2865 "main.c"
}
#line 396 "/home/jens/Source/shotwell/src/main.vala"
- debug_init (_tmp42_);
+ debug_init (_tmp35_);
#line 398 "/home/jens/Source/shotwell/src/main.vala"
if (RESOURCES_GIT_VERSION != NULL) {
-#line 2712 "main.c"
- const gchar* _tmp45_ = NULL;
- const gchar* _tmp46_;
- gboolean _tmp47_;
-#line 400 "/home/jens/Source/shotwell/src/main.vala"
- _tmp46_ = filename;
+#line 2871 "main.c"
+ const gchar* _tmp37_ = NULL;
+ const gchar* _tmp38_;
#line 400 "/home/jens/Source/shotwell/src/main.vala"
- _tmp47_ = is_string_empty (_tmp46_);
+ _tmp38_ = filename;
#line 400 "/home/jens/Source/shotwell/src/main.vala"
- if (_tmp47_) {
+ if (is_string_empty (_tmp38_)) {
#line 400 "/home/jens/Source/shotwell/src/main.vala"
- _tmp45_ = RESOURCES_APP_LIBRARY_ROLE;
-#line 2724 "main.c"
+ _tmp37_ = RESOURCES_APP_LIBRARY_ROLE;
+#line 2880 "main.c"
} else {
#line 400 "/home/jens/Source/shotwell/src/main.vala"
- _tmp45_ = RESOURCES_APP_DIRECT_ROLE;
-#line 2728 "main.c"
+ _tmp37_ = RESOURCES_APP_DIRECT_ROLE;
+#line 2884 "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"
+ g_message ("main.vala:399: Shotwell %s %s (%s)", _tmp37_, RESOURCES_APP_VERSION, RESOURCES_GIT_VERSION);
+#line 2888 "main.c"
} else {
- const gchar* _tmp48_ = NULL;
- const gchar* _tmp49_;
- gboolean _tmp50_;
+ const gchar* _tmp39_ = NULL;
+ const gchar* _tmp40_;
#line 404 "/home/jens/Source/shotwell/src/main.vala"
- _tmp49_ = filename;
+ _tmp40_ = filename;
#line 404 "/home/jens/Source/shotwell/src/main.vala"
- _tmp50_ = is_string_empty (_tmp49_);
+ if (is_string_empty (_tmp40_)) {
#line 404 "/home/jens/Source/shotwell/src/main.vala"
- if (_tmp50_) {
-#line 404 "/home/jens/Source/shotwell/src/main.vala"
- _tmp48_ = RESOURCES_APP_LIBRARY_ROLE;
-#line 2745 "main.c"
+ _tmp39_ = RESOURCES_APP_LIBRARY_ROLE;
+#line 2898 "main.c"
} else {
#line 404 "/home/jens/Source/shotwell/src/main.vala"
- _tmp48_ = RESOURCES_APP_DIRECT_ROLE;
-#line 2749 "main.c"
+ _tmp39_ = RESOURCES_APP_DIRECT_ROLE;
+#line 2902 "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"
+ g_message ("main.vala:403: Shotwell %s %s", _tmp39_, RESOURCES_APP_VERSION);
+#line 2906 "main.c"
}
#line 407 "/home/jens/Source/shotwell/src/main.vala"
- _tmp51_ = g_date_time_new_now_local ();
+ _tmp41_ = g_date_time_new_now_local ();
#line 407 "/home/jens/Source/shotwell/src/main.vala"
- _tmp52_ = _tmp51_;
+ _tmp42_ = _tmp41_;
#line 407 "/home/jens/Source/shotwell/src/main.vala"
- _tmp53_ = g_date_time_get_timezone_abbreviation (_tmp52_);
+ _tmp43_ = g_date_time_get_timezone_abbreviation (_tmp42_);
#line 407 "/home/jens/Source/shotwell/src/main.vala"
- g_debug ("main.vala:407: Shotwell is running in timezone %s", _tmp53_);
+ g_debug ("main.vala:407: Shotwell is running in timezone %s", _tmp43_);
#line 407 "/home/jens/Source/shotwell/src/main.vala"
- _g_date_time_unref0 (_tmp52_);
-#line 412 "/home/jens/Source/shotwell/src/main.vala"
- _tmp54_ = filename;
+ _g_date_time_unref0 (_tmp42_);
#line 412 "/home/jens/Source/shotwell/src/main.vala"
- _tmp55_ = is_string_empty (_tmp54_);
+ _tmp44_ = filename;
#line 412 "/home/jens/Source/shotwell/src/main.vala"
- application_init (!_tmp55_);
+ application_init (!is_string_empty (_tmp44_));
#line 415 "/home/jens/Source/shotwell/src/main.vala"
- _tmp56_ = commandline_options_data_dir;
+ _tmp45_ = commandline_options_data_dir;
#line 415 "/home/jens/Source/shotwell/src/main.vala"
- if (_tmp56_ != NULL) {
-#line 2775 "main.c"
- const gchar* _tmp57_;
+ if (_tmp45_ != NULL) {
+#line 2926 "main.c"
+ const gchar* _tmp46_;
#line 416 "/home/jens/Source/shotwell/src/main.vala"
- _tmp57_ = commandline_options_data_dir;
+ _tmp46_ = commandline_options_data_dir;
#line 416 "/home/jens/Source/shotwell/src/main.vala"
- app_dirs_set_data_dir (_tmp57_);
-#line 2781 "main.c"
+ app_dirs_set_data_dir (_tmp46_);
+#line 2932 "main.c"
} else {
#line 418 "/home/jens/Source/shotwell/src/main.vala"
app_dirs_try_migrate_data ();
-#line 2785 "main.c"
+#line 2936 "main.c"
}
#line 421 "/home/jens/Source/shotwell/src/main.vala"
app_dirs_verify_data_dir ();
#line 422 "/home/jens/Source/shotwell/src/main.vala"
app_dirs_verify_cache_dir ();
#line 425 "/home/jens/Source/shotwell/src/main.vala"
- _tmp58_ = args;
-#line 425 "/home/jens/Source/shotwell/src/main.vala"
- _tmp58__length1 = args_length1;
-#line 425 "/home/jens/Source/shotwell/src/main.vala"
- international_support_init (RESOURCES_APP_GETTEXT_PACKAGE, _tmp58_, _tmp58__length1, INTERNATIONAL_SUPPORT_SYSTEM_LOCALE);
+ international_support_init (RESOURCES_APP_GETTEXT_PACKAGE, args, args_length1, INTERNATIONAL_SUPPORT_SYSTEM_LOCALE);
#line 427 "/home/jens/Source/shotwell/src/main.vala"
- _tmp59_ = g_timer_new ();
+ _tmp47_ = g_timer_new ();
#line 427 "/home/jens/Source/shotwell/src/main.vala"
_g_timer_destroy0 (startup_timer);
#line 427 "/home/jens/Source/shotwell/src/main.vala"
- startup_timer = _tmp59_;
+ startup_timer = _tmp47_;
#line 428 "/home/jens/Source/shotwell/src/main.vala"
- _tmp60_ = startup_timer;
+ _tmp48_ = startup_timer;
#line 428 "/home/jens/Source/shotwell/src/main.vala"
- g_timer_start (_tmp60_);
+ g_timer_start (_tmp48_);
#line 431 "/home/jens/Source/shotwell/src/main.vala"
g_set_application_name (RESOURCES_APP_TITLE);
#line 435 "/home/jens/Source/shotwell/src/main.vala"
resources_init ();
#line 440 "/home/jens/Source/shotwell/src/main.vala"
- _tmp61_ = filename;
+ _tmp49_ = filename;
#line 440 "/home/jens/Source/shotwell/src/main.vala"
- _tmp62_ = is_string_empty (_tmp61_);
-#line 440 "/home/jens/Source/shotwell/src/main.vala"
- if (_tmp62_) {
-#line 2817 "main.c"
- gchar** _tmp63_;
- gint _tmp63__length1;
+ if (is_string_empty (_tmp49_)) {
+#line 2962 "main.c"
+ gchar** _tmp50_;
+ gint _tmp50__length1;
#line 441 "/home/jens/Source/shotwell/src/main.vala"
- _tmp63_ = mounts;
+ _tmp50_ = mounts;
#line 441 "/home/jens/Source/shotwell/src/main.vala"
- _tmp63__length1 = mounts_length1;
+ _tmp50__length1 = mounts_length1;
#line 441 "/home/jens/Source/shotwell/src/main.vala"
- library_exec (_tmp63_, _tmp63__length1);
-#line 2826 "main.c"
+ library_exec (_tmp50_, _tmp50__length1);
+#line 2971 "main.c"
} else {
- const gchar* _tmp64_;
- gboolean _tmp65_;
+ const gchar* _tmp51_;
+ gboolean _tmp52_;
#line 443 "/home/jens/Source/shotwell/src/main.vala"
- _tmp64_ = filename;
+ _tmp51_ = filename;
#line 443 "/home/jens/Source/shotwell/src/main.vala"
- _tmp65_ = commandline_options_fullscreen;
+ _tmp52_ = commandline_options_fullscreen;
#line 443 "/home/jens/Source/shotwell/src/main.vala"
- editing_exec (_tmp64_, _tmp65_);
-#line 2836 "main.c"
+ editing_exec (_tmp51_, _tmp52_);
+#line 2981 "main.c"
}
#line 446 "/home/jens/Source/shotwell/src/main.vala"
resources_terminate ();
@@ -2851,122 +2996,120 @@ void _vala_main (gchar** args, int args_length1) {
#line 449 "/home/jens/Source/shotwell/src/main.vala"
app_dirs_terminate ();
#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_);
+ _tmp54_ = filename;
#line 454 "/home/jens/Source/shotwell/src/main.vala"
- if (_tmp68_) {
-#line 2852 "main.c"
- gboolean _tmp69_;
+ if (is_string_empty (_tmp54_)) {
+#line 2995 "main.c"
+ gboolean _tmp55_;
#line 454 "/home/jens/Source/shotwell/src/main.vala"
- _tmp69_ = was_already_running;
+ _tmp55_ = was_already_running;
#line 454 "/home/jens/Source/shotwell/src/main.vala"
- _tmp66_ = !_tmp69_;
-#line 2858 "main.c"
+ _tmp53_ = !_tmp55_;
+#line 3001 "main.c"
} else {
#line 454 "/home/jens/Source/shotwell/src/main.vala"
- _tmp66_ = FALSE;
-#line 2862 "main.c"
+ _tmp53_ = FALSE;
+#line 3005 "main.c"
}
#line 454 "/home/jens/Source/shotwell/src/main.vala"
- if (_tmp66_) {
-#line 2866 "main.c"
+ if (_tmp53_) {
+#line 3009 "main.c"
gchar* orig_path = NULL;
- GFile* _tmp70_;
- GFile* _tmp71_;
- GFile* _tmp72_;
- GFile* _tmp73_;
- gchar* _tmp74_;
- gchar* _tmp75_;
+ GFile* _tmp56_;
+ GFile* _tmp57_;
+ GFile* _tmp58_;
+ GFile* _tmp59_;
+ gchar* _tmp60_;
+ gchar* _tmp61_;
gchar* backup_path = NULL;
- const gchar* _tmp76_;
- gchar* _tmp77_;
+ const gchar* _tmp62_;
+ gchar* _tmp63_;
#line 455 "/home/jens/Source/shotwell/src/main.vala"
- _tmp70_ = app_dirs_get_data_subdir ("data", NULL);
+ _tmp56_ = app_dirs_get_data_subdir ("data", NULL);
#line 455 "/home/jens/Source/shotwell/src/main.vala"
- _tmp71_ = _tmp70_;
+ _tmp57_ = _tmp56_;
#line 455 "/home/jens/Source/shotwell/src/main.vala"
- _tmp72_ = g_file_get_child (_tmp71_, "photo.db");
+ _tmp58_ = g_file_get_child (_tmp57_, "photo.db");
#line 455 "/home/jens/Source/shotwell/src/main.vala"
- _tmp73_ = _tmp72_;
+ _tmp59_ = _tmp58_;
#line 455 "/home/jens/Source/shotwell/src/main.vala"
- _tmp74_ = g_file_get_path (_tmp73_);
+ _tmp60_ = g_file_get_path (_tmp59_);
#line 455 "/home/jens/Source/shotwell/src/main.vala"
- _tmp75_ = _tmp74_;
+ _tmp61_ = _tmp60_;
#line 455 "/home/jens/Source/shotwell/src/main.vala"
- _g_object_unref0 (_tmp73_);
+ _g_object_unref0 (_tmp59_);
#line 455 "/home/jens/Source/shotwell/src/main.vala"
- _g_object_unref0 (_tmp71_);
+ _g_object_unref0 (_tmp57_);
#line 455 "/home/jens/Source/shotwell/src/main.vala"
- orig_path = _tmp75_;
+ orig_path = _tmp61_;
#line 456 "/home/jens/Source/shotwell/src/main.vala"
- _tmp76_ = orig_path;
+ _tmp62_ = orig_path;
#line 456 "/home/jens/Source/shotwell/src/main.vala"
- _tmp77_ = g_strconcat (_tmp76_, ".bak", NULL);
+ _tmp63_ = g_strconcat (_tmp62_, ".bak", NULL);
#line 456 "/home/jens/Source/shotwell/src/main.vala"
- backup_path = _tmp77_;
-#line 2901 "main.c"
+ backup_path = _tmp63_;
+#line 3044 "main.c"
{
GFile* src = NULL;
- const gchar* _tmp78_;
- GFile* _tmp79_;
+ const gchar* _tmp64_;
+ GFile* _tmp65_;
GFile* dest = NULL;
- const gchar* _tmp80_;
- GFile* _tmp81_;
- GFile* _tmp82_;
- GFile* _tmp83_;
+ const gchar* _tmp66_;
+ GFile* _tmp67_;
+ GFile* _tmp68_;
+ GFile* _tmp69_;
#line 458 "/home/jens/Source/shotwell/src/main.vala"
- _tmp78_ = orig_path;
+ _tmp64_ = orig_path;
#line 458 "/home/jens/Source/shotwell/src/main.vala"
- _tmp79_ = g_file_new_for_commandline_arg (_tmp78_);
+ _tmp65_ = g_file_new_for_commandline_arg (_tmp64_);
#line 458 "/home/jens/Source/shotwell/src/main.vala"
- src = _tmp79_;
+ src = _tmp65_;
#line 459 "/home/jens/Source/shotwell/src/main.vala"
- _tmp80_ = backup_path;
+ _tmp66_ = backup_path;
#line 459 "/home/jens/Source/shotwell/src/main.vala"
- _tmp81_ = g_file_new_for_commandline_arg (_tmp80_);
+ _tmp67_ = g_file_new_for_commandline_arg (_tmp66_);
#line 459 "/home/jens/Source/shotwell/src/main.vala"
- dest = _tmp81_;
+ dest = _tmp67_;
#line 460 "/home/jens/Source/shotwell/src/main.vala"
- _tmp82_ = src;
+ _tmp68_ = src;
#line 460 "/home/jens/Source/shotwell/src/main.vala"
- _tmp83_ = dest;
+ _tmp69_ = 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_);
+ g_file_copy (_tmp68_, _tmp69_, 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 460 "/home/jens/Source/shotwell/src/main.vala"
_g_object_unref0 (dest);
#line 460 "/home/jens/Source/shotwell/src/main.vala"
_g_object_unref0 (src);
-#line 2935 "main.c"
+#line 3078 "main.c"
goto __catch237_g_error;
}
#line 457 "/home/jens/Source/shotwell/src/main.vala"
_g_object_unref0 (dest);
#line 457 "/home/jens/Source/shotwell/src/main.vala"
_g_object_unref0 (src);
-#line 2942 "main.c"
+#line 3085 "main.c"
}
goto __finally237;
__catch237_g_error:
{
GError* _error_ = NULL;
- GError* _tmp84_;
- const gchar* _tmp85_;
+ GError* _tmp70_;
+ const gchar* _tmp71_;
#line 457 "/home/jens/Source/shotwell/src/main.vala"
_error_ = _inner_error_;
#line 457 "/home/jens/Source/shotwell/src/main.vala"
_inner_error_ = NULL;
#line 464 "/home/jens/Source/shotwell/src/main.vala"
- _tmp84_ = _error_;
+ _tmp70_ = _error_;
#line 464 "/home/jens/Source/shotwell/src/main.vala"
- _tmp85_ = _tmp84_->message;
+ _tmp71_ = _tmp70_->message;
#line 464 "/home/jens/Source/shotwell/src/main.vala"
- g_warning ("main.vala:464: Failed to create backup file of database: %s", _tmp85_);
+ g_warning ("main.vala:464: Failed to create backup file of database: %s", _tmp71_);
#line 457 "/home/jens/Source/shotwell/src/main.vala"
_g_error_free0 (_error_);
-#line 2962 "main.c"
+#line 3105 "main.c"
}
__finally237:
#line 457 "/home/jens/Source/shotwell/src/main.vala"
@@ -2985,7 +3128,7 @@ void _vala_main (gchar** args, int args_length1) {
g_clear_error (&_inner_error_);
#line 457 "/home/jens/Source/shotwell/src/main.vala"
return;
-#line 2981 "main.c"
+#line 3124 "main.c"
}
#line 467 "/home/jens/Source/shotwell/src/main.vala"
sync ();
@@ -2993,29 +3136,33 @@ void _vala_main (gchar** args, int args_length1) {
_g_free0 (backup_path);
#line 454 "/home/jens/Source/shotwell/src/main.vala"
_g_free0 (orig_path);
-#line 2989 "main.c"
+#line 3132 "main.c"
}
#line 330 "/home/jens/Source/shotwell/src/main.vala"
_g_free0 (filename);
#line 330 "/home/jens/Source/shotwell/src/main.vala"
mounts = (_vala_array_free (mounts, mounts_length1, (GDestroyNotify) g_free), NULL);
-#line 2995 "main.c"
+#line 3138 "main.c"
}
-int main (int argc, char ** argv) {
-#if !GLIB_CHECK_VERSION (2,35,0)
- g_type_init ();
-#endif
+int
+main (int argc,
+ char ** argv)
+{
#line 330 "/home/jens/Source/shotwell/src/main.vala"
_vala_main (argv, argc);
#line 330 "/home/jens/Source/shotwell/src/main.vala"
return 0;
-#line 3007 "main.c"
+#line 3150 "main.c"
}
-static void _vala_array_destroy (gpointer array, gint array_length, GDestroyNotify destroy_func) {
+static void
+_vala_array_destroy (gpointer array,
+ gint array_length,
+ GDestroyNotify destroy_func)
+{
if ((array != NULL) && (destroy_func != NULL)) {
int i;
for (i = 0; i < array_length; i = i + 1) {
@@ -3027,7 +3174,11 @@ static void _vala_array_destroy (gpointer array, gint array_length, GDestroyNoti
}
-static void _vala_array_free (gpointer array, gint array_length, GDestroyNotify destroy_func) {
+static void
+_vala_array_free (gpointer array,
+ gint array_length,
+ GDestroyNotify destroy_func)
+{
_vala_array_destroy (array, array_length, destroy_func);
g_free (array);
}