summaryrefslogtreecommitdiff
path: root/src/direct
diff options
context:
space:
mode:
Diffstat (limited to 'src/direct')
-rw-r--r--src/direct/Direct.c34
-rw-r--r--src/direct/DirectPhoto.c1469
-rw-r--r--src/direct/DirectPhotoPage.c2829
-rw-r--r--src/direct/DirectView.c303
-rw-r--r--src/direct/DirectWindow.c459
5 files changed, 2762 insertions, 2332 deletions
diff --git a/src/direct/Direct.c b/src/direct/Direct.c
index 36ab376..48e5fab 100644
--- a/src/direct/Direct.c
+++ b/src/direct/Direct.c
@@ -1,4 +1,4 @@
-/* Direct.c generated by valac 0.36.6, the Vala compiler
+/* Direct.c generated by valac 0.40.4, the Vala compiler
* generated from Direct.vala, do not modify */
/* Copyright 2016 Software Freedom Conservancy Inc.
@@ -15,6 +15,7 @@
* the preconfigure() method, implement it, and ensure in init() that it's been called.
*/
+
#include <glib.h>
#include <glib-object.h>
#include <gio/gio.h>
@@ -36,31 +37,34 @@ void direct_terminate (void);
void direct_photo_terminate (void);
-static gpointer _g_object_ref0 (gpointer self) {
+static gpointer
+_g_object_ref0 (gpointer self)
+{
#line 21 "/home/jens/Source/shotwell/src/direct/Direct.vala"
return self ? g_object_ref (self) : NULL;
-#line 43 "Direct.c"
+#line 46 "Direct.c"
}
-void direct_preconfigure (GFile* initial_file) {
+void
+direct_preconfigure (GFile* initial_file)
+{
GFile* _tmp0_;
- GFile* _tmp1_;
#line 20 "/home/jens/Source/shotwell/src/direct/Direct.vala"
g_return_if_fail (G_IS_FILE (initial_file));
#line 21 "/home/jens/Source/shotwell/src/direct/Direct.vala"
- _tmp0_ = initial_file;
-#line 21 "/home/jens/Source/shotwell/src/direct/Direct.vala"
- _tmp1_ = _g_object_ref0 (_tmp0_);
+ _tmp0_ = _g_object_ref0 (initial_file);
#line 21 "/home/jens/Source/shotwell/src/direct/Direct.vala"
_g_object_unref0 (direct_initial_file);
#line 21 "/home/jens/Source/shotwell/src/direct/Direct.vala"
- direct_initial_file = _tmp1_;
-#line 60 "Direct.c"
+ direct_initial_file = _tmp0_;
+#line 62 "Direct.c"
}
-void direct_init (GError** error) {
+void
+direct_init (GError** error)
+{
GFile* _tmp0_;
GFile* _tmp1_;
#line 25 "/home/jens/Source/shotwell/src/direct/Direct.vala"
@@ -71,14 +75,16 @@ void direct_init (GError** error) {
_tmp1_ = direct_initial_file;
#line 27 "/home/jens/Source/shotwell/src/direct/Direct.vala"
direct_photo_init (_tmp1_);
-#line 75 "Direct.c"
+#line 79 "Direct.c"
}
-void direct_terminate (void) {
+void
+direct_terminate (void)
+{
#line 31 "/home/jens/Source/shotwell/src/direct/Direct.vala"
direct_photo_terminate ();
-#line 82 "Direct.c"
+#line 88 "Direct.c"
}
diff --git a/src/direct/DirectPhoto.c b/src/direct/DirectPhoto.c
index 0a51b29..42b8670 100644
--- a/src/direct/DirectPhoto.c
+++ b/src/direct/DirectPhoto.c
@@ -1,4 +1,4 @@
-/* DirectPhoto.c generated by valac 0.36.6, the Vala compiler
+/* DirectPhoto.c generated by valac 0.40.4, the Vala compiler
* generated from DirectPhoto.vala, do not modify */
/* Copyright 2016 Software Freedom Conservancy Inc.
@@ -7,6 +7,7 @@
* (version 2.1 or later). See the COPYING file in this distribution.
*/
+
#include <glib.h>
#include <glib-object.h>
#include <stdlib.h>
@@ -232,6 +233,11 @@ typedef struct _BackingPhotoRowClass BackingPhotoRowClass;
typedef struct _DirectPhoto DirectPhoto;
typedef struct _DirectPhotoClass DirectPhotoClass;
typedef struct _DirectPhotoPrivate DirectPhotoPrivate;
+enum {
+ DIRECT_PHOTO_0_PROPERTY,
+ DIRECT_PHOTO_NUM_PROPERTIES
+};
+static GParamSpec* direct_photo_properties[DIRECT_PHOTO_NUM_PROPERTIES];
#define TYPE_DATABASE_SOURCE_COLLECTION (database_source_collection_get_type ())
#define DATABASE_SOURCE_COLLECTION(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), TYPE_DATABASE_SOURCE_COLLECTION, DatabaseSourceCollection))
@@ -342,9 +348,9 @@ typedef struct _PhotoPreviewClass PhotoPreviewClass;
#define _media_metadata_unref0(var) ((var == NULL) ? NULL : (var = (media_metadata_unref (var), NULL)))
enum {
DIRECT_PHOTO_CAN_ROTATE_CHANGED_SIGNAL,
- DIRECT_PHOTO_LAST_SIGNAL
+ DIRECT_PHOTO_NUM_SIGNALS
};
-static guint direct_photo_signals[DIRECT_PHOTO_LAST_SIGNAL] = {0};
+static guint direct_photo_signals[DIRECT_PHOTO_NUM_SIGNALS] = {0};
typedef struct _DataCollectionPrivate DataCollectionPrivate;
#define TYPE_MARKER (marker_get_type ())
@@ -860,32 +866,56 @@ static gpointer direct_photo_source_collection_parent_class = NULL;
GType data_object_get_type (void) G_GNUC_CONST;
gpointer alteration_ref (gpointer instance);
void alteration_unref (gpointer instance);
-GParamSpec* param_spec_alteration (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags);
-void value_set_alteration (GValue* value, gpointer v_object);
-void value_take_alteration (GValue* value, gpointer v_object);
+GParamSpec* param_spec_alteration (const gchar* name,
+ const gchar* nick,
+ const gchar* blurb,
+ GType object_type,
+ GParamFlags flags);
+void value_set_alteration (GValue* value,
+ gpointer v_object);
+void value_take_alteration (GValue* value,
+ gpointer v_object);
gpointer value_get_alteration (const GValue* value);
GType alteration_get_type (void) G_GNUC_CONST;
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 data_source_get_type (void) G_GNUC_CONST;
gpointer source_holding_tank_ref (gpointer instance);
void source_holding_tank_unref (gpointer instance);
-GParamSpec* param_spec_source_holding_tank (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags);
-void value_set_source_holding_tank (GValue* value, gpointer v_object);
-void value_take_source_holding_tank (GValue* value, gpointer v_object);
+GParamSpec* param_spec_source_holding_tank (const gchar* name,
+ const gchar* nick,
+ const gchar* blurb,
+ GType object_type,
+ GParamFlags flags);
+void value_set_source_holding_tank (GValue* value,
+ gpointer v_object);
+void value_take_source_holding_tank (GValue* value,
+ gpointer v_object);
gpointer value_get_source_holding_tank (const GValue* value);
GType source_holding_tank_get_type (void) G_GNUC_CONST;
GType source_collection_get_type (void) G_GNUC_CONST;
gpointer source_snapshot_ref (gpointer instance);
void source_snapshot_unref (gpointer instance);
-GParamSpec* param_spec_source_snapshot (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags);
-void value_set_source_snapshot (GValue* value, gpointer v_object);
-void value_take_source_snapshot (GValue* value, gpointer v_object);
+GParamSpec* param_spec_source_snapshot (const gchar* name,
+ const gchar* nick,
+ const gchar* blurb,
+ GType object_type,
+ GParamFlags flags);
+void value_set_source_snapshot (GValue* value,
+ gpointer v_object);
+void value_take_source_snapshot (GValue* value,
+ gpointer v_object);
gpointer value_get_source_snapshot (const GValue* value);
GType source_snapshot_get_type (void) G_GNUC_CONST;
GType thumbnail_source_get_type (void) G_GNUC_CONST;
@@ -897,9 +927,15 @@ EventID* event_id_dup (const EventID* self);
void event_id_free (EventID* self);
gpointer backing_file_state_ref (gpointer instance);
void backing_file_state_unref (gpointer instance);
-GParamSpec* param_spec_backing_file_state (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags);
-void value_set_backing_file_state (GValue* value, gpointer v_object);
-void value_take_backing_file_state (GValue* value, gpointer v_object);
+GParamSpec* param_spec_backing_file_state (const gchar* name,
+ const gchar* nick,
+ const gchar* blurb,
+ GType object_type,
+ GParamFlags flags);
+void value_set_backing_file_state (GValue* value,
+ gpointer v_object);
+void value_take_backing_file_state (GValue* value,
+ gpointer v_object);
gpointer value_get_backing_file_state (const GValue* value);
GType backing_file_state_get_type (void) G_GNUC_CONST;
GType rating_get_type (void) G_GNUC_CONST;
@@ -917,9 +953,15 @@ void import_id_free (ImportID* self);
GType photo_source_get_type (void) G_GNUC_CONST;
gpointer media_metadata_ref (gpointer instance);
void media_metadata_unref (gpointer instance);
-GParamSpec* param_spec_media_metadata (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags);
-void value_set_media_metadata (GValue* value, gpointer v_object);
-void value_take_media_metadata (GValue* value, gpointer v_object);
+GParamSpec* param_spec_media_metadata (const gchar* name,
+ const gchar* nick,
+ const gchar* blurb,
+ GType object_type,
+ GParamFlags flags);
+void value_set_media_metadata (GValue* value,
+ gpointer v_object);
+void value_take_media_metadata (GValue* value,
+ gpointer v_object);
gpointer value_get_media_metadata (const GValue* value);
GType media_metadata_get_type (void) G_GNUC_CONST;
GType photo_metadata_get_type (void) G_GNUC_CONST;
@@ -928,31 +970,43 @@ GType photo_get_type (void) G_GNUC_CONST;
GType rotation_get_type (void) G_GNUC_CONST;
gpointer photo_row_ref (gpointer instance);
void photo_row_unref (gpointer instance);
-GParamSpec* param_spec_photo_row (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags);
-void value_set_photo_row (GValue* value, gpointer v_object);
-void value_take_photo_row (GValue* value, gpointer v_object);
+GParamSpec* param_spec_photo_row (const gchar* name,
+ const gchar* nick,
+ const gchar* blurb,
+ GType object_type,
+ GParamFlags flags);
+void value_set_photo_row (GValue* value,
+ gpointer v_object);
+void value_take_photo_row (GValue* value,
+ gpointer v_object);
gpointer value_get_photo_row (const GValue* value);
GType photo_row_get_type (void) G_GNUC_CONST;
gpointer backing_photo_row_ref (gpointer instance);
void backing_photo_row_unref (gpointer instance);
-GParamSpec* param_spec_backing_photo_row (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags);
-void value_set_backing_photo_row (GValue* value, gpointer v_object);
-void value_take_backing_photo_row (GValue* value, gpointer v_object);
+GParamSpec* param_spec_backing_photo_row (const gchar* name,
+ const gchar* nick,
+ const gchar* blurb,
+ GType object_type,
+ GParamFlags flags);
+void value_set_backing_photo_row (GValue* value,
+ gpointer v_object);
+void value_take_backing_photo_row (GValue* value,
+ gpointer v_object);
gpointer value_get_backing_photo_row (const GValue* value);
GType backing_photo_row_get_type (void) G_GNUC_CONST;
GType direct_photo_get_type (void) G_GNUC_CONST;
#define DIRECT_PHOTO_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), TYPE_DIRECT_PHOTO, DirectPhotoPrivate))
-enum {
- DIRECT_PHOTO_DUMMY_PROPERTY
-};
GType database_source_collection_get_type (void) G_GNUC_CONST;
GType direct_photo_source_collection_get_type (void) G_GNUC_CONST;
#define DIRECT_PHOTO_PREVIEW_BEST_FIT 360
static DirectPhoto* direct_photo_new (PhotoRow* row);
-static DirectPhoto* direct_photo_construct (GType object_type, PhotoRow* row);
-Photo* photo_construct (GType object_type, PhotoRow* row);
+static DirectPhoto* direct_photo_construct (GType object_type,
+ PhotoRow* row);
+Photo* photo_construct (GType object_type,
+ PhotoRow* row);
GType orientation_get_type (void) G_GNUC_CONST;
-void direct_photo_fixup_orientation_after_reimport (DirectPhoto* self, Orientation dest);
+void direct_photo_fixup_orientation_after_reimport (DirectPhoto* self,
+ Orientation dest);
GType photo_id_get_type (void) G_GNUC_CONST;
PhotoID* photo_id_dup (const PhotoID* self);
void photo_id_free (PhotoID* self);
@@ -963,85 +1017,157 @@ GType raw_developer_get_type (void) G_GNUC_CONST;
void direct_photo_init (GFile* initial_file);
void photo_init_photo (void);
DirectPhotoSourceCollection* direct_photo_source_collection_new (GFile* initial_file);
-DirectPhotoSourceCollection* direct_photo_source_collection_construct (GType object_type, GFile* initial_file);
-gchar* direct_photo_source_collection_fetch (DirectPhotoSourceCollection* self, GFile* file, DirectPhoto* * photo, gboolean reimport);
-gboolean data_collection_add (DataCollection* self, DataObject* object);
+DirectPhotoSourceCollection* direct_photo_source_collection_construct (GType object_type,
+ GFile* initial_file);
+gchar* direct_photo_source_collection_fetch (DirectPhotoSourceCollection* self,
+ GFile* file,
+ DirectPhoto* * photo,
+ gboolean reimport);
+gboolean data_collection_add (DataCollection* self,
+ DataObject* object);
void direct_photo_terminate (void);
void photo_terminate_photo (void);
static void direct_photo_save_dims (DirectPhoto* self);
GType backing_fetch_mode_get_type (void) G_GNUC_CONST;
-GdkPixbuf* photo_get_pixbuf_with_options (Photo* self, Scaling* scaling, PhotoException exceptions, BackingFetchMode fetch_mode, GError** error);
+GdkPixbuf* photo_get_pixbuf_with_options (Photo* self,
+ Scaling* scaling,
+ PhotoException exceptions,
+ BackingFetchMode fetch_mode,
+ GError** error);
void scaling_for_original (Scaling* result);
-void dimensions_for_pixbuf (GdkPixbuf* pixbuf, Dimensions* result);
+void dimensions_for_pixbuf (GdkPixbuf* pixbuf,
+ Dimensions* result);
gchar* data_object_to_string (DataObject* self);
GType import_result_get_type (void) G_GNUC_CONST;
ImportResult direct_photo_demand_load (DirectPhoto* self);
gpointer photo_reimport_master_state_ref (gpointer instance);
void photo_reimport_master_state_unref (gpointer instance);
-GParamSpec* photo_param_spec_reimport_master_state (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags);
-void photo_value_set_reimport_master_state (GValue* value, gpointer v_object);
-void photo_value_take_reimport_master_state (GValue* value, gpointer v_object);
+GParamSpec* photo_param_spec_reimport_master_state (const gchar* name,
+ const gchar* nick,
+ const gchar* blurb,
+ GType object_type,
+ GParamFlags flags);
+void photo_value_set_reimport_master_state (GValue* value,
+ gpointer v_object);
+void photo_value_take_reimport_master_state (GValue* value,
+ gpointer v_object);
gpointer photo_value_get_reimport_master_state (const GValue* value);
GType photo_reimport_master_state_get_type (void) G_GNUC_CONST;
-gboolean photo_prepare_for_reimport_master (Photo* self, PhotoReimportMasterState* * reimport_state, GError** error);
+gboolean photo_prepare_for_reimport_master (Photo* self,
+ PhotoReimportMasterState* * reimport_state,
+ GError** error);
GQuark database_error_quark (void);
-void photo_finish_reimport_master (Photo* self, PhotoReimportMasterState* state, GError** error);
-ImportResult direct_photo_internal_import (GFile* file, DirectPhoto* * photo);
+void photo_finish_reimport_master (Photo* self,
+ PhotoReimportMasterState* state,
+ GError** error);
+ImportResult direct_photo_internal_import (GFile* file,
+ DirectPhoto* * photo);
gpointer photo_import_params_ref (gpointer instance);
void photo_import_params_unref (gpointer instance);
-GParamSpec* param_spec_photo_import_params (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags);
-void value_set_photo_import_params (GValue* value, gpointer v_object);
-void value_take_photo_import_params (GValue* value, gpointer v_object);
+GParamSpec* param_spec_photo_import_params (const gchar* name,
+ const gchar* nick,
+ const gchar* blurb,
+ GType object_type,
+ GParamFlags flags);
+void value_set_photo_import_params (GValue* value,
+ gpointer v_object);
+void value_take_photo_import_params (GValue* value,
+ gpointer v_object);
gpointer value_get_photo_import_params (const GValue* value);
GType photo_import_params_get_type (void) G_GNUC_CONST;
void import_id_generate (ImportID* result);
-PhotoImportParams* photo_import_params_new_create_placeholder (GFile* file, ImportID* import_id);
-PhotoImportParams* photo_import_params_construct_create_placeholder (GType object_type, GFile* file, ImportID* import_id);
+PhotoImportParams* photo_import_params_new_create_placeholder (GFile* file,
+ ImportID* import_id);
+PhotoImportParams* photo_import_params_construct_create_placeholder (GType object_type,
+ GFile* file,
+ ImportID* import_id);
void photo_create_pre_import (PhotoImportParams* params);
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;
PhotoTable* photo_table_get_instance (void);
-void photo_table_add (PhotoTable* self, PhotoRow* photo_row, PhotoID* result);
+void photo_table_add (PhotoTable* self,
+ PhotoRow* photo_row,
+ PhotoID* result);
GType photo_file_sniffer_options_get_type (void) G_GNUC_CONST;
gpointer thumbnails_ref (gpointer instance);
void thumbnails_unref (gpointer instance);
-GParamSpec* param_spec_thumbnails (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags);
-void value_set_thumbnails (GValue* value, gpointer v_object);
-void value_take_thumbnails (GValue* value, gpointer v_object);
+GParamSpec* param_spec_thumbnails (const gchar* name,
+ const gchar* nick,
+ const gchar* blurb,
+ GType object_type,
+ GParamFlags flags);
+void value_set_thumbnails (GValue* value,
+ gpointer v_object);
+void value_take_thumbnails (GValue* value,
+ gpointer v_object);
gpointer value_get_thumbnails (const GValue* value);
GType thumbnails_get_type (void) G_GNUC_CONST;
-static GdkPixbuf* direct_photo_real_get_preview_pixbuf (MediaSource* base, Scaling* scaling, GError** error);
-GdkPixbuf* thumbnail_source_get_thumbnail (ThumbnailSource* self, gint scale, GError** error);
-GdkPixbuf* photo_source_get_pixbuf (PhotoSource* self, Scaling* scaling, GError** error);
-GdkPixbuf* scaling_perform_on_pixbuf (Scaling *self, GdkPixbuf* pixbuf, GdkInterpType interp, gboolean scale_up);
-static void direct_photo_real_rotate (Photo* base, Rotation rotation);
-void photo_rotate (Photo* self, Rotation rotation);
-static GdkPixbuf* direct_photo_real_get_pixbuf (PhotoSource* base, Scaling* scaling, GError** error);
-static GdkPixbuf* direct_photo_real_get_thumbnail (ThumbnailSource* base, gint scale, GError** error);
+static GdkPixbuf* direct_photo_real_get_preview_pixbuf (MediaSource* base,
+ Scaling* scaling,
+ GError** error);
+GdkPixbuf* thumbnail_source_get_thumbnail (ThumbnailSource* self,
+ gint scale,
+ GError** error);
+GdkPixbuf* photo_source_get_pixbuf (PhotoSource* self,
+ Scaling* scaling,
+ GError** error);
+GdkPixbuf* scaling_perform_on_pixbuf (Scaling *self,
+ GdkPixbuf* pixbuf,
+ GdkInterpType interp,
+ gboolean scale_up);
+static void direct_photo_real_rotate (Photo* base,
+ Rotation rotation);
+void photo_rotate (Photo* self,
+ Rotation rotation);
+static GdkPixbuf* direct_photo_real_get_pixbuf (PhotoSource* base,
+ Scaling* scaling,
+ GError** error);
+static GdkPixbuf* direct_photo_real_get_thumbnail (ThumbnailSource* base,
+ gint scale,
+ GError** error);
PhotoMetadata* photo_source_get_metadata (PhotoSource* self);
guint photo_metadata_get_preview_count (PhotoMetadata* self);
gpointer photo_preview_ref (gpointer instance);
void photo_preview_unref (gpointer instance);
-GParamSpec* param_spec_photo_preview (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags);
-void value_set_photo_preview (GValue* value, gpointer v_object);
-void value_take_photo_preview (GValue* value, gpointer v_object);
+GParamSpec* param_spec_photo_preview (const gchar* name,
+ const gchar* nick,
+ const gchar* blurb,
+ GType object_type,
+ GParamFlags flags);
+void value_set_photo_preview (GValue* value,
+ gpointer v_object);
+void value_take_photo_preview (GValue* value,
+ gpointer v_object);
gpointer value_get_photo_preview (const GValue* value);
GType photo_preview_get_type (void) G_GNUC_CONST;
-PhotoPreview* photo_metadata_get_preview (PhotoMetadata* self, guint number);
-GdkPixbuf* photo_preview_get_pixbuf (PhotoPreview* self, GError** error);
+PhotoPreview* photo_metadata_get_preview (PhotoMetadata* self,
+ guint number);
+GdkPixbuf* photo_preview_get_pixbuf (PhotoPreview* self,
+ GError** error);
Orientation photo_get_orientation (Photo* self);
-GdkPixbuf* orientation_rotate_pixbuf (Orientation self, GdkPixbuf* pixbuf);
-static void direct_photo_real_notify_altered (DataObject* base, Alteration* alteration);
-void data_object_notify_altered (DataObject* self, Alteration* alteration);
+GdkPixbuf* orientation_rotate_pixbuf (Orientation self,
+ GdkPixbuf* pixbuf);
+static void direct_photo_real_notify_altered (DataObject* base,
+ Alteration* alteration);
+void data_object_notify_altered (DataObject* self,
+ Alteration* alteration);
static gboolean direct_photo_real_has_user_generated_metadata (Photo* base);
-static void direct_photo_real_set_user_metadata_for_export (Photo* base, PhotoMetadata* metadata);
-static void direct_photo_real_apply_user_metadata_for_reimport (Photo* base, PhotoMetadata* metadata);
+static void direct_photo_real_set_user_metadata_for_export (Photo* base,
+ PhotoMetadata* metadata);
+static void direct_photo_real_apply_user_metadata_for_reimport (Photo* base,
+ PhotoMetadata* metadata);
static gboolean direct_photo_real_is_trashed (MediaSource* base);
static gboolean direct_photo_real_is_offline (MediaSource* base);
static void direct_photo_real_trash (MediaSource* base);
@@ -1052,72 +1178,110 @@ static void direct_photo_finalize (GObject * obj);
GType marker_get_type (void) G_GNUC_CONST;
gpointer source_backlink_ref (gpointer instance);
void source_backlink_unref (gpointer instance);
-GParamSpec* param_spec_source_backlink (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags);
-void value_set_source_backlink (GValue* value, gpointer v_object);
-void value_take_source_backlink (GValue* value, gpointer v_object);
+GParamSpec* param_spec_source_backlink (const gchar* name,
+ const gchar* nick,
+ const gchar* blurb,
+ GType object_type,
+ GParamFlags flags);
+void value_set_source_backlink (GValue* value,
+ gpointer v_object);
+void value_take_source_backlink (GValue* value,
+ gpointer v_object);
gpointer value_get_source_backlink (const GValue* value);
GType source_backlink_get_type (void) G_GNUC_CONST;
GType directory_monitor_get_type (void) G_GNUC_CONST;
#define DIRECT_PHOTO_SOURCE_COLLECTION_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), TYPE_DIRECT_PHOTO_SOURCE_COLLECTION, DirectPhotoSourceCollectionPrivate))
-enum {
- DIRECT_PHOTO_SOURCE_COLLECTION_DUMMY_PROPERTY
-};
guint file_hash (GFile* file);
-static guint _file_hash_gee_hash_data_func (gconstpointer v, gpointer self);
-gboolean file_equal (GFile* a, GFile* b);
-static gboolean _file_equal_gee_equal_data_func (gconstpointer a, gconstpointer b, gpointer self);
+static guint _file_hash_gee_hash_data_func (gconstpointer v,
+ gpointer self);
+gboolean file_equal (GFile* a,
+ GFile* b);
+static gboolean _file_equal_gee_equal_data_func (gconstpointer a,
+ gconstpointer b,
+ gpointer self);
#define DIRECT_PHOTO_SOURCE_COLLECTION_DISCOVERED_FILES_BATCH_ADD 500
static gint64 direct_photo_source_collection_get_direct_key (DataSource* source);
-static gint64 _direct_photo_source_collection_get_direct_key_get_source_database_key (DataSource* source, gpointer self);
-DatabaseSourceCollection* database_source_collection_construct (GType object_type, const gchar* name, GetSourceDatabaseKey source_key_func, void* source_key_func_target);
-DirectoryMonitor* directory_monitor_new (GFile* root, gboolean recurse, gboolean monitoring);
-DirectoryMonitor* directory_monitor_construct (GType object_type, GFile* root, gboolean recurse, gboolean monitoring);
-static void direct_photo_source_collection_on_file_discovered (DirectPhotoSourceCollection* self, GFile* file, GFileInfo* info);
-static void _direct_photo_source_collection_on_file_discovered_directory_monitor_file_discovered (DirectoryMonitor* _sender, GFile* file, GFileInfo* info, gpointer self);
+static gint64 _direct_photo_source_collection_get_direct_key_get_source_database_key (DataSource* source,
+ gpointer self);
+DatabaseSourceCollection* database_source_collection_construct (GType object_type,
+ const gchar* name,
+ GetSourceDatabaseKey source_key_func,
+ void* source_key_func_target);
+DirectoryMonitor* directory_monitor_new (GFile* root,
+ gboolean recurse,
+ gboolean monitoring);
+DirectoryMonitor* directory_monitor_construct (GType object_type,
+ GFile* root,
+ gboolean recurse,
+ gboolean monitoring);
+static void direct_photo_source_collection_on_file_discovered (DirectPhotoSourceCollection* self,
+ GFile* file,
+ GFileInfo* info);
+static void _direct_photo_source_collection_on_file_discovered_directory_monitor_file_discovered (DirectoryMonitor* _sender,
+ GFile* file,
+ GFileInfo* info,
+ gpointer self);
static void direct_photo_source_collection_on_discovery_completed (DirectPhotoSourceCollection* self);
-static void _direct_photo_source_collection_on_discovery_completed_directory_monitor_discovery_completed (DirectoryMonitor* _sender, gpointer self);
+static void _direct_photo_source_collection_on_discovery_completed_directory_monitor_discovery_completed (DirectoryMonitor* _sender,
+ gpointer self);
void directory_monitor_start_discovery (DirectoryMonitor* self);
-static gboolean direct_photo_source_collection_real_holds_type_of_source (SourceCollection* base, DataSource* source);
-void photo_get_photo_id (Photo* self, PhotoID* result);
-static void direct_photo_source_collection_real_notify_items_added (DataCollection* base, GeeIterable* added);
+static gboolean direct_photo_source_collection_real_holds_type_of_source (SourceCollection* base,
+ DataSource* source);
+void photo_get_photo_id (Photo* self,
+ PhotoID* result);
+static void direct_photo_source_collection_real_notify_items_added (DataCollection* base,
+ GeeIterable* added);
GFile* media_source_get_file (MediaSource* self);
-void data_collection_notify_items_added (DataCollection* self, GeeIterable* added);
-static void direct_photo_source_collection_real_notify_items_removed (DataCollection* base, GeeIterable* removed);
-void data_collection_notify_items_removed (DataCollection* self, GeeIterable* removed);
-gboolean direct_photo_source_collection_has_source_for_file (DirectPhotoSourceCollection* self, GFile* file);
+void data_collection_notify_items_added (DataCollection* self,
+ GeeIterable* added);
+static void direct_photo_source_collection_real_notify_items_removed (DataCollection* base,
+ GeeIterable* removed);
+void data_collection_notify_items_removed (DataCollection* self,
+ GeeIterable* removed);
+gboolean direct_photo_source_collection_has_source_for_file (DirectPhotoSourceCollection* self,
+ GFile* file);
gboolean photo_file_format_is_file_supported (GFile* file);
static void direct_photo_source_collection_flush_prepared_photos (DirectPhotoSourceCollection* self);
-GeeCollection* data_collection_add_many (DataCollection* self, GeeCollection* objects, ProgressMonitor monitor, void* monitor_target);
-gboolean direct_photo_source_collection_has_file (DirectPhotoSourceCollection* self, GFile* file);
-void direct_photo_source_collection_reimport_photo (DirectPhotoSourceCollection* self, DirectPhoto* photo);
+GeeCollection* data_collection_add_many (DataCollection* self,
+ GeeCollection* objects,
+ ProgressMonitor monitor,
+ void* monitor_target);
+gboolean direct_photo_source_collection_has_file (DirectPhotoSourceCollection* self,
+ GFile* file);
+void direct_photo_source_collection_reimport_photo (DirectPhotoSourceCollection* self,
+ DirectPhoto* photo);
void photo_discard_prefetched (Photo* self);
gboolean photo_only_metadata_changed (Photo* self);
PhotoFileFormat photo_get_file_format (Photo* self);
gchar* import_result_to_string (ImportResult self);
-gboolean direct_photo_source_collection_has_file_source (DirectPhotoSourceCollection* self, GFile* file);
-DirectPhoto* direct_photo_source_collection_get_file_source (DirectPhotoSourceCollection* self, GFile* file);
+gboolean direct_photo_source_collection_has_file_source (DirectPhotoSourceCollection* self,
+ GFile* file);
+DirectPhoto* direct_photo_source_collection_get_file_source (DirectPhotoSourceCollection* self,
+ GFile* file);
static void direct_photo_source_collection_finalize (DataCollection * obj);
-static DirectPhoto* direct_photo_construct (GType object_type, PhotoRow* row) {
+static DirectPhoto*
+direct_photo_construct (GType object_type,
+ PhotoRow* row)
+{
DirectPhoto * self = NULL;
- PhotoRow* _tmp0_;
#line 17 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala"
g_return_val_if_fail (IS_PHOTO_ROW (row), NULL);
#line 18 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala"
- _tmp0_ = row;
-#line 18 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala"
- self = (DirectPhoto*) photo_construct (object_type, _tmp0_);
+ self = (DirectPhoto*) photo_construct (object_type, row);
#line 17 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala"
return self;
-#line 1114 "DirectPhoto.c"
+#line 1276 "DirectPhoto.c"
}
-static DirectPhoto* direct_photo_new (PhotoRow* row) {
+static DirectPhoto*
+direct_photo_new (PhotoRow* row)
+{
#line 17 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala"
return direct_photo_construct (TYPE_DIRECT_PHOTO, row);
-#line 1121 "DirectPhoto.c"
+#line 1285 "DirectPhoto.c"
}
@@ -1135,103 +1299,100 @@ static DirectPhoto* direct_photo_new (PhotoRow* row) {
* @param dest The orientation to set the photo to; usually, this should be a value
* obtained by calling get_orientation() prior to export()ing a DirectPhoto.
*/
-void direct_photo_fixup_orientation_after_reimport (DirectPhoto* self, Orientation dest) {
+void
+direct_photo_fixup_orientation_after_reimport (DirectPhoto* self,
+ Orientation dest)
+{
PhotoRow* _tmp0_;
- Orientation _tmp1_;
- BackingPhotoRow* _tmp2_;
- Orientation _tmp3_;
+ BackingPhotoRow* _tmp1_;
#line 35 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala"
g_return_if_fail (IS_DIRECT_PHOTO (self));
#line 36 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala"
_tmp0_ = G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PHOTO, Photo)->row;
#line 36 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala"
- _tmp1_ = dest;
-#line 36 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala"
- _tmp0_->orientation = _tmp1_;
-#line 37 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala"
- _tmp2_ = G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PHOTO, Photo)->backing_photo_row;
+ _tmp0_->orientation = dest;
#line 37 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala"
- _tmp3_ = dest;
+ _tmp1_ = G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PHOTO, Photo)->backing_photo_row;
#line 37 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala"
- _tmp2_->original_orientation = _tmp3_;
-#line 1158 "DirectPhoto.c"
+ _tmp1_->original_orientation = dest;
+#line 1319 "DirectPhoto.c"
}
-void direct_photo_init (GFile* initial_file) {
- GFile* _tmp0_;
- DirectPhotoSourceCollection* _tmp1_;
+void
+direct_photo_init (GFile* initial_file)
+{
+ DirectPhotoSourceCollection* _tmp0_;
DirectPhoto* photo = NULL;
gchar* reason = NULL;
- DirectPhotoSourceCollection* _tmp2_;
- GFile* _tmp3_;
- DirectPhoto* _tmp4_ = NULL;
- gchar* _tmp5_;
- const gchar* _tmp6_;
- DirectPhotoSourceCollection* _tmp8_;
- DirectPhoto* _tmp9_;
+ DirectPhotoSourceCollection* _tmp1_;
+ DirectPhoto* _tmp2_ = NULL;
+ gchar* _tmp3_;
+ const gchar* _tmp4_;
+ DirectPhotoSourceCollection* _tmp6_;
+ DirectPhoto* _tmp7_;
#line 40 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala"
g_return_if_fail (G_IS_FILE (initial_file));
#line 41 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala"
photo_init_photo ();
#line 43 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala"
- _tmp0_ = initial_file;
-#line 43 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala"
- _tmp1_ = direct_photo_source_collection_new (_tmp0_);
+ _tmp0_ = direct_photo_source_collection_new (initial_file);
#line 43 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala"
_data_collection_unref0 (direct_photo_global);
#line 43 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala"
- direct_photo_global = _tmp1_;
-#line 45 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala"
- _tmp2_ = direct_photo_global;
+ direct_photo_global = _tmp0_;
#line 45 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala"
- _tmp3_ = initial_file;
+ _tmp1_ = direct_photo_global;
#line 45 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala"
- _tmp5_ = direct_photo_source_collection_fetch (_tmp2_, _tmp3_, &_tmp4_, FALSE);
+ _tmp3_ = direct_photo_source_collection_fetch (_tmp1_, initial_file, &_tmp2_, FALSE);
#line 45 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala"
_g_object_unref0 (photo);
#line 45 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala"
- photo = _tmp4_;
+ photo = _tmp2_;
#line 45 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala"
- reason = _tmp5_;
+ reason = _tmp3_;
#line 46 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala"
- _tmp6_ = reason;
+ _tmp4_ = reason;
#line 46 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala"
- if (_tmp6_ != NULL) {
-#line 1202 "DirectPhoto.c"
- const gchar* _tmp7_;
+ if (_tmp4_ != NULL) {
+#line 1359 "DirectPhoto.c"
+ const gchar* _tmp5_;
#line 47 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala"
- _tmp7_ = reason;
+ _tmp5_ = reason;
#line 47 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala"
- g_warning ("DirectPhoto.vala:47: fetch error: %s", _tmp7_);
-#line 1208 "DirectPhoto.c"
+ g_warning ("DirectPhoto.vala:47: fetch error: %s", _tmp5_);
+#line 1365 "DirectPhoto.c"
}
#line 48 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala"
- _tmp8_ = direct_photo_global;
+ _tmp6_ = direct_photo_global;
#line 48 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala"
- _tmp9_ = photo;
+ _tmp7_ = photo;
#line 48 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala"
- data_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, TYPE_DATA_COLLECTION, DataCollection), G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, TYPE_DATA_OBJECT, DataObject));
+ data_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, TYPE_DATA_COLLECTION, DataCollection), G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, TYPE_DATA_OBJECT, DataObject));
#line 40 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala"
_g_free0 (reason);
#line 40 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala"
_g_object_unref0 (photo);
-#line 1220 "DirectPhoto.c"
+#line 1377 "DirectPhoto.c"
}
-void direct_photo_terminate (void) {
+void
+direct_photo_terminate (void)
+{
#line 52 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala"
photo_terminate_photo ();
-#line 1227 "DirectPhoto.c"
+#line 1386 "DirectPhoto.c"
}
-static void direct_photo_save_dims (DirectPhoto* self) {
+static void
+direct_photo_save_dims (DirectPhoto* self)
+{
GError * _inner_error_ = NULL;
#line 57 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala"
g_return_if_fail (IS_DIRECT_PHOTO (self));
-#line 1235 "DirectPhoto.c"
+#line 1396 "DirectPhoto.c"
{
GdkPixbuf* _tmp0_ = NULL;
Scaling _tmp1_ = {0};
@@ -1246,7 +1407,7 @@ static void direct_photo_save_dims (DirectPhoto* self) {
_tmp0_ = _tmp2_;
#line 59 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala"
if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 1250 "DirectPhoto.c"
+#line 1411 "DirectPhoto.c"
goto __catch49_g_error;
}
#line 59 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala"
@@ -1257,7 +1418,7 @@ static void direct_photo_save_dims (DirectPhoto* self) {
_tmp3_->dim = _tmp4_;
#line 58 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala"
_g_object_unref0 (_tmp0_);
-#line 1261 "DirectPhoto.c"
+#line 1422 "DirectPhoto.c"
}
goto __finally49;
__catch49_g_error:
@@ -1279,7 +1440,7 @@ static void direct_photo_save_dims (DirectPhoto* self) {
_g_free0 (_tmp6_);
#line 58 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala"
_g_error_free0 (e);
-#line 1283 "DirectPhoto.c"
+#line 1444 "DirectPhoto.c"
}
__finally49:
#line 58 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala"
@@ -1290,12 +1451,14 @@ static void direct_photo_save_dims (DirectPhoto* self) {
g_clear_error (&_inner_error_);
#line 58 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala"
return;
-#line 1294 "DirectPhoto.c"
+#line 1455 "DirectPhoto.c"
}
}
-ImportResult direct_photo_demand_load (DirectPhoto* self) {
+ImportResult
+direct_photo_demand_load (DirectPhoto* self)
+{
ImportResult result = 0;
gboolean _tmp0_;
PhotoReimportMasterState* reimport_state = NULL;
@@ -1312,7 +1475,7 @@ ImportResult direct_photo_demand_load (DirectPhoto* self) {
result = IMPORT_RESULT_SUCCESS;
#line 70 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala"
return result;
-#line 1316 "DirectPhoto.c"
+#line 1479 "DirectPhoto.c"
}
{
PhotoReimportMasterState* _tmp1_ = NULL;
@@ -1325,7 +1488,7 @@ ImportResult direct_photo_demand_load (DirectPhoto* self) {
reimport_state = _tmp1_;
#line 75 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala"
if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 1329 "DirectPhoto.c"
+#line 1492 "DirectPhoto.c"
goto __catch50_g_error;
}
#line 76 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala"
@@ -1334,7 +1497,7 @@ ImportResult direct_photo_demand_load (DirectPhoto* self) {
photo_finish_reimport_master (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PHOTO, Photo), _tmp2_, &_inner_error_);
#line 76 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala"
if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 1338 "DirectPhoto.c"
+#line 1501 "DirectPhoto.c"
goto __catch50_g_error;
}
}
@@ -1362,7 +1525,7 @@ ImportResult direct_photo_demand_load (DirectPhoto* self) {
_photo_reimport_master_state_unref0 (reimport_state);
#line 79 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala"
return result;
-#line 1366 "DirectPhoto.c"
+#line 1529 "DirectPhoto.c"
}
__finally50:
#line 74 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala"
@@ -1375,7 +1538,7 @@ ImportResult direct_photo_demand_load (DirectPhoto* self) {
g_clear_error (&_inner_error_);
#line 74 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala"
return 0;
-#line 1379 "DirectPhoto.c"
+#line 1542 "DirectPhoto.c"
}
#line 82 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala"
self->priv->loaded = TRUE;
@@ -1387,53 +1550,53 @@ ImportResult direct_photo_demand_load (DirectPhoto* self) {
_photo_reimport_master_state_unref0 (reimport_state);
#line 84 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala"
return result;
-#line 1391 "DirectPhoto.c"
+#line 1554 "DirectPhoto.c"
}
-ImportResult direct_photo_internal_import (GFile* file, DirectPhoto* * photo) {
+ImportResult
+direct_photo_internal_import (GFile* file,
+ DirectPhoto* * photo)
+{
DirectPhoto* _vala_photo = NULL;
ImportResult result = 0;
PhotoImportParams* params = NULL;
- GFile* _tmp0_;
- ImportID _tmp1_ = {0};
- PhotoImportParams* _tmp2_;
+ ImportID _tmp0_ = {0};
+ PhotoImportParams* _tmp1_;
+ PhotoTable* _tmp2_;
PhotoTable* _tmp3_;
- PhotoTable* _tmp4_;
- PhotoRow* _tmp5_;
- PhotoID _tmp6_ = {0};
- PhotoRow* _tmp7_;
- DirectPhoto* _tmp8_;
+ PhotoRow* _tmp4_;
+ PhotoID _tmp5_ = {0};
+ PhotoRow* _tmp6_;
+ DirectPhoto* _tmp7_;
#line 89 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala"
g_return_val_if_fail (G_IS_FILE (file), 0);
#line 90 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala"
- _tmp0_ = file;
-#line 90 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala"
- import_id_generate (&_tmp1_);
+ import_id_generate (&_tmp0_);
#line 90 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala"
- _tmp2_ = photo_import_params_new_create_placeholder (_tmp0_, &_tmp1_);
+ _tmp1_ = photo_import_params_new_create_placeholder (file, &_tmp0_);
#line 90 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala"
- params = _tmp2_;
+ params = _tmp1_;
#line 91 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala"
photo_create_pre_import (params);
#line 92 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala"
- _tmp3_ = photo_table_get_instance ();
+ _tmp2_ = photo_table_get_instance ();
#line 92 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala"
- _tmp4_ = _tmp3_;
+ _tmp3_ = _tmp2_;
#line 92 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala"
- _tmp5_ = params->row;
+ _tmp4_ = params->row;
#line 92 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala"
- photo_table_add (_tmp4_, _tmp5_, &_tmp6_);
+ photo_table_add (_tmp3_, _tmp4_, &_tmp5_);
#line 92 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala"
- _database_table_unref0 (_tmp4_);
+ _database_table_unref0 (_tmp3_);
#line 94 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala"
- _tmp7_ = params->row;
+ _tmp6_ = params->row;
#line 94 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala"
- _tmp8_ = direct_photo_new (_tmp7_);
+ _tmp7_ = direct_photo_new (_tmp6_);
#line 94 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala"
_g_object_unref0 (_vala_photo);
#line 94 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala"
- _vala_photo = _tmp8_;
+ _vala_photo = _tmp7_;
#line 96 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala"
result = IMPORT_RESULT_SUCCESS;
#line 96 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala"
@@ -1442,19 +1605,23 @@ ImportResult direct_photo_internal_import (GFile* file, DirectPhoto* * photo) {
if (photo) {
#line 96 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala"
*photo = _vala_photo;
-#line 1446 "DirectPhoto.c"
+#line 1609 "DirectPhoto.c"
} else {
#line 96 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala"
_g_object_unref0 (_vala_photo);
-#line 1450 "DirectPhoto.c"
+#line 1613 "DirectPhoto.c"
}
#line 96 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala"
return result;
-#line 1454 "DirectPhoto.c"
+#line 1617 "DirectPhoto.c"
}
-static GdkPixbuf* direct_photo_real_get_preview_pixbuf (MediaSource* base, Scaling* scaling, GError** error) {
+static GdkPixbuf*
+direct_photo_real_get_preview_pixbuf (MediaSource* base,
+ Scaling* scaling,
+ GError** error)
+{
DirectPhoto * self;
GdkPixbuf* result = NULL;
GdkPixbuf* _tmp0_;
@@ -1469,7 +1636,7 @@ static GdkPixbuf* direct_photo_real_get_preview_pixbuf (MediaSource* base, Scali
_tmp0_ = self->priv->preview;
#line 100 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala"
if (_tmp0_ == NULL) {
-#line 1473 "DirectPhoto.c"
+#line 1640 "DirectPhoto.c"
GdkPixbuf* _tmp1_ = NULL;
GdkPixbuf* _tmp2_;
GdkPixbuf* _tmp3_;
@@ -1484,7 +1651,7 @@ static GdkPixbuf* direct_photo_real_get_preview_pixbuf (MediaSource* base, Scali
g_propagate_error (error, _inner_error_);
#line 101 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala"
return NULL;
-#line 1488 "DirectPhoto.c"
+#line 1655 "DirectPhoto.c"
}
#line 101 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala"
_tmp3_ = _tmp1_;
@@ -1498,7 +1665,7 @@ static GdkPixbuf* direct_photo_real_get_preview_pixbuf (MediaSource* base, Scali
_tmp4_ = self->priv->preview;
#line 103 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala"
if (_tmp4_ == NULL) {
-#line 1502 "DirectPhoto.c"
+#line 1669 "DirectPhoto.c"
GdkPixbuf* _tmp5_ = NULL;
Scaling _tmp6_;
GdkPixbuf* _tmp7_;
@@ -1517,7 +1684,7 @@ static GdkPixbuf* direct_photo_real_get_preview_pixbuf (MediaSource* base, Scali
_g_object_unref0 (_tmp1_);
#line 104 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala"
return NULL;
-#line 1521 "DirectPhoto.c"
+#line 1688 "DirectPhoto.c"
}
#line 104 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala"
_tmp8_ = _tmp5_;
@@ -1529,11 +1696,11 @@ static GdkPixbuf* direct_photo_real_get_preview_pixbuf (MediaSource* base, Scali
self->priv->preview = _tmp8_;
#line 103 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala"
_g_object_unref0 (_tmp5_);
-#line 1533 "DirectPhoto.c"
+#line 1700 "DirectPhoto.c"
}
#line 100 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala"
_g_object_unref0 (_tmp1_);
-#line 1537 "DirectPhoto.c"
+#line 1704 "DirectPhoto.c"
}
#line 107 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala"
_tmp9_ = self->priv->preview;
@@ -1543,13 +1710,15 @@ static GdkPixbuf* direct_photo_real_get_preview_pixbuf (MediaSource* base, Scali
result = _tmp10_;
#line 107 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala"
return result;
-#line 1547 "DirectPhoto.c"
+#line 1714 "DirectPhoto.c"
}
-static void direct_photo_real_rotate (Photo* base, Rotation rotation) {
+static void
+direct_photo_real_rotate (Photo* base,
+ Rotation rotation)
+{
DirectPhoto * self;
- Rotation _tmp0_;
#line 110 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala"
self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_DIRECT_PHOTO, DirectPhoto);
#line 111 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala"
@@ -1557,14 +1726,16 @@ static void direct_photo_real_rotate (Photo* base, Rotation rotation) {
#line 112 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala"
g_signal_emit (self, direct_photo_signals[DIRECT_PHOTO_CAN_ROTATE_CHANGED_SIGNAL], 0, FALSE);
#line 113 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala"
- _tmp0_ = rotation;
-#line 113 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala"
- PHOTO_CLASS (direct_photo_parent_class)->rotate (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PHOTO, Photo), _tmp0_);
-#line 1564 "DirectPhoto.c"
+ PHOTO_CLASS (direct_photo_parent_class)->rotate (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PHOTO, Photo), rotation);
+#line 1731 "DirectPhoto.c"
}
-static GdkPixbuf* direct_photo_real_get_pixbuf (PhotoSource* base, Scaling* scaling, GError** error) {
+static GdkPixbuf*
+direct_photo_real_get_pixbuf (PhotoSource* base,
+ Scaling* scaling,
+ GError** error)
+{
DirectPhoto * self;
GdkPixbuf* result = NULL;
GdkPixbuf* ret = NULL;
@@ -1587,7 +1758,7 @@ static GdkPixbuf* direct_photo_real_get_pixbuf (PhotoSource* base, Scaling* scal
g_propagate_error (error, _inner_error_);
#line 117 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala"
return NULL;
-#line 1591 "DirectPhoto.c"
+#line 1762 "DirectPhoto.c"
}
#line 118 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala"
g_signal_emit (self, direct_photo_signals[DIRECT_PHOTO_CAN_ROTATE_CHANGED_SIGNAL], 0, TRUE);
@@ -1597,11 +1768,15 @@ static GdkPixbuf* direct_photo_real_get_pixbuf (PhotoSource* base, Scaling* scal
result = ret;
#line 120 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala"
return result;
-#line 1601 "DirectPhoto.c"
+#line 1772 "DirectPhoto.c"
}
-static GdkPixbuf* direct_photo_real_get_thumbnail (ThumbnailSource* base, gint scale, GError** error) {
+static GdkPixbuf*
+direct_photo_real_get_thumbnail (ThumbnailSource* base,
+ gint scale,
+ GError** error)
+{
DirectPhoto * self;
GdkPixbuf* result = NULL;
PhotoMetadata* metadata = NULL;
@@ -1622,17 +1797,14 @@ static GdkPixbuf* direct_photo_real_get_thumbnail (ThumbnailSource* base, gint s
if (_tmp3_ == NULL) {
#line 126 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala"
_tmp2_ = TRUE;
-#line 1626 "DirectPhoto.c"
+#line 1801 "DirectPhoto.c"
} else {
PhotoMetadata* _tmp4_;
- guint _tmp5_;
#line 126 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala"
_tmp4_ = metadata;
#line 126 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala"
- _tmp5_ = photo_metadata_get_preview_count (_tmp4_);
-#line 126 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala"
- _tmp2_ = _tmp5_ == ((guint) 0);
-#line 1636 "DirectPhoto.c"
+ _tmp2_ = photo_metadata_get_preview_count (_tmp4_) == ((guint) 0);
+#line 1808 "DirectPhoto.c"
}
#line 126 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala"
if (_tmp2_) {
@@ -1640,30 +1812,29 @@ static GdkPixbuf* direct_photo_real_get_thumbnail (ThumbnailSource* base, gint s
_g_object_unref0 (_tmp1_);
#line 126 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala"
_tmp1_ = NULL;
-#line 1644 "DirectPhoto.c"
+#line 1816 "DirectPhoto.c"
} else {
- GdkPixbuf* _tmp6_ = NULL;
- PhotoMetadata* _tmp7_;
+ GdkPixbuf* _tmp5_ = NULL;
+ PhotoMetadata* _tmp6_;
+ PhotoPreview* _tmp7_;
PhotoPreview* _tmp8_;
- PhotoPreview* _tmp9_;
+ GdkPixbuf* _tmp9_;
GdkPixbuf* _tmp10_;
GdkPixbuf* _tmp11_;
- Orientation _tmp12_;
- GdkPixbuf* _tmp13_;
#line 127 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala"
- _tmp7_ = metadata;
+ _tmp6_ = metadata;
#line 127 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala"
- _tmp8_ = photo_metadata_get_preview (_tmp7_, (guint) 0);
+ _tmp7_ = photo_metadata_get_preview (_tmp6_, (guint) 0);
#line 127 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala"
- _tmp9_ = _tmp8_;
+ _tmp8_ = _tmp7_;
#line 127 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala"
- _tmp10_ = photo_preview_get_pixbuf (_tmp9_, &_inner_error_);
+ _tmp9_ = photo_preview_get_pixbuf (_tmp8_, &_inner_error_);
#line 127 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala"
- _tmp11_ = _tmp10_;
+ _tmp10_ = _tmp9_;
#line 127 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala"
- _photo_preview_unref0 (_tmp9_);
+ _photo_preview_unref0 (_tmp8_);
#line 127 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala"
- _tmp6_ = _tmp11_;
+ _tmp5_ = _tmp10_;
#line 127 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala"
if (G_UNLIKELY (_inner_error_ != NULL)) {
#line 127 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala"
@@ -1674,19 +1845,17 @@ static GdkPixbuf* direct_photo_real_get_thumbnail (ThumbnailSource* base, gint s
_media_metadata_unref0 (metadata);
#line 127 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala"
return NULL;
-#line 1678 "DirectPhoto.c"
+#line 1849 "DirectPhoto.c"
}
#line 127 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala"
- _tmp12_ = photo_get_orientation (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PHOTO, Photo));
-#line 127 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala"
- _tmp13_ = orientation_rotate_pixbuf (_tmp12_, _tmp6_);
+ _tmp11_ = orientation_rotate_pixbuf (photo_get_orientation (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PHOTO, Photo)), _tmp5_);
#line 127 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala"
_g_object_unref0 (_tmp1_);
#line 127 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala"
- _tmp1_ = _tmp13_;
+ _tmp1_ = _tmp11_;
#line 126 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala"
- _g_object_unref0 (_tmp6_);
-#line 1690 "DirectPhoto.c"
+ _g_object_unref0 (_tmp5_);
+#line 1859 "DirectPhoto.c"
}
#line 126 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala"
result = _tmp1_;
@@ -1694,13 +1863,15 @@ static GdkPixbuf* direct_photo_real_get_thumbnail (ThumbnailSource* base, gint s
_media_metadata_unref0 (metadata);
#line 126 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala"
return result;
-#line 1698 "DirectPhoto.c"
+#line 1867 "DirectPhoto.c"
}
-static void direct_photo_real_notify_altered (DataObject* base, Alteration* alteration) {
+static void
+direct_photo_real_notify_altered (DataObject* base,
+ Alteration* alteration)
+{
DirectPhoto * self;
- Alteration* _tmp0_;
#line 130 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala"
self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_DIRECT_PHOTO, DirectPhoto);
#line 130 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala"
@@ -1710,14 +1881,14 @@ static void direct_photo_real_notify_altered (DataObject* base, Alteration* alte
#line 131 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala"
self->priv->preview = NULL;
#line 133 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala"
- _tmp0_ = alteration;
-#line 133 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala"
- DATA_OBJECT_CLASS (direct_photo_parent_class)->notify_altered (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PHOTO, Photo), TYPE_DATA_OBJECT, DataObject), _tmp0_);
-#line 1717 "DirectPhoto.c"
+ DATA_OBJECT_CLASS (direct_photo_parent_class)->notify_altered (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PHOTO, Photo), TYPE_DATA_OBJECT, DataObject), alteration);
+#line 1886 "DirectPhoto.c"
}
-static gboolean direct_photo_real_has_user_generated_metadata (Photo* base) {
+static gboolean
+direct_photo_real_has_user_generated_metadata (Photo* base)
+{
DirectPhoto * self;
gboolean result = FALSE;
#line 136 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala"
@@ -1726,31 +1897,39 @@ static gboolean direct_photo_real_has_user_generated_metadata (Photo* base) {
result = FALSE;
#line 138 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala"
return result;
-#line 1730 "DirectPhoto.c"
+#line 1901 "DirectPhoto.c"
}
-static void direct_photo_real_set_user_metadata_for_export (Photo* base, PhotoMetadata* metadata) {
+static void
+direct_photo_real_set_user_metadata_for_export (Photo* base,
+ PhotoMetadata* metadata)
+{
DirectPhoto * self;
#line 141 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala"
self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_DIRECT_PHOTO, DirectPhoto);
#line 141 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala"
g_return_if_fail (IS_PHOTO_METADATA (metadata));
-#line 1740 "DirectPhoto.c"
+#line 1914 "DirectPhoto.c"
}
-static void direct_photo_real_apply_user_metadata_for_reimport (Photo* base, PhotoMetadata* metadata) {
+static void
+direct_photo_real_apply_user_metadata_for_reimport (Photo* base,
+ PhotoMetadata* metadata)
+{
DirectPhoto * self;
#line 145 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala"
self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_DIRECT_PHOTO, DirectPhoto);
#line 145 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala"
g_return_if_fail (IS_PHOTO_METADATA (metadata));
-#line 1750 "DirectPhoto.c"
+#line 1927 "DirectPhoto.c"
}
-static gboolean direct_photo_real_is_trashed (MediaSource* base) {
+static gboolean
+direct_photo_real_is_trashed (MediaSource* base)
+{
DirectPhoto * self;
gboolean result = FALSE;
#line 148 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala"
@@ -1759,11 +1938,13 @@ static gboolean direct_photo_real_is_trashed (MediaSource* base) {
result = FALSE;
#line 150 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala"
return result;
-#line 1763 "DirectPhoto.c"
+#line 1942 "DirectPhoto.c"
}
-static gboolean direct_photo_real_is_offline (MediaSource* base) {
+static gboolean
+direct_photo_real_is_offline (MediaSource* base)
+{
DirectPhoto * self;
gboolean result = FALSE;
#line 153 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala"
@@ -1772,43 +1953,53 @@ static gboolean direct_photo_real_is_offline (MediaSource* base) {
result = FALSE;
#line 155 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala"
return result;
-#line 1776 "DirectPhoto.c"
+#line 1957 "DirectPhoto.c"
}
-static void direct_photo_real_trash (MediaSource* base) {
+static void
+direct_photo_real_trash (MediaSource* base)
+{
DirectPhoto * self;
#line 158 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala"
self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_DIRECT_PHOTO, DirectPhoto);
-#line 1784 "DirectPhoto.c"
+#line 1967 "DirectPhoto.c"
}
-static void direct_photo_real_untrash (MediaSource* base) {
+static void
+direct_photo_real_untrash (MediaSource* base)
+{
DirectPhoto * self;
#line 162 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala"
self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_DIRECT_PHOTO, DirectPhoto);
-#line 1792 "DirectPhoto.c"
+#line 1977 "DirectPhoto.c"
}
-static void direct_photo_real_mark_offline (MediaSource* base) {
+static void
+direct_photo_real_mark_offline (MediaSource* base)
+{
DirectPhoto * self;
#line 166 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala"
self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_DIRECT_PHOTO, DirectPhoto);
-#line 1800 "DirectPhoto.c"
+#line 1987 "DirectPhoto.c"
}
-static void direct_photo_real_mark_online (MediaSource* base) {
+static void
+direct_photo_real_mark_online (MediaSource* base)
+{
DirectPhoto * self;
#line 170 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala"
self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_DIRECT_PHOTO, DirectPhoto);
-#line 1808 "DirectPhoto.c"
+#line 1997 "DirectPhoto.c"
}
-static void direct_photo_class_init (DirectPhotoClass * klass) {
+static void
+direct_photo_class_init (DirectPhotoClass * klass)
+{
#line 7 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala"
direct_photo_parent_class = g_type_class_peek_parent (klass);
#line 7 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala"
@@ -1845,22 +2036,26 @@ static void direct_photo_class_init (DirectPhotoClass * klass) {
G_OBJECT_CLASS (klass)->finalize = direct_photo_finalize;
#line 7 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala"
direct_photo_signals[DIRECT_PHOTO_CAN_ROTATE_CHANGED_SIGNAL] = g_signal_new ("can-rotate-changed", TYPE_DIRECT_PHOTO, G_SIGNAL_RUN_LAST, 0, NULL, NULL, g_cclosure_marshal_VOID__BOOLEAN, G_TYPE_NONE, 1, G_TYPE_BOOLEAN);
-#line 1849 "DirectPhoto.c"
+#line 2040 "DirectPhoto.c"
}
-static void direct_photo_instance_init (DirectPhoto * self) {
+static void
+direct_photo_instance_init (DirectPhoto * self)
+{
#line 7 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala"
self->priv = DIRECT_PHOTO_GET_PRIVATE (self);
#line 14 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala"
self->priv->preview = NULL;
#line 15 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala"
self->priv->loaded = FALSE;
-#line 1860 "DirectPhoto.c"
+#line 2053 "DirectPhoto.c"
}
-static void direct_photo_finalize (GObject * obj) {
+static void
+direct_photo_finalize (GObject * obj)
+{
DirectPhoto * self;
#line 7 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala"
self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_DIRECT_PHOTO, DirectPhoto);
@@ -1868,11 +2063,13 @@ static void direct_photo_finalize (GObject * obj) {
_g_object_unref0 (self->priv->preview);
#line 7 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala"
G_OBJECT_CLASS (direct_photo_parent_class)->finalize (obj);
-#line 1872 "DirectPhoto.c"
+#line 2067 "DirectPhoto.c"
}
-GType direct_photo_get_type (void) {
+GType
+direct_photo_get_type (void)
+{
static volatile gsize direct_photo_type_id__volatile = 0;
if (g_once_init_enter (&direct_photo_type_id__volatile)) {
static const GTypeInfo g_define_type_info = { sizeof (DirectPhotoClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) direct_photo_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (DirectPhoto), 0, (GInstanceInitFunc) direct_photo_instance_init, NULL };
@@ -1884,363 +2081,370 @@ GType direct_photo_get_type (void) {
}
-static guint _file_hash_gee_hash_data_func (gconstpointer v, gpointer self) {
+static guint
+_file_hash_gee_hash_data_func (gconstpointer v,
+ gpointer self)
+{
guint result;
result = file_hash ((GFile*) v);
#line 178 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala"
return result;
-#line 1893 "DirectPhoto.c"
+#line 2093 "DirectPhoto.c"
}
-static gboolean _file_equal_gee_equal_data_func (gconstpointer a, gconstpointer b, gpointer self) {
+static gboolean
+_file_equal_gee_equal_data_func (gconstpointer a,
+ gconstpointer b,
+ gpointer self)
+{
gboolean result;
result = file_equal ((GFile*) a, (GFile*) b);
#line 178 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala"
return result;
-#line 1902 "DirectPhoto.c"
+#line 2106 "DirectPhoto.c"
}
-static gint64 _direct_photo_source_collection_get_direct_key_get_source_database_key (DataSource* source, gpointer self) {
+static gint64
+_direct_photo_source_collection_get_direct_key_get_source_database_key (DataSource* source,
+ gpointer self)
+{
gint64 result;
result = direct_photo_source_collection_get_direct_key (source);
#line 183 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala"
return result;
-#line 1911 "DirectPhoto.c"
+#line 2118 "DirectPhoto.c"
}
-static void _direct_photo_source_collection_on_file_discovered_directory_monitor_file_discovered (DirectoryMonitor* _sender, GFile* file, GFileInfo* info, gpointer self) {
+static void
+_direct_photo_source_collection_on_file_discovered_directory_monitor_file_discovered (DirectoryMonitor* _sender,
+ GFile* file,
+ GFileInfo* info,
+ gpointer self)
+{
#line 187 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala"
direct_photo_source_collection_on_file_discovered ((DirectPhotoSourceCollection*) self, file, info);
-#line 1918 "DirectPhoto.c"
+#line 2130 "DirectPhoto.c"
}
-static void _direct_photo_source_collection_on_discovery_completed_directory_monitor_discovery_completed (DirectoryMonitor* _sender, gpointer self) {
+static void
+_direct_photo_source_collection_on_discovery_completed_directory_monitor_discovery_completed (DirectoryMonitor* _sender,
+ gpointer self)
+{
#line 188 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala"
direct_photo_source_collection_on_discovery_completed ((DirectPhotoSourceCollection*) self);
-#line 1925 "DirectPhoto.c"
+#line 2140 "DirectPhoto.c"
}
-DirectPhotoSourceCollection* direct_photo_source_collection_construct (GType object_type, GFile* initial_file) {
+DirectPhotoSourceCollection*
+direct_photo_source_collection_construct (GType object_type,
+ GFile* initial_file)
+{
DirectPhotoSourceCollection* self = NULL;
GFile* _tmp0_;
GFile* _tmp1_;
- GFile* _tmp2_;
+ DirectoryMonitor* _tmp2_;
DirectoryMonitor* _tmp3_;
DirectoryMonitor* _tmp4_;
DirectoryMonitor* _tmp5_;
- DirectoryMonitor* _tmp6_;
#line 182 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala"
g_return_val_if_fail (G_IS_FILE (initial_file), NULL);
#line 183 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala"
self = (DirectPhotoSourceCollection*) database_source_collection_construct (object_type, "DirectPhotoSourceCollection", _direct_photo_source_collection_get_direct_key_get_source_database_key, NULL);
#line 186 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala"
- _tmp0_ = initial_file;
+ _tmp0_ = g_file_get_parent (initial_file);
#line 186 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala"
- _tmp1_ = g_file_get_parent (_tmp0_);
-#line 186 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala"
- _tmp2_ = _tmp1_;
+ _tmp1_ = _tmp0_;
#line 186 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala"
- _tmp3_ = directory_monitor_new (_tmp2_, FALSE, FALSE);
+ _tmp2_ = directory_monitor_new (_tmp1_, FALSE, FALSE);
#line 186 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala"
_g_object_unref0 (self->priv->monitor);
#line 186 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala"
- self->priv->monitor = _tmp3_;
+ self->priv->monitor = _tmp2_;
#line 186 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala"
- _g_object_unref0 (_tmp2_);
+ _g_object_unref0 (_tmp1_);
#line 187 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala"
- _tmp4_ = self->priv->monitor;
+ _tmp3_ = self->priv->monitor;
#line 187 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala"
- g_signal_connect (_tmp4_, "file-discovered", (GCallback) _direct_photo_source_collection_on_file_discovered_directory_monitor_file_discovered, self);
+ g_signal_connect (_tmp3_, "file-discovered", (GCallback) _direct_photo_source_collection_on_file_discovered_directory_monitor_file_discovered, self);
#line 188 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala"
- _tmp5_ = self->priv->monitor;
+ _tmp4_ = self->priv->monitor;
#line 188 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala"
- g_signal_connect (_tmp5_, "discovery-completed", (GCallback) _direct_photo_source_collection_on_discovery_completed_directory_monitor_discovery_completed, self);
+ g_signal_connect (_tmp4_, "discovery-completed", (GCallback) _direct_photo_source_collection_on_discovery_completed_directory_monitor_discovery_completed, self);
#line 190 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala"
- _tmp6_ = self->priv->monitor;
+ _tmp5_ = self->priv->monitor;
#line 190 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala"
- directory_monitor_start_discovery (_tmp6_);
+ directory_monitor_start_discovery (_tmp5_);
#line 182 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala"
return self;
-#line 1970 "DirectPhoto.c"
+#line 2185 "DirectPhoto.c"
}
-DirectPhotoSourceCollection* direct_photo_source_collection_new (GFile* initial_file) {
+DirectPhotoSourceCollection*
+direct_photo_source_collection_new (GFile* initial_file)
+{
#line 182 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala"
return direct_photo_source_collection_construct (TYPE_DIRECT_PHOTO_SOURCE_COLLECTION, initial_file);
-#line 1977 "DirectPhoto.c"
+#line 2194 "DirectPhoto.c"
}
-static gboolean direct_photo_source_collection_real_holds_type_of_source (SourceCollection* base, DataSource* source) {
+static gboolean
+direct_photo_source_collection_real_holds_type_of_source (SourceCollection* base,
+ DataSource* source)
+{
DirectPhotoSourceCollection * self;
gboolean result = FALSE;
- DataSource* _tmp0_;
#line 193 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala"
self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_DIRECT_PHOTO_SOURCE_COLLECTION, DirectPhotoSourceCollection);
#line 193 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala"
g_return_val_if_fail (IS_DATA_SOURCE (source), FALSE);
#line 194 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala"
- _tmp0_ = source;
-#line 194 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala"
- result = G_TYPE_CHECK_INSTANCE_TYPE (_tmp0_, TYPE_DIRECT_PHOTO);
+ result = G_TYPE_CHECK_INSTANCE_TYPE (source, TYPE_DIRECT_PHOTO);
#line 194 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala"
return result;
-#line 1995 "DirectPhoto.c"
+#line 2212 "DirectPhoto.c"
}
-static gpointer _g_object_ref0 (gpointer self) {
+static gpointer
+_g_object_ref0 (gpointer self)
+{
#line 198 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala"
return self ? g_object_ref (self) : NULL;
-#line 2002 "DirectPhoto.c"
+#line 2221 "DirectPhoto.c"
}
-static gint64 direct_photo_source_collection_get_direct_key (DataSource* source) {
+static gint64
+direct_photo_source_collection_get_direct_key (DataSource* source)
+{
gint64 result = 0LL;
DirectPhoto* photo = NULL;
- DataSource* _tmp0_;
- DirectPhoto* _tmp1_;
+ DirectPhoto* _tmp0_;
PhotoID photo_id = {0};
- PhotoID _tmp2_ = {0};
- PhotoID _tmp3_;
- gint64 _tmp4_;
+ PhotoID _tmp1_ = {0};
+ PhotoID _tmp2_;
+ gint64 _tmp3_;
#line 197 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala"
g_return_val_if_fail (IS_DATA_SOURCE (source), 0LL);
#line 198 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala"
- _tmp0_ = source;
-#line 198 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala"
- _tmp1_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, TYPE_DIRECT_PHOTO, DirectPhoto));
+ _tmp0_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (source, TYPE_DIRECT_PHOTO, DirectPhoto));
#line 198 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala"
- photo = _tmp1_;
+ photo = _tmp0_;
#line 199 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala"
- photo_get_photo_id (G_TYPE_CHECK_INSTANCE_CAST (photo, TYPE_PHOTO, Photo), &_tmp2_);
+ photo_get_photo_id (G_TYPE_CHECK_INSTANCE_CAST (photo, TYPE_PHOTO, Photo), &_tmp1_);
#line 199 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala"
- photo_id = _tmp2_;
+ photo_id = _tmp1_;
#line 201 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala"
- _tmp3_ = photo_id;
+ _tmp2_ = photo_id;
#line 201 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala"
- _tmp4_ = _tmp3_.id;
+ _tmp3_ = _tmp2_.id;
#line 201 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala"
- result = _tmp4_;
+ result = _tmp3_;
#line 201 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala"
_g_object_unref0 (photo);
#line 201 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala"
return result;
-#line 2037 "DirectPhoto.c"
+#line 2255 "DirectPhoto.c"
}
-static void direct_photo_source_collection_real_notify_items_added (DataCollection* base, GeeIterable* added) {
+static void
+direct_photo_source_collection_real_notify_items_added (DataCollection* base,
+ GeeIterable* added)
+{
DirectPhotoSourceCollection * self;
- GeeIterable* _tmp16_;
#line 204 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala"
self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_DIRECT_PHOTO_SOURCE_COLLECTION, DirectPhotoSourceCollection);
#line 204 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala"
g_return_if_fail (GEE_IS_ITERABLE (added));
-#line 2048 "DirectPhoto.c"
+#line 2268 "DirectPhoto.c"
{
GeeIterator* _object_it = NULL;
- GeeIterable* _tmp0_;
- GeeIterator* _tmp1_;
+ GeeIterator* _tmp0_;
#line 205 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala"
- _tmp0_ = added;
+ _tmp0_ = gee_iterable_iterator (added);
#line 205 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala"
- _tmp1_ = gee_iterable_iterator (_tmp0_);
-#line 205 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala"
- _object_it = _tmp1_;
+ _object_it = _tmp0_;
#line 205 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala"
while (TRUE) {
-#line 2061 "DirectPhoto.c"
- GeeIterator* _tmp2_;
- gboolean _tmp3_;
+#line 2278 "DirectPhoto.c"
+ GeeIterator* _tmp1_;
DataObject* object = NULL;
- GeeIterator* _tmp4_;
- gpointer _tmp5_;
+ GeeIterator* _tmp2_;
+ gpointer _tmp3_;
DirectPhoto* photo = NULL;
- DataObject* _tmp6_;
- DirectPhoto* _tmp7_;
+ DataObject* _tmp4_;
+ DirectPhoto* _tmp5_;
GFile* file = NULL;
- DirectPhoto* _tmp8_;
+ DirectPhoto* _tmp6_;
+ GFile* _tmp7_;
+ GeeHashMap* _tmp8_;
GFile* _tmp9_;
GeeHashMap* _tmp10_;
GFile* _tmp11_;
- gboolean _tmp12_;
- GeeHashMap* _tmp13_;
- GFile* _tmp14_;
- DirectPhoto* _tmp15_;
+ DirectPhoto* _tmp12_;
#line 205 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala"
- _tmp2_ = _object_it;
+ _tmp1_ = _object_it;
#line 205 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala"
- _tmp3_ = gee_iterator_next (_tmp2_);
-#line 205 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala"
- if (!_tmp3_) {
+ if (!gee_iterator_next (_tmp1_)) {
#line 205 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala"
break;
-#line 2087 "DirectPhoto.c"
+#line 2300 "DirectPhoto.c"
}
#line 205 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala"
- _tmp4_ = _object_it;
+ _tmp2_ = _object_it;
#line 205 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala"
- _tmp5_ = gee_iterator_get (_tmp4_);
+ _tmp3_ = gee_iterator_get (_tmp2_);
#line 205 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala"
- object = (DataObject*) _tmp5_;
+ object = (DataObject*) _tmp3_;
#line 206 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala"
- _tmp6_ = object;
+ _tmp4_ = object;
#line 206 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala"
- _tmp7_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, TYPE_DIRECT_PHOTO, DirectPhoto));
+ _tmp5_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, TYPE_DIRECT_PHOTO, DirectPhoto));
#line 206 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala"
- photo = _tmp7_;
+ photo = _tmp5_;
#line 207 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala"
- _tmp8_ = photo;
+ _tmp6_ = photo;
#line 207 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala"
- _tmp9_ = media_source_get_file (G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, TYPE_MEDIA_SOURCE, MediaSource));
+ _tmp7_ = media_source_get_file (G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, TYPE_MEDIA_SOURCE, MediaSource));
#line 207 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala"
- file = _tmp9_;
+ file = _tmp7_;
#line 209 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala"
- _tmp10_ = self->priv->file_map;
+ _tmp8_ = self->priv->file_map;
#line 209 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala"
- _tmp11_ = file;
-#line 209 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala"
- _tmp12_ = gee_abstract_map_has_key (G_TYPE_CHECK_INSTANCE_CAST (_tmp10_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp11_);
+ _tmp9_ = file;
#line 209 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala"
- _vala_assert (!_tmp12_, "!file_map.has_key(file)");
+ _vala_assert (!gee_abstract_map_has_key (G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp9_), "!file_map.has_key(file)");
#line 211 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala"
- _tmp13_ = self->priv->file_map;
+ _tmp10_ = self->priv->file_map;
#line 211 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala"
- _tmp14_ = file;
+ _tmp11_ = file;
#line 211 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala"
- _tmp15_ = photo;
+ _tmp12_ = photo;
#line 211 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala"
- gee_abstract_map_set (G_TYPE_CHECK_INSTANCE_CAST (_tmp13_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp14_, _tmp15_);
+ gee_abstract_map_set (G_TYPE_CHECK_INSTANCE_CAST (_tmp10_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp11_, _tmp12_);
#line 205 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala"
_g_object_unref0 (file);
#line 205 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala"
_g_object_unref0 (photo);
#line 205 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala"
_g_object_unref0 (object);
-#line 2129 "DirectPhoto.c"
+#line 2340 "DirectPhoto.c"
}
#line 205 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala"
_g_object_unref0 (_object_it);
-#line 2133 "DirectPhoto.c"
+#line 2344 "DirectPhoto.c"
}
#line 214 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala"
- _tmp16_ = added;
-#line 214 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala"
- DATA_COLLECTION_CLASS (direct_photo_source_collection_parent_class)->notify_items_added (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATABASE_SOURCE_COLLECTION, DatabaseSourceCollection), TYPE_DATA_COLLECTION, DataCollection), _tmp16_);
-#line 2139 "DirectPhoto.c"
+ DATA_COLLECTION_CLASS (direct_photo_source_collection_parent_class)->notify_items_added (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATABASE_SOURCE_COLLECTION, DatabaseSourceCollection), TYPE_DATA_COLLECTION, DataCollection), added);
+#line 2348 "DirectPhoto.c"
}
-static void direct_photo_source_collection_real_notify_items_removed (DataCollection* base, GeeIterable* removed) {
+static void
+direct_photo_source_collection_real_notify_items_removed (DataCollection* base,
+ GeeIterable* removed)
+{
DirectPhotoSourceCollection * self;
- GeeIterable* _tmp14_;
#line 217 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala"
self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_DIRECT_PHOTO_SOURCE_COLLECTION, DirectPhotoSourceCollection);
#line 217 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala"
g_return_if_fail (GEE_IS_ITERABLE (removed));
-#line 2150 "DirectPhoto.c"
+#line 2361 "DirectPhoto.c"
{
GeeIterator* _object_it = NULL;
- GeeIterable* _tmp0_;
- GeeIterator* _tmp1_;
-#line 218 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala"
- _tmp0_ = removed;
+ GeeIterator* _tmp0_;
#line 218 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala"
- _tmp1_ = gee_iterable_iterator (_tmp0_);
+ _tmp0_ = gee_iterable_iterator (removed);
#line 218 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala"
- _object_it = _tmp1_;
+ _object_it = _tmp0_;
#line 218 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala"
while (TRUE) {
-#line 2163 "DirectPhoto.c"
- GeeIterator* _tmp2_;
- gboolean _tmp3_;
+#line 2371 "DirectPhoto.c"
+ GeeIterator* _tmp1_;
DataObject* object = NULL;
- GeeIterator* _tmp4_;
- gpointer _tmp5_;
+ GeeIterator* _tmp2_;
+ gpointer _tmp3_;
DirectPhoto* photo = NULL;
- DataObject* _tmp6_;
- DirectPhoto* _tmp7_;
+ DataObject* _tmp4_;
+ DirectPhoto* _tmp5_;
GFile* file = NULL;
- DirectPhoto* _tmp8_;
- GFile* _tmp9_;
+ DirectPhoto* _tmp6_;
+ GFile* _tmp7_;
gboolean is_removed = FALSE;
- GeeHashMap* _tmp10_;
- GFile* _tmp11_;
- gboolean _tmp12_;
- gboolean _tmp13_;
-#line 218 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala"
- _tmp2_ = _object_it;
+ GeeHashMap* _tmp8_;
+ GFile* _tmp9_;
+ gboolean _tmp10_;
+ gboolean _tmp11_;
#line 218 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala"
- _tmp3_ = gee_iterator_next (_tmp2_);
+ _tmp1_ = _object_it;
#line 218 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala"
- if (!_tmp3_) {
+ if (!gee_iterator_next (_tmp1_)) {
#line 218 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala"
break;
-#line 2188 "DirectPhoto.c"
+#line 2393 "DirectPhoto.c"
}
#line 218 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala"
- _tmp4_ = _object_it;
+ _tmp2_ = _object_it;
#line 218 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala"
- _tmp5_ = gee_iterator_get (_tmp4_);
+ _tmp3_ = gee_iterator_get (_tmp2_);
#line 218 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala"
- object = (DataObject*) _tmp5_;
+ object = (DataObject*) _tmp3_;
#line 219 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala"
- _tmp6_ = object;
+ _tmp4_ = object;
#line 219 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala"
- _tmp7_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, TYPE_DIRECT_PHOTO, DirectPhoto));
+ _tmp5_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, TYPE_DIRECT_PHOTO, DirectPhoto));
#line 219 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala"
- photo = _tmp7_;
+ photo = _tmp5_;
#line 220 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala"
- _tmp8_ = photo;
+ _tmp6_ = photo;
#line 220 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala"
- _tmp9_ = media_source_get_file (G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, TYPE_MEDIA_SOURCE, MediaSource));
+ _tmp7_ = media_source_get_file (G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, TYPE_MEDIA_SOURCE, MediaSource));
#line 220 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala"
- file = _tmp9_;
+ file = _tmp7_;
#line 222 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala"
- _tmp10_ = self->priv->file_map;
+ _tmp8_ = self->priv->file_map;
#line 222 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala"
- _tmp11_ = file;
+ _tmp9_ = file;
#line 222 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala"
- _tmp12_ = gee_abstract_map_unset (G_TYPE_CHECK_INSTANCE_CAST (_tmp10_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp11_, NULL);
+ _tmp10_ = gee_abstract_map_unset (G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp9_, NULL);
#line 222 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala"
- is_removed = _tmp12_;
+ is_removed = _tmp10_;
#line 223 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala"
- _tmp13_ = is_removed;
+ _tmp11_ = is_removed;
#line 223 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala"
- _vala_assert (_tmp13_, "is_removed");
+ _vala_assert (_tmp11_, "is_removed");
#line 218 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala"
_g_object_unref0 (file);
#line 218 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala"
_g_object_unref0 (photo);
#line 218 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala"
_g_object_unref0 (object);
-#line 2226 "DirectPhoto.c"
+#line 2431 "DirectPhoto.c"
}
#line 218 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala"
_g_object_unref0 (_object_it);
-#line 2230 "DirectPhoto.c"
+#line 2435 "DirectPhoto.c"
}
#line 226 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala"
- _tmp14_ = removed;
-#line 226 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala"
- DATA_COLLECTION_CLASS (direct_photo_source_collection_parent_class)->notify_items_removed (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATABASE_SOURCE_COLLECTION, DatabaseSourceCollection), TYPE_DATA_COLLECTION, DataCollection), _tmp14_);
-#line 2236 "DirectPhoto.c"
+ DATA_COLLECTION_CLASS (direct_photo_source_collection_parent_class)->notify_items_removed (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATABASE_SOURCE_COLLECTION, DatabaseSourceCollection), TYPE_DATA_COLLECTION, DataCollection), removed);
+#line 2439 "DirectPhoto.c"
}
-gboolean direct_photo_source_collection_has_source_for_file (DirectPhotoSourceCollection* self, GFile* file) {
+gboolean
+direct_photo_source_collection_has_source_for_file (DirectPhotoSourceCollection* self,
+ GFile* file)
+{
gboolean result = FALSE;
GeeHashMap* _tmp0_;
- GFile* _tmp1_;
- gboolean _tmp2_;
#line 229 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala"
g_return_val_if_fail (IS_DIRECT_PHOTO_SOURCE_COLLECTION (self), FALSE);
#line 229 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala"
@@ -2248,33 +2452,28 @@ gboolean direct_photo_source_collection_has_source_for_file (DirectPhotoSourceCo
#line 230 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala"
_tmp0_ = self->priv->file_map;
#line 230 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala"
- _tmp1_ = file;
-#line 230 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala"
- _tmp2_ = gee_abstract_map_has_key (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp1_);
-#line 230 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala"
- result = _tmp2_;
+ result = gee_abstract_map_has_key (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), file);
#line 230 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala"
return result;
-#line 2259 "DirectPhoto.c"
+#line 2459 "DirectPhoto.c"
}
-static void direct_photo_source_collection_on_file_discovered (DirectPhotoSourceCollection* self, GFile* file, GFileInfo* info) {
- GFile* _tmp0_;
- gboolean _tmp1_;
- GFile* _tmp2_;
- gboolean _tmp3_;
+static void
+direct_photo_source_collection_on_file_discovered (DirectPhotoSourceCollection* self,
+ GFile* file,
+ GFileInfo* info)
+{
DirectPhoto* photo = NULL;
gchar* reason = NULL;
- GFile* _tmp4_;
- DirectPhoto* _tmp5_ = NULL;
- gchar* _tmp6_;
- const gchar* _tmp7_;
- GeeCollection* _tmp9_;
- DirectPhoto* _tmp10_;
- GeeCollection* _tmp11_;
- gint _tmp12_;
- gint _tmp13_;
+ DirectPhoto* _tmp0_ = NULL;
+ gchar* _tmp1_;
+ const gchar* _tmp2_;
+ GeeCollection* _tmp4_;
+ DirectPhoto* _tmp5_;
+ GeeCollection* _tmp6_;
+ gint _tmp7_;
+ gint _tmp8_;
#line 233 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala"
g_return_if_fail (IS_DIRECT_PHOTO_SOURCE_COLLECTION (self));
#line 233 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala"
@@ -2282,83 +2481,77 @@ static void direct_photo_source_collection_on_file_discovered (DirectPhotoSource
#line 233 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala"
g_return_if_fail (G_IS_FILE_INFO (info));
#line 235 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala"
- _tmp0_ = file;
-#line 235 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala"
- _tmp1_ = direct_photo_source_collection_has_source_for_file (self, _tmp0_);
-#line 235 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala"
- if (_tmp1_) {
+ if (direct_photo_source_collection_has_source_for_file (self, file)) {
#line 236 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala"
return;
-#line 2293 "DirectPhoto.c"
+#line 2488 "DirectPhoto.c"
}
#line 239 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala"
- _tmp2_ = file;
-#line 239 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala"
- _tmp3_ = photo_file_format_is_file_supported (_tmp2_);
-#line 239 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala"
- if (!_tmp3_) {
+ if (!photo_file_format_is_file_supported (file)) {
#line 240 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala"
return;
-#line 2303 "DirectPhoto.c"
+#line 2494 "DirectPhoto.c"
}
#line 243 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala"
- _tmp4_ = file;
-#line 243 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala"
- _tmp6_ = direct_photo_source_collection_fetch (self, _tmp4_, &_tmp5_, FALSE);
+ _tmp1_ = direct_photo_source_collection_fetch (self, file, &_tmp0_, FALSE);
#line 243 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala"
_g_object_unref0 (photo);
#line 243 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala"
- photo = _tmp5_;
+ photo = _tmp0_;
#line 243 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala"
- reason = _tmp6_;
+ reason = _tmp1_;
#line 244 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala"
- _tmp7_ = reason;
+ _tmp2_ = reason;
#line 244 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala"
- if (_tmp7_ != NULL) {
-#line 2319 "DirectPhoto.c"
- const gchar* _tmp8_;
+ if (_tmp2_ != NULL) {
+#line 2508 "DirectPhoto.c"
+ const gchar* _tmp3_;
#line 245 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala"
- _tmp8_ = reason;
+ _tmp3_ = reason;
#line 245 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala"
- g_warning ("DirectPhoto.vala:245: Error fetching file: %s", _tmp8_);
-#line 2325 "DirectPhoto.c"
+ g_warning ("DirectPhoto.vala:245: Error fetching file: %s", _tmp3_);
+#line 2514 "DirectPhoto.c"
}
#line 246 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala"
- _tmp9_ = self->priv->prepared_photos;
+ _tmp4_ = self->priv->prepared_photos;
#line 246 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala"
- _tmp10_ = photo;
+ _tmp5_ = photo;
#line 246 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala"
- gee_collection_add (_tmp9_, _tmp10_);
+ gee_collection_add (_tmp4_, _tmp5_);
#line 247 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala"
- _tmp11_ = self->priv->prepared_photos;
+ _tmp6_ = self->priv->prepared_photos;
#line 247 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala"
- _tmp12_ = gee_collection_get_size (_tmp11_);
+ _tmp7_ = gee_collection_get_size (_tmp6_);
#line 247 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala"
- _tmp13_ = _tmp12_;
+ _tmp8_ = _tmp7_;
#line 247 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala"
- if (_tmp13_ >= DIRECT_PHOTO_SOURCE_COLLECTION_DISCOVERED_FILES_BATCH_ADD) {
+ if (_tmp8_ >= DIRECT_PHOTO_SOURCE_COLLECTION_DISCOVERED_FILES_BATCH_ADD) {
#line 248 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala"
direct_photo_source_collection_flush_prepared_photos (self);
-#line 2343 "DirectPhoto.c"
+#line 2532 "DirectPhoto.c"
}
#line 233 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala"
_g_free0 (reason);
#line 233 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala"
_g_object_unref0 (photo);
-#line 2349 "DirectPhoto.c"
+#line 2538 "DirectPhoto.c"
}
-static void direct_photo_source_collection_on_discovery_completed (DirectPhotoSourceCollection* self) {
+static void
+direct_photo_source_collection_on_discovery_completed (DirectPhotoSourceCollection* self)
+{
#line 251 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala"
g_return_if_fail (IS_DIRECT_PHOTO_SOURCE_COLLECTION (self));
#line 252 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala"
direct_photo_source_collection_flush_prepared_photos (self);
-#line 2358 "DirectPhoto.c"
+#line 2549 "DirectPhoto.c"
}
-static void direct_photo_source_collection_flush_prepared_photos (DirectPhotoSourceCollection* self) {
+static void
+direct_photo_source_collection_flush_prepared_photos (DirectPhotoSourceCollection* self)
+{
GeeCollection* _tmp0_;
GeeCollection* _tmp1_;
GeeCollection* _tmp2_;
@@ -2377,15 +2570,16 @@ static void direct_photo_source_collection_flush_prepared_photos (DirectPhotoSou
_tmp3_ = self->priv->prepared_photos;
#line 257 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala"
gee_collection_clear (_tmp3_);
-#line 2381 "DirectPhoto.c"
+#line 2574 "DirectPhoto.c"
}
-gboolean direct_photo_source_collection_has_file (DirectPhotoSourceCollection* self, GFile* file) {
+gboolean
+direct_photo_source_collection_has_file (DirectPhotoSourceCollection* self,
+ GFile* file)
+{
gboolean result = FALSE;
GeeHashMap* _tmp0_;
- GFile* _tmp1_;
- gboolean _tmp2_;
#line 260 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala"
g_return_val_if_fail (IS_DIRECT_PHOTO_SOURCE_COLLECTION (self), FALSE);
#line 260 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala"
@@ -2393,71 +2587,67 @@ gboolean direct_photo_source_collection_has_file (DirectPhotoSourceCollection* s
#line 261 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala"
_tmp0_ = self->priv->file_map;
#line 261 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala"
- _tmp1_ = file;
-#line 261 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala"
- _tmp2_ = gee_abstract_map_has_key (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp1_);
-#line 261 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala"
- result = _tmp2_;
+ result = gee_abstract_map_has_key (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), file);
#line 261 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala"
return result;
-#line 2404 "DirectPhoto.c"
+#line 2594 "DirectPhoto.c"
}
-void direct_photo_source_collection_reimport_photo (DirectPhotoSourceCollection* self, DirectPhoto* photo) {
- DirectPhoto* _tmp0_;
+void
+direct_photo_source_collection_reimport_photo (DirectPhotoSourceCollection* self,
+ DirectPhoto* photo)
+{
DirectPhoto* reimported_photo = NULL;
- DirectPhoto* _tmp1_;
- GFile* _tmp2_;
- GFile* _tmp3_;
- DirectPhoto* _tmp4_ = NULL;
- gchar* _tmp5_;
- gchar* _tmp6_;
+ GFile* _tmp0_;
+ GFile* _tmp1_;
+ DirectPhoto* _tmp2_ = NULL;
+ gchar* _tmp3_;
+ gchar* _tmp4_;
#line 264 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala"
g_return_if_fail (IS_DIRECT_PHOTO_SOURCE_COLLECTION (self));
#line 264 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala"
g_return_if_fail (IS_DIRECT_PHOTO (photo));
#line 265 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala"
- _tmp0_ = photo;
-#line 265 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala"
- photo_discard_prefetched (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, TYPE_PHOTO, Photo));
+ photo_discard_prefetched (G_TYPE_CHECK_INSTANCE_CAST (photo, TYPE_PHOTO, Photo));
#line 267 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala"
- _tmp1_ = photo;
+ _tmp0_ = media_source_get_file (G_TYPE_CHECK_INSTANCE_CAST (photo, TYPE_MEDIA_SOURCE, MediaSource));
#line 267 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala"
- _tmp2_ = media_source_get_file (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, TYPE_MEDIA_SOURCE, MediaSource));
+ _tmp1_ = _tmp0_;
#line 267 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala"
- _tmp3_ = _tmp2_;
-#line 267 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala"
- _tmp5_ = direct_photo_source_collection_fetch (self, _tmp3_, &_tmp4_, TRUE);
+ _tmp3_ = direct_photo_source_collection_fetch (self, _tmp1_, &_tmp2_, TRUE);
#line 267 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala"
_g_object_unref0 (reimported_photo);
#line 267 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala"
- reimported_photo = _tmp4_;
+ reimported_photo = _tmp2_;
#line 267 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala"
- _tmp6_ = _tmp5_;
+ _tmp4_ = _tmp3_;
#line 267 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala"
- _g_free0 (_tmp6_);
+ _g_free0 (_tmp4_);
#line 267 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala"
- _g_object_unref0 (_tmp3_);
+ _g_object_unref0 (_tmp1_);
#line 264 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala"
_g_object_unref0 (reimported_photo);
-#line 2445 "DirectPhoto.c"
+#line 2632 "DirectPhoto.c"
}
-gchar* direct_photo_source_collection_fetch (DirectPhotoSourceCollection* self, GFile* file, DirectPhoto* * photo, gboolean reimport) {
+gchar*
+direct_photo_source_collection_fetch (DirectPhotoSourceCollection* self,
+ GFile* file,
+ DirectPhoto* * photo,
+ gboolean reimport)
+{
DirectPhoto* _vala_photo = NULL;
gchar* result = NULL;
GeeHashMap* _tmp0_;
- GFile* _tmp1_;
- gpointer _tmp2_;
- DirectPhoto* _tmp3_;
+ gpointer _tmp1_;
+ DirectPhoto* _tmp2_;
ImportResult _result_ = 0;
- GFile* _tmp25_;
- DirectPhoto* _tmp26_ = NULL;
- ImportResult _tmp27_;
- gchar* _tmp28_ = NULL;
- ImportResult _tmp29_;
+ DirectPhoto* _tmp20_ = NULL;
+ ImportResult _tmp21_;
+ gchar* _tmp22_ = NULL;
+ ImportResult _tmp23_;
GError * _inner_error_ = NULL;
#line 271 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala"
g_return_val_if_fail (IS_DIRECT_PHOTO_SOURCE_COLLECTION (self), NULL);
@@ -2466,166 +2656,152 @@ gchar* direct_photo_source_collection_fetch (DirectPhotoSourceCollection* self,
#line 273 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala"
_tmp0_ = self->priv->file_map;
#line 273 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala"
- _tmp1_ = file;
-#line 273 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala"
- _tmp2_ = gee_abstract_map_get (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp1_);
+ _tmp1_ = gee_abstract_map_get (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), file);
#line 273 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala"
_g_object_unref0 (_vala_photo);
#line 273 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala"
- _vala_photo = (DirectPhoto*) _tmp2_;
+ _vala_photo = (DirectPhoto*) _tmp1_;
#line 274 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala"
- _tmp3_ = _vala_photo;
+ _tmp2_ = _vala_photo;
#line 274 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala"
- if (_tmp3_ != NULL) {
-#line 2481 "DirectPhoto.c"
+ if (_tmp2_ != NULL) {
+#line 2669 "DirectPhoto.c"
gchar* reason = NULL;
- gboolean _tmp4_;
#line 275 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala"
reason = NULL;
#line 277 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala"
- _tmp4_ = reimport;
-#line 277 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala"
- if (_tmp4_) {
-#line 2490 "DirectPhoto.c"
+ if (reimport) {
+#line 2675 "DirectPhoto.c"
{
Orientation ori_tmp = 0;
gboolean should_restore_ori = FALSE;
- gboolean _tmp5_ = FALSE;
- DirectPhoto* _tmp6_;
- gboolean _tmp7_;
+ gboolean _tmp3_ = FALSE;
+ DirectPhoto* _tmp4_;
PhotoReimportMasterState* reimport_state = NULL;
- gboolean _tmp12_ = FALSE;
- DirectPhoto* _tmp13_;
- PhotoReimportMasterState* _tmp14_ = NULL;
- gboolean _tmp15_;
+ gboolean _tmp7_ = FALSE;
+ DirectPhoto* _tmp8_;
+ PhotoReimportMasterState* _tmp9_ = NULL;
+ gboolean _tmp10_;
#line 279 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala"
ori_tmp = ORIENTATION_TOP_LEFT;
#line 280 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala"
should_restore_ori = FALSE;
#line 282 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala"
- _tmp6_ = _vala_photo;
-#line 282 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala"
- _tmp7_ = photo_only_metadata_changed (G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, TYPE_PHOTO, Photo));
+ _tmp4_ = _vala_photo;
#line 282 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala"
- if (_tmp7_) {
+ if (photo_only_metadata_changed (G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, TYPE_PHOTO, Photo))) {
#line 282 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala"
- _tmp5_ = TRUE;
-#line 2514 "DirectPhoto.c"
+ _tmp3_ = TRUE;
+#line 2696 "DirectPhoto.c"
} else {
- DirectPhoto* _tmp8_;
- PhotoFileFormat _tmp9_;
-#line 283 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala"
- _tmp8_ = _vala_photo;
+ DirectPhoto* _tmp5_;
#line 283 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala"
- _tmp9_ = photo_get_file_format (G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, TYPE_PHOTO, Photo));
+ _tmp5_ = _vala_photo;
#line 283 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala"
- _tmp5_ = _tmp9_ == PHOTO_FILE_FORMAT_JFIF;
-#line 2524 "DirectPhoto.c"
+ _tmp3_ = photo_get_file_format (G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, TYPE_PHOTO, Photo)) == PHOTO_FILE_FORMAT_JFIF;
+#line 2703 "DirectPhoto.c"
}
#line 282 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala"
- if (_tmp5_) {
-#line 2528 "DirectPhoto.c"
- DirectPhoto* _tmp10_;
- Orientation _tmp11_;
-#line 284 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala"
- _tmp10_ = _vala_photo;
+ if (_tmp3_) {
+#line 2707 "DirectPhoto.c"
+ DirectPhoto* _tmp6_;
#line 284 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala"
- _tmp11_ = photo_get_orientation (G_TYPE_CHECK_INSTANCE_CAST (_tmp10_, TYPE_PHOTO, Photo));
+ _tmp6_ = _vala_photo;
#line 284 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala"
- ori_tmp = _tmp11_;
+ ori_tmp = photo_get_orientation (G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, TYPE_PHOTO, Photo));
#line 285 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala"
should_restore_ori = TRUE;
-#line 2539 "DirectPhoto.c"
+#line 2715 "DirectPhoto.c"
}
#line 289 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala"
- _tmp13_ = _vala_photo;
+ _tmp8_ = _vala_photo;
#line 289 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala"
- _tmp15_ = photo_prepare_for_reimport_master (G_TYPE_CHECK_INSTANCE_CAST (_tmp13_, TYPE_PHOTO, Photo), &_tmp14_, &_inner_error_);
+ _tmp10_ = photo_prepare_for_reimport_master (G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, TYPE_PHOTO, Photo), &_tmp9_, &_inner_error_);
#line 289 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala"
_photo_reimport_master_state_unref0 (reimport_state);
#line 289 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala"
- reimport_state = _tmp14_;
+ reimport_state = _tmp9_;
#line 289 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala"
- _tmp12_ = _tmp15_;
+ _tmp7_ = _tmp10_;
#line 289 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala"
if (G_UNLIKELY (_inner_error_ != NULL)) {
#line 289 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala"
_photo_reimport_master_state_unref0 (reimport_state);
-#line 2555 "DirectPhoto.c"
+#line 2731 "DirectPhoto.c"
goto __catch51_g_error;
}
#line 289 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala"
- if (_tmp12_) {
-#line 2560 "DirectPhoto.c"
- DirectPhoto* _tmp16_;
- PhotoReimportMasterState* _tmp17_;
- gboolean _tmp18_;
+ if (_tmp7_) {
+#line 2736 "DirectPhoto.c"
+ DirectPhoto* _tmp11_;
+ PhotoReimportMasterState* _tmp12_;
+ gboolean _tmp13_;
#line 290 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala"
- _tmp16_ = _vala_photo;
+ _tmp11_ = _vala_photo;
#line 290 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala"
- _tmp17_ = reimport_state;
+ _tmp12_ = reimport_state;
#line 290 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala"
- photo_finish_reimport_master (G_TYPE_CHECK_INSTANCE_CAST (_tmp16_, TYPE_PHOTO, Photo), _tmp17_, &_inner_error_);
+ photo_finish_reimport_master (G_TYPE_CHECK_INSTANCE_CAST (_tmp11_, TYPE_PHOTO, Photo), _tmp12_, &_inner_error_);
#line 290 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala"
if (G_UNLIKELY (_inner_error_ != NULL)) {
#line 290 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala"
_photo_reimport_master_state_unref0 (reimport_state);
-#line 2574 "DirectPhoto.c"
+#line 2750 "DirectPhoto.c"
goto __catch51_g_error;
}
#line 291 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala"
- _tmp18_ = should_restore_ori;
+ _tmp13_ = should_restore_ori;
#line 291 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala"
- if (_tmp18_) {
-#line 2581 "DirectPhoto.c"
- DirectPhoto* _tmp19_;
- Orientation _tmp20_;
+ if (_tmp13_) {
+#line 2757 "DirectPhoto.c"
+ DirectPhoto* _tmp14_;
+ Orientation _tmp15_;
#line 292 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala"
- _tmp19_ = _vala_photo;
+ _tmp14_ = _vala_photo;
#line 292 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala"
- _tmp20_ = ori_tmp;
+ _tmp15_ = ori_tmp;
#line 292 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala"
- direct_photo_fixup_orientation_after_reimport (_tmp19_, _tmp20_);
-#line 2590 "DirectPhoto.c"
+ direct_photo_fixup_orientation_after_reimport (_tmp14_, _tmp15_);
+#line 2766 "DirectPhoto.c"
}
} else {
- gchar* _tmp21_;
+ gchar* _tmp16_;
#line 296 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala"
- _tmp21_ = import_result_to_string (IMPORT_RESULT_FILE_ERROR);
+ _tmp16_ = import_result_to_string (IMPORT_RESULT_FILE_ERROR);
#line 296 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala"
_g_free0 (reason);
#line 296 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala"
- reason = _tmp21_;
-#line 2600 "DirectPhoto.c"
+ reason = _tmp16_;
+#line 2776 "DirectPhoto.c"
}
#line 278 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala"
_photo_reimport_master_state_unref0 (reimport_state);
-#line 2604 "DirectPhoto.c"
+#line 2780 "DirectPhoto.c"
}
goto __finally51;
__catch51_g_error:
{
GError* err = NULL;
- GError* _tmp22_;
- const gchar* _tmp23_;
- gchar* _tmp24_;
+ GError* _tmp17_;
+ const gchar* _tmp18_;
+ gchar* _tmp19_;
#line 278 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala"
err = _inner_error_;
#line 278 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala"
_inner_error_ = NULL;
#line 299 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala"
- _tmp22_ = err;
+ _tmp17_ = err;
#line 299 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala"
- _tmp23_ = _tmp22_->message;
+ _tmp18_ = _tmp17_->message;
#line 299 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala"
- _tmp24_ = g_strdup (_tmp23_);
+ _tmp19_ = g_strdup (_tmp18_);
#line 299 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala"
_g_free0 (reason);
#line 299 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala"
- reason = _tmp24_;
+ reason = _tmp19_;
#line 278 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala"
_g_error_free0 (err);
-#line 2629 "DirectPhoto.c"
+#line 2805 "DirectPhoto.c"
}
__finally51:
#line 278 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala"
@@ -2638,7 +2814,7 @@ gchar* direct_photo_source_collection_fetch (DirectPhotoSourceCollection* self,
g_clear_error (&_inner_error_);
#line 278 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala"
return NULL;
-#line 2642 "DirectPhoto.c"
+#line 2818 "DirectPhoto.c"
}
}
#line 303 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala"
@@ -2647,71 +2823,70 @@ gchar* direct_photo_source_collection_fetch (DirectPhotoSourceCollection* self,
if (photo) {
#line 303 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala"
*photo = _vala_photo;
-#line 2651 "DirectPhoto.c"
+#line 2827 "DirectPhoto.c"
} else {
#line 303 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala"
_g_object_unref0 (_vala_photo);
-#line 2655 "DirectPhoto.c"
+#line 2831 "DirectPhoto.c"
}
#line 303 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala"
return result;
-#line 2659 "DirectPhoto.c"
+#line 2835 "DirectPhoto.c"
}
#line 308 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala"
- _tmp25_ = file;
-#line 308 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala"
- _tmp27_ = direct_photo_internal_import (_tmp25_, &_tmp26_);
+ _tmp21_ = direct_photo_internal_import (file, &_tmp20_);
#line 308 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala"
_g_object_unref0 (_vala_photo);
#line 308 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala"
- _vala_photo = _tmp26_;
+ _vala_photo = _tmp20_;
#line 308 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala"
- _result_ = _tmp27_;
+ _result_ = _tmp21_;
#line 310 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala"
- _tmp29_ = _result_;
+ _tmp23_ = _result_;
#line 310 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala"
- if (_tmp29_ == IMPORT_RESULT_SUCCESS) {
+ if (_tmp23_ == IMPORT_RESULT_SUCCESS) {
#line 310 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala"
- _g_free0 (_tmp28_);
+ _g_free0 (_tmp22_);
#line 310 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala"
- _tmp28_ = NULL;
-#line 2679 "DirectPhoto.c"
+ _tmp22_ = NULL;
+#line 2853 "DirectPhoto.c"
} else {
- ImportResult _tmp30_;
- gchar* _tmp31_;
+ ImportResult _tmp24_;
+ gchar* _tmp25_;
#line 310 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala"
- _tmp30_ = _result_;
+ _tmp24_ = _result_;
#line 310 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala"
- _tmp31_ = import_result_to_string (_tmp30_);
+ _tmp25_ = import_result_to_string (_tmp24_);
#line 310 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala"
- _g_free0 (_tmp28_);
+ _g_free0 (_tmp22_);
#line 310 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala"
- _tmp28_ = _tmp31_;
-#line 2691 "DirectPhoto.c"
+ _tmp22_ = _tmp25_;
+#line 2865 "DirectPhoto.c"
}
#line 310 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala"
- result = _tmp28_;
+ result = _tmp22_;
#line 310 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala"
if (photo) {
#line 310 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala"
*photo = _vala_photo;
-#line 2699 "DirectPhoto.c"
+#line 2873 "DirectPhoto.c"
} else {
#line 310 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala"
_g_object_unref0 (_vala_photo);
-#line 2703 "DirectPhoto.c"
+#line 2877 "DirectPhoto.c"
}
#line 310 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala"
return result;
-#line 2707 "DirectPhoto.c"
+#line 2881 "DirectPhoto.c"
}
-gboolean direct_photo_source_collection_has_file_source (DirectPhotoSourceCollection* self, GFile* file) {
+gboolean
+direct_photo_source_collection_has_file_source (DirectPhotoSourceCollection* self,
+ GFile* file)
+{
gboolean result = FALSE;
GeeHashMap* _tmp0_;
- GFile* _tmp1_;
- gboolean _tmp2_;
#line 313 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala"
g_return_val_if_fail (IS_DIRECT_PHOTO_SOURCE_COLLECTION (self), FALSE);
#line 313 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala"
@@ -2719,22 +2894,20 @@ gboolean direct_photo_source_collection_has_file_source (DirectPhotoSourceCollec
#line 314 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala"
_tmp0_ = self->priv->file_map;
#line 314 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala"
- _tmp1_ = file;
-#line 314 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala"
- _tmp2_ = gee_abstract_map_has_key (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp1_);
-#line 314 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala"
- result = _tmp2_;
+ result = gee_abstract_map_has_key (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), file);
#line 314 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala"
return result;
-#line 2730 "DirectPhoto.c"
+#line 2901 "DirectPhoto.c"
}
-DirectPhoto* direct_photo_source_collection_get_file_source (DirectPhotoSourceCollection* self, GFile* file) {
+DirectPhoto*
+direct_photo_source_collection_get_file_source (DirectPhotoSourceCollection* self,
+ GFile* file)
+{
DirectPhoto* result = NULL;
GeeHashMap* _tmp0_;
- GFile* _tmp1_;
- gpointer _tmp2_;
+ gpointer _tmp1_;
#line 317 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala"
g_return_val_if_fail (IS_DIRECT_PHOTO_SOURCE_COLLECTION (self), NULL);
#line 317 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala"
@@ -2742,18 +2915,18 @@ DirectPhoto* direct_photo_source_collection_get_file_source (DirectPhotoSourceCo
#line 318 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala"
_tmp0_ = self->priv->file_map;
#line 318 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala"
- _tmp1_ = file;
-#line 318 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala"
- _tmp2_ = gee_abstract_map_get (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp1_);
+ _tmp1_ = gee_abstract_map_get (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), file);
#line 318 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala"
- result = (DirectPhoto*) _tmp2_;
+ result = (DirectPhoto*) _tmp1_;
#line 318 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala"
return result;
-#line 2753 "DirectPhoto.c"
+#line 2924 "DirectPhoto.c"
}
-static void direct_photo_source_collection_class_init (DirectPhotoSourceCollectionClass * klass) {
+static void
+direct_photo_source_collection_class_init (DirectPhotoSourceCollectionClass * klass)
+{
#line 175 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala"
direct_photo_source_collection_parent_class = g_type_class_peek_parent (klass);
#line 175 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala"
@@ -2766,11 +2939,13 @@ static void direct_photo_source_collection_class_init (DirectPhotoSourceCollecti
((DataCollectionClass *) klass)->notify_items_added = (void (*) (DataCollection *, GeeIterable*)) direct_photo_source_collection_real_notify_items_added;
#line 175 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala"
((DataCollectionClass *) klass)->notify_items_removed = (void (*) (DataCollection *, GeeIterable*)) direct_photo_source_collection_real_notify_items_removed;
-#line 2770 "DirectPhoto.c"
+#line 2943 "DirectPhoto.c"
}
-static void direct_photo_source_collection_instance_init (DirectPhotoSourceCollection * self) {
+static void
+direct_photo_source_collection_instance_init (DirectPhotoSourceCollection * self)
+{
GeeArrayList* _tmp0_;
GeeHashMap* _tmp1_;
#line 175 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala"
@@ -2783,11 +2958,13 @@ static void direct_photo_source_collection_instance_init (DirectPhotoSourceColle
_tmp1_ = gee_hash_map_new (g_file_get_type (), (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, TYPE_DIRECT_PHOTO, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, _file_hash_gee_hash_data_func, NULL, NULL, _file_equal_gee_equal_data_func, NULL, NULL, NULL, NULL, NULL);
#line 178 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala"
self->priv->file_map = _tmp1_;
-#line 2787 "DirectPhoto.c"
+#line 2962 "DirectPhoto.c"
}
-static void direct_photo_source_collection_finalize (DataCollection * obj) {
+static void
+direct_photo_source_collection_finalize (DataCollection * obj)
+{
DirectPhotoSourceCollection * self;
#line 175 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala"
self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_DIRECT_PHOTO_SOURCE_COLLECTION, DirectPhotoSourceCollection);
@@ -2799,11 +2976,13 @@ static void direct_photo_source_collection_finalize (DataCollection * obj) {
_g_object_unref0 (self->priv->monitor);
#line 175 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala"
DATA_COLLECTION_CLASS (direct_photo_source_collection_parent_class)->finalize (obj);
-#line 2803 "DirectPhoto.c"
+#line 2980 "DirectPhoto.c"
}
-GType direct_photo_source_collection_get_type (void) {
+GType
+direct_photo_source_collection_get_type (void)
+{
static volatile gsize direct_photo_source_collection_type_id__volatile = 0;
if (g_once_init_enter (&direct_photo_source_collection_type_id__volatile)) {
static const GTypeInfo g_define_type_info = { sizeof (DirectPhotoSourceCollectionClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) direct_photo_source_collection_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (DirectPhotoSourceCollection), 0, (GInstanceInitFunc) direct_photo_source_collection_instance_init, NULL };
diff --git a/src/direct/DirectPhotoPage.c b/src/direct/DirectPhotoPage.c
index ae2a47c..62620fb 100644
--- a/src/direct/DirectPhotoPage.c
+++ b/src/direct/DirectPhotoPage.c
@@ -1,4 +1,4 @@
-/* DirectPhotoPage.c generated by valac 0.36.6, the Vala compiler
+/* DirectPhotoPage.c generated by valac 0.40.4, the Vala compiler
* generated from DirectPhotoPage.vala, do not modify */
/* Copyright 2016 Software Freedom Conservancy Inc.
@@ -7,6 +7,7 @@
* (version 2.1 or later). See the COPYING file in this distribution.
*/
+
#include <glib.h>
#include <glib-object.h>
#include <gtk/gtk.h>
@@ -211,6 +212,11 @@ typedef struct _ViewCollectionClass ViewCollectionClass;
typedef struct _DirectViewCollection DirectViewCollection;
typedef struct _DirectViewCollectionClass DirectViewCollectionClass;
+enum {
+ DIRECT_PHOTO_PAGE_0_PROPERTY,
+ DIRECT_PHOTO_PAGE_NUM_PROPERTIES
+};
+static GParamSpec* direct_photo_page_properties[DIRECT_PHOTO_PAGE_NUM_PROPERTIES];
#define TYPE_SOURCE_COLLECTION (source_collection_get_type ())
#define SOURCE_COLLECTION(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), TYPE_SOURCE_COLLECTION, SourceCollection))
@@ -371,6 +377,11 @@ typedef struct _Block7Data Block7Data;
typedef struct _DirectFullscreenPhotoPage DirectFullscreenPhotoPage;
typedef struct _DirectFullscreenPhotoPageClass DirectFullscreenPhotoPageClass;
typedef struct _DirectFullscreenPhotoPagePrivate DirectFullscreenPhotoPagePrivate;
+enum {
+ DIRECT_FULLSCREEN_PHOTO_PAGE_0_PROPERTY,
+ DIRECT_FULLSCREEN_PHOTO_PAGE_NUM_PROPERTIES
+};
+static GParamSpec* direct_fullscreen_photo_page_properties[DIRECT_FULLSCREEN_PHOTO_PAGE_NUM_PROPERTIES];
struct _Page {
GtkScrolledWindow parent_instance;
@@ -602,9 +613,15 @@ GType page_window_get_type (void) G_GNUC_CONST;
GType fullscreen_window_get_type (void) G_GNUC_CONST;
gpointer injection_group_ref (gpointer instance);
void injection_group_unref (gpointer instance);
-GParamSpec* param_spec_injection_group (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags);
-void value_set_injection_group (GValue* value, gpointer v_object);
-void value_take_injection_group (GValue* value, gpointer v_object);
+GParamSpec* param_spec_injection_group (const gchar* name,
+ const gchar* nick,
+ const gchar* blurb,
+ GType object_type,
+ GParamFlags flags);
+void value_set_injection_group (GValue* value,
+ gpointer v_object);
+void value_take_injection_group (GValue* value,
+ gpointer v_object);
gpointer value_get_injection_group (const GValue* value);
GType injection_group_get_type (void) G_GNUC_CONST;
GType single_photo_page_get_type (void) G_GNUC_CONST;
@@ -624,84 +641,151 @@ GType data_view_get_type (void) G_GNUC_CONST;
GType direct_photo_page_get_type (void) G_GNUC_CONST;
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 view_collection_get_type (void) G_GNUC_CONST;
GType direct_view_collection_get_type (void) G_GNUC_CONST;
#define DIRECT_PHOTO_PAGE_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), TYPE_DIRECT_PHOTO_PAGE, DirectPhotoPagePrivate))
-enum {
- DIRECT_PHOTO_PAGE_DUMMY_PROPERTY
-};
GType source_collection_get_type (void) G_GNUC_CONST;
GType database_source_collection_get_type (void) G_GNUC_CONST;
GType direct_photo_source_collection_get_type (void) G_GNUC_CONST;
gpointer alteration_ref (gpointer instance);
void alteration_unref (gpointer instance);
-GParamSpec* param_spec_alteration (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags);
-void value_set_alteration (GValue* value, gpointer v_object);
-void value_take_alteration (GValue* value, gpointer v_object);
+GParamSpec* param_spec_alteration (const gchar* name,
+ const gchar* nick,
+ const gchar* blurb,
+ GType object_type,
+ GParamFlags flags);
+void value_set_alteration (GValue* value,
+ gpointer v_object);
+void value_take_alteration (GValue* value,
+ gpointer v_object);
gpointer value_get_alteration (const GValue* value);
GType alteration_get_type (void) G_GNUC_CONST;
-static void direct_photo_page_on_photos_altered (DirectPhotoPage* self, GeeMap* map);
-static void _direct_photo_page_on_photos_altered_data_collection_items_altered (DataCollection* _sender, GeeMap* items, gpointer self);
+static void direct_photo_page_on_photos_altered (DirectPhotoPage* self,
+ GeeMap* map);
+static void _direct_photo_page_on_photos_altered_data_collection_items_altered (DataCollection* _sender,
+ GeeMap* items,
+ gpointer self);
static void direct_photo_page_on_save (DirectPhotoPage* self);
-static void _direct_photo_page_on_save_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self);
+static void _direct_photo_page_on_save_gsimple_action_activate_callback (GSimpleAction* action,
+ GVariant* parameter,
+ gpointer self);
static void direct_photo_page_on_save_as (DirectPhotoPage* self);
-static void _direct_photo_page_on_save_as_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self);
+static void _direct_photo_page_on_save_as_gsimple_action_activate_callback (GSimpleAction* action,
+ GVariant* parameter,
+ gpointer self);
static void direct_photo_page_on_send_to (DirectPhotoPage* self);
-static void _direct_photo_page_on_send_to_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self);
+static void _direct_photo_page_on_send_to_gsimple_action_activate_callback (GSimpleAction* action,
+ GVariant* parameter,
+ gpointer self);
static void direct_photo_page_on_print (DirectPhotoPage* self);
-static void _direct_photo_page_on_print_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self);
+static void _direct_photo_page_on_print_gsimple_action_activate_callback (GSimpleAction* action,
+ GVariant* parameter,
+ gpointer self);
void single_photo_page_on_previous_photo (SinglePhotoPage* self);
-static void _single_photo_page_on_previous_photo_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self);
+static void _single_photo_page_on_previous_photo_gsimple_action_activate_callback (GSimpleAction* action,
+ GVariant* parameter,
+ gpointer self);
void single_photo_page_on_next_photo (SinglePhotoPage* self);
-static void _single_photo_page_on_next_photo_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self);
+static void _single_photo_page_on_next_photo_gsimple_action_activate_callback (GSimpleAction* action,
+ GVariant* parameter,
+ gpointer self);
void editing_host_page_on_rotate_clockwise (EditingHostPage* self);
-static void _editing_host_page_on_rotate_clockwise_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self);
+static void _editing_host_page_on_rotate_clockwise_gsimple_action_activate_callback (GSimpleAction* action,
+ GVariant* parameter,
+ gpointer self);
void editing_host_page_on_rotate_counterclockwise (EditingHostPage* self);
-static void _editing_host_page_on_rotate_counterclockwise_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self);
+static void _editing_host_page_on_rotate_counterclockwise_gsimple_action_activate_callback (GSimpleAction* action,
+ GVariant* parameter,
+ gpointer self);
void editing_host_page_on_flip_horizontally (EditingHostPage* self);
-static void _editing_host_page_on_flip_horizontally_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self);
+static void _editing_host_page_on_flip_horizontally_gsimple_action_activate_callback (GSimpleAction* action,
+ GVariant* parameter,
+ gpointer self);
void editing_host_page_on_flip_vertically (EditingHostPage* self);
-static void _editing_host_page_on_flip_vertically_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self);
+static void _editing_host_page_on_flip_vertically_gsimple_action_activate_callback (GSimpleAction* action,
+ GVariant* parameter,
+ gpointer self);
void editing_host_page_on_enhance (EditingHostPage* self);
-static void _editing_host_page_on_enhance_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self);
+static void _editing_host_page_on_enhance_gsimple_action_activate_callback (GSimpleAction* action,
+ GVariant* parameter,
+ gpointer self);
void editing_host_page_toggle_crop (EditingHostPage* self);
-static void _editing_host_page_toggle_crop_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self);
+static void _editing_host_page_toggle_crop_gsimple_action_activate_callback (GSimpleAction* action,
+ GVariant* parameter,
+ gpointer self);
void editing_host_page_toggle_straighten (EditingHostPage* self);
-static void _editing_host_page_toggle_straighten_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self);
+static void _editing_host_page_toggle_straighten_gsimple_action_activate_callback (GSimpleAction* action,
+ GVariant* parameter,
+ gpointer self);
void editing_host_page_toggle_redeye (EditingHostPage* self);
-static void _editing_host_page_toggle_redeye_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self);
+static void _editing_host_page_toggle_redeye_gsimple_action_activate_callback (GSimpleAction* action,
+ GVariant* parameter,
+ gpointer self);
void editing_host_page_toggle_adjust (EditingHostPage* self);
-static void _editing_host_page_toggle_adjust_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self);
+static void _editing_host_page_toggle_adjust_gsimple_action_activate_callback (GSimpleAction* action,
+ GVariant* parameter,
+ gpointer self);
void editing_host_page_on_revert (EditingHostPage* self);
-static void _editing_host_page_on_revert_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self);
+static void _editing_host_page_on_revert_gsimple_action_activate_callback (GSimpleAction* action,
+ GVariant* parameter,
+ gpointer self);
void editing_host_page_on_adjust_date_time (EditingHostPage* self);
-static void _editing_host_page_on_adjust_date_time_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self);
+static void _editing_host_page_on_adjust_date_time_gsimple_action_activate_callback (GSimpleAction* action,
+ GVariant* parameter,
+ gpointer self);
void editing_host_page_on_set_background (EditingHostPage* self);
-static void _editing_host_page_on_set_background_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self);
+static void _editing_host_page_on_set_background_gsimple_action_activate_callback (GSimpleAction* action,
+ GVariant* parameter,
+ gpointer self);
void editing_host_page_on_increase_size (EditingHostPage* self);
-static void _editing_host_page_on_increase_size_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self);
+static void _editing_host_page_on_increase_size_gsimple_action_activate_callback (GSimpleAction* action,
+ GVariant* parameter,
+ gpointer self);
void editing_host_page_on_decrease_size (EditingHostPage* self);
-static void _editing_host_page_on_decrease_size_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self);
+static void _editing_host_page_on_decrease_size_gsimple_action_activate_callback (GSimpleAction* action,
+ GVariant* parameter,
+ gpointer self);
void editing_host_page_snap_zoom_to_min (EditingHostPage* self);
-static void _editing_host_page_snap_zoom_to_min_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self);
+static void _editing_host_page_snap_zoom_to_min_gsimple_action_activate_callback (GSimpleAction* action,
+ GVariant* parameter,
+ gpointer self);
void editing_host_page_snap_zoom_to_isomorphic (EditingHostPage* self);
-static void _editing_host_page_snap_zoom_to_isomorphic_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self);
+static void _editing_host_page_snap_zoom_to_isomorphic_gsimple_action_activate_callback (GSimpleAction* action,
+ GVariant* parameter,
+ gpointer self);
void editing_host_page_snap_zoom_to_max (EditingHostPage* self);
-static void _editing_host_page_snap_zoom_to_max_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self);
+static void _editing_host_page_snap_zoom_to_max_gsimple_action_activate_callback (GSimpleAction* action,
+ GVariant* parameter,
+ gpointer self);
DirectPhotoPage* direct_photo_page_new (GFile* file);
-DirectPhotoPage* direct_photo_page_construct (GType object_type, GFile* file);
-EditingHostPage* editing_host_page_construct (GType object_type, SourceCollection* sources, const gchar* name);
+DirectPhotoPage* direct_photo_page_construct (GType object_type,
+ GFile* file);
+EditingHostPage* editing_host_page_construct (GType object_type,
+ SourceCollection* sources,
+ const gchar* name);
static gboolean direct_photo_page_check_editable_file (GFile* file);
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);
@@ -710,47 +794,80 @@ DirectViewCollection* direct_view_collection_new (void);
DirectViewCollection* direct_view_collection_construct (GType object_type);
ViewCollection* page_get_view (Page* self);
static void direct_photo_page_on_selection_group_altered (DirectPhotoPage* self);
-static void _direct_photo_page_on_selection_group_altered_view_collection_selection_group_altered (ViewCollection* _sender, gpointer self);
-static void direct_photo_page_real_init_collect_ui_filenames (Page* base, GeeList* ui_filenames);
-void page_init_collect_ui_filenames (Page* self, GeeList* ui_filenames);
-static void direct_photo_page_real_add_actions (Page* base, GActionMap* map);
-void page_add_actions (Page* self, GActionMap* map);
-static void direct_photo_page_real_remove_actions (Page* base, GActionMap* map);
-void page_remove_actions (Page* self, GActionMap* map);
-static InjectionGroup** direct_photo_page_real_init_collect_injection_groups (Page* base, int* result_length1);
-InjectionGroup** page_init_collect_injection_groups (Page* self, int* result_length1);
+static void _direct_photo_page_on_selection_group_altered_view_collection_selection_group_altered (ViewCollection* _sender,
+ gpointer self);
+static void direct_photo_page_real_init_collect_ui_filenames (Page* base,
+ GeeList* ui_filenames);
+void page_init_collect_ui_filenames (Page* self,
+ GeeList* ui_filenames);
+static void direct_photo_page_real_add_actions (Page* base,
+ GActionMap* map);
+void page_add_actions (Page* self,
+ GActionMap* map);
+static void direct_photo_page_real_remove_actions (Page* base,
+ GActionMap* map);
+void page_remove_actions (Page* self,
+ GActionMap* map);
+static InjectionGroup** direct_photo_page_real_init_collect_injection_groups (Page* base,
+ int* result_length1);
+InjectionGroup** page_init_collect_injection_groups (Page* self,
+ int* result_length1);
InjectionGroup* injection_group_new (const gchar* path);
-InjectionGroup* injection_group_construct (GType object_type, const gchar* path);
-void injection_group_add_menu_item (InjectionGroup* self, const gchar* name, const gchar* action, const gchar* accellerator);
-static void _vala_array_add64 (InjectionGroup** * array, int* length, int* size, InjectionGroup* value);
-static void _vala_array_add65 (InjectionGroup** * array, int* length, int* size, InjectionGroup* value);
-void app_window_error_message (const gchar* message, GtkWindow* parent);
+InjectionGroup* injection_group_construct (GType object_type,
+ const gchar* path);
+void injection_group_add_menu_item (InjectionGroup* self,
+ const gchar* name,
+ const gchar* action,
+ const gchar* accellerator);
+static void _vala_array_add64 (InjectionGroup** * array,
+ int* length,
+ int* size,
+ InjectionGroup* value);
+static void _vala_array_add65 (InjectionGroup** * array,
+ int* length,
+ int* size,
+ InjectionGroup* value);
+void app_window_error_message (const gchar* message,
+ GtkWindow* parent);
gboolean photo_file_format_is_file_supported (GFile* file);
#define RESOURCES_APP_TITLE "Shotwell"
static void direct_photo_page_real_realize (GtkWidget* base);
GType direct_photo_get_type (void) G_GNUC_CONST;
-DirectPhoto* direct_photo_source_collection_get_file_source (DirectPhotoSourceCollection* self, GFile* file);
-void editing_host_page_display_mirror_of (EditingHostPage* self, ViewCollection* controller, Photo* starting_photo);
+DirectPhoto* direct_photo_source_collection_get_file_source (DirectPhotoSourceCollection* self,
+ GFile* file);
+void editing_host_page_display_mirror_of (EditingHostPage* self,
+ ViewCollection* controller,
+ Photo* starting_photo);
void app_window_panic (const gchar* msg);
-static void direct_photo_page_real_photo_changing (EditingHostPage* base, Photo* new_photo);
+static void direct_photo_page_real_photo_changing (EditingHostPage* base,
+ Photo* new_photo);
Photo* editing_host_page_get_photo (EditingHostPage* self);
-static void direct_photo_page_on_dphoto_can_rotate_changed (DirectPhotoPage* self, gboolean should_allow_rotation);
-static void _direct_photo_page_on_dphoto_can_rotate_changed_direct_photo_can_rotate_changed (DirectPhoto* _sender, gboolean b, gpointer self);
+static void direct_photo_page_on_dphoto_can_rotate_changed (DirectPhotoPage* self,
+ gboolean should_allow_rotation);
+static void _direct_photo_page_on_dphoto_can_rotate_changed_direct_photo_can_rotate_changed (DirectPhoto* _sender,
+ gboolean b,
+ gpointer self);
GType import_result_get_type (void) G_GNUC_CONST;
ImportResult direct_photo_demand_load (DirectPhoto* self);
GFile* direct_photo_page_get_current_file (DirectPhotoPage* self);
GFile* media_source_get_file (MediaSource* self);
-static gboolean direct_photo_page_real_on_context_buttonpress (Page* base, GdkEventButton* event);
-gboolean page_popup_context_menu (Page* self, GtkMenu* context_menu, GdkEventButton* event);
+static gboolean direct_photo_page_real_on_context_buttonpress (Page* base,
+ GdkEventButton* event);
+gboolean page_popup_context_menu (Page* self,
+ GtkMenu* context_menu,
+ GdkEventButton* event);
static GtkMenu* direct_photo_page_get_context_menu (DirectPhotoPage* self);
static void direct_photo_page_update_zoom_menu_item_sensitivity (DirectPhotoPage* self);
GType zoom_state_get_type (void) G_GNUC_CONST;
ZoomState* zoom_state_dup (const ZoomState* self);
void zoom_state_free (ZoomState* self);
-void single_photo_page_get_zoom_state (SinglePhotoPage* self, ZoomState* result);
+void single_photo_page_get_zoom_state (SinglePhotoPage* self,
+ ZoomState* result);
gboolean zoom_state_is_max (ZoomState *self);
gboolean editing_host_page_get_photo_missing (EditingHostPage* self);
-void page_set_action_sensitive (Page* self, const gchar* name, gboolean sensitive);
+void page_set_action_sensitive (Page* self,
+ const gchar* name,
+ gboolean sensitive);
gboolean zoom_state_is_default (ZoomState *self);
static void direct_photo_page_real_on_increase_size (EditingHostPage* base);
static void direct_photo_page_real_on_decrease_size (EditingHostPage* base);
@@ -760,446 +877,606 @@ PhotoFileFormat photo_get_file_format (Photo* self);
gboolean photo_file_format_can_write (PhotoFileFormat self);
gpointer command_manager_ref (gpointer instance);
void command_manager_unref (gpointer instance);
-GParamSpec* param_spec_command_manager (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags);
-void value_set_command_manager (GValue* value, gpointer v_object);
-void value_take_command_manager (GValue* value, gpointer v_object);
+GParamSpec* param_spec_command_manager (const gchar* name,
+ const gchar* nick,
+ const gchar* blurb,
+ GType object_type,
+ GParamFlags flags);
+void value_set_command_manager (GValue* value,
+ gpointer v_object);
+void value_take_command_manager (GValue* value,
+ gpointer v_object);
gpointer value_get_command_manager (const GValue* value);
GType command_manager_get_type (void) G_GNUC_CONST;
CommandManager* page_get_command_manager (Page* self);
void command_manager_reset (CommandManager* self);
-static gboolean direct_photo_page_real_on_double_click (EditingHostPage* base, GdkEventButton* event);
+static gboolean direct_photo_page_real_on_double_click (EditingHostPage* base,
+ GdkEventButton* event);
GtkWindow* page_get_container (Page* self);
void fullscreen_window_close (FullscreenWindow* self);
-gboolean editing_host_page_on_double_click (EditingHostPage* self, GdkEventButton* event);
-static void direct_photo_page_real_update_ui (EditingHostPage* base, gboolean missing);
-void editing_host_page_update_ui (EditingHostPage* self, gboolean missing);
-static void direct_photo_page_real_update_actions (Page* base, gint selected_count, gint count);
+gboolean editing_host_page_on_double_click (EditingHostPage* self,
+ GdkEventButton* event);
+static void direct_photo_page_real_update_ui (EditingHostPage* base,
+ gboolean missing);
+void editing_host_page_update_ui (EditingHostPage* self,
+ gboolean missing);
+static void direct_photo_page_real_update_actions (Page* base,
+ gint selected_count,
+ gint count);
gint data_collection_get_count (DataCollection* self);
gboolean photo_has_transformations (Photo* self);
-gboolean editing_host_page_is_rotate_available (EditingHostPage* self, Photo* photo);
-gboolean editing_host_page_is_enhance_available (EditingHostPage* self, Photo* photo);
+gboolean editing_host_page_is_rotate_available (EditingHostPage* self,
+ Photo* photo);
+gboolean editing_host_page_is_enhance_available (EditingHostPage* self,
+ Photo* photo);
GType scaling_get_type (void) G_GNUC_CONST;
GType scale_constraint_get_type (void) G_GNUC_CONST;
Scaling* scaling_dup (const Scaling* self);
void scaling_free (Scaling* self);
-gboolean editing_tools_crop_tool_is_available (Photo* photo, Scaling* scaling);
+gboolean editing_tools_crop_tool_is_available (Photo* photo,
+ Scaling* scaling);
void scaling_for_original (Scaling* result);
-gboolean editing_tools_redeye_tool_is_available (Photo* photo, Scaling* scaling);
-void page_update_actions (Page* self, gint selected_count, gint count);
-static gboolean direct_photo_page_check_ok_to_close_photo (DirectPhotoPage* self, Photo* photo);
+gboolean editing_tools_redeye_tool_is_available (Photo* photo,
+ Scaling* scaling);
+void page_update_actions (Page* self,
+ gint selected_count,
+ gint count);
+static gboolean direct_photo_page_check_ok_to_close_photo (DirectPhotoPage* self,
+ Photo* photo);
gboolean photo_has_alterations (Photo* self);
void photo_remove_all_transformations (Photo* self);
-GtkResponseType app_window_negate_affirm_cancel_question (const gchar* message, const gchar* negative, const gchar* affirmative, const gchar* title, GtkWindow* parent);
+GtkResponseType app_window_negate_affirm_cancel_question (const gchar* message,
+ const gchar* negative,
+ const gchar* affirmative,
+ const gchar* title,
+ GtkWindow* parent);
gchar* media_source_get_basename (MediaSource* self);
GType jpeg_quality_get_type (void) G_GNUC_CONST;
-static void direct_photo_page_save (DirectPhotoPage* self, GFile* dest, gint scale, ScaleConstraint constraint, JpegQuality quality, PhotoFileFormat format, gboolean copy_unmodified, gboolean save_metadata);
+static void direct_photo_page_save (DirectPhotoPage* self,
+ GFile* dest,
+ gint scale,
+ ScaleConstraint constraint,
+ JpegQuality quality,
+ PhotoFileFormat format,
+ gboolean copy_unmodified,
+ gboolean save_metadata);
gboolean direct_photo_page_check_quit (DirectPhotoPage* self);
-static gboolean direct_photo_page_real_confirm_replace_photo (EditingHostPage* base, Photo* old_photo, Photo* new_photo);
-void scaling_for_constraint (ScaleConstraint constraint, gint scale, gboolean scale_up, Scaling* result);
-void photo_export (Photo* self, GFile* dest_file, Scaling* scaling, JpegQuality quality, PhotoFileFormat export_format, gboolean direct_copy_unmodified, gboolean export_metadata, GError** error);
-gchar* direct_photo_source_collection_fetch (DirectPhotoSourceCollection* self, GFile* file, DirectPhoto* * photo, gboolean reimport);
-gboolean data_source_equals (DataSource* self, DataSource* source);
+static gboolean direct_photo_page_real_confirm_replace_photo (EditingHostPage* base,
+ Photo* old_photo,
+ Photo* new_photo);
+void scaling_for_constraint (ScaleConstraint constraint,
+ gint scale,
+ gboolean scale_up,
+ Scaling* result);
+void photo_export (Photo* self,
+ GFile* dest_file,
+ Scaling* scaling,
+ JpegQuality quality,
+ PhotoFileFormat export_format,
+ gboolean direct_copy_unmodified,
+ gboolean export_metadata,
+ GError** error);
+gchar* direct_photo_source_collection_fetch (DirectPhotoSourceCollection* self,
+ GFile* file,
+ DirectPhoto* * photo,
+ gboolean reimport);
+gboolean data_source_equals (DataSource* self,
+ DataSource* source);
GType direct_view_get_type (void) G_GNUC_CONST;
DirectView* direct_view_new (DirectPhoto* source);
-DirectView* direct_view_construct (GType object_type, DirectPhoto* source);
-gboolean data_collection_add (DataCollection* self, DataObject* object);
-void direct_photo_source_collection_reimport_photo (DirectPhotoSourceCollection* self, DirectPhoto* photo);
+DirectView* direct_view_construct (GType object_type,
+ DirectPhoto* source);
+gboolean data_collection_add (DataCollection* self,
+ DataObject* object);
+void direct_photo_source_collection_reimport_photo (DirectPhotoSourceCollection* self,
+ DirectPhoto* photo);
GType export_dialog_get_type (void) G_GNUC_CONST;
ExportDialog* export_dialog_new (const gchar* title);
-ExportDialog* export_dialog_construct (GType object_type, const gchar* title);
+ExportDialog* export_dialog_construct (GType object_type,
+ const gchar* title);
GType export_format_parameters_get_type (void) G_GNUC_CONST;
GType export_format_mode_get_type (void) G_GNUC_CONST;
ExportFormatParameters* export_format_parameters_dup (const ExportFormatParameters* self);
void export_format_parameters_free (ExportFormatParameters* self);
void export_format_parameters_last (ExportFormatParameters* result);
-gboolean export_dialog_execute (ExportDialog* self, gint* scale, ScaleConstraint* constraint, ExportFormatParameters* parameters);
-gchar* photo_get_export_basename_for_parameters (Photo* self, ExportFormatParameters* params);
-PhotoFileFormat photo_get_export_format_for_parameters (Photo* self, ExportFormatParameters* params);
+gboolean export_dialog_execute (ExportDialog* self,
+ gint* scale,
+ ScaleConstraint* constraint,
+ ExportFormatParameters* parameters);
+gchar* photo_get_export_basename_for_parameters (Photo* self,
+ ExportFormatParameters* params);
+PhotoFileFormat photo_get_export_format_for_parameters (Photo* self,
+ ExportFormatParameters* params);
gpointer photo_file_format_properties_ref (gpointer instance);
void photo_file_format_properties_unref (gpointer instance);
-GParamSpec* param_spec_photo_file_format_properties (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags);
-void value_set_photo_file_format_properties (GValue* value, gpointer v_object);
-void value_take_photo_file_format_properties (GValue* value, gpointer v_object);
+GParamSpec* param_spec_photo_file_format_properties (const gchar* name,
+ const gchar* nick,
+ const gchar* blurb,
+ GType object_type,
+ GParamFlags flags);
+void value_set_photo_file_format_properties (GValue* value,
+ gpointer v_object);
+void value_take_photo_file_format_properties (GValue* value,
+ gpointer v_object);
gpointer value_get_photo_file_format_properties (const GValue* value);
GType photo_file_format_properties_get_type (void) G_GNUC_CONST;
PhotoFileFormatProperties* photo_file_format_get_properties (PhotoFileFormat self);
-gchar** photo_file_format_properties_get_known_extensions (PhotoFileFormatProperties* self, int* result_length1);
+gchar** photo_file_format_properties_get_known_extensions (PhotoFileFormatProperties* self,
+ int* result_length1);
GType app_window_get_type (void) G_GNUC_CONST;
AppWindow* app_window_get_instance (void);
#define RESOURCES_CANCEL_LABEL _ ("_Cancel")
#define RESOURCES_OK_LABEL _ ("_OK")
void desktop_integration_send_to (GeeCollection* media);
GeeList* view_collection_get_selected_sources (ViewCollection* self);
-static gboolean direct_photo_page_real_on_app_key_pressed (Page* base, GdkEventKey* event);
-void page_activate_action (Page* self, const gchar* name);
-gboolean page_on_app_key_pressed (Page* self, GdkEventKey* event);
+static gboolean direct_photo_page_real_on_app_key_pressed (Page* base,
+ GdkEventKey* event);
+void page_activate_action (Page* self,
+ const gchar* name);
+gboolean page_on_app_key_pressed (Page* self,
+ GdkEventKey* event);
gint view_collection_get_selected_count (ViewCollection* self);
gpointer print_manager_ref (gpointer instance);
void print_manager_unref (gpointer instance);
-GParamSpec* param_spec_print_manager (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags);
-void value_set_print_manager (GValue* value, gpointer v_object);
-void value_take_print_manager (GValue* value, gpointer v_object);
+GParamSpec* param_spec_print_manager (const gchar* name,
+ const gchar* nick,
+ const gchar* blurb,
+ GType object_type,
+ GParamFlags flags);
+void value_set_print_manager (GValue* value,
+ gpointer v_object);
+void value_take_print_manager (GValue* value,
+ gpointer v_object);
gpointer value_get_print_manager (const GValue* value);
GType print_manager_get_type (void) G_GNUC_CONST;
PrintManager* print_manager_get_instance (void);
-void print_manager_spool_photo (PrintManager* self, GeeCollection* to_print);
-GeeList* view_collection_get_selected_sources_of_type (ViewCollection* self, GType t);
+void print_manager_spool_photo (PrintManager* self,
+ GeeCollection* to_print);
+GeeList* view_collection_get_selected_sources_of_type (ViewCollection* self,
+ GType t);
static Block7Data* block7_data_ref (Block7Data* _data7_);
static void block7_data_unref (void * _userdata_);
static gboolean __lambda17_ (Block7Data* _data7_);
-void editing_host_page_enable_rotate (EditingHostPage* self, gboolean should_enable);
+void editing_host_page_enable_rotate (EditingHostPage* self,
+ gboolean should_enable);
static gboolean ___lambda17__gsource_func (gpointer self);
-static DataView* direct_photo_page_real_create_photo_view (EditingHostPage* base, DataSource* source);
+static DataView* direct_photo_page_real_create_photo_view (EditingHostPage* base,
+ DataSource* source);
static void direct_photo_page_finalize (GObject * obj);
GType direct_fullscreen_photo_page_get_type (void) G_GNUC_CONST;
-enum {
- DIRECT_FULLSCREEN_PHOTO_PAGE_DUMMY_PROPERTY
-};
DirectFullscreenPhotoPage* direct_fullscreen_photo_page_new (GFile* file);
-DirectFullscreenPhotoPage* direct_fullscreen_photo_page_construct (GType object_type, GFile* file);
-static void direct_fullscreen_photo_page_real_init_collect_ui_filenames (Page* base, GeeList* ui_filenames);
-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);
+DirectFullscreenPhotoPage* direct_fullscreen_photo_page_construct (GType object_type,
+ GFile* file);
+static void direct_fullscreen_photo_page_real_init_collect_ui_filenames (Page* base,
+ GeeList* ui_filenames);
+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 const GActionEntry DIRECT_PHOTO_PAGE_entries[23] = {{"Save", _direct_photo_page_on_save_gsimple_action_activate_callback}, {"SaveAs", _direct_photo_page_on_save_as_gsimple_action_activate_callback}, {"SendTo", _direct_photo_page_on_send_to_gsimple_action_activate_callback}, {"Print", _direct_photo_page_on_print_gsimple_action_activate_callback}, {"PrevPhoto", _single_photo_page_on_previous_photo_gsimple_action_activate_callback}, {"NextPhoto", _single_photo_page_on_next_photo_gsimple_action_activate_callback}, {"RotateClockwise", _editing_host_page_on_rotate_clockwise_gsimple_action_activate_callback}, {"RotateCounterclockwise", _editing_host_page_on_rotate_counterclockwise_gsimple_action_activate_callback}, {"FlipHorizontally", _editing_host_page_on_flip_horizontally_gsimple_action_activate_callback}, {"FlipVertically", _editing_host_page_on_flip_vertically_gsimple_action_activate_callback}, {"Enhance", _editing_host_page_on_enhance_gsimple_action_activate_callback}, {"Crop", _editing_host_page_toggle_crop_gsimple_action_activate_callback}, {"Straighten", _editing_host_page_toggle_straighten_gsimple_action_activate_callback}, {"RedEye", _editing_host_page_toggle_redeye_gsimple_action_activate_callback}, {"Adjust", _editing_host_page_toggle_adjust_gsimple_action_activate_callback}, {"Revert", _editing_host_page_on_revert_gsimple_action_activate_callback}, {"AdjustDateTime", _editing_host_page_on_adjust_date_time_gsimple_action_activate_callback}, {"SetBackground", _editing_host_page_on_set_background_gsimple_action_activate_callback}, {"IncreaseSize", _editing_host_page_on_increase_size_gsimple_action_activate_callback}, {"DecreaseSize", _editing_host_page_on_decrease_size_gsimple_action_activate_callback}, {"ZoomFit", _editing_host_page_snap_zoom_to_min_gsimple_action_activate_callback}, {"Zoom100", _editing_host_page_snap_zoom_to_isomorphic_gsimple_action_activate_callback}, {"Zoom200", _editing_host_page_snap_zoom_to_max_gsimple_action_activate_callback}};
-static void _direct_photo_page_on_photos_altered_data_collection_items_altered (DataCollection* _sender, GeeMap* items, gpointer self) {
+static void
+_direct_photo_page_on_photos_altered_data_collection_items_altered (DataCollection* _sender,
+ GeeMap* items,
+ gpointer self)
+{
#line 32 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
direct_photo_page_on_photos_altered ((DirectPhotoPage*) self, items);
-#line 870 "DirectPhotoPage.c"
+#line 1069 "DirectPhotoPage.c"
}
-static void _direct_photo_page_on_save_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self) {
+static void
+_direct_photo_page_on_save_gsimple_action_activate_callback (GSimpleAction* action,
+ GVariant* parameter,
+ gpointer self)
+{
#line 42 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
direct_photo_page_on_save ((DirectPhotoPage*) self);
-#line 877 "DirectPhotoPage.c"
+#line 1080 "DirectPhotoPage.c"
}
-static void _direct_photo_page_on_save_as_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self) {
+static void
+_direct_photo_page_on_save_as_gsimple_action_activate_callback (GSimpleAction* action,
+ GVariant* parameter,
+ gpointer self)
+{
#line 42 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
direct_photo_page_on_save_as ((DirectPhotoPage*) self);
-#line 884 "DirectPhotoPage.c"
+#line 1091 "DirectPhotoPage.c"
}
-static void _direct_photo_page_on_send_to_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self) {
+static void
+_direct_photo_page_on_send_to_gsimple_action_activate_callback (GSimpleAction* action,
+ GVariant* parameter,
+ gpointer self)
+{
#line 42 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
direct_photo_page_on_send_to ((DirectPhotoPage*) self);
-#line 891 "DirectPhotoPage.c"
+#line 1102 "DirectPhotoPage.c"
}
-static void _direct_photo_page_on_print_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self) {
+static void
+_direct_photo_page_on_print_gsimple_action_activate_callback (GSimpleAction* action,
+ GVariant* parameter,
+ gpointer self)
+{
#line 42 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
direct_photo_page_on_print ((DirectPhotoPage*) self);
-#line 898 "DirectPhotoPage.c"
+#line 1113 "DirectPhotoPage.c"
}
-static void _single_photo_page_on_previous_photo_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self) {
+static void
+_single_photo_page_on_previous_photo_gsimple_action_activate_callback (GSimpleAction* action,
+ GVariant* parameter,
+ gpointer self)
+{
#line 42 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
single_photo_page_on_previous_photo ((SinglePhotoPage*) self);
-#line 905 "DirectPhotoPage.c"
+#line 1124 "DirectPhotoPage.c"
}
-static void _single_photo_page_on_next_photo_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self) {
+static void
+_single_photo_page_on_next_photo_gsimple_action_activate_callback (GSimpleAction* action,
+ GVariant* parameter,
+ gpointer self)
+{
#line 42 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
single_photo_page_on_next_photo ((SinglePhotoPage*) self);
-#line 912 "DirectPhotoPage.c"
+#line 1135 "DirectPhotoPage.c"
}
-static void _editing_host_page_on_rotate_clockwise_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self) {
+static void
+_editing_host_page_on_rotate_clockwise_gsimple_action_activate_callback (GSimpleAction* action,
+ GVariant* parameter,
+ gpointer self)
+{
#line 42 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
editing_host_page_on_rotate_clockwise ((EditingHostPage*) self);
-#line 919 "DirectPhotoPage.c"
+#line 1146 "DirectPhotoPage.c"
}
-static void _editing_host_page_on_rotate_counterclockwise_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self) {
+static void
+_editing_host_page_on_rotate_counterclockwise_gsimple_action_activate_callback (GSimpleAction* action,
+ GVariant* parameter,
+ gpointer self)
+{
#line 42 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
editing_host_page_on_rotate_counterclockwise ((EditingHostPage*) self);
-#line 926 "DirectPhotoPage.c"
+#line 1157 "DirectPhotoPage.c"
}
-static void _editing_host_page_on_flip_horizontally_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self) {
+static void
+_editing_host_page_on_flip_horizontally_gsimple_action_activate_callback (GSimpleAction* action,
+ GVariant* parameter,
+ gpointer self)
+{
#line 42 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
editing_host_page_on_flip_horizontally ((EditingHostPage*) self);
-#line 933 "DirectPhotoPage.c"
+#line 1168 "DirectPhotoPage.c"
}
-static void _editing_host_page_on_flip_vertically_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self) {
+static void
+_editing_host_page_on_flip_vertically_gsimple_action_activate_callback (GSimpleAction* action,
+ GVariant* parameter,
+ gpointer self)
+{
#line 42 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
editing_host_page_on_flip_vertically ((EditingHostPage*) self);
-#line 940 "DirectPhotoPage.c"
+#line 1179 "DirectPhotoPage.c"
}
-static void _editing_host_page_on_enhance_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self) {
+static void
+_editing_host_page_on_enhance_gsimple_action_activate_callback (GSimpleAction* action,
+ GVariant* parameter,
+ gpointer self)
+{
#line 42 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
editing_host_page_on_enhance ((EditingHostPage*) self);
-#line 947 "DirectPhotoPage.c"
+#line 1190 "DirectPhotoPage.c"
}
-static void _editing_host_page_toggle_crop_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self) {
+static void
+_editing_host_page_toggle_crop_gsimple_action_activate_callback (GSimpleAction* action,
+ GVariant* parameter,
+ gpointer self)
+{
#line 42 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
editing_host_page_toggle_crop ((EditingHostPage*) self);
-#line 954 "DirectPhotoPage.c"
+#line 1201 "DirectPhotoPage.c"
}
-static void _editing_host_page_toggle_straighten_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self) {
+static void
+_editing_host_page_toggle_straighten_gsimple_action_activate_callback (GSimpleAction* action,
+ GVariant* parameter,
+ gpointer self)
+{
#line 42 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
editing_host_page_toggle_straighten ((EditingHostPage*) self);
-#line 961 "DirectPhotoPage.c"
+#line 1212 "DirectPhotoPage.c"
}
-static void _editing_host_page_toggle_redeye_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self) {
+static void
+_editing_host_page_toggle_redeye_gsimple_action_activate_callback (GSimpleAction* action,
+ GVariant* parameter,
+ gpointer self)
+{
#line 42 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
editing_host_page_toggle_redeye ((EditingHostPage*) self);
-#line 968 "DirectPhotoPage.c"
+#line 1223 "DirectPhotoPage.c"
}
-static void _editing_host_page_toggle_adjust_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self) {
+static void
+_editing_host_page_toggle_adjust_gsimple_action_activate_callback (GSimpleAction* action,
+ GVariant* parameter,
+ gpointer self)
+{
#line 42 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
editing_host_page_toggle_adjust ((EditingHostPage*) self);
-#line 975 "DirectPhotoPage.c"
+#line 1234 "DirectPhotoPage.c"
}
-static void _editing_host_page_on_revert_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self) {
+static void
+_editing_host_page_on_revert_gsimple_action_activate_callback (GSimpleAction* action,
+ GVariant* parameter,
+ gpointer self)
+{
#line 42 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
editing_host_page_on_revert ((EditingHostPage*) self);
-#line 982 "DirectPhotoPage.c"
+#line 1245 "DirectPhotoPage.c"
}
-static void _editing_host_page_on_adjust_date_time_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self) {
+static void
+_editing_host_page_on_adjust_date_time_gsimple_action_activate_callback (GSimpleAction* action,
+ GVariant* parameter,
+ gpointer self)
+{
#line 42 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
editing_host_page_on_adjust_date_time ((EditingHostPage*) self);
-#line 989 "DirectPhotoPage.c"
+#line 1256 "DirectPhotoPage.c"
}
-static void _editing_host_page_on_set_background_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self) {
+static void
+_editing_host_page_on_set_background_gsimple_action_activate_callback (GSimpleAction* action,
+ GVariant* parameter,
+ gpointer self)
+{
#line 42 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
editing_host_page_on_set_background ((EditingHostPage*) self);
-#line 996 "DirectPhotoPage.c"
+#line 1267 "DirectPhotoPage.c"
}
-static void _editing_host_page_on_increase_size_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self) {
+static void
+_editing_host_page_on_increase_size_gsimple_action_activate_callback (GSimpleAction* action,
+ GVariant* parameter,
+ gpointer self)
+{
#line 42 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
editing_host_page_on_increase_size ((EditingHostPage*) self);
-#line 1003 "DirectPhotoPage.c"
+#line 1278 "DirectPhotoPage.c"
}
-static void _editing_host_page_on_decrease_size_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self) {
+static void
+_editing_host_page_on_decrease_size_gsimple_action_activate_callback (GSimpleAction* action,
+ GVariant* parameter,
+ gpointer self)
+{
#line 42 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
editing_host_page_on_decrease_size ((EditingHostPage*) self);
-#line 1010 "DirectPhotoPage.c"
+#line 1289 "DirectPhotoPage.c"
}
-static void _editing_host_page_snap_zoom_to_min_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self) {
+static void
+_editing_host_page_snap_zoom_to_min_gsimple_action_activate_callback (GSimpleAction* action,
+ GVariant* parameter,
+ gpointer self)
+{
#line 42 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
editing_host_page_snap_zoom_to_min ((EditingHostPage*) self);
-#line 1017 "DirectPhotoPage.c"
+#line 1300 "DirectPhotoPage.c"
}
-static void _editing_host_page_snap_zoom_to_isomorphic_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self) {
+static void
+_editing_host_page_snap_zoom_to_isomorphic_gsimple_action_activate_callback (GSimpleAction* action,
+ GVariant* parameter,
+ gpointer self)
+{
#line 42 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
editing_host_page_snap_zoom_to_isomorphic ((EditingHostPage*) self);
-#line 1024 "DirectPhotoPage.c"
+#line 1311 "DirectPhotoPage.c"
}
-static void _editing_host_page_snap_zoom_to_max_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self) {
+static void
+_editing_host_page_snap_zoom_to_max_gsimple_action_activate_callback (GSimpleAction* action,
+ GVariant* parameter,
+ gpointer self)
+{
#line 42 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
editing_host_page_snap_zoom_to_max ((EditingHostPage*) self);
-#line 1031 "DirectPhotoPage.c"
+#line 1322 "DirectPhotoPage.c"
}
-static gpointer _g_object_ref0 (gpointer self) {
+static gpointer
+_g_object_ref0 (gpointer self)
+{
#line 22 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
return self ? g_object_ref (self) : NULL;
-#line 1038 "DirectPhotoPage.c"
+#line 1331 "DirectPhotoPage.c"
}
-static void _direct_photo_page_on_selection_group_altered_view_collection_selection_group_altered (ViewCollection* _sender, gpointer self) {
+static void
+_direct_photo_page_on_selection_group_altered_view_collection_selection_group_altered (ViewCollection* _sender,
+ gpointer self)
+{
#line 28 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
direct_photo_page_on_selection_group_altered ((DirectPhotoPage*) self);
-#line 1045 "DirectPhotoPage.c"
+#line 1341 "DirectPhotoPage.c"
}
-DirectPhotoPage* direct_photo_page_construct (GType object_type, GFile* file) {
+DirectPhotoPage*
+direct_photo_page_construct (GType object_type,
+ GFile* file)
+{
DirectPhotoPage * self = NULL;
DirectPhotoSourceCollection* _tmp0_;
- GFile* _tmp1_;
+ gchar* _tmp1_;
gchar* _tmp2_;
- gchar* _tmp3_;
- GFile* _tmp4_;
- gboolean _tmp5_;
- GFile* _tmp8_;
- GFile* _tmp9_;
- DirectViewCollection* _tmp10_;
- GFile* _tmp11_;
- GFile* _tmp12_;
- DirectPhotoSourceCollection* _tmp13_;
- ViewCollection* _tmp14_;
- ViewCollection* _tmp15_;
+ GFile* _tmp5_;
+ DirectViewCollection* _tmp6_;
+ GFile* _tmp7_;
+ DirectPhotoSourceCollection* _tmp8_;
+ ViewCollection* _tmp9_;
+ ViewCollection* _tmp10_;
#line 13 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
g_return_val_if_fail (G_IS_FILE (file), NULL);
#line 14 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
_tmp0_ = direct_photo_global;
#line 14 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
- _tmp1_ = file;
-#line 14 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
- _tmp2_ = g_file_get_basename (_tmp1_);
+ _tmp1_ = g_file_get_basename (file);
#line 14 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
- _tmp3_ = _tmp2_;
+ _tmp2_ = _tmp1_;
#line 14 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
- self = (DirectPhotoPage*) editing_host_page_construct (object_type, G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, TYPE_SOURCE_COLLECTION, SourceCollection), _tmp3_);
+ self = (DirectPhotoPage*) editing_host_page_construct (object_type, G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, TYPE_SOURCE_COLLECTION, SourceCollection), _tmp2_);
#line 14 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
- _g_free0 (_tmp3_);
-#line 16 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
- _tmp4_ = file;
-#line 16 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
- _tmp5_ = direct_photo_page_check_editable_file (_tmp4_);
+ _g_free0 (_tmp2_);
#line 16 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
- if (!_tmp5_) {
-#line 1085 "DirectPhotoPage.c"
- Application* _tmp6_;
- Application* _tmp7_;
+ if (!direct_photo_page_check_editable_file (file)) {
+#line 1373 "DirectPhotoPage.c"
+ Application* _tmp3_;
+ Application* _tmp4_;
#line 17 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
- _tmp6_ = application_get_instance ();
+ _tmp3_ = application_get_instance ();
#line 17 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
- _tmp7_ = _tmp6_;
+ _tmp4_ = _tmp3_;
#line 17 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
- application_panic (_tmp7_);
+ application_panic (_tmp4_);
#line 17 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
- _application_unref0 (_tmp7_);
+ _application_unref0 (_tmp4_);
#line 19 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
return self;
-#line 1098 "DirectPhotoPage.c"
+#line 1386 "DirectPhotoPage.c"
}
#line 22 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
- _tmp8_ = file;
-#line 22 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
- _tmp9_ = _g_object_ref0 (_tmp8_);
+ _tmp5_ = _g_object_ref0 (file);
#line 22 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
_g_object_unref0 (self->priv->initial_file);
#line 22 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
- self->priv->initial_file = _tmp9_;
+ self->priv->initial_file = _tmp5_;
#line 23 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
- _tmp10_ = direct_view_collection_new ();
+ _tmp6_ = direct_view_collection_new ();
#line 23 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
_data_collection_unref0 (self->priv->view_controller);
#line 23 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
- self->priv->view_controller = _tmp10_;
-#line 24 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
- _tmp11_ = file;
+ self->priv->view_controller = _tmp6_;
#line 24 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
- _tmp12_ = g_file_get_parent (_tmp11_);
+ _tmp7_ = g_file_get_parent (file);
#line 24 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
_g_object_unref0 (self->priv->current_save_dir);
#line 24 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
- self->priv->current_save_dir = _tmp12_;
+ self->priv->current_save_dir = _tmp7_;
#line 26 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
- _tmp13_ = direct_photo_global;
+ _tmp8_ = direct_photo_global;
#line 26 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
- g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp13_, TYPE_DATA_COLLECTION, DataCollection), "items-altered", (GCallback) _direct_photo_page_on_photos_altered_data_collection_items_altered, self, 0);
+ g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, TYPE_DATA_COLLECTION, DataCollection), "items-altered", (GCallback) _direct_photo_page_on_photos_altered_data_collection_items_altered, self, 0);
#line 28 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
- _tmp14_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
+ _tmp9_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
#line 28 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
- _tmp15_ = _tmp14_;
+ _tmp10_ = _tmp9_;
#line 28 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
- g_signal_connect_object (_tmp15_, "selection-group-altered", (GCallback) _direct_photo_page_on_selection_group_altered_view_collection_selection_group_altered, self, 0);
+ g_signal_connect_object (_tmp10_, "selection-group-altered", (GCallback) _direct_photo_page_on_selection_group_altered_view_collection_selection_group_altered, self, 0);
#line 28 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
- _data_collection_unref0 (_tmp15_);
+ _data_collection_unref0 (_tmp10_);
#line 13 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
return self;
-#line 1136 "DirectPhotoPage.c"
+#line 1420 "DirectPhotoPage.c"
}
-DirectPhotoPage* direct_photo_page_new (GFile* file) {
+DirectPhotoPage*
+direct_photo_page_new (GFile* file)
+{
#line 13 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
return direct_photo_page_construct (TYPE_DIRECT_PHOTO_PAGE, file);
-#line 1143 "DirectPhotoPage.c"
+#line 1429 "DirectPhotoPage.c"
}
-static void direct_photo_page_real_init_collect_ui_filenames (Page* base, GeeList* ui_filenames) {
+static void
+direct_photo_page_real_init_collect_ui_filenames (Page* base,
+ GeeList* ui_filenames)
+{
DirectPhotoPage * self;
- GeeList* _tmp0_;
- GeeList* _tmp1_;
- GeeList* _tmp2_;
#line 35 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_DIRECT_PHOTO_PAGE, DirectPhotoPage);
#line 35 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
g_return_if_fail (GEE_IS_LIST (ui_filenames));
#line 36 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
- _tmp0_ = ui_filenames;
-#line 36 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
- PAGE_CLASS (direct_photo_page_parent_class)->init_collect_ui_filenames (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage), TYPE_PAGE, Page), _tmp0_);
+ PAGE_CLASS (direct_photo_page_parent_class)->init_collect_ui_filenames (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage), TYPE_PAGE, Page), ui_filenames);
#line 38 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
- _tmp1_ = ui_filenames;
-#line 38 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
- gee_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, GEE_TYPE_COLLECTION, GeeCollection), "direct_context.ui");
-#line 39 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
- _tmp2_ = ui_filenames;
+ gee_collection_add (G_TYPE_CHECK_INSTANCE_CAST (ui_filenames, GEE_TYPE_COLLECTION, GeeCollection), "direct_context.ui");
#line 39 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
- gee_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, GEE_TYPE_COLLECTION, GeeCollection), "direct.ui");
-#line 1168 "DirectPhotoPage.c"
+ gee_collection_add (G_TYPE_CHECK_INSTANCE_CAST (ui_filenames, GEE_TYPE_COLLECTION, GeeCollection), "direct.ui");
+#line 1448 "DirectPhotoPage.c"
}
-static void direct_photo_page_real_add_actions (Page* base, GActionMap* map) {
+static void
+direct_photo_page_real_add_actions (Page* base,
+ GActionMap* map)
+{
DirectPhotoPage * self;
- GActionMap* _tmp0_;
- GActionMap* _tmp1_;
#line 68 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_DIRECT_PHOTO_PAGE, DirectPhotoPage);
#line 68 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
g_return_if_fail (G_IS_ACTION_MAP (map));
#line 69 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
- _tmp0_ = map;
-#line 69 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
- PAGE_CLASS (direct_photo_page_parent_class)->add_actions (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage), TYPE_PAGE, Page), _tmp0_);
-#line 71 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
- _tmp1_ = map;
+ PAGE_CLASS (direct_photo_page_parent_class)->add_actions (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage), TYPE_PAGE, Page), map);
#line 71 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
- g_action_map_add_action_entries (_tmp1_, DIRECT_PHOTO_PAGE_entries, G_N_ELEMENTS (DIRECT_PHOTO_PAGE_entries), self);
-#line 1188 "DirectPhotoPage.c"
+ g_action_map_add_action_entries (map, DIRECT_PHOTO_PAGE_entries, G_N_ELEMENTS (DIRECT_PHOTO_PAGE_entries), self);
+#line 1465 "DirectPhotoPage.c"
}
-static void direct_photo_page_real_remove_actions (Page* base, GActionMap* map) {
+static void
+direct_photo_page_real_remove_actions (Page* base,
+ GActionMap* map)
+{
DirectPhotoPage * self;
- GActionMap* _tmp0_;
#line 74 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_DIRECT_PHOTO_PAGE, DirectPhotoPage);
#line 74 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
g_return_if_fail (G_IS_ACTION_MAP (map));
#line 75 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
- _tmp0_ = map;
-#line 75 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
- PAGE_CLASS (direct_photo_page_parent_class)->remove_actions (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage), TYPE_PAGE, Page), _tmp0_);
-#line 1203 "DirectPhotoPage.c"
+ PAGE_CLASS (direct_photo_page_parent_class)->remove_actions (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage), TYPE_PAGE, Page), map);
+#line 1480 "DirectPhotoPage.c"
{
GActionEntry* entry_collection = NULL;
gint entry_collection_length1 = 0;
@@ -1211,72 +1488,84 @@ static void direct_photo_page_real_remove_actions (Page* base, GActionMap* map)
entry_collection_length1 = G_N_ELEMENTS (DIRECT_PHOTO_PAGE_entries);
#line 76 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
for (entry_it = 0; entry_it < G_N_ELEMENTS (DIRECT_PHOTO_PAGE_entries); entry_it = entry_it + 1) {
-#line 1215 "DirectPhotoPage.c"
+#line 1492 "DirectPhotoPage.c"
GActionEntry entry = {0};
#line 76 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
entry = entry_collection[entry_it];
-#line 1219 "DirectPhotoPage.c"
+#line 1496 "DirectPhotoPage.c"
{
- GActionMap* _tmp1_;
- GActionEntry _tmp2_;
- const gchar* _tmp3_;
-#line 77 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
- _tmp1_ = map;
+ GActionEntry _tmp0_;
+ const gchar* _tmp1_;
#line 77 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
- _tmp2_ = entry;
+ _tmp0_ = entry;
#line 77 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
- _tmp3_ = _tmp2_.name;
+ _tmp1_ = _tmp0_.name;
#line 77 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
- g_action_map_remove_action (_tmp1_, _tmp3_);
-#line 1232 "DirectPhotoPage.c"
+ g_action_map_remove_action (map, _tmp1_);
+#line 1506 "DirectPhotoPage.c"
}
}
}
}
-static gpointer _injection_group_ref0 (gpointer self) {
+static gpointer
+_injection_group_ref0 (gpointer self)
+{
#line 87 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
return self ? injection_group_ref (self) : NULL;
-#line 1242 "DirectPhotoPage.c"
+#line 1518 "DirectPhotoPage.c"
}
-static void _vala_array_add64 (InjectionGroup** * array, int* length, int* size, InjectionGroup* value) {
+static void
+_vala_array_add64 (InjectionGroup** * array,
+ int* length,
+ int* size,
+ InjectionGroup* value)
+{
#line 87 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
if ((*length) == (*size)) {
#line 87 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
*size = (*size) ? (2 * (*size)) : 4;
#line 87 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
*array = g_renew (InjectionGroup*, *array, (*size) + 1);
-#line 1253 "DirectPhotoPage.c"
+#line 1534 "DirectPhotoPage.c"
}
#line 87 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
(*array)[(*length)++] = value;
#line 87 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
(*array)[*length] = NULL;
-#line 1259 "DirectPhotoPage.c"
+#line 1540 "DirectPhotoPage.c"
}
-static void _vala_array_add65 (InjectionGroup** * array, int* length, int* size, InjectionGroup* value) {
+static void
+_vala_array_add65 (InjectionGroup** * array,
+ int* length,
+ int* size,
+ InjectionGroup* value)
+{
#line 92 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
if ((*length) == (*size)) {
#line 92 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
*size = (*size) ? (2 * (*size)) : 4;
#line 92 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
*array = g_renew (InjectionGroup*, *array, (*size) + 1);
-#line 1270 "DirectPhotoPage.c"
+#line 1556 "DirectPhotoPage.c"
}
#line 92 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
(*array)[(*length)++] = value;
#line 92 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
(*array)[*length] = NULL;
-#line 1276 "DirectPhotoPage.c"
+#line 1562 "DirectPhotoPage.c"
}
-static InjectionGroup** direct_photo_page_real_init_collect_injection_groups (Page* base, int* result_length1) {
+static InjectionGroup**
+direct_photo_page_real_init_collect_injection_groups (Page* base,
+ int* result_length1)
+{
DirectPhotoPage * self;
InjectionGroup** result = NULL;
InjectionGroup** groups = NULL;
@@ -1342,7 +1631,7 @@ static InjectionGroup** direct_photo_page_real_init_collect_injection_groups (Pa
if (result_length1) {
#line 94 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
*result_length1 = _tmp8__length1;
-#line 1346 "DirectPhotoPage.c"
+#line 1635 "DirectPhotoPage.c"
}
#line 94 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
result = _tmp8_;
@@ -1352,137 +1641,112 @@ static InjectionGroup** direct_photo_page_real_init_collect_injection_groups (Pa
_injection_group_unref0 (print_group);
#line 94 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
return result;
-#line 1356 "DirectPhotoPage.c"
+#line 1645 "DirectPhotoPage.c"
}
-static gboolean direct_photo_page_check_editable_file (GFile* file) {
+static gboolean
+direct_photo_page_check_editable_file (GFile* file)
+{
gboolean result = FALSE;
- GFile* _tmp0_;
+ gchar* _tmp0_;
gchar* _tmp1_;
- gchar* _tmp2_;
- gboolean _tmp3_;
- gboolean _tmp4_;
+ gboolean _tmp2_;
#line 97 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
g_return_val_if_fail (G_IS_FILE (file), FALSE);
#line 98 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
- _tmp0_ = file;
-#line 98 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
- _tmp1_ = g_file_get_path (_tmp0_);
+ _tmp0_ = g_file_get_path (file);
#line 98 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
- _tmp2_ = _tmp1_;
+ _tmp1_ = _tmp0_;
#line 98 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
- _tmp3_ = g_file_test (_tmp2_, G_FILE_TEST_EXISTS);
+ _tmp2_ = !g_file_test (_tmp1_, G_FILE_TEST_EXISTS);
#line 98 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
- _tmp4_ = !_tmp3_;
+ _g_free0 (_tmp1_);
#line 98 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
- _g_free0 (_tmp2_);
-#line 98 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
- if (_tmp4_) {
-#line 1383 "DirectPhotoPage.c"
- GFile* _tmp5_;
+ if (_tmp2_) {
+#line 1668 "DirectPhotoPage.c"
+ gchar* _tmp3_;
+ gchar* _tmp4_;
+ gchar* _tmp5_;
gchar* _tmp6_;
- gchar* _tmp7_;
- gchar* _tmp8_;
- gchar* _tmp9_;
-#line 99 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
- _tmp5_ = file;
#line 99 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
- _tmp6_ = g_file_get_path (_tmp5_);
+ _tmp3_ = g_file_get_path (file);
#line 99 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
- _tmp7_ = _tmp6_;
+ _tmp4_ = _tmp3_;
#line 99 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
- _tmp8_ = g_strdup_printf (_ ("%s does not exist."), _tmp7_);
+ _tmp5_ = g_strdup_printf (_ ("%s does not exist."), _tmp4_);
#line 99 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
- _tmp9_ = _tmp8_;
+ _tmp6_ = _tmp5_;
#line 99 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
- app_window_error_message (_tmp9_, NULL);
+ app_window_error_message (_tmp6_, NULL);
#line 99 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
- _g_free0 (_tmp9_);
+ _g_free0 (_tmp6_);
#line 99 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
- _g_free0 (_tmp7_);
-#line 1405 "DirectPhotoPage.c"
+ _g_free0 (_tmp4_);
+#line 1687 "DirectPhotoPage.c"
} else {
- GFile* _tmp10_;
- gchar* _tmp11_;
- gchar* _tmp12_;
- gboolean _tmp13_;
- gboolean _tmp14_;
-#line 100 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
- _tmp10_ = file;
-#line 100 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
- _tmp11_ = g_file_get_path (_tmp10_);
+ gchar* _tmp7_;
+ gchar* _tmp8_;
+ gboolean _tmp9_;
#line 100 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
- _tmp12_ = _tmp11_;
+ _tmp7_ = g_file_get_path (file);
#line 100 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
- _tmp13_ = g_file_test (_tmp12_, G_FILE_TEST_IS_REGULAR);
+ _tmp8_ = _tmp7_;
#line 100 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
- _tmp14_ = !_tmp13_;
+ _tmp9_ = !g_file_test (_tmp8_, G_FILE_TEST_IS_REGULAR);
#line 100 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
- _g_free0 (_tmp12_);
+ _g_free0 (_tmp8_);
#line 100 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
- if (_tmp14_) {
-#line 1426 "DirectPhotoPage.c"
- GFile* _tmp15_;
- gchar* _tmp16_;
- gchar* _tmp17_;
- gchar* _tmp18_;
- gchar* _tmp19_;
-#line 101 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
- _tmp15_ = file;
+ if (_tmp9_) {
+#line 1702 "DirectPhotoPage.c"
+ gchar* _tmp10_;
+ gchar* _tmp11_;
+ gchar* _tmp12_;
+ gchar* _tmp13_;
#line 101 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
- _tmp16_ = g_file_get_path (_tmp15_);
+ _tmp10_ = g_file_get_path (file);
#line 101 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
- _tmp17_ = _tmp16_;
+ _tmp11_ = _tmp10_;
#line 101 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
- _tmp18_ = g_strdup_printf (_ ("%s is not a file."), _tmp17_);
+ _tmp12_ = g_strdup_printf (_ ("%s is not a file."), _tmp11_);
#line 101 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
- _tmp19_ = _tmp18_;
+ _tmp13_ = _tmp12_;
#line 101 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
- app_window_error_message (_tmp19_, NULL);
+ app_window_error_message (_tmp13_, NULL);
#line 101 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
- _g_free0 (_tmp19_);
+ _g_free0 (_tmp13_);
#line 101 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
- _g_free0 (_tmp17_);
-#line 1448 "DirectPhotoPage.c"
+ _g_free0 (_tmp11_);
+#line 1721 "DirectPhotoPage.c"
} else {
- GFile* _tmp20_;
- gboolean _tmp21_;
-#line 102 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
- _tmp20_ = file;
-#line 102 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
- _tmp21_ = photo_file_format_is_file_supported (_tmp20_);
#line 102 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
- if (!_tmp21_) {
-#line 1458 "DirectPhotoPage.c"
- GFile* _tmp22_;
- gchar* _tmp23_;
- gchar* _tmp24_;
- gchar* _tmp25_;
- gchar* _tmp26_;
-#line 103 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
- _tmp22_ = file;
+ if (!photo_file_format_is_file_supported (file)) {
+#line 1725 "DirectPhotoPage.c"
+ gchar* _tmp14_;
+ gchar* _tmp15_;
+ gchar* _tmp16_;
+ gchar* _tmp17_;
#line 103 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
- _tmp23_ = g_file_get_path (_tmp22_);
+ _tmp14_ = g_file_get_path (file);
#line 103 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
- _tmp24_ = _tmp23_;
+ _tmp15_ = _tmp14_;
#line 103 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
- _tmp25_ = g_strdup_printf (_ ("%s does not support the file format of\n%s."), RESOURCES_APP_TITLE, _tmp24_);
+ _tmp16_ = g_strdup_printf (_ ("%s does not support the file format of\n%s."), RESOURCES_APP_TITLE, _tmp15_);
#line 103 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
- _tmp26_ = _tmp25_;
+ _tmp17_ = _tmp16_;
#line 103 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
- app_window_error_message (_tmp26_, NULL);
+ app_window_error_message (_tmp17_, NULL);
#line 103 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
- _g_free0 (_tmp26_);
+ _g_free0 (_tmp17_);
#line 103 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
- _g_free0 (_tmp24_);
-#line 1480 "DirectPhotoPage.c"
+ _g_free0 (_tmp15_);
+#line 1744 "DirectPhotoPage.c"
} else {
#line 106 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
result = TRUE;
#line 106 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
return result;
-#line 1486 "DirectPhotoPage.c"
+#line 1750 "DirectPhotoPage.c"
}
}
}
@@ -1490,11 +1754,13 @@ static gboolean direct_photo_page_check_editable_file (GFile* file) {
result = FALSE;
#line 108 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
return result;
-#line 1494 "DirectPhotoPage.c"
+#line 1758 "DirectPhotoPage.c"
}
-static void direct_photo_page_real_realize (GtkWidget* base) {
+static void
+direct_photo_page_real_realize (GtkWidget* base)
+{
DirectPhotoPage * self;
DirectPhoto* photo = NULL;
DirectPhotoSourceCollection* _tmp0_;
@@ -1507,7 +1773,7 @@ static void direct_photo_page_real_realize (GtkWidget* base) {
if (GTK_WIDGET_CLASS (direct_photo_page_parent_class)->realize != NULL) {
#line 113 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
GTK_WIDGET_CLASS (direct_photo_page_parent_class)->realize (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage), gtk_widget_get_type (), GtkWidget));
-#line 1511 "DirectPhotoPage.c"
+#line 1777 "DirectPhotoPage.c"
}
#line 115 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
_tmp0_ = direct_photo_global;
@@ -1521,7 +1787,7 @@ static void direct_photo_page_real_realize (GtkWidget* base) {
_tmp3_ = photo;
#line 117 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
if (_tmp3_ != NULL) {
-#line 1525 "DirectPhotoPage.c"
+#line 1791 "DirectPhotoPage.c"
DirectViewCollection* _tmp4_;
DirectPhoto* _tmp5_;
#line 118 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
@@ -1530,7 +1796,7 @@ static void direct_photo_page_real_realize (GtkWidget* base) {
_tmp5_ = photo;
#line 118 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
editing_host_page_display_mirror_of (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage), G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, TYPE_VIEW_COLLECTION, ViewCollection), G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, TYPE_PHOTO, Photo));
-#line 1534 "DirectPhotoPage.c"
+#line 1800 "DirectPhotoPage.c"
} else {
GFile* _tmp6_;
gchar* _tmp7_;
@@ -1553,7 +1819,7 @@ static void direct_photo_page_real_realize (GtkWidget* base) {
_g_free0 (_tmp10_);
#line 120 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
_g_free0 (_tmp8_);
-#line 1557 "DirectPhotoPage.c"
+#line 1823 "DirectPhotoPage.c"
}
#line 123 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
_g_object_unref0 (self->priv->initial_file);
@@ -1561,27 +1827,32 @@ static void direct_photo_page_real_realize (GtkWidget* base) {
self->priv->initial_file = NULL;
#line 111 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
_g_object_unref0 (photo);
-#line 1565 "DirectPhotoPage.c"
+#line 1831 "DirectPhotoPage.c"
}
-static void _direct_photo_page_on_dphoto_can_rotate_changed_direct_photo_can_rotate_changed (DirectPhoto* _sender, gboolean b, gpointer self) {
+static void
+_direct_photo_page_on_dphoto_can_rotate_changed_direct_photo_can_rotate_changed (DirectPhoto* _sender,
+ gboolean b,
+ gpointer self)
+{
#line 131 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
direct_photo_page_on_dphoto_can_rotate_changed ((DirectPhotoPage*) self, b);
-#line 1572 "DirectPhotoPage.c"
+#line 1842 "DirectPhotoPage.c"
}
-static void direct_photo_page_real_photo_changing (EditingHostPage* base, Photo* new_photo) {
+static void
+direct_photo_page_real_photo_changing (EditingHostPage* base,
+ Photo* new_photo)
+{
DirectPhotoPage * self;
Photo* _tmp0_;
Photo* _tmp1_;
gboolean _tmp2_;
- Photo* _tmp8_;
DirectPhoto* tmp = NULL;
- Photo* _tmp9_;
- DirectPhoto* _tmp10_;
- DirectPhoto* _tmp11_;
+ DirectPhoto* _tmp8_;
+ DirectPhoto* _tmp9_;
#line 126 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_DIRECT_PHOTO_PAGE, DirectPhotoPage);
#line 126 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
@@ -1596,7 +1867,7 @@ static void direct_photo_page_real_photo_changing (EditingHostPage* base, Photo*
_g_object_unref0 (_tmp1_);
#line 127 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
if (_tmp2_) {
-#line 1600 "DirectPhotoPage.c"
+#line 1871 "DirectPhotoPage.c"
DirectPhoto* tmp = NULL;
Photo* _tmp3_;
DirectPhoto* _tmp4_;
@@ -1609,7 +1880,7 @@ static void direct_photo_page_real_photo_changing (EditingHostPage* base, Photo*
if (_tmp4_ == NULL) {
#line 128 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
_g_object_unref0 (_tmp3_);
-#line 1613 "DirectPhotoPage.c"
+#line 1884 "DirectPhotoPage.c"
}
#line 128 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
tmp = _tmp4_;
@@ -1617,7 +1888,7 @@ static void direct_photo_page_real_photo_changing (EditingHostPage* base, Photo*
_tmp5_ = tmp;
#line 130 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
if (_tmp5_ != NULL) {
-#line 1621 "DirectPhotoPage.c"
+#line 1892 "DirectPhotoPage.c"
DirectPhoto* _tmp6_;
guint _tmp7_;
#line 131 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
@@ -1626,41 +1897,39 @@ static void direct_photo_page_real_photo_changing (EditingHostPage* base, Photo*
g_signal_parse_name ("can-rotate-changed", TYPE_DIRECT_PHOTO, &_tmp7_, NULL, FALSE);
#line 131 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
g_signal_handlers_disconnect_matched (_tmp6_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp7_, 0, NULL, (GCallback) _direct_photo_page_on_dphoto_can_rotate_changed_direct_photo_can_rotate_changed, self);
-#line 1630 "DirectPhotoPage.c"
+#line 1901 "DirectPhotoPage.c"
}
#line 127 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
_g_object_unref0 (tmp);
-#line 1634 "DirectPhotoPage.c"
+#line 1905 "DirectPhotoPage.c"
}
#line 135 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
- _tmp8_ = new_photo;
-#line 135 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
- direct_photo_demand_load (G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, TYPE_DIRECT_PHOTO, DirectPhoto));
-#line 137 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
- _tmp9_ = new_photo;
+ direct_photo_demand_load (G_TYPE_CHECK_INSTANCE_CAST (new_photo, TYPE_DIRECT_PHOTO, DirectPhoto));
#line 137 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
- _tmp10_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp9_, TYPE_DIRECT_PHOTO) ? ((DirectPhoto*) _tmp9_) : NULL);
+ _tmp8_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (new_photo, TYPE_DIRECT_PHOTO) ? ((DirectPhoto*) new_photo) : NULL);
#line 137 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
- tmp = _tmp10_;
+ tmp = _tmp8_;
#line 139 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
- _tmp11_ = tmp;
+ _tmp9_ = tmp;
#line 139 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
- if (_tmp11_ != NULL) {
-#line 1650 "DirectPhotoPage.c"
- DirectPhoto* _tmp12_;
+ if (_tmp9_ != NULL) {
+#line 1917 "DirectPhotoPage.c"
+ DirectPhoto* _tmp10_;
#line 140 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
- _tmp12_ = tmp;
+ _tmp10_ = tmp;
#line 140 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
- g_signal_connect_object (_tmp12_, "can-rotate-changed", (GCallback) _direct_photo_page_on_dphoto_can_rotate_changed_direct_photo_can_rotate_changed, self, 0);
-#line 1656 "DirectPhotoPage.c"
+ g_signal_connect_object (_tmp10_, "can-rotate-changed", (GCallback) _direct_photo_page_on_dphoto_can_rotate_changed_direct_photo_can_rotate_changed, self, 0);
+#line 1923 "DirectPhotoPage.c"
}
#line 126 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
_g_object_unref0 (tmp);
-#line 1660 "DirectPhotoPage.c"
+#line 1927 "DirectPhotoPage.c"
}
-GFile* direct_photo_page_get_current_file (DirectPhotoPage* self) {
+GFile*
+direct_photo_page_get_current_file (DirectPhotoPage* self)
+{
GFile* result = NULL;
Photo* _tmp0_;
Photo* _tmp1_;
@@ -1682,16 +1951,18 @@ GFile* direct_photo_page_get_current_file (DirectPhotoPage* self) {
result = _tmp3_;
#line 145 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
return result;
-#line 1686 "DirectPhotoPage.c"
+#line 1955 "DirectPhotoPage.c"
}
-static gboolean direct_photo_page_real_on_context_buttonpress (Page* base, GdkEventButton* event) {
+static gboolean
+direct_photo_page_real_on_context_buttonpress (Page* base,
+ GdkEventButton* event)
+{
DirectPhotoPage * self;
gboolean result = FALSE;
GtkMenu* _tmp0_;
GtkMenu* _tmp1_;
- GdkEventButton* _tmp2_;
#line 148 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_DIRECT_PHOTO_PAGE, DirectPhotoPage);
#line 148 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
@@ -1701,20 +1972,20 @@ static gboolean direct_photo_page_real_on_context_buttonpress (Page* base, GdkEv
#line 149 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
_tmp1_ = _tmp0_;
#line 149 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
- _tmp2_ = event;
-#line 149 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
- page_popup_context_menu (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), _tmp1_, _tmp2_);
+ page_popup_context_menu (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), _tmp1_, event);
#line 149 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
_g_object_unref0 (_tmp1_);
#line 151 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
result = TRUE;
#line 151 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
return result;
-#line 1714 "DirectPhotoPage.c"
+#line 1983 "DirectPhotoPage.c"
}
-static GtkMenu* direct_photo_page_get_context_menu (DirectPhotoPage* self) {
+static GtkMenu*
+direct_photo_page_get_context_menu (DirectPhotoPage* self)
+{
GtkMenu* result = NULL;
GtkMenu* _tmp0_;
GtkMenu* _tmp7_;
@@ -1725,7 +1996,7 @@ static GtkMenu* direct_photo_page_get_context_menu (DirectPhotoPage* self) {
_tmp0_ = self->priv->context_menu;
#line 157 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
if (_tmp0_ == NULL) {
-#line 1729 "DirectPhotoPage.c"
+#line 2000 "DirectPhotoPage.c"
GMenuModel* model = NULL;
GtkBuilder* _tmp1_;
GObject* _tmp2_;
@@ -1757,7 +2028,7 @@ static GtkMenu* direct_photo_page_get_context_menu (DirectPhotoPage* self) {
gtk_menu_attach_to_widget (_tmp6_, G_TYPE_CHECK_INSTANCE_CAST (self, gtk_widget_get_type (), GtkWidget), NULL);
#line 157 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
_g_object_unref0 (model);
-#line 1761 "DirectPhotoPage.c"
+#line 2032 "DirectPhotoPage.c"
}
#line 164 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
_tmp7_ = self->priv->context_menu;
@@ -1767,64 +2038,54 @@ static GtkMenu* direct_photo_page_get_context_menu (DirectPhotoPage* self) {
result = _tmp8_;
#line 164 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
return result;
-#line 1771 "DirectPhotoPage.c"
+#line 2042 "DirectPhotoPage.c"
}
-static void direct_photo_page_update_zoom_menu_item_sensitivity (DirectPhotoPage* self) {
+static void
+direct_photo_page_update_zoom_menu_item_sensitivity (DirectPhotoPage* self)
+{
gboolean _tmp0_ = FALSE;
ZoomState _tmp1_ = {0};
- gboolean _tmp2_;
- gboolean _tmp4_ = FALSE;
- ZoomState _tmp5_ = {0};
- gboolean _tmp6_;
+ gboolean _tmp2_ = FALSE;
+ ZoomState _tmp3_ = {0};
#line 167 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
g_return_if_fail (IS_DIRECT_PHOTO_PAGE (self));
#line 168 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
single_photo_page_get_zoom_state (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SINGLE_PHOTO_PAGE, SinglePhotoPage), &_tmp1_);
#line 168 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
- _tmp2_ = zoom_state_is_max (&_tmp1_);
+ if (!zoom_state_is_max (&_tmp1_)) {
#line 168 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
- if (!_tmp2_) {
-#line 1790 "DirectPhotoPage.c"
- gboolean _tmp3_;
-#line 168 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
- _tmp3_ = editing_host_page_get_photo_missing (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage));
-#line 168 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
- _tmp0_ = !_tmp3_;
-#line 1796 "DirectPhotoPage.c"
+ _tmp0_ = !editing_host_page_get_photo_missing (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage));
+#line 2061 "DirectPhotoPage.c"
} else {
#line 168 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
_tmp0_ = FALSE;
-#line 1800 "DirectPhotoPage.c"
+#line 2065 "DirectPhotoPage.c"
}
#line 168 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "IncreaseSize", _tmp0_);
#line 169 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
- single_photo_page_get_zoom_state (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SINGLE_PHOTO_PAGE, SinglePhotoPage), &_tmp5_);
-#line 169 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
- _tmp6_ = zoom_state_is_default (&_tmp5_);
-#line 169 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
- if (!_tmp6_) {
-#line 1810 "DirectPhotoPage.c"
- gboolean _tmp7_;
+ single_photo_page_get_zoom_state (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SINGLE_PHOTO_PAGE, SinglePhotoPage), &_tmp3_);
#line 169 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
- _tmp7_ = editing_host_page_get_photo_missing (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage));
+ if (!zoom_state_is_default (&_tmp3_)) {
#line 169 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
- _tmp4_ = !_tmp7_;
-#line 1816 "DirectPhotoPage.c"
+ _tmp2_ = !editing_host_page_get_photo_missing (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage));
+#line 2075 "DirectPhotoPage.c"
} else {
#line 169 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
- _tmp4_ = FALSE;
-#line 1820 "DirectPhotoPage.c"
+ _tmp2_ = FALSE;
+#line 2079 "DirectPhotoPage.c"
}
#line 169 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
- page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "DecreaseSize", _tmp4_);
-#line 1824 "DirectPhotoPage.c"
+ page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "DecreaseSize", _tmp2_);
+#line 2083 "DirectPhotoPage.c"
}
-static void direct_photo_page_real_on_increase_size (EditingHostPage* base) {
+static void
+direct_photo_page_real_on_increase_size (EditingHostPage* base)
+{
DirectPhotoPage * self;
#line 172 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_DIRECT_PHOTO_PAGE, DirectPhotoPage);
@@ -1832,11 +2093,13 @@ static void direct_photo_page_real_on_increase_size (EditingHostPage* base) {
EDITING_HOST_PAGE_CLASS (direct_photo_page_parent_class)->on_increase_size (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage));
#line 175 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
direct_photo_page_update_zoom_menu_item_sensitivity (self);
-#line 1836 "DirectPhotoPage.c"
+#line 2097 "DirectPhotoPage.c"
}
-static void direct_photo_page_real_on_decrease_size (EditingHostPage* base) {
+static void
+direct_photo_page_real_on_decrease_size (EditingHostPage* base)
+{
DirectPhotoPage * self;
#line 178 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_DIRECT_PHOTO_PAGE, DirectPhotoPage);
@@ -1844,20 +2107,21 @@ static void direct_photo_page_real_on_decrease_size (EditingHostPage* base) {
EDITING_HOST_PAGE_CLASS (direct_photo_page_parent_class)->on_decrease_size (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage));
#line 181 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
direct_photo_page_update_zoom_menu_item_sensitivity (self);
-#line 1848 "DirectPhotoPage.c"
+#line 2111 "DirectPhotoPage.c"
}
-static void direct_photo_page_on_photos_altered (DirectPhotoPage* self, GeeMap* map) {
+static void
+direct_photo_page_on_photos_altered (DirectPhotoPage* self,
+ GeeMap* map)
+{
gboolean contains = FALSE;
- gboolean _tmp0_;
+ gboolean _tmp11_ = FALSE;
+ gboolean sensitive = FALSE;
+ gboolean _tmp12_;
gboolean _tmp14_ = FALSE;
gboolean _tmp15_;
- gboolean sensitive = FALSE;
- gboolean _tmp17_;
- gboolean _tmp19_ = FALSE;
- gboolean _tmp20_;
- gboolean _tmp25_;
+ gboolean _tmp18_;
#line 184 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
g_return_if_fail (IS_DIRECT_PHOTO_PAGE (self));
#line 184 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
@@ -1865,161 +2129,143 @@ static void direct_photo_page_on_photos_altered (DirectPhotoPage* self, GeeMap*
#line 185 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
contains = FALSE;
#line 186 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
- _tmp0_ = editing_host_page_has_photo (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage));
-#line 186 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
- if (_tmp0_) {
-#line 1872 "DirectPhotoPage.c"
+ if (editing_host_page_has_photo (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage))) {
+#line 2134 "DirectPhotoPage.c"
Photo* photo = NULL;
- Photo* _tmp1_;
+ Photo* _tmp0_;
#line 187 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
- _tmp1_ = editing_host_page_get_photo (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage));
+ _tmp0_ = editing_host_page_get_photo (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage));
#line 187 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
- photo = _tmp1_;
-#line 1879 "DirectPhotoPage.c"
+ photo = _tmp0_;
+#line 2141 "DirectPhotoPage.c"
{
GeeIterator* _object_it = NULL;
- GeeMap* _tmp2_;
+ GeeSet* _tmp1_;
+ GeeSet* _tmp2_;
GeeSet* _tmp3_;
- GeeSet* _tmp4_;
- GeeSet* _tmp5_;
- GeeIterator* _tmp6_;
- GeeIterator* _tmp7_;
-#line 188 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
- _tmp2_ = map;
+ GeeIterator* _tmp4_;
+ GeeIterator* _tmp5_;
#line 188 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
- _tmp3_ = gee_map_get_keys (_tmp2_);
+ _tmp1_ = gee_map_get_keys (map);
#line 188 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
- _tmp4_ = _tmp3_;
+ _tmp2_ = _tmp1_;
#line 188 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
- _tmp5_ = _tmp4_;
+ _tmp3_ = _tmp2_;
#line 188 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
- _tmp6_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, GEE_TYPE_ITERABLE, GeeIterable));
+ _tmp4_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, GEE_TYPE_ITERABLE, GeeIterable));
#line 188 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
- _tmp7_ = _tmp6_;
+ _tmp5_ = _tmp4_;
#line 188 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
- _g_object_unref0 (_tmp5_);
+ _g_object_unref0 (_tmp3_);
#line 188 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
- _object_it = _tmp7_;
+ _object_it = _tmp5_;
#line 188 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
while (TRUE) {
-#line 1906 "DirectPhotoPage.c"
- GeeIterator* _tmp8_;
- gboolean _tmp9_;
+#line 2165 "DirectPhotoPage.c"
+ GeeIterator* _tmp6_;
DataObject* object = NULL;
- GeeIterator* _tmp10_;
- gpointer _tmp11_;
- DataObject* _tmp12_;
- Photo* _tmp13_;
-#line 188 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
- _tmp8_ = _object_it;
+ GeeIterator* _tmp7_;
+ gpointer _tmp8_;
+ DataObject* _tmp9_;
+ Photo* _tmp10_;
#line 188 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
- _tmp9_ = gee_iterator_next (_tmp8_);
+ _tmp6_ = _object_it;
#line 188 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
- if (!_tmp9_) {
+ if (!gee_iterator_next (_tmp6_)) {
#line 188 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
break;
-#line 1922 "DirectPhotoPage.c"
+#line 2178 "DirectPhotoPage.c"
}
#line 188 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
- _tmp10_ = _object_it;
+ _tmp7_ = _object_it;
#line 188 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
- _tmp11_ = gee_iterator_get (_tmp10_);
+ _tmp8_ = gee_iterator_get (_tmp7_);
#line 188 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
- object = (DataObject*) _tmp11_;
+ object = (DataObject*) _tmp8_;
#line 189 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
- _tmp12_ = object;
+ _tmp9_ = object;
#line 189 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
- _tmp13_ = photo;
+ _tmp10_ = photo;
#line 189 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
- if (G_TYPE_CHECK_INSTANCE_CAST (_tmp12_, TYPE_PHOTO, Photo) == _tmp13_) {
+ if (G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, TYPE_PHOTO, Photo) == _tmp10_) {
#line 190 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
contains = TRUE;
#line 192 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
_g_object_unref0 (object);
#line 192 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
break;
-#line 1942 "DirectPhotoPage.c"
+#line 2198 "DirectPhotoPage.c"
}
#line 188 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
_g_object_unref0 (object);
-#line 1946 "DirectPhotoPage.c"
+#line 2202 "DirectPhotoPage.c"
}
#line 188 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
_g_object_unref0 (_object_it);
-#line 1950 "DirectPhotoPage.c"
+#line 2206 "DirectPhotoPage.c"
}
#line 186 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
_g_object_unref0 (photo);
-#line 1954 "DirectPhotoPage.c"
+#line 2210 "DirectPhotoPage.c"
}
#line 197 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
- _tmp15_ = editing_host_page_has_photo (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage));
-#line 197 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
- if (_tmp15_) {
-#line 1960 "DirectPhotoPage.c"
- gboolean _tmp16_;
-#line 197 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
- _tmp16_ = editing_host_page_get_photo_missing (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage));
+ if (editing_host_page_has_photo (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage))) {
#line 197 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
- _tmp14_ = !_tmp16_;
-#line 1966 "DirectPhotoPage.c"
+ _tmp11_ = !editing_host_page_get_photo_missing (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage));
+#line 2216 "DirectPhotoPage.c"
} else {
#line 197 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
- _tmp14_ = FALSE;
-#line 1970 "DirectPhotoPage.c"
+ _tmp11_ = FALSE;
+#line 2220 "DirectPhotoPage.c"
}
#line 197 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
- sensitive = _tmp14_;
+ sensitive = _tmp11_;
#line 198 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
- _tmp17_ = sensitive;
+ _tmp12_ = sensitive;
#line 198 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
- if (_tmp17_) {
-#line 1978 "DirectPhotoPage.c"
- gboolean _tmp18_;
+ if (_tmp12_) {
+#line 2228 "DirectPhotoPage.c"
+ gboolean _tmp13_;
#line 199 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
- _tmp18_ = contains;
+ _tmp13_ = contains;
#line 199 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
- sensitive = _tmp18_;
-#line 1984 "DirectPhotoPage.c"
+ sensitive = _tmp13_;
+#line 2234 "DirectPhotoPage.c"
}
#line 201 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
- _tmp20_ = sensitive;
-#line 201 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
- if (_tmp20_) {
-#line 1990 "DirectPhotoPage.c"
- Photo* _tmp21_;
- Photo* _tmp22_;
- PhotoFileFormat _tmp23_;
- gboolean _tmp24_;
-#line 201 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
- _tmp21_ = editing_host_page_get_photo (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage));
+ _tmp15_ = sensitive;
#line 201 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
- _tmp22_ = _tmp21_;
+ if (_tmp15_) {
+#line 2240 "DirectPhotoPage.c"
+ Photo* _tmp16_;
+ Photo* _tmp17_;
#line 201 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
- _tmp23_ = photo_get_file_format (_tmp22_);
+ _tmp16_ = editing_host_page_get_photo (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage));
#line 201 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
- _tmp24_ = photo_file_format_can_write (_tmp23_);
+ _tmp17_ = _tmp16_;
#line 201 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
- _tmp19_ = _tmp24_;
+ _tmp14_ = photo_file_format_can_write (photo_get_file_format (_tmp17_));
#line 201 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
- _g_object_unref0 (_tmp22_);
-#line 2007 "DirectPhotoPage.c"
+ _g_object_unref0 (_tmp17_);
+#line 2251 "DirectPhotoPage.c"
} else {
#line 201 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
- _tmp19_ = FALSE;
-#line 2011 "DirectPhotoPage.c"
+ _tmp14_ = FALSE;
+#line 2255 "DirectPhotoPage.c"
}
#line 201 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
- page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "Save", _tmp19_);
+ page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "Save", _tmp14_);
#line 202 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
- _tmp25_ = sensitive;
+ _tmp18_ = sensitive;
#line 202 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
- page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "Revert", _tmp25_);
-#line 2019 "DirectPhotoPage.c"
+ page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "Revert", _tmp18_);
+#line 2263 "DirectPhotoPage.c"
}
-static void direct_photo_page_on_selection_group_altered (DirectPhotoPage* self) {
+static void
+direct_photo_page_on_selection_group_altered (DirectPhotoPage* self)
+{
CommandManager* _tmp0_;
CommandManager* _tmp1_;
#line 205 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
@@ -2032,19 +2278,20 @@ static void direct_photo_page_on_selection_group_altered (DirectPhotoPage* self)
command_manager_reset (_tmp1_);
#line 212 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
_command_manager_unref0 (_tmp1_);
-#line 2036 "DirectPhotoPage.c"
+#line 2282 "DirectPhotoPage.c"
}
-static gboolean direct_photo_page_real_on_double_click (EditingHostPage* base, GdkEventButton* event) {
+static gboolean
+direct_photo_page_real_on_double_click (EditingHostPage* base,
+ GdkEventButton* event)
+{
DirectPhotoPage * self;
gboolean result = FALSE;
FullscreenWindow* fs = NULL;
GtkWindow* _tmp0_;
FullscreenWindow* _tmp1_;
FullscreenWindow* _tmp2_;
- GdkEventButton* _tmp4_;
- gboolean _tmp5_;
#line 215 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_DIRECT_PHOTO_PAGE, DirectPhotoPage);
#line 215 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
@@ -2057,7 +2304,7 @@ static gboolean direct_photo_page_real_on_double_click (EditingHostPage* base, G
if (_tmp1_ == NULL) {
#line 216 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
_g_object_unref0 (_tmp0_);
-#line 2061 "DirectPhotoPage.c"
+#line 2308 "DirectPhotoPage.c"
}
#line 216 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
fs = _tmp1_;
@@ -2065,7 +2312,7 @@ static gboolean direct_photo_page_real_on_double_click (EditingHostPage* base, G
_tmp2_ = fs;
#line 217 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
if (_tmp2_ != NULL) {
-#line 2069 "DirectPhotoPage.c"
+#line 2316 "DirectPhotoPage.c"
FullscreenWindow* _tmp3_;
#line 218 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
_tmp3_ = fs;
@@ -2077,23 +2324,22 @@ static gboolean direct_photo_page_real_on_double_click (EditingHostPage* base, G
_g_object_unref0 (fs);
#line 220 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
return result;
-#line 2081 "DirectPhotoPage.c"
+#line 2328 "DirectPhotoPage.c"
}
#line 223 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
- _tmp4_ = event;
-#line 223 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
- _tmp5_ = EDITING_HOST_PAGE_CLASS (direct_photo_page_parent_class)->on_double_click (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage), _tmp4_);
-#line 223 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
- result = _tmp5_;
+ result = EDITING_HOST_PAGE_CLASS (direct_photo_page_parent_class)->on_double_click (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage), event);
#line 223 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
_g_object_unref0 (fs);
#line 223 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
return result;
-#line 2093 "DirectPhotoPage.c"
+#line 2336 "DirectPhotoPage.c"
}
-static void direct_photo_page_real_update_ui (EditingHostPage* base, gboolean missing) {
+static void
+direct_photo_page_real_update_ui (EditingHostPage* base,
+ gboolean missing)
+{
DirectPhotoPage * self;
gboolean sensitivity = FALSE;
gboolean _tmp0_;
@@ -2121,173 +2367,156 @@ static void direct_photo_page_real_update_ui (EditingHostPage* base, gboolean mi
gboolean _tmp22_;
gboolean _tmp23_;
gboolean _tmp24_;
- gboolean _tmp25_;
- gboolean _tmp26_ = FALSE;
- gboolean _tmp27_;
- gboolean _tmp29_;
+ gboolean _tmp25_ = FALSE;
#line 226 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_DIRECT_PHOTO_PAGE, DirectPhotoPage);
#line 227 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
- _tmp0_ = missing;
-#line 227 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
- sensitivity = !_tmp0_;
+ sensitivity = !missing;
#line 229 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
- _tmp1_ = sensitivity;
+ _tmp0_ = sensitivity;
#line 229 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
- page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "Save", _tmp1_);
+ page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "Save", _tmp0_);
#line 230 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
- _tmp2_ = sensitivity;
+ _tmp1_ = sensitivity;
#line 230 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
- page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "SaveAs", _tmp2_);
+ page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "SaveAs", _tmp1_);
#line 231 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
- _tmp3_ = sensitivity;
+ _tmp2_ = sensitivity;
#line 231 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
- page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "SendTo", _tmp3_);
+ page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "SendTo", _tmp2_);
#line 232 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
- _tmp4_ = sensitivity;
+ _tmp3_ = sensitivity;
#line 232 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
- page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "Publish", _tmp4_);
+ page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "Publish", _tmp3_);
#line 233 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
- _tmp5_ = sensitivity;
+ _tmp4_ = sensitivity;
#line 233 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
- page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "Print", _tmp5_);
+ page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "Print", _tmp4_);
#line 234 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
- _tmp6_ = sensitivity;
+ _tmp5_ = sensitivity;
#line 234 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
- page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "CommonJumpToFile", _tmp6_);
+ page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "CommonJumpToFile", _tmp5_);
#line 236 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
- _tmp7_ = sensitivity;
+ _tmp6_ = sensitivity;
#line 236 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
- page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "CommonUndo", _tmp7_);
+ page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "CommonUndo", _tmp6_);
#line 237 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
- _tmp8_ = sensitivity;
+ _tmp7_ = sensitivity;
#line 237 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
- page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "CommonRedo", _tmp8_);
+ page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "CommonRedo", _tmp7_);
#line 239 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
- _tmp9_ = sensitivity;
+ _tmp8_ = sensitivity;
#line 239 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
- page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "IncreaseSize", _tmp9_);
+ page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "IncreaseSize", _tmp8_);
#line 240 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
- _tmp10_ = sensitivity;
+ _tmp9_ = sensitivity;
#line 240 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
- page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "DecreaseSize", _tmp10_);
+ page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "DecreaseSize", _tmp9_);
#line 241 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
- _tmp11_ = sensitivity;
+ _tmp10_ = sensitivity;
#line 241 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
- page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "ZoomFit", _tmp11_);
+ page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "ZoomFit", _tmp10_);
#line 242 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
- _tmp12_ = sensitivity;
+ _tmp11_ = sensitivity;
#line 242 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
- page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "Zoom100", _tmp12_);
+ page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "Zoom100", _tmp11_);
#line 243 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
- _tmp13_ = sensitivity;
+ _tmp12_ = sensitivity;
#line 243 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
- page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "Zoom200", _tmp13_);
+ page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "Zoom200", _tmp12_);
#line 245 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
- _tmp14_ = sensitivity;
+ _tmp13_ = sensitivity;
#line 245 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
- page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "RotateClockwise", _tmp14_);
+ page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "RotateClockwise", _tmp13_);
#line 246 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
- _tmp15_ = sensitivity;
+ _tmp14_ = sensitivity;
#line 246 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
- page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "RotateCounterclockwise", _tmp15_);
+ page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "RotateCounterclockwise", _tmp14_);
#line 247 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
- _tmp16_ = sensitivity;
+ _tmp15_ = sensitivity;
#line 247 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
- page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "FlipHorizontally", _tmp16_);
+ page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "FlipHorizontally", _tmp15_);
#line 248 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
- _tmp17_ = sensitivity;
+ _tmp16_ = sensitivity;
#line 248 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
- page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "FlipVertically", _tmp17_);
+ page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "FlipVertically", _tmp16_);
#line 249 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
- _tmp18_ = sensitivity;
+ _tmp17_ = sensitivity;
#line 249 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
- page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "Enhance", _tmp18_);
+ page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "Enhance", _tmp17_);
#line 250 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
- _tmp19_ = sensitivity;
+ _tmp18_ = sensitivity;
#line 250 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
- page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "Crop", _tmp19_);
+ page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "Crop", _tmp18_);
#line 251 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
- _tmp20_ = sensitivity;
+ _tmp19_ = sensitivity;
#line 251 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
- page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "Straighten", _tmp20_);
+ page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "Straighten", _tmp19_);
#line 252 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
- _tmp21_ = sensitivity;
+ _tmp20_ = sensitivity;
#line 252 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
- page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "RedEye", _tmp21_);
+ page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "RedEye", _tmp20_);
#line 253 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
- _tmp22_ = sensitivity;
+ _tmp21_ = sensitivity;
#line 253 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
- page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "Adjust", _tmp22_);
+ page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "Adjust", _tmp21_);
#line 254 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
- _tmp23_ = sensitivity;
+ _tmp22_ = sensitivity;
#line 254 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
- page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "Revert", _tmp23_);
+ page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "Revert", _tmp22_);
#line 255 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
- _tmp24_ = sensitivity;
+ _tmp23_ = sensitivity;
#line 255 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
- page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "AdjustDateTime", _tmp24_);
+ page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "AdjustDateTime", _tmp23_);
#line 256 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
- _tmp25_ = sensitivity;
+ _tmp24_ = sensitivity;
#line 256 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
- page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "Fullscreen", _tmp25_);
+ page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "Fullscreen", _tmp24_);
#line 258 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
- _tmp27_ = editing_host_page_has_photo (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage));
+ if (editing_host_page_has_photo (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage))) {
#line 258 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
- if (_tmp27_) {
-#line 2239 "DirectPhotoPage.c"
- gboolean _tmp28_;
-#line 258 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
- _tmp28_ = editing_host_page_get_photo_missing (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage));
-#line 258 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
- _tmp26_ = !_tmp28_;
-#line 2245 "DirectPhotoPage.c"
+ _tmp25_ = !editing_host_page_get_photo_missing (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage));
+#line 2480 "DirectPhotoPage.c"
} else {
#line 258 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
- _tmp26_ = FALSE;
-#line 2249 "DirectPhotoPage.c"
+ _tmp25_ = FALSE;
+#line 2484 "DirectPhotoPage.c"
}
#line 258 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
- page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "SetBackground", _tmp26_);
-#line 260 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
- _tmp29_ = missing;
+ page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "SetBackground", _tmp25_);
#line 260 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
- EDITING_HOST_PAGE_CLASS (direct_photo_page_parent_class)->update_ui (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage), _tmp29_);
-#line 2257 "DirectPhotoPage.c"
+ EDITING_HOST_PAGE_CLASS (direct_photo_page_parent_class)->update_ui (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage), missing);
+#line 2490 "DirectPhotoPage.c"
}
-static void direct_photo_page_real_update_actions (Page* base, gint selected_count, gint count) {
+static void
+direct_photo_page_real_update_actions (Page* base,
+ gint selected_count,
+ gint count)
+{
DirectPhotoPage * self;
gboolean multiple = FALSE;
ViewCollection* _tmp0_;
ViewCollection* _tmp1_;
- gint _tmp2_;
- gboolean _tmp3_;
- gboolean _tmp4_ = FALSE;
- gboolean _tmp5_;
+ gboolean _tmp2_;
+ gboolean _tmp3_ = FALSE;
gboolean revert_possible = FALSE;
- gboolean _tmp12_ = FALSE;
- gboolean _tmp13_;
+ gboolean _tmp8_ = FALSE;
gboolean rotate_possible = FALSE;
- gboolean _tmp17_ = FALSE;
- gboolean _tmp18_;
+ gboolean _tmp11_ = FALSE;
gboolean enhance_possible = FALSE;
- gboolean _tmp22_;
- gboolean _tmp23_;
- gboolean _tmp24_;
- gboolean _tmp25_;
- gboolean _tmp26_;
- gboolean _tmp27_;
- gboolean _tmp28_;
- gboolean _tmp29_;
+ gboolean _tmp14_;
+ gboolean _tmp15_;
+ gboolean _tmp16_;
+ gboolean _tmp17_;
+ gboolean _tmp18_;
+ gboolean _tmp19_;
+ gboolean _tmp20_;
+ gboolean _tmp21_;
+ Photo* _tmp28_;
+ Photo* _tmp29_;
gboolean _tmp30_;
- gboolean _tmp31_;
- Photo* _tmp40_;
- Photo* _tmp41_;
- gboolean _tmp42_;
- gint _tmp46_;
- gint _tmp47_;
#line 263 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_DIRECT_PHOTO_PAGE, DirectPhotoPage);
#line 264 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
@@ -2295,439 +2524,369 @@ static void direct_photo_page_real_update_actions (Page* base, gint selected_cou
#line 264 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
_tmp1_ = _tmp0_;
#line 264 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
- _tmp2_ = data_collection_get_count (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, TYPE_DATA_COLLECTION, DataCollection));
-#line 264 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
- _tmp3_ = _tmp2_ > 1;
+ _tmp2_ = data_collection_get_count (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, TYPE_DATA_COLLECTION, DataCollection)) > 1;
#line 264 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
_data_collection_unref0 (_tmp1_);
#line 264 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
- multiple = _tmp3_;
-#line 265 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
- _tmp5_ = editing_host_page_has_photo (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage));
-#line 265 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
- if (_tmp5_) {
-#line 2310 "DirectPhotoPage.c"
- gboolean _tmp6_ = FALSE;
- Photo* _tmp7_;
- Photo* _tmp8_;
- gboolean _tmp9_;
- gboolean _tmp10_;
+ multiple = _tmp2_;
#line 265 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
- _tmp7_ = editing_host_page_get_photo (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage));
+ if (editing_host_page_has_photo (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage))) {
+#line 2535 "DirectPhotoPage.c"
+ gboolean _tmp4_ = FALSE;
+ Photo* _tmp5_;
+ Photo* _tmp6_;
+ gboolean _tmp7_;
#line 265 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
- _tmp8_ = _tmp7_;
+ _tmp5_ = editing_host_page_get_photo (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage));
#line 265 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
- _tmp9_ = photo_has_transformations (_tmp8_);
+ _tmp6_ = _tmp5_;
#line 265 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
- _tmp10_ = _tmp9_;
+ _tmp7_ = photo_has_transformations (_tmp6_);
#line 265 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
- _g_object_unref0 (_tmp8_);
+ _g_object_unref0 (_tmp6_);
#line 265 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
- if (_tmp10_) {
-#line 2328 "DirectPhotoPage.c"
- gboolean _tmp11_;
-#line 266 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
- _tmp11_ = editing_host_page_get_photo_missing (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage));
+ if (_tmp7_) {
#line 266 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
- _tmp6_ = !_tmp11_;
-#line 2334 "DirectPhotoPage.c"
+ _tmp4_ = !editing_host_page_get_photo_missing (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage));
+#line 2552 "DirectPhotoPage.c"
} else {
#line 265 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
- _tmp6_ = FALSE;
-#line 2338 "DirectPhotoPage.c"
+ _tmp4_ = FALSE;
+#line 2556 "DirectPhotoPage.c"
}
#line 265 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
- _tmp4_ = _tmp6_;
-#line 2342 "DirectPhotoPage.c"
+ _tmp3_ = _tmp4_;
+#line 2560 "DirectPhotoPage.c"
} else {
#line 266 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
- _tmp4_ = FALSE;
-#line 2346 "DirectPhotoPage.c"
+ _tmp3_ = FALSE;
+#line 2564 "DirectPhotoPage.c"
}
#line 265 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
- revert_possible = _tmp4_;
-#line 267 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
- _tmp13_ = editing_host_page_has_photo (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage));
+ revert_possible = _tmp3_;
#line 267 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
- if (_tmp13_) {
-#line 2354 "DirectPhotoPage.c"
- Photo* _tmp14_;
- Photo* _tmp15_;
- gboolean _tmp16_;
+ if (editing_host_page_has_photo (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage))) {
+#line 2570 "DirectPhotoPage.c"
+ Photo* _tmp9_;
+ Photo* _tmp10_;
#line 267 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
- _tmp14_ = editing_host_page_get_photo (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage));
+ _tmp9_ = editing_host_page_get_photo (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage));
#line 267 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
- _tmp15_ = _tmp14_;
-#line 267 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
- _tmp16_ = editing_host_page_is_rotate_available (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage), _tmp15_);
+ _tmp10_ = _tmp9_;
#line 267 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
- _tmp12_ = _tmp16_;
+ _tmp8_ = editing_host_page_is_rotate_available (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage), _tmp10_);
#line 267 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
- _g_object_unref0 (_tmp15_);
-#line 2368 "DirectPhotoPage.c"
+ _g_object_unref0 (_tmp10_);
+#line 2581 "DirectPhotoPage.c"
} else {
#line 267 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
- _tmp12_ = FALSE;
-#line 2372 "DirectPhotoPage.c"
+ _tmp8_ = FALSE;
+#line 2585 "DirectPhotoPage.c"
}
#line 267 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
- rotate_possible = _tmp12_;
-#line 268 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
- _tmp18_ = editing_host_page_has_photo (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage));
+ rotate_possible = _tmp8_;
#line 268 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
- if (_tmp18_) {
-#line 2380 "DirectPhotoPage.c"
- Photo* _tmp19_;
- Photo* _tmp20_;
- gboolean _tmp21_;
+ if (editing_host_page_has_photo (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage))) {
+#line 2591 "DirectPhotoPage.c"
+ Photo* _tmp12_;
+ Photo* _tmp13_;
#line 268 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
- _tmp19_ = editing_host_page_get_photo (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage));
+ _tmp12_ = editing_host_page_get_photo (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage));
#line 268 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
- _tmp20_ = _tmp19_;
-#line 268 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
- _tmp21_ = editing_host_page_is_enhance_available (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage), _tmp20_);
+ _tmp13_ = _tmp12_;
#line 268 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
- _tmp17_ = _tmp21_;
+ _tmp11_ = editing_host_page_is_enhance_available (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage), _tmp13_);
#line 268 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
- _g_object_unref0 (_tmp20_);
-#line 2394 "DirectPhotoPage.c"
+ _g_object_unref0 (_tmp13_);
+#line 2602 "DirectPhotoPage.c"
} else {
#line 268 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
- _tmp17_ = FALSE;
-#line 2398 "DirectPhotoPage.c"
+ _tmp11_ = FALSE;
+#line 2606 "DirectPhotoPage.c"
}
#line 268 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
- enhance_possible = _tmp17_;
+ enhance_possible = _tmp11_;
#line 270 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
- _tmp22_ = multiple;
+ _tmp14_ = multiple;
#line 270 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
- page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "PrevPhoto", _tmp22_);
+ page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "PrevPhoto", _tmp14_);
#line 271 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
- _tmp23_ = multiple;
+ _tmp15_ = multiple;
#line 271 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
- page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "NextPhoto", _tmp23_);
+ page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "NextPhoto", _tmp15_);
#line 272 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
- _tmp24_ = rotate_possible;
+ _tmp16_ = rotate_possible;
#line 272 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
- page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "RotateClockwise", _tmp24_);
+ page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "RotateClockwise", _tmp16_);
#line 273 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
- _tmp25_ = rotate_possible;
+ _tmp17_ = rotate_possible;
#line 273 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
- page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "RotateCounterclockwise", _tmp25_);
+ page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "RotateCounterclockwise", _tmp17_);
#line 274 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
- _tmp26_ = rotate_possible;
+ _tmp18_ = rotate_possible;
#line 274 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
- page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "FlipHorizontally", _tmp26_);
+ page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "FlipHorizontally", _tmp18_);
#line 275 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
- _tmp27_ = rotate_possible;
+ _tmp19_ = rotate_possible;
#line 275 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
- page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "FlipVertically", _tmp27_);
+ page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "FlipVertically", _tmp19_);
#line 276 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
- _tmp28_ = revert_possible;
+ _tmp20_ = revert_possible;
#line 276 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
- page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "Revert", _tmp28_);
+ page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "Revert", _tmp20_);
#line 277 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
- _tmp29_ = enhance_possible;
+ _tmp21_ = enhance_possible;
#line 277 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
- page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "Enhance", _tmp29_);
-#line 279 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
- _tmp30_ = editing_host_page_has_photo (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage));
+ page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "Enhance", _tmp21_);
#line 279 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
- page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "SetBackground", _tmp30_);
+ page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "SetBackground", editing_host_page_has_photo (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage)));
#line 281 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
- _tmp31_ = editing_host_page_has_photo (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage));
-#line 281 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
- if (_tmp31_) {
-#line 2442 "DirectPhotoPage.c"
- Photo* _tmp32_;
- Photo* _tmp33_;
- Scaling _tmp34_ = {0};
- gboolean _tmp35_;
- Photo* _tmp36_;
- Photo* _tmp37_;
- Scaling _tmp38_ = {0};
- gboolean _tmp39_;
-#line 282 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
- _tmp32_ = editing_host_page_get_photo (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage));
+ if (editing_host_page_has_photo (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage))) {
+#line 2646 "DirectPhotoPage.c"
+ Photo* _tmp22_;
+ Photo* _tmp23_;
+ Scaling _tmp24_ = {0};
+ Photo* _tmp25_;
+ Photo* _tmp26_;
+ Scaling _tmp27_ = {0};
#line 282 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
- _tmp33_ = _tmp32_;
+ _tmp22_ = editing_host_page_get_photo (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage));
#line 282 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
- scaling_for_original (&_tmp34_);
+ _tmp23_ = _tmp22_;
#line 282 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
- _tmp35_ = editing_tools_crop_tool_is_available (_tmp33_, &_tmp34_);
+ scaling_for_original (&_tmp24_);
#line 282 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
- page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "Crop", _tmp35_);
+ page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "Crop", editing_tools_crop_tool_is_available (_tmp23_, &_tmp24_));
#line 282 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
- _g_object_unref0 (_tmp33_);
-#line 283 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
- _tmp36_ = editing_host_page_get_photo (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage));
+ _g_object_unref0 (_tmp23_);
#line 283 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
- _tmp37_ = _tmp36_;
+ _tmp25_ = editing_host_page_get_photo (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage));
#line 283 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
- scaling_for_original (&_tmp38_);
+ _tmp26_ = _tmp25_;
#line 283 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
- _tmp39_ = editing_tools_redeye_tool_is_available (_tmp37_, &_tmp38_);
+ scaling_for_original (&_tmp27_);
#line 283 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
- page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "RedEye", _tmp39_);
+ page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "RedEye", editing_tools_redeye_tool_is_available (_tmp26_, &_tmp27_));
#line 283 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
- _g_object_unref0 (_tmp37_);
-#line 2475 "DirectPhotoPage.c"
+ _g_object_unref0 (_tmp26_);
+#line 2673 "DirectPhotoPage.c"
}
#line 289 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
- _tmp40_ = editing_host_page_get_photo (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage));
+ _tmp28_ = editing_host_page_get_photo (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage));
#line 289 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
- _tmp41_ = _tmp40_;
+ _tmp29_ = _tmp28_;
#line 289 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
- _tmp42_ = _tmp41_ != NULL;
+ _tmp30_ = _tmp29_ != NULL;
#line 289 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
- _g_object_unref0 (_tmp41_);
+ _g_object_unref0 (_tmp29_);
#line 289 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
- if (_tmp42_) {
-#line 2487 "DirectPhotoPage.c"
- Photo* _tmp43_;
- Photo* _tmp44_;
- PhotoFileFormat _tmp45_;
-#line 290 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
- _tmp43_ = editing_host_page_get_photo (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage));
+ if (_tmp30_) {
+#line 2685 "DirectPhotoPage.c"
+ Photo* _tmp31_;
+ Photo* _tmp32_;
#line 290 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
- _tmp44_ = _tmp43_;
+ _tmp31_ = editing_host_page_get_photo (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage));
#line 290 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
- _tmp45_ = photo_get_file_format (_tmp44_);
+ _tmp32_ = _tmp31_;
#line 290 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
- page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "AdjustDateTime", _tmp45_ != PHOTO_FILE_FORMAT_RAW);
+ page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "AdjustDateTime", photo_get_file_format (_tmp32_) != PHOTO_FILE_FORMAT_RAW);
#line 290 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
- _g_object_unref0 (_tmp44_);
-#line 2501 "DirectPhotoPage.c"
+ _g_object_unref0 (_tmp32_);
+#line 2696 "DirectPhotoPage.c"
} else {
#line 292 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "AdjustDateTime", FALSE);
-#line 2505 "DirectPhotoPage.c"
+#line 2700 "DirectPhotoPage.c"
}
#line 295 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
- _tmp46_ = selected_count;
-#line 295 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
- _tmp47_ = count;
-#line 295 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
- PAGE_CLASS (direct_photo_page_parent_class)->update_actions (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage), TYPE_PAGE, Page), _tmp46_, _tmp47_);
-#line 2513 "DirectPhotoPage.c"
+ PAGE_CLASS (direct_photo_page_parent_class)->update_actions (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage), TYPE_PAGE, Page), selected_count, count);
+#line 2704 "DirectPhotoPage.c"
}
-static gboolean direct_photo_page_check_ok_to_close_photo (DirectPhotoPage* self, Photo* photo) {
+static gboolean
+direct_photo_page_check_ok_to_close_photo (DirectPhotoPage* self,
+ Photo* photo)
+{
gboolean result = FALSE;
- Photo* _tmp0_;
+ gboolean _tmp0_;
+ gboolean is_writeable = FALSE;
Photo* _tmp1_;
- gboolean _tmp2_;
+ Photo* _tmp2_;
gboolean _tmp3_;
- gboolean is_writeable = FALSE;
- Photo* _tmp5_;
- Photo* _tmp6_;
- PhotoFileFormat _tmp7_;
- gboolean _tmp8_;
- gboolean _tmp9_;
- const gchar* _tmp10_ = NULL;
- gboolean _tmp11_;
+ const gchar* _tmp4_ = NULL;
+ gboolean _tmp5_;
gchar* save_option = NULL;
- gchar* _tmp12_;
+ gchar* _tmp6_;
GtkResponseType response = 0;
- Photo* _tmp13_;
- gchar* _tmp14_;
- gchar* _tmp15_;
- gchar* _tmp16_;
- gchar* _tmp17_;
- const gchar* _tmp18_;
- GtkResponseType _tmp19_;
- GtkResponseType _tmp20_;
- GtkResponseType _tmp21_;
+ gchar* _tmp7_;
+ gchar* _tmp8_;
+ gchar* _tmp9_;
+ gchar* _tmp10_;
+ const gchar* _tmp11_;
+ GtkResponseType _tmp12_;
+ GtkResponseType _tmp13_;
#line 298 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
g_return_val_if_fail (IS_DIRECT_PHOTO_PAGE (self), FALSE);
#line 298 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
g_return_val_if_fail ((photo == NULL) || IS_PHOTO (photo), FALSE);
#line 301 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
- _tmp0_ = photo;
-#line 301 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
- if (_tmp0_ == NULL) {
+ if (photo == NULL) {
#line 302 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
result = TRUE;
#line 302 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
return result;
-#line 2555 "DirectPhotoPage.c"
+#line 2740 "DirectPhotoPage.c"
}
#line 304 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
- _tmp1_ = photo;
-#line 304 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
- _tmp2_ = photo_has_alterations (_tmp1_);
-#line 304 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
- if (!_tmp2_) {
+ if (!photo_has_alterations (photo)) {
#line 305 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
result = TRUE;
#line 305 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
return result;
-#line 2567 "DirectPhotoPage.c"
+#line 2748 "DirectPhotoPage.c"
}
#line 307 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
- _tmp3_ = self->priv->drop_if_dirty;
+ _tmp0_ = self->priv->drop_if_dirty;
#line 307 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
- if (_tmp3_) {
-#line 2573 "DirectPhotoPage.c"
- Photo* _tmp4_;
-#line 310 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
- _tmp4_ = photo;
+ if (_tmp0_) {
#line 310 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
- photo_remove_all_transformations (_tmp4_);
+ photo_remove_all_transformations (photo);
#line 312 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
result = TRUE;
#line 312 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
return result;
-#line 2583 "DirectPhotoPage.c"
+#line 2760 "DirectPhotoPage.c"
}
#line 315 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
- _tmp5_ = editing_host_page_get_photo (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage));
-#line 315 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
- _tmp6_ = _tmp5_;
-#line 315 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
- _tmp7_ = photo_get_file_format (_tmp6_);
+ _tmp1_ = editing_host_page_get_photo (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage));
#line 315 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
- _tmp8_ = photo_file_format_can_write (_tmp7_);
+ _tmp2_ = _tmp1_;
#line 315 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
- _tmp9_ = _tmp8_;
+ _tmp3_ = photo_file_format_can_write (photo_get_file_format (_tmp2_));
#line 315 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
- _g_object_unref0 (_tmp6_);
+ _g_object_unref0 (_tmp2_);
#line 315 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
- is_writeable = _tmp9_;
+ is_writeable = _tmp3_;
#line 316 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
- _tmp11_ = is_writeable;
+ _tmp5_ = is_writeable;
#line 316 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
- if (_tmp11_) {
+ if (_tmp5_) {
#line 316 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
- _tmp10_ = _ ("_Save");
-#line 2605 "DirectPhotoPage.c"
+ _tmp4_ = _ ("_Save");
+#line 2778 "DirectPhotoPage.c"
} else {
#line 316 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
- _tmp10_ = _ ("_Save a Copy");
-#line 2609 "DirectPhotoPage.c"
+ _tmp4_ = _ ("_Save a Copy");
+#line 2782 "DirectPhotoPage.c"
}
#line 316 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
- _tmp12_ = g_strdup (_tmp10_);
+ _tmp6_ = g_strdup (_tmp4_);
#line 316 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
- save_option = _tmp12_;
-#line 318 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
- _tmp13_ = photo;
+ save_option = _tmp6_;
#line 318 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
- _tmp14_ = media_source_get_basename (G_TYPE_CHECK_INSTANCE_CAST (_tmp13_, TYPE_MEDIA_SOURCE, MediaSource));
+ _tmp7_ = media_source_get_basename (G_TYPE_CHECK_INSTANCE_CAST (photo, TYPE_MEDIA_SOURCE, MediaSource));
#line 318 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
- _tmp15_ = _tmp14_;
-#line 318 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
- _tmp16_ = g_strdup_printf (_ ("Lose changes to %s?"), _tmp15_);
+ _tmp8_ = _tmp7_;
#line 318 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
- _tmp17_ = _tmp16_;
+ _tmp9_ = g_strdup_printf (_ ("Lose changes to %s?"), _tmp8_);
#line 318 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
- _tmp18_ = save_option;
+ _tmp10_ = _tmp9_;
#line 318 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
- _tmp19_ = app_window_negate_affirm_cancel_question (_tmp17_, _tmp18_, _ ("Close _without Saving"), NULL, NULL);
+ _tmp11_ = save_option;
#line 318 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
- _tmp20_ = _tmp19_;
+ _tmp12_ = app_window_negate_affirm_cancel_question (_tmp10_, _tmp11_, _ ("Close _without Saving"), NULL, NULL);
#line 318 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
- _g_free0 (_tmp17_);
+ _g_free0 (_tmp10_);
#line 318 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
- _g_free0 (_tmp15_);
+ _g_free0 (_tmp8_);
#line 318 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
- response = _tmp20_;
+ response = _tmp12_;
#line 322 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
- _tmp21_ = response;
+ _tmp13_ = response;
#line 322 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
- if (_tmp21_ == GTK_RESPONSE_YES) {
-#line 2641 "DirectPhotoPage.c"
- Photo* _tmp22_;
+ if (_tmp13_ == GTK_RESPONSE_YES) {
#line 323 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
- _tmp22_ = photo;
-#line 323 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
- photo_remove_all_transformations (_tmp22_);
-#line 2647 "DirectPhotoPage.c"
+ photo_remove_all_transformations (photo);
+#line 2812 "DirectPhotoPage.c"
} else {
- GtkResponseType _tmp23_;
+ GtkResponseType _tmp14_;
#line 324 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
- _tmp23_ = response;
+ _tmp14_ = response;
#line 324 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
- if (_tmp23_ == GTK_RESPONSE_NO) {
-#line 2654 "DirectPhotoPage.c"
- gboolean _tmp24_;
+ if (_tmp14_ == GTK_RESPONSE_NO) {
+#line 2819 "DirectPhotoPage.c"
+ gboolean _tmp15_;
#line 325 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
- _tmp24_ = is_writeable;
+ _tmp15_ = is_writeable;
#line 325 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
- if (_tmp24_) {
-#line 2660 "DirectPhotoPage.c"
- Photo* _tmp25_;
- GFile* _tmp26_;
- GFile* _tmp27_;
- Photo* _tmp28_;
- Photo* _tmp29_;
- PhotoFileFormat _tmp30_;
-#line 326 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
- _tmp25_ = photo;
+ if (_tmp15_) {
+#line 2825 "DirectPhotoPage.c"
+ GFile* _tmp16_;
+ GFile* _tmp17_;
+ Photo* _tmp18_;
+ Photo* _tmp19_;
#line 326 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
- _tmp26_ = media_source_get_file (G_TYPE_CHECK_INSTANCE_CAST (_tmp25_, TYPE_MEDIA_SOURCE, MediaSource));
+ _tmp16_ = media_source_get_file (G_TYPE_CHECK_INSTANCE_CAST (photo, TYPE_MEDIA_SOURCE, MediaSource));
#line 326 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
- _tmp27_ = _tmp26_;
+ _tmp17_ = _tmp16_;
#line 326 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
- _tmp28_ = editing_host_page_get_photo (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage));
+ _tmp18_ = editing_host_page_get_photo (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage));
#line 326 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
- _tmp29_ = _tmp28_;
+ _tmp19_ = _tmp18_;
#line 326 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
- _tmp30_ = photo_get_file_format (_tmp29_);
+ direct_photo_page_save (self, _tmp17_, 0, SCALE_CONSTRAINT_ORIGINAL, JPEG_QUALITY_HIGH, photo_get_file_format (_tmp19_), FALSE, TRUE);
#line 326 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
- direct_photo_page_save (self, _tmp27_, 0, SCALE_CONSTRAINT_ORIGINAL, JPEG_QUALITY_HIGH, _tmp30_, FALSE, TRUE);
+ _g_object_unref0 (_tmp19_);
#line 326 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
- _g_object_unref0 (_tmp29_);
-#line 326 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
- _g_object_unref0 (_tmp27_);
-#line 2685 "DirectPhotoPage.c"
+ _g_object_unref0 (_tmp17_);
+#line 2844 "DirectPhotoPage.c"
} else {
#line 329 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
direct_photo_page_on_save_as (self);
-#line 2689 "DirectPhotoPage.c"
+#line 2848 "DirectPhotoPage.c"
}
} else {
- gboolean _tmp31_ = FALSE;
- gboolean _tmp32_ = FALSE;
- GtkResponseType _tmp33_;
+ gboolean _tmp20_ = FALSE;
+ gboolean _tmp21_ = FALSE;
+ GtkResponseType _tmp22_;
#line 330 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
- _tmp33_ = response;
+ _tmp22_ = response;
#line 330 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
- if (_tmp33_ == GTK_RESPONSE_CANCEL) {
+ if (_tmp22_ == GTK_RESPONSE_CANCEL) {
#line 330 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
- _tmp32_ = TRUE;
-#line 2701 "DirectPhotoPage.c"
+ _tmp21_ = TRUE;
+#line 2860 "DirectPhotoPage.c"
} else {
- GtkResponseType _tmp34_;
+ GtkResponseType _tmp23_;
#line 330 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
- _tmp34_ = response;
+ _tmp23_ = response;
#line 330 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
- _tmp32_ = _tmp34_ == GTK_RESPONSE_DELETE_EVENT;
-#line 2708 "DirectPhotoPage.c"
+ _tmp21_ = _tmp23_ == GTK_RESPONSE_DELETE_EVENT;
+#line 2867 "DirectPhotoPage.c"
}
#line 330 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
- if (_tmp32_) {
+ if (_tmp21_) {
#line 330 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
- _tmp31_ = TRUE;
-#line 2714 "DirectPhotoPage.c"
+ _tmp20_ = TRUE;
+#line 2873 "DirectPhotoPage.c"
} else {
- GtkResponseType _tmp35_;
+ GtkResponseType _tmp24_;
#line 331 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
- _tmp35_ = response;
+ _tmp24_ = response;
#line 331 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
- _tmp31_ = _tmp35_ == GTK_RESPONSE_CLOSE;
-#line 2721 "DirectPhotoPage.c"
+ _tmp20_ = _tmp24_ == GTK_RESPONSE_CLOSE;
+#line 2880 "DirectPhotoPage.c"
}
#line 330 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
- if (_tmp31_) {
+ if (_tmp20_) {
#line 332 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
result = FALSE;
#line 332 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
_g_free0 (save_option);
#line 332 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
return result;
-#line 2731 "DirectPhotoPage.c"
+#line 2890 "DirectPhotoPage.c"
}
}
}
@@ -2737,16 +2896,17 @@ static gboolean direct_photo_page_check_ok_to_close_photo (DirectPhotoPage* self
_g_free0 (save_option);
#line 335 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
return result;
-#line 2741 "DirectPhotoPage.c"
+#line 2900 "DirectPhotoPage.c"
}
-gboolean direct_photo_page_check_quit (DirectPhotoPage* self) {
+gboolean
+direct_photo_page_check_quit (DirectPhotoPage* self)
+{
gboolean result = FALSE;
Photo* _tmp0_;
Photo* _tmp1_;
gboolean _tmp2_;
- gboolean _tmp3_;
#line 338 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
g_return_val_if_fail (IS_DIRECT_PHOTO_PAGE (self), FALSE);
#line 339 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
@@ -2756,22 +2916,23 @@ gboolean direct_photo_page_check_quit (DirectPhotoPage* self) {
#line 339 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
_tmp2_ = direct_photo_page_check_ok_to_close_photo (self, _tmp1_);
#line 339 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
- _tmp3_ = _tmp2_;
-#line 339 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
_g_object_unref0 (_tmp1_);
#line 339 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
- result = _tmp3_;
+ result = _tmp2_;
#line 339 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
return result;
-#line 2767 "DirectPhotoPage.c"
+#line 2925 "DirectPhotoPage.c"
}
-static gboolean direct_photo_page_real_confirm_replace_photo (EditingHostPage* base, Photo* old_photo, Photo* new_photo) {
+static gboolean
+direct_photo_page_real_confirm_replace_photo (EditingHostPage* base,
+ Photo* old_photo,
+ Photo* new_photo)
+{
DirectPhotoPage * self;
gboolean result = FALSE;
gboolean _tmp0_ = FALSE;
- Photo* _tmp1_;
#line 342 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_DIRECT_PHOTO_PAGE, DirectPhotoPage);
#line 342 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
@@ -2779,98 +2940,75 @@ static gboolean direct_photo_page_real_confirm_replace_photo (EditingHostPage* b
#line 342 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
g_return_val_if_fail (IS_PHOTO (new_photo), FALSE);
#line 343 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
- _tmp1_ = old_photo;
-#line 343 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
- if (_tmp1_ != NULL) {
-#line 2786 "DirectPhotoPage.c"
- Photo* _tmp2_;
- gboolean _tmp3_;
-#line 343 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
- _tmp2_ = old_photo;
-#line 343 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
- _tmp3_ = direct_photo_page_check_ok_to_close_photo (self, _tmp2_);
+ if (old_photo != NULL) {
#line 343 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
- _tmp0_ = _tmp3_;
-#line 2795 "DirectPhotoPage.c"
+ _tmp0_ = direct_photo_page_check_ok_to_close_photo (self, old_photo);
+#line 2947 "DirectPhotoPage.c"
} else {
#line 343 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
_tmp0_ = TRUE;
-#line 2799 "DirectPhotoPage.c"
+#line 2951 "DirectPhotoPage.c"
}
#line 343 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
result = _tmp0_;
#line 343 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
return result;
-#line 2805 "DirectPhotoPage.c"
+#line 2957 "DirectPhotoPage.c"
}
-static void direct_photo_page_save (DirectPhotoPage* self, GFile* dest, gint scale, ScaleConstraint constraint, JpegQuality quality, PhotoFileFormat format, gboolean copy_unmodified, gboolean save_metadata) {
+static void
+direct_photo_page_save (DirectPhotoPage* self,
+ GFile* dest,
+ gint scale,
+ ScaleConstraint constraint,
+ JpegQuality quality,
+ PhotoFileFormat format,
+ gboolean copy_unmodified,
+ gboolean save_metadata)
+{
Scaling scaling = {0};
- ScaleConstraint _tmp0_;
- gint _tmp1_;
- Scaling _tmp2_ = {0};
+ Scaling _tmp0_ = {0};
DirectPhoto* photo = NULL;
- DirectPhotoSourceCollection* _tmp18_;
- GFile* _tmp19_;
- DirectPhoto* _tmp20_ = NULL;
- gchar* _tmp21_;
- gchar* _tmp22_;
- Photo* _tmp23_;
- Photo* _tmp24_;
+ DirectPhotoSourceCollection* _tmp10_;
+ DirectPhoto* _tmp11_ = NULL;
+ gchar* _tmp12_;
+ gchar* _tmp13_;
+ Photo* _tmp14_;
+ Photo* _tmp15_;
+ DirectPhoto* _tmp16_;
+ gboolean _tmp17_;
+ DirectPhotoSourceCollection* _tmp22_;
+ DirectPhoto* _tmp23_;
+ DirectViewCollection* _tmp24_;
DirectPhoto* _tmp25_;
- gboolean _tmp26_;
- gboolean _tmp27_;
- DirectPhotoSourceCollection* _tmp32_;
- DirectPhoto* _tmp33_;
- DirectViewCollection* _tmp34_;
- DirectPhoto* _tmp35_;
GError * _inner_error_ = NULL;
#line 346 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
g_return_if_fail (IS_DIRECT_PHOTO_PAGE (self));
#line 346 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
g_return_if_fail (G_IS_FILE (dest));
#line 348 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
- _tmp0_ = constraint;
+ scaling_for_constraint (constraint, scale, FALSE, &_tmp0_);
#line 348 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
- _tmp1_ = scale;
-#line 348 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
- scaling_for_constraint (_tmp0_, _tmp1_, FALSE, &_tmp2_);
-#line 348 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
- scaling = _tmp2_;
-#line 2842 "DirectPhotoPage.c"
+ scaling = _tmp0_;
+#line 2995 "DirectPhotoPage.c"
{
- Photo* _tmp3_;
- Photo* _tmp4_;
- GFile* _tmp5_;
- Scaling _tmp6_;
- JpegQuality _tmp7_;
- PhotoFileFormat _tmp8_;
- gboolean _tmp9_;
- gboolean _tmp10_;
-#line 351 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
- _tmp3_ = editing_host_page_get_photo (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage));
-#line 351 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
- _tmp4_ = _tmp3_;
-#line 351 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
- _tmp5_ = dest;
-#line 351 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
- _tmp6_ = scaling;
-#line 351 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
- _tmp7_ = quality;
+ Photo* _tmp1_;
+ Photo* _tmp2_;
+ Scaling _tmp3_;
#line 351 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
- _tmp8_ = format;
+ _tmp1_ = editing_host_page_get_photo (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage));
#line 351 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
- _tmp9_ = copy_unmodified;
+ _tmp2_ = _tmp1_;
#line 351 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
- _tmp10_ = save_metadata;
+ _tmp3_ = scaling;
#line 351 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
- photo_export (_tmp4_, _tmp5_, &_tmp6_, _tmp7_, _tmp8_, _tmp9_, _tmp10_, &_inner_error_);
+ photo_export (_tmp2_, dest, &_tmp3_, quality, format, copy_unmodified, save_metadata, &_inner_error_);
#line 351 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
- _g_object_unref0 (_tmp4_);
+ _g_object_unref0 (_tmp2_);
#line 351 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 2874 "DirectPhotoPage.c"
+#line 3012 "DirectPhotoPage.c"
goto __catch52_g_error;
}
}
@@ -2878,42 +3016,39 @@ static void direct_photo_page_save (DirectPhotoPage* self, GFile* dest, gint sca
__catch52_g_error:
{
GError* err = NULL;
- GFile* _tmp11_;
- gchar* _tmp12_;
- gchar* _tmp13_;
- GError* _tmp14_;
- const gchar* _tmp15_;
- gchar* _tmp16_;
- gchar* _tmp17_;
+ gchar* _tmp4_;
+ gchar* _tmp5_;
+ GError* _tmp6_;
+ const gchar* _tmp7_;
+ gchar* _tmp8_;
+ gchar* _tmp9_;
#line 350 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
err = _inner_error_;
#line 350 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
_inner_error_ = NULL;
#line 353 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
- _tmp11_ = dest;
+ _tmp4_ = g_file_get_path (dest);
#line 353 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
- _tmp12_ = g_file_get_path (_tmp11_);
-#line 353 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
- _tmp13_ = _tmp12_;
+ _tmp5_ = _tmp4_;
#line 353 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
- _tmp14_ = err;
+ _tmp6_ = err;
#line 353 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
- _tmp15_ = _tmp14_->message;
+ _tmp7_ = _tmp6_->message;
#line 353 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
- _tmp16_ = g_strdup_printf (_ ("Error while saving to %s: %s"), _tmp13_, _tmp15_);
+ _tmp8_ = g_strdup_printf (_ ("Error while saving to %s: %s"), _tmp5_, _tmp7_);
#line 353 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
- _tmp17_ = _tmp16_;
+ _tmp9_ = _tmp8_;
#line 353 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
- app_window_error_message (_tmp17_, NULL);
+ app_window_error_message (_tmp9_, NULL);
#line 353 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
- _g_free0 (_tmp17_);
+ _g_free0 (_tmp9_);
#line 353 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
- _g_free0 (_tmp13_);
+ _g_free0 (_tmp5_);
#line 356 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
_g_error_free0 (err);
#line 356 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
return;
-#line 2917 "DirectPhotoPage.c"
+#line 3052 "DirectPhotoPage.c"
}
__finally52:
#line 350 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
@@ -2924,90 +3059,86 @@ static void direct_photo_page_save (DirectPhotoPage* self, GFile* dest, gint sca
g_clear_error (&_inner_error_);
#line 350 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
return;
-#line 2928 "DirectPhotoPage.c"
+#line 3063 "DirectPhotoPage.c"
}
#line 361 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
- _tmp18_ = direct_photo_global;
-#line 361 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
- _tmp19_ = dest;
+ _tmp10_ = direct_photo_global;
#line 361 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
- _tmp21_ = direct_photo_source_collection_fetch (_tmp18_, _tmp19_, &_tmp20_, TRUE);
+ _tmp12_ = direct_photo_source_collection_fetch (_tmp10_, dest, &_tmp11_, TRUE);
#line 361 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
_g_object_unref0 (photo);
#line 361 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
- photo = _tmp20_;
+ photo = _tmp11_;
#line 361 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
- _tmp22_ = _tmp21_;
+ _tmp13_ = _tmp12_;
#line 361 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
- _g_free0 (_tmp22_);
+ _g_free0 (_tmp13_);
#line 363 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
- _tmp23_ = editing_host_page_get_photo (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage));
+ _tmp14_ = editing_host_page_get_photo (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage));
#line 363 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
- _tmp24_ = _tmp23_;
-#line 363 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
- _tmp25_ = photo;
+ _tmp15_ = _tmp14_;
#line 363 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
- _tmp26_ = data_source_equals (G_TYPE_CHECK_INSTANCE_CAST (_tmp24_, TYPE_DATA_SOURCE, DataSource), G_TYPE_CHECK_INSTANCE_CAST (_tmp25_, TYPE_DATA_SOURCE, DataSource));
+ _tmp16_ = photo;
#line 363 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
- _tmp27_ = !_tmp26_;
+ _tmp17_ = !data_source_equals (G_TYPE_CHECK_INSTANCE_CAST (_tmp15_, TYPE_DATA_SOURCE, DataSource), G_TYPE_CHECK_INSTANCE_CAST (_tmp16_, TYPE_DATA_SOURCE, DataSource));
#line 363 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
- _g_object_unref0 (_tmp24_);
+ _g_object_unref0 (_tmp15_);
#line 363 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
- if (_tmp27_) {
-#line 2958 "DirectPhotoPage.c"
+ if (_tmp17_) {
+#line 3089 "DirectPhotoPage.c"
DirectView* tmp_view = NULL;
- DirectPhoto* _tmp28_;
- DirectView* _tmp29_;
- DirectViewCollection* _tmp30_;
- DirectView* _tmp31_;
+ DirectPhoto* _tmp18_;
+ DirectView* _tmp19_;
+ DirectViewCollection* _tmp20_;
+ DirectView* _tmp21_;
#line 364 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
- _tmp28_ = photo;
+ _tmp18_ = photo;
#line 364 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
- _tmp29_ = direct_view_new (_tmp28_);
+ _tmp19_ = direct_view_new (_tmp18_);
#line 364 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
- tmp_view = _tmp29_;
+ tmp_view = _tmp19_;
#line 365 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
- _tmp30_ = self->priv->view_controller;
+ _tmp20_ = self->priv->view_controller;
#line 365 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
- _tmp31_ = tmp_view;
+ _tmp21_ = tmp_view;
#line 365 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
- data_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp30_, TYPE_DATA_COLLECTION, DataCollection), G_TYPE_CHECK_INSTANCE_CAST (_tmp31_, TYPE_DATA_OBJECT, DataObject));
+ data_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp20_, TYPE_DATA_COLLECTION, DataCollection), G_TYPE_CHECK_INSTANCE_CAST (_tmp21_, TYPE_DATA_OBJECT, DataObject));
#line 363 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
_g_object_unref0 (tmp_view);
-#line 2978 "DirectPhotoPage.c"
+#line 3109 "DirectPhotoPage.c"
}
#line 368 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
- _tmp32_ = direct_photo_global;
+ _tmp22_ = direct_photo_global;
#line 368 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
- _tmp33_ = photo;
+ _tmp23_ = photo;
#line 368 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
- direct_photo_source_collection_reimport_photo (_tmp32_, _tmp33_);
+ direct_photo_source_collection_reimport_photo (_tmp22_, _tmp23_);
#line 369 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
- _tmp34_ = self->priv->view_controller;
+ _tmp24_ = self->priv->view_controller;
#line 369 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
- _tmp35_ = photo;
+ _tmp25_ = photo;
#line 369 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
- editing_host_page_display_mirror_of (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage), G_TYPE_CHECK_INSTANCE_CAST (_tmp34_, TYPE_VIEW_COLLECTION, ViewCollection), G_TYPE_CHECK_INSTANCE_CAST (_tmp35_, TYPE_PHOTO, Photo));
+ editing_host_page_display_mirror_of (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage), G_TYPE_CHECK_INSTANCE_CAST (_tmp24_, TYPE_VIEW_COLLECTION, ViewCollection), G_TYPE_CHECK_INSTANCE_CAST (_tmp25_, TYPE_PHOTO, Photo));
#line 346 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
_g_object_unref0 (photo);
-#line 2994 "DirectPhotoPage.c"
+#line 3125 "DirectPhotoPage.c"
}
-static void direct_photo_page_on_save (DirectPhotoPage* self) {
+static void
+direct_photo_page_on_save (DirectPhotoPage* self)
+{
gboolean _tmp0_ = FALSE;
gboolean _tmp1_ = FALSE;
Photo* _tmp2_;
Photo* _tmp3_;
gboolean _tmp4_;
- gboolean _tmp5_;
+ Photo* _tmp7_;
+ Photo* _tmp8_;
+ GFile* _tmp9_;
+ GFile* _tmp10_;
Photo* _tmp11_;
Photo* _tmp12_;
- GFile* _tmp13_;
- GFile* _tmp14_;
- Photo* _tmp15_;
- Photo* _tmp16_;
- PhotoFileFormat _tmp17_;
#line 372 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
g_return_if_fail (IS_DIRECT_PHOTO_PAGE (self));
#line 373 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
@@ -3015,81 +3146,70 @@ static void direct_photo_page_on_save (DirectPhotoPage* self) {
#line 373 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
_tmp3_ = _tmp2_;
#line 373 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
- _tmp4_ = photo_has_alterations (_tmp3_);
-#line 373 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
- _tmp5_ = !_tmp4_;
+ _tmp4_ = !photo_has_alterations (_tmp3_);
#line 373 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
_g_object_unref0 (_tmp3_);
#line 373 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
- if (_tmp5_) {
+ if (_tmp4_) {
#line 373 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
_tmp1_ = TRUE;
-#line 3028 "DirectPhotoPage.c"
+#line 3157 "DirectPhotoPage.c"
} else {
+ Photo* _tmp5_;
Photo* _tmp6_;
- Photo* _tmp7_;
- PhotoFileFormat _tmp8_;
- gboolean _tmp9_;
#line 373 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
- _tmp6_ = editing_host_page_get_photo (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage));
+ _tmp5_ = editing_host_page_get_photo (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage));
#line 373 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
- _tmp7_ = _tmp6_;
+ _tmp6_ = _tmp5_;
#line 373 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
- _tmp8_ = photo_get_file_format (_tmp7_);
+ _tmp1_ = !photo_file_format_can_write (photo_get_file_format (_tmp6_));
#line 373 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
- _tmp9_ = photo_file_format_can_write (_tmp8_);
-#line 373 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
- _tmp1_ = !_tmp9_;
-#line 373 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
- _g_object_unref0 (_tmp7_);
-#line 3046 "DirectPhotoPage.c"
+ _g_object_unref0 (_tmp6_);
+#line 3169 "DirectPhotoPage.c"
}
#line 373 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
if (_tmp1_) {
#line 373 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
_tmp0_ = TRUE;
-#line 3052 "DirectPhotoPage.c"
+#line 3175 "DirectPhotoPage.c"
} else {
- gboolean _tmp10_;
#line 374 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
- _tmp10_ = editing_host_page_get_photo_missing (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage));
-#line 374 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
- _tmp0_ = _tmp10_;
-#line 3059 "DirectPhotoPage.c"
+ _tmp0_ = editing_host_page_get_photo_missing (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage));
+#line 3179 "DirectPhotoPage.c"
}
#line 373 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
if (_tmp0_) {
#line 375 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
return;
-#line 3065 "DirectPhotoPage.c"
+#line 3185 "DirectPhotoPage.c"
}
#line 378 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
- _tmp11_ = editing_host_page_get_photo (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage));
-#line 378 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
- _tmp12_ = _tmp11_;
+ _tmp7_ = editing_host_page_get_photo (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage));
#line 378 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
- _tmp13_ = media_source_get_file (G_TYPE_CHECK_INSTANCE_CAST (_tmp12_, TYPE_MEDIA_SOURCE, MediaSource));
+ _tmp8_ = _tmp7_;
#line 378 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
- _tmp14_ = _tmp13_;
+ _tmp9_ = media_source_get_file (G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, TYPE_MEDIA_SOURCE, MediaSource));
#line 378 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
- _tmp15_ = editing_host_page_get_photo (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage));
+ _tmp10_ = _tmp9_;
#line 378 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
- _tmp16_ = _tmp15_;
+ _tmp11_ = editing_host_page_get_photo (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage));
#line 378 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
- _tmp17_ = photo_get_file_format (_tmp16_);
+ _tmp12_ = _tmp11_;
#line 378 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
- direct_photo_page_save (self, _tmp14_, 0, SCALE_CONSTRAINT_ORIGINAL, JPEG_QUALITY_HIGH, _tmp17_, FALSE, TRUE);
+ direct_photo_page_save (self, _tmp10_, 0, SCALE_CONSTRAINT_ORIGINAL, JPEG_QUALITY_HIGH, photo_get_file_format (_tmp12_), FALSE, TRUE);
#line 378 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
- _g_object_unref0 (_tmp16_);
+ _g_object_unref0 (_tmp12_);
#line 378 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
- _g_object_unref0 (_tmp14_);
+ _g_object_unref0 (_tmp10_);
#line 378 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
- _g_object_unref0 (_tmp12_);
-#line 3089 "DirectPhotoPage.c"
+ _g_object_unref0 (_tmp8_);
+#line 3207 "DirectPhotoPage.c"
}
-static void direct_photo_page_on_save_as (DirectPhotoPage* self) {
+static void
+direct_photo_page_on_save_as (DirectPhotoPage* self)
+{
ExportDialog* export_dialog = NULL;
ExportDialog* _tmp0_;
gint scale = 0;
@@ -3111,43 +3231,41 @@ static void direct_photo_page_on_save_as (DirectPhotoPage* self) {
Photo* _tmp12_;
ExportFormatParameters _tmp13_;
PhotoFileFormat _tmp14_;
- PhotoFileFormat _tmp15_;
gchar** output_format_extensions = NULL;
- PhotoFileFormat _tmp16_;
+ PhotoFileFormat _tmp15_;
+ PhotoFileFormatProperties* _tmp16_;
PhotoFileFormatProperties* _tmp17_;
- PhotoFileFormatProperties* _tmp18_;
- gint _tmp19_;
+ gint _tmp18_;
+ gchar** _tmp19_;
gchar** _tmp20_;
- gchar** _tmp21_;
- gint _tmp21__length1;
+ gint _tmp20__length1;
gint output_format_extensions_length1;
gint _output_format_extensions_size_;
GtkFileFilter* output_format_filter = NULL;
- GtkFileFilter* _tmp22_;
- gchar** _tmp23_;
- gint _tmp23__length1;
+ GtkFileFilter* _tmp21_;
+ gchar** _tmp22_;
+ gint _tmp22__length1;
GtkFileChooserDialog* save_as_dialog = NULL;
+ AppWindow* _tmp34_;
AppWindow* _tmp35_;
- AppWindow* _tmp36_;
+ GtkFileChooserDialog* _tmp36_;
GtkFileChooserDialog* _tmp37_;
GtkFileChooserDialog* _tmp38_;
GtkFileChooserDialog* _tmp39_;
- GtkFileChooserDialog* _tmp40_;
- const gchar* _tmp41_;
- GtkFileChooserDialog* _tmp42_;
- GFile* _tmp43_;
+ const gchar* _tmp40_;
+ GtkFileChooserDialog* _tmp41_;
+ GFile* _tmp42_;
+ gchar* _tmp43_;
gchar* _tmp44_;
- gchar* _tmp45_;
- GtkFileChooserDialog* _tmp46_;
+ GtkFileChooserDialog* _tmp45_;
+ GtkFileFilter* _tmp46_;
GtkFileFilter* _tmp47_;
- GtkFileFilter* _tmp48_;
+ GtkFileChooserDialog* _tmp48_;
GtkFileChooserDialog* _tmp49_;
- GtkFileChooserDialog* _tmp50_;
gint response = 0;
- GtkFileChooserDialog* _tmp51_;
- gint _tmp52_;
- gint _tmp53_;
- GtkFileChooserDialog* _tmp72_;
+ GtkFileChooserDialog* _tmp50_;
+ gint _tmp51_;
+ GtkFileChooserDialog* _tmp70_;
#line 382 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
g_return_if_fail (IS_DIRECT_PHOTO_PAGE (self));
#line 383 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
@@ -3174,7 +3292,7 @@ static void direct_photo_page_on_save_as (DirectPhotoPage* self) {
_g_object_unref0 (export_dialog);
#line 389 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
return;
-#line 3178 "DirectPhotoPage.c"
+#line 3296 "DirectPhotoPage.c"
}
#line 391 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
_tmp6_ = editing_host_page_get_photo (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage));
@@ -3199,250 +3317,246 @@ static void direct_photo_page_on_save_as (DirectPhotoPage* self) {
#line 392 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
_tmp14_ = photo_get_export_format_for_parameters (_tmp12_, &_tmp13_);
#line 392 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
- _tmp15_ = _tmp14_;
-#line 392 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
_g_object_unref0 (_tmp12_);
#line 392 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
- effective_export_format = _tmp15_;
+ effective_export_format = _tmp14_;
#line 395 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
- _tmp16_ = effective_export_format;
+ _tmp15_ = effective_export_format;
#line 395 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
- _tmp17_ = photo_file_format_get_properties (_tmp16_);
+ _tmp16_ = photo_file_format_get_properties (_tmp15_);
#line 395 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
- _tmp18_ = _tmp17_;
+ _tmp17_ = _tmp16_;
#line 395 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
- _tmp20_ = photo_file_format_properties_get_known_extensions (_tmp18_, &_tmp19_);
+ _tmp19_ = photo_file_format_properties_get_known_extensions (_tmp17_, &_tmp18_);
#line 395 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
- _tmp21_ = _tmp20_;
+ _tmp20_ = _tmp19_;
#line 395 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
- _tmp21__length1 = _tmp19_;
+ _tmp20__length1 = _tmp18_;
#line 395 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
- _photo_file_format_properties_unref0 (_tmp18_);
+ _photo_file_format_properties_unref0 (_tmp17_);
#line 395 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
- output_format_extensions = _tmp21_;
+ output_format_extensions = _tmp20_;
#line 395 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
- output_format_extensions_length1 = _tmp21__length1;
+ output_format_extensions_length1 = _tmp20__length1;
#line 395 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
_output_format_extensions_size_ = output_format_extensions_length1;
#line 397 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
- _tmp22_ = gtk_file_filter_new ();
+ _tmp21_ = gtk_file_filter_new ();
#line 397 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
- g_object_ref_sink (_tmp22_);
+ g_object_ref_sink (_tmp21_);
#line 397 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
- output_format_filter = _tmp22_;
+ output_format_filter = _tmp21_;
#line 398 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
- _tmp23_ = output_format_extensions;
+ _tmp22_ = output_format_extensions;
#line 398 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
- _tmp23__length1 = output_format_extensions_length1;
-#line 3238 "DirectPhotoPage.c"
+ _tmp22__length1 = output_format_extensions_length1;
+#line 3354 "DirectPhotoPage.c"
{
gchar** extension_collection = NULL;
gint extension_collection_length1 = 0;
gint _extension_collection_size_ = 0;
gint extension_it = 0;
#line 398 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
- extension_collection = _tmp23_;
+ extension_collection = _tmp22_;
#line 398 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
- extension_collection_length1 = _tmp23__length1;
+ extension_collection_length1 = _tmp22__length1;
#line 398 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
- for (extension_it = 0; extension_it < _tmp23__length1; extension_it = extension_it + 1) {
-#line 3250 "DirectPhotoPage.c"
- gchar* _tmp24_;
+ for (extension_it = 0; extension_it < _tmp22__length1; extension_it = extension_it + 1) {
+#line 3366 "DirectPhotoPage.c"
+ gchar* _tmp23_;
gchar* extension = NULL;
#line 398 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
- _tmp24_ = g_strdup (extension_collection[extension_it]);
+ _tmp23_ = g_strdup (extension_collection[extension_it]);
#line 398 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
- extension = _tmp24_;
-#line 3257 "DirectPhotoPage.c"
+ extension = _tmp23_;
+#line 3373 "DirectPhotoPage.c"
{
gchar* uppercase_extension = NULL;
- const gchar* _tmp25_;
- gchar* _tmp26_;
- GtkFileFilter* _tmp27_;
- const gchar* _tmp28_;
+ const gchar* _tmp24_;
+ gchar* _tmp25_;
+ GtkFileFilter* _tmp26_;
+ const gchar* _tmp27_;
+ gchar* _tmp28_;
gchar* _tmp29_;
- gchar* _tmp30_;
- GtkFileFilter* _tmp31_;
- const gchar* _tmp32_;
+ GtkFileFilter* _tmp30_;
+ const gchar* _tmp31_;
+ gchar* _tmp32_;
gchar* _tmp33_;
- gchar* _tmp34_;
#line 399 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
- _tmp25_ = extension;
+ _tmp24_ = extension;
#line 399 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
- _tmp26_ = g_utf8_strup (_tmp25_, (gssize) -1);
+ _tmp25_ = g_utf8_strup (_tmp24_, (gssize) -1);
#line 399 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
- uppercase_extension = _tmp26_;
+ uppercase_extension = _tmp25_;
#line 400 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
- _tmp27_ = output_format_filter;
+ _tmp26_ = output_format_filter;
#line 400 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
- _tmp28_ = extension;
+ _tmp27_ = extension;
#line 400 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
- _tmp29_ = g_strconcat ("*.", _tmp28_, NULL);
+ _tmp28_ = g_strconcat ("*.", _tmp27_, NULL);
#line 400 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
- _tmp30_ = _tmp29_;
+ _tmp29_ = _tmp28_;
#line 400 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
- gtk_file_filter_add_pattern (_tmp27_, _tmp30_);
+ gtk_file_filter_add_pattern (_tmp26_, _tmp29_);
#line 400 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
- _g_free0 (_tmp30_);
+ _g_free0 (_tmp29_);
#line 401 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
- _tmp31_ = output_format_filter;
+ _tmp30_ = output_format_filter;
#line 401 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
- _tmp32_ = uppercase_extension;
+ _tmp31_ = uppercase_extension;
#line 401 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
- _tmp33_ = g_strconcat ("*.", _tmp32_, NULL);
+ _tmp32_ = g_strconcat ("*.", _tmp31_, NULL);
#line 401 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
- _tmp34_ = _tmp33_;
+ _tmp33_ = _tmp32_;
#line 401 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
- gtk_file_filter_add_pattern (_tmp31_, _tmp34_);
+ gtk_file_filter_add_pattern (_tmp30_, _tmp33_);
#line 401 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
- _g_free0 (_tmp34_);
+ _g_free0 (_tmp33_);
#line 398 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
_g_free0 (uppercase_extension);
#line 398 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
_g_free0 (extension);
-#line 3304 "DirectPhotoPage.c"
+#line 3420 "DirectPhotoPage.c"
}
}
}
#line 404 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
- _tmp35_ = app_window_get_instance ();
+ _tmp34_ = app_window_get_instance ();
#line 404 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
- _tmp36_ = _tmp35_;
+ _tmp35_ = _tmp34_;
#line 404 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
- _tmp37_ = (GtkFileChooserDialog*) gtk_file_chooser_dialog_new (_ ("Save As"), G_TYPE_CHECK_INSTANCE_CAST (_tmp36_, gtk_window_get_type (), GtkWindow), GTK_FILE_CHOOSER_ACTION_SAVE, RESOURCES_CANCEL_LABEL, GTK_RESPONSE_CANCEL, RESOURCES_OK_LABEL, GTK_RESPONSE_OK, NULL);
+ _tmp36_ = (GtkFileChooserDialog*) gtk_file_chooser_dialog_new (_ ("Save As"), G_TYPE_CHECK_INSTANCE_CAST (_tmp35_, gtk_window_get_type (), GtkWindow), GTK_FILE_CHOOSER_ACTION_SAVE, RESOURCES_CANCEL_LABEL, GTK_RESPONSE_CANCEL, RESOURCES_OK_LABEL, GTK_RESPONSE_OK, NULL);
#line 404 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
- g_object_ref_sink (_tmp37_);
+ g_object_ref_sink (_tmp36_);
#line 404 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
- _tmp38_ = _tmp37_;
+ _tmp37_ = _tmp36_;
#line 404 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
- _g_object_unref0 (_tmp36_);
+ _g_object_unref0 (_tmp35_);
#line 404 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
- save_as_dialog = _tmp38_;
+ save_as_dialog = _tmp37_;
#line 407 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
- _tmp39_ = save_as_dialog;
+ _tmp38_ = save_as_dialog;
#line 407 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
- gtk_file_chooser_set_select_multiple (G_TYPE_CHECK_INSTANCE_CAST (_tmp39_, GTK_TYPE_FILE_CHOOSER, GtkFileChooser), FALSE);
+ gtk_file_chooser_set_select_multiple (G_TYPE_CHECK_INSTANCE_CAST (_tmp38_, gtk_file_chooser_get_type (), GtkFileChooser), FALSE);
#line 408 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
- _tmp40_ = save_as_dialog;
+ _tmp39_ = save_as_dialog;
#line 408 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
- _tmp41_ = filename;
+ _tmp40_ = filename;
#line 408 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
- gtk_file_chooser_set_current_name (G_TYPE_CHECK_INSTANCE_CAST (_tmp40_, GTK_TYPE_FILE_CHOOSER, GtkFileChooser), _tmp41_);
+ gtk_file_chooser_set_current_name (G_TYPE_CHECK_INSTANCE_CAST (_tmp39_, gtk_file_chooser_get_type (), GtkFileChooser), _tmp40_);
#line 409 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
- _tmp42_ = save_as_dialog;
+ _tmp41_ = save_as_dialog;
#line 409 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
- _tmp43_ = self->priv->current_save_dir;
+ _tmp42_ = self->priv->current_save_dir;
#line 409 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
- _tmp44_ = g_file_get_path (_tmp43_);
+ _tmp43_ = g_file_get_path (_tmp42_);
#line 409 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
- _tmp45_ = _tmp44_;
+ _tmp44_ = _tmp43_;
#line 409 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
- gtk_file_chooser_set_current_folder (G_TYPE_CHECK_INSTANCE_CAST (_tmp42_, GTK_TYPE_FILE_CHOOSER, GtkFileChooser), _tmp45_);
+ gtk_file_chooser_set_current_folder (G_TYPE_CHECK_INSTANCE_CAST (_tmp41_, gtk_file_chooser_get_type (), GtkFileChooser), _tmp44_);
#line 409 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
- _g_free0 (_tmp45_);
+ _g_free0 (_tmp44_);
#line 410 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
- _tmp46_ = save_as_dialog;
+ _tmp45_ = save_as_dialog;
#line 410 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
- _tmp47_ = output_format_filter;
+ _tmp46_ = output_format_filter;
#line 410 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
- _tmp48_ = _g_object_ref0 (_tmp47_);
+ _tmp47_ = _g_object_ref0 (_tmp46_);
#line 410 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
- gtk_file_chooser_add_filter (G_TYPE_CHECK_INSTANCE_CAST (_tmp46_, GTK_TYPE_FILE_CHOOSER, GtkFileChooser), _tmp48_);
+ gtk_file_chooser_add_filter (G_TYPE_CHECK_INSTANCE_CAST (_tmp45_, gtk_file_chooser_get_type (), GtkFileChooser), _tmp47_);
#line 411 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
- _tmp49_ = save_as_dialog;
+ _tmp48_ = save_as_dialog;
#line 411 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
- gtk_file_chooser_set_do_overwrite_confirmation (G_TYPE_CHECK_INSTANCE_CAST (_tmp49_, GTK_TYPE_FILE_CHOOSER, GtkFileChooser), TRUE);
+ gtk_file_chooser_set_do_overwrite_confirmation (G_TYPE_CHECK_INSTANCE_CAST (_tmp48_, gtk_file_chooser_get_type (), GtkFileChooser), TRUE);
#line 412 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
- _tmp50_ = save_as_dialog;
+ _tmp49_ = save_as_dialog;
#line 412 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
- gtk_file_chooser_set_local_only (G_TYPE_CHECK_INSTANCE_CAST (_tmp50_, GTK_TYPE_FILE_CHOOSER, GtkFileChooser), FALSE);
-#line 414 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
- _tmp51_ = save_as_dialog;
+ gtk_file_chooser_set_local_only (G_TYPE_CHECK_INSTANCE_CAST (_tmp49_, gtk_file_chooser_get_type (), GtkFileChooser), FALSE);
#line 414 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
- _tmp52_ = gtk_dialog_run (G_TYPE_CHECK_INSTANCE_CAST (_tmp51_, gtk_dialog_get_type (), GtkDialog));
+ _tmp50_ = save_as_dialog;
#line 414 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
- response = _tmp52_;
+ response = gtk_dialog_run (G_TYPE_CHECK_INSTANCE_CAST (_tmp50_, gtk_dialog_get_type (), GtkDialog));
#line 415 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
- _tmp53_ = response;
+ _tmp51_ = response;
#line 415 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
- if (_tmp53_ == ((gint) GTK_RESPONSE_OK)) {
-#line 3370 "DirectPhotoPage.c"
- GtkFileChooserDialog* _tmp54_;
- gchar* _tmp55_;
- gchar* _tmp56_;
- GFile* _tmp57_;
- GFile* _tmp58_;
- gint _tmp59_;
- ScaleConstraint _tmp60_;
- ExportFormatParameters _tmp61_;
- JpegQuality _tmp62_;
- PhotoFileFormat _tmp63_;
+ if (_tmp51_ == ((gint) GTK_RESPONSE_OK)) {
+#line 3484 "DirectPhotoPage.c"
+ GtkFileChooserDialog* _tmp52_;
+ gchar* _tmp53_;
+ gchar* _tmp54_;
+ GFile* _tmp55_;
+ GFile* _tmp56_;
+ gint _tmp57_;
+ ScaleConstraint _tmp58_;
+ ExportFormatParameters _tmp59_;
+ JpegQuality _tmp60_;
+ PhotoFileFormat _tmp61_;
+ ExportFormatParameters _tmp62_;
+ ExportFormatMode _tmp63_;
ExportFormatParameters _tmp64_;
- ExportFormatMode _tmp65_;
- ExportFormatParameters _tmp66_;
- gboolean _tmp67_;
- GtkFileChooserDialog* _tmp68_;
- gchar* _tmp69_;
- gchar* _tmp70_;
- GFile* _tmp71_;
+ gboolean _tmp65_;
+ GtkFileChooserDialog* _tmp66_;
+ gchar* _tmp67_;
+ gchar* _tmp68_;
+ GFile* _tmp69_;
#line 418 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
self->priv->drop_if_dirty = TRUE;
#line 419 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
- _tmp54_ = save_as_dialog;
+ _tmp52_ = save_as_dialog;
#line 419 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
- _tmp55_ = gtk_file_chooser_get_uri (G_TYPE_CHECK_INSTANCE_CAST (_tmp54_, GTK_TYPE_FILE_CHOOSER, GtkFileChooser));
+ _tmp53_ = gtk_file_chooser_get_uri (G_TYPE_CHECK_INSTANCE_CAST (_tmp52_, gtk_file_chooser_get_type (), GtkFileChooser));
#line 419 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
- _tmp56_ = _tmp55_;
+ _tmp54_ = _tmp53_;
#line 419 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
- _tmp57_ = g_file_new_for_uri (_tmp56_);
+ _tmp55_ = g_file_new_for_uri (_tmp54_);
#line 419 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
- _tmp58_ = _tmp57_;
+ _tmp56_ = _tmp55_;
#line 419 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
- _tmp59_ = scale;
+ _tmp57_ = scale;
#line 419 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
- _tmp60_ = constraint;
+ _tmp58_ = constraint;
#line 419 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
- _tmp61_ = export_params;
+ _tmp59_ = export_params;
#line 419 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
- _tmp62_ = _tmp61_.quality;
+ _tmp60_ = _tmp59_.quality;
#line 419 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
- _tmp63_ = effective_export_format;
+ _tmp61_ = effective_export_format;
#line 419 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
- _tmp64_ = export_params;
+ _tmp62_ = export_params;
#line 419 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
- _tmp65_ = _tmp64_.mode;
+ _tmp63_ = _tmp62_.mode;
#line 419 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
- _tmp66_ = export_params;
+ _tmp64_ = export_params;
#line 419 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
- _tmp67_ = _tmp66_.export_metadata;
+ _tmp65_ = _tmp64_.export_metadata;
#line 419 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
- direct_photo_page_save (self, _tmp58_, _tmp59_, _tmp60_, _tmp62_, _tmp63_, _tmp65_ == EXPORT_FORMAT_MODE_UNMODIFIED, _tmp67_);
+ direct_photo_page_save (self, _tmp56_, _tmp57_, _tmp58_, _tmp60_, _tmp61_, _tmp63_ == EXPORT_FORMAT_MODE_UNMODIFIED, _tmp65_);
#line 419 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
- _g_object_unref0 (_tmp58_);
+ _g_object_unref0 (_tmp56_);
#line 419 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
- _g_free0 (_tmp56_);
+ _g_free0 (_tmp54_);
#line 422 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
self->priv->drop_if_dirty = FALSE;
#line 424 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
- _tmp68_ = save_as_dialog;
+ _tmp66_ = save_as_dialog;
#line 424 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
- _tmp69_ = gtk_file_chooser_get_current_folder (G_TYPE_CHECK_INSTANCE_CAST (_tmp68_, GTK_TYPE_FILE_CHOOSER, GtkFileChooser));
+ _tmp67_ = gtk_file_chooser_get_current_folder (G_TYPE_CHECK_INSTANCE_CAST (_tmp66_, gtk_file_chooser_get_type (), GtkFileChooser));
#line 424 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
- _tmp70_ = _tmp69_;
+ _tmp68_ = _tmp67_;
#line 424 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
- _tmp71_ = g_file_new_for_path (_tmp70_);
+ _tmp69_ = g_file_new_for_path (_tmp68_);
#line 424 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
_g_object_unref0 (self->priv->current_save_dir);
#line 424 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
- self->priv->current_save_dir = _tmp71_;
+ self->priv->current_save_dir = _tmp69_;
#line 424 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
- _g_free0 (_tmp70_);
-#line 3441 "DirectPhotoPage.c"
+ _g_free0 (_tmp68_);
+#line 3555 "DirectPhotoPage.c"
}
#line 427 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
- _tmp72_ = save_as_dialog;
+ _tmp70_ = save_as_dialog;
#line 427 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
- gtk_widget_destroy (G_TYPE_CHECK_INSTANCE_CAST (_tmp72_, gtk_widget_get_type (), GtkWidget));
+ gtk_widget_destroy (G_TYPE_CHECK_INSTANCE_CAST (_tmp70_, gtk_widget_get_type (), GtkWidget));
#line 382 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
_g_object_unref0 (save_as_dialog);
#line 382 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
@@ -3453,58 +3567,59 @@ static void direct_photo_page_on_save_as (DirectPhotoPage* self) {
_g_free0 (filename);
#line 382 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
_g_object_unref0 (export_dialog);
-#line 3457 "DirectPhotoPage.c"
+#line 3571 "DirectPhotoPage.c"
}
-static void direct_photo_page_on_send_to (DirectPhotoPage* self) {
- gboolean _tmp0_;
+static void
+direct_photo_page_on_send_to (DirectPhotoPage* self)
+{
#line 430 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
g_return_if_fail (IS_DIRECT_PHOTO_PAGE (self));
#line 431 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
- _tmp0_ = editing_host_page_has_photo (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage));
-#line 431 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
- if (_tmp0_) {
-#line 3469 "DirectPhotoPage.c"
+ if (editing_host_page_has_photo (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage))) {
+#line 3582 "DirectPhotoPage.c"
+ ViewCollection* _tmp0_;
ViewCollection* _tmp1_;
- ViewCollection* _tmp2_;
- GeeList* _tmp3_;
- GeeCollection* _tmp4_;
+ GeeList* _tmp2_;
+ GeeCollection* _tmp3_;
#line 432 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
- _tmp1_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
+ _tmp0_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
#line 432 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
- _tmp2_ = _tmp1_;
+ _tmp1_ = _tmp0_;
#line 432 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
- _tmp3_ = view_collection_get_selected_sources (_tmp2_);
+ _tmp2_ = view_collection_get_selected_sources (_tmp1_);
#line 432 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
- _tmp4_ = G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, GEE_TYPE_COLLECTION, GeeCollection);
+ _tmp3_ = G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, GEE_TYPE_COLLECTION, GeeCollection);
#line 432 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
- desktop_integration_send_to (_tmp4_);
+ desktop_integration_send_to (_tmp3_);
#line 432 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
- _g_object_unref0 (_tmp4_);
+ _g_object_unref0 (_tmp3_);
#line 432 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
- _data_collection_unref0 (_tmp2_);
-#line 3488 "DirectPhotoPage.c"
+ _data_collection_unref0 (_tmp1_);
+#line 3601 "DirectPhotoPage.c"
}
}
-static gboolean direct_photo_page_real_on_app_key_pressed (Page* base, GdkEventKey* event) {
+static gboolean
+direct_photo_page_real_on_app_key_pressed (Page* base,
+ GdkEventKey* event)
+{
DirectPhotoPage * self;
gboolean result = FALSE;
gboolean handled = FALSE;
- GdkEventKey* _tmp0_;
- guint _tmp1_;
+ guint _tmp0_;
+ const gchar* _tmp1_;
const gchar* _tmp2_;
- const gchar* _tmp3_;
- GQuark _tmp5_ = 0U;
+ GQuark _tmp4_ = 0U;
#line 438 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
- static GQuark _tmp4_label0 = 0;
+ static GQuark _tmp3_label0 = 0;
#line 438 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
- static GQuark _tmp4_label1 = 0;
-#line 3506 "DirectPhotoPage.c"
- gboolean _tmp6_ = FALSE;
- gboolean _tmp7_;
+ static GQuark _tmp3_label1 = 0;
+#line 3621 "DirectPhotoPage.c"
+ gboolean _tmp5_ = FALSE;
+ gboolean _tmp6_;
#line 435 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_DIRECT_PHOTO_PAGE, DirectPhotoPage);
#line 435 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
@@ -3512,87 +3627,80 @@ static gboolean direct_photo_page_real_on_app_key_pressed (Page* base, GdkEventK
#line 436 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
handled = TRUE;
#line 438 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
- _tmp0_ = event;
+ _tmp0_ = event->keyval;
#line 438 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
- _tmp1_ = _tmp0_->keyval;
+ _tmp1_ = gdk_keyval_name (_tmp0_);
#line 438 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
- _tmp2_ = gdk_keyval_name (_tmp1_);
-#line 438 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
- _tmp3_ = _tmp2_;
+ _tmp2_ = _tmp1_;
#line 438 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
- _tmp5_ = (NULL == _tmp3_) ? 0 : g_quark_from_string (_tmp3_);
+ _tmp4_ = (NULL == _tmp2_) ? 0 : g_quark_from_string (_tmp2_);
#line 438 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
- if (_tmp5_ == ((0 != _tmp4_label0) ? _tmp4_label0 : (_tmp4_label0 = g_quark_from_static_string ("bracketright")))) {
+ if (_tmp4_ == ((0 != _tmp3_label0) ? _tmp3_label0 : (_tmp3_label0 = g_quark_from_static_string ("bracketright")))) {
#line 438 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
switch (0) {
-#line 3529 "DirectPhotoPage.c"
+#line 3642 "DirectPhotoPage.c"
default:
{
#line 440 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
page_activate_action (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "RotateClockwise");
#line 441 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
break;
-#line 3536 "DirectPhotoPage.c"
+#line 3649 "DirectPhotoPage.c"
}
}
- } else if (_tmp5_ == ((0 != _tmp4_label1) ? _tmp4_label1 : (_tmp4_label1 = g_quark_from_static_string ("bracketleft")))) {
+ } else if (_tmp4_ == ((0 != _tmp3_label1) ? _tmp3_label1 : (_tmp3_label1 = g_quark_from_static_string ("bracketleft")))) {
#line 438 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
switch (0) {
-#line 3542 "DirectPhotoPage.c"
+#line 3655 "DirectPhotoPage.c"
default:
{
#line 444 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
page_activate_action (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "RotateClockwise");
#line 445 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
break;
-#line 3549 "DirectPhotoPage.c"
+#line 3662 "DirectPhotoPage.c"
}
}
} else {
#line 438 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
switch (0) {
-#line 3555 "DirectPhotoPage.c"
+#line 3668 "DirectPhotoPage.c"
default:
{
#line 448 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
handled = FALSE;
#line 449 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
break;
-#line 3562 "DirectPhotoPage.c"
+#line 3675 "DirectPhotoPage.c"
}
}
}
#line 452 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
- _tmp7_ = handled;
+ _tmp6_ = handled;
#line 452 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
- if (_tmp7_) {
+ if (_tmp6_) {
#line 452 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
- _tmp6_ = TRUE;
-#line 3572 "DirectPhotoPage.c"
+ _tmp5_ = TRUE;
+#line 3685 "DirectPhotoPage.c"
} else {
- GdkEventKey* _tmp8_;
- gboolean _tmp9_;
-#line 452 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
- _tmp8_ = event;
#line 452 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
- _tmp9_ = PAGE_CLASS (direct_photo_page_parent_class)->on_app_key_pressed (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage), TYPE_PAGE, Page), _tmp8_);
-#line 452 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
- _tmp6_ = _tmp9_;
-#line 3582 "DirectPhotoPage.c"
+ _tmp5_ = PAGE_CLASS (direct_photo_page_parent_class)->on_app_key_pressed (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage), TYPE_PAGE, Page), event);
+#line 3689 "DirectPhotoPage.c"
}
#line 452 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
- result = _tmp6_;
+ result = _tmp5_;
#line 452 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
return result;
-#line 3588 "DirectPhotoPage.c"
+#line 3695 "DirectPhotoPage.c"
}
-static void direct_photo_page_on_print (DirectPhotoPage* self) {
+static void
+direct_photo_page_on_print (DirectPhotoPage* self)
+{
ViewCollection* _tmp0_;
ViewCollection* _tmp1_;
- gint _tmp2_;
- gboolean _tmp3_;
+ gboolean _tmp2_;
#line 455 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
g_return_if_fail (IS_DIRECT_PHOTO_PAGE (self));
#line 456 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
@@ -3600,60 +3708,62 @@ static void direct_photo_page_on_print (DirectPhotoPage* self) {
#line 456 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
_tmp1_ = _tmp0_;
#line 456 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
- _tmp2_ = view_collection_get_selected_count (_tmp1_);
-#line 456 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
- _tmp3_ = _tmp2_ > 0;
+ _tmp2_ = view_collection_get_selected_count (_tmp1_) > 0;
#line 456 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
_data_collection_unref0 (_tmp1_);
#line 456 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
- if (_tmp3_) {
-#line 3611 "DirectPhotoPage.c"
+ if (_tmp2_) {
+#line 3717 "DirectPhotoPage.c"
+ PrintManager* _tmp3_;
PrintManager* _tmp4_;
- PrintManager* _tmp5_;
+ ViewCollection* _tmp5_;
ViewCollection* _tmp6_;
- ViewCollection* _tmp7_;
- GeeList* _tmp8_;
- GeeCollection* _tmp9_;
+ GeeList* _tmp7_;
+ GeeCollection* _tmp8_;
#line 457 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
- _tmp4_ = print_manager_get_instance ();
+ _tmp3_ = print_manager_get_instance ();
#line 457 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
- _tmp5_ = _tmp4_;
+ _tmp4_ = _tmp3_;
#line 457 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
- _tmp6_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
+ _tmp5_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
#line 457 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
- _tmp7_ = _tmp6_;
+ _tmp6_ = _tmp5_;
#line 457 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
- _tmp8_ = view_collection_get_selected_sources_of_type (_tmp7_, TYPE_PHOTO);
+ _tmp7_ = view_collection_get_selected_sources_of_type (_tmp6_, TYPE_PHOTO);
#line 457 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
- _tmp9_ = G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, GEE_TYPE_COLLECTION, GeeCollection);
+ _tmp8_ = G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, GEE_TYPE_COLLECTION, GeeCollection);
#line 457 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
- print_manager_spool_photo (_tmp5_, _tmp9_);
+ print_manager_spool_photo (_tmp4_, _tmp8_);
#line 457 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
- _g_object_unref0 (_tmp9_);
+ _g_object_unref0 (_tmp8_);
#line 457 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
- _data_collection_unref0 (_tmp7_);
+ _data_collection_unref0 (_tmp6_);
#line 457 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
- _print_manager_unref0 (_tmp5_);
-#line 3638 "DirectPhotoPage.c"
+ _print_manager_unref0 (_tmp4_);
+#line 3744 "DirectPhotoPage.c"
}
}
-static Block7Data* block7_data_ref (Block7Data* _data7_) {
+static Block7Data*
+block7_data_ref (Block7Data* _data7_)
+{
#line 462 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
g_atomic_int_inc (&_data7_->_ref_count_);
#line 462 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
return _data7_;
-#line 3648 "DirectPhotoPage.c"
+#line 3756 "DirectPhotoPage.c"
}
-static void block7_data_unref (void * _userdata_) {
+static void
+block7_data_unref (void * _userdata_)
+{
Block7Data* _data7_;
_data7_ = (Block7Data*) _userdata_;
#line 462 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
if (g_atomic_int_dec_and_test (&_data7_->_ref_count_)) {
-#line 3657 "DirectPhotoPage.c"
+#line 3767 "DirectPhotoPage.c"
DirectPhotoPage* self;
#line 462 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
self = _data7_->self;
@@ -3661,41 +3771,44 @@ static void block7_data_unref (void * _userdata_) {
_g_object_unref0 (self);
#line 462 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
g_slice_free (Block7Data, _data7_);
-#line 3665 "DirectPhotoPage.c"
+#line 3775 "DirectPhotoPage.c"
}
}
-static gboolean __lambda17_ (Block7Data* _data7_) {
+static gboolean
+__lambda17_ (Block7Data* _data7_)
+{
DirectPhotoPage* self;
gboolean result = FALSE;
- gboolean _tmp0_;
#line 466 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
self = _data7_->self;
#line 467 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
- _tmp0_ = _data7_->should_allow_rotation;
-#line 467 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
- editing_host_page_enable_rotate (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage), _tmp0_);
+ editing_host_page_enable_rotate (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage), _data7_->should_allow_rotation);
#line 469 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
result = FALSE;
#line 469 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
return result;
-#line 3684 "DirectPhotoPage.c"
+#line 3793 "DirectPhotoPage.c"
}
-static gboolean ___lambda17__gsource_func (gpointer self) {
+static gboolean
+___lambda17__gsource_func (gpointer self)
+{
gboolean result;
result = __lambda17_ (self);
#line 466 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
return result;
-#line 3693 "DirectPhotoPage.c"
+#line 3804 "DirectPhotoPage.c"
}
-static void direct_photo_page_on_dphoto_can_rotate_changed (DirectPhotoPage* self, gboolean should_allow_rotation) {
+static void
+direct_photo_page_on_dphoto_can_rotate_changed (DirectPhotoPage* self,
+ gboolean should_allow_rotation)
+{
Block7Data* _data7_;
- gboolean _tmp0_;
#line 462 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
g_return_if_fail (IS_DIRECT_PHOTO_PAGE (self));
#line 462 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
@@ -3705,41 +3818,41 @@ static void direct_photo_page_on_dphoto_can_rotate_changed (DirectPhotoPage* sel
#line 462 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
_data7_->self = g_object_ref (self);
#line 462 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
- _tmp0_ = should_allow_rotation;
-#line 462 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
- _data7_->should_allow_rotation = _tmp0_;
+ _data7_->should_allow_rotation = should_allow_rotation;
#line 466 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
g_idle_add_full (G_PRIORITY_DEFAULT_IDLE, ___lambda17__gsource_func, block7_data_ref (_data7_), block7_data_unref);
#line 462 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
block7_data_unref (_data7_);
#line 462 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
_data7_ = NULL;
-#line 3718 "DirectPhotoPage.c"
+#line 3829 "DirectPhotoPage.c"
}
-static DataView* direct_photo_page_real_create_photo_view (EditingHostPage* base, DataSource* source) {
+static DataView*
+direct_photo_page_real_create_photo_view (EditingHostPage* base,
+ DataSource* source)
+{
DirectPhotoPage * self;
DataView* result = NULL;
- DataSource* _tmp0_;
- DirectView* _tmp1_;
+ DirectView* _tmp0_;
#line 473 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_DIRECT_PHOTO_PAGE, DirectPhotoPage);
#line 473 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
g_return_val_if_fail (IS_DATA_SOURCE (source), NULL);
#line 474 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
- _tmp0_ = source;
-#line 474 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
- _tmp1_ = direct_view_new (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, TYPE_DIRECT_PHOTO, DirectPhoto));
+ _tmp0_ = direct_view_new (G_TYPE_CHECK_INSTANCE_CAST (source, TYPE_DIRECT_PHOTO, DirectPhoto));
#line 474 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
- result = G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, TYPE_DATA_VIEW, DataView);
+ result = G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, TYPE_DATA_VIEW, DataView);
#line 474 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
return result;
-#line 3739 "DirectPhotoPage.c"
+#line 3850 "DirectPhotoPage.c"
}
-static void direct_photo_page_class_init (DirectPhotoPageClass * klass) {
+static void
+direct_photo_page_class_init (DirectPhotoPageClass * klass)
+{
#line 7 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
direct_photo_page_parent_class = g_type_class_peek_parent (klass);
#line 7 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
@@ -3776,22 +3889,26 @@ static void direct_photo_page_class_init (DirectPhotoPageClass * klass) {
((EditingHostPageClass *) klass)->create_photo_view = (DataView* (*) (EditingHostPage *, DataSource*)) direct_photo_page_real_create_photo_view;
#line 7 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
G_OBJECT_CLASS (klass)->finalize = direct_photo_page_finalize;
-#line 3780 "DirectPhotoPage.c"
+#line 3893 "DirectPhotoPage.c"
}
-static void direct_photo_page_instance_init (DirectPhotoPage * self) {
+static void
+direct_photo_page_instance_init (DirectPhotoPage * self)
+{
#line 7 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
self->priv = DIRECT_PHOTO_PAGE_GET_PRIVATE (self);
#line 9 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
self->priv->view_controller = NULL;
#line 11 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
self->priv->drop_if_dirty = FALSE;
-#line 3791 "DirectPhotoPage.c"
+#line 3906 "DirectPhotoPage.c"
}
-static void direct_photo_page_finalize (GObject * obj) {
+static void
+direct_photo_page_finalize (GObject * obj)
+{
DirectPhotoPage * self;
DirectPhotoSourceCollection* _tmp0_;
guint _tmp1_;
@@ -3813,11 +3930,13 @@ static void direct_photo_page_finalize (GObject * obj) {
_g_object_unref0 (self->priv->context_menu);
#line 7 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
G_OBJECT_CLASS (direct_photo_page_parent_class)->finalize (obj);
-#line 3817 "DirectPhotoPage.c"
+#line 3934 "DirectPhotoPage.c"
}
-GType direct_photo_page_get_type (void) {
+GType
+direct_photo_page_get_type (void)
+{
static volatile gsize direct_photo_page_type_id__volatile = 0;
if (g_once_init_enter (&direct_photo_page_type_id__volatile)) {
static const GTypeInfo g_define_type_info = { sizeof (DirectPhotoPageClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) direct_photo_page_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (DirectPhotoPage), 0, (GInstanceInitFunc) direct_photo_page_instance_init, NULL };
@@ -3829,57 +3948,65 @@ GType direct_photo_page_get_type (void) {
}
-DirectFullscreenPhotoPage* direct_fullscreen_photo_page_construct (GType object_type, GFile* file) {
+DirectFullscreenPhotoPage*
+direct_fullscreen_photo_page_construct (GType object_type,
+ GFile* file)
+{
DirectFullscreenPhotoPage * self = NULL;
- GFile* _tmp0_;
#line 479 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
g_return_val_if_fail (G_IS_FILE (file), NULL);
#line 480 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
- _tmp0_ = file;
-#line 480 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
- self = (DirectFullscreenPhotoPage*) direct_photo_page_construct (object_type, _tmp0_);
+ self = (DirectFullscreenPhotoPage*) direct_photo_page_construct (object_type, file);
#line 479 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
return self;
-#line 3844 "DirectPhotoPage.c"
+#line 3963 "DirectPhotoPage.c"
}
-DirectFullscreenPhotoPage* direct_fullscreen_photo_page_new (GFile* file) {
+DirectFullscreenPhotoPage*
+direct_fullscreen_photo_page_new (GFile* file)
+{
#line 479 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
return direct_fullscreen_photo_page_construct (TYPE_DIRECT_FULLSCREEN_PHOTO_PAGE, file);
-#line 3851 "DirectPhotoPage.c"
+#line 3972 "DirectPhotoPage.c"
}
-static void direct_fullscreen_photo_page_real_init_collect_ui_filenames (Page* base, GeeList* ui_filenames) {
+static void
+direct_fullscreen_photo_page_real_init_collect_ui_filenames (Page* base,
+ GeeList* ui_filenames)
+{
DirectFullscreenPhotoPage * self;
- GeeList* _tmp0_;
#line 483 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_DIRECT_FULLSCREEN_PHOTO_PAGE, DirectFullscreenPhotoPage);
#line 483 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
g_return_if_fail (GEE_IS_LIST (ui_filenames));
#line 486 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
- _tmp0_ = ui_filenames;
-#line 486 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
- gee_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GEE_TYPE_COLLECTION, GeeCollection), "direct_context.ui");
-#line 3866 "DirectPhotoPage.c"
+ gee_collection_add (G_TYPE_CHECK_INSTANCE_CAST (ui_filenames, GEE_TYPE_COLLECTION, GeeCollection), "direct_context.ui");
+#line 3987 "DirectPhotoPage.c"
}
-static void direct_fullscreen_photo_page_class_init (DirectFullscreenPhotoPageClass * klass) {
+static void
+direct_fullscreen_photo_page_class_init (DirectFullscreenPhotoPageClass * klass)
+{
#line 478 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
direct_fullscreen_photo_page_parent_class = g_type_class_peek_parent (klass);
#line 478 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
((PageClass *) klass)->init_collect_ui_filenames = (void (*) (Page *, GeeList*)) direct_fullscreen_photo_page_real_init_collect_ui_filenames;
-#line 3875 "DirectPhotoPage.c"
+#line 3998 "DirectPhotoPage.c"
}
-static void direct_fullscreen_photo_page_instance_init (DirectFullscreenPhotoPage * self) {
+static void
+direct_fullscreen_photo_page_instance_init (DirectFullscreenPhotoPage * self)
+{
}
-GType direct_fullscreen_photo_page_get_type (void) {
+GType
+direct_fullscreen_photo_page_get_type (void)
+{
static volatile gsize direct_fullscreen_photo_page_type_id__volatile = 0;
if (g_once_init_enter (&direct_fullscreen_photo_page_type_id__volatile)) {
static const GTypeInfo g_define_type_info = { sizeof (DirectFullscreenPhotoPageClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) direct_fullscreen_photo_page_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (DirectFullscreenPhotoPage), 0, (GInstanceInitFunc) direct_fullscreen_photo_page_instance_init, NULL };
@@ -3891,7 +4018,11 @@ GType direct_fullscreen_photo_page_get_type (void) {
}
-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) {
@@ -3903,7 +4034,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);
}
diff --git a/src/direct/DirectView.c b/src/direct/DirectView.c
index 7ad6acd..407d555 100644
--- a/src/direct/DirectView.c
+++ b/src/direct/DirectView.c
@@ -1,4 +1,4 @@
-/* DirectView.c generated by valac 0.36.6, the Vala compiler
+/* DirectView.c generated by valac 0.40.4, the Vala compiler
* generated from DirectView.vala, do not modify */
/* Copyright 2016 Software Freedom Conservancy Inc.
@@ -7,6 +7,7 @@
* (version 2.1 or later). See the COPYING file in this distribution.
*/
+
#include <glib.h>
#include <glib-object.h>
#include <stdlib.h>
@@ -77,6 +78,11 @@ typedef struct _DataSourceClass DataSourceClass;
typedef struct _DirectView DirectView;
typedef struct _DirectViewClass DirectViewClass;
typedef struct _DirectViewPrivate DirectViewPrivate;
+enum {
+ DIRECT_VIEW_0_PROPERTY,
+ DIRECT_VIEW_NUM_PROPERTIES
+};
+static GParamSpec* direct_view_properties[DIRECT_VIEW_NUM_PROPERTIES];
#define _g_object_unref0(var) ((var == NULL) ? NULL : (var = (g_object_unref (var), NULL)))
#define _g_free0(var) (var = (g_free (var), NULL))
@@ -417,34 +423,45 @@ static gpointer direct_view_collection_direct_view_manager_parent_class = NULL;
GType data_object_get_type (void) G_GNUC_CONST;
gpointer alteration_ref (gpointer instance);
void alteration_unref (gpointer instance);
-GParamSpec* param_spec_alteration (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags);
-void value_set_alteration (GValue* value, gpointer v_object);
-void value_take_alteration (GValue* value, gpointer v_object);
+GParamSpec* param_spec_alteration (const gchar* name,
+ const gchar* nick,
+ const gchar* blurb,
+ GType object_type,
+ GParamFlags flags);
+void value_set_alteration (GValue* value,
+ gpointer v_object);
+void value_take_alteration (GValue* value,
+ gpointer v_object);
gpointer value_get_alteration (const GValue* value);
GType alteration_get_type (void) G_GNUC_CONST;
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 data_view_get_type (void) G_GNUC_CONST;
GType data_source_get_type (void) G_GNUC_CONST;
GType direct_view_get_type (void) G_GNUC_CONST;
#define DIRECT_VIEW_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), TYPE_DIRECT_VIEW, DirectViewPrivate))
-enum {
- DIRECT_VIEW_DUMMY_PROPERTY
-};
GType thumbnail_source_get_type (void) G_GNUC_CONST;
GType media_source_get_type (void) G_GNUC_CONST;
GType photo_source_get_type (void) G_GNUC_CONST;
GType photo_get_type (void) G_GNUC_CONST;
GType direct_photo_get_type (void) G_GNUC_CONST;
DirectView* direct_view_new (DirectPhoto* source);
-DirectView* direct_view_construct (GType object_type, DirectPhoto* source);
+DirectView* direct_view_construct (GType object_type,
+ DirectPhoto* source);
DataView* data_view_new (DataSource* source);
-DataView* data_view_construct (GType object_type, DataSource* source);
+DataView* data_view_construct (GType object_type,
+ DataSource* source);
GFile* media_source_get_file (MediaSource* self);
GFile* direct_view_get_file (DirectView* self);
gchar* direct_view_get_collate_key (DirectView* self);
@@ -453,90 +470,120 @@ GType marker_get_type (void) G_GNUC_CONST;
GType view_collection_get_type (void) G_GNUC_CONST;
gpointer view_filter_ref (gpointer instance);
void view_filter_unref (gpointer instance);
-GParamSpec* param_spec_view_filter (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags);
-void value_set_view_filter (GValue* value, gpointer v_object);
-void value_take_view_filter (GValue* value, gpointer v_object);
+GParamSpec* param_spec_view_filter (const gchar* name,
+ const gchar* nick,
+ const gchar* blurb,
+ GType object_type,
+ GParamFlags flags);
+void value_set_view_filter (GValue* value,
+ gpointer v_object);
+void value_take_view_filter (GValue* value,
+ gpointer v_object);
gpointer value_get_view_filter (const GValue* value);
GType view_filter_get_type (void) G_GNUC_CONST;
GType direct_view_collection_get_type (void) G_GNUC_CONST;
-enum {
- DIRECT_VIEW_COLLECTION_DUMMY_PROPERTY
-};
DirectViewCollection* direct_view_collection_new (void);
DirectViewCollection* direct_view_collection_construct (GType object_type);
ViewCollection* view_collection_new (const gchar* name);
-ViewCollection* view_collection_construct (GType object_type, const gchar* name);
-void data_collection_set_comparator (DataCollection* self, Comparator comparator, void* comparator_target, ComparatorPredicate predicate, void* predicate_target);
-static gint64 direct_view_collection_filename_comparator (void* a, void* b);
-static gint64 _direct_view_collection_filename_comparator_comparator (void* a, void* b, gpointer self);
+ViewCollection* view_collection_construct (GType object_type,
+ const gchar* name);
+void data_collection_set_comparator (DataCollection* self,
+ Comparator comparator,
+ void* comparator_target,
+ ComparatorPredicate predicate,
+ void* predicate_target);
+static gint64 direct_view_collection_filename_comparator (void* a,
+ void* b);
+static gint64 _direct_view_collection_filename_comparator_comparator (void* a,
+ void* b,
+ gpointer self);
GType source_collection_get_type (void) G_GNUC_CONST;
gpointer view_manager_ref (gpointer instance);
void view_manager_unref (gpointer instance);
-GParamSpec* param_spec_view_manager (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags);
-void value_set_view_manager (GValue* value, gpointer v_object);
-void value_take_view_manager (GValue* value, gpointer v_object);
+GParamSpec* param_spec_view_manager (const gchar* name,
+ const gchar* nick,
+ const gchar* blurb,
+ GType object_type,
+ GParamFlags flags);
+void value_set_view_manager (GValue* value,
+ gpointer v_object);
+void value_take_view_manager (GValue* value,
+ gpointer v_object);
gpointer value_get_view_manager (const GValue* value);
GType view_manager_get_type (void) G_GNUC_CONST;
gpointer view_collection_monitor_ref (gpointer instance);
void view_collection_monitor_unref (gpointer instance);
-GParamSpec* view_collection_param_spec_monitor (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags);
-void view_collection_value_set_monitor (GValue* value, gpointer v_object);
-void view_collection_value_take_monitor (GValue* value, gpointer v_object);
+GParamSpec* view_collection_param_spec_monitor (const gchar* name,
+ const gchar* nick,
+ const gchar* blurb,
+ GType object_type,
+ GParamFlags flags);
+void view_collection_value_set_monitor (GValue* value,
+ gpointer v_object);
+void view_collection_value_take_monitor (GValue* value,
+ gpointer v_object);
gpointer view_collection_value_get_monitor (const GValue* value);
GType view_collection_monitor_get_type (void) G_GNUC_CONST;
-ViewCollectionMonitor* view_collection_monitor_source_collection (ViewCollection* self, SourceCollection* sources, ViewManager* manager, Alteration* prereq, GeeCollection* initial, ProgressMonitor progress_monitor, void* progress_monitor_target);
+ViewCollectionMonitor* view_collection_monitor_source_collection (ViewCollection* self,
+ SourceCollection* sources,
+ ViewManager* manager,
+ Alteration* prereq,
+ GeeCollection* initial,
+ ProgressMonitor progress_monitor,
+ void* progress_monitor_target);
GType database_source_collection_get_type (void) G_GNUC_CONST;
GType direct_photo_source_collection_get_type (void) G_GNUC_CONST;
static DirectViewCollectionDirectViewManager* direct_view_collection_direct_view_manager_new (void);
static DirectViewCollectionDirectViewManager* direct_view_collection_direct_view_manager_construct (GType object_type);
static GType direct_view_collection_direct_view_manager_get_type (void) G_GNUC_CONST G_GNUC_UNUSED;
-enum {
- DIRECT_VIEW_COLLECTION_DIRECT_VIEW_MANAGER_DUMMY_PROPERTY
-};
-static DataView* direct_view_collection_direct_view_manager_real_create_view (ViewManager* base, DataSource* source);
+static DataView* direct_view_collection_direct_view_manager_real_create_view (ViewManager* base,
+ DataSource* source);
ViewManager* view_manager_construct (GType object_type);
-DirectView* direct_view_construct (GType object_type, DirectPhoto* source) {
+DirectView*
+direct_view_construct (GType object_type,
+ DirectPhoto* source)
+{
DirectView * self = NULL;
- DirectPhoto* _tmp0_;
- DirectPhoto* _tmp1_;
- GFile* _tmp2_;
+ GFile* _tmp0_;
#line 11 "/home/jens/Source/shotwell/src/direct/DirectView.vala"
g_return_val_if_fail (IS_DIRECT_PHOTO (source), NULL);
#line 12 "/home/jens/Source/shotwell/src/direct/DirectView.vala"
- _tmp0_ = source;
-#line 12 "/home/jens/Source/shotwell/src/direct/DirectView.vala"
- self = (DirectView*) data_view_construct (object_type, G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, TYPE_DATA_SOURCE, DataSource));
-#line 14 "/home/jens/Source/shotwell/src/direct/DirectView.vala"
- _tmp1_ = source;
+ self = (DirectView*) data_view_construct (object_type, G_TYPE_CHECK_INSTANCE_CAST (source, TYPE_DATA_SOURCE, DataSource));
#line 14 "/home/jens/Source/shotwell/src/direct/DirectView.vala"
- _tmp2_ = media_source_get_file (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, TYPE_PHOTO, Photo), TYPE_MEDIA_SOURCE, MediaSource));
+ _tmp0_ = media_source_get_file (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (source, TYPE_PHOTO, Photo), TYPE_MEDIA_SOURCE, MediaSource));
#line 14 "/home/jens/Source/shotwell/src/direct/DirectView.vala"
_g_object_unref0 (self->priv->file);
#line 14 "/home/jens/Source/shotwell/src/direct/DirectView.vala"
- self->priv->file = _tmp2_;
+ self->priv->file = _tmp0_;
#line 11 "/home/jens/Source/shotwell/src/direct/DirectView.vala"
return self;
-#line 522 "DirectView.c"
+#line 563 "DirectView.c"
}
-DirectView* direct_view_new (DirectPhoto* source) {
+DirectView*
+direct_view_new (DirectPhoto* source)
+{
#line 11 "/home/jens/Source/shotwell/src/direct/DirectView.vala"
return direct_view_construct (TYPE_DIRECT_VIEW, source);
-#line 529 "DirectView.c"
+#line 572 "DirectView.c"
}
-static gpointer _g_object_ref0 (gpointer self) {
+static gpointer
+_g_object_ref0 (gpointer self)
+{
#line 18 "/home/jens/Source/shotwell/src/direct/DirectView.vala"
return self ? g_object_ref (self) : NULL;
-#line 536 "DirectView.c"
+#line 581 "DirectView.c"
}
-GFile* direct_view_get_file (DirectView* self) {
+GFile*
+direct_view_get_file (DirectView* self)
+{
GFile* result = NULL;
GFile* _tmp0_;
GFile* _tmp1_;
@@ -550,11 +597,13 @@ GFile* direct_view_get_file (DirectView* self) {
result = _tmp1_;
#line 18 "/home/jens/Source/shotwell/src/direct/DirectView.vala"
return result;
-#line 554 "DirectView.c"
+#line 601 "DirectView.c"
}
-gchar* direct_view_get_collate_key (DirectView* self) {
+gchar*
+direct_view_get_collate_key (DirectView* self)
+{
gchar* result = NULL;
const gchar* _tmp0_;
const gchar* _tmp5_;
@@ -565,7 +614,7 @@ gchar* direct_view_get_collate_key (DirectView* self) {
_tmp0_ = self->priv->collate_key;
#line 22 "/home/jens/Source/shotwell/src/direct/DirectView.vala"
if (_tmp0_ == NULL) {
-#line 569 "DirectView.c"
+#line 618 "DirectView.c"
GFile* _tmp1_;
gchar* _tmp2_;
gchar* _tmp3_;
@@ -584,7 +633,7 @@ gchar* direct_view_get_collate_key (DirectView* self) {
self->priv->collate_key = _tmp4_;
#line 23 "/home/jens/Source/shotwell/src/direct/DirectView.vala"
_g_free0 (_tmp3_);
-#line 588 "DirectView.c"
+#line 637 "DirectView.c"
}
#line 25 "/home/jens/Source/shotwell/src/direct/DirectView.vala"
_tmp5_ = self->priv->collate_key;
@@ -594,31 +643,37 @@ gchar* direct_view_get_collate_key (DirectView* self) {
result = _tmp6_;
#line 25 "/home/jens/Source/shotwell/src/direct/DirectView.vala"
return result;
-#line 598 "DirectView.c"
+#line 647 "DirectView.c"
}
-static void direct_view_class_init (DirectViewClass * klass) {
+static void
+direct_view_class_init (DirectViewClass * klass)
+{
#line 7 "/home/jens/Source/shotwell/src/direct/DirectView.vala"
direct_view_parent_class = g_type_class_peek_parent (klass);
#line 7 "/home/jens/Source/shotwell/src/direct/DirectView.vala"
g_type_class_add_private (klass, sizeof (DirectViewPrivate));
#line 7 "/home/jens/Source/shotwell/src/direct/DirectView.vala"
G_OBJECT_CLASS (klass)->finalize = direct_view_finalize;
-#line 609 "DirectView.c"
+#line 660 "DirectView.c"
}
-static void direct_view_instance_init (DirectView * self) {
+static void
+direct_view_instance_init (DirectView * self)
+{
#line 7 "/home/jens/Source/shotwell/src/direct/DirectView.vala"
self->priv = DIRECT_VIEW_GET_PRIVATE (self);
#line 9 "/home/jens/Source/shotwell/src/direct/DirectView.vala"
self->priv->collate_key = NULL;
-#line 618 "DirectView.c"
+#line 671 "DirectView.c"
}
-static void direct_view_finalize (GObject * obj) {
+static void
+direct_view_finalize (GObject * obj)
+{
DirectView * self;
#line 7 "/home/jens/Source/shotwell/src/direct/DirectView.vala"
self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_DIRECT_VIEW, DirectView);
@@ -628,11 +683,13 @@ static void direct_view_finalize (GObject * obj) {
_g_free0 (self->priv->collate_key);
#line 7 "/home/jens/Source/shotwell/src/direct/DirectView.vala"
G_OBJECT_CLASS (direct_view_parent_class)->finalize (obj);
-#line 632 "DirectView.c"
+#line 687 "DirectView.c"
}
-GType direct_view_get_type (void) {
+GType
+direct_view_get_type (void)
+{
static volatile gsize direct_view_type_id__volatile = 0;
if (g_once_init_enter (&direct_view_type_id__volatile)) {
static const GTypeInfo g_define_type_info = { sizeof (DirectViewClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) direct_view_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (DirectView), 0, (GInstanceInitFunc) direct_view_instance_init, NULL };
@@ -644,16 +701,22 @@ GType direct_view_get_type (void) {
}
-static gint64 _direct_view_collection_filename_comparator_comparator (void* a, void* b, gpointer self) {
+static gint64
+_direct_view_collection_filename_comparator_comparator (void* a,
+ void* b,
+ gpointer self)
+{
gint64 result;
result = direct_view_collection_filename_comparator (a, b);
#line 39 "/home/jens/Source/shotwell/src/direct/DirectView.vala"
return result;
-#line 653 "DirectView.c"
+#line 714 "DirectView.c"
}
-DirectViewCollection* direct_view_collection_construct (GType object_type) {
+DirectViewCollection*
+direct_view_collection_construct (GType object_type)
+{
DirectViewCollection* self = NULL;
DirectPhotoSourceCollection* _tmp0_;
DirectViewCollectionDirectViewManager* _tmp1_;
@@ -680,116 +743,122 @@ DirectViewCollection* direct_view_collection_construct (GType object_type) {
_view_manager_unref0 (_tmp2_);
#line 36 "/home/jens/Source/shotwell/src/direct/DirectView.vala"
return self;
-#line 684 "DirectView.c"
+#line 747 "DirectView.c"
}
-DirectViewCollection* direct_view_collection_new (void) {
+DirectViewCollection*
+direct_view_collection_new (void)
+{
#line 36 "/home/jens/Source/shotwell/src/direct/DirectView.vala"
return direct_view_collection_construct (TYPE_DIRECT_VIEW_COLLECTION);
-#line 691 "DirectView.c"
+#line 756 "DirectView.c"
}
-static gint64 direct_view_collection_filename_comparator (void* a, void* b) {
+static gint64
+direct_view_collection_filename_comparator (void* a,
+ void* b)
+{
gint64 result = 0LL;
DirectView* aview = NULL;
- void* _tmp0_;
DirectView* bview = NULL;
- void* _tmp1_;
- GCompareFunc _tmp2_;
+ GCompareFunc _tmp0_;
+ gchar* _tmp1_;
+ gchar* _tmp2_;
gchar* _tmp3_;
gchar* _tmp4_;
- gchar* _tmp5_;
- gchar* _tmp6_;
- gint _tmp7_;
- gint64 _tmp8_;
+ gint64 _tmp5_;
#line 44 "/home/jens/Source/shotwell/src/direct/DirectView.vala"
- _tmp0_ = a;
-#line 44 "/home/jens/Source/shotwell/src/direct/DirectView.vala"
- aview = (DirectView*) _tmp0_;
-#line 45 "/home/jens/Source/shotwell/src/direct/DirectView.vala"
- _tmp1_ = b;
+ aview = (DirectView*) a;
#line 45 "/home/jens/Source/shotwell/src/direct/DirectView.vala"
- bview = (DirectView*) _tmp1_;
-#line 47 "/home/jens/Source/shotwell/src/direct/DirectView.vala"
- _tmp2_ = g_strcmp0;
+ bview = (DirectView*) b;
#line 47 "/home/jens/Source/shotwell/src/direct/DirectView.vala"
- _tmp3_ = direct_view_get_collate_key (G_TYPE_CHECK_INSTANCE_CAST (aview, TYPE_DIRECT_VIEW, DirectView));
+ _tmp0_ = g_strcmp0;
#line 47 "/home/jens/Source/shotwell/src/direct/DirectView.vala"
- _tmp4_ = _tmp3_;
-#line 47 "/home/jens/Source/shotwell/src/direct/DirectView.vala"
- _tmp5_ = direct_view_get_collate_key (G_TYPE_CHECK_INSTANCE_CAST (bview, TYPE_DIRECT_VIEW, DirectView));
+ _tmp1_ = direct_view_get_collate_key (G_TYPE_CHECK_INSTANCE_CAST (aview, TYPE_DIRECT_VIEW, DirectView));
#line 47 "/home/jens/Source/shotwell/src/direct/DirectView.vala"
- _tmp6_ = _tmp5_;
+ _tmp2_ = _tmp1_;
#line 47 "/home/jens/Source/shotwell/src/direct/DirectView.vala"
- _tmp7_ = _tmp2_ (_tmp4_, _tmp6_);
+ _tmp3_ = direct_view_get_collate_key (G_TYPE_CHECK_INSTANCE_CAST (bview, TYPE_DIRECT_VIEW, DirectView));
#line 47 "/home/jens/Source/shotwell/src/direct/DirectView.vala"
- _tmp8_ = (gint64) _tmp7_;
+ _tmp4_ = _tmp3_;
#line 47 "/home/jens/Source/shotwell/src/direct/DirectView.vala"
- _g_free0 (_tmp6_);
+ _tmp5_ = (gint64) _tmp0_ (_tmp2_, _tmp4_);
#line 47 "/home/jens/Source/shotwell/src/direct/DirectView.vala"
_g_free0 (_tmp4_);
#line 47 "/home/jens/Source/shotwell/src/direct/DirectView.vala"
- result = _tmp8_;
+ _g_free0 (_tmp2_);
+#line 47 "/home/jens/Source/shotwell/src/direct/DirectView.vala"
+ result = _tmp5_;
#line 47 "/home/jens/Source/shotwell/src/direct/DirectView.vala"
return result;
-#line 738 "DirectView.c"
+#line 797 "DirectView.c"
}
-static DataView* direct_view_collection_direct_view_manager_real_create_view (ViewManager* base, DataSource* source) {
+static DataView*
+direct_view_collection_direct_view_manager_real_create_view (ViewManager* base,
+ DataSource* source)
+{
DirectViewCollectionDirectViewManager * self;
DataView* result = NULL;
- DataSource* _tmp0_;
- DirectView* _tmp1_;
+ DirectView* _tmp0_;
#line 31 "/home/jens/Source/shotwell/src/direct/DirectView.vala"
self = G_TYPE_CHECK_INSTANCE_CAST (base, DIRECT_VIEW_COLLECTION_TYPE_DIRECT_VIEW_MANAGER, DirectViewCollectionDirectViewManager);
#line 31 "/home/jens/Source/shotwell/src/direct/DirectView.vala"
g_return_val_if_fail (IS_DATA_SOURCE (source), NULL);
#line 32 "/home/jens/Source/shotwell/src/direct/DirectView.vala"
- _tmp0_ = source;
-#line 32 "/home/jens/Source/shotwell/src/direct/DirectView.vala"
- _tmp1_ = direct_view_new (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, TYPE_DIRECT_PHOTO, DirectPhoto));
+ _tmp0_ = direct_view_new (G_TYPE_CHECK_INSTANCE_CAST (source, TYPE_DIRECT_PHOTO, DirectPhoto));
#line 32 "/home/jens/Source/shotwell/src/direct/DirectView.vala"
- result = G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, TYPE_DATA_VIEW, DataView);
+ result = G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, TYPE_DATA_VIEW, DataView);
#line 32 "/home/jens/Source/shotwell/src/direct/DirectView.vala"
return result;
-#line 759 "DirectView.c"
+#line 818 "DirectView.c"
}
-static DirectViewCollectionDirectViewManager* direct_view_collection_direct_view_manager_construct (GType object_type) {
+static DirectViewCollectionDirectViewManager*
+direct_view_collection_direct_view_manager_construct (GType object_type)
+{
DirectViewCollectionDirectViewManager* self = NULL;
#line 30 "/home/jens/Source/shotwell/src/direct/DirectView.vala"
self = (DirectViewCollectionDirectViewManager*) view_manager_construct (object_type);
#line 30 "/home/jens/Source/shotwell/src/direct/DirectView.vala"
return self;
-#line 769 "DirectView.c"
+#line 830 "DirectView.c"
}
-static DirectViewCollectionDirectViewManager* direct_view_collection_direct_view_manager_new (void) {
+static DirectViewCollectionDirectViewManager*
+direct_view_collection_direct_view_manager_new (void)
+{
#line 30 "/home/jens/Source/shotwell/src/direct/DirectView.vala"
return direct_view_collection_direct_view_manager_construct (DIRECT_VIEW_COLLECTION_TYPE_DIRECT_VIEW_MANAGER);
-#line 776 "DirectView.c"
+#line 839 "DirectView.c"
}
-static void direct_view_collection_direct_view_manager_class_init (DirectViewCollectionDirectViewManagerClass * klass) {
+static void
+direct_view_collection_direct_view_manager_class_init (DirectViewCollectionDirectViewManagerClass * klass)
+{
#line 30 "/home/jens/Source/shotwell/src/direct/DirectView.vala"
direct_view_collection_direct_view_manager_parent_class = g_type_class_peek_parent (klass);
#line 30 "/home/jens/Source/shotwell/src/direct/DirectView.vala"
((ViewManagerClass *) klass)->create_view = (DataView* (*) (ViewManager *, DataSource*)) direct_view_collection_direct_view_manager_real_create_view;
-#line 785 "DirectView.c"
+#line 850 "DirectView.c"
}
-static void direct_view_collection_direct_view_manager_instance_init (DirectViewCollectionDirectViewManager * self) {
+static void
+direct_view_collection_direct_view_manager_instance_init (DirectViewCollectionDirectViewManager * self)
+{
}
-static GType direct_view_collection_direct_view_manager_get_type (void) {
+static GType
+direct_view_collection_direct_view_manager_get_type (void)
+{
static volatile gsize direct_view_collection_direct_view_manager_type_id__volatile = 0;
if (g_once_init_enter (&direct_view_collection_direct_view_manager_type_id__volatile)) {
static const GTypeInfo g_define_type_info = { sizeof (DirectViewCollectionDirectViewManagerClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) direct_view_collection_direct_view_manager_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (DirectViewCollectionDirectViewManager), 0, (GInstanceInitFunc) direct_view_collection_direct_view_manager_instance_init, NULL };
@@ -801,18 +870,24 @@ static GType direct_view_collection_direct_view_manager_get_type (void) {
}
-static void direct_view_collection_class_init (DirectViewCollectionClass * klass) {
+static void
+direct_view_collection_class_init (DirectViewCollectionClass * klass)
+{
#line 29 "/home/jens/Source/shotwell/src/direct/DirectView.vala"
direct_view_collection_parent_class = g_type_class_peek_parent (klass);
-#line 808 "DirectView.c"
+#line 879 "DirectView.c"
}
-static void direct_view_collection_instance_init (DirectViewCollection * self) {
+static void
+direct_view_collection_instance_init (DirectViewCollection * self)
+{
}
-GType direct_view_collection_get_type (void) {
+GType
+direct_view_collection_get_type (void)
+{
static volatile gsize direct_view_collection_type_id__volatile = 0;
if (g_once_init_enter (&direct_view_collection_type_id__volatile)) {
static const GTypeInfo g_define_type_info = { sizeof (DirectViewCollectionClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) direct_view_collection_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (DirectViewCollection), 0, (GInstanceInitFunc) direct_view_collection_instance_init, NULL };
diff --git a/src/direct/DirectWindow.c b/src/direct/DirectWindow.c
index 16c0212..74d510c 100644
--- a/src/direct/DirectWindow.c
+++ b/src/direct/DirectWindow.c
@@ -1,4 +1,4 @@
-/* DirectWindow.c generated by valac 0.36.6, the Vala compiler
+/* DirectWindow.c generated by valac 0.40.4, the Vala compiler
* generated from DirectWindow.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 <gtk/gtk.h>
@@ -93,6 +94,11 @@ typedef struct _EditingHostPageClass EditingHostPageClass;
typedef struct _DirectPhotoPage DirectPhotoPage;
typedef struct _DirectPhotoPageClass DirectPhotoPageClass;
+enum {
+ DIRECT_WINDOW_0_PROPERTY,
+ DIRECT_WINDOW_NUM_PROPERTIES
+};
+static GParamSpec* direct_window_properties[DIRECT_WINDOW_NUM_PROPERTIES];
#define _g_object_unref0(var) ((var == NULL) ? NULL : (var = (g_object_unref (var), NULL)))
#define TYPE_DATA_COLLECTION (data_collection_get_type ())
@@ -291,19 +297,24 @@ GType single_photo_page_get_type (void) G_GNUC_CONST;
GType editing_host_page_get_type (void) G_GNUC_CONST;
GType direct_photo_page_get_type (void) G_GNUC_CONST;
#define DIRECT_WINDOW_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), TYPE_DIRECT_WINDOW, DirectWindowPrivate))
-enum {
- DIRECT_WINDOW_DUMMY_PROPERTY
-};
DirectWindow* direct_window_new (GFile* file);
-DirectWindow* direct_window_construct (GType object_type, GFile* file);
+DirectWindow* direct_window_construct (GType object_type,
+ GFile* file);
AppWindow* app_window_construct (GType object_type);
DirectPhotoPage* direct_photo_page_new (GFile* file);
-DirectPhotoPage* direct_photo_page_construct (GType object_type, GFile* file);
+DirectPhotoPage* direct_photo_page_construct (GType object_type,
+ GFile* file);
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 view_collection_get_type (void) G_GNUC_CONST;
@@ -312,16 +323,29 @@ static void direct_window_on_photo_changed (DirectWindow* self);
GType data_object_get_type (void) G_GNUC_CONST;
gpointer alteration_ref (gpointer instance);
void alteration_unref (gpointer instance);
-GParamSpec* param_spec_alteration (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags);
-void value_set_alteration (GValue* value, gpointer v_object);
-void value_take_alteration (GValue* value, gpointer v_object);
+GParamSpec* param_spec_alteration (const gchar* name,
+ const gchar* nick,
+ const gchar* blurb,
+ GType object_type,
+ GParamFlags flags);
+void value_set_alteration (GValue* value,
+ gpointer v_object);
+void value_take_alteration (GValue* value,
+ gpointer v_object);
gpointer value_get_alteration (const GValue* value);
GType alteration_get_type (void) G_GNUC_CONST;
-static void _direct_window_on_photo_changed_data_collection_items_altered (DataCollection* _sender, GeeMap* items, gpointer self);
+static void _direct_window_on_photo_changed_data_collection_items_altered (DataCollection* _sender,
+ GeeMap* items,
+ gpointer self);
GType data_view_get_type (void) G_GNUC_CONST;
-static void _direct_window_on_photo_changed_view_collection_items_state_changed (ViewCollection* _sender, GeeIterable* changed, gpointer self);
-void page_window_set_current_page (PageWindow* self, Page* page);
-void direct_window_update_title (DirectWindow* self, GFile* file, gboolean modified);
+static void _direct_window_on_photo_changed_view_collection_items_state_changed (ViewCollection* _sender,
+ GeeIterable* changed,
+ gpointer self);
+void page_window_set_current_page (PageWindow* self,
+ Page* page);
+void direct_window_update_title (DirectWindow* self,
+ GFile* file,
+ gboolean modified);
void page_switched_to (Page* self);
GtkToolbar* page_get_toolbar (Page* self);
void application_set_menubar (GMenuModel* model);
@@ -333,9 +357,11 @@ gchar* get_display_pathname (GFile* file);
#define RESOURCES_APP_TITLE "Shotwell"
static void direct_window_real_on_fullscreen (AppWindow* base);
GFile* direct_photo_page_get_current_file (DirectPhotoPage* self);
-void app_window_go_fullscreen (AppWindow* self, Page* page);
+void app_window_go_fullscreen (AppWindow* self,
+ Page* page);
DirectFullscreenPhotoPage* direct_fullscreen_photo_page_new (GFile* file);
-DirectFullscreenPhotoPage* direct_fullscreen_photo_page_construct (GType object_type, GFile* file);
+DirectFullscreenPhotoPage* direct_fullscreen_photo_page_construct (GType object_type,
+ GFile* file);
GType direct_fullscreen_photo_page_get_type (void) G_GNUC_CONST;
static gchar* direct_window_real_get_app_role (AppWindow* base);
#define RESOURCES_APP_DIRECT_ROLE _ ("Photo Viewer")
@@ -352,152 +378,168 @@ gboolean direct_photo_page_check_quit (DirectPhotoPage* self);
GType configuration_facade_get_type (void) G_GNUC_CONST;
GType config_facade_get_type (void) G_GNUC_CONST;
ConfigFacade* config_facade_get_instance (void);
-void configuration_facade_set_direct_window_state (ConfigurationFacade* self, gboolean maximize, Dimensions* dimensions);
+void configuration_facade_set_direct_window_state (ConfigurationFacade* self,
+ gboolean maximize,
+ Dimensions* dimensions);
void app_window_on_quit (AppWindow* self);
-static gboolean direct_window_real_delete_event (GtkWidget* base, GdkEventAny* event);
-static gboolean direct_window_real_button_press_event (GtkWidget* base, GdkEventButton* event);
+static gboolean direct_window_real_delete_event (GtkWidget* base,
+ GdkEventAny* event);
+static gboolean direct_window_real_button_press_event (GtkWidget* base,
+ GdkEventButton* event);
void app_window_on_fullscreen (AppWindow* self);
-static gboolean direct_window_real_key_press_event (GtkWidget* base, GdkEventKey* event);
+static gboolean direct_window_real_key_press_event (GtkWidget* base,
+ GdkEventKey* event);
static void direct_window_finalize (GObject * obj);
-static void _direct_window_on_photo_changed_data_collection_items_altered (DataCollection* _sender, GeeMap* items, gpointer self) {
+static void
+_direct_window_on_photo_changed_data_collection_items_altered (DataCollection* _sender,
+ GeeMap* items,
+ gpointer self)
+{
#line 12 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala"
direct_window_on_photo_changed ((DirectWindow*) self);
-#line 368 "DirectWindow.c"
+#line 403 "DirectWindow.c"
}
-static void _direct_window_on_photo_changed_view_collection_items_state_changed (ViewCollection* _sender, GeeIterable* changed, gpointer self) {
+static void
+_direct_window_on_photo_changed_view_collection_items_state_changed (ViewCollection* _sender,
+ GeeIterable* changed,
+ gpointer self)
+{
#line 13 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala"
direct_window_on_photo_changed ((DirectWindow*) self);
-#line 375 "DirectWindow.c"
+#line 414 "DirectWindow.c"
}
-DirectWindow* direct_window_construct (GType object_type, GFile* file) {
+DirectWindow*
+direct_window_construct (GType object_type,
+ GFile* file)
+{
DirectWindow * self = NULL;
- GFile* _tmp0_;
+ DirectPhotoPage* _tmp0_;
DirectPhotoPage* _tmp1_;
- DirectPhotoPage* _tmp2_;
+ ViewCollection* _tmp2_;
ViewCollection* _tmp3_;
- ViewCollection* _tmp4_;
- DirectPhotoPage* _tmp5_;
+ DirectPhotoPage* _tmp4_;
+ ViewCollection* _tmp5_;
ViewCollection* _tmp6_;
- ViewCollection* _tmp7_;
+ DirectPhotoPage* _tmp7_;
DirectPhotoPage* _tmp8_;
- GFile* _tmp9_;
- DirectPhotoPage* _tmp10_;
GtkBox* layout = NULL;
- GtkBox* _tmp11_;
- DirectPhotoPage* _tmp12_;
- DirectPhotoPage* _tmp13_;
- GtkToolbar* _tmp14_;
- GtkToolbar* _tmp15_;
- DirectPhotoPage* _tmp16_;
- GMenuModel* _tmp17_;
- GMenuModel* _tmp18_;
+ GtkBox* _tmp9_;
+ DirectPhotoPage* _tmp10_;
+ DirectPhotoPage* _tmp11_;
+ GtkToolbar* _tmp12_;
+ GtkToolbar* _tmp13_;
+ DirectPhotoPage* _tmp14_;
+ GMenuModel* _tmp15_;
+ GMenuModel* _tmp16_;
#line 10 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala"
g_return_val_if_fail (G_IS_FILE (file), NULL);
#line 10 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala"
self = (DirectWindow*) app_window_construct (object_type);
#line 11 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala"
- _tmp0_ = file;
-#line 11 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala"
- _tmp1_ = direct_photo_page_new (_tmp0_);
+ _tmp0_ = direct_photo_page_new (file);
#line 11 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala"
- g_object_ref_sink (_tmp1_);
+ g_object_ref_sink (_tmp0_);
#line 11 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala"
_g_object_unref0 (self->priv->direct_photo_page);
#line 11 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala"
- self->priv->direct_photo_page = _tmp1_;
+ self->priv->direct_photo_page = _tmp0_;
#line 12 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala"
- _tmp2_ = self->priv->direct_photo_page;
+ _tmp1_ = self->priv->direct_photo_page;
#line 12 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala"
- _tmp3_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, TYPE_PAGE, Page));
+ _tmp2_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, TYPE_PAGE, Page));
#line 12 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala"
- _tmp4_ = _tmp3_;
+ _tmp3_ = _tmp2_;
#line 12 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala"
- g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, TYPE_DATA_COLLECTION, DataCollection), "items-altered", (GCallback) _direct_window_on_photo_changed_data_collection_items_altered, self, 0);
+ g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, TYPE_DATA_COLLECTION, DataCollection), "items-altered", (GCallback) _direct_window_on_photo_changed_data_collection_items_altered, self, 0);
#line 12 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala"
- _data_collection_unref0 (_tmp4_);
+ _data_collection_unref0 (_tmp3_);
#line 13 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala"
- _tmp5_ = self->priv->direct_photo_page;
+ _tmp4_ = self->priv->direct_photo_page;
#line 13 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala"
- _tmp6_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, TYPE_PAGE, Page));
+ _tmp5_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, TYPE_PAGE, Page));
#line 13 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala"
- _tmp7_ = _tmp6_;
+ _tmp6_ = _tmp5_;
#line 13 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala"
- g_signal_connect_object (_tmp7_, "items-state-changed", (GCallback) _direct_window_on_photo_changed_view_collection_items_state_changed, self, 0);
+ g_signal_connect_object (_tmp6_, "items-state-changed", (GCallback) _direct_window_on_photo_changed_view_collection_items_state_changed, self, 0);
#line 13 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala"
- _data_collection_unref0 (_tmp7_);
+ _data_collection_unref0 (_tmp6_);
#line 15 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala"
- _tmp8_ = self->priv->direct_photo_page;
+ _tmp7_ = self->priv->direct_photo_page;
#line 15 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala"
- page_window_set_current_page (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE_WINDOW, PageWindow), G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, TYPE_PAGE, Page));
+ page_window_set_current_page (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE_WINDOW, PageWindow), G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, TYPE_PAGE, Page));
#line 17 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala"
- _tmp9_ = file;
-#line 17 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala"
- direct_window_update_title (self, _tmp9_, FALSE);
+ direct_window_update_title (self, file, FALSE);
#line 19 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala"
- _tmp10_ = self->priv->direct_photo_page;
+ _tmp8_ = self->priv->direct_photo_page;
#line 19 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala"
- page_switched_to (G_TYPE_CHECK_INSTANCE_CAST (_tmp10_, TYPE_PAGE, Page));
+ page_switched_to (G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, TYPE_PAGE, Page));
#line 23 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala"
- _tmp11_ = (GtkBox*) gtk_box_new (GTK_ORIENTATION_VERTICAL, 0);
+ _tmp9_ = (GtkBox*) gtk_box_new (GTK_ORIENTATION_VERTICAL, 0);
#line 23 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala"
- g_object_ref_sink (_tmp11_);
+ g_object_ref_sink (_tmp9_);
#line 23 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala"
- layout = _tmp11_;
+ layout = _tmp9_;
#line 24 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala"
- _tmp12_ = self->priv->direct_photo_page;
+ _tmp10_ = self->priv->direct_photo_page;
#line 24 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala"
- gtk_box_pack_start (layout, G_TYPE_CHECK_INSTANCE_CAST (_tmp12_, gtk_widget_get_type (), GtkWidget), TRUE, TRUE, (guint) 0);
+ gtk_box_pack_start (layout, G_TYPE_CHECK_INSTANCE_CAST (_tmp10_, gtk_widget_get_type (), GtkWidget), TRUE, TRUE, (guint) 0);
#line 25 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala"
- _tmp13_ = self->priv->direct_photo_page;
+ _tmp11_ = self->priv->direct_photo_page;
#line 25 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala"
- _tmp14_ = page_get_toolbar (G_TYPE_CHECK_INSTANCE_CAST (_tmp13_, TYPE_PAGE, Page));
+ _tmp12_ = page_get_toolbar (G_TYPE_CHECK_INSTANCE_CAST (_tmp11_, TYPE_PAGE, Page));
#line 25 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala"
- _tmp15_ = _tmp14_;
+ _tmp13_ = _tmp12_;
#line 25 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala"
- gtk_box_pack_end (layout, G_TYPE_CHECK_INSTANCE_CAST (_tmp15_, gtk_widget_get_type (), GtkWidget), FALSE, FALSE, (guint) 0);
+ gtk_box_pack_end (layout, G_TYPE_CHECK_INSTANCE_CAST (_tmp13_, gtk_widget_get_type (), GtkWidget), FALSE, FALSE, (guint) 0);
#line 25 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala"
- _g_object_unref0 (_tmp15_);
+ _g_object_unref0 (_tmp13_);
#line 27 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala"
- _tmp16_ = self->priv->direct_photo_page;
+ _tmp14_ = self->priv->direct_photo_page;
#line 27 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala"
- _tmp17_ = page_get_menubar (G_TYPE_CHECK_INSTANCE_CAST (_tmp16_, TYPE_PAGE, Page));
+ _tmp15_ = page_get_menubar (G_TYPE_CHECK_INSTANCE_CAST (_tmp14_, TYPE_PAGE, Page));
#line 27 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala"
- _tmp18_ = _tmp17_;
+ _tmp16_ = _tmp15_;
#line 27 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala"
- application_set_menubar (_tmp18_);
+ application_set_menubar (_tmp16_);
#line 27 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala"
- _g_object_unref0 (_tmp18_);
+ _g_object_unref0 (_tmp16_);
#line 29 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala"
gtk_container_add (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_container_get_type (), GtkContainer), G_TYPE_CHECK_INSTANCE_CAST (layout, gtk_widget_get_type (), GtkWidget));
#line 10 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala"
_g_object_unref0 (layout);
#line 10 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala"
return self;
-#line 483 "DirectWindow.c"
+#line 519 "DirectWindow.c"
}
-DirectWindow* direct_window_new (GFile* file) {
+DirectWindow*
+direct_window_new (GFile* file)
+{
#line 10 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala"
return direct_window_construct (TYPE_DIRECT_WINDOW, file);
-#line 490 "DirectWindow.c"
+#line 528 "DirectWindow.c"
}
-static gpointer _g_object_ref0 (gpointer self) {
+static gpointer
+_g_object_ref0 (gpointer self)
+{
#line 33 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala"
return self ? g_object_ref (self) : NULL;
-#line 497 "DirectWindow.c"
+#line 537 "DirectWindow.c"
}
-DirectWindow* direct_window_get_app (void) {
+DirectWindow*
+direct_window_get_app (void)
+{
DirectWindow* result = NULL;
AppWindow* _tmp0_;
DirectWindow* _tmp1_;
@@ -509,11 +551,13 @@ DirectWindow* direct_window_get_app (void) {
result = _tmp1_;
#line 33 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala"
return result;
-#line 513 "DirectWindow.c"
+#line 555 "DirectWindow.c"
}
-DirectPhotoPage* direct_window_get_direct_page (DirectWindow* self) {
+DirectPhotoPage*
+direct_window_get_direct_page (DirectWindow* self)
+{
DirectPhotoPage* result = NULL;
Page* _tmp0_;
#line 36 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala"
@@ -524,74 +568,71 @@ DirectPhotoPage* direct_window_get_direct_page (DirectWindow* self) {
result = G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, TYPE_DIRECT_PHOTO_PAGE, DirectPhotoPage);
#line 37 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala"
return result;
-#line 528 "DirectWindow.c"
+#line 572 "DirectWindow.c"
}
-void direct_window_update_title (DirectWindow* self, GFile* file, gboolean modified) {
+void
+direct_window_update_title (DirectWindow* self,
+ GFile* file,
+ gboolean modified)
+{
const gchar* _tmp0_ = NULL;
- gboolean _tmp1_;
- GFile* _tmp2_;
- gchar* _tmp3_;
- gchar* _tmp4_;
- GFile* _tmp5_;
- GFile* _tmp6_;
- GFile* _tmp7_;
+ gchar* _tmp1_;
+ gchar* _tmp2_;
+ GFile* _tmp3_;
+ GFile* _tmp4_;
+ gchar* _tmp5_;
+ gchar* _tmp6_;
+ gchar* _tmp7_;
gchar* _tmp8_;
- gchar* _tmp9_;
- gchar* _tmp10_;
- gchar* _tmp11_;
#line 40 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala"
g_return_if_fail (IS_DIRECT_WINDOW (self));
#line 40 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala"
g_return_if_fail (G_IS_FILE (file));
#line 41 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala"
- _tmp1_ = modified;
-#line 41 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala"
- if (_tmp1_) {
+ if (modified) {
#line 41 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala"
_tmp0_ = "*";
-#line 555 "DirectWindow.c"
+#line 598 "DirectWindow.c"
} else {
#line 41 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala"
_tmp0_ = "";
-#line 559 "DirectWindow.c"
+#line 602 "DirectWindow.c"
}
#line 41 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala"
- _tmp2_ = file;
+ _tmp1_ = g_file_get_basename (file);
#line 41 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala"
- _tmp3_ = g_file_get_basename (_tmp2_);
+ _tmp2_ = _tmp1_;
#line 41 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala"
- _tmp4_ = _tmp3_;
+ _tmp3_ = g_file_get_parent (file);
#line 41 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala"
- _tmp5_ = file;
-#line 41 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala"
- _tmp6_ = g_file_get_parent (_tmp5_);
-#line 41 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala"
- _tmp7_ = _tmp6_;
+ _tmp4_ = _tmp3_;
#line 41 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala"
- _tmp8_ = get_display_pathname (_tmp7_);
+ _tmp5_ = get_display_pathname (_tmp4_);
#line 41 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala"
- _tmp9_ = _tmp8_;
+ _tmp6_ = _tmp5_;
#line 41 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala"
- _tmp10_ = g_strdup_printf ("%s%s (%s) - %s", _tmp0_, _tmp4_, _tmp9_, RESOURCES_APP_TITLE);
+ _tmp7_ = g_strdup_printf ("%s%s (%s) - %s", _tmp0_, _tmp2_, _tmp6_, RESOURCES_APP_TITLE);
#line 41 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala"
- _tmp11_ = _tmp10_;
+ _tmp8_ = _tmp7_;
#line 41 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala"
- gtk_window_set_title (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_window_get_type (), GtkWindow), _tmp11_);
+ gtk_window_set_title (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_window_get_type (), GtkWindow), _tmp8_);
#line 41 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala"
- _g_free0 (_tmp11_);
+ _g_free0 (_tmp8_);
#line 41 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala"
- _g_free0 (_tmp9_);
+ _g_free0 (_tmp6_);
#line 41 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala"
- _g_object_unref0 (_tmp7_);
+ _g_object_unref0 (_tmp4_);
#line 41 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala"
- _g_free0 (_tmp4_);
-#line 591 "DirectWindow.c"
+ _g_free0 (_tmp2_);
+#line 630 "DirectWindow.c"
}
-static void direct_window_real_on_fullscreen (AppWindow* base) {
+static void
+direct_window_real_on_fullscreen (AppWindow* base)
+{
DirectWindow * self;
GFile* file = NULL;
DirectPhotoPage* _tmp0_;
@@ -626,11 +667,13 @@ static void direct_window_real_on_fullscreen (AppWindow* base) {
_g_object_unref0 (_tmp5_);
#line 45 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala"
_g_object_unref0 (file);
-#line 630 "DirectWindow.c"
+#line 671 "DirectWindow.c"
}
-static gchar* direct_window_real_get_app_role (AppWindow* base) {
+static gchar*
+direct_window_real_get_app_role (AppWindow* base)
+{
DirectWindow * self;
gchar* result = NULL;
gchar* _tmp0_;
@@ -642,11 +685,13 @@ static gchar* direct_window_real_get_app_role (AppWindow* base) {
result = _tmp0_;
#line 52 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala"
return result;
-#line 646 "DirectWindow.c"
+#line 689 "DirectWindow.c"
}
-static void direct_window_on_photo_changed (DirectWindow* self) {
+static void
+direct_window_on_photo_changed (DirectWindow* self)
+{
Photo* photo = NULL;
DirectPhotoPage* _tmp0_;
Photo* _tmp1_;
@@ -663,12 +708,11 @@ static void direct_window_on_photo_changed (DirectWindow* self) {
_tmp2_ = photo;
#line 57 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala"
if (_tmp2_ != NULL) {
-#line 667 "DirectWindow.c"
+#line 712 "DirectWindow.c"
Photo* _tmp3_;
GFile* _tmp4_;
GFile* _tmp5_;
Photo* _tmp6_;
- gboolean _tmp7_;
#line 58 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala"
_tmp3_ = photo;
#line 58 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala"
@@ -678,29 +722,28 @@ static void direct_window_on_photo_changed (DirectWindow* self) {
#line 58 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala"
_tmp6_ = photo;
#line 58 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala"
- _tmp7_ = photo_has_alterations (_tmp6_);
-#line 58 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala"
- direct_window_update_title (self, _tmp5_, _tmp7_);
+ direct_window_update_title (self, _tmp5_, photo_has_alterations (_tmp6_));
#line 58 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala"
_g_object_unref0 (_tmp5_);
-#line 687 "DirectWindow.c"
+#line 729 "DirectWindow.c"
}
#line 55 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala"
_g_object_unref0 (photo);
-#line 691 "DirectWindow.c"
+#line 733 "DirectWindow.c"
}
-static void direct_window_real_on_quit (AppWindow* base) {
+static void
+direct_window_real_on_quit (AppWindow* base)
+{
DirectWindow * self;
DirectPhotoPage* _tmp0_;
DirectPhotoPage* _tmp1_;
gboolean _tmp2_;
- gboolean _tmp3_;
+ ConfigFacade* _tmp3_;
ConfigFacade* _tmp4_;
- ConfigFacade* _tmp5_;
- gboolean _tmp6_;
- Dimensions _tmp7_;
+ gboolean _tmp5_;
+ Dimensions _tmp6_;
#line 61 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala"
self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_DIRECT_WINDOW, DirectWindow);
#line 62 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala"
@@ -708,43 +751,43 @@ static void direct_window_real_on_quit (AppWindow* base) {
#line 62 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala"
_tmp1_ = _tmp0_;
#line 62 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala"
- _tmp2_ = direct_photo_page_check_quit (_tmp1_);
-#line 62 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala"
- _tmp3_ = !_tmp2_;
+ _tmp2_ = !direct_photo_page_check_quit (_tmp1_);
#line 62 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala"
_g_object_unref0 (_tmp1_);
#line 62 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala"
- if (_tmp3_) {
+ if (_tmp2_) {
#line 63 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala"
return;
-#line 721 "DirectWindow.c"
+#line 762 "DirectWindow.c"
}
#line 65 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala"
- _tmp4_ = config_facade_get_instance ();
+ _tmp3_ = config_facade_get_instance ();
#line 65 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala"
- _tmp5_ = _tmp4_;
+ _tmp4_ = _tmp3_;
#line 65 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala"
- _tmp6_ = G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_APP_WINDOW, AppWindow)->maximized;
+ _tmp5_ = G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_APP_WINDOW, AppWindow)->maximized;
#line 65 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala"
- _tmp7_ = G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_APP_WINDOW, AppWindow)->dimensions;
+ _tmp6_ = G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_APP_WINDOW, AppWindow)->dimensions;
#line 65 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala"
- configuration_facade_set_direct_window_state (G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade), _tmp6_, &_tmp7_);
+ configuration_facade_set_direct_window_state (G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade), _tmp5_, &_tmp6_);
#line 65 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala"
- _g_object_unref0 (_tmp5_);
+ _g_object_unref0 (_tmp4_);
#line 67 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala"
APP_WINDOW_CLASS (direct_window_parent_class)->on_quit (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_APP_WINDOW, AppWindow));
-#line 737 "DirectWindow.c"
+#line 778 "DirectWindow.c"
}
-static gboolean direct_window_real_delete_event (GtkWidget* base, GdkEventAny* event) {
+static gboolean
+direct_window_real_delete_event (GtkWidget* base,
+ GdkEventAny* event)
+{
DirectWindow * self;
gboolean result = FALSE;
DirectPhotoPage* _tmp0_;
DirectPhotoPage* _tmp1_;
gboolean _tmp2_;
- gboolean _tmp3_;
- gboolean _tmp4_ = FALSE;
+ gboolean _tmp3_ = FALSE;
#line 70 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala"
self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_DIRECT_WINDOW, DirectWindow);
#line 70 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala"
@@ -754,128 +797,114 @@ static gboolean direct_window_real_delete_event (GtkWidget* base, GdkEventAny* e
#line 71 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala"
_tmp1_ = _tmp0_;
#line 71 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala"
- _tmp2_ = direct_photo_page_check_quit (_tmp1_);
-#line 71 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala"
- _tmp3_ = !_tmp2_;
+ _tmp2_ = !direct_photo_page_check_quit (_tmp1_);
#line 71 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala"
_g_object_unref0 (_tmp1_);
#line 71 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala"
- if (_tmp3_) {
+ if (_tmp2_) {
#line 72 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala"
result = TRUE;
#line 72 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala"
return result;
-#line 769 "DirectWindow.c"
+#line 810 "DirectWindow.c"
}
#line 74 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala"
if (GTK_WIDGET_CLASS (direct_window_parent_class)->delete_event != NULL) {
-#line 773 "DirectWindow.c"
- GdkEventAny* _tmp5_;
- gboolean _tmp6_;
#line 74 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala"
- _tmp5_ = event;
-#line 74 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala"
- _tmp6_ = GTK_WIDGET_CLASS (direct_window_parent_class)->delete_event (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_APP_WINDOW, AppWindow), gtk_widget_get_type (), GtkWidget), _tmp5_);
-#line 74 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala"
- _tmp4_ = _tmp6_;
-#line 782 "DirectWindow.c"
+ _tmp3_ = GTK_WIDGET_CLASS (direct_window_parent_class)->delete_event (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_APP_WINDOW, AppWindow), gtk_widget_get_type (), GtkWidget), event);
+#line 816 "DirectWindow.c"
} else {
#line 74 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala"
- _tmp4_ = FALSE;
-#line 786 "DirectWindow.c"
+ _tmp3_ = FALSE;
+#line 820 "DirectWindow.c"
}
#line 74 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala"
- result = _tmp4_;
+ result = _tmp3_;
#line 74 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala"
return result;
-#line 792 "DirectWindow.c"
+#line 826 "DirectWindow.c"
}
-static gboolean direct_window_real_button_press_event (GtkWidget* base, GdkEventButton* event) {
+static gboolean
+direct_window_real_button_press_event (GtkWidget* base,
+ GdkEventButton* event)
+{
DirectWindow * self;
gboolean result = FALSE;
- GdkEventButton* _tmp0_;
- GdkEventType _tmp1_;
+ GdkEventType _tmp0_;
#line 77 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala"
self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_DIRECT_WINDOW, DirectWindow);
#line 77 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala"
g_return_val_if_fail (event != NULL, FALSE);
#line 78 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala"
- _tmp0_ = event;
-#line 78 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala"
- _tmp1_ = _tmp0_->type;
+ _tmp0_ = event->type;
#line 78 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala"
- if (_tmp1_ == GDK_2BUTTON_PRESS) {
+ if (_tmp0_ == GDK_2BUTTON_PRESS) {
#line 79 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala"
app_window_on_fullscreen (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_APP_WINDOW, AppWindow));
#line 81 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala"
result = TRUE;
#line 81 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala"
return result;
-#line 817 "DirectWindow.c"
+#line 851 "DirectWindow.c"
}
#line 84 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala"
result = FALSE;
#line 84 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala"
return result;
-#line 823 "DirectWindow.c"
+#line 857 "DirectWindow.c"
}
-static gboolean direct_window_real_key_press_event (GtkWidget* base, GdkEventKey* event) {
+static gboolean
+direct_window_real_key_press_event (GtkWidget* base,
+ GdkEventKey* event)
+{
DirectWindow * self;
gboolean result = FALSE;
- GdkEventKey* _tmp0_;
- guint _tmp1_;
- const gchar* _tmp2_;
- gboolean _tmp3_ = FALSE;
+ guint _tmp0_;
+ const gchar* _tmp1_;
+ gboolean _tmp2_ = FALSE;
#line 87 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala"
self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_DIRECT_WINDOW, DirectWindow);
#line 87 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala"
g_return_val_if_fail (event != NULL, FALSE);
#line 89 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala"
- _tmp0_ = event;
+ _tmp0_ = event->keyval;
#line 89 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala"
- _tmp1_ = _tmp0_->keyval;
+ _tmp1_ = gdk_keyval_name (_tmp0_);
#line 89 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala"
- _tmp2_ = gdk_keyval_name (_tmp1_);
-#line 89 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala"
- if (g_strcmp0 (_tmp2_, "Escape") == 0) {
+ if (g_strcmp0 (_tmp1_, "Escape") == 0) {
#line 90 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala"
app_window_on_quit (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_APP_WINDOW, AppWindow));
#line 92 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala"
result = TRUE;
#line 92 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala"
return result;
-#line 852 "DirectWindow.c"
+#line 886 "DirectWindow.c"
}
#line 96 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala"
if (GTK_WIDGET_CLASS (direct_window_parent_class)->key_press_event != NULL) {
-#line 856 "DirectWindow.c"
- GdkEventKey* _tmp4_;
- gboolean _tmp5_;
-#line 96 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala"
- _tmp4_ = event;
-#line 96 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala"
- _tmp5_ = GTK_WIDGET_CLASS (direct_window_parent_class)->key_press_event (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_APP_WINDOW, AppWindow), gtk_widget_get_type (), GtkWidget), _tmp4_);
#line 96 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala"
- _tmp3_ = _tmp5_;
-#line 865 "DirectWindow.c"
+ _tmp2_ = GTK_WIDGET_CLASS (direct_window_parent_class)->key_press_event (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_APP_WINDOW, AppWindow), gtk_widget_get_type (), GtkWidget), event);
+#line 892 "DirectWindow.c"
} else {
#line 96 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala"
- _tmp3_ = FALSE;
-#line 869 "DirectWindow.c"
+ _tmp2_ = FALSE;
+#line 896 "DirectWindow.c"
}
#line 96 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala"
- result = _tmp3_;
+ result = _tmp2_;
#line 96 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala"
return result;
-#line 875 "DirectWindow.c"
+#line 902 "DirectWindow.c"
}
-static void direct_window_class_init (DirectWindowClass * klass) {
+static void
+direct_window_class_init (DirectWindowClass * klass)
+{
#line 7 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala"
direct_window_parent_class = g_type_class_peek_parent (klass);
#line 7 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala"
@@ -894,18 +923,22 @@ static void direct_window_class_init (DirectWindowClass * klass) {
((GtkWidgetClass *) klass)->key_press_event = (gboolean (*) (GtkWidget *, GdkEventKey*)) direct_window_real_key_press_event;
#line 7 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala"
G_OBJECT_CLASS (klass)->finalize = direct_window_finalize;
-#line 898 "DirectWindow.c"
+#line 927 "DirectWindow.c"
}
-static void direct_window_instance_init (DirectWindow * self) {
+static void
+direct_window_instance_init (DirectWindow * self)
+{
#line 7 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala"
self->priv = DIRECT_WINDOW_GET_PRIVATE (self);
-#line 905 "DirectWindow.c"
+#line 936 "DirectWindow.c"
}
-static void direct_window_finalize (GObject * obj) {
+static void
+direct_window_finalize (GObject * obj)
+{
DirectWindow * self;
#line 7 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala"
self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_DIRECT_WINDOW, DirectWindow);
@@ -913,11 +946,13 @@ static void direct_window_finalize (GObject * obj) {
_g_object_unref0 (self->priv->direct_photo_page);
#line 7 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala"
G_OBJECT_CLASS (direct_window_parent_class)->finalize (obj);
-#line 917 "DirectWindow.c"
+#line 950 "DirectWindow.c"
}
-GType direct_window_get_type (void) {
+GType
+direct_window_get_type (void)
+{
static volatile gsize direct_window_type_id__volatile = 0;
if (g_once_init_enter (&direct_window_type_id__volatile)) {
static const GTypeInfo g_define_type_info = { sizeof (DirectWindowClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) direct_window_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (DirectWindow), 0, (GInstanceInitFunc) direct_window_instance_init, NULL };
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-01 22:17:14 +0000