diff options
Diffstat (limited to 'src/direct')
| -rw-r--r-- | src/direct/Direct.c | 2 | ||||
| -rw-r--r-- | src/direct/DirectPhoto.c | 32 | ||||
| -rw-r--r-- | src/direct/DirectPhotoPage.c | 2116 | ||||
| -rw-r--r-- | src/direct/DirectPhotoPage.vala | 15 | ||||
| -rw-r--r-- | src/direct/DirectView.c | 2 | ||||
| -rw-r--r-- | src/direct/DirectWindow.c | 338 | ||||
| -rw-r--r-- | src/direct/DirectWindow.vala | 2 |
7 files changed, 1275 insertions, 1232 deletions
diff --git a/src/direct/Direct.c b/src/direct/Direct.c index 2e1bfa4..3f0abf5 100644 --- a/src/direct/Direct.c +++ b/src/direct/Direct.c @@ -1,4 +1,4 @@ -/* Direct.c generated by valac 0.32.1, the Vala compiler +/* Direct.c generated by valac 0.34.4, the Vala compiler * generated from Direct.vala, do not modify */ /* Copyright 2016 Software Freedom Conservancy Inc. diff --git a/src/direct/DirectPhoto.c b/src/direct/DirectPhoto.c index 97ebcd5..6e17fe2 100644 --- a/src/direct/DirectPhoto.c +++ b/src/direct/DirectPhoto.c @@ -1,4 +1,4 @@ -/* DirectPhoto.c generated by valac 0.32.1, the Vala compiler +/* DirectPhoto.c generated by valac 0.34.4, the Vala compiler * generated from DirectPhoto.vala, do not modify */ /* Copyright 2016 Software Freedom Conservancy Inc. @@ -1258,7 +1258,7 @@ static void direct_photo_save_dims (DirectPhoto* self) { #line 59 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { #line 1261 "DirectPhoto.c" - goto __catch42_g_error; + goto __catch44_g_error; } #line 59 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala" _tmp3_ = G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PHOTO, Photo)->backing_photo_row; @@ -1270,8 +1270,8 @@ static void direct_photo_save_dims (DirectPhoto* self) { _g_object_unref0 (_tmp0_); #line 1272 "DirectPhoto.c" } - goto __finally42; - __catch42_g_error: + goto __finally44; + __catch44_g_error: { GError* e = NULL; gchar* _tmp5_ = NULL; @@ -1292,7 +1292,7 @@ static void direct_photo_save_dims (DirectPhoto* self) { _g_error_free0 (e); #line 1294 "DirectPhoto.c" } - __finally42: + __finally44: #line 58 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { #line 58 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala" @@ -1337,7 +1337,7 @@ ImportResult direct_photo_demand_load (DirectPhoto* self) { #line 75 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { #line 1340 "DirectPhoto.c" - goto __catch43_g_error; + goto __catch45_g_error; } #line 76 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala" _tmp2_ = reimport_state; @@ -1346,11 +1346,11 @@ ImportResult direct_photo_demand_load (DirectPhoto* self) { #line 76 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { #line 1349 "DirectPhoto.c" - goto __catch43_g_error; + goto __catch45_g_error; } } - goto __finally43; - __catch43_g_error: + goto __finally45; + __catch45_g_error: { GError* err = NULL; GError* _tmp3_ = NULL; @@ -1375,7 +1375,7 @@ ImportResult direct_photo_demand_load (DirectPhoto* self) { return result; #line 1377 "DirectPhoto.c" } - __finally43: + __finally45: #line 74 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { #line 74 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala" @@ -2563,7 +2563,7 @@ gchar* direct_photo_source_collection_fetch (DirectPhotoSourceCollection* self, #line 289 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala" _photo_reimport_master_state_unref0 (reimport_state); #line 2566 "DirectPhoto.c" - goto __catch44_g_error; + goto __catch46_g_error; } #line 289 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala" if (_tmp12_) { @@ -2582,7 +2582,7 @@ gchar* direct_photo_source_collection_fetch (DirectPhotoSourceCollection* self, #line 290 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala" _photo_reimport_master_state_unref0 (reimport_state); #line 2585 "DirectPhoto.c" - goto __catch44_g_error; + goto __catch46_g_error; } #line 291 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala" _tmp18_ = should_restore_ori; @@ -2613,8 +2613,8 @@ gchar* direct_photo_source_collection_fetch (DirectPhotoSourceCollection* self, _photo_reimport_master_state_unref0 (reimport_state); #line 2615 "DirectPhoto.c" } - goto __finally44; - __catch44_g_error: + goto __finally46; + __catch46_g_error: { GError* err = NULL; GError* _tmp22_ = NULL; @@ -2638,7 +2638,7 @@ gchar* direct_photo_source_collection_fetch (DirectPhotoSourceCollection* self, _g_error_free0 (err); #line 2640 "DirectPhoto.c" } - __finally44: + __finally46: #line 278 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { #line 278 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala" @@ -2791,7 +2791,7 @@ static void direct_photo_source_collection_instance_init (DirectPhotoSourceColle #line 177 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala" self->priv->prepared_photos = G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GEE_TYPE_COLLECTION, GeeCollection); #line 178 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala" - _tmp1_ = gee_hash_map_new (G_TYPE_FILE, (GBoxedCopyFunc) g_object_ref, g_object_unref, TYPE_DIRECT_PHOTO, (GBoxedCopyFunc) g_object_ref, g_object_unref, _file_hash_gee_hash_data_func, NULL, NULL, _file_equal_gee_equal_data_func, NULL, NULL, NULL, NULL, NULL); + _tmp1_ = gee_hash_map_new (g_file_get_type (), (GBoxedCopyFunc) g_object_ref, g_object_unref, TYPE_DIRECT_PHOTO, (GBoxedCopyFunc) g_object_ref, 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 2798 "DirectPhoto.c" diff --git a/src/direct/DirectPhotoPage.c b/src/direct/DirectPhotoPage.c index 807c74b..aeefa98 100644 --- a/src/direct/DirectPhotoPage.c +++ b/src/direct/DirectPhotoPage.c @@ -1,4 +1,4 @@ -/* DirectPhotoPage.c generated by valac 0.32.1, the Vala compiler +/* DirectPhotoPage.c generated by valac 0.34.4, the Vala compiler * generated from DirectPhotoPage.vala, do not modify */ /* Copyright 2016 Software Freedom Conservancy Inc. @@ -12,11 +12,11 @@ #include <gtk/gtk.h> #include <stdlib.h> #include <string.h> +#include <gio/gio.h> #include <gee.h> #include <gdk/gdk.h> #include <cairo.h> #include <gdk-pixbuf/gdk-pixbuf.h> -#include <gio/gio.h> #include <glib/gi18n-lib.h> #include <glib/gstdio.h> #include <float.h> @@ -265,16 +265,6 @@ typedef struct _AlterationClass AlterationClass; typedef struct _Application Application; typedef struct _ApplicationClass ApplicationClass; #define _application_unref0(var) ((var == NULL) ? NULL : (var = (application_unref (var), NULL))) - -#define TYPE_APP_WINDOW (app_window_get_type ()) -#define APP_WINDOW(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), TYPE_APP_WINDOW, AppWindow)) -#define APP_WINDOW_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), TYPE_APP_WINDOW, AppWindowClass)) -#define IS_APP_WINDOW(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), TYPE_APP_WINDOW)) -#define IS_APP_WINDOW_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), TYPE_APP_WINDOW)) -#define APP_WINDOW_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), TYPE_APP_WINDOW, AppWindowClass)) - -typedef struct _AppWindow AppWindow; -typedef struct _AppWindowClass AppWindowClass; #define _injection_group_unref0(var) ((var == NULL) ? NULL : (var = (injection_group_unref (var), NULL))) #define TYPE_DIRECT_PHOTO (direct_photo_get_type ()) @@ -349,6 +339,16 @@ typedef struct _PhotoFileFormatProperties PhotoFileFormatProperties; typedef struct _PhotoFileFormatPropertiesClass PhotoFileFormatPropertiesClass; #define _photo_file_format_properties_unref0(var) ((var == NULL) ? NULL : (var = (photo_file_format_properties_unref (var), NULL))) +#define TYPE_APP_WINDOW (app_window_get_type ()) +#define APP_WINDOW(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), TYPE_APP_WINDOW, AppWindow)) +#define APP_WINDOW_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), TYPE_APP_WINDOW, AppWindowClass)) +#define IS_APP_WINDOW(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), TYPE_APP_WINDOW)) +#define IS_APP_WINDOW_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), TYPE_APP_WINDOW)) +#define APP_WINDOW_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), TYPE_APP_WINDOW, AppWindowClass)) + +typedef struct _AppWindow AppWindow; +typedef struct _AppWindowClass AppWindowClass; + #define TYPE_PRINT_MANAGER (print_manager_get_type ()) #define PRINT_MANAGER(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), TYPE_PRINT_MANAGER, PrintManager)) #define PRINT_MANAGER_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), TYPE_PRINT_MANAGER, PrintManagerClass)) @@ -392,7 +392,8 @@ struct _PageClass { void (*ready) (Page* self); void (*switching_to_fullscreen) (Page* self, FullscreenWindow* fsw); void (*returning_from_fullscreen) (Page* self, FullscreenWindow* fsw); - void (*add_actions) (Page* self); + void (*add_actions) (Page* self, GActionMap* map); + void (*remove_actions) (Page* self, GActionMap* map); void (*init_collect_ui_filenames) (Page* self, GeeList* ui_filenames); InjectionGroup** (*init_collect_injection_groups) (Page* self, int* result_length1); void (*init_actions) (Page* self, gint selected_count, gint count); @@ -711,10 +712,10 @@ 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); -void page_add_actions (Page* self); -GType app_window_get_type (void) G_GNUC_CONST; -AppWindow* app_window_get_instance (void); +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); @@ -819,6 +820,8 @@ 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); +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); @@ -839,9 +842,9 @@ void print_manager_spool_photo (PrintManager* self, GeeCollection* to_print); GeeList* view_collection_get_selected_sources_of_type (ViewCollection* self, GType t); static Block6Data* block6_data_ref (Block6Data* _data6_); static void block6_data_unref (void * _userdata_); -static gboolean __lambda14_ (Block6Data* _data6_); +static gboolean __lambda15_ (Block6Data* _data6_); void editing_host_page_enable_rotate (EditingHostPage* self, gboolean should_enable); -static gboolean ___lambda14__gsource_func (gpointer self); +static gboolean ___lambda15__gsource_func (gpointer self); 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; @@ -859,182 +862,182 @@ static const GActionEntry DIRECT_PHOTO_PAGE_entries[23] = {{"Save", _direct_phot 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 863 "DirectPhotoPage.c" +#line 866 "DirectPhotoPage.c" } 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 870 "DirectPhotoPage.c" +#line 873 "DirectPhotoPage.c" } 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 877 "DirectPhotoPage.c" +#line 880 "DirectPhotoPage.c" } 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 884 "DirectPhotoPage.c" +#line 887 "DirectPhotoPage.c" } 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 891 "DirectPhotoPage.c" +#line 894 "DirectPhotoPage.c" } 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 898 "DirectPhotoPage.c" +#line 901 "DirectPhotoPage.c" } 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 905 "DirectPhotoPage.c" +#line 908 "DirectPhotoPage.c" } 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 912 "DirectPhotoPage.c" +#line 915 "DirectPhotoPage.c" } 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 919 "DirectPhotoPage.c" +#line 922 "DirectPhotoPage.c" } 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 926 "DirectPhotoPage.c" +#line 929 "DirectPhotoPage.c" } 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 933 "DirectPhotoPage.c" +#line 936 "DirectPhotoPage.c" } 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 940 "DirectPhotoPage.c" +#line 943 "DirectPhotoPage.c" } 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 947 "DirectPhotoPage.c" +#line 950 "DirectPhotoPage.c" } 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 954 "DirectPhotoPage.c" +#line 957 "DirectPhotoPage.c" } 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 961 "DirectPhotoPage.c" +#line 964 "DirectPhotoPage.c" } 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 968 "DirectPhotoPage.c" +#line 971 "DirectPhotoPage.c" } 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 975 "DirectPhotoPage.c" +#line 978 "DirectPhotoPage.c" } 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 982 "DirectPhotoPage.c" +#line 985 "DirectPhotoPage.c" } 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 989 "DirectPhotoPage.c" +#line 992 "DirectPhotoPage.c" } 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 996 "DirectPhotoPage.c" +#line 999 "DirectPhotoPage.c" } 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 1003 "DirectPhotoPage.c" +#line 1006 "DirectPhotoPage.c" } 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 1010 "DirectPhotoPage.c" +#line 1013 "DirectPhotoPage.c" } 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 1017 "DirectPhotoPage.c" +#line 1020 "DirectPhotoPage.c" } 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 1024 "DirectPhotoPage.c" +#line 1027 "DirectPhotoPage.c" } 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 1031 "DirectPhotoPage.c" +#line 1034 "DirectPhotoPage.c" } 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 1038 "DirectPhotoPage.c" +#line 1041 "DirectPhotoPage.c" } @@ -1074,7 +1077,7 @@ DirectPhotoPage* direct_photo_page_construct (GType object_type, GFile* file) { _tmp5_ = direct_photo_page_check_editable_file (_tmp4_); #line 16 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" if (!_tmp5_) { -#line 1078 "DirectPhotoPage.c" +#line 1081 "DirectPhotoPage.c" Application* _tmp6_ = NULL; Application* _tmp7_ = NULL; #line 17 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" @@ -1087,7 +1090,7 @@ DirectPhotoPage* direct_photo_page_construct (GType object_type, GFile* file) { _application_unref0 (_tmp7_); #line 19 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" return self; -#line 1091 "DirectPhotoPage.c" +#line 1094 "DirectPhotoPage.c" } #line 22 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" _tmp8_ = file; @@ -1125,14 +1128,14 @@ DirectPhotoPage* direct_photo_page_construct (GType object_type, GFile* file) { _data_collection_unref0 (_tmp15_); #line 13 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" return self; -#line 1129 "DirectPhotoPage.c" +#line 1132 "DirectPhotoPage.c" } 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 1136 "DirectPhotoPage.c" +#line 1139 "DirectPhotoPage.c" } @@ -1157,68 +1160,115 @@ static void direct_photo_page_real_init_collect_ui_filenames (Page* base, GeeLis _tmp2_ = ui_filenames; #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 1161 "DirectPhotoPage.c" +#line 1164 "DirectPhotoPage.c" } -static void direct_photo_page_real_add_actions (Page* base) { +static void direct_photo_page_real_add_actions (Page* base, GActionMap* map) { DirectPhotoPage * self; - AppWindow* _tmp0_ = NULL; - AppWindow* _tmp1_ = NULL; + GActionMap* _tmp0_ = NULL; + GActionMap* _tmp1_ = NULL; #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" - 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)); -#line 71 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" - _tmp0_ = app_window_get_instance (); -#line 71 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" - _tmp1_ = _tmp0_; + _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" - g_action_map_add_action_entries (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, g_action_map_get_type (), GActionMap), DIRECT_PHOTO_PAGE_entries, G_N_ELEMENTS (DIRECT_PHOTO_PAGE_entries), self); + _tmp1_ = map; #line 71 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" - _g_object_unref0 (_tmp1_); -#line 1181 "DirectPhotoPage.c" + g_action_map_add_action_entries (_tmp1_, DIRECT_PHOTO_PAGE_entries, G_N_ELEMENTS (DIRECT_PHOTO_PAGE_entries), self); +#line 1184 "DirectPhotoPage.c" +} + + +static void direct_photo_page_real_remove_actions (Page* base, GActionMap* map) { + DirectPhotoPage * self; + GActionMap* _tmp0_ = NULL; +#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 1199 "DirectPhotoPage.c" + { + GActionEntry* entry_collection = NULL; + gint entry_collection_length1 = 0; + gint _entry_collection_size_ = 0; + gint entry_it = 0; +#line 76 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" + entry_collection = DIRECT_PHOTO_PAGE_entries; +#line 76 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" + 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 1211 "DirectPhotoPage.c" + GActionEntry entry = {0}; +#line 76 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" + entry = entry_collection[entry_it]; +#line 1215 "DirectPhotoPage.c" + { + GActionMap* _tmp1_ = NULL; + GActionEntry _tmp2_ = {0}; + const gchar* _tmp3_ = NULL; +#line 77 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" + _tmp1_ = map; +#line 77 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" + _tmp2_ = entry; +#line 77 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" + _tmp3_ = _tmp2_.name; +#line 77 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" + g_action_map_remove_action (_tmp1_, _tmp3_); +#line 1228 "DirectPhotoPage.c" + } + } + } } static gpointer _injection_group_ref0 (gpointer self) { -#line 80 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" +#line 87 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" return self ? injection_group_ref (self) : NULL; -#line 1188 "DirectPhotoPage.c" +#line 1238 "DirectPhotoPage.c" } static void _vala_array_add61 (InjectionGroup*** array, int* length, int* size, InjectionGroup* value) { -#line 80 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" +#line 87 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" if ((*length) == (*size)) { -#line 80 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" +#line 87 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" *size = (*size) ? (2 * (*size)) : 4; -#line 80 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" +#line 87 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" *array = g_renew (InjectionGroup*, *array, (*size) + 1); -#line 1199 "DirectPhotoPage.c" +#line 1249 "DirectPhotoPage.c" } -#line 80 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" +#line 87 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" (*array)[(*length)++] = value; -#line 80 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" +#line 87 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" (*array)[*length] = NULL; -#line 1205 "DirectPhotoPage.c" +#line 1255 "DirectPhotoPage.c" } static void _vala_array_add62 (InjectionGroup*** array, int* length, int* size, InjectionGroup* value) { -#line 85 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" +#line 92 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" if ((*length) == (*size)) { -#line 85 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" +#line 92 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" *size = (*size) ? (2 * (*size)) : 4; -#line 85 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" +#line 92 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" *array = g_renew (InjectionGroup*, *array, (*size) + 1); -#line 1216 "DirectPhotoPage.c" +#line 1266 "DirectPhotoPage.c" } -#line 85 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" +#line 92 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" (*array)[(*length)++] = value; -#line 85 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" +#line 92 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" (*array)[*length] = NULL; -#line 1222 "DirectPhotoPage.c" +#line 1272 "DirectPhotoPage.c" } @@ -1244,67 +1294,67 @@ static InjectionGroup** direct_photo_page_real_init_collect_injection_groups (Pa InjectionGroup* _tmp9_ = NULL; InjectionGroup** _tmp10_ = NULL; gint _tmp10__length1 = 0; -#line 74 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" +#line 81 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_DIRECT_PHOTO_PAGE, DirectPhotoPage); -#line 75 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" +#line 82 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" _tmp1_ = PAGE_CLASS (direct_photo_page_parent_class)->init_collect_injection_groups (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage), TYPE_PAGE, Page), &_tmp0_); -#line 75 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" +#line 82 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" groups = _tmp1_; -#line 75 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" +#line 82 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" groups_length1 = _tmp0_; -#line 75 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" +#line 82 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" _groups_size_ = groups_length1; -#line 77 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" +#line 84 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" _tmp2_ = injection_group_new ("PrintPlaceholder"); -#line 77 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" +#line 84 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" print_group = _tmp2_; -#line 78 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" +#line 85 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" _tmp3_ = _ ("_Print"); -#line 78 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" +#line 85 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" injection_group_add_menu_item (print_group, _tmp3_, "Print", "<Primary>p"); -#line 80 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" +#line 87 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" _tmp4_ = groups; -#line 80 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" +#line 87 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" _tmp4__length1 = groups_length1; -#line 80 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" +#line 87 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" _tmp5_ = _injection_group_ref0 (print_group); -#line 80 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" +#line 87 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" _vala_array_add61 (&groups, &groups_length1, &_groups_size_, _tmp5_); -#line 82 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" +#line 89 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" _tmp6_ = injection_group_new ("SetBackgroundPlaceholder"); -#line 82 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" +#line 89 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" bg_group = _tmp6_; -#line 83 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" +#line 90 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" _tmp7_ = _ ("Set as _Desktop Background"); -#line 83 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" +#line 90 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" injection_group_add_menu_item (bg_group, _tmp7_, "SetBackground", "<Primary>b"); -#line 85 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" +#line 92 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" _tmp8_ = groups; -#line 85 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" +#line 92 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" _tmp8__length1 = groups_length1; -#line 85 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" +#line 92 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" _tmp9_ = _injection_group_ref0 (bg_group); -#line 85 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" +#line 92 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" _vala_array_add62 (&groups, &groups_length1, &_groups_size_, _tmp9_); -#line 87 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" +#line 94 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" _tmp10_ = groups; -#line 87 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" +#line 94 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" _tmp10__length1 = groups_length1; -#line 87 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" +#line 94 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" if (result_length1) { -#line 87 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" +#line 94 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" *result_length1 = _tmp10__length1; -#line 1298 "DirectPhotoPage.c" +#line 1348 "DirectPhotoPage.c" } -#line 87 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" +#line 94 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" result = _tmp10_; -#line 87 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" +#line 94 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" _injection_group_unref0 (bg_group); -#line 87 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" +#line 94 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" _injection_group_unref0 (print_group); -#line 87 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" +#line 94 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" return result; -#line 1308 "DirectPhotoPage.c" +#line 1358 "DirectPhotoPage.c" } @@ -1315,143 +1365,143 @@ static gboolean direct_photo_page_check_editable_file (GFile* file) { gchar* _tmp2_ = NULL; gboolean _tmp3_ = FALSE; gboolean _tmp4_ = FALSE; -#line 90 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" +#line 97 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" g_return_val_if_fail (G_IS_FILE (file), FALSE); -#line 91 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" +#line 98 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" _tmp0_ = file; -#line 91 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" +#line 98 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" _tmp1_ = g_file_get_path (_tmp0_); -#line 91 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" +#line 98 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" _tmp2_ = _tmp1_; -#line 91 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" +#line 98 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" _tmp3_ = g_file_test (_tmp2_, G_FILE_TEST_EXISTS); -#line 91 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" +#line 98 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" _tmp4_ = !_tmp3_; -#line 91 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" +#line 98 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" _g_free0 (_tmp2_); -#line 91 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" +#line 98 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" if (_tmp4_) { -#line 1335 "DirectPhotoPage.c" +#line 1385 "DirectPhotoPage.c" const gchar* _tmp5_ = NULL; GFile* _tmp6_ = NULL; gchar* _tmp7_ = NULL; gchar* _tmp8_ = NULL; gchar* _tmp9_ = NULL; gchar* _tmp10_ = NULL; -#line 92 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" +#line 99 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" _tmp5_ = _ ("%s does not exist."); -#line 92 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" +#line 99 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" _tmp6_ = file; -#line 92 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" +#line 99 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" _tmp7_ = g_file_get_path (_tmp6_); -#line 92 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" +#line 99 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" _tmp8_ = _tmp7_; -#line 92 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" +#line 99 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" _tmp9_ = g_strdup_printf (_tmp5_, _tmp8_); -#line 92 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" +#line 99 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" _tmp10_ = _tmp9_; -#line 92 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" +#line 99 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" app_window_error_message (_tmp10_, NULL); -#line 92 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" +#line 99 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" _g_free0 (_tmp10_); -#line 92 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" +#line 99 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" _g_free0 (_tmp8_); -#line 1360 "DirectPhotoPage.c" +#line 1410 "DirectPhotoPage.c" } else { GFile* _tmp11_ = NULL; gchar* _tmp12_ = NULL; gchar* _tmp13_ = NULL; gboolean _tmp14_ = FALSE; gboolean _tmp15_ = FALSE; -#line 93 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" +#line 100 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" _tmp11_ = file; -#line 93 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" +#line 100 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" _tmp12_ = g_file_get_path (_tmp11_); -#line 93 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" +#line 100 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" _tmp13_ = _tmp12_; -#line 93 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" +#line 100 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" _tmp14_ = g_file_test (_tmp13_, G_FILE_TEST_IS_REGULAR); -#line 93 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" +#line 100 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" _tmp15_ = !_tmp14_; -#line 93 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" +#line 100 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" _g_free0 (_tmp13_); -#line 93 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" +#line 100 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" if (_tmp15_) { -#line 1381 "DirectPhotoPage.c" +#line 1431 "DirectPhotoPage.c" const gchar* _tmp16_ = NULL; GFile* _tmp17_ = NULL; gchar* _tmp18_ = NULL; gchar* _tmp19_ = NULL; gchar* _tmp20_ = NULL; gchar* _tmp21_ = NULL; -#line 94 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" +#line 101 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" _tmp16_ = _ ("%s is not a file."); -#line 94 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" +#line 101 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" _tmp17_ = file; -#line 94 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" +#line 101 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" _tmp18_ = g_file_get_path (_tmp17_); -#line 94 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" +#line 101 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" _tmp19_ = _tmp18_; -#line 94 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" +#line 101 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" _tmp20_ = g_strdup_printf (_tmp16_, _tmp19_); -#line 94 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" +#line 101 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" _tmp21_ = _tmp20_; -#line 94 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" +#line 101 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" app_window_error_message (_tmp21_, NULL); -#line 94 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" +#line 101 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" _g_free0 (_tmp21_); -#line 94 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" +#line 101 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" _g_free0 (_tmp19_); -#line 1406 "DirectPhotoPage.c" +#line 1456 "DirectPhotoPage.c" } else { GFile* _tmp22_ = NULL; gboolean _tmp23_ = FALSE; -#line 95 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" +#line 102 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" _tmp22_ = file; -#line 95 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" +#line 102 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" _tmp23_ = photo_file_format_is_file_supported (_tmp22_); -#line 95 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" +#line 102 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" if (!_tmp23_) { -#line 1416 "DirectPhotoPage.c" +#line 1466 "DirectPhotoPage.c" const gchar* _tmp24_ = NULL; GFile* _tmp25_ = NULL; gchar* _tmp26_ = NULL; gchar* _tmp27_ = NULL; gchar* _tmp28_ = NULL; gchar* _tmp29_ = NULL; -#line 96 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" +#line 103 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" _tmp24_ = _ ("%s does not support the file format of\n%s."); -#line 96 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" +#line 103 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" _tmp25_ = file; -#line 96 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" +#line 103 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" _tmp26_ = g_file_get_path (_tmp25_); -#line 96 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" +#line 103 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" _tmp27_ = _tmp26_; -#line 96 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" +#line 103 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" _tmp28_ = g_strdup_printf (_tmp24_, RESOURCES_APP_TITLE, _tmp27_); -#line 96 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" +#line 103 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" _tmp29_ = _tmp28_; -#line 96 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" +#line 103 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" app_window_error_message (_tmp29_, NULL); -#line 96 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" +#line 103 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" _g_free0 (_tmp29_); -#line 96 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" +#line 103 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" _g_free0 (_tmp27_); -#line 1441 "DirectPhotoPage.c" +#line 1491 "DirectPhotoPage.c" } else { -#line 99 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" +#line 106 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" result = TRUE; -#line 99 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" +#line 106 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" return result; -#line 1447 "DirectPhotoPage.c" +#line 1497 "DirectPhotoPage.c" } } } -#line 101 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" +#line 108 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" result = FALSE; -#line 101 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" +#line 108 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" return result; -#line 1455 "DirectPhotoPage.c" +#line 1505 "DirectPhotoPage.c" } @@ -1462,36 +1512,36 @@ static void direct_photo_page_real_realize (GtkWidget* base) { GFile* _tmp1_ = NULL; DirectPhoto* _tmp2_ = NULL; DirectPhoto* _tmp3_ = NULL; -#line 104 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" +#line 111 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_DIRECT_PHOTO_PAGE, DirectPhotoPage); -#line 105 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" +#line 112 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" if (GTK_WIDGET_CLASS (direct_photo_page_parent_class)->realize != NULL) { -#line 106 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" +#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 1472 "DirectPhotoPage.c" +#line 1522 "DirectPhotoPage.c" } -#line 108 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" +#line 115 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" _tmp0_ = direct_photo_global; -#line 108 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" +#line 115 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" _tmp1_ = self->priv->initial_file; -#line 108 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" +#line 115 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" _tmp2_ = direct_photo_source_collection_get_file_source (_tmp0_, _tmp1_); -#line 108 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" +#line 115 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" photo = _tmp2_; -#line 110 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" +#line 117 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" _tmp3_ = photo; -#line 110 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" +#line 117 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" if (_tmp3_ != NULL) { -#line 1486 "DirectPhotoPage.c" +#line 1536 "DirectPhotoPage.c" DirectViewCollection* _tmp4_ = NULL; DirectPhoto* _tmp5_ = NULL; -#line 111 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" +#line 118 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" _tmp4_ = self->priv->view_controller; -#line 111 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" +#line 118 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" _tmp5_ = photo; -#line 111 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" +#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 1495 "DirectPhotoPage.c" +#line 1545 "DirectPhotoPage.c" } else { const gchar* _tmp6_ = NULL; GFile* _tmp7_ = NULL; @@ -1499,40 +1549,40 @@ static void direct_photo_page_real_realize (GtkWidget* base) { gchar* _tmp9_ = NULL; gchar* _tmp10_ = NULL; gchar* _tmp11_ = NULL; -#line 113 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" +#line 120 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" _tmp6_ = _ ("Unable open photo %s. Sorry."); -#line 113 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" +#line 120 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" _tmp7_ = self->priv->initial_file; -#line 113 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" +#line 120 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" _tmp8_ = g_file_get_path (_tmp7_); -#line 113 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" +#line 120 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" _tmp9_ = _tmp8_; -#line 113 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" +#line 120 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" _tmp10_ = g_strdup_printf (_tmp6_, _tmp9_); -#line 113 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" +#line 120 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" _tmp11_ = _tmp10_; -#line 113 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" +#line 120 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" app_window_panic (_tmp11_); -#line 113 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" +#line 120 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" _g_free0 (_tmp11_); -#line 113 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" +#line 120 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" _g_free0 (_tmp9_); -#line 1521 "DirectPhotoPage.c" +#line 1571 "DirectPhotoPage.c" } -#line 116 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" +#line 123 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" _g_object_unref0 (self->priv->initial_file); -#line 116 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" +#line 123 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" self->priv->initial_file = NULL; -#line 104 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" +#line 111 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" _g_object_unref0 (photo); -#line 1529 "DirectPhotoPage.c" +#line 1579 "DirectPhotoPage.c" } static void _direct_photo_page_on_dphoto_can_rotate_changed_direct_photo_can_rotate_changed (DirectPhoto* _sender, gboolean b, gpointer self) { -#line 124 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" +#line 131 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" direct_photo_page_on_dphoto_can_rotate_changed ((DirectPhotoPage*) self, b); -#line 1536 "DirectPhotoPage.c" +#line 1586 "DirectPhotoPage.c" } @@ -1546,81 +1596,81 @@ static void direct_photo_page_real_photo_changing (EditingHostPage* base, Photo* Photo* _tmp9_ = NULL; DirectPhoto* _tmp10_ = NULL; DirectPhoto* _tmp11_ = NULL; -#line 119 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" +#line 126 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_DIRECT_PHOTO_PAGE, DirectPhotoPage); -#line 119 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" +#line 126 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" g_return_if_fail (IS_PHOTO (new_photo)); -#line 120 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" +#line 127 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" _tmp0_ = editing_host_page_get_photo (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage)); -#line 120 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" +#line 127 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" _tmp1_ = _tmp0_; -#line 120 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" +#line 127 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" _tmp2_ = _tmp1_ != NULL; -#line 120 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" +#line 127 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" _g_object_unref0 (_tmp1_); -#line 120 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" +#line 127 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" if (_tmp2_) { -#line 1564 "DirectPhotoPage.c" +#line 1614 "DirectPhotoPage.c" DirectPhoto* tmp = NULL; Photo* _tmp3_ = NULL; DirectPhoto* _tmp4_ = NULL; DirectPhoto* _tmp5_ = NULL; -#line 121 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" +#line 128 "/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 121 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" +#line 128 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" _tmp4_ = G_TYPE_CHECK_INSTANCE_TYPE (_tmp3_, TYPE_DIRECT_PHOTO) ? ((DirectPhoto*) _tmp3_) : NULL; -#line 121 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" +#line 128 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" if (_tmp4_ == NULL) { -#line 121 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" +#line 128 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" _g_object_unref0 (_tmp3_); -#line 1577 "DirectPhotoPage.c" +#line 1627 "DirectPhotoPage.c" } -#line 121 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" +#line 128 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" tmp = _tmp4_; -#line 123 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" +#line 130 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" _tmp5_ = tmp; -#line 123 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" +#line 130 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" if (_tmp5_ != NULL) { -#line 1585 "DirectPhotoPage.c" +#line 1635 "DirectPhotoPage.c" DirectPhoto* _tmp6_ = NULL; guint _tmp7_ = 0U; -#line 124 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" +#line 131 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" _tmp6_ = tmp; -#line 124 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" +#line 131 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" g_signal_parse_name ("can-rotate-changed", TYPE_DIRECT_PHOTO, &_tmp7_, NULL, FALSE); -#line 124 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" +#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 1594 "DirectPhotoPage.c" +#line 1644 "DirectPhotoPage.c" } -#line 120 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" +#line 127 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" _g_object_unref0 (tmp); -#line 1598 "DirectPhotoPage.c" +#line 1648 "DirectPhotoPage.c" } -#line 128 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" +#line 135 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" _tmp8_ = new_photo; -#line 128 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" +#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 130 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" +#line 137 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" _tmp9_ = new_photo; -#line 130 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" +#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); -#line 130 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" +#line 137 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" tmp = _tmp10_; -#line 132 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" +#line 139 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" _tmp11_ = tmp; -#line 132 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" +#line 139 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" if (_tmp11_ != NULL) { -#line 1614 "DirectPhotoPage.c" +#line 1664 "DirectPhotoPage.c" DirectPhoto* _tmp12_ = NULL; -#line 133 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" +#line 140 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" _tmp12_ = tmp; -#line 133 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" +#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 1620 "DirectPhotoPage.c" +#line 1670 "DirectPhotoPage.c" } -#line 119 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" +#line 126 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" _g_object_unref0 (tmp); -#line 1624 "DirectPhotoPage.c" +#line 1674 "DirectPhotoPage.c" } @@ -1630,38 +1680,38 @@ GFile* direct_photo_page_get_current_file (DirectPhotoPage* self) { Photo* _tmp1_ = NULL; GFile* _tmp2_ = NULL; GFile* _tmp3_ = NULL; -#line 137 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" +#line 144 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" g_return_val_if_fail (IS_DIRECT_PHOTO_PAGE (self), NULL); -#line 138 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" +#line 145 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" _tmp0_ = editing_host_page_get_photo (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage)); -#line 138 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" +#line 145 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" _tmp1_ = _tmp0_; -#line 138 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" +#line 145 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" _tmp2_ = media_source_get_file (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, TYPE_MEDIA_SOURCE, MediaSource)); -#line 138 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" +#line 145 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" _tmp3_ = _tmp2_; -#line 138 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" +#line 145 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" _g_object_unref0 (_tmp1_); -#line 138 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" +#line 145 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" result = _tmp3_; -#line 138 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" +#line 145 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" return result; -#line 1650 "DirectPhotoPage.c" +#line 1700 "DirectPhotoPage.c" } static gboolean direct_photo_page_real_on_context_buttonpress (Page* base, GdkEventButton* event) { DirectPhotoPage * self; gboolean result = FALSE; -#line 141 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" +#line 148 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_DIRECT_PHOTO_PAGE, DirectPhotoPage); -#line 141 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" +#line 148 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" g_return_val_if_fail (event != NULL, FALSE); -#line 145 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" +#line 152 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" result = TRUE; -#line 145 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" +#line 152 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" return result; -#line 1665 "DirectPhotoPage.c" +#line 1715 "DirectPhotoPage.c" } @@ -1672,73 +1722,73 @@ static void direct_photo_page_update_zoom_menu_item_sensitivity (DirectPhotoPage gboolean _tmp4_ = FALSE; ZoomState _tmp5_ = {0}; gboolean _tmp6_ = FALSE; -#line 148 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" +#line 155 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" g_return_if_fail (IS_DIRECT_PHOTO_PAGE (self)); -#line 149 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" +#line 156 "/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 149 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" +#line 156 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" _tmp2_ = zoom_state_is_max (&_tmp1_); -#line 149 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" +#line 156 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" if (!_tmp2_) { -#line 1684 "DirectPhotoPage.c" +#line 1734 "DirectPhotoPage.c" gboolean _tmp3_ = FALSE; -#line 149 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" +#line 156 "/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 149 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" +#line 156 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" _tmp0_ = !_tmp3_; -#line 1690 "DirectPhotoPage.c" +#line 1740 "DirectPhotoPage.c" } else { -#line 149 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" +#line 156 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" _tmp0_ = FALSE; -#line 1694 "DirectPhotoPage.c" +#line 1744 "DirectPhotoPage.c" } -#line 149 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" +#line 156 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "IncreaseSize", _tmp0_); -#line 150 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" +#line 157 "/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 150 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" +#line 157 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" _tmp6_ = zoom_state_is_default (&_tmp5_); -#line 150 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" +#line 157 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" if (!_tmp6_) { -#line 1704 "DirectPhotoPage.c" +#line 1754 "DirectPhotoPage.c" gboolean _tmp7_ = FALSE; -#line 150 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" +#line 157 "/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)); -#line 150 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" +#line 157 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" _tmp4_ = !_tmp7_; -#line 1710 "DirectPhotoPage.c" +#line 1760 "DirectPhotoPage.c" } else { -#line 150 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" +#line 157 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" _tmp4_ = FALSE; -#line 1714 "DirectPhotoPage.c" +#line 1764 "DirectPhotoPage.c" } -#line 150 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" +#line 157 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "DecreaseSize", _tmp4_); -#line 1718 "DirectPhotoPage.c" +#line 1768 "DirectPhotoPage.c" } static void direct_photo_page_real_on_increase_size (EditingHostPage* base) { DirectPhotoPage * self; -#line 153 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" +#line 160 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_DIRECT_PHOTO_PAGE, DirectPhotoPage); -#line 154 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" +#line 161 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" EDITING_HOST_PAGE_CLASS (direct_photo_page_parent_class)->on_increase_size (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage)); -#line 156 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" +#line 163 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" direct_photo_page_update_zoom_menu_item_sensitivity (self); -#line 1730 "DirectPhotoPage.c" +#line 1780 "DirectPhotoPage.c" } static void direct_photo_page_real_on_decrease_size (EditingHostPage* base) { DirectPhotoPage * self; -#line 159 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" +#line 166 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_DIRECT_PHOTO_PAGE, DirectPhotoPage); -#line 160 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" +#line 167 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" EDITING_HOST_PAGE_CLASS (direct_photo_page_parent_class)->on_decrease_size (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage)); -#line 162 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" +#line 169 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" direct_photo_page_update_zoom_menu_item_sensitivity (self); -#line 1742 "DirectPhotoPage.c" +#line 1792 "DirectPhotoPage.c" } @@ -1752,24 +1802,24 @@ static void direct_photo_page_on_photos_altered (DirectPhotoPage* self, GeeMap* gboolean _tmp19_ = FALSE; gboolean _tmp20_ = FALSE; gboolean _tmp25_ = FALSE; -#line 165 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" +#line 172 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" g_return_if_fail (IS_DIRECT_PHOTO_PAGE (self)); -#line 165 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" +#line 172 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" g_return_if_fail (GEE_IS_MAP (map)); -#line 166 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" +#line 173 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" contains = FALSE; -#line 167 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" +#line 174 "/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 167 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" +#line 174 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" if (_tmp0_) { -#line 1766 "DirectPhotoPage.c" +#line 1816 "DirectPhotoPage.c" Photo* photo = NULL; Photo* _tmp1_ = NULL; -#line 168 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" +#line 175 "/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)); -#line 168 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" +#line 175 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" photo = _tmp1_; -#line 1773 "DirectPhotoPage.c" +#line 1823 "DirectPhotoPage.c" { GeeIterator* _object_it = NULL; GeeMap* _tmp2_ = NULL; @@ -1778,25 +1828,25 @@ static void direct_photo_page_on_photos_altered (DirectPhotoPage* self, GeeMap* GeeSet* _tmp5_ = NULL; GeeIterator* _tmp6_ = NULL; GeeIterator* _tmp7_ = NULL; -#line 169 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" +#line 176 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" _tmp2_ = map; -#line 169 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" +#line 176 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" _tmp3_ = gee_map_get_keys (_tmp2_); -#line 169 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" +#line 176 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" _tmp4_ = _tmp3_; -#line 169 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" +#line 176 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" _tmp5_ = _tmp4_; -#line 169 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" +#line 176 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" _tmp6_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, GEE_TYPE_ITERABLE, GeeIterable)); -#line 169 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" +#line 176 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" _tmp7_ = _tmp6_; -#line 169 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" +#line 176 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" _g_object_unref0 (_tmp5_); -#line 169 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" +#line 176 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" _object_it = _tmp7_; -#line 169 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" +#line 176 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" while (TRUE) { -#line 1800 "DirectPhotoPage.c" +#line 1850 "DirectPhotoPage.c" GeeIterator* _tmp8_ = NULL; gboolean _tmp9_ = FALSE; DataObject* object = NULL; @@ -1804,129 +1854,129 @@ static void direct_photo_page_on_photos_altered (DirectPhotoPage* self, GeeMap* gpointer _tmp11_ = NULL; DataObject* _tmp12_ = NULL; Photo* _tmp13_ = NULL; -#line 169 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" +#line 176 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" _tmp8_ = _object_it; -#line 169 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" +#line 176 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" _tmp9_ = gee_iterator_next (_tmp8_); -#line 169 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" +#line 176 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" if (!_tmp9_) { -#line 169 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" +#line 176 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" break; -#line 1816 "DirectPhotoPage.c" +#line 1866 "DirectPhotoPage.c" } -#line 169 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" +#line 176 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" _tmp10_ = _object_it; -#line 169 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" +#line 176 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" _tmp11_ = gee_iterator_get (_tmp10_); -#line 169 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" +#line 176 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" object = (DataObject*) _tmp11_; -#line 170 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" +#line 177 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" _tmp12_ = object; -#line 170 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" +#line 177 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" _tmp13_ = photo; -#line 170 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" +#line 177 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" if (G_TYPE_CHECK_INSTANCE_CAST (_tmp12_, TYPE_PHOTO, Photo) == _tmp13_) { -#line 171 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" +#line 178 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" contains = TRUE; -#line 173 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" +#line 180 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" _g_object_unref0 (object); -#line 173 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" +#line 180 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" break; -#line 1836 "DirectPhotoPage.c" +#line 1886 "DirectPhotoPage.c" } -#line 169 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" +#line 176 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" _g_object_unref0 (object); -#line 1840 "DirectPhotoPage.c" +#line 1890 "DirectPhotoPage.c" } -#line 169 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" +#line 176 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" _g_object_unref0 (_object_it); -#line 1844 "DirectPhotoPage.c" +#line 1894 "DirectPhotoPage.c" } -#line 167 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" +#line 174 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" _g_object_unref0 (photo); -#line 1848 "DirectPhotoPage.c" +#line 1898 "DirectPhotoPage.c" } -#line 178 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" +#line 185 "/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 178 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" +#line 185 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" if (_tmp15_) { -#line 1854 "DirectPhotoPage.c" +#line 1904 "DirectPhotoPage.c" gboolean _tmp16_ = FALSE; -#line 178 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" +#line 185 "/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)); -#line 178 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" +#line 185 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" _tmp14_ = !_tmp16_; -#line 1860 "DirectPhotoPage.c" +#line 1910 "DirectPhotoPage.c" } else { -#line 178 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" +#line 185 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" _tmp14_ = FALSE; -#line 1864 "DirectPhotoPage.c" +#line 1914 "DirectPhotoPage.c" } -#line 178 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" +#line 185 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" sensitive = _tmp14_; -#line 179 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" +#line 186 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" _tmp17_ = sensitive; -#line 179 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" +#line 186 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" if (_tmp17_) { -#line 1872 "DirectPhotoPage.c" +#line 1922 "DirectPhotoPage.c" gboolean _tmp18_ = FALSE; -#line 180 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" +#line 187 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" _tmp18_ = contains; -#line 180 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" +#line 187 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" sensitive = _tmp18_; -#line 1878 "DirectPhotoPage.c" +#line 1928 "DirectPhotoPage.c" } -#line 182 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" +#line 189 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" _tmp20_ = sensitive; -#line 182 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" +#line 189 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" if (_tmp20_) { -#line 1884 "DirectPhotoPage.c" +#line 1934 "DirectPhotoPage.c" Photo* _tmp21_ = NULL; Photo* _tmp22_ = NULL; PhotoFileFormat _tmp23_ = 0; gboolean _tmp24_ = FALSE; -#line 182 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" +#line 189 "/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)); -#line 182 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" +#line 189 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" _tmp22_ = _tmp21_; -#line 182 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" +#line 189 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" _tmp23_ = photo_get_file_format (_tmp22_); -#line 182 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" +#line 189 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" _tmp24_ = photo_file_format_can_write (_tmp23_); -#line 182 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" +#line 189 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" _tmp19_ = _tmp24_; -#line 182 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" +#line 189 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" _g_object_unref0 (_tmp22_); -#line 1901 "DirectPhotoPage.c" +#line 1951 "DirectPhotoPage.c" } else { -#line 182 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" +#line 189 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" _tmp19_ = FALSE; -#line 1905 "DirectPhotoPage.c" +#line 1955 "DirectPhotoPage.c" } -#line 182 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" +#line 189 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "Save", _tmp19_); -#line 183 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" +#line 190 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" _tmp25_ = sensitive; -#line 183 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" +#line 190 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "Revert", _tmp25_); -#line 1913 "DirectPhotoPage.c" +#line 1963 "DirectPhotoPage.c" } static void direct_photo_page_on_selection_group_altered (DirectPhotoPage* self) { CommandManager* _tmp0_ = NULL; CommandManager* _tmp1_ = NULL; -#line 186 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" - g_return_if_fail (IS_DIRECT_PHOTO_PAGE (self)); #line 193 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" + g_return_if_fail (IS_DIRECT_PHOTO_PAGE (self)); +#line 200 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" _tmp0_ = page_get_command_manager (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page)); -#line 193 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" +#line 200 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" _tmp1_ = _tmp0_; -#line 193 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" +#line 200 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" command_manager_reset (_tmp1_); -#line 193 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" +#line 200 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" _command_manager_unref0 (_tmp1_); -#line 1930 "DirectPhotoPage.c" +#line 1980 "DirectPhotoPage.c" } @@ -1939,51 +1989,51 @@ static gboolean direct_photo_page_real_on_double_click (EditingHostPage* base, G FullscreenWindow* _tmp2_ = NULL; GdkEventButton* _tmp4_ = NULL; gboolean _tmp5_ = FALSE; -#line 196 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" +#line 203 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_DIRECT_PHOTO_PAGE, DirectPhotoPage); -#line 196 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" +#line 203 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" g_return_val_if_fail (event != NULL, FALSE); -#line 197 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" +#line 204 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" _tmp0_ = page_get_container (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page)); -#line 197 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" +#line 204 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" _tmp1_ = G_TYPE_CHECK_INSTANCE_TYPE (_tmp0_, TYPE_FULLSCREEN_WINDOW) ? ((FullscreenWindow*) _tmp0_) : NULL; -#line 197 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" +#line 204 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" if (_tmp1_ == NULL) { -#line 197 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" +#line 204 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" _g_object_unref0 (_tmp0_); -#line 1955 "DirectPhotoPage.c" +#line 2005 "DirectPhotoPage.c" } -#line 197 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" +#line 204 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" fs = _tmp1_; -#line 198 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" +#line 205 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" _tmp2_ = fs; -#line 198 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" +#line 205 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" if (_tmp2_ != NULL) { -#line 1963 "DirectPhotoPage.c" +#line 2013 "DirectPhotoPage.c" FullscreenWindow* _tmp3_ = NULL; -#line 199 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" +#line 206 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" _tmp3_ = fs; -#line 199 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" +#line 206 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" fullscreen_window_close (_tmp3_); -#line 201 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" +#line 208 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" result = TRUE; -#line 201 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" +#line 208 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" _g_object_unref0 (fs); -#line 201 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" +#line 208 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" return result; -#line 1975 "DirectPhotoPage.c" +#line 2025 "DirectPhotoPage.c" } -#line 204 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" +#line 211 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" _tmp4_ = event; -#line 204 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" +#line 211 "/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 204 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" +#line 211 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" result = _tmp5_; -#line 204 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" +#line 211 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" _g_object_unref0 (fs); -#line 204 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" +#line 211 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" return result; -#line 1987 "DirectPhotoPage.c" +#line 2037 "DirectPhotoPage.c" } @@ -2019,135 +2069,135 @@ static void direct_photo_page_real_update_ui (EditingHostPage* base, gboolean mi gboolean _tmp26_ = FALSE; gboolean _tmp27_ = FALSE; gboolean _tmp29_ = FALSE; -#line 207 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" +#line 214 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_DIRECT_PHOTO_PAGE, DirectPhotoPage); -#line 208 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" +#line 215 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" _tmp0_ = missing; -#line 208 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" +#line 215 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" sensitivity = !_tmp0_; -#line 210 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" +#line 217 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" _tmp1_ = sensitivity; -#line 210 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" +#line 217 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "Save", _tmp1_); -#line 211 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" +#line 218 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" _tmp2_ = sensitivity; -#line 211 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" +#line 218 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "SaveAs", _tmp2_); -#line 212 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" +#line 219 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" _tmp3_ = sensitivity; -#line 212 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" +#line 219 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "SendTo", _tmp3_); -#line 213 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" +#line 220 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" _tmp4_ = sensitivity; -#line 213 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" +#line 220 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "Publish", _tmp4_); -#line 214 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" +#line 221 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" _tmp5_ = sensitivity; -#line 214 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" +#line 221 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "Print", _tmp5_); -#line 215 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" +#line 222 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" _tmp6_ = sensitivity; -#line 215 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" +#line 222 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "CommonJumpToFile", _tmp6_); -#line 217 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" +#line 224 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" _tmp7_ = sensitivity; -#line 217 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" +#line 224 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "CommonUndo", _tmp7_); -#line 218 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" +#line 225 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" _tmp8_ = sensitivity; -#line 218 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" +#line 225 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "CommonRedo", _tmp8_); -#line 220 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" +#line 227 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" _tmp9_ = sensitivity; -#line 220 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" +#line 227 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "IncreaseSize", _tmp9_); -#line 221 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" +#line 228 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" _tmp10_ = sensitivity; -#line 221 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" +#line 228 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "DecreaseSize", _tmp10_); -#line 222 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" +#line 229 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" _tmp11_ = sensitivity; -#line 222 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" +#line 229 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "ZoomFit", _tmp11_); -#line 223 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" +#line 230 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" _tmp12_ = sensitivity; -#line 223 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" +#line 230 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "Zoom100", _tmp12_); -#line 224 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" +#line 231 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" _tmp13_ = sensitivity; -#line 224 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" +#line 231 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "Zoom200", _tmp13_); -#line 226 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" +#line 233 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" _tmp14_ = sensitivity; -#line 226 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" +#line 233 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "RotateClockwise", _tmp14_); -#line 227 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" +#line 234 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" _tmp15_ = sensitivity; -#line 227 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" +#line 234 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "RotateCounterclockwise", _tmp15_); -#line 228 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" +#line 235 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" _tmp16_ = sensitivity; -#line 228 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" +#line 235 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "FlipHorizontally", _tmp16_); -#line 229 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" +#line 236 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" _tmp17_ = sensitivity; -#line 229 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" +#line 236 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "FlipVertically", _tmp17_); -#line 230 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" +#line 237 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" _tmp18_ = sensitivity; -#line 230 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" +#line 237 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "Enhance", _tmp18_); -#line 231 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" +#line 238 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" _tmp19_ = sensitivity; -#line 231 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" +#line 238 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "Crop", _tmp19_); -#line 232 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" +#line 239 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" _tmp20_ = sensitivity; -#line 232 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" +#line 239 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "Straighten", _tmp20_); -#line 233 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" +#line 240 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" _tmp21_ = sensitivity; -#line 233 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" +#line 240 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "RedEye", _tmp21_); -#line 234 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" +#line 241 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" _tmp22_ = sensitivity; -#line 234 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" +#line 241 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "Adjust", _tmp22_); -#line 235 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" +#line 242 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" _tmp23_ = sensitivity; -#line 235 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" +#line 242 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "Revert", _tmp23_); -#line 236 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" +#line 243 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" _tmp24_ = sensitivity; -#line 236 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" +#line 243 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "AdjustDateTime", _tmp24_); -#line 237 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" +#line 244 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" _tmp25_ = sensitivity; -#line 237 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" +#line 244 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "Fullscreen", _tmp25_); -#line 239 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" +#line 246 "/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)); -#line 239 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" +#line 246 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" if (_tmp27_) { -#line 2133 "DirectPhotoPage.c" +#line 2183 "DirectPhotoPage.c" gboolean _tmp28_ = FALSE; -#line 239 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" +#line 246 "/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 239 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" +#line 246 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" _tmp26_ = !_tmp28_; -#line 2139 "DirectPhotoPage.c" +#line 2189 "DirectPhotoPage.c" } else { -#line 239 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" +#line 246 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" _tmp26_ = FALSE; -#line 2143 "DirectPhotoPage.c" +#line 2193 "DirectPhotoPage.c" } -#line 239 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" +#line 246 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "SetBackground", _tmp26_); -#line 241 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" +#line 248 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" _tmp29_ = missing; -#line 241 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" +#line 248 "/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 2151 "DirectPhotoPage.c" +#line 2201 "DirectPhotoPage.c" } @@ -2182,157 +2232,157 @@ static void direct_photo_page_real_update_actions (Page* base, gint selected_cou gboolean _tmp42_ = FALSE; gint _tmp46_ = 0; gint _tmp47_ = 0; -#line 244 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" +#line 251 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_DIRECT_PHOTO_PAGE, DirectPhotoPage); -#line 245 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" +#line 252 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" _tmp0_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page)); -#line 245 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" +#line 252 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" _tmp1_ = _tmp0_; -#line 245 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" +#line 252 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" _tmp2_ = data_collection_get_count (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, TYPE_DATA_COLLECTION, DataCollection)); -#line 245 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" +#line 252 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" _tmp3_ = _tmp2_ > 1; -#line 245 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" +#line 252 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" _data_collection_unref0 (_tmp1_); -#line 245 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" +#line 252 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" multiple = _tmp3_; -#line 246 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" +#line 253 "/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 246 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" +#line 253 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" if (_tmp5_) { -#line 2204 "DirectPhotoPage.c" +#line 2254 "DirectPhotoPage.c" gboolean _tmp6_ = FALSE; Photo* _tmp7_ = NULL; Photo* _tmp8_ = NULL; gboolean _tmp9_ = FALSE; gboolean _tmp10_ = FALSE; -#line 246 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" +#line 253 "/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)); -#line 246 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" +#line 253 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" _tmp8_ = _tmp7_; -#line 246 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" +#line 253 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" _tmp9_ = photo_has_transformations (_tmp8_); -#line 246 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" +#line 253 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" _tmp10_ = _tmp9_; -#line 246 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" +#line 253 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" _g_object_unref0 (_tmp8_); -#line 246 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" +#line 253 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" if (_tmp10_) { -#line 2222 "DirectPhotoPage.c" +#line 2272 "DirectPhotoPage.c" gboolean _tmp11_ = FALSE; -#line 247 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" +#line 254 "/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)); -#line 247 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" +#line 254 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" _tmp6_ = !_tmp11_; -#line 2228 "DirectPhotoPage.c" +#line 2278 "DirectPhotoPage.c" } else { -#line 246 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" +#line 253 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" _tmp6_ = FALSE; -#line 2232 "DirectPhotoPage.c" +#line 2282 "DirectPhotoPage.c" } -#line 246 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" +#line 253 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" _tmp4_ = _tmp6_; -#line 2236 "DirectPhotoPage.c" +#line 2286 "DirectPhotoPage.c" } else { -#line 247 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" +#line 254 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" _tmp4_ = FALSE; -#line 2240 "DirectPhotoPage.c" +#line 2290 "DirectPhotoPage.c" } -#line 246 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" +#line 253 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" revert_possible = _tmp4_; -#line 248 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" +#line 255 "/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)); -#line 248 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" +#line 255 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" if (_tmp13_) { -#line 2248 "DirectPhotoPage.c" +#line 2298 "DirectPhotoPage.c" Photo* _tmp14_ = NULL; Photo* _tmp15_ = NULL; gboolean _tmp16_ = FALSE; -#line 248 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" +#line 255 "/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)); -#line 248 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" +#line 255 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" _tmp15_ = _tmp14_; -#line 248 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" +#line 255 "/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_); -#line 248 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" +#line 255 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" _tmp12_ = _tmp16_; -#line 248 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" +#line 255 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" _g_object_unref0 (_tmp15_); -#line 2262 "DirectPhotoPage.c" +#line 2312 "DirectPhotoPage.c" } else { -#line 248 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" +#line 255 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" _tmp12_ = FALSE; -#line 2266 "DirectPhotoPage.c" +#line 2316 "DirectPhotoPage.c" } -#line 248 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" +#line 255 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" rotate_possible = _tmp12_; -#line 249 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" +#line 256 "/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)); -#line 249 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" +#line 256 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" if (_tmp18_) { -#line 2274 "DirectPhotoPage.c" +#line 2324 "DirectPhotoPage.c" Photo* _tmp19_ = NULL; Photo* _tmp20_ = NULL; gboolean _tmp21_ = FALSE; -#line 249 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" +#line 256 "/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)); -#line 249 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" +#line 256 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" _tmp20_ = _tmp19_; -#line 249 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" +#line 256 "/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_); -#line 249 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" +#line 256 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" _tmp17_ = _tmp21_; -#line 249 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" +#line 256 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" _g_object_unref0 (_tmp20_); -#line 2288 "DirectPhotoPage.c" +#line 2338 "DirectPhotoPage.c" } else { -#line 249 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" +#line 256 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" _tmp17_ = FALSE; -#line 2292 "DirectPhotoPage.c" +#line 2342 "DirectPhotoPage.c" } -#line 249 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" +#line 256 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" enhance_possible = _tmp17_; -#line 251 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" +#line 258 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" _tmp22_ = multiple; -#line 251 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" +#line 258 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "PrevPhoto", _tmp22_); -#line 252 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" +#line 259 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" _tmp23_ = multiple; -#line 252 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" +#line 259 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "NextPhoto", _tmp23_); -#line 253 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" +#line 260 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" _tmp24_ = rotate_possible; -#line 253 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" +#line 260 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "RotateClockwise", _tmp24_); -#line 254 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" +#line 261 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" _tmp25_ = rotate_possible; -#line 254 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" +#line 261 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "RotateCounterclockwise", _tmp25_); -#line 255 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" +#line 262 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" _tmp26_ = rotate_possible; -#line 255 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" +#line 262 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "FlipHorizontally", _tmp26_); -#line 256 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" +#line 263 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" _tmp27_ = rotate_possible; -#line 256 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" +#line 263 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "FlipVertically", _tmp27_); -#line 257 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" +#line 264 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" _tmp28_ = revert_possible; -#line 257 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" +#line 264 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "Revert", _tmp28_); -#line 258 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" +#line 265 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" _tmp29_ = enhance_possible; -#line 258 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" +#line 265 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "Enhance", _tmp29_); -#line 260 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" +#line 267 "/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)); -#line 260 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" +#line 267 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "SetBackground", _tmp30_); -#line 262 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" +#line 269 "/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 262 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" +#line 269 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" if (_tmp31_) { -#line 2336 "DirectPhotoPage.c" +#line 2386 "DirectPhotoPage.c" Photo* _tmp32_ = NULL; Photo* _tmp33_ = NULL; Scaling _tmp34_ = {0}; @@ -2341,69 +2391,69 @@ static void direct_photo_page_real_update_actions (Page* base, gint selected_cou Photo* _tmp37_ = NULL; Scaling _tmp38_ = {0}; gboolean _tmp39_ = FALSE; -#line 263 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" +#line 270 "/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)); -#line 263 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" +#line 270 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" _tmp33_ = _tmp32_; -#line 263 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" +#line 270 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" scaling_for_original (&_tmp34_); -#line 263 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" +#line 270 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" _tmp35_ = editing_tools_crop_tool_is_available (_tmp33_, &_tmp34_); -#line 263 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" +#line 270 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "Crop", _tmp35_); -#line 263 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" +#line 270 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" _g_object_unref0 (_tmp33_); -#line 264 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" +#line 271 "/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)); -#line 264 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" +#line 271 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" _tmp37_ = _tmp36_; -#line 264 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" +#line 271 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" scaling_for_original (&_tmp38_); -#line 264 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" +#line 271 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" _tmp39_ = editing_tools_redeye_tool_is_available (_tmp37_, &_tmp38_); -#line 264 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" +#line 271 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "RedEye", _tmp39_); -#line 264 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" +#line 271 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" _g_object_unref0 (_tmp37_); -#line 2369 "DirectPhotoPage.c" +#line 2419 "DirectPhotoPage.c" } -#line 270 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" +#line 277 "/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)); -#line 270 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" +#line 277 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" _tmp41_ = _tmp40_; -#line 270 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" +#line 277 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" _tmp42_ = _tmp41_ != NULL; -#line 270 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" +#line 277 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" _g_object_unref0 (_tmp41_); -#line 270 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" +#line 277 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" if (_tmp42_) { -#line 2381 "DirectPhotoPage.c" +#line 2431 "DirectPhotoPage.c" Photo* _tmp43_ = NULL; Photo* _tmp44_ = NULL; PhotoFileFormat _tmp45_ = 0; -#line 271 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" +#line 278 "/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)); -#line 271 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" +#line 278 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" _tmp44_ = _tmp43_; -#line 271 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" +#line 278 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" _tmp45_ = photo_get_file_format (_tmp44_); -#line 271 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" +#line 278 "/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); -#line 271 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" +#line 278 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" _g_object_unref0 (_tmp44_); -#line 2395 "DirectPhotoPage.c" +#line 2445 "DirectPhotoPage.c" } else { -#line 273 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" +#line 280 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "AdjustDateTime", FALSE); -#line 2399 "DirectPhotoPage.c" +#line 2449 "DirectPhotoPage.c" } -#line 276 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" +#line 283 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" _tmp46_ = selected_count; -#line 276 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" +#line 283 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" _tmp47_ = count; -#line 276 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" +#line 283 "/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 2407 "DirectPhotoPage.c" +#line 2457 "DirectPhotoPage.c" } @@ -2435,216 +2485,216 @@ static gboolean direct_photo_page_check_ok_to_close_photo (DirectPhotoPage* self GtkResponseType _tmp23_ = 0; GtkResponseType _tmp24_ = 0; GtkResponseType _tmp25_ = 0; -#line 279 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" +#line 286 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" g_return_val_if_fail (IS_DIRECT_PHOTO_PAGE (self), FALSE); -#line 279 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" +#line 286 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" g_return_val_if_fail ((photo == NULL) || IS_PHOTO (photo), FALSE); -#line 282 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" +#line 289 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" _tmp0_ = photo; -#line 282 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" +#line 289 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" if (_tmp0_ == NULL) { -#line 283 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" +#line 290 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" result = TRUE; -#line 283 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" +#line 290 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" return result; -#line 2451 "DirectPhotoPage.c" +#line 2501 "DirectPhotoPage.c" } -#line 285 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" +#line 292 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" _tmp1_ = photo; -#line 285 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" +#line 292 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" _tmp2_ = photo_has_alterations (_tmp1_); -#line 285 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" +#line 292 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" if (!_tmp2_) { -#line 286 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" +#line 293 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" result = TRUE; -#line 286 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" +#line 293 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" return result; -#line 2463 "DirectPhotoPage.c" +#line 2513 "DirectPhotoPage.c" } -#line 288 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" +#line 295 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" _tmp3_ = self->priv->drop_if_dirty; -#line 288 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" +#line 295 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" if (_tmp3_) { -#line 2469 "DirectPhotoPage.c" +#line 2519 "DirectPhotoPage.c" Photo* _tmp4_ = NULL; -#line 291 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" +#line 298 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" _tmp4_ = photo; -#line 291 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" +#line 298 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" photo_remove_all_transformations (_tmp4_); -#line 293 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" +#line 300 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" result = TRUE; -#line 293 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" +#line 300 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" return result; -#line 2479 "DirectPhotoPage.c" +#line 2529 "DirectPhotoPage.c" } -#line 296 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" +#line 303 "/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 296 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" +#line 303 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" _tmp6_ = _tmp5_; -#line 296 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" +#line 303 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" _tmp7_ = photo_get_file_format (_tmp6_); -#line 296 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" +#line 303 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" _tmp8_ = photo_file_format_can_write (_tmp7_); -#line 296 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" +#line 303 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" _tmp9_ = _tmp8_; -#line 296 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" +#line 303 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" _g_object_unref0 (_tmp6_); -#line 296 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" +#line 303 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" is_writeable = _tmp9_; -#line 297 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" +#line 304 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" _tmp11_ = is_writeable; -#line 297 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" +#line 304 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" if (_tmp11_) { -#line 2499 "DirectPhotoPage.c" +#line 2549 "DirectPhotoPage.c" const gchar* _tmp12_ = NULL; -#line 297 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" +#line 304 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" _tmp12_ = _ ("_Save"); -#line 297 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" +#line 304 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" _tmp10_ = _tmp12_; -#line 2505 "DirectPhotoPage.c" +#line 2555 "DirectPhotoPage.c" } else { const gchar* _tmp13_ = NULL; -#line 297 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" +#line 304 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" _tmp13_ = _ ("_Save a Copy"); -#line 297 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" +#line 304 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" _tmp10_ = _tmp13_; -#line 2512 "DirectPhotoPage.c" +#line 2562 "DirectPhotoPage.c" } -#line 297 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" +#line 304 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" _tmp14_ = g_strdup (_tmp10_); -#line 297 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" +#line 304 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" save_option = _tmp14_; -#line 299 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" +#line 306 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" _tmp15_ = _ ("Lose changes to %s?"); -#line 299 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" +#line 306 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" _tmp16_ = photo; -#line 299 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" +#line 306 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" _tmp17_ = media_source_get_basename (G_TYPE_CHECK_INSTANCE_CAST (_tmp16_, TYPE_MEDIA_SOURCE, MediaSource)); -#line 299 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" +#line 306 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" _tmp18_ = _tmp17_; -#line 299 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" +#line 306 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" _tmp19_ = g_strdup_printf (_tmp15_, _tmp18_); -#line 299 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" +#line 306 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" _tmp20_ = _tmp19_; -#line 299 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" +#line 306 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" _tmp21_ = save_option; -#line 299 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" +#line 306 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" _tmp22_ = _ ("Close _without Saving"); -#line 299 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" +#line 306 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" _tmp23_ = app_window_negate_affirm_cancel_question (_tmp20_, _tmp21_, _tmp22_, NULL, NULL); -#line 299 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" +#line 306 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" _tmp24_ = _tmp23_; -#line 299 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" +#line 306 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" _g_free0 (_tmp20_); -#line 299 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" +#line 306 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" _g_free0 (_tmp18_); -#line 299 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" +#line 306 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" response = _tmp24_; -#line 303 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" +#line 310 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" _tmp25_ = response; -#line 303 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" +#line 310 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" if (_tmp25_ == GTK_RESPONSE_YES) { -#line 2548 "DirectPhotoPage.c" +#line 2598 "DirectPhotoPage.c" Photo* _tmp26_ = NULL; -#line 304 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" +#line 311 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" _tmp26_ = photo; -#line 304 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" +#line 311 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" photo_remove_all_transformations (_tmp26_); -#line 2554 "DirectPhotoPage.c" +#line 2604 "DirectPhotoPage.c" } else { GtkResponseType _tmp27_ = 0; -#line 305 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" +#line 312 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" _tmp27_ = response; -#line 305 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" +#line 312 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" if (_tmp27_ == GTK_RESPONSE_NO) { -#line 2561 "DirectPhotoPage.c" +#line 2611 "DirectPhotoPage.c" gboolean _tmp28_ = FALSE; -#line 306 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" +#line 313 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" _tmp28_ = is_writeable; -#line 306 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" +#line 313 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" if (_tmp28_) { -#line 2567 "DirectPhotoPage.c" +#line 2617 "DirectPhotoPage.c" Photo* _tmp29_ = NULL; GFile* _tmp30_ = NULL; GFile* _tmp31_ = NULL; Photo* _tmp32_ = NULL; Photo* _tmp33_ = NULL; PhotoFileFormat _tmp34_ = 0; -#line 307 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" +#line 314 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" _tmp29_ = photo; -#line 307 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" +#line 314 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" _tmp30_ = media_source_get_file (G_TYPE_CHECK_INSTANCE_CAST (_tmp29_, TYPE_MEDIA_SOURCE, MediaSource)); -#line 307 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" +#line 314 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" _tmp31_ = _tmp30_; -#line 307 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" +#line 314 "/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)); -#line 307 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" +#line 314 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" _tmp33_ = _tmp32_; -#line 307 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" +#line 314 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" _tmp34_ = photo_get_file_format (_tmp33_); -#line 307 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" +#line 314 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" direct_photo_page_save (self, _tmp31_, 0, SCALE_CONSTRAINT_ORIGINAL, JPEG_QUALITY_HIGH, _tmp34_, FALSE, TRUE); -#line 307 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" +#line 314 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" _g_object_unref0 (_tmp33_); -#line 307 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" +#line 314 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" _g_object_unref0 (_tmp31_); -#line 2592 "DirectPhotoPage.c" +#line 2642 "DirectPhotoPage.c" } else { -#line 310 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" +#line 317 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" direct_photo_page_on_save_as (self); -#line 2596 "DirectPhotoPage.c" +#line 2646 "DirectPhotoPage.c" } } else { gboolean _tmp35_ = FALSE; gboolean _tmp36_ = FALSE; GtkResponseType _tmp37_ = 0; -#line 311 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" +#line 318 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" _tmp37_ = response; -#line 311 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" +#line 318 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" if (_tmp37_ == GTK_RESPONSE_CANCEL) { -#line 311 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" +#line 318 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" _tmp36_ = TRUE; -#line 2608 "DirectPhotoPage.c" +#line 2658 "DirectPhotoPage.c" } else { GtkResponseType _tmp38_ = 0; -#line 311 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" +#line 318 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" _tmp38_ = response; -#line 311 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" +#line 318 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" _tmp36_ = _tmp38_ == GTK_RESPONSE_DELETE_EVENT; -#line 2615 "DirectPhotoPage.c" +#line 2665 "DirectPhotoPage.c" } -#line 311 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" +#line 318 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" if (_tmp36_) { -#line 311 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" +#line 318 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" _tmp35_ = TRUE; -#line 2621 "DirectPhotoPage.c" +#line 2671 "DirectPhotoPage.c" } else { GtkResponseType _tmp39_ = 0; -#line 312 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" +#line 319 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" _tmp39_ = response; -#line 312 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" +#line 319 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" _tmp35_ = _tmp39_ == GTK_RESPONSE_CLOSE; -#line 2628 "DirectPhotoPage.c" +#line 2678 "DirectPhotoPage.c" } -#line 311 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" +#line 318 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" if (_tmp35_) { -#line 313 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" +#line 320 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" result = FALSE; -#line 313 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" +#line 320 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" _g_free0 (save_option); -#line 313 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" +#line 320 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" return result; -#line 2638 "DirectPhotoPage.c" +#line 2688 "DirectPhotoPage.c" } } } -#line 316 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" +#line 323 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" result = TRUE; -#line 316 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" +#line 323 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" _g_free0 (save_option); -#line 316 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" +#line 323 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" return result; -#line 2648 "DirectPhotoPage.c" +#line 2698 "DirectPhotoPage.c" } @@ -2654,23 +2704,23 @@ gboolean direct_photo_page_check_quit (DirectPhotoPage* self) { Photo* _tmp1_ = NULL; gboolean _tmp2_ = FALSE; gboolean _tmp3_ = FALSE; -#line 319 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" +#line 326 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" g_return_val_if_fail (IS_DIRECT_PHOTO_PAGE (self), FALSE); -#line 320 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" +#line 327 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" _tmp0_ = editing_host_page_get_photo (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage)); -#line 320 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" +#line 327 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" _tmp1_ = _tmp0_; -#line 320 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" +#line 327 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" _tmp2_ = direct_photo_page_check_ok_to_close_photo (self, _tmp1_); -#line 320 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" +#line 327 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" _tmp3_ = _tmp2_; -#line 320 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" +#line 327 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" _g_object_unref0 (_tmp1_); -#line 320 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" +#line 327 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" result = _tmp3_; -#line 320 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" +#line 327 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" return result; -#line 2674 "DirectPhotoPage.c" +#line 2724 "DirectPhotoPage.c" } @@ -2679,36 +2729,36 @@ static gboolean direct_photo_page_real_confirm_replace_photo (EditingHostPage* b gboolean result = FALSE; gboolean _tmp0_ = FALSE; Photo* _tmp1_ = NULL; -#line 323 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" +#line 330 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_DIRECT_PHOTO_PAGE, DirectPhotoPage); -#line 323 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" +#line 330 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" g_return_val_if_fail ((old_photo == NULL) || IS_PHOTO (old_photo), FALSE); -#line 323 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" +#line 330 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" g_return_val_if_fail (IS_PHOTO (new_photo), FALSE); -#line 324 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" +#line 331 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" _tmp1_ = old_photo; -#line 324 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" +#line 331 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" if (_tmp1_ != NULL) { -#line 2693 "DirectPhotoPage.c" +#line 2743 "DirectPhotoPage.c" Photo* _tmp2_ = NULL; gboolean _tmp3_ = FALSE; -#line 324 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" +#line 331 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" _tmp2_ = old_photo; -#line 324 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" +#line 331 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" _tmp3_ = direct_photo_page_check_ok_to_close_photo (self, _tmp2_); -#line 324 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" +#line 331 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" _tmp0_ = _tmp3_; -#line 2702 "DirectPhotoPage.c" +#line 2752 "DirectPhotoPage.c" } else { -#line 324 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" +#line 331 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" _tmp0_ = TRUE; -#line 2706 "DirectPhotoPage.c" +#line 2756 "DirectPhotoPage.c" } -#line 324 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" +#line 331 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" result = _tmp0_; -#line 324 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" +#line 331 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" return result; -#line 2712 "DirectPhotoPage.c" +#line 2762 "DirectPhotoPage.c" } @@ -2733,19 +2783,19 @@ static void direct_photo_page_save (DirectPhotoPage* self, GFile* dest, gint sca DirectViewCollection* _tmp30_ = NULL; DirectPhoto* _tmp31_ = NULL; GError * _inner_error_ = NULL; -#line 327 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" +#line 334 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" g_return_if_fail (IS_DIRECT_PHOTO_PAGE (self)); -#line 327 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" +#line 334 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" g_return_if_fail (G_IS_FILE (dest)); -#line 329 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" +#line 336 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" _tmp0_ = constraint; -#line 329 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" +#line 336 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" _tmp1_ = scale; -#line 329 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" +#line 336 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" scaling_for_constraint (_tmp0_, _tmp1_, FALSE, &_tmp2_); -#line 329 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" +#line 336 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" scaling = _tmp2_; -#line 2749 "DirectPhotoPage.c" +#line 2799 "DirectPhotoPage.c" { Photo* _tmp3_ = NULL; Photo* _tmp4_ = NULL; @@ -2755,34 +2805,34 @@ static void direct_photo_page_save (DirectPhotoPage* self, GFile* dest, gint sca PhotoFileFormat _tmp8_ = 0; gboolean _tmp9_ = FALSE; gboolean _tmp10_ = FALSE; -#line 332 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" +#line 339 "/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 332 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" +#line 339 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" _tmp4_ = _tmp3_; -#line 332 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" +#line 339 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" _tmp5_ = dest; -#line 332 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" +#line 339 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" _tmp6_ = scaling; -#line 332 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" +#line 339 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" _tmp7_ = quality; -#line 332 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" +#line 339 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" _tmp8_ = format; -#line 332 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" +#line 339 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" _tmp9_ = copy_unmodified; -#line 332 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" +#line 339 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" _tmp10_ = save_metadata; -#line 332 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" +#line 339 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" photo_export (_tmp4_, _tmp5_, &_tmp6_, _tmp7_, _tmp8_, _tmp9_, _tmp10_, &_inner_error_); -#line 332 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" +#line 339 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" _g_object_unref0 (_tmp4_); -#line 332 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" +#line 339 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 2781 "DirectPhotoPage.c" - goto __catch45_g_error; +#line 2831 "DirectPhotoPage.c" + goto __catch47_g_error; } } - goto __finally45; - __catch45_g_error: + goto __finally47; + __catch47_g_error: { GError* err = NULL; const gchar* _tmp11_ = NULL; @@ -2793,92 +2843,92 @@ static void direct_photo_page_save (DirectPhotoPage* self, GFile* dest, gint sca const gchar* _tmp16_ = NULL; gchar* _tmp17_ = NULL; gchar* _tmp18_ = NULL; -#line 331 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" +#line 338 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" err = _inner_error_; -#line 331 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" +#line 338 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" _inner_error_ = NULL; -#line 334 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" +#line 341 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" _tmp11_ = _ ("Error while saving to %s: %s"); -#line 334 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" +#line 341 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" _tmp12_ = dest; -#line 334 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" +#line 341 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" _tmp13_ = g_file_get_path (_tmp12_); -#line 334 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" +#line 341 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" _tmp14_ = _tmp13_; -#line 334 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" +#line 341 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" _tmp15_ = err; -#line 334 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" +#line 341 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" _tmp16_ = _tmp15_->message; -#line 334 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" +#line 341 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" _tmp17_ = g_strdup_printf (_tmp11_, _tmp14_, _tmp16_); -#line 334 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" +#line 341 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" _tmp18_ = _tmp17_; -#line 334 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" +#line 341 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" app_window_error_message (_tmp18_, NULL); -#line 334 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" +#line 341 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" _g_free0 (_tmp18_); -#line 334 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" +#line 341 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" _g_free0 (_tmp14_); -#line 337 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" +#line 344 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" _g_error_free0 (err); -#line 337 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" +#line 344 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" return; -#line 2827 "DirectPhotoPage.c" +#line 2877 "DirectPhotoPage.c" } - __finally45: -#line 331 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" + __finally47: +#line 338 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 331 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" +#line 338 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code); -#line 331 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" +#line 338 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" g_clear_error (&_inner_error_); -#line 331 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" +#line 338 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" return; -#line 2838 "DirectPhotoPage.c" +#line 2888 "DirectPhotoPage.c" } -#line 342 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" +#line 349 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" _tmp19_ = direct_photo_global; -#line 342 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" +#line 349 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" _tmp20_ = dest; -#line 342 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" +#line 349 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" _tmp22_ = direct_photo_source_collection_fetch (_tmp19_, _tmp20_, &_tmp21_, TRUE); -#line 342 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" +#line 349 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" _g_object_unref0 (photo); -#line 342 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" +#line 349 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" photo = _tmp21_; -#line 342 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" +#line 349 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" _tmp23_ = _tmp22_; -#line 342 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" +#line 349 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" _g_free0 (_tmp23_); -#line 344 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" +#line 351 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" _tmp24_ = photo; -#line 344 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" +#line 351 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" _tmp25_ = direct_view_new (_tmp24_); -#line 344 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" +#line 351 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" tmp_view = _tmp25_; -#line 345 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" +#line 352 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" _tmp26_ = self->priv->view_controller; -#line 345 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" +#line 352 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" _tmp27_ = tmp_view; -#line 345 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" +#line 352 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" data_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp26_, TYPE_DATA_COLLECTION, DataCollection), G_TYPE_CHECK_INSTANCE_CAST (_tmp27_, TYPE_DATA_OBJECT, DataObject)); -#line 347 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" +#line 354 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" _tmp28_ = direct_photo_global; -#line 347 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" +#line 354 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" _tmp29_ = photo; -#line 347 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" +#line 354 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" direct_photo_source_collection_reimport_photo (_tmp28_, _tmp29_); -#line 348 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" +#line 355 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" _tmp30_ = self->priv->view_controller; -#line 348 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" +#line 355 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" _tmp31_ = photo; -#line 348 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" +#line 355 "/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 (_tmp30_, TYPE_VIEW_COLLECTION, ViewCollection), G_TYPE_CHECK_INSTANCE_CAST (_tmp31_, TYPE_PHOTO, Photo)); -#line 327 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" +#line 334 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" _g_object_unref0 (tmp_view); -#line 327 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" +#line 334 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" _g_object_unref0 (photo); -#line 2882 "DirectPhotoPage.c" +#line 2932 "DirectPhotoPage.c" } @@ -2896,84 +2946,84 @@ static void direct_photo_page_on_save (DirectPhotoPage* self) { Photo* _tmp15_ = NULL; Photo* _tmp16_ = NULL; PhotoFileFormat _tmp17_ = 0; -#line 351 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" +#line 358 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" g_return_if_fail (IS_DIRECT_PHOTO_PAGE (self)); -#line 352 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" +#line 359 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" _tmp2_ = editing_host_page_get_photo (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage)); -#line 352 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" +#line 359 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" _tmp3_ = _tmp2_; -#line 352 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" +#line 359 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" _tmp4_ = photo_has_alterations (_tmp3_); -#line 352 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" +#line 359 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" _tmp5_ = !_tmp4_; -#line 352 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" +#line 359 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" _g_object_unref0 (_tmp3_); -#line 352 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" +#line 359 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" if (_tmp5_) { -#line 352 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" +#line 359 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" _tmp1_ = TRUE; -#line 2916 "DirectPhotoPage.c" +#line 2966 "DirectPhotoPage.c" } else { Photo* _tmp6_ = NULL; Photo* _tmp7_ = NULL; PhotoFileFormat _tmp8_ = 0; gboolean _tmp9_ = FALSE; -#line 352 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" +#line 359 "/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)); -#line 352 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" +#line 359 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" _tmp7_ = _tmp6_; -#line 352 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" +#line 359 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" _tmp8_ = photo_get_file_format (_tmp7_); -#line 352 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" +#line 359 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" _tmp9_ = photo_file_format_can_write (_tmp8_); -#line 352 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" +#line 359 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" _tmp1_ = !_tmp9_; -#line 352 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" +#line 359 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" _g_object_unref0 (_tmp7_); -#line 2934 "DirectPhotoPage.c" +#line 2984 "DirectPhotoPage.c" } -#line 352 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" +#line 359 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" if (_tmp1_) { -#line 352 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" +#line 359 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" _tmp0_ = TRUE; -#line 2940 "DirectPhotoPage.c" +#line 2990 "DirectPhotoPage.c" } else { gboolean _tmp10_ = FALSE; -#line 353 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" +#line 360 "/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 353 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" +#line 360 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" _tmp0_ = _tmp10_; -#line 2947 "DirectPhotoPage.c" +#line 2997 "DirectPhotoPage.c" } -#line 352 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" +#line 359 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" if (_tmp0_) { -#line 354 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" +#line 361 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" return; -#line 2953 "DirectPhotoPage.c" +#line 3003 "DirectPhotoPage.c" } -#line 357 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" +#line 364 "/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 357 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" +#line 364 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" _tmp12_ = _tmp11_; -#line 357 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" +#line 364 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" _tmp13_ = media_source_get_file (G_TYPE_CHECK_INSTANCE_CAST (_tmp12_, TYPE_MEDIA_SOURCE, MediaSource)); -#line 357 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" +#line 364 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" _tmp14_ = _tmp13_; -#line 357 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" +#line 364 "/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)); -#line 357 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" +#line 364 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" _tmp16_ = _tmp15_; -#line 357 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" +#line 364 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" _tmp17_ = photo_get_file_format (_tmp16_); -#line 357 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" +#line 364 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" direct_photo_page_save (self, _tmp14_, 0, SCALE_CONSTRAINT_ORIGINAL, JPEG_QUALITY_HIGH, _tmp17_, FALSE, TRUE); -#line 357 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" +#line 364 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" _g_object_unref0 (_tmp16_); -#line 357 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" +#line 364 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" _g_object_unref0 (_tmp14_); -#line 357 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" +#line 364 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" _g_object_unref0 (_tmp12_); -#line 2977 "DirectPhotoPage.c" +#line 3027 "DirectPhotoPage.c" } @@ -3038,114 +3088,114 @@ static void direct_photo_page_on_save_as (DirectPhotoPage* self) { gint _tmp54_ = 0; gint _tmp55_ = 0; GtkFileChooserDialog* _tmp74_ = NULL; -#line 361 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" +#line 368 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" g_return_if_fail (IS_DIRECT_PHOTO_PAGE (self)); -#line 362 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" +#line 369 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" _tmp0_ = _ ("Save As"); -#line 362 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" +#line 369 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" _tmp1_ = export_dialog_new (_tmp0_); -#line 362 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" +#line 369 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" g_object_ref_sink (_tmp1_); -#line 362 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" +#line 369 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" export_dialog = _tmp1_; -#line 366 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" +#line 373 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" export_format_parameters_last (&_tmp2_); -#line 366 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" +#line 373 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" export_params = _tmp2_; -#line 367 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" +#line 374 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" _tmp3_ = export_dialog; -#line 367 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" +#line 374 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" _tmp6_ = export_dialog_execute (_tmp3_, &_tmp4_, &_tmp5_, &export_params); -#line 367 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" +#line 374 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" scale = _tmp4_; -#line 367 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" +#line 374 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" constraint = _tmp5_; -#line 367 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" +#line 374 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" if (!_tmp6_) { -#line 368 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" +#line 375 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" _g_object_unref0 (export_dialog); -#line 368 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" +#line 375 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" return; -#line 3070 "DirectPhotoPage.c" +#line 3120 "DirectPhotoPage.c" } -#line 370 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" +#line 377 "/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)); -#line 370 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" +#line 377 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" _tmp8_ = _tmp7_; -#line 370 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" +#line 377 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" _tmp9_ = export_params; -#line 370 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" +#line 377 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" _tmp10_ = photo_get_export_basename_for_parameters (_tmp8_, &_tmp9_); -#line 370 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" +#line 377 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" _tmp11_ = _tmp10_; -#line 370 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" +#line 377 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" _g_object_unref0 (_tmp8_); -#line 370 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" +#line 377 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" filename = _tmp11_; -#line 371 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" +#line 378 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" _tmp12_ = editing_host_page_get_photo (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage)); -#line 371 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" +#line 378 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" _tmp13_ = _tmp12_; -#line 371 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" +#line 378 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" _tmp14_ = export_params; -#line 371 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" +#line 378 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" _tmp15_ = photo_get_export_format_for_parameters (_tmp13_, &_tmp14_); -#line 371 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" +#line 378 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" _tmp16_ = _tmp15_; -#line 371 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" +#line 378 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" _g_object_unref0 (_tmp13_); -#line 371 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" +#line 378 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" effective_export_format = _tmp16_; -#line 374 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" +#line 381 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" _tmp17_ = effective_export_format; -#line 374 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" +#line 381 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" _tmp18_ = photo_file_format_get_properties (_tmp17_); -#line 374 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" +#line 381 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" _tmp19_ = _tmp18_; -#line 374 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" +#line 381 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" _tmp21_ = photo_file_format_properties_get_known_extensions (_tmp19_, &_tmp20_); -#line 374 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" +#line 381 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" _tmp22_ = _tmp21_; -#line 374 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" +#line 381 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" _tmp22__length1 = _tmp20_; -#line 374 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" +#line 381 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" _photo_file_format_properties_unref0 (_tmp19_); -#line 374 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" +#line 381 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" output_format_extensions = _tmp22_; -#line 374 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" +#line 381 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" output_format_extensions_length1 = _tmp22__length1; -#line 374 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" +#line 381 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" _output_format_extensions_size_ = output_format_extensions_length1; -#line 376 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" +#line 383 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" _tmp23_ = gtk_file_filter_new (); -#line 376 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" +#line 383 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" g_object_ref_sink (_tmp23_); -#line 376 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" +#line 383 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" output_format_filter = _tmp23_; -#line 377 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" +#line 384 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" _tmp24_ = output_format_extensions; -#line 377 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" +#line 384 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" _tmp24__length1 = output_format_extensions_length1; -#line 3130 "DirectPhotoPage.c" +#line 3180 "DirectPhotoPage.c" { gchar** extension_collection = NULL; gint extension_collection_length1 = 0; gint _extension_collection_size_ = 0; gint extension_it = 0; -#line 377 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" +#line 384 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" extension_collection = _tmp24_; -#line 377 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" +#line 384 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" extension_collection_length1 = _tmp24__length1; -#line 377 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" +#line 384 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" for (extension_it = 0; extension_it < _tmp24__length1; extension_it = extension_it + 1) { -#line 3142 "DirectPhotoPage.c" +#line 3192 "DirectPhotoPage.c" gchar* _tmp25_ = NULL; gchar* extension = NULL; -#line 377 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" +#line 384 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" _tmp25_ = g_strdup (extension_collection[extension_it]); -#line 377 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" +#line 384 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" extension = _tmp25_; -#line 3149 "DirectPhotoPage.c" +#line 3199 "DirectPhotoPage.c" { gchar* uppercase_extension = NULL; const gchar* _tmp26_ = NULL; @@ -3158,109 +3208,109 @@ static void direct_photo_page_on_save_as (DirectPhotoPage* self) { const gchar* _tmp33_ = NULL; gchar* _tmp34_ = NULL; gchar* _tmp35_ = NULL; -#line 378 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" +#line 385 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" _tmp26_ = extension; -#line 378 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" +#line 385 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" _tmp27_ = g_utf8_strup (_tmp26_, (gssize) -1); -#line 378 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" +#line 385 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" uppercase_extension = _tmp27_; -#line 379 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" +#line 386 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" _tmp28_ = output_format_filter; -#line 379 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" +#line 386 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" _tmp29_ = extension; -#line 379 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" +#line 386 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" _tmp30_ = g_strconcat ("*.", _tmp29_, NULL); -#line 379 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" +#line 386 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" _tmp31_ = _tmp30_; -#line 379 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" +#line 386 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" gtk_file_filter_add_pattern (_tmp28_, _tmp31_); -#line 379 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" +#line 386 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" _g_free0 (_tmp31_); -#line 380 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" +#line 387 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" _tmp32_ = output_format_filter; -#line 380 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" +#line 387 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" _tmp33_ = uppercase_extension; -#line 380 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" +#line 387 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" _tmp34_ = g_strconcat ("*.", _tmp33_, NULL); -#line 380 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" +#line 387 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" _tmp35_ = _tmp34_; -#line 380 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" +#line 387 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" gtk_file_filter_add_pattern (_tmp32_, _tmp35_); -#line 380 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" +#line 387 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" _g_free0 (_tmp35_); -#line 377 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" +#line 384 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" _g_free0 (uppercase_extension); -#line 377 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" +#line 384 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" _g_free0 (extension); -#line 3196 "DirectPhotoPage.c" +#line 3246 "DirectPhotoPage.c" } } } -#line 383 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" +#line 390 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" _tmp36_ = _ ("Save As"); -#line 383 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" +#line 390 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" _tmp37_ = app_window_get_instance (); -#line 383 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" +#line 390 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" _tmp38_ = _tmp37_; -#line 383 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" +#line 390 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" _tmp39_ = (GtkFileChooserDialog*) gtk_file_chooser_dialog_new (_tmp36_, G_TYPE_CHECK_INSTANCE_CAST (_tmp38_, gtk_window_get_type (), GtkWindow), GTK_FILE_CHOOSER_ACTION_SAVE, RESOURCES_CANCEL_LABEL, GTK_RESPONSE_CANCEL, RESOURCES_OK_LABEL, GTK_RESPONSE_OK, NULL); -#line 383 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" +#line 390 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" g_object_ref_sink (_tmp39_); -#line 383 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" +#line 390 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" _tmp40_ = _tmp39_; -#line 383 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" +#line 390 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" _g_object_unref0 (_tmp38_); -#line 383 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" +#line 390 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" save_as_dialog = _tmp40_; -#line 386 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" +#line 393 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" _tmp41_ = save_as_dialog; -#line 386 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" +#line 393 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" gtk_file_chooser_set_select_multiple (G_TYPE_CHECK_INSTANCE_CAST (_tmp41_, GTK_TYPE_FILE_CHOOSER, GtkFileChooser), FALSE); -#line 387 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" +#line 394 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" _tmp42_ = save_as_dialog; -#line 387 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" +#line 394 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" _tmp43_ = filename; -#line 387 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" +#line 394 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" gtk_file_chooser_set_current_name (G_TYPE_CHECK_INSTANCE_CAST (_tmp42_, GTK_TYPE_FILE_CHOOSER, GtkFileChooser), _tmp43_); -#line 388 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" +#line 395 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" _tmp44_ = save_as_dialog; -#line 388 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" +#line 395 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" _tmp45_ = self->priv->current_save_dir; -#line 388 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" +#line 395 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" _tmp46_ = g_file_get_path (_tmp45_); -#line 388 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" +#line 395 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" _tmp47_ = _tmp46_; -#line 388 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" +#line 395 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" gtk_file_chooser_set_current_folder (G_TYPE_CHECK_INSTANCE_CAST (_tmp44_, GTK_TYPE_FILE_CHOOSER, GtkFileChooser), _tmp47_); -#line 388 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" +#line 395 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" _g_free0 (_tmp47_); -#line 389 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" +#line 396 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" _tmp48_ = save_as_dialog; -#line 389 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" +#line 396 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" _tmp49_ = output_format_filter; -#line 389 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" +#line 396 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" _tmp50_ = _g_object_ref0 (_tmp49_); -#line 389 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" +#line 396 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" gtk_file_chooser_add_filter (G_TYPE_CHECK_INSTANCE_CAST (_tmp48_, GTK_TYPE_FILE_CHOOSER, GtkFileChooser), _tmp50_); -#line 390 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" +#line 397 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" _tmp51_ = save_as_dialog; -#line 390 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" +#line 397 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" gtk_file_chooser_set_do_overwrite_confirmation (G_TYPE_CHECK_INSTANCE_CAST (_tmp51_, GTK_TYPE_FILE_CHOOSER, GtkFileChooser), TRUE); -#line 391 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" +#line 398 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" _tmp52_ = save_as_dialog; -#line 391 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" +#line 398 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" gtk_file_chooser_set_local_only (G_TYPE_CHECK_INSTANCE_CAST (_tmp52_, GTK_TYPE_FILE_CHOOSER, GtkFileChooser), FALSE); -#line 393 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" +#line 400 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" _tmp53_ = save_as_dialog; -#line 393 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" +#line 400 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" _tmp54_ = gtk_dialog_run (G_TYPE_CHECK_INSTANCE_CAST (_tmp53_, gtk_dialog_get_type (), GtkDialog)); -#line 393 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" +#line 400 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" response = _tmp54_; -#line 394 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" +#line 401 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" _tmp55_ = response; -#line 394 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" +#line 401 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" if (_tmp55_ == ((gint) GTK_RESPONSE_OK)) { -#line 3264 "DirectPhotoPage.c" +#line 3314 "DirectPhotoPage.c" GtkFileChooserDialog* _tmp56_ = NULL; gchar* _tmp57_ = NULL; gchar* _tmp58_ = NULL; @@ -3279,106 +3329,106 @@ static void direct_photo_page_on_save_as (DirectPhotoPage* self) { gchar* _tmp71_ = NULL; gchar* _tmp72_ = NULL; GFile* _tmp73_ = NULL; -#line 397 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" +#line 404 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" self->priv->drop_if_dirty = TRUE; -#line 398 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" +#line 405 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" _tmp56_ = save_as_dialog; -#line 398 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" +#line 405 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" _tmp57_ = gtk_file_chooser_get_uri (G_TYPE_CHECK_INSTANCE_CAST (_tmp56_, GTK_TYPE_FILE_CHOOSER, GtkFileChooser)); -#line 398 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" +#line 405 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" _tmp58_ = _tmp57_; -#line 398 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" +#line 405 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" _tmp59_ = g_file_new_for_uri (_tmp58_); -#line 398 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" +#line 405 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" _tmp60_ = _tmp59_; -#line 398 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" +#line 405 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" _tmp61_ = scale; -#line 398 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" +#line 405 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" _tmp62_ = constraint; -#line 398 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" +#line 405 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" _tmp63_ = export_params; -#line 398 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" +#line 405 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" _tmp64_ = _tmp63_.quality; -#line 398 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" +#line 405 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" _tmp65_ = effective_export_format; -#line 398 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" +#line 405 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" _tmp66_ = export_params; -#line 398 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" +#line 405 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" _tmp67_ = _tmp66_.mode; -#line 398 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" +#line 405 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" _tmp68_ = export_params; -#line 398 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" +#line 405 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" _tmp69_ = _tmp68_.export_metadata; -#line 398 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" +#line 405 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" direct_photo_page_save (self, _tmp60_, _tmp61_, _tmp62_, _tmp64_, _tmp65_, _tmp67_ == EXPORT_FORMAT_MODE_UNMODIFIED, _tmp69_); -#line 398 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" +#line 405 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" _g_object_unref0 (_tmp60_); -#line 398 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" +#line 405 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" _g_free0 (_tmp58_); -#line 401 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" +#line 408 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" self->priv->drop_if_dirty = FALSE; -#line 403 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" +#line 410 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" _tmp70_ = save_as_dialog; -#line 403 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" +#line 410 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" _tmp71_ = gtk_file_chooser_get_current_folder (G_TYPE_CHECK_INSTANCE_CAST (_tmp70_, GTK_TYPE_FILE_CHOOSER, GtkFileChooser)); -#line 403 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" +#line 410 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" _tmp72_ = _tmp71_; -#line 403 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" +#line 410 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" _tmp73_ = g_file_new_for_path (_tmp72_); -#line 403 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" +#line 410 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" _g_object_unref0 (self->priv->current_save_dir); -#line 403 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" +#line 410 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" self->priv->current_save_dir = _tmp73_; -#line 403 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" +#line 410 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" _g_free0 (_tmp72_); -#line 3335 "DirectPhotoPage.c" +#line 3385 "DirectPhotoPage.c" } -#line 406 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" +#line 413 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" _tmp74_ = save_as_dialog; -#line 406 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" +#line 413 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" gtk_widget_destroy (G_TYPE_CHECK_INSTANCE_CAST (_tmp74_, gtk_widget_get_type (), GtkWidget)); -#line 361 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" +#line 368 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" _g_object_unref0 (save_as_dialog); -#line 361 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" +#line 368 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" _g_object_unref0 (output_format_filter); -#line 361 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" +#line 368 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" output_format_extensions = (_vala_array_free (output_format_extensions, output_format_extensions_length1, (GDestroyNotify) g_free), NULL); -#line 361 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" +#line 368 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" _g_free0 (filename); -#line 361 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" +#line 368 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" _g_object_unref0 (export_dialog); -#line 3351 "DirectPhotoPage.c" +#line 3401 "DirectPhotoPage.c" } static void direct_photo_page_on_send_to (DirectPhotoPage* self) { gboolean _tmp0_ = FALSE; -#line 409 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" +#line 416 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" g_return_if_fail (IS_DIRECT_PHOTO_PAGE (self)); -#line 410 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" +#line 417 "/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 410 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" +#line 417 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" if (_tmp0_) { -#line 3363 "DirectPhotoPage.c" +#line 3413 "DirectPhotoPage.c" ViewCollection* _tmp1_ = NULL; ViewCollection* _tmp2_ = NULL; GeeList* _tmp3_ = NULL; GeeCollection* _tmp4_ = NULL; -#line 411 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" +#line 418 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" _tmp1_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page)); -#line 411 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" +#line 418 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" _tmp2_ = _tmp1_; -#line 411 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" +#line 418 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" _tmp3_ = view_collection_get_selected_sources (_tmp2_); -#line 411 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" +#line 418 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" _tmp4_ = G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, GEE_TYPE_COLLECTION, GeeCollection); -#line 411 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" +#line 418 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" desktop_integration_send_to (_tmp4_); -#line 411 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" +#line 418 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" _g_object_unref0 (_tmp4_); -#line 411 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" +#line 418 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" _data_collection_unref0 (_tmp2_); -#line 3382 "DirectPhotoPage.c" +#line 3432 "DirectPhotoPage.c" } } @@ -3392,93 +3442,93 @@ static gboolean direct_photo_page_real_on_app_key_pressed (Page* base, GdkEventK const gchar* _tmp2_ = NULL; const gchar* _tmp3_ = NULL; GQuark _tmp5_ = 0U; -#line 417 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" +#line 424 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" static GQuark _tmp4_label0 = 0; -#line 417 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" +#line 424 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" static GQuark _tmp4_label1 = 0; -#line 3400 "DirectPhotoPage.c" +#line 3450 "DirectPhotoPage.c" gboolean _tmp6_ = FALSE; gboolean _tmp7_ = FALSE; -#line 414 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" +#line 421 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_DIRECT_PHOTO_PAGE, DirectPhotoPage); -#line 414 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" +#line 421 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" g_return_val_if_fail (event != NULL, FALSE); -#line 415 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" +#line 422 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" handled = TRUE; -#line 417 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" +#line 424 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" _tmp0_ = event; -#line 417 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" +#line 424 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" _tmp1_ = _tmp0_->keyval; -#line 417 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" +#line 424 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" _tmp2_ = gdk_keyval_name (_tmp1_); -#line 417 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" +#line 424 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" _tmp3_ = _tmp2_; -#line 417 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" +#line 424 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" _tmp5_ = (NULL == _tmp3_) ? 0 : g_quark_from_string (_tmp3_); -#line 417 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" +#line 424 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" if (_tmp5_ == ((0 != _tmp4_label0) ? _tmp4_label0 : (_tmp4_label0 = g_quark_from_static_string ("bracketright")))) { -#line 417 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" +#line 424 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" switch (0) { -#line 3423 "DirectPhotoPage.c" +#line 3473 "DirectPhotoPage.c" default: { -#line 419 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" +#line 426 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" page_activate_action (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "RotateClockwise"); -#line 420 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" +#line 427 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" break; -#line 3430 "DirectPhotoPage.c" +#line 3480 "DirectPhotoPage.c" } } } else if (_tmp5_ == ((0 != _tmp4_label1) ? _tmp4_label1 : (_tmp4_label1 = g_quark_from_static_string ("bracketleft")))) { -#line 417 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" +#line 424 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" switch (0) { -#line 3436 "DirectPhotoPage.c" +#line 3486 "DirectPhotoPage.c" default: { -#line 423 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" +#line 430 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" page_activate_action (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "RotateClockwise"); -#line 424 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" +#line 431 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" break; -#line 3443 "DirectPhotoPage.c" +#line 3493 "DirectPhotoPage.c" } } } else { -#line 417 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" +#line 424 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" switch (0) { -#line 3449 "DirectPhotoPage.c" +#line 3499 "DirectPhotoPage.c" default: { -#line 427 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" +#line 434 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" handled = FALSE; -#line 428 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" +#line 435 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" break; -#line 3456 "DirectPhotoPage.c" +#line 3506 "DirectPhotoPage.c" } } } -#line 431 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" +#line 438 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" _tmp7_ = handled; -#line 431 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" +#line 438 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" if (_tmp7_) { -#line 431 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" +#line 438 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" _tmp6_ = TRUE; -#line 3466 "DirectPhotoPage.c" +#line 3516 "DirectPhotoPage.c" } else { GdkEventKey* _tmp8_ = NULL; gboolean _tmp9_ = FALSE; -#line 431 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" +#line 438 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" _tmp8_ = event; -#line 431 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" +#line 438 "/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 431 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" +#line 438 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" _tmp6_ = _tmp9_; -#line 3476 "DirectPhotoPage.c" +#line 3526 "DirectPhotoPage.c" } -#line 431 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" +#line 438 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" result = _tmp6_; -#line 431 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" +#line 438 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" return result; -#line 3482 "DirectPhotoPage.c" +#line 3532 "DirectPhotoPage.c" } @@ -3487,128 +3537,128 @@ static void direct_photo_page_on_print (DirectPhotoPage* self) { ViewCollection* _tmp1_ = NULL; gint _tmp2_ = 0; gboolean _tmp3_ = FALSE; -#line 434 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" +#line 441 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" g_return_if_fail (IS_DIRECT_PHOTO_PAGE (self)); -#line 435 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" +#line 442 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" _tmp0_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page)); -#line 435 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" +#line 442 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" _tmp1_ = _tmp0_; -#line 435 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" +#line 442 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" _tmp2_ = view_collection_get_selected_count (_tmp1_); -#line 435 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" +#line 442 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" _tmp3_ = _tmp2_ > 0; -#line 435 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" +#line 442 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" _data_collection_unref0 (_tmp1_); -#line 435 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" +#line 442 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" if (_tmp3_) { -#line 3505 "DirectPhotoPage.c" +#line 3555 "DirectPhotoPage.c" PrintManager* _tmp4_ = NULL; PrintManager* _tmp5_ = NULL; ViewCollection* _tmp6_ = NULL; ViewCollection* _tmp7_ = NULL; GeeList* _tmp8_ = NULL; GeeCollection* _tmp9_ = NULL; -#line 436 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" +#line 443 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" _tmp4_ = print_manager_get_instance (); -#line 436 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" +#line 443 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" _tmp5_ = _tmp4_; -#line 436 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" +#line 443 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" _tmp6_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page)); -#line 436 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" +#line 443 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" _tmp7_ = _tmp6_; -#line 436 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" +#line 443 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" _tmp8_ = view_collection_get_selected_sources_of_type (_tmp7_, TYPE_PHOTO); -#line 436 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" +#line 443 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" _tmp9_ = G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, GEE_TYPE_COLLECTION, GeeCollection); -#line 436 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" +#line 443 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" print_manager_spool_photo (_tmp5_, _tmp9_); -#line 436 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" +#line 443 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" _g_object_unref0 (_tmp9_); -#line 436 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" +#line 443 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" _data_collection_unref0 (_tmp7_); -#line 436 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" +#line 443 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" _print_manager_unref0 (_tmp5_); -#line 3532 "DirectPhotoPage.c" +#line 3582 "DirectPhotoPage.c" } } static Block6Data* block6_data_ref (Block6Data* _data6_) { -#line 441 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" +#line 448 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" g_atomic_int_inc (&_data6_->_ref_count_); -#line 441 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" +#line 448 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" return _data6_; -#line 3542 "DirectPhotoPage.c" +#line 3592 "DirectPhotoPage.c" } static void block6_data_unref (void * _userdata_) { Block6Data* _data6_; _data6_ = (Block6Data*) _userdata_; -#line 441 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" +#line 448 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" if (g_atomic_int_dec_and_test (&_data6_->_ref_count_)) { -#line 3551 "DirectPhotoPage.c" +#line 3601 "DirectPhotoPage.c" DirectPhotoPage* self; -#line 441 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" +#line 448 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" self = _data6_->self; -#line 441 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" +#line 448 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" _g_object_unref0 (self); -#line 441 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" +#line 448 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" g_slice_free (Block6Data, _data6_); -#line 3559 "DirectPhotoPage.c" +#line 3609 "DirectPhotoPage.c" } } -static gboolean __lambda14_ (Block6Data* _data6_) { +static gboolean __lambda15_ (Block6Data* _data6_) { DirectPhotoPage* self; gboolean result = FALSE; gboolean _tmp0_ = FALSE; -#line 445 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" +#line 452 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" self = _data6_->self; -#line 446 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" +#line 453 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" _tmp0_ = _data6_->should_allow_rotation; -#line 446 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" +#line 453 "/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_); -#line 448 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" +#line 455 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" result = FALSE; -#line 448 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" +#line 455 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" return result; -#line 3578 "DirectPhotoPage.c" +#line 3628 "DirectPhotoPage.c" } -static gboolean ___lambda14__gsource_func (gpointer self) { +static gboolean ___lambda15__gsource_func (gpointer self) { gboolean result; - result = __lambda14_ (self); -#line 445 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" + result = __lambda15_ (self); +#line 452 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" return result; -#line 3587 "DirectPhotoPage.c" +#line 3637 "DirectPhotoPage.c" } static void direct_photo_page_on_dphoto_can_rotate_changed (DirectPhotoPage* self, gboolean should_allow_rotation) { Block6Data* _data6_; gboolean _tmp0_ = FALSE; -#line 441 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" +#line 448 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" g_return_if_fail (IS_DIRECT_PHOTO_PAGE (self)); -#line 441 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" +#line 448 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" _data6_ = g_slice_new0 (Block6Data); -#line 441 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" +#line 448 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" _data6_->_ref_count_ = 1; -#line 441 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" +#line 448 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" _data6_->self = g_object_ref (self); -#line 441 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" +#line 448 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" _tmp0_ = should_allow_rotation; -#line 441 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" +#line 448 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" _data6_->should_allow_rotation = _tmp0_; -#line 445 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" - g_idle_add_full (G_PRIORITY_DEFAULT_IDLE, ___lambda14__gsource_func, block6_data_ref (_data6_), block6_data_unref); -#line 441 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" +#line 452 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" + g_idle_add_full (G_PRIORITY_DEFAULT_IDLE, ___lambda15__gsource_func, block6_data_ref (_data6_), block6_data_unref); +#line 448 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" block6_data_unref (_data6_); -#line 441 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" +#line 448 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" _data6_ = NULL; -#line 3612 "DirectPhotoPage.c" +#line 3662 "DirectPhotoPage.c" } @@ -3617,19 +3667,19 @@ static DataView* direct_photo_page_real_create_photo_view (EditingHostPage* base DataView* result = NULL; DataSource* _tmp0_ = NULL; DirectView* _tmp1_ = NULL; -#line 452 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" +#line 459 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_DIRECT_PHOTO_PAGE, DirectPhotoPage); -#line 452 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" +#line 459 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" g_return_val_if_fail (IS_DATA_SOURCE (source), NULL); -#line 453 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" +#line 460 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" _tmp0_ = source; -#line 453 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" +#line 460 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" _tmp1_ = direct_view_new (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, TYPE_DIRECT_PHOTO, DirectPhoto)); -#line 453 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" +#line 460 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" result = G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, TYPE_DATA_VIEW, DataView); -#line 453 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" +#line 460 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" return result; -#line 3633 "DirectPhotoPage.c" +#line 3683 "DirectPhotoPage.c" } @@ -3643,6 +3693,8 @@ static void direct_photo_page_class_init (DirectPhotoPageClass * klass) { #line 7 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" ((PageClass *) klass)->add_actions = direct_photo_page_real_add_actions; #line 7 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" + ((PageClass *) klass)->remove_actions = direct_photo_page_real_remove_actions; +#line 7 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" ((PageClass *) klass)->init_collect_injection_groups = direct_photo_page_real_init_collect_injection_groups; #line 7 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" ((GtkWidgetClass *) klass)->realize = direct_photo_page_real_realize; @@ -3668,7 +3720,7 @@ static void direct_photo_page_class_init (DirectPhotoPageClass * klass) { ((EditingHostPageClass *) klass)->create_photo_view = 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 3672 "DirectPhotoPage.c" +#line 3724 "DirectPhotoPage.c" } @@ -3679,7 +3731,7 @@ static void direct_photo_page_instance_init (DirectPhotoPage * self) { self->priv->view_controller = NULL; #line 11 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" self->priv->drop_if_dirty = FALSE; -#line 3683 "DirectPhotoPage.c" +#line 3735 "DirectPhotoPage.c" } @@ -3703,7 +3755,7 @@ static void direct_photo_page_finalize (GObject* obj) { _g_object_unref0 (self->priv->current_save_dir); #line 7 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" G_OBJECT_CLASS (direct_photo_page_parent_class)->finalize (obj); -#line 3707 "DirectPhotoPage.c" +#line 3759 "DirectPhotoPage.c" } @@ -3722,46 +3774,46 @@ GType direct_photo_page_get_type (void) { DirectFullscreenPhotoPage* direct_fullscreen_photo_page_construct (GType object_type, GFile* file) { DirectFullscreenPhotoPage * self = NULL; GFile* _tmp0_ = NULL; -#line 458 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" +#line 465 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" g_return_val_if_fail (G_IS_FILE (file), NULL); -#line 459 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" +#line 466 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" _tmp0_ = file; -#line 459 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" +#line 466 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" self = (DirectFullscreenPhotoPage*) direct_photo_page_construct (object_type, _tmp0_); -#line 458 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" +#line 465 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" return self; -#line 3734 "DirectPhotoPage.c" +#line 3786 "DirectPhotoPage.c" } DirectFullscreenPhotoPage* direct_fullscreen_photo_page_new (GFile* file) { -#line 458 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" +#line 465 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" return direct_fullscreen_photo_page_construct (TYPE_DIRECT_FULLSCREEN_PHOTO_PAGE, file); -#line 3741 "DirectPhotoPage.c" +#line 3793 "DirectPhotoPage.c" } static void direct_fullscreen_photo_page_real_init_collect_ui_filenames (Page* base, GeeList* ui_filenames) { DirectFullscreenPhotoPage * self; GeeList* _tmp0_ = NULL; -#line 462 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" +#line 469 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_DIRECT_FULLSCREEN_PHOTO_PAGE, DirectFullscreenPhotoPage); -#line 462 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" +#line 469 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" g_return_if_fail (GEE_IS_LIST (ui_filenames)); -#line 465 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" +#line 472 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" _tmp0_ = ui_filenames; -#line 465 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" +#line 472 "/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 3756 "DirectPhotoPage.c" +#line 3808 "DirectPhotoPage.c" } static void direct_fullscreen_photo_page_class_init (DirectFullscreenPhotoPageClass * klass) { -#line 457 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" +#line 464 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" direct_fullscreen_photo_page_parent_class = g_type_class_peek_parent (klass); -#line 457 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" +#line 464 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" ((PageClass *) klass)->init_collect_ui_filenames = direct_fullscreen_photo_page_real_init_collect_ui_filenames; -#line 3765 "DirectPhotoPage.c" +#line 3817 "DirectPhotoPage.c" } diff --git a/src/direct/DirectPhotoPage.vala b/src/direct/DirectPhotoPage.vala index 9688aa5..a48f9e0 100644 --- a/src/direct/DirectPhotoPage.vala +++ b/src/direct/DirectPhotoPage.vala @@ -65,12 +65,19 @@ public class DirectPhotoPage : EditingHostPage { { "Zoom200", snap_zoom_to_max } }; - protected override void add_actions () { - base.add_actions (); + protected override void add_actions (GLib.ActionMap map) { + base.add_actions (map); - AppWindow.get_instance ().add_action_entries (entries, this); + map.add_action_entries (entries, this); } - + + protected override void remove_actions(GLib.ActionMap map) { + base.remove_actions(map); + foreach (var entry in entries) { + map.remove_action(entry.name); + } + } + protected override InjectionGroup[] init_collect_injection_groups() { InjectionGroup[] groups = base.init_collect_injection_groups(); diff --git a/src/direct/DirectView.c b/src/direct/DirectView.c index e3cebb7..f2ef1b1 100644 --- a/src/direct/DirectView.c +++ b/src/direct/DirectView.c @@ -1,4 +1,4 @@ -/* DirectView.c generated by valac 0.32.1, the Vala compiler +/* DirectView.c generated by valac 0.34.4, the Vala compiler * generated from DirectView.vala, do not modify */ /* Copyright 2016 Software Freedom Conservancy Inc. diff --git a/src/direct/DirectWindow.c b/src/direct/DirectWindow.c index dc9432e..06465a8 100644 --- a/src/direct/DirectWindow.c +++ b/src/direct/DirectWindow.c @@ -1,4 +1,4 @@ -/* DirectWindow.c generated by valac 0.32.1, the Vala compiler +/* DirectWindow.c generated by valac 0.34.4, the Vala compiler * generated from DirectWindow.vala, do not modify */ /* Copyright 2016 Software Freedom Conservancy Inc. @@ -326,7 +326,6 @@ void page_switched_to (Page* self); GtkToolbar* page_get_toolbar (Page* self); void application_set_menubar (GMenuModel* model); GMenuModel* page_get_menubar (Page* self); -void application_set_appmenu (GMenuModel* model); DirectWindow* direct_window_get_app (void); DirectPhotoPage* direct_window_get_direct_page (DirectWindow* self); Page* page_window_get_current_page (PageWindow* self); @@ -365,14 +364,14 @@ static void direct_window_finalize (GObject* obj); 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 369 "DirectWindow.c" +#line 368 "DirectWindow.c" } 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 376 "DirectWindow.c" +#line 375 "DirectWindow.c" } @@ -395,12 +394,9 @@ DirectWindow* direct_window_construct (GType object_type, GFile* file) { DirectPhotoPage* _tmp13_ = NULL; GtkToolbar* _tmp14_ = NULL; GtkToolbar* _tmp15_ = NULL; - GtkBuilder* builder = NULL; - GtkBuilder* _tmp16_ = NULL; - DirectPhotoPage* _tmp17_ = NULL; + DirectPhotoPage* _tmp16_ = NULL; + GMenuModel* _tmp17_ = NULL; GMenuModel* _tmp18_ = NULL; - GMenuModel* _tmp19_ = NULL; - GObject* _tmp20_ = NULL; #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" @@ -468,46 +464,36 @@ DirectWindow* direct_window_construct (GType object_type, GFile* file) { #line 25 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala" _g_object_unref0 (_tmp15_); #line 27 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala" - _tmp16_ = gtk_builder_new_from_resource ("/org/gnome/Shotwell/appmenu.ui"); + _tmp16_ = self->priv->direct_photo_page; #line 27 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala" - builder = _tmp16_; -#line 28 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala" - _tmp17_ = self->priv->direct_photo_page; -#line 28 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala" - _tmp18_ = page_get_menubar (G_TYPE_CHECK_INSTANCE_CAST (_tmp17_, TYPE_PAGE, Page)); -#line 28 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala" - _tmp19_ = _tmp18_; -#line 28 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala" - application_set_menubar (_tmp19_); -#line 28 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala" - _g_object_unref0 (_tmp19_); -#line 29 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala" - _tmp20_ = gtk_builder_get_object (builder, "direct-appmenu"); + _tmp17_ = page_get_menubar (G_TYPE_CHECK_INSTANCE_CAST (_tmp16_, TYPE_PAGE, Page)); +#line 27 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala" + _tmp18_ = _tmp17_; +#line 27 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala" + application_set_menubar (_tmp18_); +#line 27 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala" + _g_object_unref0 (_tmp18_); #line 29 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala" - application_set_appmenu (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_TYPE (_tmp20_, g_menu_get_type ()) ? ((GMenu*) _tmp20_) : NULL, g_menu_model_get_type (), GMenuModel)); -#line 31 "/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 (builder); -#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 497 "DirectWindow.c" +#line 483 "DirectWindow.c" } 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 504 "DirectWindow.c" +#line 490 "DirectWindow.c" } static gpointer _g_object_ref0 (gpointer self) { -#line 35 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala" +#line 33 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala" return self ? g_object_ref (self) : NULL; -#line 511 "DirectWindow.c" +#line 497 "DirectWindow.c" } @@ -515,30 +501,30 @@ DirectWindow* direct_window_get_app (void) { DirectWindow* result = NULL; AppWindow* _tmp0_ = NULL; DirectWindow* _tmp1_ = NULL; -#line 35 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala" +#line 33 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala" _tmp0_ = app_window_instance; -#line 35 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala" +#line 33 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala" _tmp1_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, TYPE_DIRECT_WINDOW, DirectWindow)); -#line 35 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala" +#line 33 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala" result = _tmp1_; -#line 35 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala" +#line 33 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala" return result; -#line 527 "DirectWindow.c" +#line 513 "DirectWindow.c" } DirectPhotoPage* direct_window_get_direct_page (DirectWindow* self) { DirectPhotoPage* result = NULL; Page* _tmp0_ = NULL; -#line 38 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala" +#line 36 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala" g_return_val_if_fail (IS_DIRECT_WINDOW (self), NULL); -#line 39 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala" +#line 37 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala" _tmp0_ = page_window_get_current_page (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE_WINDOW, PageWindow)); -#line 39 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala" +#line 37 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala" result = G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, TYPE_DIRECT_PHOTO_PAGE, DirectPhotoPage); -#line 39 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala" +#line 37 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala" return result; -#line 542 "DirectWindow.c" +#line 528 "DirectWindow.c" } @@ -555,53 +541,53 @@ void direct_window_update_title (DirectWindow* self, GFile* file, gboolean modif gchar* _tmp9_ = NULL; gchar* _tmp10_ = NULL; gchar* _tmp11_ = NULL; -#line 42 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala" +#line 40 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala" g_return_if_fail (IS_DIRECT_WINDOW (self)); -#line 42 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala" +#line 40 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala" g_return_if_fail (G_IS_FILE (file)); -#line 43 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala" +#line 41 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala" _tmp1_ = modified; -#line 43 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala" +#line 41 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala" if (_tmp1_) { -#line 43 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala" +#line 41 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala" _tmp0_ = "*"; -#line 569 "DirectWindow.c" +#line 555 "DirectWindow.c" } else { -#line 43 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala" +#line 41 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala" _tmp0_ = ""; -#line 573 "DirectWindow.c" +#line 559 "DirectWindow.c" } -#line 43 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala" +#line 41 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala" _tmp2_ = file; -#line 43 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala" +#line 41 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala" _tmp3_ = g_file_get_basename (_tmp2_); -#line 43 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala" +#line 41 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala" _tmp4_ = _tmp3_; -#line 43 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala" +#line 41 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala" _tmp5_ = file; -#line 43 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala" +#line 41 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala" _tmp6_ = g_file_get_parent (_tmp5_); -#line 43 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala" +#line 41 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala" _tmp7_ = _tmp6_; -#line 43 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala" +#line 41 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala" _tmp8_ = get_display_pathname (_tmp7_); -#line 43 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala" +#line 41 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala" _tmp9_ = _tmp8_; -#line 43 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala" +#line 41 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala" _tmp10_ = g_strdup_printf ("%s%s (%s) - %s", _tmp0_, _tmp4_, _tmp9_, RESOURCES_APP_TITLE); -#line 43 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala" +#line 41 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala" _tmp11_ = _tmp10_; -#line 43 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala" +#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_); -#line 43 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala" +#line 41 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala" _g_free0 (_tmp11_); -#line 43 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala" +#line 41 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala" _g_free0 (_tmp9_); -#line 43 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala" +#line 41 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala" _g_object_unref0 (_tmp7_); -#line 43 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala" +#line 41 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala" _g_free0 (_tmp4_); -#line 605 "DirectWindow.c" +#line 591 "DirectWindow.c" } @@ -614,33 +600,33 @@ static void direct_window_real_on_fullscreen (AppWindow* base) { GFile* _tmp3_ = NULL; DirectFullscreenPhotoPage* _tmp4_ = NULL; DirectFullscreenPhotoPage* _tmp5_ = NULL; -#line 47 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala" +#line 45 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_DIRECT_WINDOW, DirectWindow); -#line 48 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala" +#line 46 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala" _tmp0_ = direct_window_get_direct_page (self); -#line 48 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala" +#line 46 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala" _tmp1_ = _tmp0_; -#line 48 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala" +#line 46 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala" _tmp2_ = direct_photo_page_get_current_file (_tmp1_); -#line 48 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala" +#line 46 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala" _tmp3_ = _tmp2_; -#line 48 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala" +#line 46 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala" _g_object_unref0 (_tmp1_); -#line 48 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala" +#line 46 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala" file = _tmp3_; -#line 50 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala" +#line 48 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala" _tmp4_ = direct_fullscreen_photo_page_new (file); -#line 50 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala" +#line 48 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala" g_object_ref_sink (_tmp4_); -#line 50 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala" +#line 48 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala" _tmp5_ = _tmp4_; -#line 50 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala" +#line 48 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala" app_window_go_fullscreen (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_APP_WINDOW, AppWindow), G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, TYPE_PAGE, Page)); -#line 50 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala" +#line 48 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala" _g_object_unref0 (_tmp5_); -#line 47 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala" +#line 45 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala" _g_object_unref0 (file); -#line 644 "DirectWindow.c" +#line 630 "DirectWindow.c" } @@ -648,15 +634,15 @@ static gchar* direct_window_real_get_app_role (AppWindow* base) { DirectWindow * self; gchar* result = NULL; gchar* _tmp0_ = NULL; -#line 53 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala" +#line 51 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_DIRECT_WINDOW, DirectWindow); -#line 54 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala" +#line 52 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala" _tmp0_ = g_strdup (RESOURCES_APP_DIRECT_ROLE); -#line 54 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala" +#line 52 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala" result = _tmp0_; -#line 54 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala" +#line 52 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala" return result; -#line 660 "DirectWindow.c" +#line 646 "DirectWindow.c" } @@ -665,43 +651,43 @@ static void direct_window_on_photo_changed (DirectWindow* self) { DirectPhotoPage* _tmp0_ = NULL; Photo* _tmp1_ = NULL; Photo* _tmp2_ = NULL; -#line 57 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala" +#line 55 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala" g_return_if_fail (IS_DIRECT_WINDOW (self)); -#line 58 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala" +#line 56 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala" _tmp0_ = self->priv->direct_photo_page; -#line 58 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala" +#line 56 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala" _tmp1_ = editing_host_page_get_photo (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, TYPE_EDITING_HOST_PAGE, EditingHostPage)); -#line 58 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala" +#line 56 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala" photo = _tmp1_; -#line 59 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala" +#line 57 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala" _tmp2_ = photo; -#line 59 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala" +#line 57 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala" if (_tmp2_ != NULL) { -#line 681 "DirectWindow.c" +#line 667 "DirectWindow.c" Photo* _tmp3_ = NULL; GFile* _tmp4_ = NULL; GFile* _tmp5_ = NULL; Photo* _tmp6_ = NULL; gboolean _tmp7_ = FALSE; -#line 60 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala" +#line 58 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala" _tmp3_ = photo; -#line 60 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala" +#line 58 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala" _tmp4_ = media_source_get_file (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, TYPE_MEDIA_SOURCE, MediaSource)); -#line 60 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala" +#line 58 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala" _tmp5_ = _tmp4_; -#line 60 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala" +#line 58 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala" _tmp6_ = photo; -#line 60 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala" +#line 58 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala" _tmp7_ = photo_has_alterations (_tmp6_); -#line 60 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala" +#line 58 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala" direct_window_update_title (self, _tmp5_, _tmp7_); -#line 60 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala" +#line 58 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala" _g_object_unref0 (_tmp5_); -#line 701 "DirectWindow.c" +#line 687 "DirectWindow.c" } -#line 57 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala" +#line 55 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala" _g_object_unref0 (photo); -#line 705 "DirectWindow.c" +#line 691 "DirectWindow.c" } @@ -715,39 +701,39 @@ static void direct_window_real_on_quit (AppWindow* base) { ConfigFacade* _tmp5_ = NULL; gboolean _tmp6_ = FALSE; Dimensions _tmp7_ = {0}; -#line 63 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala" +#line 61 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_DIRECT_WINDOW, DirectWindow); -#line 64 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala" +#line 62 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala" _tmp0_ = direct_window_get_direct_page (self); -#line 64 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala" +#line 62 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala" _tmp1_ = _tmp0_; -#line 64 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala" +#line 62 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala" _tmp2_ = direct_photo_page_check_quit (_tmp1_); -#line 64 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala" +#line 62 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala" _tmp3_ = !_tmp2_; -#line 64 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala" +#line 62 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala" _g_object_unref0 (_tmp1_); -#line 64 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala" +#line 62 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala" if (_tmp3_) { -#line 65 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala" +#line 63 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala" return; -#line 735 "DirectWindow.c" +#line 721 "DirectWindow.c" } -#line 67 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala" +#line 65 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala" _tmp4_ = config_facade_get_instance (); -#line 67 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala" +#line 65 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala" _tmp5_ = _tmp4_; -#line 67 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala" +#line 65 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala" _tmp6_ = G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_APP_WINDOW, AppWindow)->maximized; -#line 67 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala" +#line 65 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala" _tmp7_ = G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_APP_WINDOW, AppWindow)->dimensions; -#line 67 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala" +#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_); -#line 67 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala" +#line 65 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala" _g_object_unref0 (_tmp5_); -#line 69 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala" +#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 751 "DirectWindow.c" +#line 737 "DirectWindow.c" } @@ -759,50 +745,50 @@ static gboolean direct_window_real_delete_event (GtkWidget* base, GdkEventAny* e gboolean _tmp2_ = FALSE; gboolean _tmp3_ = FALSE; gboolean _tmp4_ = FALSE; -#line 72 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala" +#line 70 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_DIRECT_WINDOW, DirectWindow); -#line 72 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala" +#line 70 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala" g_return_val_if_fail (event != NULL, FALSE); -#line 73 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala" +#line 71 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala" _tmp0_ = direct_window_get_direct_page (self); -#line 73 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala" +#line 71 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala" _tmp1_ = _tmp0_; -#line 73 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala" +#line 71 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala" _tmp2_ = direct_photo_page_check_quit (_tmp1_); -#line 73 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala" +#line 71 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala" _tmp3_ = !_tmp2_; -#line 73 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala" +#line 71 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala" _g_object_unref0 (_tmp1_); -#line 73 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala" +#line 71 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala" if (_tmp3_) { -#line 74 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala" +#line 72 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala" result = TRUE; -#line 74 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala" +#line 72 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala" return result; -#line 783 "DirectWindow.c" +#line 769 "DirectWindow.c" } -#line 76 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala" +#line 74 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala" if (GTK_WIDGET_CLASS (direct_window_parent_class)->delete_event != NULL) { -#line 787 "DirectWindow.c" +#line 773 "DirectWindow.c" GdkEventAny* _tmp5_ = NULL; gboolean _tmp6_ = FALSE; -#line 76 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala" +#line 74 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala" _tmp5_ = event; -#line 76 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala" +#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 76 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala" +#line 74 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala" _tmp4_ = _tmp6_; -#line 796 "DirectWindow.c" +#line 782 "DirectWindow.c" } else { -#line 76 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala" +#line 74 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala" _tmp4_ = FALSE; -#line 800 "DirectWindow.c" +#line 786 "DirectWindow.c" } -#line 76 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala" +#line 74 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala" result = _tmp4_; -#line 76 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala" +#line 74 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala" return result; -#line 806 "DirectWindow.c" +#line 792 "DirectWindow.c" } @@ -811,29 +797,29 @@ static gboolean direct_window_real_button_press_event (GtkWidget* base, GdkEvent gboolean result = FALSE; GdkEventButton* _tmp0_ = NULL; GdkEventType _tmp1_ = 0; -#line 79 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala" +#line 77 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_DIRECT_WINDOW, DirectWindow); -#line 79 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala" +#line 77 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala" g_return_val_if_fail (event != NULL, FALSE); -#line 80 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala" +#line 78 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala" _tmp0_ = event; -#line 80 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala" +#line 78 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala" _tmp1_ = _tmp0_->type; -#line 80 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala" +#line 78 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala" if (_tmp1_ == GDK_2BUTTON_PRESS) { -#line 81 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala" +#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 83 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala" +#line 81 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala" result = TRUE; -#line 83 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala" +#line 81 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala" return result; -#line 831 "DirectWindow.c" +#line 817 "DirectWindow.c" } -#line 86 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala" +#line 84 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala" result = FALSE; -#line 86 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala" +#line 84 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala" return result; -#line 837 "DirectWindow.c" +#line 823 "DirectWindow.c" } @@ -844,48 +830,48 @@ static gboolean direct_window_real_key_press_event (GtkWidget* base, GdkEventKey guint _tmp1_ = 0U; const gchar* _tmp2_ = NULL; gboolean _tmp3_ = FALSE; -#line 89 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala" +#line 87 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_DIRECT_WINDOW, DirectWindow); -#line 89 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala" +#line 87 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala" g_return_val_if_fail (event != NULL, FALSE); -#line 91 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala" +#line 89 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala" _tmp0_ = event; -#line 91 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala" +#line 89 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala" _tmp1_ = _tmp0_->keyval; -#line 91 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala" +#line 89 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala" _tmp2_ = gdk_keyval_name (_tmp1_); -#line 91 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala" +#line 89 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala" if (g_strcmp0 (_tmp2_, "Escape") == 0) { -#line 92 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala" +#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 94 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala" +#line 92 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala" result = TRUE; -#line 94 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala" +#line 92 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala" return result; -#line 866 "DirectWindow.c" +#line 852 "DirectWindow.c" } -#line 98 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala" +#line 96 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala" if (GTK_WIDGET_CLASS (direct_window_parent_class)->key_press_event != NULL) { -#line 870 "DirectWindow.c" +#line 856 "DirectWindow.c" GdkEventKey* _tmp4_ = NULL; gboolean _tmp5_ = FALSE; -#line 98 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala" +#line 96 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala" _tmp4_ = event; -#line 98 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala" +#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 98 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala" +#line 96 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala" _tmp3_ = _tmp5_; -#line 879 "DirectWindow.c" +#line 865 "DirectWindow.c" } else { -#line 98 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala" +#line 96 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala" _tmp3_ = FALSE; -#line 883 "DirectWindow.c" +#line 869 "DirectWindow.c" } -#line 98 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala" +#line 96 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala" result = _tmp3_; -#line 98 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala" +#line 96 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala" return result; -#line 889 "DirectWindow.c" +#line 875 "DirectWindow.c" } @@ -908,14 +894,14 @@ static void direct_window_class_init (DirectWindowClass * klass) { ((GtkWidgetClass *) klass)->key_press_event = 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 912 "DirectWindow.c" +#line 898 "DirectWindow.c" } 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 919 "DirectWindow.c" +#line 905 "DirectWindow.c" } @@ -927,7 +913,7 @@ 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 931 "DirectWindow.c" +#line 917 "DirectWindow.c" } diff --git a/src/direct/DirectWindow.vala b/src/direct/DirectWindow.vala index ee1995a..e1cbf75 100644 --- a/src/direct/DirectWindow.vala +++ b/src/direct/DirectWindow.vala @@ -24,9 +24,7 @@ public class DirectWindow : AppWindow { layout.pack_start(direct_photo_page, true, true, 0); layout.pack_end(direct_photo_page.get_toolbar(), false, false, 0); - var builder = new Gtk.Builder.from_resource ("/org/gnome/Shotwell/appmenu.ui"); Application.set_menubar (direct_photo_page.get_menubar ()); - Application.set_appmenu (builder.get_object ("direct-appmenu") as GLib.Menu); add(layout); } |