diff options
Diffstat (limited to 'src/library')
| -rw-r--r-- | src/library/Branch.c | 151 | ||||
| -rw-r--r-- | src/library/FlaggedPage.c | 73 | ||||
| -rw-r--r-- | src/library/ImportQueuePage.c | 776 | ||||
| -rw-r--r-- | src/library/ImportQueuePage.vala | 20 | ||||
| -rw-r--r-- | src/library/LastImportPage.c | 87 | ||||
| -rw-r--r-- | src/library/LibraryWindow.c | 8909 | ||||
| -rw-r--r-- | src/library/LibraryWindow.vala | 418 | ||||
| -rw-r--r-- | src/library/OfflinePage.c | 553 | ||||
| -rw-r--r-- | src/library/OfflinePage.vala | 29 | ||||
| -rw-r--r-- | src/library/TrashPage.c | 549 | ||||
| -rw-r--r-- | src/library/TrashPage.vala | 35 |
11 files changed, 4892 insertions, 6708 deletions
diff --git a/src/library/Branch.c b/src/library/Branch.c index 2698af7..097a951 100644 --- a/src/library/Branch.c +++ b/src/library/Branch.c @@ -15,6 +15,7 @@ #include <gtk/gtk.h> #include <gdk/gdk.h> #include <gee.h> +#include <gio/gio.h> #define SIDEBAR_TYPE_BRANCH (sidebar_branch_get_type ()) @@ -606,7 +607,7 @@ struct _LibraryHideablePageEntryPrivate { struct _Page { GtkScrolledWindow parent_instance; PagePrivate * priv; - GtkUIManager* ui; + GtkBuilder* builder; GtkToolbar* toolbar; gboolean in_view; }; @@ -616,8 +617,6 @@ struct _PageClass { void (*set_page_name) (Page* self, const gchar* page_name); void (*set_container) (Page* self, GtkWindow* container); void (*clear_container) (Page* self); - GtkMenuBar* (*get_menubar) (Page* self); - GtkWidget* (*get_page_ui_widget) (Page* self, const gchar* path); GtkToolbar* (*get_toolbar) (Page* self); GtkMenu* (*get_page_context_menu) (Page* self); void (*switching_from) (Page* self); @@ -625,10 +624,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 (*init_collect_ui_filenames) (Page* self, GeeList* ui_filenames); - GtkActionEntry* (*init_collect_action_entries) (Page* self, int* result_length1); - GtkToggleActionEntry* (*init_collect_toggle_action_entries) (Page* self, int* result_length1); - void (*register_radio_actions) (Page* self, GtkActionGroup* action_group); InjectionGroup** (*init_collect_injection_groups) (Page* self, int* result_length1); void (*init_actions) (Page* self, gint selected_count, gint count); void (*update_actions) (Page* self, gint selected_count, gint count); @@ -740,13 +737,13 @@ struct _MediaPageClass { void (*on_move_to_trash) (MediaPage* self); void (*on_edit_title) (MediaPage* self); void (*on_edit_comment) (MediaPage* self); - void (*on_display_titles) (MediaPage* self, GtkAction* action); - void (*on_display_comments) (MediaPage* self, GtkAction* action); - void (*on_display_ratings) (MediaPage* self, GtkAction* action); - void (*on_display_tags) (MediaPage* self, GtkAction* action); + void (*on_display_titles) (MediaPage* self, GSimpleAction* action, GVariant* value); + void (*on_display_comments) (MediaPage* self, GSimpleAction* action, GVariant* value); + void (*on_display_ratings) (MediaPage* self, GSimpleAction* action, GVariant* value); + void (*on_display_tags) (MediaPage* self, GSimpleAction* action, GVariant* value); void (*get_config_photos_sort) (MediaPage* self, gboolean* sort_order, gint* sort_by); void (*set_config_photos_sort) (MediaPage* self, gboolean sort_order, gint sort_by); - void (*on_sort_changed) (MediaPage* self); + void (*on_sort_changed) (MediaPage* self, GSimpleAction* action, GVariant* value); void (*developer_changed) (MediaPage* self, RawDeveloper rd); DataView* (*create_thumbnail) (MediaPage* self, DataSource* source); }; @@ -993,35 +990,35 @@ static gint _library_branch_comparator_gcompare_func (gconstpointer a, gconstpoi result = library_branch_comparator ((SidebarEntry*) a, (SidebarEntry*) b); #line 30 "/home/jens/Source/shotwell/src/library/Branch.vala" return result; -#line 997 "Branch.c" +#line 994 "Branch.c" } static void _library_branch_on_flagged_visibility_changed_library_hideable_page_entry_visibility_changed (LibraryHideablePageEntry* _sender, gboolean visible, gpointer self) { #line 43 "/home/jens/Source/shotwell/src/library/Branch.vala" library_branch_on_flagged_visibility_changed ((LibraryBranch*) self); -#line 1004 "Branch.c" +#line 1001 "Branch.c" } static void _library_branch_on_last_imported_visibility_changed_library_hideable_page_entry_visibility_changed (LibraryHideablePageEntry* _sender, gboolean visible, gpointer self) { #line 46 "/home/jens/Source/shotwell/src/library/Branch.vala" library_branch_on_last_imported_visibility_changed ((LibraryBranch*) self); -#line 1011 "Branch.c" +#line 1008 "Branch.c" } static void _library_branch_on_import_queue_visibility_changed_library_hideable_page_entry_visibility_changed (LibraryHideablePageEntry* _sender, gboolean visible, gpointer self) { #line 49 "/home/jens/Source/shotwell/src/library/Branch.vala" library_branch_on_import_queue_visibility_changed ((LibraryBranch*) self); -#line 1018 "Branch.c" +#line 1015 "Branch.c" } static void _library_branch_on_offline_visibility_changed_library_hideable_page_entry_visibility_changed (LibraryHideablePageEntry* _sender, gboolean visible, gpointer self) { #line 52 "/home/jens/Source/shotwell/src/library/Branch.vala" library_branch_on_offline_visibility_changed ((LibraryBranch*) self); -#line 1025 "Branch.c" +#line 1022 "Branch.c" } @@ -1140,14 +1137,14 @@ LibraryBranch* library_branch_construct (GType object_type) { library_branch_on_offline_visibility_changed (self); #line 29 "/home/jens/Source/shotwell/src/library/Branch.vala" return self; -#line 1144 "Branch.c" +#line 1141 "Branch.c" } LibraryBranch* library_branch_new (void) { #line 29 "/home/jens/Source/shotwell/src/library/Branch.vala" return library_branch_construct (LIBRARY_TYPE_BRANCH); -#line 1151 "Branch.c" +#line 1148 "Branch.c" } @@ -1177,7 +1174,7 @@ static void library_branch_insert (LibraryBranch* self, SidebarEntry* entry, gin sidebar_branch_graft (G_TYPE_CHECK_INSTANCE_CAST (self, SIDEBAR_TYPE_BRANCH, SidebarBranch), _tmp3_, _tmp4_, NULL); #line 58 "/home/jens/Source/shotwell/src/library/Branch.vala" _g_object_unref0 (_tmp3_); -#line 1181 "Branch.c" +#line 1178 "Branch.c" } @@ -1189,7 +1186,7 @@ static void library_branch_on_flagged_visibility_changed (LibraryBranch* self) { _tmp0_ = self->priv->_flagged_entry; #line 62 "/home/jens/Source/shotwell/src/library/Branch.vala" library_branch_update_entry_visibility (self, G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, LIBRARY_TYPE_HIDEABLE_PAGE_ENTRY, LibraryHideablePageEntry), (gint) LIBRARY_BRANCH_ENTRY_POSITION_FLAGGED); -#line 1193 "Branch.c" +#line 1190 "Branch.c" } @@ -1201,7 +1198,7 @@ static void library_branch_on_last_imported_visibility_changed (LibraryBranch* s _tmp0_ = self->priv->_last_imported_entry; #line 66 "/home/jens/Source/shotwell/src/library/Branch.vala" library_branch_update_entry_visibility (self, G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, LIBRARY_TYPE_HIDEABLE_PAGE_ENTRY, LibraryHideablePageEntry), (gint) LIBRARY_BRANCH_ENTRY_POSITION_LAST_IMPORTED); -#line 1205 "Branch.c" +#line 1202 "Branch.c" } @@ -1213,7 +1210,7 @@ static void library_branch_on_import_queue_visibility_changed (LibraryBranch* se _tmp0_ = self->priv->_import_queue_entry; #line 70 "/home/jens/Source/shotwell/src/library/Branch.vala" library_branch_update_entry_visibility (self, G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, LIBRARY_TYPE_HIDEABLE_PAGE_ENTRY, LibraryHideablePageEntry), (gint) LIBRARY_BRANCH_ENTRY_POSITION_IMPORT_QUEUE); -#line 1217 "Branch.c" +#line 1214 "Branch.c" } @@ -1225,7 +1222,7 @@ static void library_branch_on_offline_visibility_changed (LibraryBranch* self) { _tmp0_ = self->priv->_offline_entry; #line 74 "/home/jens/Source/shotwell/src/library/Branch.vala" library_branch_update_entry_visibility (self, G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, LIBRARY_TYPE_HIDEABLE_PAGE_ENTRY, LibraryHideablePageEntry), (gint) LIBRARY_BRANCH_ENTRY_POSITION_OFFLINE); -#line 1229 "Branch.c" +#line 1226 "Branch.c" } @@ -1245,7 +1242,7 @@ static void library_branch_update_entry_visibility (LibraryBranch* self, Library _tmp2_ = _tmp1_; #line 78 "/home/jens/Source/shotwell/src/library/Branch.vala" if (_tmp2_) { -#line 1249 "Branch.c" +#line 1246 "Branch.c" LibraryHideablePageEntry* _tmp3_ = NULL; gboolean _tmp4_ = FALSE; #line 79 "/home/jens/Source/shotwell/src/library/Branch.vala" @@ -1254,7 +1251,7 @@ static void library_branch_update_entry_visibility (LibraryBranch* self, Library _tmp4_ = sidebar_branch_has_entry (G_TYPE_CHECK_INSTANCE_CAST (self, SIDEBAR_TYPE_BRANCH, SidebarBranch), G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, SIDEBAR_TYPE_ENTRY, SidebarEntry)); #line 79 "/home/jens/Source/shotwell/src/library/Branch.vala" if (!_tmp4_) { -#line 1258 "Branch.c" +#line 1255 "Branch.c" LibraryHideablePageEntry* _tmp5_ = NULL; gint _tmp6_ = 0; #line 80 "/home/jens/Source/shotwell/src/library/Branch.vala" @@ -1263,7 +1260,7 @@ static void library_branch_update_entry_visibility (LibraryBranch* self, Library _tmp6_ = position; #line 80 "/home/jens/Source/shotwell/src/library/Branch.vala" library_branch_insert (self, G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, SIDEBAR_TYPE_ENTRY, SidebarEntry), _tmp6_); -#line 1267 "Branch.c" +#line 1264 "Branch.c" } } else { LibraryHideablePageEntry* _tmp7_ = NULL; @@ -1274,13 +1271,13 @@ static void library_branch_update_entry_visibility (LibraryBranch* self, Library _tmp8_ = sidebar_branch_has_entry (G_TYPE_CHECK_INSTANCE_CAST (self, SIDEBAR_TYPE_BRANCH, SidebarBranch), G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, SIDEBAR_TYPE_ENTRY, SidebarEntry)); #line 81 "/home/jens/Source/shotwell/src/library/Branch.vala" if (_tmp8_) { -#line 1278 "Branch.c" +#line 1275 "Branch.c" LibraryHideablePageEntry* _tmp9_ = NULL; #line 82 "/home/jens/Source/shotwell/src/library/Branch.vala" _tmp9_ = entry; #line 82 "/home/jens/Source/shotwell/src/library/Branch.vala" sidebar_branch_prune (G_TYPE_CHECK_INSTANCE_CAST (self, SIDEBAR_TYPE_BRANCH, SidebarBranch), G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, SIDEBAR_TYPE_ENTRY, SidebarEntry)); -#line 1284 "Branch.c" +#line 1281 "Branch.c" } } } @@ -1308,7 +1305,7 @@ static gint library_branch_comparator (SidebarEntry* a, SidebarEntry* b) { result = ((gint) ((gintptr) _tmp1_)) - ((gint) ((gintptr) _tmp3_)); #line 87 "/home/jens/Source/shotwell/src/library/Branch.vala" return result; -#line 1312 "Branch.c" +#line 1309 "Branch.c" } @@ -1323,14 +1320,14 @@ LibraryPhotosEntry* library_branch_get_photos_entry (LibraryBranch* self) { result = _tmp0_; #line 10 "/home/jens/Source/shotwell/src/library/Branch.vala" return result; -#line 1327 "Branch.c" +#line 1324 "Branch.c" } static gpointer _g_object_ref0 (gpointer self) { #line 10 "/home/jens/Source/shotwell/src/library/Branch.vala" return self ? g_object_ref (self) : NULL; -#line 1334 "Branch.c" +#line 1331 "Branch.c" } @@ -1349,7 +1346,7 @@ static void library_branch_set_photos_entry (LibraryBranch* self, LibraryPhotosE self->priv->_photos_entry = _tmp1_; #line 10 "/home/jens/Source/shotwell/src/library/Branch.vala" g_object_notify ((GObject *) self, "photos-entry"); -#line 1353 "Branch.c" +#line 1350 "Branch.c" } @@ -1364,7 +1361,7 @@ LibraryFlaggedSidebarEntry* library_branch_get_flagged_entry (LibraryBranch* sel result = _tmp0_; #line 11 "/home/jens/Source/shotwell/src/library/Branch.vala" return result; -#line 1368 "Branch.c" +#line 1365 "Branch.c" } @@ -1383,7 +1380,7 @@ static void library_branch_set_flagged_entry (LibraryBranch* self, LibraryFlagge self->priv->_flagged_entry = _tmp1_; #line 11 "/home/jens/Source/shotwell/src/library/Branch.vala" g_object_notify ((GObject *) self, "flagged-entry"); -#line 1387 "Branch.c" +#line 1384 "Branch.c" } @@ -1398,7 +1395,7 @@ LibraryLastImportSidebarEntry* library_branch_get_last_imported_entry (LibraryBr result = _tmp0_; #line 12 "/home/jens/Source/shotwell/src/library/Branch.vala" return result; -#line 1402 "Branch.c" +#line 1399 "Branch.c" } @@ -1417,7 +1414,7 @@ static void library_branch_set_last_imported_entry (LibraryBranch* self, Library self->priv->_last_imported_entry = _tmp1_; #line 12 "/home/jens/Source/shotwell/src/library/Branch.vala" g_object_notify ((GObject *) self, "last-imported-entry"); -#line 1421 "Branch.c" +#line 1418 "Branch.c" } @@ -1432,7 +1429,7 @@ LibraryImportQueueSidebarEntry* library_branch_get_import_queue_entry (LibraryBr result = _tmp0_; #line 13 "/home/jens/Source/shotwell/src/library/Branch.vala" return result; -#line 1436 "Branch.c" +#line 1433 "Branch.c" } @@ -1451,7 +1448,7 @@ static void library_branch_set_import_queue_entry (LibraryBranch* self, LibraryI self->priv->_import_queue_entry = _tmp1_; #line 13 "/home/jens/Source/shotwell/src/library/Branch.vala" g_object_notify ((GObject *) self, "import-queue-entry"); -#line 1455 "Branch.c" +#line 1452 "Branch.c" } @@ -1466,7 +1463,7 @@ LibraryOfflineSidebarEntry* library_branch_get_offline_entry (LibraryBranch* sel result = _tmp0_; #line 14 "/home/jens/Source/shotwell/src/library/Branch.vala" return result; -#line 1470 "Branch.c" +#line 1467 "Branch.c" } @@ -1485,7 +1482,7 @@ static void library_branch_set_offline_entry (LibraryBranch* self, LibraryOfflin self->priv->_offline_entry = _tmp1_; #line 14 "/home/jens/Source/shotwell/src/library/Branch.vala" g_object_notify ((GObject *) self, "offline-entry"); -#line 1489 "Branch.c" +#line 1486 "Branch.c" } @@ -1500,7 +1497,7 @@ LibraryTrashSidebarEntry* library_branch_get_trash_entry (LibraryBranch* self) { result = _tmp0_; #line 15 "/home/jens/Source/shotwell/src/library/Branch.vala" return result; -#line 1504 "Branch.c" +#line 1501 "Branch.c" } @@ -1519,7 +1516,7 @@ static void library_branch_set_trash_entry (LibraryBranch* self, LibraryTrashSid self->priv->_trash_entry = _tmp1_; #line 15 "/home/jens/Source/shotwell/src/library/Branch.vala" g_object_notify ((GObject *) self, "trash-entry"); -#line 1523 "Branch.c" +#line 1520 "Branch.c" } @@ -1546,14 +1543,14 @@ static void library_branch_class_init (LibraryBranchClass * klass) { g_object_class_install_property (G_OBJECT_CLASS (klass), LIBRARY_BRANCH_OFFLINE_ENTRY, g_param_spec_object ("offline-entry", "offline-entry", "offline-entry", LIBRARY_TYPE_OFFLINE_SIDEBAR_ENTRY, G_PARAM_STATIC_NAME | G_PARAM_STATIC_NICK | G_PARAM_STATIC_BLURB | G_PARAM_READABLE)); #line 7 "/home/jens/Source/shotwell/src/library/Branch.vala" g_object_class_install_property (G_OBJECT_CLASS (klass), LIBRARY_BRANCH_TRASH_ENTRY, g_param_spec_object ("trash-entry", "trash-entry", "trash-entry", LIBRARY_TYPE_TRASH_SIDEBAR_ENTRY, G_PARAM_STATIC_NAME | G_PARAM_STATIC_NICK | G_PARAM_STATIC_BLURB | G_PARAM_READABLE)); -#line 1550 "Branch.c" +#line 1547 "Branch.c" } static void library_branch_instance_init (LibraryBranch * self) { #line 7 "/home/jens/Source/shotwell/src/library/Branch.vala" self->priv = LIBRARY_BRANCH_GET_PRIVATE (self); -#line 1557 "Branch.c" +#line 1554 "Branch.c" } @@ -1575,7 +1572,7 @@ static void library_branch_finalize (GObject* obj) { _g_object_unref0 (self->priv->_trash_entry); #line 7 "/home/jens/Source/shotwell/src/library/Branch.vala" G_OBJECT_CLASS (library_branch_parent_class)->finalize (obj); -#line 1579 "Branch.c" +#line 1576 "Branch.c" } @@ -1632,13 +1629,13 @@ static void _vala_library_branch_get_property (GObject * object, guint property_ g_value_set_object (value, library_branch_get_trash_entry (self)); #line 7 "/home/jens/Source/shotwell/src/library/Branch.vala" break; -#line 1636 "Branch.c" +#line 1633 "Branch.c" default: #line 7 "/home/jens/Source/shotwell/src/library/Branch.vala" G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec); #line 7 "/home/jens/Source/shotwell/src/library/Branch.vala" break; -#line 1642 "Branch.c" +#line 1639 "Branch.c" } } @@ -1684,13 +1681,13 @@ static void _vala_library_branch_set_property (GObject * object, guint property_ library_branch_set_trash_entry (self, g_value_get_object (value)); #line 7 "/home/jens/Source/shotwell/src/library/Branch.vala" break; -#line 1688 "Branch.c" +#line 1685 "Branch.c" default: #line 7 "/home/jens/Source/shotwell/src/library/Branch.vala" G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec); #line 7 "/home/jens/Source/shotwell/src/library/Branch.vala" break; -#line 1694 "Branch.c" +#line 1691 "Branch.c" } } @@ -1701,14 +1698,14 @@ LibraryPhotosEntry* library_photos_entry_construct (GType object_type) { self = (LibraryPhotosEntry*) sidebar_simple_page_entry_construct (object_type); #line 93 "/home/jens/Source/shotwell/src/library/Branch.vala" return self; -#line 1705 "Branch.c" +#line 1702 "Branch.c" } LibraryPhotosEntry* library_photos_entry_new (void) { #line 93 "/home/jens/Source/shotwell/src/library/Branch.vala" return library_photos_entry_construct (LIBRARY_TYPE_PHOTOS_ENTRY); -#line 1712 "Branch.c" +#line 1709 "Branch.c" } @@ -1727,7 +1724,7 @@ static gchar* library_photos_entry_real_get_sidebar_name (SidebarSimplePageEntry result = _tmp1_; #line 97 "/home/jens/Source/shotwell/src/library/Branch.vala" return result; -#line 1731 "Branch.c" +#line 1728 "Branch.c" } @@ -1743,7 +1740,7 @@ static gchar* library_photos_entry_real_get_sidebar_icon (SidebarSimplePageEntry result = _tmp0_; #line 101 "/home/jens/Source/shotwell/src/library/Branch.vala" return result; -#line 1747 "Branch.c" +#line 1744 "Branch.c" } @@ -1761,7 +1758,7 @@ static Page* library_photos_entry_real_create_page (SidebarSimplePageEntry* base result = G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, TYPE_PAGE, Page); #line 105 "/home/jens/Source/shotwell/src/library/Branch.vala" return result; -#line 1765 "Branch.c" +#line 1762 "Branch.c" } @@ -1774,7 +1771,7 @@ static void library_photos_entry_class_init (LibraryPhotosEntryClass * klass) { ((SidebarSimplePageEntryClass *) klass)->get_sidebar_icon = library_photos_entry_real_get_sidebar_icon; #line 91 "/home/jens/Source/shotwell/src/library/Branch.vala" ((SidebarSimplePageEntryClass *) klass)->create_page = library_photos_entry_real_create_page; -#line 1778 "Branch.c" +#line 1775 "Branch.c" } @@ -1800,7 +1797,7 @@ LibraryHideablePageEntry* library_hideable_page_entry_construct (GType object_ty self = (LibraryHideablePageEntry*) sidebar_simple_page_entry_construct (object_type); #line 125 "/home/jens/Source/shotwell/src/library/Branch.vala" return self; -#line 1804 "Branch.c" +#line 1801 "Branch.c" } @@ -1815,7 +1812,7 @@ gboolean library_hideable_page_entry_get_visible (LibraryHideablePageEntry* self result = _tmp0_; #line 115 "/home/jens/Source/shotwell/src/library/Branch.vala" return result; -#line 1819 "Branch.c" +#line 1816 "Branch.c" } @@ -1834,7 +1831,7 @@ void library_hideable_page_entry_set_visible (LibraryHideablePageEntry* self, gb if (_tmp0_ == _tmp1_) { #line 118 "/home/jens/Source/shotwell/src/library/Branch.vala" return; -#line 1838 "Branch.c" +#line 1835 "Branch.c" } #line 120 "/home/jens/Source/shotwell/src/library/Branch.vala" _tmp2_ = value; @@ -1846,7 +1843,7 @@ void library_hideable_page_entry_set_visible (LibraryHideablePageEntry* self, gb g_signal_emit_by_name (self, "visibility-changed", _tmp3_); #line 116 "/home/jens/Source/shotwell/src/library/Branch.vala" g_object_notify ((GObject *) self, "visible"); -#line 1850 "Branch.c" +#line 1847 "Branch.c" } @@ -1865,7 +1862,7 @@ static void library_hideable_page_entry_class_init (LibraryHideablePageEntryClas g_object_class_install_property (G_OBJECT_CLASS (klass), LIBRARY_HIDEABLE_PAGE_ENTRY_VISIBLE, g_param_spec_boolean ("visible", "visible", "visible", FALSE, G_PARAM_STATIC_NAME | G_PARAM_STATIC_NICK | G_PARAM_STATIC_BLURB | G_PARAM_READABLE | G_PARAM_WRITABLE)); #line 109 "/home/jens/Source/shotwell/src/library/Branch.vala" g_signal_new ("visibility_changed", LIBRARY_TYPE_HIDEABLE_PAGE_ENTRY, G_SIGNAL_RUN_LAST, 0, NULL, NULL, g_cclosure_marshal_VOID__BOOLEAN, G_TYPE_NONE, 1, G_TYPE_BOOLEAN); -#line 1869 "Branch.c" +#line 1866 "Branch.c" } @@ -1874,7 +1871,7 @@ static void library_hideable_page_entry_instance_init (LibraryHideablePageEntry self->priv = LIBRARY_HIDEABLE_PAGE_ENTRY_GET_PRIVATE (self); #line 113 "/home/jens/Source/shotwell/src/library/Branch.vala" self->priv->show_entry = FALSE; -#line 1878 "Branch.c" +#line 1875 "Branch.c" } @@ -1884,7 +1881,7 @@ static void library_hideable_page_entry_finalize (GObject* obj) { self = G_TYPE_CHECK_INSTANCE_CAST (obj, LIBRARY_TYPE_HIDEABLE_PAGE_ENTRY, LibraryHideablePageEntry); #line 109 "/home/jens/Source/shotwell/src/library/Branch.vala" G_OBJECT_CLASS (library_hideable_page_entry_parent_class)->finalize (obj); -#line 1888 "Branch.c" +#line 1885 "Branch.c" } @@ -1911,13 +1908,13 @@ static void _vala_library_hideable_page_entry_get_property (GObject * object, gu g_value_set_boolean (value, library_hideable_page_entry_get_visible (self)); #line 109 "/home/jens/Source/shotwell/src/library/Branch.vala" break; -#line 1915 "Branch.c" +#line 1912 "Branch.c" default: #line 109 "/home/jens/Source/shotwell/src/library/Branch.vala" G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec); #line 109 "/home/jens/Source/shotwell/src/library/Branch.vala" break; -#line 1921 "Branch.c" +#line 1918 "Branch.c" } } @@ -1933,13 +1930,13 @@ static void _vala_library_hideable_page_entry_set_property (GObject * object, gu library_hideable_page_entry_set_visible (self, g_value_get_boolean (value)); #line 109 "/home/jens/Source/shotwell/src/library/Branch.vala" break; -#line 1937 "Branch.c" +#line 1934 "Branch.c" default: #line 109 "/home/jens/Source/shotwell/src/library/Branch.vala" G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec); #line 109 "/home/jens/Source/shotwell/src/library/Branch.vala" break; -#line 1943 "Branch.c" +#line 1940 "Branch.c" } } @@ -1948,7 +1945,7 @@ LibraryMainPage* library_main_page_construct (GType object_type, ProgressMonitor LibraryMainPage * self = NULL; #line 133 "/home/jens/Source/shotwell/src/library/Branch.vala" self = (LibraryMainPage*) collection_page_construct (object_type, LIBRARY_MAIN_PAGE_NAME); -#line 1952 "Branch.c" +#line 1949 "Branch.c" { GeeIterator* _sources_it = NULL; MediaCollectionRegistry* _tmp0_ = NULL; @@ -1977,7 +1974,7 @@ LibraryMainPage* library_main_page_construct (GType object_type, ProgressMonitor _sources_it = _tmp5_; #line 135 "/home/jens/Source/shotwell/src/library/Branch.vala" while (TRUE) { -#line 1981 "Branch.c" +#line 1978 "Branch.c" GeeIterator* _tmp6_ = NULL; gboolean _tmp7_ = FALSE; MediaSourceCollection* sources = NULL; @@ -2000,7 +1997,7 @@ LibraryMainPage* library_main_page_construct (GType object_type, ProgressMonitor if (!_tmp7_) { #line 135 "/home/jens/Source/shotwell/src/library/Branch.vala" break; -#line 2004 "Branch.c" +#line 2001 "Branch.c" } #line 135 "/home/jens/Source/shotwell/src/library/Branch.vala" _tmp8_ = _sources_it; @@ -2034,22 +2031,22 @@ LibraryMainPage* library_main_page_construct (GType object_type, ProgressMonitor _data_collection_unref0 (_tmp11_); #line 135 "/home/jens/Source/shotwell/src/library/Branch.vala" _data_collection_unref0 (sources); -#line 2038 "Branch.c" +#line 2035 "Branch.c" } #line 135 "/home/jens/Source/shotwell/src/library/Branch.vala" _g_object_unref0 (_sources_it); -#line 2042 "Branch.c" +#line 2039 "Branch.c" } #line 132 "/home/jens/Source/shotwell/src/library/Branch.vala" return self; -#line 2046 "Branch.c" +#line 2043 "Branch.c" } LibraryMainPage* library_main_page_new (ProgressMonitor monitor, void* monitor_target) { #line 132 "/home/jens/Source/shotwell/src/library/Branch.vala" return library_main_page_construct (LIBRARY_TYPE_MAIN_PAGE, monitor, monitor_target); -#line 2053 "Branch.c" +#line 2050 "Branch.c" } @@ -2079,13 +2076,13 @@ static void library_main_page_real_get_config_photos_sort (MediaPage* base, gboo if (sort_order) { #line 139 "/home/jens/Source/shotwell/src/library/Branch.vala" *sort_order = _vala_sort_order; -#line 2083 "Branch.c" +#line 2080 "Branch.c" } #line 139 "/home/jens/Source/shotwell/src/library/Branch.vala" if (sort_by) { #line 139 "/home/jens/Source/shotwell/src/library/Branch.vala" *sort_by = _vala_sort_by; -#line 2089 "Branch.c" +#line 2086 "Branch.c" } } @@ -2110,7 +2107,7 @@ static void library_main_page_real_set_config_photos_sort (MediaPage* base, gboo configuration_facade_set_library_photos_sort (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade), _tmp2_, _tmp3_); #line 144 "/home/jens/Source/shotwell/src/library/Branch.vala" _g_object_unref0 (_tmp1_); -#line 2114 "Branch.c" +#line 2111 "Branch.c" } @@ -2121,7 +2118,7 @@ static void library_main_page_class_init (LibraryMainPageClass * klass) { ((MediaPageClass *) klass)->get_config_photos_sort = library_main_page_real_get_config_photos_sort; #line 129 "/home/jens/Source/shotwell/src/library/Branch.vala" ((MediaPageClass *) klass)->set_config_photos_sort = library_main_page_real_set_config_photos_sort; -#line 2125 "Branch.c" +#line 2122 "Branch.c" } diff --git a/src/library/FlaggedPage.c b/src/library/FlaggedPage.c index 6ad004b..5cd3d40 100644 --- a/src/library/FlaggedPage.c +++ b/src/library/FlaggedPage.c @@ -14,6 +14,7 @@ #include <string.h> #include <gee.h> #include <gdk/gdk.h> +#include <gio/gio.h> #include <glib/gi18n-lib.h> @@ -409,7 +410,7 @@ typedef struct _FlaggedPageFlaggedSearchViewFilterPrivate FlaggedPageFlaggedSear struct _Page { GtkScrolledWindow parent_instance; PagePrivate * priv; - GtkUIManager* ui; + GtkBuilder* builder; GtkToolbar* toolbar; gboolean in_view; }; @@ -419,8 +420,6 @@ struct _PageClass { void (*set_page_name) (Page* self, const gchar* page_name); void (*set_container) (Page* self, GtkWindow* container); void (*clear_container) (Page* self); - GtkMenuBar* (*get_menubar) (Page* self); - GtkWidget* (*get_page_ui_widget) (Page* self, const gchar* path); GtkToolbar* (*get_toolbar) (Page* self); GtkMenu* (*get_page_context_menu) (Page* self); void (*switching_from) (Page* self); @@ -428,10 +427,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 (*init_collect_ui_filenames) (Page* self, GeeList* ui_filenames); - GtkActionEntry* (*init_collect_action_entries) (Page* self, int* result_length1); - GtkToggleActionEntry* (*init_collect_toggle_action_entries) (Page* self, int* result_length1); - void (*register_radio_actions) (Page* self, GtkActionGroup* action_group); InjectionGroup** (*init_collect_injection_groups) (Page* self, int* result_length1); void (*init_actions) (Page* self, gint selected_count, gint count); void (*update_actions) (Page* self, gint selected_count, gint count); @@ -543,13 +540,13 @@ struct _MediaPageClass { void (*on_move_to_trash) (MediaPage* self); void (*on_edit_title) (MediaPage* self); void (*on_edit_comment) (MediaPage* self); - void (*on_display_titles) (MediaPage* self, GtkAction* action); - void (*on_display_comments) (MediaPage* self, GtkAction* action); - void (*on_display_ratings) (MediaPage* self, GtkAction* action); - void (*on_display_tags) (MediaPage* self, GtkAction* action); + void (*on_display_titles) (MediaPage* self, GSimpleAction* action, GVariant* value); + void (*on_display_comments) (MediaPage* self, GSimpleAction* action, GVariant* value); + void (*on_display_ratings) (MediaPage* self, GSimpleAction* action, GVariant* value); + void (*on_display_tags) (MediaPage* self, GSimpleAction* action, GVariant* value); void (*get_config_photos_sort) (MediaPage* self, gboolean* sort_order, gint* sort_by); void (*set_config_photos_sort) (MediaPage* self, gboolean sort_order, gint sort_by); - void (*on_sort_changed) (MediaPage* self); + void (*on_sort_changed) (MediaPage* self, GSimpleAction* action, GVariant* value); void (*developer_changed) (MediaPage* self, RawDeveloper rd); DataView* (*create_thumbnail) (MediaPage* self, DataSource* source); }; @@ -825,7 +822,7 @@ FlaggedPage* flagged_page_construct (GType object_type) { _view_manager_unref0 (self->priv->view_manager); #line 36 "/home/jens/Source/shotwell/src/library/FlaggedPage.vala" self->priv->view_manager = G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, TYPE_VIEW_MANAGER, ViewManager); -#line 829 "FlaggedPage.c" +#line 826 "FlaggedPage.c" { GeeIterator* _sources_it = NULL; MediaCollectionRegistry* _tmp1_ = NULL; @@ -854,7 +851,7 @@ FlaggedPage* flagged_page_construct (GType object_type) { _sources_it = _tmp6_; #line 38 "/home/jens/Source/shotwell/src/library/FlaggedPage.vala" while (TRUE) { -#line 858 "FlaggedPage.c" +#line 855 "FlaggedPage.c" GeeIterator* _tmp7_ = NULL; gboolean _tmp8_ = FALSE; MediaSourceCollection* sources = NULL; @@ -875,7 +872,7 @@ FlaggedPage* flagged_page_construct (GType object_type) { if (!_tmp8_) { #line 38 "/home/jens/Source/shotwell/src/library/FlaggedPage.vala" break; -#line 879 "FlaggedPage.c" +#line 876 "FlaggedPage.c" } #line 38 "/home/jens/Source/shotwell/src/library/FlaggedPage.vala" _tmp9_ = _sources_it; @@ -903,22 +900,22 @@ FlaggedPage* flagged_page_construct (GType object_type) { _data_collection_unref0 (_tmp12_); #line 38 "/home/jens/Source/shotwell/src/library/FlaggedPage.vala" _data_collection_unref0 (sources); -#line 907 "FlaggedPage.c" +#line 904 "FlaggedPage.c" } #line 38 "/home/jens/Source/shotwell/src/library/FlaggedPage.vala" _g_object_unref0 (_sources_it); -#line 911 "FlaggedPage.c" +#line 908 "FlaggedPage.c" } #line 33 "/home/jens/Source/shotwell/src/library/FlaggedPage.vala" return self; -#line 915 "FlaggedPage.c" +#line 912 "FlaggedPage.c" } FlaggedPage* flagged_page_new (void) { #line 33 "/home/jens/Source/shotwell/src/library/FlaggedPage.vala" return flagged_page_construct (TYPE_FLAGGED_PAGE); -#line 922 "FlaggedPage.c" +#line 919 "FlaggedPage.c" } @@ -948,13 +945,13 @@ static void flagged_page_real_get_config_photos_sort (MediaPage* base, gboolean* if (sort_order) { #line 42 "/home/jens/Source/shotwell/src/library/FlaggedPage.vala" *sort_order = _vala_sort_order; -#line 952 "FlaggedPage.c" +#line 949 "FlaggedPage.c" } #line 42 "/home/jens/Source/shotwell/src/library/FlaggedPage.vala" if (sort_by) { #line 42 "/home/jens/Source/shotwell/src/library/FlaggedPage.vala" *sort_by = _vala_sort_by; -#line 958 "FlaggedPage.c" +#line 955 "FlaggedPage.c" } } @@ -979,14 +976,14 @@ static void flagged_page_real_set_config_photos_sort (MediaPage* base, gboolean configuration_facade_set_library_photos_sort (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade), _tmp2_, _tmp3_); #line 47 "/home/jens/Source/shotwell/src/library/FlaggedPage.vala" _g_object_unref0 (_tmp1_); -#line 983 "FlaggedPage.c" +#line 980 "FlaggedPage.c" } static gpointer _view_filter_ref0 (gpointer self) { #line 51 "/home/jens/Source/shotwell/src/library/FlaggedPage.vala" return self ? view_filter_ref (self) : NULL; -#line 990 "FlaggedPage.c" +#line 987 "FlaggedPage.c" } @@ -1005,7 +1002,7 @@ static SearchViewFilter* flagged_page_real_get_search_view_filter (CheckerboardP result = _tmp1_; #line 51 "/home/jens/Source/shotwell/src/library/FlaggedPage.vala" return result; -#line 1009 "FlaggedPage.c" +#line 1006 "FlaggedPage.c" } @@ -1020,21 +1017,21 @@ static FlaggedPageFlaggedViewManager* flagged_page_flagged_view_manager_construc self = (FlaggedPageFlaggedViewManager*) collection_view_manager_construct (object_type, G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, TYPE_COLLECTION_PAGE, CollectionPage)); #line 11 "/home/jens/Source/shotwell/src/library/FlaggedPage.vala" return self; -#line 1024 "FlaggedPage.c" +#line 1021 "FlaggedPage.c" } static FlaggedPageFlaggedViewManager* flagged_page_flagged_view_manager_new (FlaggedPage* owner) { #line 11 "/home/jens/Source/shotwell/src/library/FlaggedPage.vala" return flagged_page_flagged_view_manager_construct (FLAGGED_PAGE_TYPE_FLAGGED_VIEW_MANAGER, owner); -#line 1031 "FlaggedPage.c" +#line 1028 "FlaggedPage.c" } static gpointer _g_object_ref0 (gpointer self) { #line 16 "/home/jens/Source/shotwell/src/library/FlaggedPage.vala" return self ? g_object_ref (self) : NULL; -#line 1038 "FlaggedPage.c" +#line 1035 "FlaggedPage.c" } @@ -1060,7 +1057,7 @@ static gboolean flagged_page_flagged_view_manager_real_include_in_view (ViewMana _tmp3_ = flaggable; #line 18 "/home/jens/Source/shotwell/src/library/FlaggedPage.vala" if (_tmp3_ != NULL) { -#line 1064 "FlaggedPage.c" +#line 1061 "FlaggedPage.c" Flaggable* _tmp4_ = NULL; gboolean _tmp5_ = FALSE; #line 18 "/home/jens/Source/shotwell/src/library/FlaggedPage.vala" @@ -1069,11 +1066,11 @@ static gboolean flagged_page_flagged_view_manager_real_include_in_view (ViewMana _tmp5_ = flaggable_is_flagged (_tmp4_); #line 18 "/home/jens/Source/shotwell/src/library/FlaggedPage.vala" _tmp2_ = _tmp5_; -#line 1073 "FlaggedPage.c" +#line 1070 "FlaggedPage.c" } else { #line 18 "/home/jens/Source/shotwell/src/library/FlaggedPage.vala" _tmp2_ = FALSE; -#line 1077 "FlaggedPage.c" +#line 1074 "FlaggedPage.c" } #line 18 "/home/jens/Source/shotwell/src/library/FlaggedPage.vala" result = _tmp2_; @@ -1081,7 +1078,7 @@ static gboolean flagged_page_flagged_view_manager_real_include_in_view (ViewMana _g_object_unref0 (flaggable); #line 18 "/home/jens/Source/shotwell/src/library/FlaggedPage.vala" return result; -#line 1085 "FlaggedPage.c" +#line 1082 "FlaggedPage.c" } @@ -1090,7 +1087,7 @@ static void flagged_page_flagged_view_manager_class_init (FlaggedPageFlaggedView flagged_page_flagged_view_manager_parent_class = g_type_class_peek_parent (klass); #line 10 "/home/jens/Source/shotwell/src/library/FlaggedPage.vala" ((ViewManagerClass *) klass)->include_in_view = flagged_page_flagged_view_manager_real_include_in_view; -#line 1094 "FlaggedPage.c" +#line 1091 "FlaggedPage.c" } @@ -1119,7 +1116,7 @@ static guint flagged_page_flagged_search_view_filter_real_get_criteria (SearchVi result = (guint) (((SEARCH_FILTER_CRITERIA_TEXT | SEARCH_FILTER_CRITERIA_MEDIA) | SEARCH_FILTER_CRITERIA_RATING) | SEARCH_FILTER_CRITERIA_SAVEDSEARCH); #line 24 "/home/jens/Source/shotwell/src/library/FlaggedPage.vala" return result; -#line 1123 "FlaggedPage.c" +#line 1120 "FlaggedPage.c" } @@ -1129,14 +1126,14 @@ static FlaggedPageFlaggedSearchViewFilter* flagged_page_flagged_search_view_filt self = (FlaggedPageFlaggedSearchViewFilter*) collection_page_collection_search_view_filter_construct (object_type); #line 22 "/home/jens/Source/shotwell/src/library/FlaggedPage.vala" return self; -#line 1133 "FlaggedPage.c" +#line 1130 "FlaggedPage.c" } static FlaggedPageFlaggedSearchViewFilter* flagged_page_flagged_search_view_filter_new (void) { #line 22 "/home/jens/Source/shotwell/src/library/FlaggedPage.vala" return flagged_page_flagged_search_view_filter_construct (FLAGGED_PAGE_TYPE_FLAGGED_SEARCH_VIEW_FILTER); -#line 1140 "FlaggedPage.c" +#line 1137 "FlaggedPage.c" } @@ -1145,7 +1142,7 @@ static void flagged_page_flagged_search_view_filter_class_init (FlaggedPageFlagg flagged_page_flagged_search_view_filter_parent_class = g_type_class_peek_parent (klass); #line 22 "/home/jens/Source/shotwell/src/library/FlaggedPage.vala" ((SearchViewFilterClass *) klass)->get_criteria = flagged_page_flagged_search_view_filter_real_get_criteria; -#line 1149 "FlaggedPage.c" +#line 1146 "FlaggedPage.c" } @@ -1178,7 +1175,7 @@ static void flagged_page_class_init (FlaggedPageClass * klass) { ((CheckerboardPageClass *) klass)->get_search_view_filter = flagged_page_real_get_search_view_filter; #line 7 "/home/jens/Source/shotwell/src/library/FlaggedPage.vala" G_OBJECT_CLASS (klass)->finalize = flagged_page_finalize; -#line 1182 "FlaggedPage.c" +#line 1179 "FlaggedPage.c" } @@ -1195,7 +1192,7 @@ static void flagged_page_instance_init (FlaggedPage * self) { _tmp1_ = flagged_page_flagged_search_view_filter_new (); #line 31 "/home/jens/Source/shotwell/src/library/FlaggedPage.vala" self->priv->search_filter = _tmp1_; -#line 1199 "FlaggedPage.c" +#line 1196 "FlaggedPage.c" } @@ -1211,7 +1208,7 @@ static void flagged_page_finalize (GObject* obj) { _view_filter_unref0 (self->priv->search_filter); #line 7 "/home/jens/Source/shotwell/src/library/FlaggedPage.vala" G_OBJECT_CLASS (flagged_page_parent_class)->finalize (obj); -#line 1215 "FlaggedPage.c" +#line 1212 "FlaggedPage.c" } diff --git a/src/library/ImportQueuePage.c b/src/library/ImportQueuePage.c index 916c8b2..261796a 100644 --- a/src/library/ImportQueuePage.c +++ b/src/library/ImportQueuePage.c @@ -17,6 +17,7 @@ #include <cairo.h> #include <gdk-pixbuf/gdk-pixbuf.h> #include <glib/gi18n-lib.h> +#include <gio/gio.h> #include <float.h> #include <math.h> #include <pango/pango.h> @@ -111,6 +112,16 @@ typedef struct _BatchImport BatchImport; typedef struct _BatchImportClass BatchImportClass; #define _g_object_unref0(var) ((var == NULL) ? NULL : (var = (g_object_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_DATA_OBJECT (data_object_get_type ()) #define DATA_OBJECT(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), TYPE_DATA_OBJECT, DataObject)) #define DATA_OBJECT_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), TYPE_DATA_OBJECT, DataObjectClass)) @@ -173,16 +184,6 @@ typedef struct _BatchImportRollClass BatchImportRollClass; #define TYPE_IMPORT_RESULT (import_result_get_type ()) -#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_DIRECTION (direction_get_type ()) #define TYPE_DATA_COLLECTION (data_collection_get_type ()) @@ -304,7 +305,7 @@ typedef struct _VideoViewClass VideoViewClass; struct _Page { GtkScrolledWindow parent_instance; PagePrivate * priv; - GtkUIManager* ui; + GtkBuilder* builder; GtkToolbar* toolbar; gboolean in_view; }; @@ -314,8 +315,6 @@ struct _PageClass { void (*set_page_name) (Page* self, const gchar* page_name); void (*set_container) (Page* self, GtkWindow* container); void (*clear_container) (Page* self); - GtkMenuBar* (*get_menubar) (Page* self); - GtkWidget* (*get_page_ui_widget) (Page* self, const gchar* path); GtkToolbar* (*get_toolbar) (Page* self); GtkMenu* (*get_page_context_menu) (Page* self); void (*switching_from) (Page* self); @@ -323,10 +322,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 (*init_collect_ui_filenames) (Page* self, GeeList* ui_filenames); - GtkActionEntry* (*init_collect_action_entries) (Page* self, int* result_length1); - GtkToggleActionEntry* (*init_collect_toggle_action_entries) (Page* self, int* result_length1); - void (*register_radio_actions) (Page* self, GtkActionGroup* action_group); InjectionGroup** (*init_collect_injection_groups) (Page* self, int* result_length1); void (*init_actions) (Page* self, gint selected_count, gint count); void (*update_actions) (Page* self, gint selected_count, gint count); @@ -463,20 +460,18 @@ enum { IMPORT_QUEUE_PAGE_DUMMY_PROPERTY }; #define IMPORT_QUEUE_PAGE_NAME _ ("Importing…") +static void import_queue_page_on_stop (ImportQueuePage* self); +static void _import_queue_page_on_stop_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self); ImportQueuePage* import_queue_page_new (void); ImportQueuePage* import_queue_page_construct (GType object_type); SinglePhotoPage* single_photo_page_construct (GType object_type, const gchar* page_name, gboolean scale_up_to_viewport); GtkToolbar* page_get_toolbar (Page* self); -GtkAction* page_get_action (Page* self, const gchar* name); static void import_queue_page_real_init_collect_ui_filenames (Page* base, GeeList* ui_filenames); void page_init_collect_ui_filenames (Page* self, GeeList* ui_filenames); -static GtkActionEntry* import_queue_page_real_init_collect_action_entries (Page* base, int* result_length1); -GtkActionEntry* page_init_collect_action_entries (Page* self, int* result_length1); -#define RESOURCES_STOP_LABEL _ ("_Stop") -#define TRANSLATABLE "translatable" -static void import_queue_page_on_stop (ImportQueuePage* self); -static void _import_queue_page_on_stop_gtk_action_callback (GtkAction* action, gpointer self); -static void _vala_array_add87 (GtkActionEntry** array, int* length, int* size, const GtkActionEntry* value); +static void import_queue_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); void import_queue_page_enqueue_and_schedule (ImportQueuePage* self, BatchImport* batch_import, gboolean allow_user_cancel); static void import_queue_page_on_starting (ImportQueuePage* self, BatchImport* batch_import); static void _import_queue_page_on_starting_batch_import_starting (BatchImport* _sender, gpointer self); @@ -513,8 +508,6 @@ void batch_import_schedule (BatchImport* self); static void import_queue_page_update_stop_action (ImportQueuePage* self); gint import_queue_page_get_batch_count (ImportQueuePage* self); void page_set_action_sensitive (Page* self, const gchar* name, gboolean sensitive); -GType app_window_get_type (void) G_GNUC_CONST; -AppWindow* app_window_get_instance (void); void page_window_set_busy_cursor (PageWindow* self); void batch_import_user_halt (BatchImport* self); gboolean page_is_in_view (Page* self); @@ -551,6 +544,14 @@ void page_window_set_normal_cursor (PageWindow* self); void app_window_error_message (const gchar* message, GtkWindow* parent); static void import_queue_page_finalize (GObject* obj); +static const GActionEntry IMPORT_QUEUE_PAGE_entries[1] = {{"Stop", _import_queue_page_on_stop_gsimple_action_activate_callback}}; + +static void _import_queue_page_on_stop_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self) { +#line 62 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" + import_queue_page_on_stop ((ImportQueuePage*) self); +#line 553 "ImportQueuePage.c" +} + ImportQueuePage* import_queue_page_construct (GType object_type) { ImportQueuePage * self = NULL; @@ -558,14 +559,12 @@ ImportQueuePage* import_queue_page_construct (GType object_type) { GtkToolbar* _tmp0_ = NULL; GtkToolButton* stop_button = NULL; GtkToolButton* _tmp1_ = NULL; - GtkAction* _tmp2_ = NULL; - GtkAction* _tmp3_ = NULL; GtkSeparatorToolItem* separator = NULL; - GtkSeparatorToolItem* _tmp4_ = NULL; + GtkSeparatorToolItem* _tmp2_ = NULL; GtkToolItem* progress_item = NULL; - GtkToolItem* _tmp5_ = NULL; - GtkProgressBar* _tmp6_ = NULL; - GtkProgressBar* _tmp7_ = NULL; + GtkToolItem* _tmp3_ = NULL; + GtkProgressBar* _tmp4_ = NULL; + GtkProgressBar* _tmp5_ = NULL; #line 25 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" self = (ImportQueuePage*) single_photo_page_construct (object_type, IMPORT_QUEUE_PAGE_NAME, FALSE); #line 28 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" @@ -581,41 +580,35 @@ ImportQueuePage* import_queue_page_construct (GType object_type) { #line 32 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" gtk_tool_button_set_icon_name (stop_button, "stop"); #line 33 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" - _tmp2_ = page_get_action (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "Stop"); -#line 33 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" - _tmp3_ = _tmp2_; -#line 33 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" - gtk_activatable_set_related_action (G_TYPE_CHECK_INSTANCE_CAST (stop_button, GTK_TYPE_ACTIVATABLE, GtkActivatable), _tmp3_); -#line 33 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" - _g_object_unref0 (_tmp3_); + gtk_actionable_set_action_name (G_TYPE_CHECK_INSTANCE_CAST (stop_button, GTK_TYPE_ACTIONABLE, GtkActionable), "win.Stop"); #line 35 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" gtk_toolbar_insert (toolbar, G_TYPE_CHECK_INSTANCE_CAST (stop_button, gtk_tool_item_get_type (), GtkToolItem), -1); #line 38 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" - _tmp4_ = (GtkSeparatorToolItem*) gtk_separator_tool_item_new (); + _tmp2_ = (GtkSeparatorToolItem*) gtk_separator_tool_item_new (); #line 38 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" - g_object_ref_sink (_tmp4_); + g_object_ref_sink (_tmp2_); #line 38 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" - separator = _tmp4_; + separator = _tmp2_; #line 39 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" gtk_separator_tool_item_set_draw (separator, FALSE); #line 41 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" gtk_toolbar_insert (toolbar, G_TYPE_CHECK_INSTANCE_CAST (separator, gtk_tool_item_get_type (), GtkToolItem), -1); #line 44 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" - _tmp5_ = gtk_tool_item_new (); + _tmp3_ = gtk_tool_item_new (); #line 44 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" - g_object_ref_sink (_tmp5_); + g_object_ref_sink (_tmp3_); #line 44 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" - progress_item = _tmp5_; + progress_item = _tmp3_; #line 45 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" gtk_tool_item_set_expand (progress_item, TRUE); #line 46 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" - _tmp6_ = self->priv->progress_bar; + _tmp4_ = self->priv->progress_bar; #line 46 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" - gtk_container_add (G_TYPE_CHECK_INSTANCE_CAST (progress_item, gtk_container_get_type (), GtkContainer), G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, gtk_widget_get_type (), GtkWidget)); + gtk_container_add (G_TYPE_CHECK_INSTANCE_CAST (progress_item, gtk_container_get_type (), GtkContainer), G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, gtk_widget_get_type (), GtkWidget)); #line 47 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" - _tmp7_ = self->priv->progress_bar; + _tmp5_ = self->priv->progress_bar; #line 47 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" - gtk_progress_bar_set_show_text (_tmp7_, TRUE); + gtk_progress_bar_set_show_text (_tmp5_, TRUE); #line 49 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" gtk_toolbar_insert (toolbar, progress_item, -1); #line 24 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" @@ -628,14 +621,14 @@ ImportQueuePage* import_queue_page_construct (GType object_type) { _g_object_unref0 (toolbar); #line 24 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" return self; -#line 632 "ImportQueuePage.c" +#line 625 "ImportQueuePage.c" } ImportQueuePage* import_queue_page_new (void) { #line 24 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" return import_queue_page_construct (TYPE_IMPORT_QUEUE_PAGE); -#line 639 "ImportQueuePage.c" +#line 632 "ImportQueuePage.c" } @@ -655,146 +648,69 @@ static void import_queue_page_real_init_collect_ui_filenames (Page* base, GeeLis _tmp1_ = ui_filenames; #line 59 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" PAGE_CLASS (import_queue_page_parent_class)->init_collect_ui_filenames (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SINGLE_PHOTO_PAGE, SinglePhotoPage), TYPE_PAGE, Page), _tmp1_); -#line 659 "ImportQueuePage.c" +#line 652 "ImportQueuePage.c" } -static void _import_queue_page_on_stop_gtk_action_callback (GtkAction* action, gpointer self) { -#line 65 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" - import_queue_page_on_stop ((ImportQueuePage*) self); -#line 666 "ImportQueuePage.c" -} - - -static void _vala_array_add87 (GtkActionEntry** array, int* length, int* size, const GtkActionEntry* value) { -#line 69 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" - if ((*length) == (*size)) { -#line 69 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" - *size = (*size) ? (2 * (*size)) : 4; -#line 69 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" - *array = g_renew (GtkActionEntry, *array, *size); -#line 677 "ImportQueuePage.c" - } -#line 69 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" - (*array)[(*length)++] = *value; -#line 681 "ImportQueuePage.c" -} - - -static GtkActionEntry* import_queue_page_real_init_collect_action_entries (Page* base, int* result_length1) { +static void import_queue_page_real_add_actions (Page* base) { ImportQueuePage * self; - GtkActionEntry* result = NULL; - GtkActionEntry* actions = NULL; - gint _tmp0_ = 0; - GtkActionEntry* _tmp1_ = NULL; - gint actions_length1 = 0; - gint _actions_size_ = 0; - GtkActionEntry stop = {0}; - GtkActionEntry _tmp2_ = {0}; - const gchar* _tmp3_ = NULL; - const gchar* _tmp4_ = NULL; - GtkActionEntry* _tmp5_ = NULL; - gint _tmp5__length1 = 0; - GtkActionEntry _tmp6_ = {0}; - GtkActionEntry* _tmp7_ = NULL; - gint _tmp7__length1 = 0; -#line 62 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" + AppWindow* _tmp0_ = NULL; + AppWindow* _tmp1_ = NULL; +#line 66 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_IMPORT_QUEUE_PAGE, ImportQueuePage); -#line 63 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" - _tmp1_ = PAGE_CLASS (import_queue_page_parent_class)->init_collect_action_entries (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SINGLE_PHOTO_PAGE, SinglePhotoPage), TYPE_PAGE, Page), &_tmp0_); -#line 63 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" - actions = _tmp1_; -#line 63 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" - actions_length1 = _tmp0_; -#line 63 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" - _actions_size_ = actions_length1; -#line 65 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" - _tmp2_.name = "Stop"; -#line 65 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" - _tmp2_.stock_id = RESOURCES_STOP_LABEL; -#line 65 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" - _tmp2_.label = TRANSLATABLE; -#line 65 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" - _tmp2_.accelerator = NULL; -#line 65 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" - _tmp2_.tooltip = TRANSLATABLE; -#line 65 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" - _tmp2_.callback = (GCallback) _import_queue_page_on_stop_gtk_action_callback; -#line 65 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" - stop = _tmp2_; #line 67 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" - _tmp3_ = _ ("_Stop Import"); -#line 67 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" - stop.label = _tmp3_; -#line 68 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" - _tmp4_ = _ ("Stop importing photos"); -#line 68 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" - stop.tooltip = _tmp4_; + PAGE_CLASS (import_queue_page_parent_class)->add_actions (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SINGLE_PHOTO_PAGE, SinglePhotoPage), TYPE_PAGE, Page)); #line 69 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" - _tmp5_ = actions; + _tmp0_ = app_window_get_instance (); #line 69 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" - _tmp5__length1 = actions_length1; + _tmp1_ = _tmp0_; #line 69 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" - _tmp6_ = stop; + g_action_map_add_action_entries (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, g_action_map_get_type (), GActionMap), IMPORT_QUEUE_PAGE_entries, G_N_ELEMENTS (IMPORT_QUEUE_PAGE_entries), self); #line 69 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" - _vala_array_add87 (&actions, &actions_length1, &_actions_size_, &_tmp6_); -#line 71 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" - _tmp7_ = actions; -#line 71 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" - _tmp7__length1 = actions_length1; -#line 71 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" - if (result_length1) { -#line 71 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" - *result_length1 = _tmp7__length1; -#line 750 "ImportQueuePage.c" - } -#line 71 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" - result = _tmp7_; -#line 71 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" - return result; -#line 756 "ImportQueuePage.c" + _g_object_unref0 (_tmp1_); +#line 672 "ImportQueuePage.c" } static void _import_queue_page_on_starting_batch_import_starting (BatchImport* _sender, gpointer self) { -#line 77 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" +#line 75 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" import_queue_page_on_starting ((ImportQueuePage*) self, _sender); -#line 763 "ImportQueuePage.c" +#line 679 "ImportQueuePage.c" } static void _import_queue_page_on_preparing_batch_import_preparing (BatchImport* _sender, gpointer self) { -#line 78 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" +#line 76 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" import_queue_page_on_preparing ((ImportQueuePage*) self); -#line 770 "ImportQueuePage.c" +#line 686 "ImportQueuePage.c" } static void _import_queue_page_on_progress_batch_import_progress (BatchImport* _sender, guint64 completed_bytes, guint64 total_bytes, gpointer self) { -#line 79 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" +#line 77 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" import_queue_page_on_progress ((ImportQueuePage*) self, completed_bytes, total_bytes); -#line 777 "ImportQueuePage.c" +#line 693 "ImportQueuePage.c" } static void _import_queue_page_on_imported_batch_import_imported (BatchImport* _sender, MediaSource* source, GdkPixbuf* pixbuf, gint to_follow, gpointer self) { -#line 80 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" +#line 78 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" import_queue_page_on_imported ((ImportQueuePage*) self, source, pixbuf, to_follow); -#line 784 "ImportQueuePage.c" +#line 700 "ImportQueuePage.c" } static void _import_queue_page_on_import_complete_batch_import_import_complete (BatchImport* _sender, ImportManifest* manifest, BatchImportRoll* import_roll, gpointer self) { -#line 81 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" +#line 79 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" import_queue_page_on_import_complete ((ImportQueuePage*) self, _sender, manifest, import_roll); -#line 791 "ImportQueuePage.c" +#line 707 "ImportQueuePage.c" } static void _import_queue_page_on_fatal_error_batch_import_fatal_error (BatchImport* _sender, ImportResult _result_, const gchar* message, gpointer self) { -#line 82 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" +#line 80 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" import_queue_page_on_fatal_error ((ImportQueuePage*) self, _result_, message); -#line 798 "ImportQueuePage.c" +#line 714 "ImportQueuePage.c" } @@ -815,86 +731,86 @@ void import_queue_page_enqueue_and_schedule (ImportQueuePage* self, BatchImport* GeeArrayList* _tmp15_ = NULL; gint _tmp16_ = 0; gint _tmp17_ = 0; -#line 74 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" +#line 72 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" g_return_if_fail (IS_IMPORT_QUEUE_PAGE (self)); -#line 74 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" +#line 72 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" g_return_if_fail (IS_BATCH_IMPORT (batch_import)); -#line 75 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" +#line 73 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" _tmp0_ = self->priv->queue; -#line 75 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" +#line 73 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" _tmp1_ = batch_import; -#line 75 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" +#line 73 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" _tmp2_ = gee_abstract_collection_contains (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), _tmp1_); -#line 75 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" +#line 73 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" _vala_assert (!_tmp2_, "!queue.contains(batch_import)"); -#line 77 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" +#line 75 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" _tmp3_ = batch_import; -#line 77 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" +#line 75 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" g_signal_connect_object (_tmp3_, "starting", (GCallback) _import_queue_page_on_starting_batch_import_starting, self, 0); -#line 78 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" +#line 76 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" _tmp4_ = batch_import; -#line 78 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" +#line 76 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" g_signal_connect_object (_tmp4_, "preparing", (GCallback) _import_queue_page_on_preparing_batch_import_preparing, self, 0); -#line 79 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" +#line 77 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" _tmp5_ = batch_import; -#line 79 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" +#line 77 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" g_signal_connect_object (_tmp5_, "progress", (GCallback) _import_queue_page_on_progress_batch_import_progress, self, 0); -#line 80 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" +#line 78 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" _tmp6_ = batch_import; -#line 80 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" +#line 78 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" g_signal_connect_object (_tmp6_, "imported", (GCallback) _import_queue_page_on_imported_batch_import_imported, self, 0); -#line 81 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" +#line 79 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" _tmp7_ = batch_import; -#line 81 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" +#line 79 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" g_signal_connect_object (_tmp7_, "import-complete", (GCallback) _import_queue_page_on_import_complete_batch_import_import_complete, self, 0); -#line 82 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" +#line 80 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" _tmp8_ = batch_import; -#line 82 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" +#line 80 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" g_signal_connect_object (_tmp8_, "fatal-error", (GCallback) _import_queue_page_on_fatal_error_batch_import_fatal_error, self, 0); -#line 84 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" +#line 82 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" _tmp9_ = allow_user_cancel; -#line 84 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" +#line 82 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" if (!_tmp9_) { -#line 859 "ImportQueuePage.c" +#line 775 "ImportQueuePage.c" GeeHashSet* _tmp10_ = NULL; BatchImport* _tmp11_ = NULL; -#line 85 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" +#line 83 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" _tmp10_ = self->priv->cancel_unallowed; -#line 85 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" +#line 83 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" _tmp11_ = batch_import; -#line 85 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" +#line 83 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" gee_abstract_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp10_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), _tmp11_); -#line 868 "ImportQueuePage.c" +#line 784 "ImportQueuePage.c" } -#line 87 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" +#line 85 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" _tmp12_ = self->priv->queue; -#line 87 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" +#line 85 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" _tmp13_ = batch_import; -#line 87 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" +#line 85 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" gee_abstract_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp12_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), _tmp13_); -#line 88 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" +#line 86 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" _tmp14_ = batch_import; -#line 88 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" +#line 86 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" g_signal_emit_by_name (self, "batch-added", _tmp14_); -#line 90 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" +#line 88 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" _tmp15_ = self->priv->queue; -#line 90 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" +#line 88 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" _tmp16_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp15_, GEE_TYPE_COLLECTION, GeeCollection)); -#line 90 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" +#line 88 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" _tmp17_ = _tmp16_; -#line 90 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" +#line 88 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" if (_tmp17_ == 1) { -#line 888 "ImportQueuePage.c" +#line 804 "ImportQueuePage.c" BatchImport* _tmp18_ = NULL; -#line 91 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" +#line 89 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" _tmp18_ = batch_import; -#line 91 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" +#line 89 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" batch_import_schedule (_tmp18_); -#line 894 "ImportQueuePage.c" +#line 810 "ImportQueuePage.c" } -#line 93 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" +#line 91 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" import_queue_page_update_stop_action (self); -#line 898 "ImportQueuePage.c" +#line 814 "ImportQueuePage.c" } @@ -903,19 +819,19 @@ gint import_queue_page_get_batch_count (ImportQueuePage* self) { GeeArrayList* _tmp0_ = NULL; gint _tmp1_ = 0; gint _tmp2_ = 0; -#line 96 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" +#line 94 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" g_return_val_if_fail (IS_IMPORT_QUEUE_PAGE (self), 0); -#line 97 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" +#line 95 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" _tmp0_ = self->priv->queue; -#line 97 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" +#line 95 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" _tmp1_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GEE_TYPE_COLLECTION, GeeCollection)); -#line 97 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" +#line 95 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" _tmp2_ = _tmp1_; -#line 97 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" +#line 95 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" result = _tmp2_; -#line 97 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" +#line 95 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" return result; -#line 919 "ImportQueuePage.c" +#line 835 "ImportQueuePage.c" } @@ -924,44 +840,44 @@ static void import_queue_page_update_stop_action (ImportQueuePage* self) { GeeHashSet* _tmp1_ = NULL; BatchImport* _tmp2_ = NULL; gboolean _tmp3_ = FALSE; -#line 100 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" +#line 98 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" g_return_if_fail (IS_IMPORT_QUEUE_PAGE (self)); -#line 101 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" +#line 99 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" _tmp1_ = self->priv->cancel_unallowed; -#line 101 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" +#line 99 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" _tmp2_ = self->priv->current_batch; -#line 101 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" +#line 99 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" _tmp3_ = gee_abstract_collection_contains (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), _tmp2_); -#line 101 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" +#line 99 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" if (!_tmp3_) { -#line 938 "ImportQueuePage.c" +#line 854 "ImportQueuePage.c" GeeArrayList* _tmp4_ = NULL; gint _tmp5_ = 0; gint _tmp6_ = 0; -#line 101 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" +#line 99 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" _tmp4_ = self->priv->queue; -#line 101 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" +#line 99 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" _tmp5_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, GEE_TYPE_COLLECTION, GeeCollection)); -#line 101 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" +#line 99 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" _tmp6_ = _tmp5_; -#line 101 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" +#line 99 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" _tmp0_ = _tmp6_ > 0; -#line 950 "ImportQueuePage.c" +#line 866 "ImportQueuePage.c" } else { -#line 101 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" +#line 99 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" _tmp0_ = FALSE; -#line 954 "ImportQueuePage.c" +#line 870 "ImportQueuePage.c" } -#line 101 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" +#line 99 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "Stop", _tmp0_); -#line 958 "ImportQueuePage.c" +#line 874 "ImportQueuePage.c" } static gpointer _g_object_ref0 (gpointer self) { -#line 114 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" +#line 112 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" return self ? g_object_ref (self) : NULL; -#line 965 "ImportQueuePage.c" +#line 881 "ImportQueuePage.c" } @@ -971,33 +887,33 @@ static void import_queue_page_on_stop (ImportQueuePage* self) { gint _tmp2_ = 0; AppWindow* _tmp3_ = NULL; AppWindow* _tmp4_ = NULL; -#line 104 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" +#line 102 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" g_return_if_fail (IS_IMPORT_QUEUE_PAGE (self)); -#line 105 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" +#line 103 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" import_queue_page_update_stop_action (self); -#line 107 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" +#line 105 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" _tmp0_ = self->priv->queue; -#line 107 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" +#line 105 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" _tmp1_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GEE_TYPE_COLLECTION, GeeCollection)); -#line 107 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" +#line 105 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" _tmp2_ = _tmp1_; -#line 107 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" +#line 105 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" if (_tmp2_ == 0) { -#line 108 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" +#line 106 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" return; -#line 989 "ImportQueuePage.c" +#line 905 "ImportQueuePage.c" } -#line 110 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" +#line 108 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" _tmp3_ = app_window_get_instance (); -#line 110 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" +#line 108 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" _tmp4_ = _tmp3_; -#line 110 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" +#line 108 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" page_window_set_busy_cursor (G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, TYPE_PAGE_WINDOW, PageWindow)); -#line 110 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" +#line 108 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" _g_object_unref0 (_tmp4_); -#line 111 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" +#line 109 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" self->priv->stopped = TRUE; -#line 1001 "ImportQueuePage.c" +#line 917 "ImportQueuePage.c" { GeeArrayList* _batch_import_list = NULL; GeeArrayList* _tmp5_ = NULL; @@ -1007,25 +923,25 @@ static void import_queue_page_on_stop (ImportQueuePage* self) { gint _tmp8_ = 0; gint _tmp9_ = 0; gint _batch_import_index = 0; -#line 114 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" +#line 112 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" _tmp5_ = self->priv->queue; -#line 114 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" +#line 112 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" _tmp6_ = _g_object_ref0 (_tmp5_); -#line 114 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" +#line 112 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" _batch_import_list = _tmp6_; -#line 114 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" +#line 112 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" _tmp7_ = _batch_import_list; -#line 114 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" +#line 112 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" _tmp8_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, GEE_TYPE_COLLECTION, GeeCollection)); -#line 114 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" +#line 112 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" _tmp9_ = _tmp8_; -#line 114 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" +#line 112 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" _batch_import_size = _tmp9_; -#line 114 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" +#line 112 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" _batch_import_index = -1; -#line 114 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" +#line 112 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" while (TRUE) { -#line 1029 "ImportQueuePage.c" +#line 945 "ImportQueuePage.c" gint _tmp10_ = 0; gint _tmp11_ = 0; gint _tmp12_ = 0; @@ -1034,39 +950,39 @@ static void import_queue_page_on_stop (ImportQueuePage* self) { gint _tmp14_ = 0; gpointer _tmp15_ = NULL; BatchImport* _tmp16_ = NULL; -#line 114 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" +#line 112 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" _tmp10_ = _batch_import_index; -#line 114 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" +#line 112 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" _batch_import_index = _tmp10_ + 1; -#line 114 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" +#line 112 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" _tmp11_ = _batch_import_index; -#line 114 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" +#line 112 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" _tmp12_ = _batch_import_size; -#line 114 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" +#line 112 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" if (!(_tmp11_ < _tmp12_)) { -#line 114 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" +#line 112 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" break; -#line 1050 "ImportQueuePage.c" +#line 966 "ImportQueuePage.c" } -#line 114 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" +#line 112 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" _tmp13_ = _batch_import_list; -#line 114 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" +#line 112 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" _tmp14_ = _batch_import_index; -#line 114 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" +#line 112 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" _tmp15_ = gee_abstract_list_get (G_TYPE_CHECK_INSTANCE_CAST (_tmp13_, GEE_TYPE_ABSTRACT_LIST, GeeAbstractList), _tmp14_); -#line 114 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" +#line 112 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" batch_import = (BatchImport*) _tmp15_; -#line 115 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" +#line 113 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" _tmp16_ = batch_import; -#line 115 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" +#line 113 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" batch_import_user_halt (_tmp16_); -#line 114 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" +#line 112 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" _g_object_unref0 (batch_import); -#line 1066 "ImportQueuePage.c" +#line 982 "ImportQueuePage.c" } -#line 114 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" +#line 112 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" _g_object_unref0 (_batch_import_list); -#line 1070 "ImportQueuePage.c" +#line 986 "ImportQueuePage.c" } } @@ -1074,21 +990,21 @@ static void import_queue_page_on_stop (ImportQueuePage* self) { static void import_queue_page_on_starting (ImportQueuePage* self, BatchImport* batch_import) { BatchImport* _tmp0_ = NULL; BatchImport* _tmp1_ = NULL; -#line 118 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" +#line 116 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" g_return_if_fail (IS_IMPORT_QUEUE_PAGE (self)); -#line 118 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" +#line 116 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" g_return_if_fail (IS_BATCH_IMPORT (batch_import)); -#line 119 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" +#line 117 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" import_queue_page_update_stop_action (self); -#line 120 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" +#line 118 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" _tmp0_ = batch_import; -#line 120 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" +#line 118 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" _tmp1_ = _g_object_ref0 (_tmp0_); -#line 120 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" +#line 118 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" _g_object_unref0 (self->priv->current_batch); -#line 120 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" +#line 118 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" self->priv->current_batch = _tmp1_; -#line 1092 "ImportQueuePage.c" +#line 1008 "ImportQueuePage.c" } @@ -1096,19 +1012,19 @@ static void import_queue_page_on_preparing (ImportQueuePage* self) { GtkProgressBar* _tmp0_ = NULL; const gchar* _tmp1_ = NULL; GtkProgressBar* _tmp2_ = NULL; -#line 123 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" +#line 121 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" g_return_if_fail (IS_IMPORT_QUEUE_PAGE (self)); -#line 124 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" +#line 122 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" _tmp0_ = self->priv->progress_bar; -#line 124 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" +#line 122 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" _tmp1_ = _ ("Preparing to import…"); -#line 124 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" +#line 122 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" gtk_progress_bar_set_text (_tmp0_, _tmp1_); -#line 125 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" +#line 123 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" _tmp2_ = self->priv->progress_bar; -#line 125 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" +#line 123 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" gtk_progress_bar_pulse (_tmp2_); -#line 1112 "ImportQueuePage.c" +#line 1028 "ImportQueuePage.c" } @@ -1118,36 +1034,36 @@ static void import_queue_page_on_progress (ImportQueuePage* self, guint64 comple guint64 _tmp2_ = 0ULL; gdouble pct = 0.0; GtkProgressBar* _tmp5_ = NULL; -#line 128 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" +#line 126 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" g_return_if_fail (IS_IMPORT_QUEUE_PAGE (self)); -#line 129 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" +#line 127 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" _tmp1_ = completed_bytes; -#line 129 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" +#line 127 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" _tmp2_ = total_bytes; -#line 129 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" +#line 127 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" if (_tmp1_ <= _tmp2_) { -#line 1130 "ImportQueuePage.c" +#line 1046 "ImportQueuePage.c" guint64 _tmp3_ = 0ULL; guint64 _tmp4_ = 0ULL; -#line 129 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" +#line 127 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" _tmp3_ = completed_bytes; -#line 129 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" +#line 127 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" _tmp4_ = total_bytes; -#line 129 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" +#line 127 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" _tmp0_ = ((gdouble) _tmp3_) / ((gdouble) _tmp4_); -#line 1139 "ImportQueuePage.c" +#line 1055 "ImportQueuePage.c" } else { -#line 130 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" +#line 128 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" _tmp0_ = 0.0; -#line 1143 "ImportQueuePage.c" +#line 1059 "ImportQueuePage.c" } -#line 129 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" +#line 127 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" pct = _tmp0_; -#line 131 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" +#line 129 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" _tmp5_ = self->priv->progress_bar; -#line 131 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" +#line 129 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" gtk_progress_bar_set_fraction (_tmp5_, pct); -#line 1151 "ImportQueuePage.c" +#line 1067 "ImportQueuePage.c" } @@ -1169,79 +1085,79 @@ static void import_queue_page_on_imported (ImportQueuePage* self, ThumbnailSourc gchar* _tmp27_ = NULL; gchar* _tmp28_ = NULL; gchar* _tmp29_ = NULL; -#line 138 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" +#line 136 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" g_return_if_fail (IS_IMPORT_QUEUE_PAGE (self)); -#line 138 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" +#line 136 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" g_return_if_fail (IS_THUMBNAIL_SOURCE (source)); -#line 138 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" +#line 136 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" g_return_if_fail (GDK_IS_PIXBUF (pixbuf)); -#line 140 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" +#line 138 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" _tmp1_ = to_follow; -#line 140 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" +#line 138 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" if (_tmp1_ > 0) { -#line 140 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" +#line 138 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" _tmp0_ = TRUE; -#line 1185 "ImportQueuePage.c" +#line 1101 "ImportQueuePage.c" } else { gboolean _tmp2_ = FALSE; -#line 140 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" +#line 138 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" _tmp2_ = page_is_in_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page)); -#line 140 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" +#line 138 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" _tmp0_ = !_tmp2_; -#line 1192 "ImportQueuePage.c" +#line 1108 "ImportQueuePage.c" } -#line 140 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" +#line 138 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" if (_tmp0_) { -#line 141 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" +#line 139 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" return; -#line 1198 "ImportQueuePage.c" +#line 1114 "ImportQueuePage.c" } -#line 143 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" +#line 141 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" _tmp3_ = pixbuf; -#line 143 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" +#line 141 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" _tmp4_ = pixbuf; -#line 143 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" +#line 141 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" dimensions_for_pixbuf (_tmp4_, &_tmp5_); -#line 143 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" +#line 141 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" single_photo_page_set_pixbuf (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SINGLE_PHOTO_PAGE, SinglePhotoPage), _tmp3_, &_tmp5_, NULL); -#line 146 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" +#line 144 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" _tmp6_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page)); -#line 146 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" +#line 144 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" _tmp7_ = _tmp6_; -#line 146 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" +#line 144 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" data_collection_clear (G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, TYPE_DATA_COLLECTION, DataCollection)); -#line 146 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" +#line 144 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" _data_collection_unref0 (_tmp7_); -#line 147 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" +#line 145 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" _tmp9_ = source; -#line 147 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" +#line 145 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" if (G_TYPE_CHECK_INSTANCE_TYPE (_tmp9_, TYPE_LIBRARY_PHOTO)) { -#line 1220 "ImportQueuePage.c" +#line 1136 "ImportQueuePage.c" ViewCollection* _tmp10_ = NULL; ViewCollection* _tmp11_ = NULL; ThumbnailSource* _tmp12_ = NULL; PhotoView* _tmp13_ = NULL; PhotoView* _tmp14_ = NULL; gboolean _tmp15_ = FALSE; -#line 147 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" +#line 145 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" _tmp10_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page)); -#line 147 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" +#line 145 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" _tmp11_ = _tmp10_; -#line 147 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" +#line 145 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" _tmp12_ = source; -#line 147 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" +#line 145 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" _tmp13_ = photo_view_new (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_TYPE (_tmp12_, TYPE_LIBRARY_PHOTO) ? ((LibraryPhoto*) _tmp12_) : NULL, TYPE_PHOTO_SOURCE, PhotoSource)); -#line 147 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" +#line 145 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" _tmp14_ = _tmp13_; -#line 147 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" +#line 145 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" _tmp15_ = data_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp11_, TYPE_DATA_COLLECTION, DataCollection), G_TYPE_CHECK_INSTANCE_CAST (_tmp14_, TYPE_DATA_OBJECT, DataObject)); -#line 147 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" +#line 145 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" _tmp8_ = _tmp15_; -#line 147 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" +#line 145 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" _g_object_unref0 (_tmp14_); -#line 147 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" +#line 145 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" _data_collection_unref0 (_tmp11_); -#line 1245 "ImportQueuePage.c" +#line 1161 "ImportQueuePage.c" } else { ViewCollection* _tmp16_ = NULL; ViewCollection* _tmp17_ = NULL; @@ -1249,51 +1165,51 @@ static void import_queue_page_on_imported (ImportQueuePage* self, ThumbnailSourc VideoView* _tmp19_ = NULL; VideoView* _tmp20_ = NULL; gboolean _tmp21_ = FALSE; -#line 148 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" +#line 146 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" _tmp16_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page)); -#line 148 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" +#line 146 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" _tmp17_ = _tmp16_; -#line 148 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" +#line 146 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" _tmp18_ = source; -#line 148 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" +#line 146 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" _tmp19_ = video_view_new (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_TYPE (_tmp18_, TYPE_VIDEO) ? ((Video*) _tmp18_) : NULL, TYPE_VIDEO_SOURCE, VideoSource)); -#line 148 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" +#line 146 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" _tmp20_ = _tmp19_; -#line 148 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" +#line 146 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" _tmp21_ = data_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp17_, TYPE_DATA_COLLECTION, DataCollection), G_TYPE_CHECK_INSTANCE_CAST (_tmp20_, TYPE_DATA_OBJECT, DataObject)); -#line 148 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" +#line 146 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" _tmp8_ = _tmp21_; -#line 148 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" +#line 146 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" _g_object_unref0 (_tmp20_); -#line 148 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" +#line 146 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" _data_collection_unref0 (_tmp17_); -#line 1271 "ImportQueuePage.c" +#line 1187 "ImportQueuePage.c" } -#line 150 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" +#line 148 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" _tmp22_ = self->priv->progress_bar; -#line 150 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" +#line 148 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" gtk_progress_bar_set_ellipsize (_tmp22_, PANGO_ELLIPSIZE_MIDDLE); -#line 151 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" +#line 149 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" _tmp23_ = self->priv->progress_bar; -#line 151 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" +#line 149 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" _tmp24_ = _ ("Imported %s"); -#line 151 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" +#line 149 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" _tmp25_ = source; -#line 151 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" +#line 149 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" _tmp26_ = data_object_get_name (G_TYPE_CHECK_INSTANCE_CAST (_tmp25_, TYPE_DATA_OBJECT, DataObject)); -#line 151 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" +#line 149 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" _tmp27_ = _tmp26_; -#line 151 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" +#line 149 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" _tmp28_ = g_strdup_printf (_tmp24_, _tmp27_); -#line 151 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" +#line 149 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" _tmp29_ = _tmp28_; -#line 151 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" +#line 149 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" gtk_progress_bar_set_text (_tmp23_, _tmp29_); -#line 151 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" +#line 149 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" _g_free0 (_tmp29_); -#line 151 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" +#line 149 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" _g_free0 (_tmp27_); -#line 1297 "ImportQueuePage.c" +#line 1213 "ImportQueuePage.c" } @@ -1330,182 +1246,182 @@ static void import_queue_page_on_import_complete (ImportQueuePage* self, BatchIm gint _tmp28_ = 0; gint _tmp29_ = 0; BatchImport* _tmp39_ = NULL; -#line 154 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" +#line 152 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" g_return_if_fail (IS_IMPORT_QUEUE_PAGE (self)); -#line 154 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" +#line 152 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" g_return_if_fail (IS_BATCH_IMPORT (batch_import)); -#line 154 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" +#line 152 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" g_return_if_fail (IS_IMPORT_MANIFEST (manifest)); -#line 154 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" +#line 152 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" g_return_if_fail (IS_BATCH_IMPORT_ROLL (import_roll)); -#line 156 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" +#line 154 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" _tmp0_ = batch_import; -#line 156 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" +#line 154 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" _tmp1_ = self->priv->current_batch; -#line 156 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" +#line 154 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" _vala_assert (_tmp0_ == _tmp1_, "batch_import == current_batch"); -#line 157 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" +#line 155 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" _g_object_unref0 (self->priv->current_batch); -#line 157 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" +#line 155 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" self->priv->current_batch = NULL; -#line 159 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" +#line 157 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" _tmp2_ = self->priv->queue; -#line 159 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" +#line 157 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" _tmp3_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, GEE_TYPE_COLLECTION, GeeCollection)); -#line 159 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" +#line 157 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" _tmp4_ = _tmp3_; -#line 159 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" +#line 157 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" _vala_assert (_tmp4_ > 0, "queue.size > 0"); -#line 160 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" +#line 158 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" _tmp5_ = self->priv->queue; -#line 160 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" +#line 158 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" _tmp6_ = gee_abstract_list_get (G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, GEE_TYPE_ABSTRACT_LIST, GeeAbstractList), 0); -#line 160 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" +#line 158 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" _tmp7_ = (BatchImport*) _tmp6_; -#line 160 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" +#line 158 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" _tmp8_ = batch_import; -#line 160 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" +#line 158 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" _vala_assert (_tmp7_ == _tmp8_, "queue.get(0) == batch_import"); -#line 160 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" +#line 158 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" _g_object_unref0 (_tmp7_); -#line 162 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" +#line 160 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" _tmp9_ = self->priv->queue; -#line 162 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" +#line 160 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" _tmp10_ = batch_import; -#line 162 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" +#line 160 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" _tmp11_ = gee_abstract_collection_remove (G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), _tmp10_); -#line 162 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" +#line 160 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" removed = _tmp11_; -#line 163 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" +#line 161 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" _tmp12_ = removed; -#line 163 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" +#line 161 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" _vala_assert (_tmp12_, "removed"); -#line 166 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" +#line 164 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" _tmp13_ = self->priv->cancel_unallowed; -#line 166 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" +#line 164 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" _tmp14_ = batch_import; -#line 166 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" +#line 164 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" gee_abstract_collection_remove (G_TYPE_CHECK_INSTANCE_CAST (_tmp13_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), _tmp14_); -#line 169 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" +#line 167 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" _tmp15_ = batch_import; -#line 169 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" +#line 167 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" g_signal_parse_name ("starting", TYPE_BATCH_IMPORT, &_tmp16_, NULL, FALSE); -#line 169 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" +#line 167 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" g_signal_handlers_disconnect_matched (_tmp15_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp16_, 0, NULL, (GCallback) _import_queue_page_on_starting_batch_import_starting, self); -#line 170 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" +#line 168 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" _tmp17_ = batch_import; -#line 170 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" +#line 168 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" g_signal_parse_name ("preparing", TYPE_BATCH_IMPORT, &_tmp18_, NULL, FALSE); -#line 170 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" +#line 168 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" g_signal_handlers_disconnect_matched (_tmp17_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp18_, 0, NULL, (GCallback) _import_queue_page_on_preparing_batch_import_preparing, self); -#line 171 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" +#line 169 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" _tmp19_ = batch_import; -#line 171 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" +#line 169 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" g_signal_parse_name ("progress", TYPE_BATCH_IMPORT, &_tmp20_, NULL, FALSE); -#line 171 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" +#line 169 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" g_signal_handlers_disconnect_matched (_tmp19_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp20_, 0, NULL, (GCallback) _import_queue_page_on_progress_batch_import_progress, self); -#line 172 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" +#line 170 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" _tmp21_ = batch_import; -#line 172 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" +#line 170 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" g_signal_parse_name ("imported", TYPE_BATCH_IMPORT, &_tmp22_, NULL, FALSE); -#line 172 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" +#line 170 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" g_signal_handlers_disconnect_matched (_tmp21_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp22_, 0, NULL, (GCallback) _import_queue_page_on_imported_batch_import_imported, self); -#line 173 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" +#line 171 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" _tmp23_ = batch_import; -#line 173 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" +#line 171 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" g_signal_parse_name ("import-complete", TYPE_BATCH_IMPORT, &_tmp24_, NULL, FALSE); -#line 173 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" +#line 171 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" g_signal_handlers_disconnect_matched (_tmp23_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp24_, 0, NULL, (GCallback) _import_queue_page_on_import_complete_batch_import_import_complete, self); -#line 174 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" +#line 172 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" _tmp25_ = batch_import; -#line 174 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" +#line 172 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" g_signal_parse_name ("fatal-error", TYPE_BATCH_IMPORT, &_tmp26_, NULL, FALSE); -#line 174 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" +#line 172 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" g_signal_handlers_disconnect_matched (_tmp25_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp26_, 0, NULL, (GCallback) _import_queue_page_on_fatal_error_batch_import_fatal_error, self); -#line 177 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" +#line 175 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" _tmp27_ = self->priv->queue; -#line 177 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" +#line 175 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" _tmp28_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp27_, GEE_TYPE_COLLECTION, GeeCollection)); -#line 177 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" +#line 175 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" _tmp29_ = _tmp28_; -#line 177 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" +#line 175 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" if (_tmp29_ > 0) { -#line 1434 "ImportQueuePage.c" +#line 1350 "ImportQueuePage.c" GeeArrayList* _tmp30_ = NULL; gpointer _tmp31_ = NULL; BatchImport* _tmp32_ = NULL; -#line 178 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" +#line 176 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" _tmp30_ = self->priv->queue; -#line 178 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" +#line 176 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" _tmp31_ = gee_abstract_list_get (G_TYPE_CHECK_INSTANCE_CAST (_tmp30_, GEE_TYPE_ABSTRACT_LIST, GeeAbstractList), 0); -#line 178 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" +#line 176 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" _tmp32_ = (BatchImport*) _tmp31_; -#line 178 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" +#line 176 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" batch_import_schedule (_tmp32_); -#line 178 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" +#line 176 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" _g_object_unref0 (_tmp32_); -#line 1448 "ImportQueuePage.c" +#line 1364 "ImportQueuePage.c" } else { GtkProgressBar* _tmp33_ = NULL; GtkProgressBar* _tmp34_ = NULL; GtkProgressBar* _tmp35_ = NULL; gboolean _tmp36_ = FALSE; -#line 181 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" +#line 179 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" _tmp33_ = self->priv->progress_bar; -#line 181 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" +#line 179 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" gtk_progress_bar_set_ellipsize (_tmp33_, PANGO_ELLIPSIZE_NONE); -#line 182 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" +#line 180 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" _tmp34_ = self->priv->progress_bar; -#line 182 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" +#line 180 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" gtk_progress_bar_set_text (_tmp34_, ""); -#line 183 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" +#line 181 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" _tmp35_ = self->priv->progress_bar; -#line 183 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" +#line 181 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" gtk_progress_bar_set_fraction (_tmp35_, 0.0); -#line 190 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" +#line 188 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" single_photo_page_blank_display (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SINGLE_PHOTO_PAGE, SinglePhotoPage)); -#line 193 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" +#line 191 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" _tmp36_ = self->priv->stopped; -#line 193 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" +#line 191 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" if (_tmp36_) { -#line 1472 "ImportQueuePage.c" +#line 1388 "ImportQueuePage.c" AppWindow* _tmp37_ = NULL; AppWindow* _tmp38_ = NULL; -#line 194 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" +#line 192 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" _tmp37_ = app_window_get_instance (); -#line 194 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" +#line 192 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" _tmp38_ = _tmp37_; -#line 194 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" +#line 192 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" page_window_set_normal_cursor (G_TYPE_CHECK_INSTANCE_CAST (_tmp38_, TYPE_PAGE_WINDOW, PageWindow)); -#line 194 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" +#line 192 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" _g_object_unref0 (_tmp38_); -#line 1483 "ImportQueuePage.c" +#line 1399 "ImportQueuePage.c" } -#line 196 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" +#line 194 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" self->priv->stopped = FALSE; -#line 1487 "ImportQueuePage.c" +#line 1403 "ImportQueuePage.c" } -#line 199 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" +#line 197 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" import_queue_page_update_stop_action (self); -#line 202 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" +#line 200 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" _tmp39_ = batch_import; -#line 202 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" +#line 200 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" g_signal_emit_by_name (self, "batch-removed", _tmp39_); -#line 1495 "ImportQueuePage.c" +#line 1411 "ImportQueuePage.c" } static void import_queue_page_on_fatal_error (ImportQueuePage* self, ImportResult _result_, const gchar* message) { const gchar* _tmp0_ = NULL; -#line 205 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" +#line 203 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" g_return_if_fail (IS_IMPORT_QUEUE_PAGE (self)); -#line 205 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" +#line 203 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" g_return_if_fail (message != NULL); -#line 206 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" +#line 204 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" _tmp0_ = message; -#line 206 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" +#line 204 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" app_window_error_message (_tmp0_, NULL); -#line 1509 "ImportQueuePage.c" +#line 1425 "ImportQueuePage.c" } @@ -1517,14 +1433,14 @@ static void import_queue_page_class_init (ImportQueuePageClass * klass) { #line 7 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" ((PageClass *) klass)->init_collect_ui_filenames = import_queue_page_real_init_collect_ui_filenames; #line 7 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" - ((PageClass *) klass)->init_collect_action_entries = import_queue_page_real_init_collect_action_entries; + ((PageClass *) klass)->add_actions = import_queue_page_real_add_actions; #line 7 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" G_OBJECT_CLASS (klass)->finalize = import_queue_page_finalize; #line 7 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" g_signal_new ("batch_added", TYPE_IMPORT_QUEUE_PAGE, G_SIGNAL_RUN_LAST, 0, NULL, NULL, g_cclosure_marshal_VOID__OBJECT, G_TYPE_NONE, 1, TYPE_BATCH_IMPORT); #line 7 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" g_signal_new ("batch_removed", TYPE_IMPORT_QUEUE_PAGE, G_SIGNAL_RUN_LAST, 0, NULL, NULL, g_cclosure_marshal_VOID__OBJECT, G_TYPE_NONE, 1, TYPE_BATCH_IMPORT); -#line 1528 "ImportQueuePage.c" +#line 1444 "ImportQueuePage.c" } @@ -1552,7 +1468,7 @@ static void import_queue_page_instance_init (ImportQueuePage * self) { self->priv->progress_bar = _tmp2_; #line 14 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" self->priv->stopped = FALSE; -#line 1556 "ImportQueuePage.c" +#line 1472 "ImportQueuePage.c" } @@ -1570,7 +1486,7 @@ static void import_queue_page_finalize (GObject* obj) { _g_object_unref0 (self->priv->progress_bar); #line 7 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" G_OBJECT_CLASS (import_queue_page_parent_class)->finalize (obj); -#line 1574 "ImportQueuePage.c" +#line 1490 "ImportQueuePage.c" } diff --git a/src/library/ImportQueuePage.vala b/src/library/ImportQueuePage.vala index b5a5eb6..a2f2290 100644 --- a/src/library/ImportQueuePage.vala +++ b/src/library/ImportQueuePage.vala @@ -30,7 +30,7 @@ public class ImportQueuePage : SinglePhotoPage { // Stop button Gtk.ToolButton stop_button = new Gtk.ToolButton(null, null); stop_button.set_icon_name("stop"); - stop_button.set_related_action(get_action("Stop")); + stop_button.set_action_name ("win.Stop"); toolbar.insert(stop_button, -1); @@ -58,17 +58,15 @@ public class ImportQueuePage : SinglePhotoPage { base.init_collect_ui_filenames(ui_filenames); } - - protected override Gtk.ActionEntry[] init_collect_action_entries() { - Gtk.ActionEntry[] actions = base.init_collect_action_entries(); - - Gtk.ActionEntry stop = { "Stop", Resources.STOP_LABEL, TRANSLATABLE, null, TRANSLATABLE, - on_stop }; - stop.label = _("_Stop Import"); - stop.tooltip = _("Stop importing photos"); - actions += stop; - return actions; + private const GLib.ActionEntry[] entries = { + {"Stop", on_stop } + }; + + protected override void add_actions () { + base.add_actions (); + + AppWindow.get_instance ().add_action_entries (entries, this); } public void enqueue_and_schedule(BatchImport batch_import, bool allow_user_cancel) { diff --git a/src/library/LastImportPage.c b/src/library/LastImportPage.c index c9bd6df..38da28c 100644 --- a/src/library/LastImportPage.c +++ b/src/library/LastImportPage.c @@ -14,6 +14,7 @@ #include <string.h> #include <gee.h> #include <gdk/gdk.h> +#include <gio/gio.h> #include <glib/gi18n-lib.h> @@ -367,7 +368,7 @@ typedef struct _MediaSourceClass MediaSourceClass; struct _Page { GtkScrolledWindow parent_instance; PagePrivate * priv; - GtkUIManager* ui; + GtkBuilder* builder; GtkToolbar* toolbar; gboolean in_view; }; @@ -377,8 +378,6 @@ struct _PageClass { void (*set_page_name) (Page* self, const gchar* page_name); void (*set_container) (Page* self, GtkWindow* container); void (*clear_container) (Page* self); - GtkMenuBar* (*get_menubar) (Page* self); - GtkWidget* (*get_page_ui_widget) (Page* self, const gchar* path); GtkToolbar* (*get_toolbar) (Page* self); GtkMenu* (*get_page_context_menu) (Page* self); void (*switching_from) (Page* self); @@ -386,10 +385,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 (*init_collect_ui_filenames) (Page* self, GeeList* ui_filenames); - GtkActionEntry* (*init_collect_action_entries) (Page* self, int* result_length1); - GtkToggleActionEntry* (*init_collect_toggle_action_entries) (Page* self, int* result_length1); - void (*register_radio_actions) (Page* self, GtkActionGroup* action_group); InjectionGroup** (*init_collect_injection_groups) (Page* self, int* result_length1); void (*init_actions) (Page* self, gint selected_count, gint count); void (*update_actions) (Page* self, gint selected_count, gint count); @@ -501,13 +498,13 @@ struct _MediaPageClass { void (*on_move_to_trash) (MediaPage* self); void (*on_edit_title) (MediaPage* self); void (*on_edit_comment) (MediaPage* self); - void (*on_display_titles) (MediaPage* self, GtkAction* action); - void (*on_display_comments) (MediaPage* self, GtkAction* action); - void (*on_display_ratings) (MediaPage* self, GtkAction* action); - void (*on_display_tags) (MediaPage* self, GtkAction* action); + void (*on_display_titles) (MediaPage* self, GSimpleAction* action, GVariant* value); + void (*on_display_comments) (MediaPage* self, GSimpleAction* action, GVariant* value); + void (*on_display_ratings) (MediaPage* self, GSimpleAction* action, GVariant* value); + void (*on_display_tags) (MediaPage* self, GSimpleAction* action, GVariant* value); void (*get_config_photos_sort) (MediaPage* self, gboolean* sort_order, gint* sort_by); void (*set_config_photos_sort) (MediaPage* self, gboolean sort_order, gint sort_by); - void (*on_sort_changed) (MediaPage* self); + void (*on_sort_changed) (MediaPage* self, GSimpleAction* action, GVariant* value); void (*developer_changed) (MediaPage* self, RawDeveloper rd); DataView* (*create_thumbnail) (MediaPage* self, DataSource* source); }; @@ -711,7 +708,7 @@ static void last_import_page_finalize (GObject* obj); static void _last_import_page_on_import_rolls_altered_media_source_collection_import_roll_altered (MediaSourceCollection* _sender, gpointer self) { #line 41 "/home/jens/Source/shotwell/src/library/LastImportPage.vala" last_import_page_on_import_rolls_altered ((LastImportPage*) self); -#line 715 "LastImportPage.c" +#line 712 "LastImportPage.c" } @@ -719,7 +716,7 @@ LastImportPage* last_import_page_construct (GType object_type) { LastImportPage * self = NULL; #line 28 "/home/jens/Source/shotwell/src/library/LastImportPage.vala" self = (LastImportPage*) collection_page_construct (object_type, LAST_IMPORT_PAGE_NAME); -#line 723 "LastImportPage.c" +#line 720 "LastImportPage.c" { GeeIterator* _col_it = NULL; MediaCollectionRegistry* _tmp0_ = NULL; @@ -748,7 +745,7 @@ LastImportPage* last_import_page_construct (GType object_type) { _col_it = _tmp5_; #line 31 "/home/jens/Source/shotwell/src/library/LastImportPage.vala" while (TRUE) { -#line 752 "LastImportPage.c" +#line 749 "LastImportPage.c" GeeIterator* _tmp6_ = NULL; gboolean _tmp7_ = FALSE; MediaSourceCollection* col = NULL; @@ -763,7 +760,7 @@ LastImportPage* last_import_page_construct (GType object_type) { if (!_tmp7_) { #line 31 "/home/jens/Source/shotwell/src/library/LastImportPage.vala" break; -#line 767 "LastImportPage.c" +#line 764 "LastImportPage.c" } #line 31 "/home/jens/Source/shotwell/src/library/LastImportPage.vala" _tmp8_ = _col_it; @@ -777,24 +774,24 @@ LastImportPage* last_import_page_construct (GType object_type) { g_signal_connect_object (_tmp10_, "import-roll-altered", (GCallback) _last_import_page_on_import_rolls_altered_media_source_collection_import_roll_altered, self, 0); #line 31 "/home/jens/Source/shotwell/src/library/LastImportPage.vala" _data_collection_unref0 (col); -#line 781 "LastImportPage.c" +#line 778 "LastImportPage.c" } #line 31 "/home/jens/Source/shotwell/src/library/LastImportPage.vala" _g_object_unref0 (_col_it); -#line 785 "LastImportPage.c" +#line 782 "LastImportPage.c" } #line 36 "/home/jens/Source/shotwell/src/library/LastImportPage.vala" last_import_page_on_import_rolls_altered (self); #line 27 "/home/jens/Source/shotwell/src/library/LastImportPage.vala" return self; -#line 791 "LastImportPage.c" +#line 788 "LastImportPage.c" } LastImportPage* last_import_page_new (void) { #line 27 "/home/jens/Source/shotwell/src/library/LastImportPage.vala" return last_import_page_construct (TYPE_LAST_IMPORT_PAGE); -#line 798 "LastImportPage.c" +#line 795 "LastImportPage.c" } @@ -832,7 +829,7 @@ static void last_import_page_on_import_rolls_altered (LastImportPage* self) { _tmp4_ = current_last_import_id; #line 50 "/home/jens/Source/shotwell/src/library/LastImportPage.vala" if (_tmp4_ == NULL) { -#line 836 "LastImportPage.c" +#line 833 "LastImportPage.c" ViewCollection* _tmp5_ = NULL; ViewCollection* _tmp6_ = NULL; ViewCollection* _tmp7_ = NULL; @@ -857,7 +854,7 @@ static void last_import_page_on_import_rolls_altered (LastImportPage* self) { _import_id_free0 (current_last_import_id); #line 54 "/home/jens/Source/shotwell/src/library/LastImportPage.vala" return; -#line 861 "LastImportPage.c" +#line 858 "LastImportPage.c" } #line 57 "/home/jens/Source/shotwell/src/library/LastImportPage.vala" _tmp9_ = current_last_import_id; @@ -873,7 +870,7 @@ static void last_import_page_on_import_rolls_altered (LastImportPage* self) { _import_id_free0 (current_last_import_id); #line 58 "/home/jens/Source/shotwell/src/library/LastImportPage.vala" return; -#line 877 "LastImportPage.c" +#line 874 "LastImportPage.c" } #line 60 "/home/jens/Source/shotwell/src/library/LastImportPage.vala" _tmp13_ = current_last_import_id; @@ -895,7 +892,7 @@ static void last_import_page_on_import_rolls_altered (LastImportPage* self) { data_collection_clear (G_TYPE_CHECK_INSTANCE_CAST (_tmp17_, TYPE_DATA_COLLECTION, DataCollection)); #line 63 "/home/jens/Source/shotwell/src/library/LastImportPage.vala" _data_collection_unref0 (_tmp17_); -#line 899 "LastImportPage.c" +#line 896 "LastImportPage.c" { GeeIterator* _col_it = NULL; MediaCollectionRegistry* _tmp18_ = NULL; @@ -924,7 +921,7 @@ static void last_import_page_on_import_rolls_altered (LastImportPage* self) { _col_it = _tmp23_; #line 65 "/home/jens/Source/shotwell/src/library/LastImportPage.vala" while (TRUE) { -#line 928 "LastImportPage.c" +#line 925 "LastImportPage.c" GeeIterator* _tmp24_ = NULL; gboolean _tmp25_ = FALSE; MediaSourceCollection* col = NULL; @@ -947,7 +944,7 @@ static void last_import_page_on_import_rolls_altered (LastImportPage* self) { if (!_tmp25_) { #line 65 "/home/jens/Source/shotwell/src/library/LastImportPage.vala" break; -#line 951 "LastImportPage.c" +#line 948 "LastImportPage.c" } #line 65 "/home/jens/Source/shotwell/src/library/LastImportPage.vala" _tmp26_ = _col_it; @@ -981,15 +978,15 @@ static void last_import_page_on_import_rolls_altered (LastImportPage* self) { _data_collection_unref0 (_tmp29_); #line 65 "/home/jens/Source/shotwell/src/library/LastImportPage.vala" _data_collection_unref0 (col); -#line 985 "LastImportPage.c" +#line 982 "LastImportPage.c" } #line 65 "/home/jens/Source/shotwell/src/library/LastImportPage.vala" _g_object_unref0 (_col_it); -#line 989 "LastImportPage.c" +#line 986 "LastImportPage.c" } #line 45 "/home/jens/Source/shotwell/src/library/LastImportPage.vala" _import_id_free0 (current_last_import_id); -#line 993 "LastImportPage.c" +#line 990 "LastImportPage.c" } @@ -1019,13 +1016,13 @@ static void last_import_page_real_get_config_photos_sort (MediaPage* base, gbool if (sort_order) { #line 71 "/home/jens/Source/shotwell/src/library/LastImportPage.vala" *sort_order = _vala_sort_order; -#line 1023 "LastImportPage.c" +#line 1020 "LastImportPage.c" } #line 71 "/home/jens/Source/shotwell/src/library/LastImportPage.vala" if (sort_by) { #line 71 "/home/jens/Source/shotwell/src/library/LastImportPage.vala" *sort_by = _vala_sort_by; -#line 1029 "LastImportPage.c" +#line 1026 "LastImportPage.c" } } @@ -1050,7 +1047,7 @@ static void last_import_page_real_set_config_photos_sort (MediaPage* base, gbool configuration_facade_set_library_photos_sort (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade), _tmp2_, _tmp3_); #line 76 "/home/jens/Source/shotwell/src/library/LastImportPage.vala" _g_object_unref0 (_tmp1_); -#line 1054 "LastImportPage.c" +#line 1051 "LastImportPage.c" } @@ -1072,14 +1069,14 @@ static LastImportPageLastImportViewManager* last_import_page_last_import_view_ma self->priv->import_id = _tmp1_; #line 13 "/home/jens/Source/shotwell/src/library/LastImportPage.vala" return self; -#line 1076 "LastImportPage.c" +#line 1073 "LastImportPage.c" } static LastImportPageLastImportViewManager* last_import_page_last_import_view_manager_new (LastImportPage* owner, ImportID* import_id) { #line 13 "/home/jens/Source/shotwell/src/library/LastImportPage.vala" return last_import_page_last_import_view_manager_construct (LAST_IMPORT_PAGE_TYPE_LAST_IMPORT_VIEW_MANAGER, owner, import_id); -#line 1083 "LastImportPage.c" +#line 1080 "LastImportPage.c" } @@ -1109,7 +1106,7 @@ static gboolean last_import_page_last_import_view_manager_real_include_in_view ( result = _tmp2_ == _tmp4_; #line 20 "/home/jens/Source/shotwell/src/library/LastImportPage.vala" return result; -#line 1113 "LastImportPage.c" +#line 1110 "LastImportPage.c" } @@ -1122,14 +1119,14 @@ static void last_import_page_last_import_view_manager_class_init (LastImportPage g_type_class_add_private (klass, sizeof (LastImportPageLastImportViewManagerPrivate)); #line 10 "/home/jens/Source/shotwell/src/library/LastImportPage.vala" ((ViewManagerClass *) klass)->include_in_view = last_import_page_last_import_view_manager_real_include_in_view; -#line 1126 "LastImportPage.c" +#line 1123 "LastImportPage.c" } static void last_import_page_last_import_view_manager_instance_init (LastImportPageLastImportViewManager * self) { #line 10 "/home/jens/Source/shotwell/src/library/LastImportPage.vala" self->priv = LAST_IMPORT_PAGE_LAST_IMPORT_VIEW_MANAGER_GET_PRIVATE (self); -#line 1133 "LastImportPage.c" +#line 1130 "LastImportPage.c" } @@ -1139,7 +1136,7 @@ static void last_import_page_last_import_view_manager_finalize (ViewManager* obj self = G_TYPE_CHECK_INSTANCE_CAST (obj, LAST_IMPORT_PAGE_TYPE_LAST_IMPORT_VIEW_MANAGER, LastImportPageLastImportViewManager); #line 10 "/home/jens/Source/shotwell/src/library/LastImportPage.vala" VIEW_MANAGER_CLASS (last_import_page_last_import_view_manager_parent_class)->finalize (obj); -#line 1143 "LastImportPage.c" +#line 1140 "LastImportPage.c" } @@ -1166,7 +1163,7 @@ static void last_import_page_class_init (LastImportPageClass * klass) { ((MediaPageClass *) klass)->set_config_photos_sort = last_import_page_real_set_config_photos_sort; #line 7 "/home/jens/Source/shotwell/src/library/LastImportPage.vala" G_OBJECT_CLASS (klass)->finalize = last_import_page_finalize; -#line 1170 "LastImportPage.c" +#line 1167 "LastImportPage.c" } @@ -1180,7 +1177,7 @@ static void last_import_page_instance_init (LastImportPage * self) { _tmp0_ = alteration_new ("metadata", "import-id"); #line 25 "/home/jens/Source/shotwell/src/library/LastImportPage.vala" self->priv->last_import_alteration = _tmp0_; -#line 1184 "LastImportPage.c" +#line 1181 "LastImportPage.c" } @@ -1188,7 +1185,7 @@ static void last_import_page_finalize (GObject* obj) { LastImportPage * self; #line 7 "/home/jens/Source/shotwell/src/library/LastImportPage.vala" self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_LAST_IMPORT_PAGE, LastImportPage); -#line 1192 "LastImportPage.c" +#line 1189 "LastImportPage.c" { GeeIterator* _col_it = NULL; MediaCollectionRegistry* _tmp0_ = NULL; @@ -1217,7 +1214,7 @@ static void last_import_page_finalize (GObject* obj) { _col_it = _tmp5_; #line 40 "/home/jens/Source/shotwell/src/library/LastImportPage.vala" while (TRUE) { -#line 1221 "LastImportPage.c" +#line 1218 "LastImportPage.c" GeeIterator* _tmp6_ = NULL; gboolean _tmp7_ = FALSE; MediaSourceCollection* col = NULL; @@ -1233,7 +1230,7 @@ static void last_import_page_finalize (GObject* obj) { if (!_tmp7_) { #line 40 "/home/jens/Source/shotwell/src/library/LastImportPage.vala" break; -#line 1237 "LastImportPage.c" +#line 1234 "LastImportPage.c" } #line 40 "/home/jens/Source/shotwell/src/library/LastImportPage.vala" _tmp8_ = _col_it; @@ -1249,17 +1246,17 @@ static void last_import_page_finalize (GObject* obj) { g_signal_handlers_disconnect_matched (_tmp10_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp11_, 0, NULL, (GCallback) _last_import_page_on_import_rolls_altered_media_source_collection_import_roll_altered, self); #line 40 "/home/jens/Source/shotwell/src/library/LastImportPage.vala" _data_collection_unref0 (col); -#line 1253 "LastImportPage.c" +#line 1250 "LastImportPage.c" } #line 40 "/home/jens/Source/shotwell/src/library/LastImportPage.vala" _g_object_unref0 (_col_it); -#line 1257 "LastImportPage.c" +#line 1254 "LastImportPage.c" } #line 25 "/home/jens/Source/shotwell/src/library/LastImportPage.vala" _alteration_unref0 (self->priv->last_import_alteration); #line 7 "/home/jens/Source/shotwell/src/library/LastImportPage.vala" G_OBJECT_CLASS (last_import_page_parent_class)->finalize (obj); -#line 1263 "LastImportPage.c" +#line 1260 "LastImportPage.c" } diff --git a/src/library/LibraryWindow.c b/src/library/LibraryWindow.c index d1dff0e..b300d1c 100644 --- a/src/library/LibraryWindow.c +++ b/src/library/LibraryWindow.c @@ -13,8 +13,8 @@ #include <stdlib.h> #include <string.h> #include <gee.h> -#include <gdk/gdk.h> #include <gio/gio.h> +#include <gdk/gdk.h> #include <glib/gi18n-lib.h> #include <gphoto2/gphoto2-camera.h> #include <gphoto.h> @@ -435,7 +435,6 @@ typedef struct _DiscoveredCameraClass DiscoveredCameraClass; #define _g_free0(var) (var = (g_free (var), NULL)) #define _one_shot_scheduler_unref0(var) ((var == NULL) ? NULL : (var = (one_shot_scheduler_unref (var), NULL))) #define _search_filter_actions_unref0(var) ((var == NULL) ? NULL : (var = (search_filter_actions_unref (var), NULL))) -#define _g_error_free0(var) ((var == NULL) ? NULL : (var = (g_error_free (var), NULL))) #define SIDEBAR_TYPE_SIMPLE_PAGE_ENTRY (sidebar_simple_page_entry_get_type ()) #define SIDEBAR_SIMPLE_PAGE_ENTRY(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), SIDEBAR_TYPE_SIMPLE_PAGE_ENTRY, SidebarSimplePageEntry)) @@ -476,6 +475,7 @@ typedef struct _ViewCollectionClass ViewCollectionClass; typedef struct _ViewFilter ViewFilter; typedef struct _ViewFilterClass ViewFilterClass; +#define _g_variant_unref0(var) ((var == NULL) ? NULL : (var = (g_variant_unref (var), NULL))) #define TYPE_CHECKERBOARD_PAGE (checkerboard_page_get_type ()) #define CHECKERBOARD_PAGE(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), TYPE_CHECKERBOARD_PAGE, CheckerboardPage)) @@ -821,6 +821,7 @@ typedef struct _CameraSidebarEntryClass CameraSidebarEntryClass; typedef struct _ImportPage ImportPage; typedef struct _ImportPageClass ImportPageClass; typedef struct _DiscoveredCameraPrivate DiscoveredCameraPrivate; +#define _g_error_free0(var) ((var == NULL) ? NULL : (var = (g_error_free (var), NULL))) #define SIDEBAR_TYPE_EXPANDABLE_ENTRY (sidebar_expandable_entry_get_type ()) #define SIDEBAR_EXPANDABLE_ENTRY(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), SIDEBAR_TYPE_EXPANDABLE_ENTRY, SidebarExpandableEntry)) @@ -926,13 +927,12 @@ typedef struct _LibraryWindowFullscreenPhotoPagePrivate LibraryWindowFullscreenP #define _vala_warn_if_fail(expr, msg) if G_LIKELY (expr) ; else g_warn_message (G_LOG_DOMAIN, __FILE__, __LINE__, G_STRFUNC, msg); struct _PageWindow { - GtkWindow parent_instance; + GtkApplicationWindow parent_instance; PageWindowPrivate * priv; - GtkUIManager* ui; }; struct _PageWindowClass { - GtkWindowClass parent_class; + GtkApplicationWindowClass parent_class; void (*switched_pages) (PageWindow* self, Page* old_page, Page* new_page); void (*set_current_page) (PageWindow* self, Page* page); void (*clear_current_page) (PageWindow* self); @@ -946,8 +946,6 @@ struct _Dimensions { struct _AppWindow { PageWindow parent_instance; AppWindowPrivate * priv; - GtkActionGroup** common_action_groups; - gint common_action_groups_length1; gboolean maximized; Dimensions dimensions; gint pos_x; @@ -959,8 +957,7 @@ struct _AppWindowClass { void (*on_fullscreen) (AppWindow* self); gchar* (*get_app_role) (AppWindow* self); void (*on_quit) (AppWindow* self); - GtkActionGroup** (*create_common_action_groups) (AppWindow* self, int* result_length1); - void (*replace_common_placeholders) (AppWindow* self, GtkUIManager* ui); + void (*add_actions) (AppWindow* self); void (*update_common_action_availability) (AppWindow* self, Page* old_page, Page* new_page); void (*update_common_actions) (AppWindow* self, Page* page, gint selected_count, gint count); }; @@ -989,7 +986,6 @@ struct _LibraryWindowPrivate { GtkPaned* sidebar_paned; GtkPaned* client_paned; GtkFrame* bottom_frame; - GtkActionGroup* common_action_group; OneShotScheduler* properties_scheduler; gboolean notify_library_is_home_dir; SidebarTree* sidebar_tree; @@ -1070,7 +1066,7 @@ struct _SidebarExpandableEntryIface { struct _Page { GtkScrolledWindow parent_instance; PagePrivate * priv; - GtkUIManager* ui; + GtkBuilder* builder; GtkToolbar* toolbar; gboolean in_view; }; @@ -1080,8 +1076,6 @@ struct _PageClass { void (*set_page_name) (Page* self, const gchar* page_name); void (*set_container) (Page* self, GtkWindow* container); void (*clear_container) (Page* self); - GtkMenuBar* (*get_menubar) (Page* self); - GtkWidget* (*get_page_ui_widget) (Page* self, const gchar* path); GtkToolbar* (*get_toolbar) (Page* self); GtkMenu* (*get_page_context_menu) (Page* self); void (*switching_from) (Page* self); @@ -1089,10 +1083,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 (*init_collect_ui_filenames) (Page* self, GeeList* ui_filenames); - GtkActionEntry* (*init_collect_action_entries) (Page* self, int* result_length1); - GtkToggleActionEntry* (*init_collect_toggle_action_entries) (Page* self, int* result_length1); - void (*register_radio_actions) (Page* self, GtkActionGroup* action_group); InjectionGroup** (*init_collect_injection_groups) (Page* self, int* result_length1); void (*init_actions) (Page* self, gint selected_count, gint count); void (*update_actions) (Page* self, gint selected_count, gint count); @@ -1367,8 +1359,8 @@ SearchFilterActions* search_filter_actions_construct (GType object_type); BasicProperties* basic_properties_new (void); BasicProperties* basic_properties_construct (GType object_type); #define LIBRARY_WINDOW_SIDEBAR_MIN_WIDTH 120 -#define LIBRARY_WINDOW_SORT_EVENTS_ORDER_ASCENDING 0 -#define LIBRARY_WINDOW_SORT_EVENTS_ORDER_DESCENDING 1 +#define LIBRARY_WINDOW_SORT_EVENTS_ORDER_ASCENDING "ascending" +#define LIBRARY_WINDOW_SORT_EVENTS_ORDER_DESCENDING "descending" #define LIBRARY_WINDOW_BACKGROUND_PROGRESS_PULSE_MSEC 250 #define LIBRARY_WINDOW_MIN_PROGRESS_BAR_FILES 20 #define LIBRARY_WINDOW_STARTUP_SCAN_PROGRESS_PRIORITY 35 @@ -1377,6 +1369,36 @@ BasicProperties* basic_properties_construct (GType object_type); #define LIBRARY_WINDOW_METADATA_WRITER_PROGRESS_PRIORITY 30 #define LIBRARY_WINDOW_TAG_PATH_MIME_TYPE "shotwell/tag-path" #define LIBRARY_WINDOW_MEDIA_LIST_MIME_TYPE "shotwell/media-id-atom" +static void library_window_on_file_import (LibraryWindow* self); +static void _library_window_on_file_import_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self); +static void library_window_on_external_library_import (LibraryWindow* self); +static void _library_window_on_external_library_import_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self); +static void library_window_on_preferences (LibraryWindow* self); +static void _library_window_on_preferences_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self); +static void library_window_on_empty_trash (LibraryWindow* self); +static void _library_window_on_empty_trash_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self); +static void library_window_on_jump_to_event (LibraryWindow* self); +static void _library_window_on_jump_to_event_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self); +static void library_window_on_find (LibraryWindow* self); +static void _library_window_on_find_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self); +static void library_window_on_new_search (LibraryWindow* self); +static void _library_window_on_new_search_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self); +static void library_window_on_action_toggle (LibraryWindow* self, GAction* action, GVariant* value); +static void _library_window_on_action_toggle_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self); +static void library_window_on_display_basic_properties (LibraryWindow* self, GSimpleAction* action, GVariant* value); +static void _library_window_on_display_basic_properties_gsimple_action_change_state_callback (GSimpleAction* action, GVariant* value, gpointer self); +static void library_window_on_display_extended_properties (LibraryWindow* self, GSimpleAction* action, GVariant* value); +static void _library_window_on_display_extended_properties_gsimple_action_change_state_callback (GSimpleAction* action, GVariant* value, gpointer self); +static void library_window_on_display_searchbar (LibraryWindow* self, GSimpleAction* action, GVariant* value); +static void _library_window_on_display_searchbar_gsimple_action_change_state_callback (GSimpleAction* action, GVariant* value, gpointer self); +static void library_window_on_display_sidebar (LibraryWindow* self, GSimpleAction* action, GVariant* variant); +static void _library_window_on_display_sidebar_gsimple_action_change_state_callback (GSimpleAction* action, GVariant* value, gpointer self); +static void library_window_on_display_toolbar (LibraryWindow* self, GSimpleAction* action, GVariant* variant); +static void _library_window_on_display_toolbar_gsimple_action_change_state_callback (GSimpleAction* action, GVariant* value, gpointer self); +static void library_window_on_action_radio (LibraryWindow* self, GAction* action, GVariant* value); +static void _library_window_on_action_radio_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self); +static void library_window_on_events_sort_changed (LibraryWindow* self, GSimpleAction* action, GVariant* value); +static void _library_window_on_events_sort_changed_gsimple_action_change_state_callback (GSimpleAction* action, GVariant* value, gpointer self); LibraryWindow* library_window_new (ProgressMonitor progress_monitor, void* progress_monitor_target); LibraryWindow* library_window_construct (GType object_type, ProgressMonitor progress_monitor, void* progress_monitor_target); AppWindow* app_window_construct (GType object_type); @@ -1393,7 +1415,6 @@ OneShotScheduler* one_shot_scheduler_new (const gchar* name, OneShotCallback cal OneShotScheduler* one_shot_scheduler_construct (GType object_type, const gchar* name, OneShotCallback callback, void* callback_target); SearchFilterToolbar* search_filter_toolbar_new (SearchFilterActions* actions); SearchFilterToolbar* search_filter_toolbar_construct (GType object_type, SearchFilterActions* actions); -GFile* resources_get_ui (const gchar* filename); static void library_window_create_layout (LibraryWindow* self, Page* start_page); GType sidebar_simple_page_entry_get_type (void) G_GNUC_CONST; GType library_photos_entry_get_type (void) G_GNUC_CONST; @@ -1412,76 +1433,9 @@ static void library_window_on_library_monitor_auto_import_preparing (LibraryWind static void _library_window_on_library_monitor_auto_import_preparing_library_monitor_auto_import_preparing (LibraryMonitor* _sender, gpointer self); static void library_window_on_library_monitor_auto_import_progress (LibraryWindow* self, guint64 completed_bytes, guint64 total_bytes); static void _library_window_on_library_monitor_auto_import_progress_library_monitor_auto_import_progress (LibraryMonitor* _sender, guint64 completed_bytes, guint64 total_bytes, gpointer self); -static GtkActionEntry* library_window_create_common_actions (LibraryWindow* self, int* result_length1); -#define RESOURCES_IMPORT "shotwell-import" -#define TRANSLATABLE "translatable" -static void library_window_on_file_import (LibraryWindow* self); -static void _library_window_on_file_import_gtk_action_callback (GtkAction* action, gpointer self); -static void _vala_array_add61 (GtkActionEntry** array, int* length, int* size, const GtkActionEntry* value); -static void library_window_on_external_library_import (LibraryWindow* self); -static void _library_window_on_external_library_import_gtk_action_callback (GtkAction* action, gpointer self); -static void _vala_array_add62 (GtkActionEntry** array, int* length, int* size, const GtkActionEntry* value); -static void _vala_array_add63 (GtkActionEntry** array, int* length, int* size, const GtkActionEntry* value); -#define RESOURCES_PREFERENCES_LABEL _ ("_Preferences") -static void library_window_on_preferences (LibraryWindow* self); -static void _library_window_on_preferences_gtk_action_callback (GtkAction* action, gpointer self); -#define RESOURCES_PREFERENCES_MENU _ ("_Preferences") -static void _vala_array_add64 (GtkActionEntry** array, int* length, int* size, const GtkActionEntry* value); -static void library_window_on_empty_trash (LibraryWindow* self); -static void _library_window_on_empty_trash_gtk_action_callback (GtkAction* action, gpointer self); -static void _vala_array_add65 (GtkActionEntry** array, int* length, int* size, const GtkActionEntry* value); -static void library_window_on_jump_to_event (LibraryWindow* self); -static void _library_window_on_jump_to_event_gtk_action_callback (GtkAction* action, gpointer self); -static void _vala_array_add66 (GtkActionEntry** array, int* length, int* size, const GtkActionEntry* value); -static void library_window_on_find (LibraryWindow* self); -static void _library_window_on_find_gtk_action_callback (GtkAction* action, gpointer self); -static void _vala_array_add67 (GtkActionEntry** array, int* length, int* size, const GtkActionEntry* value); -#define RESOURCES_FILTER_PHOTOS_MENU _ ("_Filter Photos") -static void _vala_array_add68 (GtkActionEntry** array, int* length, int* size, const GtkActionEntry* value); -static void library_window_on_new_search (LibraryWindow* self); -static void _library_window_on_new_search_gtk_action_callback (GtkAction* action, gpointer self); -static void _vala_array_add69 (GtkActionEntry** array, int* length, int* size, const GtkActionEntry* value); -static void _vala_array_add70 (GtkActionEntry** array, int* length, int* size, const GtkActionEntry* value); -static void _vala_array_add71 (GtkActionEntry** array, int* length, int* size, const GtkActionEntry* value); -static void _vala_array_add72 (GtkActionEntry** array, int* length, int* size, const GtkActionEntry* value); -static void _vala_array_add73 (GtkActionEntry** array, int* length, int* size, const GtkActionEntry* value); -static void _vala_array_add74 (GtkActionEntry** array, int* length, int* size, const GtkActionEntry* value); -static void _vala_array_add75 (GtkActionEntry** array, int* length, int* size, const GtkActionEntry* value); -static void _vala_array_add76 (GtkActionEntry** array, int* length, int* size, const GtkActionEntry* value); -static void _vala_array_add77 (GtkActionEntry** array, int* length, int* size, const GtkActionEntry* value); -static GtkToggleActionEntry* library_window_create_common_toggle_actions (LibraryWindow* self, int* result_length1); -static void library_window_on_display_basic_properties (LibraryWindow* self, GtkAction* action); -static void _library_window_on_display_basic_properties_gtk_action_callback (GtkAction* action, gpointer self); -static void _vala_array_add78 (GtkToggleActionEntry** array, int* length, int* size, const GtkToggleActionEntry* value); -static void library_window_on_display_extended_properties (LibraryWindow* self, GtkAction* action); -static void _library_window_on_display_extended_properties_gtk_action_callback (GtkAction* action, gpointer self); -static void _vala_array_add79 (GtkToggleActionEntry** array, int* length, int* size, const GtkToggleActionEntry* value); -static void library_window_on_display_searchbar (LibraryWindow* self, GtkAction* action); -static void _library_window_on_display_searchbar_gtk_action_callback (GtkAction* action, gpointer self); -static void _vala_array_add80 (GtkToggleActionEntry** array, int* length, int* size, const GtkToggleActionEntry* value); -static void library_window_on_display_sidebar (LibraryWindow* self, GtkAction* action); -static void _library_window_on_display_sidebar_gtk_action_callback (GtkAction* action, gpointer self); -static gboolean library_window_is_sidebar_visible (LibraryWindow* self); -static void _vala_array_add81 (GtkToggleActionEntry** array, int* length, int* size, const GtkToggleActionEntry* value); -static void library_window_on_display_toolbar (LibraryWindow* self, GtkAction* action); -static void _library_window_on_display_toolbar_gtk_action_callback (GtkAction* action, gpointer self); -static gboolean library_window_is_toolbar_visible (LibraryWindow* self); -static void _vala_array_add82 (GtkToggleActionEntry** array, int* length, int* size, const GtkToggleActionEntry* value); -static void library_window_add_common_radio_actions (LibraryWindow* self, GtkActionGroup* group); -#define RESOURCES_SORT_ASCENDING_LABEL _ ("Sort _Ascending") -static void _vala_array_add83 (GtkRadioActionEntry** array, int* length, int* size, const GtkRadioActionEntry* value); -#define RESOURCES_SORT_DESCENDING_LABEL _ ("Sort _Descending") -static void _vala_array_add84 (GtkRadioActionEntry** array, int* length, int* size, const GtkRadioActionEntry* value); -static void library_window_on_events_sort_changed (LibraryWindow* self, GtkAction* action, GtkAction* c); -static void _library_window_on_events_sort_changed_gtk_radio_action_callback (GtkAction* action, GtkAction* current, gpointer self); -static GtkActionGroup** library_window_real_create_common_action_groups (AppWindow* base, int* result_length1); -GtkActionGroup** app_window_create_common_action_groups (AppWindow* self, int* result_length1); -#define RESOURCES_FIND_LABEL _ ("Find") -static void _vala_array_add85 (GtkActionGroup*** array, int* length, int* size, GtkActionGroup* value); -GtkActionGroup* search_filter_actions_get_action_group (SearchFilterActions* self); -static void _vala_array_add86 (GtkActionGroup*** array, int* length, int* size, GtkActionGroup* value); -static void library_window_real_replace_common_placeholders (AppWindow* base, GtkUIManager* ui); -void app_window_replace_common_placeholders (AppWindow* self, GtkUIManager* ui); +static void library_window_real_add_actions (AppWindow* base); +void app_window_add_actions (AppWindow* self); +GActionEntry* search_filter_actions_get_actions (SearchFilterActions* self, int* result_length1); static void library_window_real_switched_pages (PageWindow* base, Page* old_page, Page* new_page); void page_window_switched_pages (PageWindow* self, Page* old_page, Page* new_page); GType view_collection_get_type (void) G_GNUC_CONST; @@ -1501,14 +1455,15 @@ void search_filter_actions_monitor_page_contents (SearchFilterActions* self, Pag static void library_window_on_view_filter_refreshed (LibraryWindow* self); static void _library_window_on_view_filter_refreshed_view_filter_refresh (ViewFilter* _sender, gpointer self); gboolean view_collection_are_items_filtered_out (ViewCollection* self); -GtkAction* app_window_get_common_action (AppWindow* self, const gchar* name); +static GVariant* _variant_new1 (gboolean value); static void library_window_real_show_all (GtkWidget* base); -GtkAction* page_get_common_action (Page* self, const gchar* name, gboolean log_warning); +GAction* page_get_common_action (Page* self, const gchar* name, gboolean log_warning); GType checkerboard_page_get_type (void) G_GNUC_CONST; static void library_window_init_view_filter (LibraryWindow* self, CheckerboardPage* page); static void library_window_toggle_search_bar (LibraryWindow* self, gboolean show, CheckerboardPage* page); static gboolean library_window_should_show_search_bar (LibraryWindow* self); static void library_window_set_sidebar_visible (LibraryWindow* self, gboolean visible); +static gboolean library_window_is_sidebar_visible (LibraryWindow* self); LibraryWindow* library_window_get_app (void); gboolean library_window_is_mount_uri_supported (const gchar* uri); static gchar* library_window_real_get_app_role (AppWindow* base); @@ -1602,6 +1557,7 @@ void saved_search_dialog_show (SavedSearchDialog* self); DataSource* view_collection_get_selected_source_at (ViewCollection* self, gint index); Event* media_source_get_event (MediaSource* self); void library_window_switch_to_event (LibraryWindow* self, Event* event); +static GVariant* _variant_new2 (gboolean value); void search_filter_toolbar_take_focus (SearchFilterToolbar* self); static void library_window_on_clear_search (LibraryWindow* self); void search_filter_actions_reset (SearchFilterActions* self); @@ -1610,6 +1566,8 @@ void configuration_facade_set_events_sort_ascending (ConfigurationFacade* self, void preferences_dialog_show (void); void properties_update_properties (Properties* self, Page* page); void configuration_facade_set_display_basic_properties (ConfigurationFacade* self, gboolean display); +static gboolean _variant_get3 (GVariant* value); +static GVariant* _variant_new4 (gboolean value); void extended_properties_window_update_properties (ExtendedPropertiesWindow* self, Page* page); void configuration_facade_set_display_search_bar (ConfigurationFacade* self, gboolean display); void library_window_show_search_bar (LibraryWindow* self, gboolean display); @@ -1618,8 +1576,10 @@ gboolean configuration_facade_get_display_sidebar (ConfigurationFacade* self); static void library_window_set_toolbar_visible (LibraryWindow* self, gboolean visible); GtkToolbar* page_get_toolbar (Page* self); void configuration_facade_set_display_toolbar (ConfigurationFacade* self, gboolean display); +static gboolean library_window_is_toolbar_visible (LibraryWindow* self); gboolean configuration_facade_get_display_toolbar (ConfigurationFacade* self); static void library_window_sync_extended_properties (LibraryWindow* self, gboolean show); +static GVariant* _variant_new5 (gboolean value); void configuration_facade_set_display_extended_properties (ConfigurationFacade* self, gboolean display); GType batch_import_get_type (void) G_GNUC_CONST; void library_window_enqueue_batch_import (LibraryWindow* self, BatchImport* batch_import, gboolean allow_user_cancel); @@ -1688,9 +1648,13 @@ GType import_page_get_type (void) G_GNUC_CONST; gboolean import_page_unmount_camera (ImportPage* self, GMount* mount); static void library_window_remove_from_stack (LibraryWindow* self, Page* page); gboolean configuration_facade_get_display_basic_properties (ConfigurationFacade* self); +static GVariant* _variant_new6 (gboolean value); gboolean configuration_facade_get_display_extended_properties (ConfigurationFacade* self); +static GVariant* _variant_new7 (gboolean value); gboolean configuration_facade_get_display_search_bar (ConfigurationFacade* self); +static GVariant* _variant_new8 (gboolean value); gboolean configuration_facade_get_events_sort_ascending (ConfigurationFacade* self); +static GVariant* _variant_new9 (const gchar* value); static void library_window_start_pulse_background_progress_bar (LibraryWindow* self, const gchar* label, gint priority); static void library_window_stop_pulse_background_progress_bar (LibraryWindow* self, gint priority, gboolean clear); static void library_window_show_background_progress_bar (LibraryWindow* self); @@ -1703,6 +1667,7 @@ gint configuration_facade_get_sidebar_position (ConfigurationFacade* self); gint library_window_get_PAGE_MIN_WIDTH (void); static void library_window_real_set_current_page (PageWindow* base, Page* page); void library_window_set_page_switching_enabled (LibraryWindow* self, gboolean should_enable); +void application_set_menubar (GMenuModel* model); void page_switching_from (Page* self); void sidebar_tree_enable_editing (SidebarTree* self); void page_window_set_current_page (PageWindow* self, Page* page); @@ -1714,6 +1679,7 @@ gboolean sidebar_tree_place_cursor (SidebarTree* self, SidebarEntry* entry, gboo static void library_window_on_update_properties (LibraryWindow* self); static void library_window_subscribe_for_basic_information (LibraryWindow* self, Page* page); void page_switched_to (Page* self); +GMenuModel* page_get_menubar (Page* self); void page_ready (Page* self); GType search_view_filter_get_type (void) G_GNUC_CONST; void search_filter_toolbar_set_view_filter (SearchFilterToolbar* self, SearchViewFilter* search_filter); @@ -1767,88 +1733,89 @@ static gint _vala_array_length (gpointer array); static const gchar* LIBRARY_WINDOW_SUPPORTED_MOUNT_SCHEMES[3] = {"gphoto2:", "disk:", "file:"}; const GtkTargetEntry LIBRARY_WINDOW_DND_TARGET_ENTRIES[3] = {{"text/uri-list", (guint) GTK_TARGET_OTHER_APP, (guint) LIBRARY_WINDOW_TARGET_TYPE_URI_LIST}, {LIBRARY_WINDOW_MEDIA_LIST_MIME_TYPE, (guint) GTK_TARGET_SAME_APP, (guint) LIBRARY_WINDOW_TARGET_TYPE_MEDIA_LIST}, {LIBRARY_WINDOW_TAG_PATH_MIME_TYPE, (guint) GTK_TARGET_SAME_WIDGET, (guint) LIBRARY_WINDOW_TARGET_TYPE_TAG_PATH}}; +static const GActionEntry LIBRARY_WINDOW_common_actions[13] = {{"CommonFileImport", _library_window_on_file_import_gsimple_action_activate_callback}, {"ExternalLibraryImport", _library_window_on_external_library_import_gsimple_action_activate_callback}, {"CommonPreferences", _library_window_on_preferences_gsimple_action_activate_callback}, {"CommonEmptyTrash", _library_window_on_empty_trash_gsimple_action_activate_callback}, {"CommonJumpToEvent", _library_window_on_jump_to_event_gsimple_action_activate_callback}, {"CommonFind", _library_window_on_find_gsimple_action_activate_callback}, {"CommonNewSearch", _library_window_on_new_search_gsimple_action_activate_callback}, {"CommonDisplayBasicProperties", _library_window_on_action_toggle_gsimple_action_activate_callback, NULL, "false", _library_window_on_display_basic_properties_gsimple_action_change_state_callback}, {"CommonDisplayExtendedProperties", _library_window_on_action_toggle_gsimple_action_activate_callback, NULL, "false", _library_window_on_display_extended_properties_gsimple_action_change_state_callback}, {"CommonDisplaySearchbar", _library_window_on_action_toggle_gsimple_action_activate_callback, NULL, "false", _library_window_on_display_searchbar_gsimple_action_change_state_callback}, {"CommonDisplaySidebar", _library_window_on_action_toggle_gsimple_action_activate_callback, NULL, "true", _library_window_on_display_sidebar_gsimple_action_change_state_callback}, {"CommonDisplayToolbar", _library_window_on_action_toggle_gsimple_action_activate_callback, NULL, "true", _library_window_on_display_toolbar_gsimple_action_change_state_callback}, {"CommonSortEvents", _library_window_on_action_radio_gsimple_action_activate_callback, "s", "'ascending'", _library_window_on_events_sort_changed_gsimple_action_change_state_callback}}; static void _library_window_on_page_created_sidebar_tree_page_created (SidebarTree* _sender, SidebarPageRepresentative* entry, Page* page, gpointer self) { -#line 231 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 215 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" library_window_on_page_created ((LibraryWindow*) self, entry, page); -#line 1775 "LibraryWindow.c" +#line 1742 "LibraryWindow.c" } static void _library_window_on_destroying_page_sidebar_tree_destroying_page (SidebarTree* _sender, SidebarPageRepresentative* entry, Page* page, gpointer self) { -#line 232 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 216 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" library_window_on_destroying_page ((LibraryWindow*) self, entry, page); -#line 1782 "LibraryWindow.c" +#line 1749 "LibraryWindow.c" } static void _library_window_on_sidebar_entry_selected_sidebar_tree_entry_selected (SidebarTree* _sender, SidebarSelectableEntry* selectable, gpointer self) { -#line 233 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 217 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" library_window_on_sidebar_entry_selected ((LibraryWindow*) self, selectable); -#line 1789 "LibraryWindow.c" +#line 1756 "LibraryWindow.c" } static void _library_window_on_sidebar_selected_entry_removed_sidebar_tree_selected_entry_removed (SidebarTree* _sender, SidebarSelectableEntry* removed, gpointer self) { -#line 234 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 218 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" library_window_on_sidebar_selected_entry_removed ((LibraryWindow*) self, removed); -#line 1796 "LibraryWindow.c" +#line 1763 "LibraryWindow.c" } static void _library_window_hide_extended_properties_gtk_widget_hide (GtkWidget* _sender, gpointer self) { -#line 238 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 222 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" library_window_hide_extended_properties ((LibraryWindow*) self); -#line 1803 "LibraryWindow.c" +#line 1770 "LibraryWindow.c" } static void _library_window_show_extended_properties_gtk_widget_show (GtkWidget* _sender, gpointer self) { -#line 239 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 223 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" library_window_show_extended_properties ((LibraryWindow*) self); -#line 1810 "LibraryWindow.c" +#line 1777 "LibraryWindow.c" } static void _library_window_on_trashcan_contents_altered_media_source_collection_trashcan_contents_altered (MediaSourceCollection* _sender, GeeCollection* added, GeeCollection* removed, gpointer self) { -#line 242 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 226 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" library_window_on_trashcan_contents_altered ((LibraryWindow*) self); -#line 1817 "LibraryWindow.c" +#line 1784 "LibraryWindow.c" } static void _library_window_on_media_altered_data_collection_items_altered (DataCollection* _sender, GeeMap* items, gpointer self) { -#line 243 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 227 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" library_window_on_media_altered ((LibraryWindow*) self); -#line 1824 "LibraryWindow.c" +#line 1791 "LibraryWindow.c" } static void _library_window_on_metadata_writer_progress_metadata_writer_progress (MetadataWriter* _sender, guint completed, guint total, gpointer self) { -#line 246 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 230 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" library_window_on_metadata_writer_progress ((LibraryWindow*) self, completed, total); -#line 1831 "LibraryWindow.c" +#line 1798 "LibraryWindow.c" } static void _library_window_on_library_monitor_installed_library_monitor_pool_monitor_installed (LibraryMonitorPool* _sender, LibraryMonitor* monitor, gpointer self) { -#line 252 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 236 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" library_window_on_library_monitor_installed ((LibraryWindow*) self, monitor); -#line 1838 "LibraryWindow.c" +#line 1805 "LibraryWindow.c" } static void _library_window_on_library_monitor_destroyed_library_monitor_pool_monitor_destroyed (LibraryMonitorPool* _sender, LibraryMonitor* monitor, gpointer self) { -#line 253 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 237 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" library_window_on_library_monitor_destroyed ((LibraryWindow*) self, monitor); -#line 1845 "LibraryWindow.c" +#line 1812 "LibraryWindow.c" } static void _library_window_on_camera_added_camera_table_camera_added (CameraTable* _sender, DiscoveredCamera* camera, gpointer self) { -#line 255 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 239 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" library_window_on_camera_added ((LibraryWindow*) self, camera); -#line 1852 "LibraryWindow.c" +#line 1819 "LibraryWindow.c" } @@ -1876,24 +1843,122 @@ GType library_window_target_type_get_type (void) { } +static void _library_window_on_file_import_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self) { +#line 264 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" + library_window_on_file_import ((LibraryWindow*) self); +#line 1850 "LibraryWindow.c" +} + + +static void _library_window_on_external_library_import_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self) { +#line 264 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" + library_window_on_external_library_import ((LibraryWindow*) self); +#line 1857 "LibraryWindow.c" +} + + +static void _library_window_on_preferences_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self) { +#line 264 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" + library_window_on_preferences ((LibraryWindow*) self); +#line 1864 "LibraryWindow.c" +} + + +static void _library_window_on_empty_trash_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self) { +#line 264 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" + library_window_on_empty_trash ((LibraryWindow*) self); +#line 1871 "LibraryWindow.c" +} + + +static void _library_window_on_jump_to_event_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self) { +#line 264 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" + library_window_on_jump_to_event ((LibraryWindow*) self); +#line 1878 "LibraryWindow.c" +} + + +static void _library_window_on_find_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self) { +#line 264 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" + library_window_on_find ((LibraryWindow*) self); +#line 1885 "LibraryWindow.c" +} + + +static void _library_window_on_new_search_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self) { +#line 264 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" + library_window_on_new_search ((LibraryWindow*) self); +#line 1892 "LibraryWindow.c" +} + + +static void _library_window_on_action_toggle_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self) { +#line 264 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" + library_window_on_action_toggle ((LibraryWindow*) self, action, parameter); +#line 1899 "LibraryWindow.c" +} + + +static void _library_window_on_display_basic_properties_gsimple_action_change_state_callback (GSimpleAction* action, GVariant* value, gpointer self) { +#line 264 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" + library_window_on_display_basic_properties ((LibraryWindow*) self, action, value); +#line 1906 "LibraryWindow.c" +} + + +static void _library_window_on_display_extended_properties_gsimple_action_change_state_callback (GSimpleAction* action, GVariant* value, gpointer self) { +#line 264 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" + library_window_on_display_extended_properties ((LibraryWindow*) self, action, value); +#line 1913 "LibraryWindow.c" +} + + +static void _library_window_on_display_searchbar_gsimple_action_change_state_callback (GSimpleAction* action, GVariant* value, gpointer self) { +#line 264 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" + library_window_on_display_searchbar ((LibraryWindow*) self, action, value); +#line 1920 "LibraryWindow.c" +} + + +static void _library_window_on_display_sidebar_gsimple_action_change_state_callback (GSimpleAction* action, GVariant* value, gpointer self) { +#line 264 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" + library_window_on_display_sidebar ((LibraryWindow*) self, action, value); +#line 1927 "LibraryWindow.c" +} + + +static void _library_window_on_display_toolbar_gsimple_action_change_state_callback (GSimpleAction* action, GVariant* value, gpointer self) { +#line 264 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" + library_window_on_display_toolbar ((LibraryWindow*) self, action, value); +#line 1934 "LibraryWindow.c" +} + + +static void _library_window_on_action_radio_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self) { +#line 264 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" + library_window_on_action_radio ((LibraryWindow*) self, action, parameter); +#line 1941 "LibraryWindow.c" +} + + +static void _library_window_on_events_sort_changed_gsimple_action_change_state_callback (GSimpleAction* action, GVariant* value, gpointer self) { +#line 264 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" + library_window_on_events_sort_changed ((LibraryWindow*) self, action, value); +#line 1948 "LibraryWindow.c" +} + + static void _library_window_external_drop_handler_sidebar_tree_external_drop_handler (GdkDragContext* context, SidebarEntry* entry, GtkSelectionData* data, guint info, guint time, gpointer self) { -#line 153 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 151 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" library_window_external_drop_handler ((LibraryWindow*) self, context, entry, data, info, time); -#line 1883 "LibraryWindow.c" +#line 1955 "LibraryWindow.c" } static void _library_window_on_update_properties_now_one_shot_callback (gpointer self) { -#line 173 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 171 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" library_window_on_update_properties_now ((LibraryWindow*) self); -#line 1890 "LibraryWindow.c" -} - - -static gpointer _g_object_ref0 (gpointer self) { -#line 186 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - return self ? g_object_ref (self) : NULL; -#line 1897 "LibraryWindow.c" +#line 1962 "LibraryWindow.c" } @@ -1922,439 +1987,351 @@ LibraryWindow* library_window_construct (GType object_type, ProgressMonitor prog OneShotScheduler* _tmp20_ = NULL; SearchFilterActions* _tmp21_ = NULL; SearchFilterToolbar* _tmp22_ = NULL; - GtkMenuBar* menubar = NULL; - GtkUIManager* _tmp28_ = NULL; - GtkWidget* _tmp29_ = NULL; - GtkMenuBar* _tmp30_ = NULL; - GtkBox* _tmp31_ = NULL; - GtkMenuBar* _tmp32_ = NULL; - GtkMenuBar* _tmp33_ = NULL; - LibraryBranch* _tmp34_ = NULL; - LibraryPhotosEntry* _tmp35_ = NULL; - LibraryPhotosEntry* _tmp36_ = NULL; - Page* _tmp37_ = NULL; - Page* _tmp38_ = NULL; + LibraryBranch* _tmp23_ = NULL; + LibraryPhotosEntry* _tmp24_ = NULL; + LibraryPhotosEntry* _tmp25_ = NULL; + Page* _tmp26_ = NULL; + Page* _tmp27_ = NULL; GtkTargetEntry* main_window_dnd_targets = NULL; - GtkTargetEntry _tmp51_ = {0}; - GtkTargetEntry _tmp52_ = {0}; - GtkTargetEntry* _tmp53_ = NULL; + GtkTargetEntry _tmp40_ = {0}; + GtkTargetEntry _tmp41_ = {0}; + GtkTargetEntry* _tmp42_ = NULL; gint main_window_dnd_targets_length1 = 0; gint _main_window_dnd_targets_size_ = 0; - GtkTargetEntry* _tmp54_ = NULL; - gint _tmp54__length1 = 0; - MetadataWriter* _tmp55_ = NULL; - MetadataWriter* _tmp56_ = NULL; + GtkTargetEntry* _tmp43_ = NULL; + gint _tmp43__length1 = 0; + MetadataWriter* _tmp44_ = NULL; + MetadataWriter* _tmp45_ = NULL; LibraryMonitor* monitor = NULL; - LibraryMonitorPool* _tmp57_ = NULL; - LibraryMonitorPool* _tmp58_ = NULL; - LibraryMonitor* _tmp59_ = NULL; - LibraryMonitor* _tmp60_ = NULL; - LibraryMonitor* _tmp61_ = NULL; - LibraryMonitorPool* _tmp63_ = NULL; - LibraryMonitorPool* _tmp64_ = NULL; - LibraryMonitorPool* _tmp65_ = NULL; - LibraryMonitorPool* _tmp66_ = NULL; - CameraTable* _tmp67_ = NULL; - CameraTable* _tmp68_ = NULL; - GtkProgressBar* _tmp69_ = NULL; - GError * _inner_error_ = NULL; -#line 151 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" + LibraryMonitorPool* _tmp46_ = NULL; + LibraryMonitorPool* _tmp47_ = NULL; + LibraryMonitor* _tmp48_ = NULL; + LibraryMonitor* _tmp49_ = NULL; + LibraryMonitor* _tmp50_ = NULL; + LibraryMonitorPool* _tmp52_ = NULL; + LibraryMonitorPool* _tmp53_ = NULL; + LibraryMonitorPool* _tmp54_ = NULL; + LibraryMonitorPool* _tmp55_ = NULL; + CameraTable* _tmp56_ = NULL; + CameraTable* _tmp57_ = NULL; + GtkProgressBar* _tmp58_ = NULL; +#line 149 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" self = (LibraryWindow*) app_window_construct (object_type); -#line 153 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 151 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp0_ = sidebar_tree_new (LIBRARY_WINDOW_DND_TARGET_ENTRIES, G_N_ELEMENTS (LIBRARY_WINDOW_DND_TARGET_ENTRIES), GDK_ACTION_ASK, _library_window_external_drop_handler_sidebar_tree_external_drop_handler, self); -#line 153 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 151 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" g_object_ref_sink (_tmp0_); -#line 153 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 151 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _g_object_unref0 (self->priv->sidebar_tree); -#line 153 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 151 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" self->priv->sidebar_tree = _tmp0_; -#line 156 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 154 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp1_ = self->priv->sidebar_tree; -#line 156 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 154 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" g_signal_connect_object (_tmp1_, "page-created", (GCallback) _library_window_on_page_created_sidebar_tree_page_created, self, 0); -#line 157 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 155 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp2_ = self->priv->sidebar_tree; -#line 157 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 155 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" g_signal_connect_object (_tmp2_, "destroying-page", (GCallback) _library_window_on_destroying_page_sidebar_tree_destroying_page, self, 0); -#line 158 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 156 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp3_ = self->priv->sidebar_tree; -#line 158 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 156 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" g_signal_connect_object (_tmp3_, "entry-selected", (GCallback) _library_window_on_sidebar_entry_selected_sidebar_tree_entry_selected, self, 0); -#line 159 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 157 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp4_ = self->priv->sidebar_tree; -#line 159 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 157 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" g_signal_connect_object (_tmp4_, "selected-entry-removed", (GCallback) _library_window_on_sidebar_selected_entry_removed_sidebar_tree_selected_entry_removed, self, 0); -#line 161 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 159 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp5_ = self->priv->sidebar_tree; -#line 161 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 159 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp6_ = self->priv->library_branch; -#line 161 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 159 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" sidebar_tree_graft (_tmp5_, G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, SIDEBAR_TYPE_BRANCH, SidebarBranch), (gint) LIBRARY_WINDOW_SIDEBAR_ROOT_POSITION_LIBRARY); -#line 162 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 160 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp7_ = self->priv->sidebar_tree; -#line 162 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 160 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp8_ = self->priv->tags_branch; -#line 162 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 160 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" sidebar_tree_graft (_tmp7_, G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, SIDEBAR_TYPE_BRANCH, SidebarBranch), (gint) LIBRARY_WINDOW_SIDEBAR_ROOT_POSITION_TAGS); -#line 163 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 161 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp9_ = self->priv->sidebar_tree; -#line 163 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 161 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp10_ = self->priv->folders_branch; -#line 163 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 161 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" sidebar_tree_graft (_tmp9_, G_TYPE_CHECK_INSTANCE_CAST (_tmp10_, SIDEBAR_TYPE_BRANCH, SidebarBranch), (gint) LIBRARY_WINDOW_SIDEBAR_ROOT_POSITION_FOLDERS); -#line 164 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 162 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp11_ = self->priv->sidebar_tree; -#line 164 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 162 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp12_ = self->priv->events_branch; -#line 164 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 162 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" sidebar_tree_graft (_tmp11_, G_TYPE_CHECK_INSTANCE_CAST (_tmp12_, SIDEBAR_TYPE_BRANCH, SidebarBranch), (gint) LIBRARY_WINDOW_SIDEBAR_ROOT_POSITION_EVENTS); -#line 165 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 163 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp13_ = self->priv->sidebar_tree; -#line 165 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 163 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp14_ = self->priv->camera_branch; -#line 165 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 163 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" sidebar_tree_graft (_tmp13_, G_TYPE_CHECK_INSTANCE_CAST (_tmp14_, SIDEBAR_TYPE_BRANCH, SidebarBranch), (gint) LIBRARY_WINDOW_SIDEBAR_ROOT_POSITION_CAMERAS); -#line 166 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 164 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp15_ = self->priv->sidebar_tree; -#line 166 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 164 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp16_ = self->priv->saved_search_branch; -#line 166 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 164 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" sidebar_tree_graft (_tmp15_, G_TYPE_CHECK_INSTANCE_CAST (_tmp16_, SIDEBAR_TYPE_BRANCH, SidebarBranch), (gint) LIBRARY_WINDOW_SIDEBAR_ROOT_POSITION_SAVED_SEARCH); -#line 169 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 167 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp17_ = extended_properties_window_new (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_window_get_type (), GtkWindow)); -#line 169 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 167 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" g_object_ref_sink (_tmp17_); -#line 169 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 167 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _g_object_unref0 (self->priv->extended_properties); -#line 169 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 167 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" self->priv->extended_properties = _tmp17_; -#line 170 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 168 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp18_ = self->priv->extended_properties; -#line 170 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 168 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp18_, gtk_widget_get_type (), GtkWidget), "hide", (GCallback) _library_window_hide_extended_properties_gtk_widget_hide, self, 0); -#line 171 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 169 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp19_ = self->priv->extended_properties; -#line 171 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 169 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp19_, gtk_widget_get_type (), GtkWidget), "show", (GCallback) _library_window_show_extended_properties_gtk_widget_show, self, 0); -#line 173 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 171 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp20_ = one_shot_scheduler_new ("LibraryWindow properties", _library_window_on_update_properties_now_one_shot_callback, self); -#line 173 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 171 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _one_shot_scheduler_unref0 (self->priv->properties_scheduler); -#line 173 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 171 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" self->priv->properties_scheduler = _tmp20_; -#line 177 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 175 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp21_ = self->priv->search_actions; -#line 177 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 175 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp22_ = search_filter_toolbar_new (_tmp21_); -#line 177 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 175 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" g_object_ref_sink (_tmp22_); -#line 177 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 175 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _g_object_unref0 (self->priv->search_toolbar); -#line 177 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 175 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" self->priv->search_toolbar = _tmp22_; -#line 2056 "LibraryWindow.c" - { - GFile* ui_file = NULL; - GFile* _tmp23_ = NULL; - GtkUIManager* _tmp24_ = NULL; - gchar* _tmp25_ = NULL; - gchar* _tmp26_ = NULL; -#line 180 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp23_ = resources_get_ui ("top.ui"); -#line 180 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - ui_file = _tmp23_; -#line 181 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp24_ = G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE_WINDOW, PageWindow)->ui; +#line 178 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" + _tmp23_ = self->priv->library_branch; +#line 178 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" + _tmp24_ = library_branch_get_photos_entry (_tmp23_); +#line 178 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" + _tmp25_ = _tmp24_; +#line 178 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" + _tmp26_ = sidebar_page_representative_get_page (G_TYPE_CHECK_INSTANCE_CAST (_tmp25_, SIDEBAR_TYPE_PAGE_REPRESENTATIVE, SidebarPageRepresentative)); +#line 178 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" + _tmp27_ = _tmp26_; +#line 178 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" + library_window_create_layout (self, _tmp27_); +#line 178 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" + _g_object_unref0 (_tmp27_); #line 181 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp25_ = g_file_get_path (ui_file); -#line 181 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp26_ = _tmp25_; -#line 181 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - gtk_ui_manager_add_ui_from_file (_tmp24_, _tmp26_, &_inner_error_); -#line 181 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _g_free0 (_tmp26_); -#line 181 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 181 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _g_object_unref0 (ui_file); -#line 2081 "LibraryWindow.c" - goto __catch39_g_error; - } -#line 179 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _g_object_unref0 (ui_file); -#line 2086 "LibraryWindow.c" - } - goto __finally39; - __catch39_g_error: - { - GError* e = NULL; - const gchar* _tmp27_ = NULL; -#line 179 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - e = _inner_error_; -#line 179 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _inner_error_ = NULL; -#line 183 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp27_ = e->message; -#line 183 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - g_error ("LibraryWindow.vala:183: %s", _tmp27_); -#line 179 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _g_error_free0 (e); -#line 2103 "LibraryWindow.c" - } - __finally39: -#line 179 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 179 "/home/jens/Source/shotwell/src/library/LibraryWindow.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 179 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - g_clear_error (&_inner_error_); -#line 179 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - return NULL; -#line 2114 "LibraryWindow.c" - } -#line 186 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp28_ = G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE_WINDOW, PageWindow)->ui; -#line 186 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp29_ = gtk_ui_manager_get_widget (_tmp28_, "/MenuBar"); -#line 186 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp30_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp29_, gtk_menu_bar_get_type ()) ? ((GtkMenuBar*) _tmp29_) : NULL); -#line 186 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - menubar = _tmp30_; -#line 187 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp31_ = self->priv->layout; -#line 187 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp32_ = menubar; -#line 187 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - gtk_container_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp31_, gtk_container_get_type (), GtkContainer), G_TYPE_CHECK_INSTANCE_CAST (_tmp32_, gtk_widget_get_type (), GtkWidget)); -#line 191 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp33_ = menubar; -#line 191 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - gtk_widget_set_no_show_all (G_TYPE_CHECK_INSTANCE_CAST (_tmp33_, gtk_widget_get_type (), GtkWidget), TRUE); -#line 194 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp34_ = self->priv->library_branch; -#line 194 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp35_ = library_branch_get_photos_entry (_tmp34_); -#line 194 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp36_ = _tmp35_; -#line 194 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp37_ = sidebar_page_representative_get_page (G_TYPE_CHECK_INSTANCE_CAST (_tmp36_, SIDEBAR_TYPE_PAGE_REPRESENTATIVE, SidebarPageRepresentative)); -#line 194 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp38_ = _tmp37_; -#line 194 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - library_window_create_layout (self, _tmp38_); -#line 194 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _g_object_unref0 (_tmp38_); -#line 197 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" library_window_load_configuration (self); -#line 2150 "LibraryWindow.c" +#line 2129 "LibraryWindow.c" { GeeIterator* _media_sources_it = NULL; - MediaCollectionRegistry* _tmp39_ = NULL; - MediaCollectionRegistry* _tmp40_ = NULL; - GeeCollection* _tmp41_ = NULL; - GeeCollection* _tmp42_ = NULL; - GeeIterator* _tmp43_ = NULL; - GeeIterator* _tmp44_ = NULL; -#line 199 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp39_ = media_collection_registry_get_instance (); -#line 199 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp40_ = _tmp39_; -#line 199 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp41_ = media_collection_registry_get_all (_tmp40_); -#line 199 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp42_ = _tmp41_; -#line 199 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp43_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp42_, GEE_TYPE_ITERABLE, GeeIterable)); -#line 199 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp44_ = _tmp43_; -#line 199 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _g_object_unref0 (_tmp42_); -#line 199 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _media_collection_registry_unref0 (_tmp40_); -#line 199 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _media_sources_it = _tmp44_; -#line 199 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" + MediaCollectionRegistry* _tmp28_ = NULL; + MediaCollectionRegistry* _tmp29_ = NULL; + GeeCollection* _tmp30_ = NULL; + GeeCollection* _tmp31_ = NULL; + GeeIterator* _tmp32_ = NULL; + GeeIterator* _tmp33_ = NULL; +#line 183 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" + _tmp28_ = media_collection_registry_get_instance (); +#line 183 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" + _tmp29_ = _tmp28_; +#line 183 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" + _tmp30_ = media_collection_registry_get_all (_tmp29_); +#line 183 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" + _tmp31_ = _tmp30_; +#line 183 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" + _tmp32_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp31_, GEE_TYPE_ITERABLE, GeeIterable)); +#line 183 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" + _tmp33_ = _tmp32_; +#line 183 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" + _g_object_unref0 (_tmp31_); +#line 183 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" + _media_collection_registry_unref0 (_tmp29_); +#line 183 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" + _media_sources_it = _tmp33_; +#line 183 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" while (TRUE) { -#line 2179 "LibraryWindow.c" - GeeIterator* _tmp45_ = NULL; - gboolean _tmp46_ = FALSE; +#line 2158 "LibraryWindow.c" + GeeIterator* _tmp34_ = NULL; + gboolean _tmp35_ = FALSE; MediaSourceCollection* media_sources = NULL; - GeeIterator* _tmp47_ = NULL; - gpointer _tmp48_ = NULL; - MediaSourceCollection* _tmp49_ = NULL; - MediaSourceCollection* _tmp50_ = NULL; -#line 199 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp45_ = _media_sources_it; -#line 199 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp46_ = gee_iterator_next (_tmp45_); -#line 199 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - if (!_tmp46_) { -#line 199 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" + GeeIterator* _tmp36_ = NULL; + gpointer _tmp37_ = NULL; + MediaSourceCollection* _tmp38_ = NULL; + MediaSourceCollection* _tmp39_ = NULL; +#line 183 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" + _tmp34_ = _media_sources_it; +#line 183 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" + _tmp35_ = gee_iterator_next (_tmp34_); +#line 183 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" + if (!_tmp35_) { +#line 183 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" break; -#line 2195 "LibraryWindow.c" +#line 2174 "LibraryWindow.c" } +#line 183 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" + _tmp36_ = _media_sources_it; +#line 183 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" + _tmp37_ = gee_iterator_get (_tmp36_); +#line 183 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" + media_sources = (MediaSourceCollection*) _tmp37_; +#line 184 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" + _tmp38_ = media_sources; +#line 184 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" + g_signal_connect_object (_tmp38_, "trashcan-contents-altered", (GCallback) _library_window_on_trashcan_contents_altered_media_source_collection_trashcan_contents_altered, self, 0); +#line 185 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" + _tmp39_ = media_sources; +#line 185 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" + g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp39_, TYPE_DATA_COLLECTION, DataCollection), "items-altered", (GCallback) _library_window_on_media_altered_data_collection_items_altered, self, 0); +#line 183 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" + _data_collection_unref0 (media_sources); +#line 2192 "LibraryWindow.c" + } +#line 183 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" + _g_object_unref0 (_media_sources_it); +#line 2196 "LibraryWindow.c" + } +#line 190 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" + _tmp40_ = LIBRARY_WINDOW_DND_TARGET_ENTRIES[LIBRARY_WINDOW_TARGET_TYPE_URI_LIST]; +#line 190 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" + _tmp41_ = LIBRARY_WINDOW_DND_TARGET_ENTRIES[LIBRARY_WINDOW_TARGET_TYPE_MEDIA_LIST]; +#line 190 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" + _tmp42_ = g_new0 (GtkTargetEntry, 2); +#line 190 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" + _tmp42_[0] = _tmp40_; +#line 190 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" + _tmp42_[1] = _tmp41_; +#line 190 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" + main_window_dnd_targets = _tmp42_; +#line 190 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" + main_window_dnd_targets_length1 = 2; +#line 190 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" + _main_window_dnd_targets_size_ = main_window_dnd_targets_length1; +#line 196 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" + _tmp43_ = main_window_dnd_targets; +#line 196 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" + _tmp43__length1 = main_window_dnd_targets_length1; +#line 196 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" + gtk_drag_dest_set (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_widget_get_type (), GtkWidget), GTK_DEST_DEFAULT_ALL, _tmp43_, _tmp43__length1, (GDK_ACTION_COPY | GDK_ACTION_LINK) | GDK_ACTION_ASK); #line 199 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp47_ = _media_sources_it; + _tmp44_ = metadata_writer_get_instance (); #line 199 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp48_ = gee_iterator_get (_tmp47_); + _tmp45_ = _tmp44_; #line 199 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - media_sources = (MediaSourceCollection*) _tmp48_; -#line 200 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp49_ = media_sources; -#line 200 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - g_signal_connect_object (_tmp49_, "trashcan-contents-altered", (GCallback) _library_window_on_trashcan_contents_altered_media_source_collection_trashcan_contents_altered, self, 0); + g_signal_connect_object (_tmp45_, "progress", (GCallback) _library_window_on_metadata_writer_progress_metadata_writer_progress, self, 0); +#line 199 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" + _g_object_unref0 (_tmp45_); #line 201 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp50_ = media_sources; + _tmp46_ = library_monitor_pool_get_instance (); #line 201 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp50_, TYPE_DATA_COLLECTION, DataCollection), "items-altered", (GCallback) _library_window_on_media_altered_data_collection_items_altered, self, 0); -#line 199 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _data_collection_unref0 (media_sources); -#line 2213 "LibraryWindow.c" - } -#line 199 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _g_object_unref0 (_media_sources_it); -#line 2217 "LibraryWindow.c" - } -#line 206 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp51_ = LIBRARY_WINDOW_DND_TARGET_ENTRIES[LIBRARY_WINDOW_TARGET_TYPE_URI_LIST]; -#line 206 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp52_ = LIBRARY_WINDOW_DND_TARGET_ENTRIES[LIBRARY_WINDOW_TARGET_TYPE_MEDIA_LIST]; -#line 206 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp53_ = g_new0 (GtkTargetEntry, 2); -#line 206 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp53_[0] = _tmp51_; + _tmp47_ = _tmp46_; +#line 201 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" + _tmp48_ = library_monitor_pool_get_monitor (_tmp47_); +#line 201 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" + _tmp49_ = _tmp48_; +#line 201 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" + _library_monitor_pool_unref0 (_tmp47_); +#line 201 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" + monitor = _tmp49_; +#line 202 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" + _tmp50_ = monitor; +#line 202 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" + if (_tmp50_ != NULL) { +#line 2244 "LibraryWindow.c" + LibraryMonitor* _tmp51_ = NULL; +#line 203 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" + _tmp51_ = monitor; +#line 203 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" + library_window_on_library_monitor_installed (self, _tmp51_); +#line 2250 "LibraryWindow.c" + } +#line 205 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" + _tmp52_ = library_monitor_pool_get_instance (); +#line 205 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" + _tmp53_ = _tmp52_; +#line 205 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" + g_signal_connect_object (_tmp53_, "monitor-installed", (GCallback) _library_window_on_library_monitor_installed_library_monitor_pool_monitor_installed, self, 0); +#line 205 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" + _library_monitor_pool_unref0 (_tmp53_); #line 206 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp53_[1] = _tmp52_; + _tmp54_ = library_monitor_pool_get_instance (); #line 206 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - main_window_dnd_targets = _tmp53_; + _tmp55_ = _tmp54_; #line 206 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - main_window_dnd_targets_length1 = 2; + g_signal_connect_object (_tmp55_, "monitor-destroyed", (GCallback) _library_window_on_library_monitor_destroyed_library_monitor_pool_monitor_destroyed, self, 0); #line 206 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _main_window_dnd_targets_size_ = main_window_dnd_targets_length1; -#line 212 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp54_ = main_window_dnd_targets; -#line 212 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp54__length1 = main_window_dnd_targets_length1; -#line 212 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - gtk_drag_dest_set (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_widget_get_type (), GtkWidget), GTK_DEST_DEFAULT_ALL, _tmp54_, _tmp54__length1, (GDK_ACTION_COPY | GDK_ACTION_LINK) | GDK_ACTION_ASK); -#line 215 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp55_ = metadata_writer_get_instance (); -#line 215 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp56_ = _tmp55_; -#line 215 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - g_signal_connect_object (_tmp56_, "progress", (GCallback) _library_window_on_metadata_writer_progress_metadata_writer_progress, self, 0); -#line 215 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _g_object_unref0 (_tmp56_); -#line 217 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp57_ = library_monitor_pool_get_instance (); -#line 217 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp58_ = _tmp57_; -#line 217 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp59_ = library_monitor_pool_get_monitor (_tmp58_); -#line 217 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp60_ = _tmp59_; -#line 217 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _library_monitor_pool_unref0 (_tmp58_); -#line 217 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - monitor = _tmp60_; -#line 218 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp61_ = monitor; -#line 218 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - if (_tmp61_ != NULL) { -#line 2265 "LibraryWindow.c" - LibraryMonitor* _tmp62_ = NULL; -#line 219 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp62_ = monitor; -#line 219 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - library_window_on_library_monitor_installed (self, _tmp62_); -#line 2271 "LibraryWindow.c" - } -#line 221 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp63_ = library_monitor_pool_get_instance (); -#line 221 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp64_ = _tmp63_; -#line 221 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - g_signal_connect_object (_tmp64_, "monitor-installed", (GCallback) _library_window_on_library_monitor_installed_library_monitor_pool_monitor_installed, self, 0); -#line 221 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _library_monitor_pool_unref0 (_tmp64_); -#line 222 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp65_ = library_monitor_pool_get_instance (); -#line 222 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp66_ = _tmp65_; -#line 222 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - g_signal_connect_object (_tmp66_, "monitor-destroyed", (GCallback) _library_window_on_library_monitor_destroyed_library_monitor_pool_monitor_destroyed, self, 0); -#line 222 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _library_monitor_pool_unref0 (_tmp66_); -#line 224 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp67_ = camera_table_get_instance (); -#line 224 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp68_ = _tmp67_; -#line 224 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - g_signal_connect_object (_tmp68_, "camera-added", (GCallback) _library_window_on_camera_added_camera_table_camera_added, self, 0); -#line 224 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _camera_table_unref0 (_tmp68_); -#line 226 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp69_ = self->priv->background_progress_bar; -#line 226 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - gtk_progress_bar_set_show_text (_tmp69_, TRUE); -#line 151 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" + _library_monitor_pool_unref0 (_tmp55_); +#line 208 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" + _tmp56_ = camera_table_get_instance (); +#line 208 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" + _tmp57_ = _tmp56_; +#line 208 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" + g_signal_connect_object (_tmp57_, "camera-added", (GCallback) _library_window_on_camera_added_camera_table_camera_added, self, 0); +#line 208 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" + _camera_table_unref0 (_tmp57_); +#line 210 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" + _tmp58_ = self->priv->background_progress_bar; +#line 210 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" + gtk_progress_bar_set_show_text (_tmp58_, TRUE); +#line 149 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _g_object_unref0 (monitor); -#line 151 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 149 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" main_window_dnd_targets = (g_free (main_window_dnd_targets), NULL); -#line 151 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _g_object_unref0 (menubar); -#line 151 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 149 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" return self; -#line 2309 "LibraryWindow.c" +#line 2286 "LibraryWindow.c" } LibraryWindow* library_window_new (ProgressMonitor progress_monitor, void* progress_monitor_target) { -#line 151 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 149 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" return library_window_construct (TYPE_LIBRARY_WINDOW, progress_monitor, progress_monitor_target); -#line 2316 "LibraryWindow.c" +#line 2293 "LibraryWindow.c" } static void _library_window_on_library_monitor_discovery_started_directory_monitor_discovery_started (DirectoryMonitor* _sender, gpointer self) { -#line 261 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 245 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" library_window_on_library_monitor_discovery_started ((LibraryWindow*) self); -#line 2323 "LibraryWindow.c" +#line 2300 "LibraryWindow.c" } static void _library_window_on_library_monitor_discovery_completed_directory_monitor_discovery_completed (DirectoryMonitor* _sender, gpointer self) { -#line 262 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 246 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" library_window_on_library_monitor_discovery_completed ((LibraryWindow*) self); -#line 2330 "LibraryWindow.c" +#line 2307 "LibraryWindow.c" } static void _library_window_on_library_monitor_discovery_completed_directory_monitor_closed (DirectoryMonitor* _sender, gpointer self) { -#line 263 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 247 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" library_window_on_library_monitor_discovery_completed ((LibraryWindow*) self); -#line 2337 "LibraryWindow.c" +#line 2314 "LibraryWindow.c" } static void _library_window_on_library_monitor_auto_update_progress_library_monitor_auto_update_progress (LibraryMonitor* _sender, gint completed_files, gint total_files, gpointer self) { -#line 264 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 248 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" library_window_on_library_monitor_auto_update_progress ((LibraryWindow*) self, completed_files, total_files); -#line 2344 "LibraryWindow.c" +#line 2321 "LibraryWindow.c" } static void _library_window_on_library_monitor_auto_import_preparing_library_monitor_auto_import_preparing (LibraryMonitor* _sender, gpointer self) { -#line 265 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 249 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" library_window_on_library_monitor_auto_import_preparing ((LibraryWindow*) self); -#line 2351 "LibraryWindow.c" +#line 2328 "LibraryWindow.c" } static void _library_window_on_library_monitor_auto_import_progress_library_monitor_auto_import_progress (LibraryMonitor* _sender, guint64 completed_bytes, guint64 total_bytes, gpointer self) { -#line 266 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 250 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" library_window_on_library_monitor_auto_import_progress ((LibraryWindow*) self, completed_bytes, total_bytes); -#line 2358 "LibraryWindow.c" +#line 2335 "LibraryWindow.c" } @@ -2370,51 +2347,51 @@ static void library_window_on_library_monitor_installed (LibraryWindow* self, Li LibraryMonitor* _tmp8_ = NULL; LibraryMonitor* _tmp9_ = NULL; LibraryMonitor* _tmp10_ = NULL; -#line 258 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 242 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" g_return_if_fail (IS_LIBRARY_WINDOW (self)); -#line 258 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 242 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" g_return_if_fail (IS_LIBRARY_MONITOR (monitor)); -#line 259 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 243 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp0_ = monitor; -#line 259 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 243 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp1_ = directory_monitor_get_root (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, TYPE_DIRECTORY_MONITOR, DirectoryMonitor)); -#line 259 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 243 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp2_ = _tmp1_; -#line 259 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 243 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp3_ = g_file_get_path (_tmp2_); -#line 259 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 243 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp4_ = _tmp3_; -#line 259 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - g_debug ("LibraryWindow.vala:259: on_library_monitor_installed: %s", _tmp4_); -#line 259 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 243 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" + g_debug ("LibraryWindow.vala:243: on_library_monitor_installed: %s", _tmp4_); +#line 243 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _g_free0 (_tmp4_); -#line 259 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 243 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _g_object_unref0 (_tmp2_); -#line 261 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 245 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp5_ = monitor; -#line 261 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 245 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, TYPE_DIRECTORY_MONITOR, DirectoryMonitor), "discovery-started", (GCallback) _library_window_on_library_monitor_discovery_started_directory_monitor_discovery_started, self, 0); -#line 262 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 246 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp6_ = monitor; -#line 262 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 246 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, TYPE_DIRECTORY_MONITOR, DirectoryMonitor), "discovery-completed", (GCallback) _library_window_on_library_monitor_discovery_completed_directory_monitor_discovery_completed, self, 0); -#line 263 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 247 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp7_ = monitor; -#line 263 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 247 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, TYPE_DIRECTORY_MONITOR, DirectoryMonitor), "closed", (GCallback) _library_window_on_library_monitor_discovery_completed_directory_monitor_closed, self, 0); -#line 264 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 248 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp8_ = monitor; -#line 264 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 248 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" g_signal_connect_object (_tmp8_, "auto-update-progress", (GCallback) _library_window_on_library_monitor_auto_update_progress_library_monitor_auto_update_progress, self, 0); -#line 265 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 249 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp9_ = monitor; -#line 265 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 249 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" g_signal_connect_object (_tmp9_, "auto-import-preparing", (GCallback) _library_window_on_library_monitor_auto_import_preparing_library_monitor_auto_import_preparing, self, 0); -#line 266 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 250 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp10_ = monitor; -#line 266 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 250 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" g_signal_connect_object (_tmp10_, "auto-import-progress", (GCallback) _library_window_on_library_monitor_auto_import_progress_library_monitor_auto_import_progress, self, 0); -#line 2418 "LibraryWindow.c" +#line 2395 "LibraryWindow.c" } @@ -2436,1651 +2413,101 @@ static void library_window_on_library_monitor_destroyed (LibraryWindow* self, Li guint _tmp14_ = 0U; LibraryMonitor* _tmp15_ = NULL; guint _tmp16_ = 0U; -#line 269 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 253 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" g_return_if_fail (IS_LIBRARY_WINDOW (self)); -#line 269 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 253 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" g_return_if_fail (IS_LIBRARY_MONITOR (monitor)); -#line 270 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 254 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp0_ = monitor; -#line 270 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 254 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp1_ = directory_monitor_get_root (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, TYPE_DIRECTORY_MONITOR, DirectoryMonitor)); -#line 270 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 254 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp2_ = _tmp1_; -#line 270 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 254 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp3_ = g_file_get_path (_tmp2_); -#line 270 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 254 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp4_ = _tmp3_; -#line 270 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - g_debug ("LibraryWindow.vala:270: on_library_monitor_destroyed: %s", _tmp4_); -#line 270 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 254 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" + g_debug ("LibraryWindow.vala:254: on_library_monitor_destroyed: %s", _tmp4_); +#line 254 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _g_free0 (_tmp4_); -#line 270 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 254 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _g_object_unref0 (_tmp2_); -#line 272 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 256 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp5_ = monitor; -#line 272 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 256 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" g_signal_parse_name ("discovery-started", TYPE_DIRECTORY_MONITOR, &_tmp6_, NULL, FALSE); -#line 272 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 256 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" g_signal_handlers_disconnect_matched (G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, TYPE_DIRECTORY_MONITOR, DirectoryMonitor), G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp6_, 0, NULL, (GCallback) _library_window_on_library_monitor_discovery_started_directory_monitor_discovery_started, self); -#line 273 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 257 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp7_ = monitor; -#line 273 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 257 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" g_signal_parse_name ("discovery-completed", TYPE_DIRECTORY_MONITOR, &_tmp8_, NULL, FALSE); -#line 273 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 257 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" g_signal_handlers_disconnect_matched (G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, TYPE_DIRECTORY_MONITOR, DirectoryMonitor), G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp8_, 0, NULL, (GCallback) _library_window_on_library_monitor_discovery_completed_directory_monitor_discovery_completed, self); -#line 274 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 258 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp9_ = monitor; -#line 274 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 258 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" g_signal_parse_name ("closed", TYPE_DIRECTORY_MONITOR, &_tmp10_, NULL, FALSE); -#line 274 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 258 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" g_signal_handlers_disconnect_matched (G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, TYPE_DIRECTORY_MONITOR, DirectoryMonitor), G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp10_, 0, NULL, (GCallback) _library_window_on_library_monitor_discovery_completed_directory_monitor_closed, self); -#line 275 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 259 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp11_ = monitor; -#line 275 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 259 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" g_signal_parse_name ("auto-update-progress", TYPE_LIBRARY_MONITOR, &_tmp12_, NULL, FALSE); -#line 275 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 259 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" g_signal_handlers_disconnect_matched (_tmp11_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp12_, 0, NULL, (GCallback) _library_window_on_library_monitor_auto_update_progress_library_monitor_auto_update_progress, self); -#line 276 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 260 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp13_ = monitor; -#line 276 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 260 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" g_signal_parse_name ("auto-import-preparing", TYPE_LIBRARY_MONITOR, &_tmp14_, NULL, FALSE); -#line 276 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 260 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" g_signal_handlers_disconnect_matched (_tmp13_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp14_, 0, NULL, (GCallback) _library_window_on_library_monitor_auto_import_preparing_library_monitor_auto_import_preparing, self); -#line 277 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 261 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp15_ = monitor; -#line 277 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 261 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" g_signal_parse_name ("auto-import-progress", TYPE_LIBRARY_MONITOR, &_tmp16_, NULL, FALSE); -#line 277 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 261 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" g_signal_handlers_disconnect_matched (_tmp15_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp16_, 0, NULL, (GCallback) _library_window_on_library_monitor_auto_import_progress_library_monitor_auto_import_progress, self); -#line 2496 "LibraryWindow.c" -} - - -static void _library_window_on_file_import_gtk_action_callback (GtkAction* action, gpointer self) { -#line 283 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - library_window_on_file_import ((LibraryWindow*) self); -#line 2503 "LibraryWindow.c" -} - - -static void _vala_array_add61 (GtkActionEntry** array, int* length, int* size, const GtkActionEntry* value) { -#line 287 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - if ((*length) == (*size)) { -#line 287 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - *size = (*size) ? (2 * (*size)) : 4; -#line 287 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - *array = g_renew (GtkActionEntry, *array, *size); -#line 2514 "LibraryWindow.c" - } -#line 287 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - (*array)[(*length)++] = *value; -#line 2518 "LibraryWindow.c" -} - - -static void _library_window_on_external_library_import_gtk_action_callback (GtkAction* action, gpointer self) { -#line 289 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - library_window_on_external_library_import ((LibraryWindow*) self); -#line 2525 "LibraryWindow.c" +#line 2473 "LibraryWindow.c" } -static void _vala_array_add62 (GtkActionEntry** array, int* length, int* size, const GtkActionEntry* value) { -#line 294 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - if ((*length) == (*size)) { -#line 294 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - *size = (*size) ? (2 * (*size)) : 4; -#line 294 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - *array = g_renew (GtkActionEntry, *array, *size); -#line 2536 "LibraryWindow.c" - } -#line 294 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - (*array)[(*length)++] = *value; -#line 2540 "LibraryWindow.c" -} - - -static void _vala_array_add63 (GtkActionEntry** array, int* length, int* size, const GtkActionEntry* value) { -#line 298 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - if ((*length) == (*size)) { -#line 298 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - *size = (*size) ? (2 * (*size)) : 4; -#line 298 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - *array = g_renew (GtkActionEntry, *array, *size); -#line 2551 "LibraryWindow.c" - } -#line 298 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - (*array)[(*length)++] = *value; -#line 2555 "LibraryWindow.c" -} - - -static void _library_window_on_preferences_gtk_action_callback (GtkAction* action, gpointer self) { -#line 300 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - library_window_on_preferences ((LibraryWindow*) self); -#line 2562 "LibraryWindow.c" -} - - -static void _vala_array_add64 (GtkActionEntry** array, int* length, int* size, const GtkActionEntry* value) { -#line 303 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - if ((*length) == (*size)) { -#line 303 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - *size = (*size) ? (2 * (*size)) : 4; -#line 303 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - *array = g_renew (GtkActionEntry, *array, *size); -#line 2573 "LibraryWindow.c" - } -#line 303 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - (*array)[(*length)++] = *value; -#line 2577 "LibraryWindow.c" -} - - -static void _library_window_on_empty_trash_gtk_action_callback (GtkAction* action, gpointer self) { -#line 305 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - library_window_on_empty_trash ((LibraryWindow*) self); -#line 2584 "LibraryWindow.c" -} - - -static void _vala_array_add65 (GtkActionEntry** array, int* length, int* size, const GtkActionEntry* value) { -#line 309 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - if ((*length) == (*size)) { -#line 309 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - *size = (*size) ? (2 * (*size)) : 4; -#line 309 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - *array = g_renew (GtkActionEntry, *array, *size); -#line 2595 "LibraryWindow.c" - } -#line 309 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - (*array)[(*length)++] = *value; -#line 2599 "LibraryWindow.c" -} - - -static void _library_window_on_jump_to_event_gtk_action_callback (GtkAction* action, gpointer self) { -#line 311 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - library_window_on_jump_to_event ((LibraryWindow*) self); -#line 2606 "LibraryWindow.c" -} - - -static void _vala_array_add66 (GtkActionEntry** array, int* length, int* size, const GtkActionEntry* value) { -#line 314 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - if ((*length) == (*size)) { -#line 314 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - *size = (*size) ? (2 * (*size)) : 4; -#line 314 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - *array = g_renew (GtkActionEntry, *array, *size); -#line 2617 "LibraryWindow.c" - } -#line 314 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - (*array)[(*length)++] = *value; -#line 2621 "LibraryWindow.c" -} - - -static void _library_window_on_find_gtk_action_callback (GtkAction* action, gpointer self) { -#line 316 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - library_window_on_find ((LibraryWindow*) self); -#line 2628 "LibraryWindow.c" -} - - -static void _vala_array_add67 (GtkActionEntry** array, int* length, int* size, const GtkActionEntry* value) { -#line 319 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - if ((*length) == (*size)) { -#line 319 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - *size = (*size) ? (2 * (*size)) : 4; -#line 319 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - *array = g_renew (GtkActionEntry, *array, *size); -#line 2639 "LibraryWindow.c" - } -#line 319 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - (*array)[(*length)++] = *value; -#line 2643 "LibraryWindow.c" -} - - -static void _vala_array_add68 (GtkActionEntry** array, int* length, int* size, const GtkActionEntry* value) { -#line 325 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - if ((*length) == (*size)) { -#line 325 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - *size = (*size) ? (2 * (*size)) : 4; -#line 325 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - *array = g_renew (GtkActionEntry, *array, *size); -#line 2654 "LibraryWindow.c" - } -#line 325 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - (*array)[(*length)++] = *value; -#line 2658 "LibraryWindow.c" -} - - -static void _library_window_on_new_search_gtk_action_callback (GtkAction* action, gpointer self) { -#line 327 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - library_window_on_new_search ((LibraryWindow*) self); -#line 2665 "LibraryWindow.c" -} - - -static void _vala_array_add69 (GtkActionEntry** array, int* length, int* size, const GtkActionEntry* value) { -#line 330 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - if ((*length) == (*size)) { -#line 330 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - *size = (*size) ? (2 * (*size)) : 4; -#line 330 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - *array = g_renew (GtkActionEntry, *array, *size); -#line 2676 "LibraryWindow.c" - } -#line 330 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - (*array)[(*length)++] = *value; -#line 2680 "LibraryWindow.c" -} - - -static void _vala_array_add70 (GtkActionEntry** array, int* length, int* size, const GtkActionEntry* value) { -#line 336 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - if ((*length) == (*size)) { -#line 336 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - *size = (*size) ? (2 * (*size)) : 4; -#line 336 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - *array = g_renew (GtkActionEntry, *array, *size); -#line 2691 "LibraryWindow.c" - } -#line 336 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - (*array)[(*length)++] = *value; -#line 2695 "LibraryWindow.c" -} - - -static void _vala_array_add71 (GtkActionEntry** array, int* length, int* size, const GtkActionEntry* value) { -#line 340 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - if ((*length) == (*size)) { -#line 340 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - *size = (*size) ? (2 * (*size)) : 4; -#line 340 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - *array = g_renew (GtkActionEntry, *array, *size); -#line 2706 "LibraryWindow.c" - } -#line 340 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - (*array)[(*length)++] = *value; -#line 2710 "LibraryWindow.c" -} - - -static void _vala_array_add72 (GtkActionEntry** array, int* length, int* size, const GtkActionEntry* value) { -#line 344 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - if ((*length) == (*size)) { -#line 344 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - *size = (*size) ? (2 * (*size)) : 4; -#line 344 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - *array = g_renew (GtkActionEntry, *array, *size); -#line 2721 "LibraryWindow.c" - } -#line 344 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - (*array)[(*length)++] = *value; -#line 2725 "LibraryWindow.c" -} - - -static void _vala_array_add73 (GtkActionEntry** array, int* length, int* size, const GtkActionEntry* value) { -#line 348 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - if ((*length) == (*size)) { -#line 348 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - *size = (*size) ? (2 * (*size)) : 4; -#line 348 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - *array = g_renew (GtkActionEntry, *array, *size); -#line 2736 "LibraryWindow.c" - } -#line 348 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - (*array)[(*length)++] = *value; -#line 2740 "LibraryWindow.c" -} - - -static void _vala_array_add74 (GtkActionEntry** array, int* length, int* size, const GtkActionEntry* value) { -#line 352 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - if ((*length) == (*size)) { -#line 352 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - *size = (*size) ? (2 * (*size)) : 4; -#line 352 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - *array = g_renew (GtkActionEntry, *array, *size); -#line 2751 "LibraryWindow.c" - } -#line 352 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - (*array)[(*length)++] = *value; -#line 2755 "LibraryWindow.c" -} - - -static void _vala_array_add75 (GtkActionEntry** array, int* length, int* size, const GtkActionEntry* value) { -#line 356 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - if ((*length) == (*size)) { -#line 356 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - *size = (*size) ? (2 * (*size)) : 4; -#line 356 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - *array = g_renew (GtkActionEntry, *array, *size); -#line 2766 "LibraryWindow.c" - } -#line 356 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - (*array)[(*length)++] = *value; -#line 2770 "LibraryWindow.c" -} - - -static void _vala_array_add76 (GtkActionEntry** array, int* length, int* size, const GtkActionEntry* value) { -#line 360 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - if ((*length) == (*size)) { -#line 360 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - *size = (*size) ? (2 * (*size)) : 4; -#line 360 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - *array = g_renew (GtkActionEntry, *array, *size); -#line 2781 "LibraryWindow.c" - } -#line 360 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - (*array)[(*length)++] = *value; -#line 2785 "LibraryWindow.c" -} - - -static void _vala_array_add77 (GtkActionEntry** array, int* length, int* size, const GtkActionEntry* value) { -#line 364 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - if ((*length) == (*size)) { -#line 364 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - *size = (*size) ? (2 * (*size)) : 4; -#line 364 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - *array = g_renew (GtkActionEntry, *array, *size); -#line 2796 "LibraryWindow.c" - } -#line 364 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - (*array)[(*length)++] = *value; -#line 2800 "LibraryWindow.c" -} - - -static GtkActionEntry* library_window_create_common_actions (LibraryWindow* self, int* result_length1) { - GtkActionEntry* result = NULL; - GtkActionEntry* actions = NULL; - GtkActionEntry* _tmp0_ = NULL; - gint actions_length1 = 0; - gint _actions_size_ = 0; - GtkActionEntry import = {0}; - GtkActionEntry _tmp1_ = {0}; - const gchar* _tmp2_ = NULL; - const gchar* _tmp3_ = NULL; - GtkActionEntry* _tmp4_ = NULL; - gint _tmp4__length1 = 0; - GtkActionEntry _tmp5_ = {0}; - GtkActionEntry import_from_external = {0}; - GtkActionEntry _tmp6_ = {0}; - const gchar* _tmp7_ = NULL; - GtkActionEntry* _tmp8_ = NULL; - gint _tmp8__length1 = 0; - GtkActionEntry _tmp9_ = {0}; - GtkActionEntry sort = {0}; - GtkActionEntry _tmp10_ = {0}; - const gchar* _tmp11_ = NULL; - GtkActionEntry* _tmp12_ = NULL; - gint _tmp12__length1 = 0; - GtkActionEntry _tmp13_ = {0}; - GtkActionEntry preferences = {0}; - GtkActionEntry _tmp14_ = {0}; - GtkActionEntry* _tmp15_ = NULL; - gint _tmp15__length1 = 0; - GtkActionEntry _tmp16_ = {0}; - GtkActionEntry empty = {0}; - GtkActionEntry _tmp17_ = {0}; - const gchar* _tmp18_ = NULL; - const gchar* _tmp19_ = NULL; - GtkActionEntry* _tmp20_ = NULL; - gint _tmp20__length1 = 0; - GtkActionEntry _tmp21_ = {0}; - GtkActionEntry jump_to_event = {0}; - GtkActionEntry _tmp22_ = {0}; - const gchar* _tmp23_ = NULL; - GtkActionEntry* _tmp24_ = NULL; - gint _tmp24__length1 = 0; - GtkActionEntry _tmp25_ = {0}; - GtkActionEntry find = {0}; - GtkActionEntry _tmp26_ = {0}; - const gchar* _tmp27_ = NULL; - const gchar* _tmp28_ = NULL; - GtkActionEntry* _tmp29_ = NULL; - gint _tmp29__length1 = 0; - GtkActionEntry _tmp30_ = {0}; - GtkActionEntry filter_photos = {0}; - GtkActionEntry _tmp31_ = {0}; - GtkActionEntry* _tmp32_ = NULL; - gint _tmp32__length1 = 0; - GtkActionEntry _tmp33_ = {0}; - GtkActionEntry new_search = {0}; - GtkActionEntry _tmp34_ = {0}; - const gchar* _tmp35_ = NULL; - GtkActionEntry* _tmp36_ = NULL; - gint _tmp36__length1 = 0; - GtkActionEntry _tmp37_ = {0}; - GtkActionEntry file = {0}; - GtkActionEntry _tmp38_ = {0}; - const gchar* _tmp39_ = NULL; - GtkActionEntry* _tmp40_ = NULL; - gint _tmp40__length1 = 0; - GtkActionEntry _tmp41_ = {0}; - GtkActionEntry edit = {0}; - GtkActionEntry _tmp42_ = {0}; - const gchar* _tmp43_ = NULL; - GtkActionEntry* _tmp44_ = NULL; - gint _tmp44__length1 = 0; - GtkActionEntry _tmp45_ = {0}; - GtkActionEntry view = {0}; - GtkActionEntry _tmp46_ = {0}; - const gchar* _tmp47_ = NULL; - GtkActionEntry* _tmp48_ = NULL; - gint _tmp48__length1 = 0; - GtkActionEntry _tmp49_ = {0}; - GtkActionEntry photo = {0}; - GtkActionEntry _tmp50_ = {0}; - const gchar* _tmp51_ = NULL; - GtkActionEntry* _tmp52_ = NULL; - gint _tmp52__length1 = 0; - GtkActionEntry _tmp53_ = {0}; - GtkActionEntry photos = {0}; - GtkActionEntry _tmp54_ = {0}; - const gchar* _tmp55_ = NULL; - GtkActionEntry* _tmp56_ = NULL; - gint _tmp56__length1 = 0; - GtkActionEntry _tmp57_ = {0}; - GtkActionEntry event = {0}; - GtkActionEntry _tmp58_ = {0}; - const gchar* _tmp59_ = NULL; - GtkActionEntry* _tmp60_ = NULL; - gint _tmp60__length1 = 0; - GtkActionEntry _tmp61_ = {0}; - GtkActionEntry tags = {0}; - GtkActionEntry _tmp62_ = {0}; - const gchar* _tmp63_ = NULL; - GtkActionEntry* _tmp64_ = NULL; - gint _tmp64__length1 = 0; - GtkActionEntry _tmp65_ = {0}; - GtkActionEntry help = {0}; - GtkActionEntry _tmp66_ = {0}; - const gchar* _tmp67_ = NULL; - GtkActionEntry* _tmp68_ = NULL; - gint _tmp68__length1 = 0; - GtkActionEntry _tmp69_ = {0}; - GtkActionEntry* _tmp70_ = NULL; - gint _tmp70__length1 = 0; -#line 280 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - g_return_val_if_fail (IS_LIBRARY_WINDOW (self), NULL); -#line 281 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp0_ = g_new0 (GtkActionEntry, 0); -#line 281 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - actions = _tmp0_; -#line 281 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - actions_length1 = 0; -#line 281 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _actions_size_ = actions_length1; -#line 283 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp1_.name = "CommonFileImport"; -#line 283 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp1_.stock_id = RESOURCES_IMPORT; -#line 283 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp1_.label = TRANSLATABLE; -#line 283 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp1_.accelerator = "<Ctrl>I"; -#line 283 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp1_.tooltip = TRANSLATABLE; -#line 283 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp1_.callback = (GCallback) _library_window_on_file_import_gtk_action_callback; -#line 283 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - import = _tmp1_; -#line 285 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp2_ = _ ("_Import From Folder…"); -#line 285 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - import.label = _tmp2_; -#line 286 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp3_ = _ ("Import photos from disk to library"); -#line 286 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - import.tooltip = _tmp3_; -#line 287 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp4_ = actions; -#line 287 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp4__length1 = actions_length1; -#line 287 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp5_ = import; -#line 287 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _vala_array_add61 (&actions, &actions_length1, &_actions_size_, &_tmp5_); -#line 289 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp6_.name = "ExternalLibraryImport"; -#line 289 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp6_.stock_id = RESOURCES_IMPORT; -#line 289 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp6_.label = TRANSLATABLE; -#line 289 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp6_.accelerator = NULL; -#line 289 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp6_.tooltip = TRANSLATABLE; -#line 289 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp6_.callback = (GCallback) _library_window_on_external_library_import_gtk_action_callback; -#line 289 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - import_from_external = _tmp6_; -#line 293 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp7_ = _ ("Import From _Application…"); -#line 293 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - import_from_external.label = _tmp7_; -#line 294 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp8_ = actions; -#line 294 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp8__length1 = actions_length1; -#line 294 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp9_ = import_from_external; -#line 294 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _vala_array_add62 (&actions, &actions_length1, &_actions_size_, &_tmp9_); -#line 296 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp10_.name = "CommonSortEvents"; -#line 296 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp10_.stock_id = NULL; -#line 296 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp10_.label = TRANSLATABLE; -#line 296 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp10_.accelerator = NULL; -#line 296 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp10_.tooltip = NULL; -#line 296 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp10_.callback = (GCallback) NULL; -#line 296 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - sort = _tmp10_; -#line 297 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp11_ = _ ("Sort _Events"); -#line 297 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - sort.label = _tmp11_; -#line 298 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp12_ = actions; -#line 298 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp12__length1 = actions_length1; -#line 298 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp13_ = sort; -#line 298 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _vala_array_add63 (&actions, &actions_length1, &_actions_size_, &_tmp13_); -#line 300 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp14_.name = "CommonPreferences"; -#line 300 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp14_.stock_id = RESOURCES_PREFERENCES_LABEL; -#line 300 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp14_.label = TRANSLATABLE; -#line 300 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp14_.accelerator = NULL; -#line 300 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp14_.tooltip = TRANSLATABLE; -#line 300 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp14_.callback = (GCallback) _library_window_on_preferences_gtk_action_callback; -#line 300 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - preferences = _tmp14_; -#line 302 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - preferences.label = RESOURCES_PREFERENCES_MENU; -#line 303 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp15_ = actions; -#line 303 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp15__length1 = actions_length1; -#line 303 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp16_ = preferences; -#line 303 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _vala_array_add64 (&actions, &actions_length1, &_actions_size_, &_tmp16_); -#line 305 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp17_.name = "CommonEmptyTrash"; -#line 305 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp17_.stock_id = NULL; -#line 305 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp17_.label = TRANSLATABLE; -#line 305 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp17_.accelerator = NULL; -#line 305 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp17_.tooltip = NULL; -#line 305 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp17_.callback = (GCallback) _library_window_on_empty_trash_gtk_action_callback; -#line 305 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - empty = _tmp17_; -#line 307 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp18_ = _ ("Empty T_rash"); -#line 307 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - empty.label = _tmp18_; -#line 308 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp19_ = _ ("Delete all photos in the trash"); -#line 308 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - empty.tooltip = _tmp19_; -#line 309 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp20_ = actions; -#line 309 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp20__length1 = actions_length1; -#line 309 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp21_ = empty; -#line 309 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _vala_array_add65 (&actions, &actions_length1, &_actions_size_, &_tmp21_); -#line 311 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp22_.name = "CommonJumpToEvent"; -#line 311 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp22_.stock_id = NULL; -#line 311 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp22_.label = TRANSLATABLE; -#line 311 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp22_.accelerator = NULL; -#line 311 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp22_.tooltip = TRANSLATABLE; -#line 311 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp22_.callback = (GCallback) _library_window_on_jump_to_event_gtk_action_callback; -#line 311 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - jump_to_event = _tmp22_; -#line 313 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp23_ = _ ("View Eve_nt for Photo"); -#line 313 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - jump_to_event.label = _tmp23_; -#line 314 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp24_ = actions; -#line 314 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp24__length1 = actions_length1; -#line 314 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp25_ = jump_to_event; -#line 314 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _vala_array_add66 (&actions, &actions_length1, &_actions_size_, &_tmp25_); -#line 316 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp26_.name = "CommonFind"; -#line 316 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp26_.stock_id = NULL; -#line 316 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp26_.label = TRANSLATABLE; -#line 316 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp26_.accelerator = NULL; -#line 316 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp26_.tooltip = NULL; -#line 316 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp26_.callback = (GCallback) _library_window_on_find_gtk_action_callback; -#line 316 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - find = _tmp26_; -#line 317 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp27_ = _ ("_Find"); -#line 317 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - find.label = _tmp27_; -#line 318 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp28_ = _ ("Find photos and videos by search criteria"); -#line 318 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - find.tooltip = _tmp28_; -#line 319 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp29_ = actions; -#line 319 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp29__length1 = actions_length1; -#line 319 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp30_ = find; -#line 319 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _vala_array_add67 (&actions, &actions_length1, &_actions_size_, &_tmp30_); -#line 323 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp31_.name = "CommonFilterPhotos"; -#line 323 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp31_.stock_id = NULL; -#line 323 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp31_.label = TRANSLATABLE; -#line 323 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp31_.accelerator = NULL; -#line 323 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp31_.tooltip = NULL; -#line 323 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp31_.callback = (GCallback) NULL; -#line 323 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - filter_photos = _tmp31_; -#line 324 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - filter_photos.label = RESOURCES_FILTER_PHOTOS_MENU; -#line 325 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp32_ = actions; -#line 325 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp32__length1 = actions_length1; -#line 325 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp33_ = filter_photos; -#line 325 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _vala_array_add68 (&actions, &actions_length1, &_actions_size_, &_tmp33_); -#line 327 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp34_.name = "CommonNewSearch"; -#line 327 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp34_.stock_id = NULL; -#line 327 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp34_.label = TRANSLATABLE; -#line 327 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp34_.accelerator = "<Ctrl>S"; -#line 327 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp34_.tooltip = NULL; -#line 327 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp34_.callback = (GCallback) _library_window_on_new_search_gtk_action_callback; -#line 327 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - new_search = _tmp34_; -#line 329 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp35_ = _ ("Ne_w Saved Search…"); -#line 329 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - new_search.label = _tmp35_; -#line 330 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp36_ = actions; -#line 330 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp36__length1 = actions_length1; -#line 330 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp37_ = new_search; -#line 330 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _vala_array_add69 (&actions, &actions_length1, &_actions_size_, &_tmp37_); -#line 334 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp38_.name = "FileMenu"; -#line 334 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp38_.stock_id = NULL; -#line 334 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp38_.label = TRANSLATABLE; -#line 334 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp38_.accelerator = NULL; -#line 334 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp38_.tooltip = NULL; -#line 334 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp38_.callback = (GCallback) NULL; -#line 334 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - file = _tmp38_; -#line 335 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp39_ = _ ("_File"); -#line 335 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - file.label = _tmp39_; -#line 336 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp40_ = actions; -#line 336 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp40__length1 = actions_length1; -#line 336 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp41_ = file; -#line 336 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _vala_array_add70 (&actions, &actions_length1, &_actions_size_, &_tmp41_); -#line 338 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp42_.name = "EditMenu"; -#line 338 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp42_.stock_id = NULL; -#line 338 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp42_.label = TRANSLATABLE; -#line 338 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp42_.accelerator = NULL; -#line 338 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp42_.tooltip = NULL; -#line 338 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp42_.callback = (GCallback) NULL; -#line 338 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - edit = _tmp42_; -#line 339 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp43_ = _ ("_Edit"); -#line 339 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - edit.label = _tmp43_; -#line 340 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp44_ = actions; -#line 340 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp44__length1 = actions_length1; -#line 340 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp45_ = edit; -#line 340 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _vala_array_add71 (&actions, &actions_length1, &_actions_size_, &_tmp45_); -#line 342 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp46_.name = "ViewMenu"; -#line 342 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp46_.stock_id = NULL; -#line 342 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp46_.label = TRANSLATABLE; -#line 342 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp46_.accelerator = NULL; -#line 342 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp46_.tooltip = NULL; -#line 342 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp46_.callback = (GCallback) NULL; -#line 342 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - view = _tmp46_; -#line 343 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp47_ = _ ("_View"); -#line 343 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - view.label = _tmp47_; -#line 344 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp48_ = actions; -#line 344 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp48__length1 = actions_length1; -#line 344 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp49_ = view; -#line 344 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _vala_array_add72 (&actions, &actions_length1, &_actions_size_, &_tmp49_); -#line 346 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp50_.name = "PhotoMenu"; -#line 346 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp50_.stock_id = NULL; -#line 346 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp50_.label = TRANSLATABLE; -#line 346 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp50_.accelerator = NULL; -#line 346 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp50_.tooltip = NULL; -#line 346 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp50_.callback = (GCallback) NULL; -#line 346 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - photo = _tmp50_; -#line 347 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp51_ = _ ("_Photo"); -#line 347 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - photo.label = _tmp51_; -#line 348 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp52_ = actions; -#line 348 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp52__length1 = actions_length1; -#line 348 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp53_ = photo; -#line 348 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _vala_array_add73 (&actions, &actions_length1, &_actions_size_, &_tmp53_); -#line 350 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp54_.name = "PhotosMenu"; -#line 350 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp54_.stock_id = NULL; -#line 350 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp54_.label = TRANSLATABLE; -#line 350 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp54_.accelerator = NULL; -#line 350 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp54_.tooltip = NULL; -#line 350 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp54_.callback = (GCallback) NULL; -#line 350 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - photos = _tmp54_; -#line 351 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp55_ = _ ("_Photos"); -#line 351 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - photos.label = _tmp55_; -#line 352 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp56_ = actions; -#line 352 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp56__length1 = actions_length1; -#line 352 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp57_ = photos; -#line 352 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _vala_array_add74 (&actions, &actions_length1, &_actions_size_, &_tmp57_); -#line 354 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp58_.name = "EventsMenu"; -#line 354 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp58_.stock_id = NULL; -#line 354 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp58_.label = TRANSLATABLE; -#line 354 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp58_.accelerator = NULL; -#line 354 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp58_.tooltip = NULL; -#line 354 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp58_.callback = (GCallback) NULL; -#line 354 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - event = _tmp58_; -#line 355 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp59_ = _ ("Even_ts"); -#line 355 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - event.label = _tmp59_; -#line 356 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp60_ = actions; -#line 356 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp60__length1 = actions_length1; -#line 356 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp61_ = event; -#line 356 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _vala_array_add75 (&actions, &actions_length1, &_actions_size_, &_tmp61_); -#line 358 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp62_.name = "TagsMenu"; -#line 358 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp62_.stock_id = NULL; -#line 358 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp62_.label = TRANSLATABLE; -#line 358 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp62_.accelerator = NULL; -#line 358 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp62_.tooltip = NULL; -#line 358 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp62_.callback = (GCallback) NULL; -#line 358 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - tags = _tmp62_; -#line 359 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp63_ = _ ("Ta_gs"); -#line 359 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - tags.label = _tmp63_; -#line 360 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp64_ = actions; -#line 360 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp64__length1 = actions_length1; -#line 360 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp65_ = tags; -#line 360 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _vala_array_add76 (&actions, &actions_length1, &_actions_size_, &_tmp65_); -#line 362 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp66_.name = "HelpMenu"; -#line 362 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp66_.stock_id = NULL; -#line 362 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp66_.label = TRANSLATABLE; -#line 362 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp66_.accelerator = NULL; -#line 362 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp66_.tooltip = NULL; -#line 362 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp66_.callback = (GCallback) NULL; -#line 362 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - help = _tmp66_; -#line 363 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp67_ = _ ("_Help"); -#line 363 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - help.label = _tmp67_; -#line 364 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp68_ = actions; -#line 364 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp68__length1 = actions_length1; -#line 364 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp69_ = help; -#line 364 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _vala_array_add77 (&actions, &actions_length1, &_actions_size_, &_tmp69_); -#line 366 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp70_ = actions; -#line 366 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp70__length1 = actions_length1; -#line 366 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - if (result_length1) { -#line 366 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - *result_length1 = _tmp70__length1; -#line 3383 "LibraryWindow.c" - } -#line 366 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - result = _tmp70_; -#line 366 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - return result; -#line 3389 "LibraryWindow.c" -} - - -static void _library_window_on_display_basic_properties_gtk_action_callback (GtkAction* action, gpointer self) { -#line 372 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - library_window_on_display_basic_properties ((LibraryWindow*) self, action); -#line 3396 "LibraryWindow.c" -} - - -static void _vala_array_add78 (GtkToggleActionEntry** array, int* length, int* size, const GtkToggleActionEntry* value) { -#line 376 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - if ((*length) == (*size)) { -#line 376 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - *size = (*size) ? (2 * (*size)) : 4; -#line 376 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - *array = g_renew (GtkToggleActionEntry, *array, *size); -#line 3407 "LibraryWindow.c" - } -#line 376 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - (*array)[(*length)++] = *value; -#line 3411 "LibraryWindow.c" -} - - -static void _library_window_on_display_extended_properties_gtk_action_callback (GtkAction* action, gpointer self) { -#line 378 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - library_window_on_display_extended_properties ((LibraryWindow*) self, action); -#line 3418 "LibraryWindow.c" -} - - -static void _vala_array_add79 (GtkToggleActionEntry** array, int* length, int* size, const GtkToggleActionEntry* value) { -#line 382 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - if ((*length) == (*size)) { -#line 382 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - *size = (*size) ? (2 * (*size)) : 4; -#line 382 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - *array = g_renew (GtkToggleActionEntry, *array, *size); -#line 3429 "LibraryWindow.c" - } -#line 382 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - (*array)[(*length)++] = *value; -#line 3433 "LibraryWindow.c" -} - - -static void _library_window_on_display_searchbar_gtk_action_callback (GtkAction* action, gpointer self) { -#line 384 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - library_window_on_display_searchbar ((LibraryWindow*) self, action); -#line 3440 "LibraryWindow.c" -} - - -static void _vala_array_add80 (GtkToggleActionEntry** array, int* length, int* size, const GtkToggleActionEntry* value) { -#line 388 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - if ((*length) == (*size)) { -#line 388 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - *size = (*size) ? (2 * (*size)) : 4; -#line 388 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - *array = g_renew (GtkToggleActionEntry, *array, *size); -#line 3451 "LibraryWindow.c" - } -#line 388 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - (*array)[(*length)++] = *value; -#line 3455 "LibraryWindow.c" -} - - -static void _library_window_on_display_sidebar_gtk_action_callback (GtkAction* action, gpointer self) { -#line 390 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - library_window_on_display_sidebar ((LibraryWindow*) self, action); -#line 3462 "LibraryWindow.c" -} - - -static void _vala_array_add81 (GtkToggleActionEntry** array, int* length, int* size, const GtkToggleActionEntry* value) { -#line 394 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - if ((*length) == (*size)) { -#line 394 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - *size = (*size) ? (2 * (*size)) : 4; -#line 394 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - *array = g_renew (GtkToggleActionEntry, *array, *size); -#line 3473 "LibraryWindow.c" - } -#line 394 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - (*array)[(*length)++] = *value; -#line 3477 "LibraryWindow.c" -} - - -static void _library_window_on_display_toolbar_gtk_action_callback (GtkAction* action, gpointer self) { -#line 396 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - library_window_on_display_toolbar ((LibraryWindow*) self, action); -#line 3484 "LibraryWindow.c" -} - - -static void _vala_array_add82 (GtkToggleActionEntry** array, int* length, int* size, const GtkToggleActionEntry* value) { -#line 400 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - if ((*length) == (*size)) { -#line 400 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - *size = (*size) ? (2 * (*size)) : 4; -#line 400 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - *array = g_renew (GtkToggleActionEntry, *array, *size); -#line 3495 "LibraryWindow.c" - } -#line 400 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - (*array)[(*length)++] = *value; -#line 3499 "LibraryWindow.c" -} - - -static GtkToggleActionEntry* library_window_create_common_toggle_actions (LibraryWindow* self, int* result_length1) { - GtkToggleActionEntry* result = NULL; - GtkToggleActionEntry* actions = NULL; - GtkToggleActionEntry* _tmp0_ = NULL; - gint actions_length1 = 0; - gint _actions_size_ = 0; - GtkToggleActionEntry basic_props = {0}; - GtkToggleActionEntry _tmp1_ = {0}; - const gchar* _tmp2_ = NULL; - const gchar* _tmp3_ = NULL; - GtkToggleActionEntry* _tmp4_ = NULL; - gint _tmp4__length1 = 0; - GtkToggleActionEntry _tmp5_ = {0}; - GtkToggleActionEntry extended_props = {0}; - GtkToggleActionEntry _tmp6_ = {0}; - const gchar* _tmp7_ = NULL; - const gchar* _tmp8_ = NULL; - GtkToggleActionEntry* _tmp9_ = NULL; - gint _tmp9__length1 = 0; - GtkToggleActionEntry _tmp10_ = {0}; - GtkToggleActionEntry searchbar = {0}; - gboolean _tmp11_ = FALSE; - GtkToggleActionEntry _tmp12_ = {0}; - const gchar* _tmp13_ = NULL; - const gchar* _tmp14_ = NULL; - GtkToggleActionEntry* _tmp15_ = NULL; - gint _tmp15__length1 = 0; - GtkToggleActionEntry _tmp16_ = {0}; - GtkToggleActionEntry sidebar = {0}; - gboolean _tmp17_ = FALSE; - GtkToggleActionEntry _tmp18_ = {0}; - const gchar* _tmp19_ = NULL; - const gchar* _tmp20_ = NULL; - GtkToggleActionEntry* _tmp21_ = NULL; - gint _tmp21__length1 = 0; - GtkToggleActionEntry _tmp22_ = {0}; - GtkToggleActionEntry toolbar = {0}; - gboolean _tmp23_ = FALSE; - GtkToggleActionEntry _tmp24_ = {0}; - const gchar* _tmp25_ = NULL; - const gchar* _tmp26_ = NULL; - GtkToggleActionEntry* _tmp27_ = NULL; - gint _tmp27__length1 = 0; - GtkToggleActionEntry _tmp28_ = {0}; - GtkToggleActionEntry* _tmp29_ = NULL; - gint _tmp29__length1 = 0; -#line 369 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - g_return_val_if_fail (IS_LIBRARY_WINDOW (self), NULL); -#line 370 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp0_ = g_new0 (GtkToggleActionEntry, 0); -#line 370 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - actions = _tmp0_; -#line 370 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - actions_length1 = 0; -#line 370 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _actions_size_ = actions_length1; -#line 372 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp1_.name = "CommonDisplayBasicProperties"; -#line 372 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp1_.stock_id = NULL; -#line 372 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp1_.label = TRANSLATABLE; -#line 372 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp1_.accelerator = "<Ctrl><Shift>I"; -#line 372 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp1_.tooltip = TRANSLATABLE; -#line 372 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp1_.callback = (GCallback) _library_window_on_display_basic_properties_gtk_action_callback; -#line 372 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp1_.is_active = FALSE; -#line 372 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - basic_props = _tmp1_; -#line 374 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp2_ = _ ("_Basic Information"); -#line 374 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - basic_props.label = _tmp2_; -#line 375 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp3_ = _ ("Display basic information for the selection"); -#line 375 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - basic_props.tooltip = _tmp3_; -#line 376 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp4_ = actions; -#line 376 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp4__length1 = actions_length1; -#line 376 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp5_ = basic_props; -#line 376 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _vala_array_add78 (&actions, &actions_length1, &_actions_size_, &_tmp5_); -#line 378 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp6_.name = "CommonDisplayExtendedProperties"; -#line 378 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp6_.stock_id = NULL; -#line 378 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp6_.label = TRANSLATABLE; -#line 378 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp6_.accelerator = "<Ctrl><Shift>X"; -#line 378 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp6_.tooltip = TRANSLATABLE; -#line 378 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp6_.callback = (GCallback) _library_window_on_display_extended_properties_gtk_action_callback; -#line 378 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp6_.is_active = FALSE; -#line 378 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - extended_props = _tmp6_; -#line 380 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp7_ = _ ("E_xtended Information"); -#line 380 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - extended_props.label = _tmp7_; -#line 381 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp8_ = _ ("Display extended information for the selection"); -#line 381 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - extended_props.tooltip = _tmp8_; -#line 382 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp9_ = actions; -#line 382 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp9__length1 = actions_length1; -#line 382 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp10_ = extended_props; -#line 382 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _vala_array_add79 (&actions, &actions_length1, &_actions_size_, &_tmp10_); -#line 384 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp11_ = self->priv->is_search_toolbar_visible; -#line 384 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp12_.name = "CommonDisplaySearchbar"; -#line 384 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp12_.stock_id = "edit-find"; -#line 384 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp12_.label = TRANSLATABLE; -#line 384 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp12_.accelerator = "F8"; -#line 384 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp12_.tooltip = TRANSLATABLE; -#line 384 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp12_.callback = (GCallback) _library_window_on_display_searchbar_gtk_action_callback; -#line 384 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp12_.is_active = _tmp11_; -#line 384 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - searchbar = _tmp12_; -#line 386 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp13_ = _ ("_Search Bar"); -#line 386 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - searchbar.label = _tmp13_; -#line 387 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp14_ = _ ("Display the search bar"); -#line 387 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - searchbar.tooltip = _tmp14_; -#line 388 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp15_ = actions; -#line 388 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp15__length1 = actions_length1; -#line 388 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp16_ = searchbar; -#line 388 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _vala_array_add80 (&actions, &actions_length1, &_actions_size_, &_tmp16_); -#line 390 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp17_ = library_window_is_sidebar_visible (self); -#line 390 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp18_.name = "CommonDisplaySidebar"; -#line 390 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp18_.stock_id = NULL; -#line 390 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp18_.label = TRANSLATABLE; -#line 390 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp18_.accelerator = "F9"; -#line 390 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp18_.tooltip = TRANSLATABLE; -#line 390 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp18_.callback = (GCallback) _library_window_on_display_sidebar_gtk_action_callback; -#line 390 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp18_.is_active = _tmp17_; -#line 390 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - sidebar = _tmp18_; -#line 392 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp19_ = _ ("S_idebar"); -#line 392 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - sidebar.label = _tmp19_; -#line 393 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp20_ = _ ("Display the sidebar"); -#line 393 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - sidebar.tooltip = _tmp20_; -#line 394 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp21_ = actions; -#line 394 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp21__length1 = actions_length1; -#line 394 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp22_ = sidebar; -#line 394 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _vala_array_add81 (&actions, &actions_length1, &_actions_size_, &_tmp22_); -#line 396 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp23_ = library_window_is_toolbar_visible (self); -#line 396 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp24_.name = "CommonDisplayToolbar"; -#line 396 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp24_.stock_id = NULL; -#line 396 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp24_.label = TRANSLATABLE; -#line 396 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp24_.accelerator = "<Ctrl>F9"; -#line 396 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp24_.tooltip = TRANSLATABLE; -#line 396 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp24_.callback = (GCallback) _library_window_on_display_toolbar_gtk_action_callback; -#line 396 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp24_.is_active = _tmp23_; -#line 396 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - toolbar = _tmp24_; -#line 398 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp25_ = _ ("T_oolbar"); -#line 398 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - toolbar.label = _tmp25_; -#line 399 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp26_ = _ ("Display the tool bar"); -#line 399 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - toolbar.tooltip = _tmp26_; -#line 400 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp27_ = actions; -#line 400 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp27__length1 = actions_length1; -#line 400 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp28_ = toolbar; -#line 400 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _vala_array_add82 (&actions, &actions_length1, &_actions_size_, &_tmp28_); -#line 402 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp29_ = actions; -#line 402 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp29__length1 = actions_length1; -#line 402 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - if (result_length1) { -#line 402 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - *result_length1 = _tmp29__length1; -#line 3733 "LibraryWindow.c" - } -#line 402 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - result = _tmp29_; -#line 402 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - return result; -#line 3739 "LibraryWindow.c" -} - - -static void _vala_array_add83 (GtkRadioActionEntry** array, int* length, int* size, const GtkRadioActionEntry* value) { -#line 413 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - if ((*length) == (*size)) { -#line 413 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - *size = (*size) ? (2 * (*size)) : 4; -#line 413 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - *array = g_renew (GtkRadioActionEntry, *array, *size); -#line 3750 "LibraryWindow.c" - } -#line 413 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - (*array)[(*length)++] = *value; -#line 3754 "LibraryWindow.c" -} - - -static void _vala_array_add84 (GtkRadioActionEntry** array, int* length, int* size, const GtkRadioActionEntry* value) { -#line 420 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - if ((*length) == (*size)) { -#line 420 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - *size = (*size) ? (2 * (*size)) : 4; -#line 420 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - *array = g_renew (GtkRadioActionEntry, *array, *size); -#line 3765 "LibraryWindow.c" - } -#line 420 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - (*array)[(*length)++] = *value; -#line 3769 "LibraryWindow.c" -} - - -static void _library_window_on_events_sort_changed_gtk_radio_action_callback (GtkAction* action, GtkAction* current, gpointer self) { -#line 422 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - library_window_on_events_sort_changed ((LibraryWindow*) self, action, current); -#line 3776 "LibraryWindow.c" -} - - -static void library_window_add_common_radio_actions (LibraryWindow* self, GtkActionGroup* group) { - GtkRadioActionEntry* actions = NULL; - GtkRadioActionEntry* _tmp0_ = NULL; - gint actions_length1 = 0; - gint _actions_size_ = 0; - GtkRadioActionEntry ascending = {0}; - GtkRadioActionEntry _tmp1_ = {0}; - const gchar* _tmp2_ = NULL; - const gchar* _tmp3_ = NULL; - GtkRadioActionEntry* _tmp4_ = NULL; - gint _tmp4__length1 = 0; - GtkRadioActionEntry _tmp5_ = {0}; - GtkRadioActionEntry descending = {0}; - GtkRadioActionEntry _tmp6_ = {0}; - const gchar* _tmp7_ = NULL; - const gchar* _tmp8_ = NULL; - GtkRadioActionEntry* _tmp9_ = NULL; - gint _tmp9__length1 = 0; - GtkRadioActionEntry _tmp10_ = {0}; - GtkActionGroup* _tmp11_ = NULL; - GtkRadioActionEntry* _tmp12_ = NULL; - gint _tmp12__length1 = 0; -#line 405 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - g_return_if_fail (IS_LIBRARY_WINDOW (self)); -#line 405 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - g_return_if_fail (GTK_IS_ACTION_GROUP (group)); -#line 406 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp0_ = g_new0 (GtkRadioActionEntry, 0); -#line 406 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - actions = _tmp0_; -#line 406 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - actions_length1 = 0; -#line 406 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _actions_size_ = actions_length1; -#line 408 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp1_.name = "CommonSortEventsAscending"; -#line 408 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp1_.stock_id = RESOURCES_SORT_ASCENDING_LABEL; -#line 408 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp1_.label = TRANSLATABLE; -#line 408 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp1_.accelerator = NULL; -#line 408 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp1_.tooltip = TRANSLATABLE; -#line 408 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp1_.value = LIBRARY_WINDOW_SORT_EVENTS_ORDER_ASCENDING; -#line 408 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - ascending = _tmp1_; -#line 411 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp2_ = _ ("_Ascending"); -#line 411 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - ascending.label = _tmp2_; -#line 412 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp3_ = _ ("Sort photos in an ascending order"); -#line 412 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - ascending.tooltip = _tmp3_; -#line 413 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp4_ = actions; -#line 413 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp4__length1 = actions_length1; -#line 413 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp5_ = ascending; -#line 413 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _vala_array_add83 (&actions, &actions_length1, &_actions_size_, &_tmp5_); -#line 415 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp6_.name = "CommonSortEventsDescending"; -#line 415 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp6_.stock_id = RESOURCES_SORT_DESCENDING_LABEL; -#line 415 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp6_.label = TRANSLATABLE; -#line 415 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp6_.accelerator = NULL; -#line 415 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp6_.tooltip = TRANSLATABLE; -#line 415 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp6_.value = LIBRARY_WINDOW_SORT_EVENTS_ORDER_DESCENDING; -#line 415 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - descending = _tmp6_; -#line 418 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp7_ = _ ("D_escending"); -#line 418 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - descending.label = _tmp7_; -#line 419 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp8_ = _ ("Sort photos in a descending order"); -#line 419 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - descending.tooltip = _tmp8_; -#line 420 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp9_ = actions; -#line 420 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp9__length1 = actions_length1; -#line 420 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp10_ = descending; -#line 420 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _vala_array_add84 (&actions, &actions_length1, &_actions_size_, &_tmp10_); -#line 422 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp11_ = group; -#line 422 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp12_ = actions; -#line 422 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp12__length1 = actions_length1; -#line 422 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - gtk_action_group_add_radio_actions (_tmp11_, _tmp12_, _tmp12__length1, LIBRARY_WINDOW_SORT_EVENTS_ORDER_ASCENDING, (GCallback) _library_window_on_events_sort_changed_gtk_radio_action_callback, self); -#line 405 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - actions = (g_free (actions), NULL); -#line 3884 "LibraryWindow.c" -} - - -static void _vala_array_add85 (GtkActionGroup*** array, int* length, int* size, GtkActionGroup* value) { -#line 438 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - if ((*length) == (*size)) { -#line 438 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - *size = (*size) ? (2 * (*size)) : 4; -#line 438 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - *array = g_renew (GtkActionGroup*, *array, (*size) + 1); -#line 3895 "LibraryWindow.c" - } -#line 438 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - (*array)[(*length)++] = value; -#line 438 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - (*array)[*length] = NULL; -#line 3901 "LibraryWindow.c" -} - - -static void _vala_array_add86 (GtkActionGroup*** array, int* length, int* size, GtkActionGroup* value) { -#line 439 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - if ((*length) == (*size)) { -#line 439 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - *size = (*size) ? (2 * (*size)) : 4; -#line 439 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - *array = g_renew (GtkActionGroup*, *array, (*size) + 1); -#line 3912 "LibraryWindow.c" - } -#line 439 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - (*array)[(*length)++] = value; -#line 439 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - (*array)[*length] = NULL; -#line 3918 "LibraryWindow.c" -} - - -static GtkActionGroup** library_window_real_create_common_action_groups (AppWindow* base, int* result_length1) { +static void library_window_real_add_actions (AppWindow* base) { LibraryWindow * self; - GtkActionGroup** result = NULL; - GtkActionGroup** groups = NULL; - gint _tmp0_ = 0; - GtkActionGroup** _tmp1_ = NULL; - gint groups_length1 = 0; - gint _groups_size_ = 0; - GtkActionGroup* _tmp2_ = NULL; - gint _tmp3_ = 0; - GtkActionEntry* _tmp4_ = NULL; - GtkActionEntry* _tmp5_ = NULL; - gint _tmp5__length1 = 0; - GtkActionGroup* _tmp6_ = NULL; - gint _tmp7_ = 0; - GtkToggleActionEntry* _tmp8_ = NULL; - GtkToggleActionEntry* _tmp9_ = NULL; - gint _tmp9__length1 = 0; - GtkActionGroup* _tmp10_ = NULL; - GtkAction* action = NULL; - GtkActionGroup* _tmp11_ = NULL; - GtkAction* _tmp12_ = NULL; - GtkAction* _tmp13_ = NULL; - GtkAction* _tmp14_ = NULL; - GtkActionGroup** _tmp17_ = NULL; - gint _tmp17__length1 = 0; - GtkActionGroup* _tmp18_ = NULL; - GtkActionGroup* _tmp19_ = NULL; - GtkActionGroup** _tmp20_ = NULL; - gint _tmp20__length1 = 0; - SearchFilterActions* _tmp21_ = NULL; - GtkActionGroup* _tmp22_ = NULL; - GtkActionGroup** _tmp23_ = NULL; - gint _tmp23__length1 = 0; -#line 425 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_LIBRARY_WINDOW, LibraryWindow); -#line 426 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp1_ = APP_WINDOW_CLASS (library_window_parent_class)->create_common_action_groups (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_APP_WINDOW, AppWindow), &_tmp0_); -#line 426 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - groups = _tmp1_; -#line 426 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - groups_length1 = _tmp0_; -#line 426 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _groups_size_ = groups_length1; -#line 428 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp2_ = self->priv->common_action_group; -#line 428 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp4_ = library_window_create_common_actions (self, &_tmp3_); -#line 428 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp5_ = _tmp4_; -#line 428 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp5__length1 = _tmp3_; -#line 428 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - gtk_action_group_add_actions (_tmp2_, _tmp5_, _tmp3_, self); -#line 428 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp5_ = (g_free (_tmp5_), NULL); -#line 429 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp6_ = self->priv->common_action_group; -#line 429 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp8_ = library_window_create_common_toggle_actions (self, &_tmp7_); -#line 429 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp9_ = _tmp8_; -#line 429 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp9__length1 = _tmp7_; -#line 429 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - gtk_action_group_add_toggle_actions (_tmp6_, _tmp9_, _tmp7_, self); -#line 429 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp9_ = (g_free (_tmp9_), NULL); -#line 430 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp10_ = self->priv->common_action_group; -#line 430 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - library_window_add_common_radio_actions (self, _tmp10_); -#line 432 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp11_ = self->priv->common_action_group; -#line 432 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp12_ = gtk_action_group_get_action (_tmp11_, "CommonDisplaySearchbar"); -#line 432 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp13_ = _g_object_ref0 (_tmp12_); -#line 432 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - action = _tmp13_; -#line 433 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp14_ = action; -#line 433 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - if (_tmp14_ != NULL) { -#line 4006 "LibraryWindow.c" - GtkAction* _tmp15_ = NULL; - GtkAction* _tmp16_ = NULL; -#line 434 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp15_ = action; -#line 434 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - gtk_action_set_short_label (_tmp15_, RESOURCES_FIND_LABEL); -#line 435 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp16_ = action; -#line 435 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - gtk_action_set_is_important (_tmp16_, TRUE); -#line 4017 "LibraryWindow.c" - } -#line 438 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp17_ = groups; -#line 438 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp17__length1 = groups_length1; -#line 438 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp18_ = self->priv->common_action_group; -#line 438 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp19_ = _g_object_ref0 (_tmp18_); -#line 438 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _vala_array_add85 (&groups, &groups_length1, &_groups_size_, _tmp19_); -#line 439 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp20_ = groups; -#line 439 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp20__length1 = groups_length1; -#line 439 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp21_ = self->priv->search_actions; -#line 439 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp22_ = search_filter_actions_get_action_group (_tmp21_); -#line 439 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _vala_array_add86 (&groups, &groups_length1, &_groups_size_, _tmp22_); -#line 441 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp23_ = groups; -#line 441 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp23__length1 = groups_length1; -#line 441 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - if (result_length1) { -#line 441 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - *result_length1 = _tmp23__length1; -#line 4047 "LibraryWindow.c" - } -#line 441 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - result = _tmp23_; -#line 441 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _g_object_unref0 (action); -#line 441 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - return result; -#line 4055 "LibraryWindow.c" -} - - -static void library_window_real_replace_common_placeholders (AppWindow* base, GtkUIManager* ui) { - LibraryWindow * self; - GtkUIManager* _tmp0_ = NULL; -#line 444 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" + SearchFilterActions* _tmp0_ = NULL; + gint _tmp1_ = 0; + GActionEntry* _tmp2_ = NULL; + SearchFilterActions* _tmp3_ = NULL; +#line 290 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_LIBRARY_WINDOW, LibraryWindow); -#line 444 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - g_return_if_fail (GTK_IS_UI_MANAGER (ui)); -#line 445 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp0_ = ui; -#line 445 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - APP_WINDOW_CLASS (library_window_parent_class)->replace_common_placeholders (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_APP_WINDOW, AppWindow), _tmp0_); -#line 4070 "LibraryWindow.c" +#line 291 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" + APP_WINDOW_CLASS (library_window_parent_class)->add_actions (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_APP_WINDOW, AppWindow)); +#line 292 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" + g_action_map_add_action_entries (G_TYPE_CHECK_INSTANCE_CAST (self, g_action_map_get_type (), GActionMap), LIBRARY_WINDOW_common_actions, G_N_ELEMENTS (LIBRARY_WINDOW_common_actions), self); +#line 293 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" + _tmp0_ = self->priv->search_actions; +#line 293 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" + _tmp2_ = search_filter_actions_get_actions (_tmp0_, &_tmp1_); +#line 293 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" + _tmp3_ = self->priv->search_actions; +#line 293 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" + g_action_map_add_action_entries (G_TYPE_CHECK_INSTANCE_CAST (self, g_action_map_get_type (), GActionMap), _tmp2_, _tmp1_, _tmp3_); +#line 2497 "LibraryWindow.c" } static void _library_window_on_view_filter_installed_view_collection_view_filter_installed (ViewCollection* _sender, ViewFilter* filer, gpointer self) { -#line 453 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 301 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" library_window_on_view_filter_installed ((LibraryWindow*) self, filer); -#line 4077 "LibraryWindow.c" +#line 2504 "LibraryWindow.c" } static void _library_window_on_view_filter_removed_view_collection_view_filter_removed (ViewCollection* _sender, ViewFilter* filer, gpointer self) { -#line 454 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 302 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" library_window_on_view_filter_removed ((LibraryWindow*) self, filer); -#line 4084 "LibraryWindow.c" +#line 2511 "LibraryWindow.c" } @@ -4093,23 +2520,23 @@ static void library_window_real_switched_pages (PageWindow* base, Page* old_page SearchFilterActions* _tmp18_ = NULL; Page* _tmp19_ = NULL; Page* _tmp20_ = NULL; -#line 448 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 296 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_LIBRARY_WINDOW, LibraryWindow); -#line 448 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 296 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" g_return_if_fail ((old_page == NULL) || IS_PAGE (old_page)); -#line 448 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 296 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" g_return_if_fail ((new_page == NULL) || IS_PAGE (new_page)); -#line 449 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 297 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp0_ = old_page; -#line 449 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 297 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp1_ = new_page; -#line 449 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 297 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" PAGE_WINDOW_CLASS (library_window_parent_class)->switched_pages (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_APP_WINDOW, AppWindow), TYPE_PAGE_WINDOW, PageWindow), _tmp0_, _tmp1_); -#line 452 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 300 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp2_ = old_page; -#line 452 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 300 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" if (_tmp2_ != NULL) { -#line 4113 "LibraryWindow.c" +#line 2540 "LibraryWindow.c" Page* _tmp3_ = NULL; ViewCollection* _tmp4_ = NULL; ViewCollection* _tmp5_ = NULL; @@ -4118,112 +2545,126 @@ static void library_window_real_switched_pages (PageWindow* base, Page* old_page ViewCollection* _tmp8_ = NULL; ViewCollection* _tmp9_ = NULL; guint _tmp10_ = 0U; -#line 453 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 301 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp3_ = old_page; -#line 453 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 301 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp4_ = page_get_view (_tmp3_); -#line 453 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 301 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp5_ = _tmp4_; -#line 453 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 301 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" g_signal_parse_name ("view-filter-installed", TYPE_VIEW_COLLECTION, &_tmp6_, NULL, FALSE); -#line 453 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 301 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" g_signal_handlers_disconnect_matched (_tmp5_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp6_, 0, NULL, (GCallback) _library_window_on_view_filter_installed_view_collection_view_filter_installed, self); -#line 453 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 301 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _data_collection_unref0 (_tmp5_); -#line 454 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 302 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp7_ = old_page; -#line 454 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 302 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp8_ = page_get_view (_tmp7_); -#line 454 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 302 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp9_ = _tmp8_; -#line 454 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 302 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" g_signal_parse_name ("view-filter-removed", TYPE_VIEW_COLLECTION, &_tmp10_, NULL, FALSE); -#line 454 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 302 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" g_signal_handlers_disconnect_matched (_tmp9_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp10_, 0, NULL, (GCallback) _library_window_on_view_filter_removed_view_collection_view_filter_removed, self); -#line 454 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 302 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _data_collection_unref0 (_tmp9_); -#line 4146 "LibraryWindow.c" +#line 2573 "LibraryWindow.c" } -#line 457 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 305 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp11_ = new_page; -#line 457 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 305 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" if (_tmp11_ != NULL) { -#line 4152 "LibraryWindow.c" +#line 2579 "LibraryWindow.c" Page* _tmp12_ = NULL; ViewCollection* _tmp13_ = NULL; ViewCollection* _tmp14_ = NULL; Page* _tmp15_ = NULL; ViewCollection* _tmp16_ = NULL; ViewCollection* _tmp17_ = NULL; -#line 458 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 306 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp12_ = new_page; -#line 458 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 306 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp13_ = page_get_view (_tmp12_); -#line 458 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 306 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp14_ = _tmp13_; -#line 458 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 306 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" g_signal_connect_object (_tmp14_, "view-filter-installed", (GCallback) _library_window_on_view_filter_installed_view_collection_view_filter_installed, self, 0); -#line 458 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 306 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _data_collection_unref0 (_tmp14_); -#line 459 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 307 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp15_ = new_page; -#line 459 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 307 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp16_ = page_get_view (_tmp15_); -#line 459 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 307 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp17_ = _tmp16_; -#line 459 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 307 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" g_signal_connect_object (_tmp17_, "view-filter-removed", (GCallback) _library_window_on_view_filter_removed_view_collection_view_filter_removed, self, 0); -#line 459 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 307 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _data_collection_unref0 (_tmp17_); -#line 4179 "LibraryWindow.c" +#line 2606 "LibraryWindow.c" } -#line 462 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 310 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp18_ = self->priv->search_actions; -#line 462 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 310 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp19_ = old_page; -#line 462 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 310 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp20_ = new_page; -#line 462 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 310 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" search_filter_actions_monitor_page_contents (_tmp18_, _tmp19_, _tmp20_); -#line 4189 "LibraryWindow.c" +#line 2616 "LibraryWindow.c" } static void _library_window_on_view_filter_refreshed_view_filter_refresh (ViewFilter* _sender, gpointer self) { -#line 466 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 314 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" library_window_on_view_filter_refreshed ((LibraryWindow*) self); -#line 4196 "LibraryWindow.c" +#line 2623 "LibraryWindow.c" } static void library_window_on_view_filter_installed (LibraryWindow* self, ViewFilter* filter) { ViewFilter* _tmp0_ = NULL; -#line 465 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 313 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" g_return_if_fail (IS_LIBRARY_WINDOW (self)); -#line 465 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 313 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" g_return_if_fail (IS_VIEW_FILTER (filter)); -#line 466 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 314 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp0_ = filter; -#line 466 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 314 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" g_signal_connect_object (_tmp0_, "refresh", (GCallback) _library_window_on_view_filter_refreshed_view_filter_refresh, self, 0); -#line 4210 "LibraryWindow.c" +#line 2637 "LibraryWindow.c" } static void library_window_on_view_filter_removed (LibraryWindow* self, ViewFilter* filter) { ViewFilter* _tmp0_ = NULL; guint _tmp1_ = 0U; -#line 469 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 317 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" g_return_if_fail (IS_LIBRARY_WINDOW (self)); -#line 469 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 317 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" g_return_if_fail (IS_VIEW_FILTER (filter)); -#line 470 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 318 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp0_ = filter; -#line 470 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 318 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" g_signal_parse_name ("refresh", TYPE_VIEW_FILTER, &_tmp1_, NULL, FALSE); -#line 470 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 318 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" g_signal_handlers_disconnect_matched (_tmp0_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp1_, 0, NULL, (GCallback) _library_window_on_view_filter_refreshed_view_filter_refresh, self); -#line 4227 "LibraryWindow.c" +#line 2654 "LibraryWindow.c" +} + + +static gpointer _g_object_ref0 (gpointer self) { +#line 328 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" + return self ? g_object_ref (self) : NULL; +#line 2661 "LibraryWindow.c" +} + + +static GVariant* _variant_new1 (gboolean value) { +#line 331 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" + return g_variant_ref_sink (g_variant_new_boolean (value)); +#line 2668 "LibraryWindow.c" } @@ -4234,196 +2675,164 @@ static void library_window_on_view_filter_refreshed (LibraryWindow* self) { ViewCollection* _tmp3_ = NULL; gboolean _tmp4_ = FALSE; gboolean _tmp5_ = FALSE; - GtkToggleAction* display_searchbar = NULL; - GtkAction* _tmp6_ = NULL; - GtkToggleAction* _tmp7_ = NULL; - GtkToggleAction* _tmp8_ = NULL; -#line 473 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" + GAction* action = NULL; + GAction* _tmp6_ = NULL; + GAction* _tmp7_ = NULL; + GAction* _tmp8_ = NULL; +#line 321 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" g_return_if_fail (IS_LIBRARY_WINDOW (self)); -#line 476 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 324 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp0_ = page_window_get_current_page (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE_WINDOW, PageWindow)); -#line 476 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 324 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp1_ = _tmp0_; -#line 476 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 324 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp2_ = page_get_view (_tmp1_); -#line 476 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 324 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp3_ = _tmp2_; -#line 476 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 324 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp4_ = view_collection_are_items_filtered_out (_tmp3_); -#line 476 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 324 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp5_ = !_tmp4_; -#line 476 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 324 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _data_collection_unref0 (_tmp3_); -#line 476 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 324 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _g_object_unref0 (_tmp1_); -#line 476 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 324 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" if (_tmp5_) { -#line 477 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 325 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" return; -#line 4264 "LibraryWindow.c" - } -#line 480 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp6_ = app_window_get_common_action (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_APP_WINDOW, AppWindow), "CommonDisplaySearchbar"); -#line 480 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp7_ = G_TYPE_CHECK_INSTANCE_TYPE (_tmp6_, gtk_toggle_action_get_type ()) ? ((GtkToggleAction*) _tmp6_) : NULL; -#line 480 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - if (_tmp7_ == NULL) { -#line 480 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _g_object_unref0 (_tmp6_); -#line 4274 "LibraryWindow.c" - } -#line 480 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - display_searchbar = _tmp7_; -#line 482 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp8_ = display_searchbar; -#line 482 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 2705 "LibraryWindow.c" + } +#line 328 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" + _tmp6_ = g_action_map_lookup_action (G_TYPE_CHECK_INSTANCE_CAST (self, g_action_map_get_type (), GActionMap), "CommonDisplaySearchbar"); +#line 328 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" + _tmp7_ = _g_object_ref0 (_tmp6_); +#line 328 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" + action = _tmp7_; +#line 330 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" + _tmp8_ = action; +#line 330 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" if (_tmp8_ != NULL) { -#line 4282 "LibraryWindow.c" - GtkToggleAction* _tmp9_ = NULL; -#line 483 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp9_ = display_searchbar; -#line 483 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - gtk_toggle_action_set_active (_tmp9_, TRUE); -#line 4288 "LibraryWindow.c" - } -#line 473 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _g_object_unref0 (display_searchbar); -#line 4292 "LibraryWindow.c" +#line 2717 "LibraryWindow.c" + GAction* _tmp9_ = NULL; + GVariant* _tmp10_ = NULL; +#line 331 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" + _tmp9_ = action; +#line 331 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" + _tmp10_ = _variant_new1 (TRUE); +#line 331 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" + g_action_change_state (_tmp9_, _tmp10_); +#line 331 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" + _g_variant_unref0 (_tmp10_); +#line 2728 "LibraryWindow.c" + } +#line 321 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" + _g_object_unref0 (action); +#line 2732 "LibraryWindow.c" } static void library_window_real_show_all (GtkWidget* base) { LibraryWindow * self; - GtkToggleAction* basic_properties_action = NULL; + GAction* basic_properties_action = NULL; Page* _tmp0_ = NULL; Page* _tmp1_ = NULL; - GtkAction* _tmp2_ = NULL; - GtkToggleAction* _tmp3_ = NULL; - GtkToggleAction* _tmp4_ = NULL; - GtkToggleAction* _tmp5_ = NULL; - GtkToggleAction* _tmp6_ = NULL; - gboolean _tmp7_ = FALSE; - GtkToggleAction* searchbar_action = NULL; - Page* _tmp9_ = NULL; - Page* _tmp10_ = NULL; - GtkAction* _tmp11_ = NULL; - GtkToggleAction* _tmp12_ = NULL; - GtkToggleAction* _tmp13_ = NULL; - GtkToggleAction* _tmp14_ = NULL; + GAction* _tmp2_ = NULL; + GAction* _tmp3_ = NULL; + GAction* _tmp4_ = NULL; + GAction* _tmp5_ = NULL; + GVariant* _tmp6_ = NULL; + GVariant* _tmp7_ = NULL; + gboolean _tmp8_ = FALSE; + gboolean _tmp9_ = FALSE; CheckerboardPage* current_page = NULL; - Page* _tmp15_ = NULL; + Page* _tmp11_ = NULL; + CheckerboardPage* _tmp12_ = NULL; + CheckerboardPage* _tmp13_ = NULL; + gboolean _tmp15_ = FALSE; CheckerboardPage* _tmp16_ = NULL; - CheckerboardPage* _tmp17_ = NULL; - gboolean _tmp19_ = FALSE; - CheckerboardPage* _tmp20_ = NULL; - gboolean _tmp21_ = FALSE; -#line 487 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" + gboolean _tmp17_ = FALSE; +#line 335 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_LIBRARY_WINDOW, LibraryWindow); -#line 488 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 336 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" GTK_WIDGET_CLASS (library_window_parent_class)->show_all (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_APP_WINDOW, AppWindow), gtk_widget_get_type (), GtkWidget)); -#line 490 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 338 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp0_ = page_window_get_current_page (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE_WINDOW, PageWindow)); -#line 490 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 338 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp1_ = _tmp0_; -#line 490 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 338 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp2_ = page_get_common_action (_tmp1_, "CommonDisplayBasicProperties", TRUE); -#line 490 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp3_ = G_TYPE_CHECK_INSTANCE_TYPE (_tmp2_, gtk_toggle_action_get_type ()) ? ((GtkToggleAction*) _tmp2_) : NULL; -#line 490 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - if (_tmp3_ == NULL) { -#line 490 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _g_object_unref0 (_tmp2_); -#line 4337 "LibraryWindow.c" - } -#line 490 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp4_ = _tmp3_; -#line 490 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 338 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" + _tmp3_ = _tmp2_; +#line 338 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _g_object_unref0 (_tmp1_); -#line 490 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - basic_properties_action = _tmp4_; -#line 492 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 338 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" + basic_properties_action = _tmp3_; +#line 340 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" + _tmp4_ = basic_properties_action; +#line 340 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" + _vala_assert (_tmp4_ != NULL, "basic_properties_action != null"); +#line 342 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp5_ = basic_properties_action; -#line 492 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _vala_assert (_tmp5_ != NULL, "basic_properties_action != null"); -#line 494 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp6_ = basic_properties_action; -#line 494 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp7_ = gtk_toggle_action_get_active (_tmp6_); -#line 494 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - if (!_tmp7_) { -#line 4355 "LibraryWindow.c" - GtkFrame* _tmp8_ = NULL; -#line 495 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp8_ = self->priv->bottom_frame; -#line 495 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - gtk_widget_hide (G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, gtk_widget_get_type (), GtkWidget)); -#line 4361 "LibraryWindow.c" +#line 342 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" + _tmp6_ = g_action_get_state (_tmp5_); +#line 342 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" + _tmp7_ = _tmp6_; +#line 342 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" + _tmp8_ = g_variant_get_boolean (_tmp7_); +#line 342 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" + _tmp9_ = !_tmp8_; +#line 342 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" + _g_variant_unref0 (_tmp7_); +#line 342 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" + if (_tmp9_) { +#line 2790 "LibraryWindow.c" + GtkFrame* _tmp10_ = NULL; +#line 343 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" + _tmp10_ = self->priv->bottom_frame; +#line 343 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" + gtk_widget_hide (G_TYPE_CHECK_INSTANCE_CAST (_tmp10_, gtk_widget_get_type (), GtkWidget)); +#line 2796 "LibraryWindow.c" } -#line 497 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp9_ = page_window_get_current_page (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE_WINDOW, PageWindow)); -#line 497 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp10_ = _tmp9_; -#line 497 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp11_ = page_get_common_action (_tmp10_, "CommonDisplaySearchbar", TRUE); -#line 497 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp12_ = G_TYPE_CHECK_INSTANCE_TYPE (_tmp11_, gtk_toggle_action_get_type ()) ? ((GtkToggleAction*) _tmp11_) : NULL; -#line 497 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 346 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" + _tmp11_ = page_window_get_current_page (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE_WINDOW, PageWindow)); +#line 346 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" + _tmp12_ = G_TYPE_CHECK_INSTANCE_TYPE (_tmp11_, TYPE_CHECKERBOARD_PAGE) ? ((CheckerboardPage*) _tmp11_) : NULL; +#line 346 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" if (_tmp12_ == NULL) { -#line 497 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 346 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _g_object_unref0 (_tmp11_); -#line 4375 "LibraryWindow.c" - } -#line 497 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp13_ = _tmp12_; -#line 497 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _g_object_unref0 (_tmp10_); -#line 497 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - searchbar_action = _tmp13_; -#line 499 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp14_ = searchbar_action; -#line 499 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _vala_assert (_tmp14_ != NULL, "searchbar_action != null"); -#line 502 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp15_ = page_window_get_current_page (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE_WINDOW, PageWindow)); -#line 502 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp16_ = G_TYPE_CHECK_INSTANCE_TYPE (_tmp15_, TYPE_CHECKERBOARD_PAGE) ? ((CheckerboardPage*) _tmp15_) : NULL; -#line 502 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - if (_tmp16_ == NULL) { -#line 502 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _g_object_unref0 (_tmp15_); -#line 4395 "LibraryWindow.c" +#line 2806 "LibraryWindow.c" } -#line 502 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - current_page = _tmp16_; -#line 503 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp17_ = current_page; -#line 503 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - if (_tmp17_ != NULL) { -#line 4403 "LibraryWindow.c" - CheckerboardPage* _tmp18_ = NULL; -#line 504 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp18_ = current_page; -#line 504 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - library_window_init_view_filter (self, _tmp18_); -#line 4409 "LibraryWindow.c" +#line 346 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" + current_page = _tmp12_; +#line 347 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" + _tmp13_ = current_page; +#line 347 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" + if (_tmp13_ != NULL) { +#line 2814 "LibraryWindow.c" + CheckerboardPage* _tmp14_ = NULL; +#line 348 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" + _tmp14_ = current_page; +#line 348 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" + library_window_init_view_filter (self, _tmp14_); +#line 2820 "LibraryWindow.c" } -#line 506 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp19_ = library_window_should_show_search_bar (self); -#line 506 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp20_ = current_page; -#line 506 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - library_window_toggle_search_bar (self, _tmp19_, _tmp20_); -#line 509 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp21_ = library_window_is_sidebar_visible (self); -#line 509 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - library_window_set_sidebar_visible (self, _tmp21_); -#line 487 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 350 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" + _tmp15_ = library_window_should_show_search_bar (self); +#line 350 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" + _tmp16_ = current_page; +#line 350 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" + library_window_toggle_search_bar (self, _tmp15_, _tmp16_); +#line 353 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" + _tmp17_ = library_window_is_sidebar_visible (self); +#line 353 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" + library_window_set_sidebar_visible (self, _tmp17_); +#line 335 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _g_object_unref0 (current_page); -#line 487 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _g_object_unref0 (searchbar_action); -#line 487 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 335 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _g_object_unref0 (basic_properties_action); -#line 4427 "LibraryWindow.c" +#line 2836 "LibraryWindow.c" } @@ -4432,77 +2841,77 @@ LibraryWindow* library_window_get_app (void) { AppWindow* _tmp0_ = NULL; AppWindow* _tmp1_ = NULL; LibraryWindow* _tmp2_ = NULL; -#line 513 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 357 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp0_ = app_window_instance; -#line 513 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 357 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _vala_assert (G_TYPE_CHECK_INSTANCE_TYPE (_tmp0_, TYPE_LIBRARY_WINDOW), "instance is LibraryWindow"); -#line 515 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 359 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp1_ = app_window_instance; -#line 515 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 359 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp2_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, TYPE_LIBRARY_WINDOW, LibraryWindow)); -#line 515 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 359 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" result = _tmp2_; -#line 515 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 359 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" return result; -#line 4448 "LibraryWindow.c" +#line 2857 "LibraryWindow.c" } gboolean library_window_is_mount_uri_supported (const gchar* uri) { gboolean result = FALSE; -#line 519 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 363 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" g_return_val_if_fail (uri != NULL, FALSE); -#line 4456 "LibraryWindow.c" +#line 2865 "LibraryWindow.c" { const gchar** scheme_collection = NULL; gint scheme_collection_length1 = 0; gint _scheme_collection_size_ = 0; gint scheme_it = 0; -#line 520 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 364 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" scheme_collection = LIBRARY_WINDOW_SUPPORTED_MOUNT_SCHEMES; -#line 520 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 364 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" scheme_collection_length1 = G_N_ELEMENTS (LIBRARY_WINDOW_SUPPORTED_MOUNT_SCHEMES); -#line 520 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 364 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" for (scheme_it = 0; scheme_it < G_N_ELEMENTS (LIBRARY_WINDOW_SUPPORTED_MOUNT_SCHEMES); scheme_it = scheme_it + 1) { -#line 4468 "LibraryWindow.c" +#line 2877 "LibraryWindow.c" gchar* _tmp0_ = NULL; gchar* scheme = NULL; -#line 520 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 364 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp0_ = g_strdup (scheme_collection[scheme_it]); -#line 520 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 364 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" scheme = _tmp0_; -#line 4475 "LibraryWindow.c" +#line 2884 "LibraryWindow.c" { const gchar* _tmp1_ = NULL; const gchar* _tmp2_ = NULL; gboolean _tmp3_ = FALSE; -#line 521 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 365 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp1_ = uri; -#line 521 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 365 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp2_ = scheme; -#line 521 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 365 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp3_ = g_str_has_prefix (_tmp1_, _tmp2_); -#line 521 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 365 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" if (_tmp3_) { -#line 522 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 366 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" result = TRUE; -#line 522 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 366 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _g_free0 (scheme); -#line 522 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 366 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" return result; -#line 4494 "LibraryWindow.c" +#line 2903 "LibraryWindow.c" } -#line 520 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 364 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _g_free0 (scheme); -#line 4498 "LibraryWindow.c" +#line 2907 "LibraryWindow.c" } } } -#line 525 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 369 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" result = FALSE; -#line 525 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 369 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" return result; -#line 4506 "LibraryWindow.c" +#line 2915 "LibraryWindow.c" } @@ -4510,15 +2919,15 @@ static gchar* library_window_real_get_app_role (AppWindow* base) { LibraryWindow * self; gchar* result = NULL; gchar* _tmp0_ = NULL; -#line 528 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 372 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_LIBRARY_WINDOW, LibraryWindow); -#line 529 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 373 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp0_ = g_strdup (RESOURCES_APP_LIBRARY_ROLE); -#line 529 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 373 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" result = _tmp0_; -#line 529 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 373 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" return result; -#line 4522 "LibraryWindow.c" +#line 2931 "LibraryWindow.c" } @@ -4528,40 +2937,40 @@ void library_window_rename_tag_in_sidebar (LibraryWindow* self, Tag* tag) { Tag* _tmp1_ = NULL; TagsSidebarEntry* _tmp2_ = NULL; TagsSidebarEntry* _tmp3_ = NULL; -#line 532 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 376 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" g_return_if_fail (IS_LIBRARY_WINDOW (self)); -#line 532 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 376 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" g_return_if_fail (IS_TAG (tag)); -#line 533 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 377 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp0_ = self->priv->tags_branch; -#line 533 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 377 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp1_ = tag; -#line 533 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 377 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp2_ = tags_branch_get_entry_for_tag (_tmp0_, _tmp1_); -#line 533 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 377 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" entry = _tmp2_; -#line 534 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 378 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp3_ = entry; -#line 534 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 378 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" if (_tmp3_ != NULL) { -#line 4548 "LibraryWindow.c" +#line 2957 "LibraryWindow.c" SidebarTree* _tmp4_ = NULL; TagsSidebarEntry* _tmp5_ = NULL; -#line 535 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 379 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp4_ = self->priv->sidebar_tree; -#line 535 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 379 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp5_ = entry; -#line 535 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 379 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" sidebar_tree_rename_entry_in_place (_tmp4_, G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, SIDEBAR_TYPE_ENTRY, SidebarEntry)); -#line 4557 "LibraryWindow.c" +#line 2966 "LibraryWindow.c" } else { -#line 537 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - g_debug ("LibraryWindow.vala:537: No tag entry found for rename"); -#line 4561 "LibraryWindow.c" +#line 381 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" + g_debug ("LibraryWindow.vala:381: No tag entry found for rename"); +#line 2970 "LibraryWindow.c" } -#line 532 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 376 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _g_object_unref0 (entry); -#line 4565 "LibraryWindow.c" +#line 2974 "LibraryWindow.c" } @@ -4571,40 +2980,40 @@ void library_window_rename_event_in_sidebar (LibraryWindow* self, Event* event) Event* _tmp1_ = NULL; EventsEventEntry* _tmp2_ = NULL; EventsEventEntry* _tmp3_ = NULL; -#line 540 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 384 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" g_return_if_fail (IS_LIBRARY_WINDOW (self)); -#line 540 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 384 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" g_return_if_fail (IS_EVENT (event)); -#line 541 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 385 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp0_ = self->priv->events_branch; -#line 541 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 385 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp1_ = event; -#line 541 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 385 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp2_ = events_branch_get_entry_for_event (_tmp0_, _tmp1_); -#line 541 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 385 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" entry = _tmp2_; -#line 542 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 386 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp3_ = entry; -#line 542 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 386 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" if (_tmp3_ != NULL) { -#line 4591 "LibraryWindow.c" +#line 3000 "LibraryWindow.c" SidebarTree* _tmp4_ = NULL; EventsEventEntry* _tmp5_ = NULL; -#line 543 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 387 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp4_ = self->priv->sidebar_tree; -#line 543 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 387 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp5_ = entry; -#line 543 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 387 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" sidebar_tree_rename_entry_in_place (_tmp4_, G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, SIDEBAR_TYPE_ENTRY, SidebarEntry)); -#line 4600 "LibraryWindow.c" +#line 3009 "LibraryWindow.c" } else { -#line 545 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - g_debug ("LibraryWindow.vala:545: No event entry found for rename"); -#line 4604 "LibraryWindow.c" +#line 389 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" + g_debug ("LibraryWindow.vala:389: No event entry found for rename"); +#line 3013 "LibraryWindow.c" } -#line 540 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 384 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _g_object_unref0 (entry); -#line 4608 "LibraryWindow.c" +#line 3017 "LibraryWindow.c" } @@ -4614,40 +3023,40 @@ void library_window_rename_search_in_sidebar (LibraryWindow* self, SavedSearch* SavedSearch* _tmp1_ = NULL; SearchesSidebarEntry* _tmp2_ = NULL; SearchesSidebarEntry* _tmp3_ = NULL; -#line 548 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 392 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" g_return_if_fail (IS_LIBRARY_WINDOW (self)); -#line 548 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 392 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" g_return_if_fail (IS_SAVED_SEARCH (search)); -#line 549 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 393 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp0_ = self->priv->saved_search_branch; -#line 549 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 393 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp1_ = search; -#line 549 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 393 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp2_ = searches_branch_get_entry_for_saved_search (_tmp0_, _tmp1_); -#line 549 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 393 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" entry = _tmp2_; -#line 550 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 394 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp3_ = entry; -#line 550 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 394 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" if (_tmp3_ != NULL) { -#line 4634 "LibraryWindow.c" +#line 3043 "LibraryWindow.c" SidebarTree* _tmp4_ = NULL; SearchesSidebarEntry* _tmp5_ = NULL; -#line 551 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 395 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp4_ = self->priv->sidebar_tree; -#line 551 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 395 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp5_ = entry; -#line 551 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 395 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" sidebar_tree_rename_entry_in_place (_tmp4_, G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, SIDEBAR_TYPE_ENTRY, SidebarEntry)); -#line 4643 "LibraryWindow.c" +#line 3052 "LibraryWindow.c" } else { -#line 553 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - g_debug ("LibraryWindow.vala:553: No search entry found for rename"); -#line 4647 "LibraryWindow.c" +#line 397 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" + g_debug ("LibraryWindow.vala:397: No search entry found for rename"); +#line 3056 "LibraryWindow.c" } -#line 548 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 392 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _g_object_unref0 (entry); -#line 4651 "LibraryWindow.c" +#line 3060 "LibraryWindow.c" } @@ -4662,37 +3071,37 @@ static void library_window_real_on_quit (AppWindow* base) { GtkPaned* _tmp6_ = NULL; gint _tmp7_ = 0; gint _tmp8_ = 0; -#line 556 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 400 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_LIBRARY_WINDOW, LibraryWindow); -#line 557 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 401 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp0_ = config_facade_get_instance (); -#line 557 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 401 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp1_ = _tmp0_; -#line 557 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 401 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp2_ = G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_APP_WINDOW, AppWindow)->maximized; -#line 557 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 401 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp3_ = G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_APP_WINDOW, AppWindow)->dimensions; -#line 557 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 401 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" configuration_facade_set_library_window_state (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade), _tmp2_, &_tmp3_); -#line 557 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 401 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _g_object_unref0 (_tmp1_); -#line 559 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 403 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp4_ = config_facade_get_instance (); -#line 559 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 403 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp5_ = _tmp4_; -#line 559 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 403 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp6_ = self->priv->client_paned; -#line 559 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 403 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp7_ = gtk_paned_get_position (_tmp6_); -#line 559 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 403 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp8_ = _tmp7_; -#line 559 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 403 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" configuration_facade_set_sidebar_position (G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade), _tmp8_); -#line 559 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 403 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _g_object_unref0 (_tmp5_); -#line 561 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 405 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" APP_WINDOW_CLASS (library_window_parent_class)->on_quit (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_APP_WINDOW, AppWindow)); -#line 4696 "LibraryWindow.c" +#line 3105 "LibraryWindow.c" } @@ -4709,105 +3118,105 @@ static Photo* library_window_get_start_fullscreen_photo (LibraryWindow* self, Co Photo* _tmp10_ = NULL; gboolean _tmp11_ = FALSE; GeeList* _tmp12_ = NULL; -#line 564 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 408 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" g_return_val_if_fail (IS_LIBRARY_WINDOW (self), NULL); -#line 564 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 408 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" g_return_val_if_fail (IS_COLLECTION_PAGE (page), NULL); -#line 565 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 409 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp0_ = page; -#line 565 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 409 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp1_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, TYPE_PAGE, Page)); -#line 565 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 409 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" view = _tmp1_; -#line 569 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 413 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp3_ = view; -#line 569 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 413 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp4_ = view_collection_get_selected_count (_tmp3_); -#line 569 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 413 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" if (_tmp4_ > 0) { -#line 4729 "LibraryWindow.c" +#line 3138 "LibraryWindow.c" ViewCollection* _tmp5_ = NULL; GeeList* _tmp6_ = NULL; -#line 570 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 414 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp5_ = view; -#line 570 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 414 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp6_ = view_collection_get_selected_sources_of_type (_tmp5_, TYPE_LIBRARY_PHOTO); -#line 570 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 414 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _g_object_unref0 (_tmp2_); -#line 570 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 414 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp2_ = _tmp6_; -#line 4740 "LibraryWindow.c" +#line 3149 "LibraryWindow.c" } else { ViewCollection* _tmp7_ = NULL; GeeList* _tmp8_ = NULL; -#line 571 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 415 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp7_ = view; -#line 571 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 415 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp8_ = view_collection_get_sources_of_type (_tmp7_, TYPE_LIBRARY_PHOTO); -#line 571 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 415 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _g_object_unref0 (_tmp2_); -#line 571 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 415 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp2_ = _tmp8_; -#line 4752 "LibraryWindow.c" +#line 3161 "LibraryWindow.c" } -#line 569 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 413 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp9_ = _g_object_ref0 (_tmp2_); -#line 569 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 413 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" sources = _tmp9_; -#line 573 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 417 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp12_ = sources; -#line 573 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 417 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" if (_tmp12_ != NULL) { -#line 4762 "LibraryWindow.c" +#line 3171 "LibraryWindow.c" GeeList* _tmp13_ = NULL; gint _tmp14_ = 0; gint _tmp15_ = 0; -#line 573 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 417 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp13_ = sources; -#line 573 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 417 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp14_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp13_, GEE_TYPE_COLLECTION, GeeCollection)); -#line 573 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 417 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp15_ = _tmp14_; -#line 573 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 417 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp11_ = _tmp15_ != 0; -#line 4774 "LibraryWindow.c" +#line 3183 "LibraryWindow.c" } else { -#line 573 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 417 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp11_ = FALSE; -#line 4778 "LibraryWindow.c" +#line 3187 "LibraryWindow.c" } -#line 573 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 417 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" if (_tmp11_) { -#line 4782 "LibraryWindow.c" +#line 3191 "LibraryWindow.c" GeeList* _tmp16_ = NULL; gpointer _tmp17_ = NULL; -#line 574 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 418 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp16_ = sources; -#line 574 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 418 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp17_ = gee_list_get (_tmp16_, 0); -#line 574 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 418 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _g_object_unref0 (_tmp10_); -#line 574 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 418 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp10_ = G_TYPE_CHECK_INSTANCE_CAST ((DataSource*) _tmp17_, TYPE_PHOTO, Photo); -#line 4793 "LibraryWindow.c" +#line 3202 "LibraryWindow.c" } else { -#line 574 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 418 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _g_object_unref0 (_tmp10_); -#line 574 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 418 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp10_ = NULL; -#line 4799 "LibraryWindow.c" +#line 3208 "LibraryWindow.c" } -#line 573 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 417 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" result = _tmp10_; -#line 573 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 417 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _g_object_unref0 (sources); -#line 573 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 417 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _g_object_unref0 (_tmp2_); -#line 573 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 417 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _data_collection_unref0 (view); -#line 573 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 417 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" return result; -#line 4811 "LibraryWindow.c" +#line 3220 "LibraryWindow.c" } @@ -4819,27 +3228,27 @@ static gboolean library_window_get_fullscreen_photo (LibraryWindow* self, Page* Page* _tmp0_ = NULL; Page* _tmp8_ = NULL; Page* _tmp30_ = NULL; -#line 577 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 421 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" g_return_val_if_fail (IS_LIBRARY_WINDOW (self), FALSE); -#line 577 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 421 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" g_return_val_if_fail (IS_PAGE (page), FALSE); -#line 579 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 423 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _g_object_unref0 (_vala_collection); -#line 579 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 423 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _vala_collection = NULL; -#line 580 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 424 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _g_object_unref0 (_vala_start); -#line 580 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 424 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _vala_start = NULL; -#line 581 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 425 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _data_collection_unref0 (_vala_view_collection); -#line 581 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 425 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _vala_view_collection = NULL; -#line 584 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 428 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp0_ = page; -#line 584 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 428 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" if (G_TYPE_CHECK_INSTANCE_TYPE (_tmp0_, TYPE_COLLECTION_PAGE)) { -#line 4843 "LibraryWindow.c" +#line 3252 "LibraryWindow.c" Page* _tmp1_ = NULL; CollectionPage* _tmp2_ = NULL; Photo* photo = NULL; @@ -4848,117 +3257,117 @@ static gboolean library_window_get_fullscreen_photo (LibraryWindow* self, Page* Photo* _tmp5_ = NULL; Photo* _tmp6_ = NULL; Photo* _tmp7_ = NULL; -#line 585 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 429 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp1_ = page; -#line 585 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 429 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp2_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, TYPE_COLLECTION_PAGE, CollectionPage)); -#line 585 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 429 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _g_object_unref0 (_vala_collection); -#line 585 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 429 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _vala_collection = _tmp2_; -#line 586 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 430 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp3_ = _vala_collection; -#line 586 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 430 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp4_ = library_window_get_start_fullscreen_photo (self, _tmp3_); -#line 586 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 430 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" photo = _tmp4_; -#line 587 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 431 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp5_ = photo; -#line 587 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 431 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" if (_tmp5_ == NULL) { -#line 588 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 432 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" result = FALSE; -#line 588 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 432 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _g_object_unref0 (photo); -#line 588 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 432 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" if (collection) { -#line 588 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 432 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" *collection = _vala_collection; -#line 4878 "LibraryWindow.c" +#line 3287 "LibraryWindow.c" } else { -#line 588 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 432 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _g_object_unref0 (_vala_collection); -#line 4882 "LibraryWindow.c" +#line 3291 "LibraryWindow.c" } -#line 588 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 432 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" if (start) { -#line 588 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 432 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" *start = _vala_start; -#line 4888 "LibraryWindow.c" +#line 3297 "LibraryWindow.c" } else { -#line 588 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 432 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _g_object_unref0 (_vala_start); -#line 4892 "LibraryWindow.c" +#line 3301 "LibraryWindow.c" } -#line 588 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 432 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" if (view_collection) { -#line 588 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 432 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" *view_collection = _vala_view_collection; -#line 4898 "LibraryWindow.c" +#line 3307 "LibraryWindow.c" } else { -#line 588 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 432 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _data_collection_unref0 (_vala_view_collection); -#line 4902 "LibraryWindow.c" +#line 3311 "LibraryWindow.c" } -#line 588 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 432 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" return result; -#line 4906 "LibraryWindow.c" +#line 3315 "LibraryWindow.c" } -#line 590 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 434 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp6_ = photo; -#line 590 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 434 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp7_ = _g_object_ref0 (_tmp6_); -#line 590 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 434 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _g_object_unref0 (_vala_start); -#line 590 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 434 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _vala_start = _tmp7_; -#line 591 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 435 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _data_collection_unref0 (_vala_view_collection); -#line 591 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 435 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _vala_view_collection = NULL; -#line 593 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 437 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" result = TRUE; -#line 593 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 437 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _g_object_unref0 (photo); -#line 593 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 437 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" if (collection) { -#line 593 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 437 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" *collection = _vala_collection; -#line 4928 "LibraryWindow.c" +#line 3337 "LibraryWindow.c" } else { -#line 593 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 437 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _g_object_unref0 (_vala_collection); -#line 4932 "LibraryWindow.c" +#line 3341 "LibraryWindow.c" } -#line 593 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 437 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" if (start) { -#line 593 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 437 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" *start = _vala_start; -#line 4938 "LibraryWindow.c" +#line 3347 "LibraryWindow.c" } else { -#line 593 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 437 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _g_object_unref0 (_vala_start); -#line 4942 "LibraryWindow.c" +#line 3351 "LibraryWindow.c" } -#line 593 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 437 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" if (view_collection) { -#line 593 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 437 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" *view_collection = _vala_view_collection; -#line 4948 "LibraryWindow.c" +#line 3357 "LibraryWindow.c" } else { -#line 593 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 437 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _data_collection_unref0 (_vala_view_collection); -#line 4952 "LibraryWindow.c" +#line 3361 "LibraryWindow.c" } -#line 593 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 437 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" return result; -#line 4956 "LibraryWindow.c" +#line 3365 "LibraryWindow.c" } -#line 596 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 440 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp8_ = page; -#line 596 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 440 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" if (G_TYPE_CHECK_INSTANCE_TYPE (_tmp8_, TYPE_EVENTS_DIRECTORY_PAGE)) { -#line 4962 "LibraryWindow.c" +#line 3371 "LibraryWindow.c" ViewCollection* view = NULL; Page* _tmp9_ = NULL; ViewCollection* _tmp10_ = NULL; @@ -4984,291 +3393,291 @@ static gboolean library_window_get_fullscreen_photo (LibraryWindow* self, Page* Photo* _tmp27_ = NULL; Photo* _tmp28_ = NULL; Photo* _tmp29_ = NULL; -#line 597 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 441 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp9_ = page; -#line 597 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 441 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp10_ = page_get_view (_tmp9_); -#line 597 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 441 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" view = _tmp10_; -#line 598 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 442 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp11_ = view; -#line 598 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 442 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp12_ = data_collection_get_count (G_TYPE_CHECK_INSTANCE_CAST (_tmp11_, TYPE_DATA_COLLECTION, DataCollection)); -#line 598 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 442 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" if (_tmp12_ == 0) { -#line 599 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 443 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" result = FALSE; -#line 599 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 443 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _data_collection_unref0 (view); -#line 599 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 443 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" if (collection) { -#line 599 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 443 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" *collection = _vala_collection; -#line 5008 "LibraryWindow.c" +#line 3417 "LibraryWindow.c" } else { -#line 599 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 443 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _g_object_unref0 (_vala_collection); -#line 5012 "LibraryWindow.c" +#line 3421 "LibraryWindow.c" } -#line 599 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 443 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" if (start) { -#line 599 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 443 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" *start = _vala_start; -#line 5018 "LibraryWindow.c" +#line 3427 "LibraryWindow.c" } else { -#line 599 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 443 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _g_object_unref0 (_vala_start); -#line 5022 "LibraryWindow.c" +#line 3431 "LibraryWindow.c" } -#line 599 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 443 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" if (view_collection) { -#line 599 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 443 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" *view_collection = _vala_view_collection; -#line 5028 "LibraryWindow.c" +#line 3437 "LibraryWindow.c" } else { -#line 599 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 443 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _data_collection_unref0 (_vala_view_collection); -#line 5032 "LibraryWindow.c" +#line 3441 "LibraryWindow.c" } -#line 599 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 443 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" return result; -#line 5036 "LibraryWindow.c" +#line 3445 "LibraryWindow.c" } -#line 601 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 445 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp13_ = view; -#line 601 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 445 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp14_ = data_collection_get_at (G_TYPE_CHECK_INSTANCE_CAST (_tmp13_, TYPE_DATA_COLLECTION, DataCollection), 0); -#line 601 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 445 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp15_ = G_TYPE_CHECK_INSTANCE_CAST (_tmp14_, TYPE_DATA_VIEW, DataView); -#line 601 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 445 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp16_ = data_view_get_source (_tmp15_); -#line 601 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 445 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp17_ = G_TYPE_CHECK_INSTANCE_CAST (_tmp16_, TYPE_EVENT, Event); -#line 601 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 445 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _g_object_unref0 (_tmp15_); -#line 601 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 445 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" event = _tmp17_; -#line 602 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 446 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp18_ = event; -#line 602 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 446 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" if (_tmp18_ == NULL) { -#line 603 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 447 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" result = FALSE; -#line 603 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 447 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _g_object_unref0 (event); -#line 603 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 447 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _data_collection_unref0 (view); -#line 603 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 447 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" if (collection) { -#line 603 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 447 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" *collection = _vala_collection; -#line 5066 "LibraryWindow.c" +#line 3475 "LibraryWindow.c" } else { -#line 603 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 447 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _g_object_unref0 (_vala_collection); -#line 5070 "LibraryWindow.c" +#line 3479 "LibraryWindow.c" } -#line 603 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 447 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" if (start) { -#line 603 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 447 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" *start = _vala_start; -#line 5076 "LibraryWindow.c" +#line 3485 "LibraryWindow.c" } else { -#line 603 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 447 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _g_object_unref0 (_vala_start); -#line 5080 "LibraryWindow.c" +#line 3489 "LibraryWindow.c" } -#line 603 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 447 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" if (view_collection) { -#line 603 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 447 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" *view_collection = _vala_view_collection; -#line 5086 "LibraryWindow.c" +#line 3495 "LibraryWindow.c" } else { -#line 603 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 447 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _data_collection_unref0 (_vala_view_collection); -#line 5090 "LibraryWindow.c" +#line 3499 "LibraryWindow.c" } -#line 603 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 447 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" return result; -#line 5094 "LibraryWindow.c" +#line 3503 "LibraryWindow.c" } -#line 605 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 449 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp19_ = self->priv->events_branch; -#line 605 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 449 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp20_ = event; -#line 605 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 449 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp21_ = events_branch_get_entry_for_event (_tmp19_, _tmp20_); -#line 605 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 449 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" entry = _tmp21_; -#line 606 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 450 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp22_ = entry; -#line 606 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 450 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" if (_tmp22_ == NULL) { -#line 607 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 451 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" result = FALSE; -#line 607 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 451 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _g_object_unref0 (entry); -#line 607 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 451 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _g_object_unref0 (event); -#line 607 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 451 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _data_collection_unref0 (view); -#line 607 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 451 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" if (collection) { -#line 607 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 451 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" *collection = _vala_collection; -#line 5120 "LibraryWindow.c" +#line 3529 "LibraryWindow.c" } else { -#line 607 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 451 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _g_object_unref0 (_vala_collection); -#line 5124 "LibraryWindow.c" +#line 3533 "LibraryWindow.c" } -#line 607 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 451 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" if (start) { -#line 607 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 451 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" *start = _vala_start; -#line 5130 "LibraryWindow.c" +#line 3539 "LibraryWindow.c" } else { -#line 607 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 451 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _g_object_unref0 (_vala_start); -#line 5134 "LibraryWindow.c" +#line 3543 "LibraryWindow.c" } -#line 607 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 451 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" if (view_collection) { -#line 607 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 451 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" *view_collection = _vala_view_collection; -#line 5140 "LibraryWindow.c" +#line 3549 "LibraryWindow.c" } else { -#line 607 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 451 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _data_collection_unref0 (_vala_view_collection); -#line 5144 "LibraryWindow.c" +#line 3553 "LibraryWindow.c" } -#line 607 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 451 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" return result; -#line 5148 "LibraryWindow.c" +#line 3557 "LibraryWindow.c" } -#line 609 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 453 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp23_ = entry; -#line 609 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 453 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp24_ = sidebar_page_representative_get_page (G_TYPE_CHECK_INSTANCE_CAST (_tmp23_, SIDEBAR_TYPE_PAGE_REPRESENTATIVE, SidebarPageRepresentative)); -#line 609 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 453 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _g_object_unref0 (_vala_collection); -#line 609 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 453 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _vala_collection = G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (_tmp24_, TYPE_EVENT_PAGE, EventPage), TYPE_COLLECTION_PAGE, CollectionPage); -#line 610 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 454 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp25_ = _vala_collection; -#line 610 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 454 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp26_ = library_window_get_start_fullscreen_photo (self, _tmp25_); -#line 610 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 454 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" photo = _tmp26_; -#line 611 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 455 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp27_ = photo; -#line 611 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 455 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" if (_tmp27_ == NULL) { -#line 612 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 456 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" result = FALSE; -#line 612 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 456 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _g_object_unref0 (photo); -#line 612 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 456 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _g_object_unref0 (entry); -#line 612 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 456 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _g_object_unref0 (event); -#line 612 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 456 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _data_collection_unref0 (view); -#line 612 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 456 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" if (collection) { -#line 612 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 456 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" *collection = _vala_collection; -#line 5182 "LibraryWindow.c" +#line 3591 "LibraryWindow.c" } else { -#line 612 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 456 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _g_object_unref0 (_vala_collection); -#line 5186 "LibraryWindow.c" +#line 3595 "LibraryWindow.c" } -#line 612 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 456 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" if (start) { -#line 612 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 456 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" *start = _vala_start; -#line 5192 "LibraryWindow.c" +#line 3601 "LibraryWindow.c" } else { -#line 612 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 456 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _g_object_unref0 (_vala_start); -#line 5196 "LibraryWindow.c" +#line 3605 "LibraryWindow.c" } -#line 612 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 456 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" if (view_collection) { -#line 612 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 456 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" *view_collection = _vala_view_collection; -#line 5202 "LibraryWindow.c" +#line 3611 "LibraryWindow.c" } else { -#line 612 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 456 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _data_collection_unref0 (_vala_view_collection); -#line 5206 "LibraryWindow.c" +#line 3615 "LibraryWindow.c" } -#line 612 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 456 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" return result; -#line 5210 "LibraryWindow.c" +#line 3619 "LibraryWindow.c" } -#line 614 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 458 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp28_ = photo; -#line 614 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 458 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp29_ = _g_object_ref0 (_tmp28_); -#line 614 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 458 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _g_object_unref0 (_vala_start); -#line 614 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 458 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _vala_start = _tmp29_; -#line 615 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 459 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _data_collection_unref0 (_vala_view_collection); -#line 615 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 459 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _vala_view_collection = NULL; -#line 617 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 461 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" result = TRUE; -#line 617 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 461 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _g_object_unref0 (photo); -#line 617 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 461 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _g_object_unref0 (entry); -#line 617 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 461 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _g_object_unref0 (event); -#line 617 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 461 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _data_collection_unref0 (view); -#line 617 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 461 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" if (collection) { -#line 617 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 461 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" *collection = _vala_collection; -#line 5238 "LibraryWindow.c" +#line 3647 "LibraryWindow.c" } else { -#line 617 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 461 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _g_object_unref0 (_vala_collection); -#line 5242 "LibraryWindow.c" +#line 3651 "LibraryWindow.c" } -#line 617 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 461 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" if (start) { -#line 617 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 461 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" *start = _vala_start; -#line 5248 "LibraryWindow.c" +#line 3657 "LibraryWindow.c" } else { -#line 617 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 461 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _g_object_unref0 (_vala_start); -#line 5252 "LibraryWindow.c" +#line 3661 "LibraryWindow.c" } -#line 617 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 461 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" if (view_collection) { -#line 617 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 461 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" *view_collection = _vala_view_collection; -#line 5258 "LibraryWindow.c" +#line 3667 "LibraryWindow.c" } else { -#line 617 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 461 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _data_collection_unref0 (_vala_view_collection); -#line 5262 "LibraryWindow.c" +#line 3671 "LibraryWindow.c" } -#line 617 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 461 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" return result; -#line 5266 "LibraryWindow.c" +#line 3675 "LibraryWindow.c" } -#line 620 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 464 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp30_ = page; -#line 620 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 464 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" if (G_TYPE_CHECK_INSTANCE_TYPE (_tmp30_, TYPE_LIBRARY_PHOTO_PAGE)) { -#line 5272 "LibraryWindow.c" +#line 3681 "LibraryWindow.c" LibraryPhotoPage* photo_page = NULL; Page* _tmp31_ = NULL; LibraryPhotoPage* _tmp32_ = NULL; @@ -5284,207 +3693,207 @@ static gboolean library_window_get_fullscreen_photo (LibraryWindow* self, Page* Photo* _tmp41_ = NULL; LibraryPhotoPage* _tmp42_ = NULL; ViewCollection* _tmp43_ = NULL; -#line 621 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 465 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp31_ = page; -#line 621 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 465 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp32_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp31_, TYPE_LIBRARY_PHOTO_PAGE, LibraryPhotoPage)); -#line 621 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 465 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" photo_page = _tmp32_; -#line 623 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 467 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp33_ = photo_page; -#line 623 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 467 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp34_ = library_photo_page_get_controller_page (_tmp33_); -#line 623 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 467 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" controller = _tmp34_; -#line 624 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 468 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp35_ = controller; -#line 624 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 468 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" if (_tmp35_ == NULL) { -#line 625 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 469 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" result = FALSE; -#line 625 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 469 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _g_object_unref0 (controller); -#line 625 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 469 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _g_object_unref0 (photo_page); -#line 625 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 469 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" if (collection) { -#line 625 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 469 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" *collection = _vala_collection; -#line 5314 "LibraryWindow.c" +#line 3723 "LibraryWindow.c" } else { -#line 625 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 469 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _g_object_unref0 (_vala_collection); -#line 5318 "LibraryWindow.c" +#line 3727 "LibraryWindow.c" } -#line 625 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 469 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" if (start) { -#line 625 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 469 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" *start = _vala_start; -#line 5324 "LibraryWindow.c" +#line 3733 "LibraryWindow.c" } else { -#line 625 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 469 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _g_object_unref0 (_vala_start); -#line 5328 "LibraryWindow.c" +#line 3737 "LibraryWindow.c" } -#line 625 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 469 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" if (view_collection) { -#line 625 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 469 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" *view_collection = _vala_view_collection; -#line 5334 "LibraryWindow.c" +#line 3743 "LibraryWindow.c" } else { -#line 625 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 469 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _data_collection_unref0 (_vala_view_collection); -#line 5338 "LibraryWindow.c" +#line 3747 "LibraryWindow.c" } -#line 625 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 469 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" return result; -#line 5342 "LibraryWindow.c" +#line 3751 "LibraryWindow.c" } -#line 627 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 471 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp36_ = photo_page; -#line 627 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 471 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp37_ = editing_host_page_has_photo (G_TYPE_CHECK_INSTANCE_CAST (_tmp36_, TYPE_EDITING_HOST_PAGE, EditingHostPage)); -#line 627 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 471 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" if (!_tmp37_) { -#line 628 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 472 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" result = FALSE; -#line 628 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 472 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _g_object_unref0 (controller); -#line 628 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 472 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _g_object_unref0 (photo_page); -#line 628 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 472 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" if (collection) { -#line 628 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 472 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" *collection = _vala_collection; -#line 5360 "LibraryWindow.c" +#line 3769 "LibraryWindow.c" } else { -#line 628 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 472 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _g_object_unref0 (_vala_collection); -#line 5364 "LibraryWindow.c" +#line 3773 "LibraryWindow.c" } -#line 628 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 472 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" if (start) { -#line 628 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 472 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" *start = _vala_start; -#line 5370 "LibraryWindow.c" +#line 3779 "LibraryWindow.c" } else { -#line 628 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 472 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _g_object_unref0 (_vala_start); -#line 5374 "LibraryWindow.c" +#line 3783 "LibraryWindow.c" } -#line 628 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 472 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" if (view_collection) { -#line 628 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 472 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" *view_collection = _vala_view_collection; -#line 5380 "LibraryWindow.c" +#line 3789 "LibraryWindow.c" } else { -#line 628 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 472 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _data_collection_unref0 (_vala_view_collection); -#line 5384 "LibraryWindow.c" +#line 3793 "LibraryWindow.c" } -#line 628 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 472 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" return result; -#line 5388 "LibraryWindow.c" +#line 3797 "LibraryWindow.c" } -#line 630 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 474 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp38_ = controller; -#line 630 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 474 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp39_ = _g_object_ref0 (_tmp38_); -#line 630 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 474 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _g_object_unref0 (_vala_collection); -#line 630 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 474 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _vala_collection = _tmp39_; -#line 631 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 475 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp40_ = photo_page; -#line 631 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 475 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp41_ = editing_host_page_get_photo (G_TYPE_CHECK_INSTANCE_CAST (_tmp40_, TYPE_EDITING_HOST_PAGE, EditingHostPage)); -#line 631 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 475 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _g_object_unref0 (_vala_start); -#line 631 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 475 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _vala_start = _tmp41_; -#line 632 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 476 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp42_ = photo_page; -#line 632 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 476 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp43_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (_tmp42_, TYPE_PAGE, Page)); -#line 632 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 476 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _data_collection_unref0 (_vala_view_collection); -#line 632 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 476 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _vala_view_collection = _tmp43_; -#line 634 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 478 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" result = TRUE; -#line 634 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 478 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _g_object_unref0 (controller); -#line 634 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 478 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _g_object_unref0 (photo_page); -#line 634 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 478 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" if (collection) { -#line 634 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 478 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" *collection = _vala_collection; -#line 5424 "LibraryWindow.c" +#line 3833 "LibraryWindow.c" } else { -#line 634 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 478 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _g_object_unref0 (_vala_collection); -#line 5428 "LibraryWindow.c" +#line 3837 "LibraryWindow.c" } -#line 634 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 478 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" if (start) { -#line 634 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 478 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" *start = _vala_start; -#line 5434 "LibraryWindow.c" +#line 3843 "LibraryWindow.c" } else { -#line 634 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 478 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _g_object_unref0 (_vala_start); -#line 5438 "LibraryWindow.c" +#line 3847 "LibraryWindow.c" } -#line 634 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 478 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" if (view_collection) { -#line 634 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 478 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" *view_collection = _vala_view_collection; -#line 5444 "LibraryWindow.c" +#line 3853 "LibraryWindow.c" } else { -#line 634 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 478 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _data_collection_unref0 (_vala_view_collection); -#line 5448 "LibraryWindow.c" +#line 3857 "LibraryWindow.c" } -#line 634 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 478 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" return result; -#line 5452 "LibraryWindow.c" +#line 3861 "LibraryWindow.c" } -#line 637 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 481 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" result = FALSE; -#line 637 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 481 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" if (collection) { -#line 637 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 481 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" *collection = _vala_collection; -#line 5460 "LibraryWindow.c" +#line 3869 "LibraryWindow.c" } else { -#line 637 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 481 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _g_object_unref0 (_vala_collection); -#line 5464 "LibraryWindow.c" +#line 3873 "LibraryWindow.c" } -#line 637 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 481 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" if (start) { -#line 637 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 481 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" *start = _vala_start; -#line 5470 "LibraryWindow.c" +#line 3879 "LibraryWindow.c" } else { -#line 637 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 481 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _g_object_unref0 (_vala_start); -#line 5474 "LibraryWindow.c" +#line 3883 "LibraryWindow.c" } -#line 637 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 481 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" if (view_collection) { -#line 637 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 481 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" *view_collection = _vala_view_collection; -#line 5480 "LibraryWindow.c" +#line 3889 "LibraryWindow.c" } else { -#line 637 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 481 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _data_collection_unref0 (_vala_view_collection); -#line 5484 "LibraryWindow.c" +#line 3893 "LibraryWindow.c" } -#line 637 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 481 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" return result; -#line 5488 "LibraryWindow.c" +#line 3897 "LibraryWindow.c" } @@ -5507,97 +3916,97 @@ static void library_window_real_on_fullscreen (AppWindow* base) { ViewCollection* _tmp9_ = NULL; LibraryWindowFullscreenPhotoPage* _tmp10_ = NULL; LibraryWindowFullscreenPhotoPage* _tmp11_ = NULL; -#line 640 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 484 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_LIBRARY_WINDOW, LibraryWindow); -#line 641 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 485 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp0_ = page_window_get_current_page (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE_WINDOW, PageWindow)); -#line 641 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 485 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" current_page = _tmp0_; -#line 642 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 486 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp1_ = current_page; -#line 642 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 486 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" if (_tmp1_ == NULL) { -#line 643 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 487 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _g_object_unref0 (current_page); -#line 643 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 487 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" return; -#line 5525 "LibraryWindow.c" +#line 3934 "LibraryWindow.c" } -#line 647 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 491 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" view = NULL; -#line 648 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 492 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp2_ = current_page; -#line 648 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 492 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp6_ = library_window_get_fullscreen_photo (self, _tmp2_, &_tmp3_, &_tmp4_, &_tmp5_); -#line 648 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 492 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _g_object_unref0 (collection); -#line 648 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 492 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" collection = _tmp3_; -#line 648 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 492 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _g_object_unref0 (start); -#line 648 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 492 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" start = _tmp4_; -#line 648 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 492 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _data_collection_unref0 (view); -#line 648 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 492 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" view = _tmp5_; -#line 648 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 492 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" if (!_tmp6_) { -#line 649 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 493 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _data_collection_unref0 (view); -#line 649 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 493 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _g_object_unref0 (start); -#line 649 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 493 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _g_object_unref0 (collection); -#line 649 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 493 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _g_object_unref0 (current_page); -#line 649 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 493 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" return; -#line 5557 "LibraryWindow.c" +#line 3966 "LibraryWindow.c" } -#line 651 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 495 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp7_ = collection; -#line 651 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 495 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp8_ = start; -#line 651 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 495 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp9_ = view; -#line 651 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 495 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp10_ = library_window_fullscreen_photo_page_new (_tmp7_, _tmp8_, _tmp9_); -#line 651 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 495 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" g_object_ref_sink (_tmp10_); -#line 651 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 495 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" fs_photo = _tmp10_; -#line 653 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 497 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp11_ = fs_photo; -#line 653 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 497 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" app_window_go_fullscreen (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_APP_WINDOW, AppWindow), G_TYPE_CHECK_INSTANCE_CAST (_tmp11_, TYPE_PAGE, Page)); -#line 640 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 484 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _g_object_unref0 (fs_photo); -#line 640 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 484 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _data_collection_unref0 (view); -#line 640 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 484 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _g_object_unref0 (start); -#line 640 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 484 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _g_object_unref0 (collection); -#line 640 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 484 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _g_object_unref0 (current_page); -#line 5585 "LibraryWindow.c" +#line 3994 "LibraryWindow.c" } static void _g_free0_ (gpointer var) { -#line 673 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 517 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" var = (g_free (var), NULL); -#line 5592 "LibraryWindow.c" +#line 4001 "LibraryWindow.c" } static void _g_slist_free__g_free0_ (GSList* self) { -#line 673 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 517 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" g_slist_foreach (self, (GFunc) _g_free0_, NULL); -#line 673 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 517 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" g_slist_free (self); -#line 5601 "LibraryWindow.c" +#line 4010 "LibraryWindow.c" } @@ -5616,41 +4025,41 @@ static void library_window_on_file_import (LibraryWindow* self) { GtkFileChooserDialog* _tmp23_ = NULL; gchar* _tmp24_ = NULL; GtkFileChooserDialog* _tmp25_ = NULL; -#line 656 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 500 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" g_return_if_fail (IS_LIBRARY_WINDOW (self)); -#line 657 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 501 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp0_ = _ ("Import From Folder"); -#line 657 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 501 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp1_ = (GtkFileChooserDialog*) gtk_file_chooser_dialog_new (_tmp0_, NULL, GTK_FILE_CHOOSER_ACTION_SELECT_FOLDER, RESOURCES_CANCEL_LABEL, GTK_RESPONSE_CANCEL, RESOURCES_OK_LABEL, GTK_RESPONSE_OK, NULL); -#line 657 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 501 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" g_object_ref_sink (_tmp1_); -#line 657 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 501 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" import_dialog = _tmp1_; -#line 660 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 504 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp2_ = import_dialog; -#line 660 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 504 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" gtk_file_chooser_set_local_only (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, GTK_TYPE_FILE_CHOOSER, GtkFileChooser), FALSE); -#line 661 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 505 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp3_ = import_dialog; -#line 661 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 505 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" gtk_file_chooser_set_select_multiple (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, GTK_TYPE_FILE_CHOOSER, GtkFileChooser), TRUE); -#line 662 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 506 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp4_ = import_dialog; -#line 662 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 506 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp5_ = self->priv->import_dir; -#line 662 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 506 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" gtk_file_chooser_set_current_folder (G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, GTK_TYPE_FILE_CHOOSER, GtkFileChooser), _tmp5_); -#line 664 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 508 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp6_ = import_dialog; -#line 664 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 508 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp7_ = gtk_dialog_run (G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, gtk_dialog_get_type (), GtkDialog)); -#line 664 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 508 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" response = _tmp7_; -#line 666 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 510 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp8_ = response; -#line 666 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 510 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" if (_tmp8_ == ((gint) GTK_RESPONSE_OK)) { -#line 5654 "LibraryWindow.c" +#line 4063 "LibraryWindow.c" GtkResponseType _tmp9_ = 0; GtkFileChooserDialog* _tmp10_ = NULL; gchar* _tmp11_ = NULL; @@ -5661,95 +4070,95 @@ static void library_window_on_file_import (LibraryWindow* self) { gboolean _tmp16_ = FALSE; GtkResponseType copy_files_response = 0; GtkResponseType _tmp18_ = 0; -#line 669 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 513 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp10_ = import_dialog; -#line 669 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 513 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp11_ = gtk_file_chooser_get_uri (G_TYPE_CHECK_INSTANCE_CAST (_tmp10_, GTK_TYPE_FILE_CHOOSER, GtkFileChooser)); -#line 669 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 513 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp12_ = _tmp11_; -#line 669 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 513 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp13_ = g_file_new_for_uri (_tmp12_); -#line 669 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 513 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp14_ = _tmp13_; -#line 669 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 513 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp15_ = app_dirs_is_in_import_dir (_tmp14_); -#line 669 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 513 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp16_ = _tmp15_; -#line 669 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 513 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _g_object_unref0 (_tmp14_); -#line 669 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 513 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _g_free0 (_tmp12_); -#line 669 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 513 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" if (_tmp16_) { -#line 670 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 514 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp9_ = GTK_RESPONSE_REJECT; -#line 5687 "LibraryWindow.c" +#line 4096 "LibraryWindow.c" } else { GtkResponseType _tmp17_ = 0; -#line 670 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 514 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp17_ = copy_files_dialog (); -#line 670 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 514 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp9_ = _tmp17_; -#line 5694 "LibraryWindow.c" +#line 4103 "LibraryWindow.c" } -#line 668 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 512 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" copy_files_response = _tmp9_; -#line 672 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 516 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp18_ = copy_files_response; -#line 672 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 516 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" if (_tmp18_ != GTK_RESPONSE_CANCEL) { -#line 5702 "LibraryWindow.c" +#line 4111 "LibraryWindow.c" GtkFileChooserDialog* _tmp19_ = NULL; GSList* _tmp20_ = NULL; GSList* _tmp21_ = NULL; GtkResponseType _tmp22_ = 0; -#line 673 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 517 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp19_ = import_dialog; -#line 673 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 517 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp20_ = gtk_file_chooser_get_uris (G_TYPE_CHECK_INSTANCE_CAST (_tmp19_, GTK_TYPE_FILE_CHOOSER, GtkFileChooser)); -#line 673 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 517 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp21_ = _tmp20_; -#line 673 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 517 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp22_ = copy_files_response; -#line 673 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 517 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" library_window_dispatch_import_jobs (self, _tmp21_, "folders", _tmp22_ == GTK_RESPONSE_ACCEPT); -#line 673 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 517 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" __g_slist_free__g_free0_0 (_tmp21_); -#line 5719 "LibraryWindow.c" +#line 4128 "LibraryWindow.c" } } -#line 678 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 522 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp23_ = import_dialog; -#line 678 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 522 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp24_ = gtk_file_chooser_get_current_folder (G_TYPE_CHECK_INSTANCE_CAST (_tmp23_, GTK_TYPE_FILE_CHOOSER, GtkFileChooser)); -#line 678 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 522 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _g_free0 (self->priv->import_dir); -#line 678 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 522 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" self->priv->import_dir = _tmp24_; -#line 679 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 523 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp25_ = import_dialog; -#line 679 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 523 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" gtk_widget_destroy (G_TYPE_CHECK_INSTANCE_CAST (_tmp25_, gtk_widget_get_type (), GtkWidget)); -#line 656 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 500 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _g_object_unref0 (import_dialog); -#line 5736 "LibraryWindow.c" +#line 4145 "LibraryWindow.c" } static void library_window_on_external_library_import (LibraryWindow* self) { GtkDialog* import_dialog = NULL; DataImportsUIDataImportsDialog* _tmp0_ = NULL; -#line 682 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 526 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" g_return_if_fail (IS_LIBRARY_WINDOW (self)); -#line 683 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 527 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp0_ = data_imports_ui_data_imports_dialog_get_or_create_instance (); -#line 683 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 527 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" import_dialog = G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, gtk_dialog_get_type (), GtkDialog); -#line 685 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 529 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" gtk_dialog_run (import_dialog); -#line 682 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 526 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _g_object_unref0 (import_dialog); -#line 5753 "LibraryWindow.c" +#line 4162 "LibraryWindow.c" } @@ -5759,27 +4168,27 @@ static void library_window_real_update_common_action_availability (AppWindow* ba Page* _tmp1_ = NULL; gboolean is_checkerboard = FALSE; Page* _tmp2_ = NULL; -#line 688 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 532 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_LIBRARY_WINDOW, LibraryWindow); -#line 688 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 532 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" g_return_if_fail ((old_page == NULL) || IS_PAGE (old_page)); -#line 688 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 532 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" g_return_if_fail ((new_page == NULL) || IS_PAGE (new_page)); -#line 689 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 533 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp0_ = old_page; -#line 689 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 533 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp1_ = new_page; -#line 689 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 533 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" APP_WINDOW_CLASS (library_window_parent_class)->update_common_action_availability (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_APP_WINDOW, AppWindow), _tmp0_, _tmp1_); -#line 691 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 535 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp2_ = new_page; -#line 691 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 535 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" is_checkerboard = G_TYPE_CHECK_INSTANCE_TYPE (_tmp2_, TYPE_CHECKERBOARD_PAGE); -#line 693 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 537 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" app_window_set_common_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_APP_WINDOW, AppWindow), "CommonDisplaySearchbar", is_checkerboard); -#line 694 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 538 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" app_window_set_common_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_APP_WINDOW, AppWindow), "CommonFind", is_checkerboard); -#line 5783 "LibraryWindow.c" +#line 4192 "LibraryWindow.c" } @@ -5797,61 +4206,61 @@ static void library_window_real_update_common_actions (AppWindow* base, Page* pa Page* _tmp6_ = NULL; gint _tmp7_ = 0; gint _tmp8_ = 0; -#line 697 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 541 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_LIBRARY_WINDOW, LibraryWindow); -#line 697 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 541 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" g_return_if_fail (IS_PAGE (page)); -#line 703 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 547 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp0_ = page; -#line 703 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 547 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp3_ = library_window_get_fullscreen_photo (self, _tmp0_, &_tmp1_, &_tmp2_, NULL); -#line 703 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 547 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _g_object_unref0 (collection); -#line 703 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 547 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" collection = _tmp1_; -#line 703 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 547 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _g_object_unref0 (start); -#line 703 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 547 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" start = _tmp2_; -#line 703 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 547 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" can_fullscreen = _tmp3_; -#line 705 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 549 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp4_ = library_window_can_empty_trash (self); -#line 705 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 549 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" app_window_set_common_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_APP_WINDOW, AppWindow), "CommonEmptyTrash", _tmp4_); -#line 706 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 550 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" app_window_set_common_action_visible (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_APP_WINDOW, AppWindow), "CommonJumpToEvent", TRUE); -#line 707 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 551 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp5_ = library_window_can_jump_to_event (self); -#line 707 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 551 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" app_window_set_common_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_APP_WINDOW, AppWindow), "CommonJumpToEvent", _tmp5_); -#line 708 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 552 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" app_window_set_common_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_APP_WINDOW, AppWindow), "CommonFullscreen", can_fullscreen); -#line 710 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 554 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp6_ = page; -#line 710 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 554 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp7_ = selected_count; -#line 710 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 554 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp8_ = count; -#line 710 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 554 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" APP_WINDOW_CLASS (library_window_parent_class)->update_common_actions (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_APP_WINDOW, AppWindow), _tmp6_, _tmp7_, _tmp8_); -#line 697 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 541 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _g_object_unref0 (start); -#line 697 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 541 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _g_object_unref0 (collection); -#line 5843 "LibraryWindow.c" +#line 4252 "LibraryWindow.c" } static void library_window_on_trashcan_contents_altered (LibraryWindow* self) { gboolean _tmp0_ = FALSE; -#line 713 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 557 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" g_return_if_fail (IS_LIBRARY_WINDOW (self)); -#line 714 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 558 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp0_ = library_window_can_empty_trash (self); -#line 714 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 558 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" app_window_set_common_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_APP_WINDOW, AppWindow), "CommonEmptyTrash", _tmp0_); -#line 5855 "LibraryWindow.c" +#line 4264 "LibraryWindow.c" } @@ -5860,33 +4269,33 @@ static gboolean library_window_can_empty_trash (LibraryWindow* self) { gboolean _tmp0_ = FALSE; LibraryPhotoSourceCollection* _tmp1_ = NULL; gint _tmp2_ = 0; -#line 717 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 561 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" g_return_val_if_fail (IS_LIBRARY_WINDOW (self), FALSE); -#line 718 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 562 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp1_ = library_photo_global; -#line 718 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 562 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp2_ = media_source_collection_get_trashcan_count (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, TYPE_MEDIA_SOURCE_COLLECTION, MediaSourceCollection)); -#line 718 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 562 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" if (_tmp2_ > 0) { -#line 718 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 562 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp0_ = TRUE; -#line 5874 "LibraryWindow.c" +#line 4283 "LibraryWindow.c" } else { VideoSourceCollection* _tmp3_ = NULL; gint _tmp4_ = 0; -#line 718 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 562 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp3_ = video_global; -#line 718 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 562 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp4_ = media_source_collection_get_trashcan_count (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, TYPE_MEDIA_SOURCE_COLLECTION, MediaSourceCollection)); -#line 718 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 562 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp0_ = _tmp4_ > 0; -#line 5884 "LibraryWindow.c" +#line 4293 "LibraryWindow.c" } -#line 718 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 562 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" result = _tmp0_; -#line 718 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 562 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" return result; -#line 5890 "LibraryWindow.c" +#line 4299 "LibraryWindow.c" } @@ -5903,66 +4312,66 @@ static void library_window_on_empty_trash (LibraryWindow* self) { const gchar* _tmp8_ = NULL; CommandManager* _tmp9_ = NULL; CommandManager* _tmp10_ = NULL; -#line 721 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 565 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" g_return_if_fail (IS_LIBRARY_WINDOW (self)); -#line 722 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 566 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp0_ = gee_array_list_new (TYPE_MEDIA_SOURCE, (GBoxedCopyFunc) g_object_ref, g_object_unref, NULL, NULL, NULL); -#line 722 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 566 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" to_remove = _tmp0_; -#line 723 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 567 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp1_ = library_photo_global; -#line 723 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 567 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp2_ = media_source_collection_get_trashcan_contents (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, TYPE_MEDIA_SOURCE_COLLECTION, MediaSourceCollection)); -#line 723 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 567 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp3_ = _tmp2_; -#line 723 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 567 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" gee_array_list_add_all (to_remove, _tmp3_); -#line 723 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 567 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _g_object_unref0 (_tmp3_); -#line 724 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 568 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp4_ = video_global; -#line 724 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 568 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp5_ = media_source_collection_get_trashcan_contents (G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, TYPE_MEDIA_SOURCE_COLLECTION, MediaSourceCollection)); -#line 724 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 568 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp6_ = _tmp5_; -#line 724 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 568 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" gee_array_list_add_all (to_remove, _tmp6_); -#line 724 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 568 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _g_object_unref0 (_tmp6_); -#line 726 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 570 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp7_ = _ ("Empty Trash"); -#line 726 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 570 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp8_ = _ ("Emptying Trash…"); -#line 726 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 570 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" remove_from_app (G_TYPE_CHECK_INSTANCE_CAST (to_remove, GEE_TYPE_COLLECTION, GeeCollection), _tmp7_, _tmp8_); -#line 728 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 572 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp9_ = app_window_get_command_manager (); -#line 728 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 572 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp10_ = _tmp9_; -#line 728 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 572 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" command_manager_reset (_tmp10_); -#line 728 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 572 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _command_manager_unref0 (_tmp10_); -#line 721 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 565 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _g_object_unref0 (to_remove); -#line 5949 "LibraryWindow.c" +#line 4358 "LibraryWindow.c" } static void library_window_on_new_search (LibraryWindow* self) { SavedSearchDialog* _tmp0_ = NULL; SavedSearchDialog* _tmp1_ = NULL; -#line 731 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 575 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" g_return_if_fail (IS_LIBRARY_WINDOW (self)); -#line 732 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 576 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp0_ = saved_search_dialog_new (); -#line 732 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 576 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp1_ = _tmp0_; -#line 732 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 576 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" saved_search_dialog_show (_tmp1_); -#line 732 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 576 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _saved_search_dialog_unref0 (_tmp1_); -#line 5966 "LibraryWindow.c" +#line 4375 "LibraryWindow.c" } @@ -5975,115 +4384,115 @@ static gboolean library_window_can_jump_to_event (LibraryWindow* self) { ViewCollection* _tmp3_ = NULL; ViewCollection* _tmp4_ = NULL; gint _tmp5_ = 0; -#line 735 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 579 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" g_return_val_if_fail (IS_LIBRARY_WINDOW (self), FALSE); -#line 736 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 580 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp0_ = page_window_get_current_page (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE_WINDOW, PageWindow)); -#line 736 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 580 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp1_ = _tmp0_; -#line 736 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 580 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp2_ = page_get_view (_tmp1_); -#line 736 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 580 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp3_ = _tmp2_; -#line 736 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 580 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _g_object_unref0 (_tmp1_); -#line 736 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 580 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" view = _tmp3_; -#line 737 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 581 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp4_ = view; -#line 737 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 581 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp5_ = view_collection_get_selected_count (_tmp4_); -#line 737 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 581 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" if (_tmp5_ == 1) { -#line 5999 "LibraryWindow.c" +#line 4408 "LibraryWindow.c" DataSource* selected_source = NULL; ViewCollection* _tmp6_ = NULL; DataSource* _tmp7_ = NULL; DataSource* _tmp8_ = NULL; -#line 738 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 582 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp6_ = view; -#line 738 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 582 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp7_ = view_collection_get_selected_source_at (_tmp6_, 0); -#line 738 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 582 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" selected_source = _tmp7_; -#line 739 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 583 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp8_ = selected_source; -#line 739 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 583 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" if (G_TYPE_CHECK_INSTANCE_TYPE (_tmp8_, TYPE_EVENT)) { -#line 740 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 584 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" result = TRUE; -#line 740 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 584 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _g_object_unref0 (selected_source); -#line 740 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 584 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _data_collection_unref0 (view); -#line 740 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 584 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" return result; -#line 6022 "LibraryWindow.c" +#line 4431 "LibraryWindow.c" } else { DataSource* _tmp9_ = NULL; -#line 741 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 585 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp9_ = selected_source; -#line 741 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 585 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" if (G_TYPE_CHECK_INSTANCE_TYPE (_tmp9_, TYPE_MEDIA_SOURCE)) { -#line 6029 "LibraryWindow.c" +#line 4438 "LibraryWindow.c" ViewCollection* _tmp10_ = NULL; DataSource* _tmp11_ = NULL; MediaSource* _tmp12_ = NULL; Event* _tmp13_ = NULL; Event* _tmp14_ = NULL; gboolean _tmp15_ = FALSE; -#line 742 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 586 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp10_ = view; -#line 742 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 586 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp11_ = view_collection_get_selected_source_at (_tmp10_, 0); -#line 742 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 586 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp12_ = G_TYPE_CHECK_INSTANCE_CAST (_tmp11_, TYPE_MEDIA_SOURCE, MediaSource); -#line 742 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 586 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp13_ = media_source_get_event (_tmp12_); -#line 742 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 586 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp14_ = _tmp13_; -#line 742 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 586 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp15_ = _tmp14_ != NULL; -#line 742 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 586 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _g_object_unref0 (_tmp14_); -#line 742 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 586 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _g_object_unref0 (_tmp12_); -#line 742 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 586 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" result = _tmp15_; -#line 742 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 586 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _g_object_unref0 (selected_source); -#line 742 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 586 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _data_collection_unref0 (view); -#line 742 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 586 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" return result; -#line 6060 "LibraryWindow.c" +#line 4469 "LibraryWindow.c" } else { -#line 744 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 588 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" result = FALSE; -#line 744 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 588 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _g_object_unref0 (selected_source); -#line 744 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 588 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _data_collection_unref0 (view); -#line 744 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 588 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" return result; -#line 6070 "LibraryWindow.c" +#line 4479 "LibraryWindow.c" } } -#line 737 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 581 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _g_object_unref0 (selected_source); -#line 6075 "LibraryWindow.c" +#line 4484 "LibraryWindow.c" } else { -#line 746 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 590 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" result = FALSE; -#line 746 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 590 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _data_collection_unref0 (view); -#line 746 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 590 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" return result; -#line 6083 "LibraryWindow.c" +#line 4492 "LibraryWindow.c" } -#line 735 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 579 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _data_collection_unref0 (view); -#line 6087 "LibraryWindow.c" +#line 4496 "LibraryWindow.c" } @@ -6104,409 +4513,519 @@ static void library_window_on_jump_to_event (LibraryWindow* self) { Event* _tmp11_ = NULL; Event* _tmp12_ = NULL; gboolean _tmp13_ = FALSE; -#line 750 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 594 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" g_return_if_fail (IS_LIBRARY_WINDOW (self)); -#line 751 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 595 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp0_ = page_window_get_current_page (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE_WINDOW, PageWindow)); -#line 751 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 595 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp1_ = _tmp0_; -#line 751 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 595 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp2_ = page_get_view (_tmp1_); -#line 751 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 595 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp3_ = _tmp2_; -#line 751 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 595 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _g_object_unref0 (_tmp1_); -#line 751 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 595 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" view = _tmp3_; -#line 753 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 597 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp4_ = view; -#line 753 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 597 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp5_ = view_collection_get_selected_count (_tmp4_); -#line 753 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 597 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" if (_tmp5_ != 1) { -#line 754 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 598 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _data_collection_unref0 (view); -#line 754 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 598 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" return; -#line 6132 "LibraryWindow.c" +#line 4541 "LibraryWindow.c" } -#line 756 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 600 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp6_ = view; -#line 756 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 600 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp7_ = view_collection_get_selected_source_at (_tmp6_, 0); -#line 756 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 600 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp8_ = G_TYPE_CHECK_INSTANCE_TYPE (_tmp7_, TYPE_MEDIA_SOURCE) ? ((MediaSource*) _tmp7_) : NULL; -#line 756 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 600 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" if (_tmp8_ == NULL) { -#line 756 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 600 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _g_object_unref0 (_tmp7_); -#line 6144 "LibraryWindow.c" +#line 4553 "LibraryWindow.c" } -#line 756 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 600 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" media = _tmp8_; -#line 757 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 601 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp9_ = media; -#line 757 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 601 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" if (_tmp9_ == NULL) { -#line 758 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 602 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _g_object_unref0 (media); -#line 758 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 602 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _data_collection_unref0 (view); -#line 758 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 602 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" return; -#line 6158 "LibraryWindow.c" +#line 4567 "LibraryWindow.c" } -#line 760 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 604 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp10_ = media; -#line 760 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 604 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp11_ = media_source_get_event (_tmp10_); -#line 760 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 604 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp12_ = _tmp11_; -#line 760 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 604 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp13_ = _tmp12_ != NULL; -#line 760 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 604 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _g_object_unref0 (_tmp12_); -#line 760 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 604 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" if (_tmp13_) { -#line 6172 "LibraryWindow.c" +#line 4581 "LibraryWindow.c" MediaSource* _tmp14_ = NULL; Event* _tmp15_ = NULL; Event* _tmp16_ = NULL; -#line 761 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 605 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp14_ = media; -#line 761 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 605 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp15_ = media_source_get_event (_tmp14_); -#line 761 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 605 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp16_ = _tmp15_; -#line 761 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 605 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" library_window_switch_to_event (self, _tmp16_); -#line 761 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 605 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _g_object_unref0 (_tmp16_); -#line 6186 "LibraryWindow.c" +#line 4595 "LibraryWindow.c" } -#line 750 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 594 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _g_object_unref0 (media); -#line 750 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 594 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _data_collection_unref0 (view); -#line 6192 "LibraryWindow.c" +#line 4601 "LibraryWindow.c" +} + + +static GVariant* _variant_new2 (gboolean value) { +#line 610 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" + return g_variant_ref_sink (g_variant_new_boolean (value)); +#line 4608 "LibraryWindow.c" } static void library_window_on_find (LibraryWindow* self) { - GtkToggleAction* action = NULL; - Page* _tmp0_ = NULL; - Page* _tmp1_ = NULL; - GtkAction* _tmp2_ = NULL; - GtkToggleAction* _tmp3_ = NULL; - SearchFilterToolbar* _tmp4_ = NULL; -#line 764 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" + GAction* action = NULL; + GAction* _tmp0_ = NULL; + GAction* _tmp1_ = NULL; + GVariant* _tmp2_ = NULL; + SearchFilterToolbar* _tmp3_ = NULL; +#line 608 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" g_return_if_fail (IS_LIBRARY_WINDOW (self)); -#line 765 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp0_ = page_window_get_current_page (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE_WINDOW, PageWindow)); -#line 765 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp1_ = _tmp0_; -#line 765 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp2_ = page_get_common_action (_tmp1_, "CommonDisplaySearchbar", TRUE); -#line 765 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp3_ = G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, gtk_toggle_action_get_type (), GtkToggleAction); -#line 765 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _g_object_unref0 (_tmp1_); -#line 765 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - action = _tmp3_; -#line 767 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - gtk_toggle_action_set_active (action, TRUE); -#line 770 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp4_ = self->priv->search_toolbar; -#line 770 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - search_filter_toolbar_take_focus (_tmp4_); -#line 764 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 609 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" + _tmp0_ = g_action_map_lookup_action (G_TYPE_CHECK_INSTANCE_CAST (self, g_action_map_get_type (), GActionMap), "CommonDisplaySearchbar"); +#line 609 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" + _tmp1_ = _g_object_ref0 (_tmp0_); +#line 609 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" + action = _tmp1_; +#line 610 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" + _tmp2_ = _variant_new2 (TRUE); +#line 610 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" + g_action_change_state (action, _tmp2_); +#line 610 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" + _g_variant_unref0 (_tmp2_); +#line 613 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" + _tmp3_ = self->priv->search_toolbar; +#line 613 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" + search_filter_toolbar_take_focus (_tmp3_); +#line 608 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _g_object_unref0 (action); -#line 6225 "LibraryWindow.c" +#line 4638 "LibraryWindow.c" } static void library_window_on_media_altered (LibraryWindow* self) { gboolean _tmp0_ = FALSE; -#line 773 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 616 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" g_return_if_fail (IS_LIBRARY_WINDOW (self)); -#line 774 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 617 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp0_ = library_window_can_jump_to_event (self); -#line 774 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 617 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" app_window_set_common_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_APP_WINDOW, AppWindow), "CommonJumpToEvent", _tmp0_); -#line 6237 "LibraryWindow.c" +#line 4650 "LibraryWindow.c" } static void library_window_on_clear_search (LibraryWindow* self) { gboolean _tmp0_ = FALSE; -#line 777 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 620 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" g_return_if_fail (IS_LIBRARY_WINDOW (self)); -#line 778 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 621 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp0_ = self->priv->is_search_toolbar_visible; -#line 778 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 621 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" if (_tmp0_) { -#line 6249 "LibraryWindow.c" +#line 4662 "LibraryWindow.c" SearchFilterActions* _tmp1_ = NULL; -#line 779 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 622 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp1_ = self->priv->search_actions; -#line 779 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 622 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" search_filter_actions_reset (_tmp1_); -#line 6255 "LibraryWindow.c" +#line 4668 "LibraryWindow.c" } } gint library_window_get_events_sort (LibraryWindow* self) { gint result = 0; - GtkRadioAction* action = NULL; - GtkAction* _tmp0_ = NULL; - GtkRadioAction* _tmp1_ = NULL; + GSimpleAction* action = NULL; + GAction* _tmp0_ = NULL; + GSimpleAction* _tmp1_ = NULL; gint _tmp2_ = 0; - GtkRadioAction* _tmp3_ = NULL; -#line 782 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" + GSimpleAction* _tmp3_ = NULL; +#line 625 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" g_return_val_if_fail (IS_LIBRARY_WINDOW (self), 0); -#line 783 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp0_ = app_window_get_common_action (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_APP_WINDOW, AppWindow), "CommonSortEventsAscending"); -#line 783 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp1_ = G_TYPE_CHECK_INSTANCE_TYPE (_tmp0_, gtk_radio_action_get_type ()) ? ((GtkRadioAction*) _tmp0_) : NULL; -#line 783 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - if (_tmp1_ == NULL) { -#line 783 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _g_object_unref0 (_tmp0_); -#line 6277 "LibraryWindow.c" - } -#line 783 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 626 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" + _tmp0_ = g_action_map_lookup_action (G_TYPE_CHECK_INSTANCE_CAST (self, g_action_map_get_type (), GActionMap), "CommonSortEvents"); +#line 626 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" + _tmp1_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp0_, g_simple_action_get_type ()) ? ((GSimpleAction*) _tmp0_) : NULL); +#line 626 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" action = _tmp1_; -#line 785 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 628 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp3_ = action; -#line 785 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 628 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" if (_tmp3_ != NULL) { -#line 6285 "LibraryWindow.c" - GtkRadioAction* _tmp4_ = NULL; - gint _tmp5_ = 0; - gint _tmp6_ = 0; -#line 785 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp4_ = action; -#line 785 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp5_ = gtk_radio_action_get_current_value (_tmp4_); -#line 785 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp6_ = _tmp5_; -#line 785 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp2_ = _tmp6_; -#line 6297 "LibraryWindow.c" +#line 4692 "LibraryWindow.c" + gint _tmp4_ = 0; + GSimpleAction* _tmp5_ = NULL; + GVariant* _tmp6_ = NULL; + GVariant* _tmp7_ = NULL; + GVariant* _tmp8_ = NULL; + const gchar* _tmp9_ = NULL; + gboolean _tmp10_ = FALSE; +#line 628 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" + _tmp5_ = action; +#line 628 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" + _tmp6_ = g_action_get_state (G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, g_action_get_type (), GAction)); +#line 628 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" + _tmp7_ = _tmp6_; +#line 628 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" + _tmp8_ = _tmp7_; +#line 628 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" + _tmp9_ = g_variant_get_string (_tmp8_, NULL); +#line 628 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" + _tmp10_ = g_strcmp0 (_tmp9_, LIBRARY_WINDOW_SORT_EVENTS_ORDER_ASCENDING) == 0; +#line 628 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" + _g_variant_unref0 (_tmp8_); +#line 628 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" + if (_tmp10_) { +#line 629 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" + _tmp4_ = 0; +#line 4718 "LibraryWindow.c" + } else { +#line 629 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" + _tmp4_ = 1; +#line 4722 "LibraryWindow.c" + } +#line 628 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" + _tmp2_ = _tmp4_; +#line 4726 "LibraryWindow.c" } else { -#line 785 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp2_ = LIBRARY_WINDOW_SORT_EVENTS_ORDER_DESCENDING; -#line 6301 "LibraryWindow.c" +#line 630 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" + _tmp2_ = 1; +#line 4730 "LibraryWindow.c" } -#line 785 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 628 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" result = _tmp2_; -#line 785 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 628 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _g_object_unref0 (action); -#line 785 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 628 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" return result; -#line 6309 "LibraryWindow.c" +#line 4738 "LibraryWindow.c" } -static void library_window_on_events_sort_changed (LibraryWindow* self, GtkAction* action, GtkAction* c) { - GtkRadioAction* current = NULL; - GtkAction* _tmp0_ = NULL; - GtkRadioAction* _tmp1_ = NULL; - ConfigFacade* _tmp2_ = NULL; - ConfigFacade* _tmp3_ = NULL; - gint _tmp4_ = 0; - gint _tmp5_ = 0; -#line 788 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +static void library_window_on_events_sort_changed (LibraryWindow* self, GSimpleAction* action, GVariant* value) { + ConfigFacade* _tmp0_ = NULL; + ConfigFacade* _tmp1_ = NULL; + GVariant* _tmp2_ = NULL; + const gchar* _tmp3_ = NULL; + GSimpleAction* _tmp4_ = NULL; + GVariant* _tmp5_ = NULL; +#line 633 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" g_return_if_fail (IS_LIBRARY_WINDOW (self)); -#line 788 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - g_return_if_fail (GTK_IS_ACTION (action)); -#line 788 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - g_return_if_fail (GTK_IS_ACTION (c)); -#line 789 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp0_ = c; -#line 789 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp1_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, gtk_radio_action_get_type (), GtkRadioAction)); -#line 789 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - current = _tmp1_; -#line 791 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp2_ = config_facade_get_instance (); -#line 791 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp3_ = _tmp2_; -#line 791 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp4_ = gtk_radio_action_get_current_value (current); -#line 791 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp5_ = _tmp4_; -#line 791 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - configuration_facade_set_events_sort_ascending (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade), _tmp5_ == LIBRARY_WINDOW_SORT_EVENTS_ORDER_ASCENDING); -#line 791 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _g_object_unref0 (_tmp3_); -#line 788 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _g_object_unref0 (current); -#line 6347 "LibraryWindow.c" +#line 633 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" + g_return_if_fail (G_IS_SIMPLE_ACTION (action)); +#line 635 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" + _tmp0_ = config_facade_get_instance (); +#line 635 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" + _tmp1_ = _tmp0_; +#line 635 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" + _tmp2_ = value; +#line 635 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" + _tmp3_ = g_variant_get_string (_tmp2_, NULL); +#line 635 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" + configuration_facade_set_events_sort_ascending (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade), g_strcmp0 (_tmp3_, LIBRARY_WINDOW_SORT_EVENTS_ORDER_ASCENDING) == 0); +#line 635 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" + _g_object_unref0 (_tmp1_); +#line 638 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" + _tmp4_ = action; +#line 638 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" + _tmp5_ = value; +#line 638 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" + g_simple_action_set_state (_tmp4_, _tmp5_); +#line 4771 "LibraryWindow.c" } static void library_window_on_preferences (LibraryWindow* self) { -#line 795 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 641 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" g_return_if_fail (IS_LIBRARY_WINDOW (self)); -#line 796 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 642 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" preferences_dialog_show (); -#line 6356 "LibraryWindow.c" +#line 4780 "LibraryWindow.c" } -static void library_window_on_display_basic_properties (LibraryWindow* self, GtkAction* action) { +static void library_window_on_display_basic_properties (LibraryWindow* self, GSimpleAction* action, GVariant* value) { gboolean display = FALSE; - GtkAction* _tmp0_ = NULL; + GVariant* _tmp0_ = NULL; gboolean _tmp1_ = FALSE; gboolean _tmp2_ = FALSE; ConfigFacade* _tmp10_ = NULL; ConfigFacade* _tmp11_ = NULL; gboolean _tmp12_ = FALSE; -#line 799 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" + GSimpleAction* _tmp13_ = NULL; + GVariant* _tmp14_ = NULL; +#line 645 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" g_return_if_fail (IS_LIBRARY_WINDOW (self)); -#line 799 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - g_return_if_fail (GTK_IS_ACTION (action)); -#line 800 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp0_ = action; -#line 800 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp1_ = gtk_toggle_action_get_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, gtk_toggle_action_get_type (), GtkToggleAction)); -#line 800 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 645 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" + g_return_if_fail (G_IS_SIMPLE_ACTION (action)); +#line 646 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" + _tmp0_ = value; +#line 646 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" + _tmp1_ = g_variant_get_boolean (_tmp0_); +#line 646 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" display = _tmp1_; -#line 802 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 648 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp2_ = display; -#line 802 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 648 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" if (_tmp2_) { -#line 6382 "LibraryWindow.c" +#line 4808 "LibraryWindow.c" BasicProperties* _tmp3_ = NULL; Page* _tmp4_ = NULL; Page* _tmp5_ = NULL; GtkFrame* _tmp6_ = NULL; -#line 803 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 649 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp3_ = self->priv->basic_properties; -#line 803 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 649 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp4_ = page_window_get_current_page (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE_WINDOW, PageWindow)); -#line 803 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 649 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp5_ = _tmp4_; -#line 803 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 649 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" properties_update_properties (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, TYPE_PROPERTIES, Properties), _tmp5_); -#line 803 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 649 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _g_object_unref0 (_tmp5_); -#line 804 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 650 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp6_ = self->priv->bottom_frame; -#line 804 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 650 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" gtk_widget_show (G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, gtk_widget_get_type (), GtkWidget)); -#line 6401 "LibraryWindow.c" +#line 4827 "LibraryWindow.c" } else { GtkPaned* _tmp7_ = NULL; GtkWidget* _tmp8_ = NULL; -#line 806 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 652 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp7_ = self->priv->sidebar_paned; -#line 806 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 652 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp8_ = gtk_paned_get_child2 (_tmp7_); -#line 806 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 652 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" if (_tmp8_ != NULL) { -#line 6411 "LibraryWindow.c" +#line 4837 "LibraryWindow.c" GtkFrame* _tmp9_ = NULL; -#line 807 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 653 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp9_ = self->priv->bottom_frame; -#line 807 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 653 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" gtk_widget_hide (G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, gtk_widget_get_type (), GtkWidget)); -#line 6417 "LibraryWindow.c" +#line 4843 "LibraryWindow.c" } } -#line 812 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 658 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp10_ = config_facade_get_instance (); -#line 812 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 658 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp11_ = _tmp10_; -#line 812 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 658 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp12_ = display; -#line 812 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 658 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" configuration_facade_set_display_basic_properties (G_TYPE_CHECK_INSTANCE_CAST (_tmp11_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade), _tmp12_); -#line 812 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 658 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _g_object_unref0 (_tmp11_); -#line 6430 "LibraryWindow.c" +#line 659 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" + _tmp13_ = action; +#line 659 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" + _tmp14_ = value; +#line 659 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" + g_simple_action_set_state (_tmp13_, _tmp14_); +#line 4862 "LibraryWindow.c" +} + + +static gboolean _variant_get3 (GVariant* value) { +#line 663 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" + return g_variant_get_boolean (value); +#line 4869 "LibraryWindow.c" +} + + +static GVariant* _variant_new4 (gboolean value) { +#line 663 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" + return g_variant_ref_sink (g_variant_new_boolean (value)); +#line 4876 "LibraryWindow.c" +} + + +static void library_window_on_action_toggle (LibraryWindow* self, GAction* action, GVariant* value) { + GVariant* new_state = NULL; + GAction* _tmp0_ = NULL; + GVariant* _tmp1_ = NULL; + GVariant* _tmp2_ = NULL; + gboolean _tmp3_ = FALSE; + GVariant* _tmp4_ = NULL; + GVariant* _tmp5_ = NULL; + GAction* _tmp6_ = NULL; +#line 662 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" + g_return_if_fail (IS_LIBRARY_WINDOW (self)); +#line 662 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" + g_return_if_fail (G_IS_ACTION (action)); +#line 663 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" + _tmp0_ = action; +#line 663 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" + _tmp1_ = g_action_get_state (_tmp0_); +#line 663 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" + _tmp2_ = _tmp1_; +#line 663 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" + _tmp3_ = _variant_get3 (_tmp2_); +#line 663 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" + _tmp4_ = _variant_new4 (!_tmp3_); +#line 663 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" + _tmp5_ = _tmp4_; +#line 663 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" + _g_variant_unref0 (_tmp2_); +#line 663 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" + new_state = _tmp5_; +#line 664 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" + _tmp6_ = action; +#line 664 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" + g_action_change_state (_tmp6_, new_state); +#line 662 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" + _g_variant_unref0 (new_state); +#line 4915 "LibraryWindow.c" +} + + +static void library_window_on_action_radio (LibraryWindow* self, GAction* action, GVariant* value) { + GAction* _tmp0_ = NULL; + GVariant* _tmp1_ = NULL; +#line 667 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" + g_return_if_fail (IS_LIBRARY_WINDOW (self)); +#line 667 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" + g_return_if_fail (G_IS_ACTION (action)); +#line 668 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" + _tmp0_ = action; +#line 668 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" + _tmp1_ = value; +#line 668 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" + g_action_change_state (_tmp0_, _tmp1_); +#line 4932 "LibraryWindow.c" } -static void library_window_on_display_extended_properties (LibraryWindow* self, GtkAction* action) { +static void library_window_on_display_extended_properties (LibraryWindow* self, GSimpleAction* action, GVariant* value) { gboolean display = FALSE; - GtkAction* _tmp0_ = NULL; + GVariant* _tmp0_ = NULL; gboolean _tmp1_ = FALSE; gboolean _tmp2_ = FALSE; -#line 815 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" + GSimpleAction* _tmp8_ = NULL; + GVariant* _tmp9_ = NULL; +#line 671 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" g_return_if_fail (IS_LIBRARY_WINDOW (self)); -#line 815 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - g_return_if_fail (GTK_IS_ACTION (action)); -#line 816 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp0_ = action; -#line 816 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp1_ = gtk_toggle_action_get_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, gtk_toggle_action_get_type (), GtkToggleAction)); -#line 816 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 671 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" + g_return_if_fail (G_IS_SIMPLE_ACTION (action)); +#line 672 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" + _tmp0_ = value; +#line 672 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" + _tmp1_ = g_variant_get_boolean (_tmp0_); +#line 672 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" display = _tmp1_; -#line 818 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 674 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp2_ = display; -#line 818 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 674 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" if (_tmp2_) { -#line 6453 "LibraryWindow.c" +#line 4957 "LibraryWindow.c" ExtendedPropertiesWindow* _tmp3_ = NULL; Page* _tmp4_ = NULL; Page* _tmp5_ = NULL; ExtendedPropertiesWindow* _tmp6_ = NULL; -#line 819 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 675 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp3_ = self->priv->extended_properties; -#line 819 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 675 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp4_ = page_window_get_current_page (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE_WINDOW, PageWindow)); -#line 819 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 675 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp5_ = _tmp4_; -#line 819 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 675 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" extended_properties_window_update_properties (_tmp3_, _tmp5_); -#line 819 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 675 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _g_object_unref0 (_tmp5_); -#line 820 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 676 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp6_ = self->priv->extended_properties; -#line 820 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 676 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" gtk_widget_show_all (G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, gtk_widget_get_type (), GtkWidget)); -#line 6472 "LibraryWindow.c" +#line 4976 "LibraryWindow.c" } else { ExtendedPropertiesWindow* _tmp7_ = NULL; -#line 822 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 678 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp7_ = self->priv->extended_properties; -#line 822 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 678 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" gtk_widget_hide (G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, gtk_widget_get_type (), GtkWidget)); -#line 6479 "LibraryWindow.c" +#line 4983 "LibraryWindow.c" } +#line 681 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" + _tmp8_ = action; +#line 681 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" + _tmp9_ = value; +#line 681 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" + g_simple_action_set_state (_tmp8_, _tmp9_); +#line 4991 "LibraryWindow.c" } -static void library_window_on_display_searchbar (LibraryWindow* self, GtkAction* action) { +static void library_window_on_display_searchbar (LibraryWindow* self, GSimpleAction* action, GVariant* value) { gboolean is_shown = FALSE; - GtkAction* _tmp0_ = NULL; + GVariant* _tmp0_ = NULL; gboolean _tmp1_ = FALSE; ConfigFacade* _tmp2_ = NULL; ConfigFacade* _tmp3_ = NULL; -#line 826 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" + GSimpleAction* _tmp4_ = NULL; + GVariant* _tmp5_ = NULL; +#line 684 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" g_return_if_fail (IS_LIBRARY_WINDOW (self)); -#line 826 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - g_return_if_fail (GTK_IS_ACTION (action)); -#line 827 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp0_ = action; -#line 827 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp1_ = gtk_toggle_action_get_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, gtk_toggle_action_get_type (), GtkToggleAction)); -#line 827 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 684 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" + g_return_if_fail (G_IS_SIMPLE_ACTION (action)); +#line 685 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" + _tmp0_ = value; +#line 685 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" + _tmp1_ = g_variant_get_boolean (_tmp0_); +#line 685 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" is_shown = _tmp1_; -#line 828 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 687 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp2_ = config_facade_get_instance (); -#line 828 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 687 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp3_ = _tmp2_; -#line 828 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 687 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" configuration_facade_set_display_search_bar (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade), is_shown); -#line 828 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 687 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _g_object_unref0 (_tmp3_); -#line 829 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 688 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" library_window_show_search_bar (self, is_shown); -#line 6510 "LibraryWindow.c" +#line 690 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" + _tmp4_ = action; +#line 690 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" + _tmp5_ = value; +#line 690 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" + g_simple_action_set_state (_tmp4_, _tmp5_); +#line 5029 "LibraryWindow.c" } @@ -6520,73 +5039,81 @@ void library_window_show_search_bar (LibraryWindow* self, gboolean display) { CheckerboardPage* _tmp6_ = NULL; CheckerboardPage* _tmp7_ = NULL; gboolean _tmp8_ = FALSE; -#line 832 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 693 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" g_return_if_fail (IS_LIBRARY_WINDOW (self)); -#line 833 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 694 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp0_ = page_window_get_current_page (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE_WINDOW, PageWindow)); -#line 833 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 694 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp1_ = _tmp0_; -#line 833 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 694 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp2_ = !G_TYPE_CHECK_INSTANCE_TYPE (_tmp1_, TYPE_CHECKERBOARD_PAGE); -#line 833 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 694 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _g_object_unref0 (_tmp1_); -#line 833 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 694 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" if (_tmp2_) { -#line 834 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 695 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" return; -#line 6538 "LibraryWindow.c" +#line 5057 "LibraryWindow.c" } -#line 836 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 697 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp3_ = display; -#line 836 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 697 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" self->priv->is_search_toolbar_visible = _tmp3_; -#line 837 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 698 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp4_ = library_window_should_show_search_bar (self); -#line 837 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 698 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp5_ = page_window_get_current_page (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE_WINDOW, PageWindow)); -#line 837 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 698 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp6_ = G_TYPE_CHECK_INSTANCE_TYPE (_tmp5_, TYPE_CHECKERBOARD_PAGE) ? ((CheckerboardPage*) _tmp5_) : NULL; -#line 837 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 698 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" if (_tmp6_ == NULL) { -#line 837 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 698 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _g_object_unref0 (_tmp5_); -#line 6554 "LibraryWindow.c" +#line 5073 "LibraryWindow.c" } -#line 837 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 698 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp7_ = _tmp6_; -#line 837 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 698 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" library_window_toggle_search_bar (self, _tmp4_, _tmp7_); -#line 837 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 698 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _g_object_unref0 (_tmp7_); -#line 838 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 699 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp8_ = display; -#line 838 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 699 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" if (!_tmp8_) { -#line 6566 "LibraryWindow.c" +#line 5085 "LibraryWindow.c" SearchFilterActions* _tmp9_ = NULL; -#line 839 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 700 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp9_ = self->priv->search_actions; -#line 839 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 700 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" search_filter_actions_reset (_tmp9_); -#line 6572 "LibraryWindow.c" +#line 5091 "LibraryWindow.c" } } -static void library_window_on_display_sidebar (LibraryWindow* self, GtkAction* action) { - GtkAction* _tmp0_ = NULL; +static void library_window_on_display_sidebar (LibraryWindow* self, GSimpleAction* action, GVariant* variant) { + GVariant* _tmp0_ = NULL; gboolean _tmp1_ = FALSE; -#line 842 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" + GSimpleAction* _tmp2_ = NULL; + GVariant* _tmp3_ = NULL; +#line 703 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" g_return_if_fail (IS_LIBRARY_WINDOW (self)); -#line 842 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - g_return_if_fail (GTK_IS_ACTION (action)); -#line 843 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp0_ = action; -#line 843 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp1_ = gtk_toggle_action_get_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, gtk_toggle_action_get_type (), GtkToggleAction)); -#line 843 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 703 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" + g_return_if_fail (G_IS_SIMPLE_ACTION (action)); +#line 704 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" + _tmp0_ = variant; +#line 704 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" + _tmp1_ = g_variant_get_boolean (_tmp0_); +#line 704 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" library_window_set_sidebar_visible (self, _tmp1_); -#line 6590 "LibraryWindow.c" +#line 706 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" + _tmp2_ = action; +#line 706 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" + _tmp3_ = variant; +#line 706 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" + g_simple_action_set_state (_tmp2_, _tmp3_); +#line 5117 "LibraryWindow.c" } @@ -6596,25 +5123,25 @@ static void library_window_set_sidebar_visible (LibraryWindow* self, gboolean vi ConfigFacade* _tmp2_ = NULL; ConfigFacade* _tmp3_ = NULL; gboolean _tmp4_ = FALSE; -#line 847 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 709 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" g_return_if_fail (IS_LIBRARY_WINDOW (self)); -#line 848 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 710 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp0_ = self->priv->sidebar_paned; -#line 848 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 710 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp1_ = visible; -#line 848 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 710 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" gtk_widget_set_visible (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, gtk_widget_get_type (), GtkWidget), _tmp1_); -#line 849 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 711 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp2_ = config_facade_get_instance (); -#line 849 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 711 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp3_ = _tmp2_; -#line 849 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 711 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp4_ = visible; -#line 849 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 711 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" configuration_facade_set_display_sidebar (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade), _tmp4_); -#line 849 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 711 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _g_object_unref0 (_tmp3_); -#line 6618 "LibraryWindow.c" +#line 5145 "LibraryWindow.c" } @@ -6624,40 +5151,48 @@ static gboolean library_window_is_sidebar_visible (LibraryWindow* self) { ConfigFacade* _tmp1_ = NULL; gboolean _tmp2_ = FALSE; gboolean _tmp3_ = FALSE; -#line 852 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 714 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" g_return_val_if_fail (IS_LIBRARY_WINDOW (self), FALSE); -#line 853 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 715 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp0_ = config_facade_get_instance (); -#line 853 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 715 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp1_ = _tmp0_; -#line 853 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 715 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp2_ = configuration_facade_get_display_sidebar (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade)); -#line 853 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 715 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp3_ = _tmp2_; -#line 853 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 715 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _g_object_unref0 (_tmp1_); -#line 853 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 715 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" result = _tmp3_; -#line 853 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 715 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" return result; -#line 6644 "LibraryWindow.c" +#line 5171 "LibraryWindow.c" } -static void library_window_on_display_toolbar (LibraryWindow* self, GtkAction* action) { - GtkAction* _tmp0_ = NULL; +static void library_window_on_display_toolbar (LibraryWindow* self, GSimpleAction* action, GVariant* variant) { + GVariant* _tmp0_ = NULL; gboolean _tmp1_ = FALSE; -#line 856 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" + GSimpleAction* _tmp2_ = NULL; + GVariant* _tmp3_ = NULL; +#line 718 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" g_return_if_fail (IS_LIBRARY_WINDOW (self)); -#line 856 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - g_return_if_fail (GTK_IS_ACTION (action)); -#line 857 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp0_ = action; -#line 857 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp1_ = gtk_toggle_action_get_active (G_TYPE_CHECK_INSTANCE_TYPE (_tmp0_, gtk_toggle_action_get_type ()) ? ((GtkToggleAction*) _tmp0_) : NULL); -#line 857 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 718 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" + g_return_if_fail (G_IS_SIMPLE_ACTION (action)); +#line 719 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" + _tmp0_ = variant; +#line 719 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" + _tmp1_ = g_variant_get_boolean (_tmp0_); +#line 719 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" library_window_set_toolbar_visible (self, _tmp1_); -#line 6661 "LibraryWindow.c" +#line 721 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" + _tmp2_ = action; +#line 721 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" + _tmp3_ = variant; +#line 721 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" + g_simple_action_set_state (_tmp2_, _tmp3_); +#line 5196 "LibraryWindow.c" } @@ -6671,48 +5206,48 @@ static void library_window_set_toolbar_visible (LibraryWindow* self, gboolean vi ConfigFacade* _tmp7_ = NULL; ConfigFacade* _tmp8_ = NULL; gboolean _tmp9_ = FALSE; -#line 860 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 724 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" g_return_if_fail (IS_LIBRARY_WINDOW (self)); -#line 861 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 725 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp0_ = page_window_get_current_page (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE_WINDOW, PageWindow)); -#line 861 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 725 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp1_ = _tmp0_; -#line 861 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 725 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp2_ = page_get_toolbar (_tmp1_); -#line 861 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 725 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp3_ = _tmp2_; -#line 861 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 725 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _g_object_unref0 (_tmp1_); -#line 861 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 725 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" toolbar = _tmp3_; -#line 862 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 726 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp4_ = toolbar; -#line 862 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 726 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" if (_tmp4_ != NULL) { -#line 6693 "LibraryWindow.c" +#line 5228 "LibraryWindow.c" GtkToolbar* _tmp5_ = NULL; gboolean _tmp6_ = FALSE; -#line 863 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 727 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp5_ = toolbar; -#line 863 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 727 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp6_ = visible; -#line 863 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 727 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" gtk_widget_set_visible (G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, gtk_widget_get_type (), GtkWidget), _tmp6_); -#line 6702 "LibraryWindow.c" +#line 5237 "LibraryWindow.c" } -#line 865 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 729 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp7_ = config_facade_get_instance (); -#line 865 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 729 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp8_ = _tmp7_; -#line 865 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 729 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp9_ = visible; -#line 865 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 729 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" configuration_facade_set_display_toolbar (G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade), _tmp9_); -#line 865 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 729 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _g_object_unref0 (_tmp8_); -#line 860 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 724 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _g_object_unref0 (toolbar); -#line 6716 "LibraryWindow.c" +#line 5251 "LibraryWindow.c" } @@ -6722,85 +5257,89 @@ static gboolean library_window_is_toolbar_visible (LibraryWindow* self) { ConfigFacade* _tmp1_ = NULL; gboolean _tmp2_ = FALSE; gboolean _tmp3_ = FALSE; -#line 868 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 732 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" g_return_val_if_fail (IS_LIBRARY_WINDOW (self), FALSE); -#line 869 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 733 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp0_ = config_facade_get_instance (); -#line 869 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 733 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp1_ = _tmp0_; -#line 869 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 733 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp2_ = configuration_facade_get_display_toolbar (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade)); -#line 869 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 733 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp3_ = _tmp2_; -#line 869 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 733 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _g_object_unref0 (_tmp1_); -#line 869 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 733 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" result = _tmp3_; -#line 869 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 733 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" return result; -#line 6742 "LibraryWindow.c" +#line 5277 "LibraryWindow.c" } static void library_window_show_extended_properties (LibraryWindow* self) { -#line 872 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 736 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" g_return_if_fail (IS_LIBRARY_WINDOW (self)); -#line 873 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 737 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" library_window_sync_extended_properties (self, TRUE); -#line 6751 "LibraryWindow.c" +#line 5286 "LibraryWindow.c" } static void library_window_hide_extended_properties (LibraryWindow* self) { -#line 876 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 740 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" g_return_if_fail (IS_LIBRARY_WINDOW (self)); -#line 877 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 741 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" library_window_sync_extended_properties (self, FALSE); -#line 6760 "LibraryWindow.c" +#line 5295 "LibraryWindow.c" +} + + +static GVariant* _variant_new5 (gboolean value) { +#line 746 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" + return g_variant_ref_sink (g_variant_new_boolean (value)); +#line 5302 "LibraryWindow.c" } static void library_window_sync_extended_properties (LibraryWindow* self, gboolean show) { - GtkToggleAction* extended_display_action = NULL; - GtkAction* _tmp0_ = NULL; - GtkToggleAction* _tmp1_ = NULL; + GAction* action = NULL; + GAction* _tmp0_ = NULL; + GAction* _tmp1_ = NULL; gboolean _tmp2_ = FALSE; - ConfigFacade* _tmp3_ = NULL; + GVariant* _tmp3_ = NULL; ConfigFacade* _tmp4_ = NULL; - gboolean _tmp5_ = FALSE; -#line 880 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" + ConfigFacade* _tmp5_ = NULL; + gboolean _tmp6_ = FALSE; +#line 744 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" g_return_if_fail (IS_LIBRARY_WINDOW (self)); -#line 881 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp0_ = app_window_get_common_action (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_APP_WINDOW, AppWindow), "CommonDisplayExtendedProperties"); -#line 881 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp1_ = G_TYPE_CHECK_INSTANCE_TYPE (_tmp0_, gtk_toggle_action_get_type ()) ? ((GtkToggleAction*) _tmp0_) : NULL; -#line 881 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - if (_tmp1_ == NULL) { -#line 881 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _g_object_unref0 (_tmp0_); -#line 6782 "LibraryWindow.c" - } -#line 881 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - extended_display_action = _tmp1_; -#line 883 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _vala_assert (extended_display_action != NULL, "extended_display_action != null"); -#line 884 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 745 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" + _tmp0_ = g_action_map_lookup_action (G_TYPE_CHECK_INSTANCE_CAST (self, g_action_map_get_type (), GActionMap), "CommonDisplayExtendedProperties"); +#line 745 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" + _tmp1_ = _g_object_ref0 (_tmp0_); +#line 745 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" + action = _tmp1_; +#line 746 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp2_ = show; -#line 884 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - gtk_toggle_action_set_active (extended_display_action, _tmp2_); -#line 887 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp3_ = config_facade_get_instance (); -#line 887 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp4_ = _tmp3_; -#line 887 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp5_ = show; -#line 887 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - configuration_facade_set_display_extended_properties (G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade), _tmp5_); -#line 887 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _g_object_unref0 (_tmp4_); -#line 880 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _g_object_unref0 (extended_display_action); -#line 6804 "LibraryWindow.c" +#line 746 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" + _tmp3_ = _variant_new5 (_tmp2_); +#line 746 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" + g_action_change_state (action, _tmp3_); +#line 746 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" + _g_variant_unref0 (_tmp3_); +#line 749 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" + _tmp4_ = config_facade_get_instance (); +#line 749 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" + _tmp5_ = _tmp4_; +#line 749 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" + _tmp6_ = show; +#line 749 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" + configuration_facade_set_display_extended_properties (G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade), _tmp6_); +#line 749 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" + _g_object_unref0 (_tmp5_); +#line 744 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" + _g_object_unref0 (action); +#line 5343 "LibraryWindow.c" } @@ -6810,44 +5349,44 @@ void library_window_enqueue_batch_import (LibraryWindow* self, BatchImport* batc LibraryImportQueueSidebarEntry* _tmp2_ = NULL; BatchImport* _tmp3_ = NULL; gboolean _tmp4_ = FALSE; -#line 890 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 752 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" g_return_if_fail (IS_LIBRARY_WINDOW (self)); -#line 890 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 752 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" g_return_if_fail (IS_BATCH_IMPORT (batch_import)); -#line 891 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 753 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp0_ = self->priv->library_branch; -#line 891 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 753 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp1_ = library_branch_get_import_queue_entry (_tmp0_); -#line 891 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 753 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp2_ = _tmp1_; -#line 891 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 753 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp3_ = batch_import; -#line 891 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 753 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp4_ = allow_user_cancel; -#line 891 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 753 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" library_import_queue_sidebar_entry_enqueue_and_schedule (_tmp2_, _tmp3_, _tmp4_); -#line 6830 "LibraryWindow.c" +#line 5369 "LibraryWindow.c" } static void library_window_import_reporter (LibraryWindow* self, ImportManifest* manifest) { ImportManifest* _tmp0_ = NULL; -#line 894 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 756 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" g_return_if_fail (IS_LIBRARY_WINDOW (self)); -#line 894 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 756 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" g_return_if_fail (IS_IMPORT_MANIFEST (manifest)); -#line 895 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 757 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp0_ = manifest; -#line 895 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 757 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" import_ui_report_manifest (_tmp0_, TRUE, NULL); -#line 6844 "LibraryWindow.c" +#line 5383 "LibraryWindow.c" } static void _library_window_import_reporter_batch_import_import_reporter (ImportManifest* manifest, BatchImportRoll* import_roll, gpointer self) { -#line 926 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 788 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" library_window_import_reporter ((LibraryWindow*) self, manifest); -#line 6851 "LibraryWindow.c" +#line 5390 "LibraryWindow.c" } @@ -6865,43 +5404,43 @@ static void library_window_dispatch_import_jobs (LibraryWindow* self, GSList* ur GeeArrayList* _tmp33_ = NULL; gint _tmp34_ = 0; gint _tmp35_ = 0; -#line 898 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 760 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" g_return_if_fail (IS_LIBRARY_WINDOW (self)); -#line 898 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 760 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" g_return_if_fail (job_name != NULL); -#line 899 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 761 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp1_ = app_dirs_get_import_dir (); -#line 899 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 761 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp2_ = _tmp1_; -#line 899 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 761 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp3_ = g_file_get_path (_tmp2_); -#line 899 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 761 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp4_ = _tmp3_; -#line 899 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 761 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp5_ = g_get_home_dir (); -#line 899 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 761 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp6_ = g_strcmp0 (_tmp4_, _tmp5_) == 0; -#line 899 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 761 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _g_free0 (_tmp4_); -#line 899 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 761 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _g_object_unref0 (_tmp2_); -#line 899 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 761 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" if (_tmp6_) { -#line 6891 "LibraryWindow.c" +#line 5430 "LibraryWindow.c" gboolean _tmp7_ = FALSE; -#line 899 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 761 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp7_ = self->priv->notify_library_is_home_dir; -#line 899 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 761 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp0_ = _tmp7_; -#line 6897 "LibraryWindow.c" +#line 5436 "LibraryWindow.c" } else { -#line 899 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 761 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp0_ = FALSE; -#line 6901 "LibraryWindow.c" +#line 5440 "LibraryWindow.c" } -#line 899 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 761 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" if (_tmp0_) { -#line 6905 "LibraryWindow.c" +#line 5444 "LibraryWindow.c" GtkResponseType response = 0; const gchar* _tmp8_ = NULL; gchar* _tmp9_ = NULL; @@ -6913,65 +5452,65 @@ static void library_window_dispatch_import_jobs (LibraryWindow* self, GSList* ur GtkResponseType _tmp15_ = 0; GtkResponseType _tmp16_ = 0; GtkResponseType _tmp17_ = 0; -#line 900 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 762 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp8_ = _ ("Shotwell is configured to import photos to your home directory.\n" "We recommend changing this in <span weight=\"bold\">Edit %s Preference" \ "s</span>.\n" "Do you want to continue importing photos?"); -#line 900 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 762 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp9_ = g_strdup_printf (_tmp8_, "▸"); -#line 900 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 762 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp10_ = _tmp9_; -#line 900 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 762 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp11_ = _ ("_Import"); -#line 900 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 762 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp12_ = _ ("Library Location"); -#line 900 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 762 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp13_ = app_window_get_instance (); -#line 900 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 762 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp14_ = _tmp13_; -#line 900 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 762 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp15_ = app_window_affirm_cancel_question (_tmp10_, _tmp11_, _tmp12_, G_TYPE_CHECK_INSTANCE_CAST (_tmp14_, gtk_window_get_type (), GtkWindow)); -#line 900 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 762 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp16_ = _tmp15_; -#line 900 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 762 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _g_object_unref0 (_tmp14_); -#line 900 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 762 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _g_free0 (_tmp10_); -#line 900 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 762 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" response = _tmp16_; -#line 906 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 768 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp17_ = response; -#line 906 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 768 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" if (_tmp17_ == GTK_RESPONSE_CANCEL) { -#line 907 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 769 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" return; -#line 6947 "LibraryWindow.c" +#line 5486 "LibraryWindow.c" } -#line 909 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 771 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" self->priv->notify_library_is_home_dir = FALSE; -#line 6951 "LibraryWindow.c" +#line 5490 "LibraryWindow.c" } -#line 912 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 774 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp18_ = gee_array_list_new (TYPE_FILE_IMPORT_JOB, (GBoxedCopyFunc) batch_import_job_ref, batch_import_job_unref, NULL, NULL, NULL); -#line 912 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 774 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" jobs = _tmp18_; -#line 913 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 775 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp19_ = uris; -#line 6959 "LibraryWindow.c" +#line 5498 "LibraryWindow.c" { GSList* uri_collection = NULL; GSList* uri_it = NULL; -#line 913 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 775 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" uri_collection = _tmp19_; -#line 913 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 775 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" for (uri_it = uri_collection; uri_it != NULL; uri_it = uri_it->next) { -#line 6967 "LibraryWindow.c" +#line 5506 "LibraryWindow.c" gchar* _tmp20_ = NULL; gchar* uri = NULL; -#line 913 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 775 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp20_ = g_strdup ((const gchar*) uri_it->data); -#line 913 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 775 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" uri = _tmp20_; -#line 6974 "LibraryWindow.c" +#line 5513 "LibraryWindow.c" { GFile* file_or_dir = NULL; const gchar* _tmp21_ = NULL; @@ -6985,95 +5524,95 @@ static void library_window_dispatch_import_jobs (LibraryWindow* self, GSList* ur gboolean _tmp30_ = FALSE; FileImportJob* _tmp31_ = NULL; FileImportJob* _tmp32_ = NULL; -#line 914 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 776 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp21_ = uri; -#line 914 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 776 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp22_ = g_file_new_for_uri (_tmp21_); -#line 914 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 776 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" file_or_dir = _tmp22_; -#line 915 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 777 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp23_ = file_or_dir; -#line 915 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 777 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp24_ = g_file_get_path (_tmp23_); -#line 915 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 777 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp25_ = _tmp24_; -#line 915 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 777 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp26_ = _tmp25_ == NULL; -#line 915 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 777 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _g_free0 (_tmp25_); -#line 915 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 777 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" if (_tmp26_) { -#line 7006 "LibraryWindow.c" +#line 5545 "LibraryWindow.c" const gchar* _tmp27_ = NULL; -#line 917 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 779 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp27_ = _ ("Photos cannot be imported from this directory."); -#line 917 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 779 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" app_window_error_message (_tmp27_, NULL); -#line 919 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 781 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _g_object_unref0 (file_or_dir); -#line 919 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 781 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _g_free0 (uri); -#line 919 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 781 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" continue; -#line 7018 "LibraryWindow.c" +#line 5557 "LibraryWindow.c" } -#line 922 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 784 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp28_ = jobs; -#line 922 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 784 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp29_ = file_or_dir; -#line 922 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 784 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp30_ = copy_to_library; -#line 922 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 784 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp31_ = file_import_job_new (_tmp29_, _tmp30_); -#line 922 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 784 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp32_ = _tmp31_; -#line 922 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 784 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" gee_abstract_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp28_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), _tmp32_); -#line 922 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 784 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _batch_import_job_unref0 (_tmp32_); -#line 913 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 775 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _g_object_unref0 (file_or_dir); -#line 913 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 775 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _g_free0 (uri); -#line 7038 "LibraryWindow.c" +#line 5577 "LibraryWindow.c" } } } -#line 925 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 787 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp33_ = jobs; -#line 925 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 787 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp34_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp33_, GEE_TYPE_COLLECTION, GeeCollection)); -#line 925 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 787 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp35_ = _tmp34_; -#line 925 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 787 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" if (_tmp35_ > 0) { -#line 7050 "LibraryWindow.c" +#line 5589 "LibraryWindow.c" BatchImport* batch_import = NULL; GeeArrayList* _tmp36_ = NULL; const gchar* _tmp37_ = NULL; BatchImport* _tmp38_ = NULL; BatchImport* _tmp39_ = NULL; -#line 926 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 788 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp36_ = jobs; -#line 926 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 788 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp37_ = job_name; -#line 926 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 788 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp38_ = batch_import_new (G_TYPE_CHECK_INSTANCE_CAST (_tmp36_, GEE_TYPE_ITERABLE, GeeIterable), _tmp37_, _library_window_import_reporter_batch_import_import_reporter, self, NULL, NULL, NULL, NULL, NULL); -#line 926 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 788 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" batch_import = _tmp38_; -#line 927 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 789 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp39_ = batch_import; -#line 927 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 789 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" library_window_enqueue_batch_import (self, _tmp39_, TRUE); -#line 928 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 790 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" library_window_switch_to_import_queue_page (self); -#line 925 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 787 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _g_object_unref0 (batch_import); -#line 7072 "LibraryWindow.c" +#line 5611 "LibraryWindow.c" } -#line 898 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 760 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _g_object_unref0 (jobs); -#line 7076 "LibraryWindow.c" +#line 5615 "LibraryWindow.c" } @@ -7094,157 +5633,157 @@ static GdkDragAction library_window_get_drag_action (LibraryWindow* self) { gboolean _tmp8_ = FALSE; gboolean _tmp9_ = FALSE; gboolean _tmp10_ = FALSE; -#line 932 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 794 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" g_return_val_if_fail (IS_LIBRARY_WINDOW (self), 0); -#line 935 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 797 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp0_ = gtk_widget_get_window (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_widget_get_type (), GtkWidget)); -#line 935 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 797 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp1_ = gdk_display_get_default (); -#line 935 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 797 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp2_ = gdk_display_get_device_manager (_tmp1_); -#line 935 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 797 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp3_ = gdk_device_manager_get_client_pointer (_tmp2_); -#line 935 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 797 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" gdk_window_get_device_position (_tmp0_, _tmp3_, NULL, NULL, &_tmp4_); -#line 935 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 797 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" mask = _tmp4_; -#line 938 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 800 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp5_ = mask; -#line 938 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 800 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" ctrl = (_tmp5_ & GDK_CONTROL_MASK) != 0; -#line 939 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 801 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp6_ = mask; -#line 939 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 801 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" alt = (_tmp6_ & GDK_MOD1_MASK) != 0; -#line 940 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 802 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp7_ = mask; -#line 940 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 802 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" shift = (_tmp7_ & GDK_SHIFT_MASK) != 0; -#line 942 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 804 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp10_ = ctrl; -#line 942 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 804 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" if (_tmp10_) { -#line 7127 "LibraryWindow.c" +#line 5666 "LibraryWindow.c" gboolean _tmp11_ = FALSE; -#line 942 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 804 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp11_ = alt; -#line 942 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 804 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp9_ = !_tmp11_; -#line 7133 "LibraryWindow.c" +#line 5672 "LibraryWindow.c" } else { -#line 942 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 804 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp9_ = FALSE; -#line 7137 "LibraryWindow.c" +#line 5676 "LibraryWindow.c" } -#line 942 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 804 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" if (_tmp9_) { -#line 7141 "LibraryWindow.c" +#line 5680 "LibraryWindow.c" gboolean _tmp12_ = FALSE; -#line 942 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 804 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp12_ = shift; -#line 942 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 804 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp8_ = !_tmp12_; -#line 7147 "LibraryWindow.c" +#line 5686 "LibraryWindow.c" } else { -#line 942 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 804 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp8_ = FALSE; -#line 7151 "LibraryWindow.c" +#line 5690 "LibraryWindow.c" } -#line 942 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 804 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" if (_tmp8_) { -#line 943 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 805 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" result = GDK_ACTION_COPY; -#line 943 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 805 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" return result; -#line 7159 "LibraryWindow.c" +#line 5698 "LibraryWindow.c" } else { gboolean _tmp13_ = FALSE; gboolean _tmp14_ = FALSE; gboolean _tmp15_ = FALSE; -#line 944 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 806 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp15_ = ctrl; -#line 944 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 806 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" if (!_tmp15_) { -#line 7168 "LibraryWindow.c" +#line 5707 "LibraryWindow.c" gboolean _tmp16_ = FALSE; -#line 944 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 806 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp16_ = alt; -#line 944 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 806 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp14_ = _tmp16_; -#line 7174 "LibraryWindow.c" +#line 5713 "LibraryWindow.c" } else { -#line 944 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 806 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp14_ = FALSE; -#line 7178 "LibraryWindow.c" +#line 5717 "LibraryWindow.c" } -#line 944 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 806 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" if (_tmp14_) { -#line 7182 "LibraryWindow.c" +#line 5721 "LibraryWindow.c" gboolean _tmp17_ = FALSE; -#line 944 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 806 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp17_ = shift; -#line 944 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 806 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp13_ = !_tmp17_; -#line 7188 "LibraryWindow.c" +#line 5727 "LibraryWindow.c" } else { -#line 944 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 806 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp13_ = FALSE; -#line 7192 "LibraryWindow.c" +#line 5731 "LibraryWindow.c" } -#line 944 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 806 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" if (_tmp13_) { -#line 945 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 807 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" result = GDK_ACTION_ASK; -#line 945 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 807 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" return result; -#line 7200 "LibraryWindow.c" +#line 5739 "LibraryWindow.c" } else { gboolean _tmp18_ = FALSE; gboolean _tmp19_ = FALSE; gboolean _tmp20_ = FALSE; -#line 946 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 808 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp20_ = ctrl; -#line 946 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 808 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" if (_tmp20_) { -#line 7209 "LibraryWindow.c" +#line 5748 "LibraryWindow.c" gboolean _tmp21_ = FALSE; -#line 946 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 808 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp21_ = alt; -#line 946 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 808 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp19_ = !_tmp21_; -#line 7215 "LibraryWindow.c" +#line 5754 "LibraryWindow.c" } else { -#line 946 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 808 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp19_ = FALSE; -#line 7219 "LibraryWindow.c" +#line 5758 "LibraryWindow.c" } -#line 946 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 808 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" if (_tmp19_) { -#line 7223 "LibraryWindow.c" +#line 5762 "LibraryWindow.c" gboolean _tmp22_ = FALSE; -#line 946 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 808 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp22_ = shift; -#line 946 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 808 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp18_ = _tmp22_; -#line 7229 "LibraryWindow.c" +#line 5768 "LibraryWindow.c" } else { -#line 946 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 808 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp18_ = FALSE; -#line 7233 "LibraryWindow.c" +#line 5772 "LibraryWindow.c" } -#line 946 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 808 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" if (_tmp18_) { -#line 947 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 809 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" result = GDK_ACTION_LINK; -#line 947 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 809 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" return result; -#line 7241 "LibraryWindow.c" +#line 5780 "LibraryWindow.c" } else { -#line 949 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 811 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" result = GDK_ACTION_DEFAULT; -#line 949 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 811 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" return result; -#line 7247 "LibraryWindow.c" +#line 5786 "LibraryWindow.c" } } } @@ -7259,93 +5798,96 @@ static gboolean library_window_real_drag_motion (GtkWidget* base, GdkDragContext GtkTargetList* _tmp1_ = NULL; GdkAtom _tmp2_ = 0U; GdkAtom _tmp3_ = 0U; - GdkDragContext* _tmp6_ = NULL; - GtkWidget* _tmp7_ = NULL; + GdkAtom _tmp4_ = 0U; + GdkDragContext* _tmp7_ = NULL; + GtkWidget* _tmp8_ = NULL; GdkDragAction drag_action = 0; - GdkDragAction _tmp10_ = 0; GdkDragAction _tmp11_ = 0; - GdkDragContext* _tmp12_ = NULL; - GdkDragAction _tmp13_ = 0; - guint _tmp14_ = 0U; -#line 952 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" + GdkDragAction _tmp12_ = 0; + GdkDragContext* _tmp13_ = NULL; + GdkDragAction _tmp14_ = 0; + guint _tmp15_ = 0U; +#line 814 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_LIBRARY_WINDOW, LibraryWindow); -#line 952 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 814 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" g_return_val_if_fail (GDK_IS_DRAG_CONTEXT (context), FALSE); -#line 953 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 815 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp0_ = context; -#line 953 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 815 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp1_ = gtk_drag_dest_get_target_list (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_widget_get_type (), GtkWidget)); -#line 953 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 815 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp2_ = gtk_drag_dest_find_target (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_widget_get_type (), GtkWidget), _tmp0_, _tmp1_); -#line 953 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 815 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" target = _tmp2_; -#line 956 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 816 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp3_ = target; -#line 956 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - if (((gint) _tmp3_) == 0) { -#line 7286 "LibraryWindow.c" - GdkDragContext* _tmp4_ = NULL; - guint _tmp5_ = 0U; -#line 957 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - g_debug ("LibraryWindow.vala:957: drag target is GDK_NONE"); -#line 958 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp4_ = context; -#line 958 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp5_ = time; -#line 958 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - gdk_drag_status (_tmp4_, 0, (guint32) _tmp5_); -#line 960 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 816 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" + _tmp4_ = GDK_NONE; +#line 816 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" + if (_tmp3_ == _tmp4_) { +#line 5828 "LibraryWindow.c" + GdkDragContext* _tmp5_ = NULL; + guint _tmp6_ = 0U; +#line 817 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" + g_debug ("LibraryWindow.vala:817: drag target is GDK_NONE"); +#line 818 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" + _tmp5_ = context; +#line 818 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" + _tmp6_ = time; +#line 818 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" + gdk_drag_status (_tmp5_, 0, (guint32) _tmp6_); +#line 820 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" result = TRUE; -#line 960 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 820 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" return result; -#line 7301 "LibraryWindow.c" +#line 5843 "LibraryWindow.c" } -#line 964 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp6_ = context; -#line 964 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp7_ = gtk_drag_get_source_widget (_tmp6_); -#line 964 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - if (_tmp7_ != NULL) { -#line 7309 "LibraryWindow.c" - GdkDragContext* _tmp8_ = NULL; - guint _tmp9_ = 0U; -#line 965 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp8_ = context; -#line 965 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp9_ = time; -#line 965 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - gdk_drag_status (_tmp8_, GDK_ACTION_PRIVATE, (guint32) _tmp9_); -#line 967 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 824 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" + _tmp7_ = context; +#line 824 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" + _tmp8_ = gtk_drag_get_source_widget (_tmp7_); +#line 824 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" + if (_tmp8_ != NULL) { +#line 5851 "LibraryWindow.c" + GdkDragContext* _tmp9_ = NULL; + guint _tmp10_ = 0U; +#line 825 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" + _tmp9_ = context; +#line 825 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" + _tmp10_ = time; +#line 825 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" + gdk_drag_status (_tmp9_, GDK_ACTION_PRIVATE, (guint32) _tmp10_); +#line 827 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" result = TRUE; -#line 967 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 827 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" return result; -#line 7322 "LibraryWindow.c" +#line 5864 "LibraryWindow.c" } -#line 971 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp10_ = library_window_get_drag_action (self); -#line 971 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - drag_action = _tmp10_; -#line 973 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp11_ = drag_action; -#line 973 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - if (_tmp11_ == GDK_ACTION_DEFAULT) { -#line 974 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 831 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" + _tmp11_ = library_window_get_drag_action (self); +#line 831 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" + drag_action = _tmp11_; +#line 833 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" + _tmp12_ = drag_action; +#line 833 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" + if (_tmp12_ == GDK_ACTION_DEFAULT) { +#line 834 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" drag_action = GDK_ACTION_ASK; -#line 7334 "LibraryWindow.c" +#line 5876 "LibraryWindow.c" } -#line 976 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp12_ = context; -#line 976 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp13_ = drag_action; -#line 976 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp14_ = time; -#line 976 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - gdk_drag_status (_tmp12_, _tmp13_, (guint32) _tmp14_); -#line 978 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 836 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" + _tmp13_ = context; +#line 836 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" + _tmp14_ = drag_action; +#line 836 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" + _tmp15_ = time; +#line 836 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" + gdk_drag_status (_tmp13_, _tmp14_, (guint32) _tmp15_); +#line 838 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" result = TRUE; -#line 978 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 838 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" return result; -#line 7348 "LibraryWindow.c" +#line 5890 "LibraryWindow.c" } @@ -7355,54 +5897,54 @@ static void library_window_real_drag_data_received (GtkWidget* base, GdkDragCont guchar* _tmp1_ = NULL; GdkDragContext* _tmp2_ = NULL; GtkWidget* _tmp3_ = NULL; -#line 981 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 841 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_LIBRARY_WINDOW, LibraryWindow); -#line 981 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 841 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" g_return_if_fail (GDK_IS_DRAG_CONTEXT (context)); -#line 981 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 841 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" g_return_if_fail (selection_data != NULL); -#line 983 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 843 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp0_ = selection_data; -#line 983 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 843 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp1_ = gtk_selection_data_get_data (_tmp0_); -#line 983 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 843 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" if (-1 < 0) { -#line 984 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - g_debug ("LibraryWindow.vala:984: failed to retrieve SelectionData"); -#line 7372 "LibraryWindow.c" +#line 844 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" + g_debug ("LibraryWindow.vala:844: failed to retrieve SelectionData"); +#line 5914 "LibraryWindow.c" } -#line 988 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 848 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp2_ = context; -#line 988 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 848 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp3_ = gtk_drag_get_source_widget (_tmp2_); -#line 988 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 848 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" if (_tmp3_ == NULL) { -#line 7380 "LibraryWindow.c" +#line 5922 "LibraryWindow.c" GdkDragContext* _tmp4_ = NULL; GtkSelectionData* _tmp5_ = NULL; guint _tmp6_ = 0U; guint _tmp7_ = 0U; -#line 989 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 849 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp4_ = context; -#line 989 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 849 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp5_ = selection_data; -#line 989 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 849 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp6_ = info; -#line 989 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 849 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp7_ = time; -#line 989 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 849 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" library_window_external_drop_handler (self, _tmp4_, NULL, _tmp5_, _tmp6_, _tmp7_); -#line 7395 "LibraryWindow.c" +#line 5937 "LibraryWindow.c" } else { GdkDragContext* _tmp8_ = NULL; guint _tmp9_ = 0U; -#line 991 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 851 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp8_ = context; -#line 991 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 851 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp9_ = time; -#line 991 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 851 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" gtk_drag_finish (_tmp8_, FALSE, FALSE, (guint32) _tmp9_); -#line 7405 "LibraryWindow.c" +#line 5947 "LibraryWindow.c" } } @@ -7425,198 +5967,198 @@ static void library_window_external_drop_handler (LibraryWindow* self, GdkDragCo GdkDragAction _tmp22_ = 0; GdkDragContext* _tmp23_ = NULL; guint _tmp24_ = 0U; -#line 994 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 854 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" g_return_if_fail (IS_LIBRARY_WINDOW (self)); -#line 994 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 854 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" g_return_if_fail (GDK_IS_DRAG_CONTEXT (context)); -#line 994 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 854 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" g_return_if_fail ((entry == NULL) || SIDEBAR_IS_ENTRY (entry)); -#line 994 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 854 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" g_return_if_fail (data != NULL); -#line 996 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 856 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp0_ = data; -#line 996 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 856 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp2_ = _tmp1_ = gtk_selection_data_get_uris (_tmp0_); -#line 996 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 856 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" uris_array = _tmp2_; -#line 996 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 856 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" uris_array_length1 = _vala_array_length (_tmp1_); -#line 996 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 856 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _uris_array_size_ = uris_array_length1; -#line 998 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 858 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" uris = NULL; -#line 999 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 859 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp3_ = uris_array; -#line 999 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 859 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp3__length1 = uris_array_length1; -#line 7452 "LibraryWindow.c" +#line 5994 "LibraryWindow.c" { gchar** uri_collection = NULL; gint uri_collection_length1 = 0; gint _uri_collection_size_ = 0; gint uri_it = 0; -#line 999 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 859 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" uri_collection = _tmp3_; -#line 999 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 859 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" uri_collection_length1 = _tmp3__length1; -#line 999 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 859 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" for (uri_it = 0; uri_it < _tmp3__length1; uri_it = uri_it + 1) { -#line 7464 "LibraryWindow.c" +#line 6006 "LibraryWindow.c" gchar* _tmp4_ = NULL; gchar* uri = NULL; -#line 999 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 859 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp4_ = g_strdup (uri_collection[uri_it]); -#line 999 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 859 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" uri = _tmp4_; -#line 7471 "LibraryWindow.c" +#line 6013 "LibraryWindow.c" { const gchar* _tmp5_ = NULL; gchar* _tmp6_ = NULL; -#line 1000 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 860 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp5_ = uri; -#line 1000 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 860 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp6_ = g_strdup (_tmp5_); -#line 1000 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 860 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" uris = g_slist_append (uris, _tmp6_); -#line 999 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 859 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _g_free0 (uri); -#line 7483 "LibraryWindow.c" +#line 6025 "LibraryWindow.c" } } } -#line 1002 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 862 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp7_ = context; -#line 1002 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 862 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp8_ = gdk_drag_context_get_selected_action (_tmp7_); -#line 1002 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 862 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" selected_action = _tmp8_; -#line 1003 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 863 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp9_ = selected_action; -#line 1003 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 863 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" if (_tmp9_ == GDK_ACTION_ASK) { -#line 7497 "LibraryWindow.c" +#line 6039 "LibraryWindow.c" GtkResponseType _result_ = 0; GSList* _tmp10_ = NULL; GtkResponseType _tmp18_ = 0; -#line 1005 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 865 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _result_ = GTK_RESPONSE_REJECT; -#line 1006 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 866 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp10_ = uris; -#line 7505 "LibraryWindow.c" +#line 6047 "LibraryWindow.c" { GSList* uri_collection = NULL; GSList* uri_it = NULL; -#line 1006 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 866 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" uri_collection = _tmp10_; -#line 1006 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 866 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" for (uri_it = uri_collection; uri_it != NULL; uri_it = uri_it->next) { -#line 7513 "LibraryWindow.c" +#line 6055 "LibraryWindow.c" gchar* _tmp11_ = NULL; gchar* uri = NULL; -#line 1006 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 866 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp11_ = g_strdup ((const gchar*) uri_it->data); -#line 1006 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 866 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" uri = _tmp11_; -#line 7520 "LibraryWindow.c" +#line 6062 "LibraryWindow.c" { const gchar* _tmp12_ = NULL; GFile* _tmp13_ = NULL; GFile* _tmp14_ = NULL; gboolean _tmp15_ = FALSE; gboolean _tmp16_ = FALSE; -#line 1007 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 867 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp12_ = uri; -#line 1007 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 867 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp13_ = g_file_new_for_uri (_tmp12_); -#line 1007 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 867 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp14_ = _tmp13_; -#line 1007 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 867 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp15_ = app_dirs_is_in_import_dir (_tmp14_); -#line 1007 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 867 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp16_ = !_tmp15_; -#line 1007 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 867 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _g_object_unref0 (_tmp14_); -#line 1007 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 867 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" if (_tmp16_) { -#line 7541 "LibraryWindow.c" +#line 6083 "LibraryWindow.c" GtkResponseType _tmp17_ = 0; -#line 1008 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 868 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp17_ = copy_files_dialog (); -#line 1008 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 868 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _result_ = _tmp17_; -#line 1010 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 870 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _g_free0 (uri); -#line 1010 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 870 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" break; -#line 7551 "LibraryWindow.c" +#line 6093 "LibraryWindow.c" } -#line 1006 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 866 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _g_free0 (uri); -#line 7555 "LibraryWindow.c" +#line 6097 "LibraryWindow.c" } } } -#line 1014 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 874 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp18_ = _result_; -#line 1014 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 874 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" switch (_tmp18_) { -#line 1014 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 874 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" case GTK_RESPONSE_ACCEPT: -#line 7565 "LibraryWindow.c" +#line 6107 "LibraryWindow.c" { -#line 1016 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 876 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" selected_action = GDK_ACTION_COPY; -#line 1017 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 877 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" break; -#line 7571 "LibraryWindow.c" +#line 6113 "LibraryWindow.c" } -#line 1014 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 874 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" case GTK_RESPONSE_REJECT: -#line 7575 "LibraryWindow.c" +#line 6117 "LibraryWindow.c" { -#line 1020 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 880 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" selected_action = GDK_ACTION_LINK; -#line 1021 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 881 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" break; -#line 7581 "LibraryWindow.c" +#line 6123 "LibraryWindow.c" } default: { GdkDragContext* _tmp19_ = NULL; guint _tmp20_ = 0U; -#line 1025 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 885 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp19_ = context; -#line 1025 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 885 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp20_ = time; -#line 1025 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 885 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" gtk_drag_finish (_tmp19_, FALSE, FALSE, (guint32) _tmp20_); -#line 1027 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 887 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" __g_slist_free__g_free0_0 (uris); -#line 1027 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 887 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" uris_array = (_vala_array_free (uris_array, uris_array_length1, (GDestroyNotify) g_free), NULL); -#line 1027 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 887 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" return; -#line 7599 "LibraryWindow.c" +#line 6141 "LibraryWindow.c" } } } -#line 1031 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 891 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp21_ = uris; -#line 1031 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 891 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp22_ = selected_action; -#line 1031 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 891 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" library_window_dispatch_import_jobs (self, _tmp21_, "drag-and-drop", _tmp22_ == GDK_ACTION_COPY); -#line 1033 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 893 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp23_ = context; -#line 1033 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 893 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp24_ = time; -#line 1033 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 893 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" gtk_drag_finish (_tmp23_, TRUE, FALSE, (guint32) _tmp24_); -#line 994 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 854 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" __g_slist_free__g_free0_0 (uris); -#line 994 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 854 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" uris_array = (_vala_array_free (uris_array, uris_array_length1, (GDestroyNotify) g_free), NULL); -#line 7619 "LibraryWindow.c" +#line 6161 "LibraryWindow.c" } @@ -7626,23 +6168,23 @@ void library_window_switch_to_library_page (LibraryWindow* self) { LibraryPhotosEntry* _tmp2_ = NULL; Page* _tmp3_ = NULL; Page* _tmp4_ = NULL; -#line 1036 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 896 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" g_return_if_fail (IS_LIBRARY_WINDOW (self)); -#line 1037 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 897 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp0_ = self->priv->library_branch; -#line 1037 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 897 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp1_ = library_branch_get_photos_entry (_tmp0_); -#line 1037 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 897 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp2_ = _tmp1_; -#line 1037 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 897 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp3_ = sidebar_page_representative_get_page (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, SIDEBAR_TYPE_PAGE_REPRESENTATIVE, SidebarPageRepresentative)); -#line 1037 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 897 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp4_ = _tmp3_; -#line 1037 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 897 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" library_window_switch_to_page (self, _tmp4_); -#line 1037 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 897 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _g_object_unref0 (_tmp4_); -#line 7645 "LibraryWindow.c" +#line 6187 "LibraryWindow.c" } @@ -7652,41 +6194,41 @@ void library_window_switch_to_event (LibraryWindow* self, Event* event) { Event* _tmp1_ = NULL; EventsEventEntry* _tmp2_ = NULL; EventsEventEntry* _tmp3_ = NULL; -#line 1040 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 900 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" g_return_if_fail (IS_LIBRARY_WINDOW (self)); -#line 1040 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 900 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" g_return_if_fail (IS_EVENT (event)); -#line 1041 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 901 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp0_ = self->priv->events_branch; -#line 1041 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 901 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp1_ = event; -#line 1041 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 901 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp2_ = events_branch_get_entry_for_event (_tmp0_, _tmp1_); -#line 1041 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 901 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" entry = _tmp2_; -#line 1042 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 902 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp3_ = entry; -#line 1042 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 902 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" if (_tmp3_ != NULL) { -#line 7671 "LibraryWindow.c" +#line 6213 "LibraryWindow.c" EventsEventEntry* _tmp4_ = NULL; Page* _tmp5_ = NULL; Page* _tmp6_ = NULL; -#line 1043 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 903 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp4_ = entry; -#line 1043 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 903 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp5_ = sidebar_page_representative_get_page (G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, SIDEBAR_TYPE_PAGE_REPRESENTATIVE, SidebarPageRepresentative)); -#line 1043 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 903 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp6_ = _tmp5_; -#line 1043 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 903 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" library_window_switch_to_page (self, _tmp6_); -#line 1043 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 903 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _g_object_unref0 (_tmp6_); -#line 7685 "LibraryWindow.c" +#line 6227 "LibraryWindow.c" } -#line 1040 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 900 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _g_object_unref0 (entry); -#line 7689 "LibraryWindow.c" +#line 6231 "LibraryWindow.c" } @@ -7696,41 +6238,41 @@ void library_window_switch_to_tag (LibraryWindow* self, Tag* tag) { Tag* _tmp1_ = NULL; TagsSidebarEntry* _tmp2_ = NULL; TagsSidebarEntry* _tmp3_ = NULL; -#line 1046 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 906 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" g_return_if_fail (IS_LIBRARY_WINDOW (self)); -#line 1046 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 906 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" g_return_if_fail (IS_TAG (tag)); -#line 1047 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 907 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp0_ = self->priv->tags_branch; -#line 1047 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 907 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp1_ = tag; -#line 1047 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 907 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp2_ = tags_branch_get_entry_for_tag (_tmp0_, _tmp1_); -#line 1047 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 907 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" entry = _tmp2_; -#line 1048 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 908 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp3_ = entry; -#line 1048 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 908 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" if (_tmp3_ != NULL) { -#line 7715 "LibraryWindow.c" +#line 6257 "LibraryWindow.c" TagsSidebarEntry* _tmp4_ = NULL; Page* _tmp5_ = NULL; Page* _tmp6_ = NULL; -#line 1049 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 909 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp4_ = entry; -#line 1049 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 909 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp5_ = sidebar_page_representative_get_page (G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, SIDEBAR_TYPE_PAGE_REPRESENTATIVE, SidebarPageRepresentative)); -#line 1049 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 909 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp6_ = _tmp5_; -#line 1049 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 909 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" library_window_switch_to_page (self, _tmp6_); -#line 1049 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 909 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _g_object_unref0 (_tmp6_); -#line 7729 "LibraryWindow.c" +#line 6271 "LibraryWindow.c" } -#line 1046 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 906 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _g_object_unref0 (entry); -#line 7733 "LibraryWindow.c" +#line 6275 "LibraryWindow.c" } @@ -7740,41 +6282,41 @@ void library_window_switch_to_saved_search (LibraryWindow* self, SavedSearch* se SavedSearch* _tmp1_ = NULL; SearchesSidebarEntry* _tmp2_ = NULL; SearchesSidebarEntry* _tmp3_ = NULL; -#line 1052 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 912 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" g_return_if_fail (IS_LIBRARY_WINDOW (self)); -#line 1052 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 912 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" g_return_if_fail (IS_SAVED_SEARCH (search)); -#line 1053 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 913 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp0_ = self->priv->saved_search_branch; -#line 1053 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 913 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp1_ = search; -#line 1053 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 913 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp2_ = searches_branch_get_entry_for_saved_search (_tmp0_, _tmp1_); -#line 1053 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 913 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" entry = _tmp2_; -#line 1054 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 914 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp3_ = entry; -#line 1054 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 914 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" if (_tmp3_ != NULL) { -#line 7759 "LibraryWindow.c" +#line 6301 "LibraryWindow.c" SearchesSidebarEntry* _tmp4_ = NULL; Page* _tmp5_ = NULL; Page* _tmp6_ = NULL; -#line 1055 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 915 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp4_ = entry; -#line 1055 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 915 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp5_ = sidebar_page_representative_get_page (G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, SIDEBAR_TYPE_PAGE_REPRESENTATIVE, SidebarPageRepresentative)); -#line 1055 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 915 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp6_ = _tmp5_; -#line 1055 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 915 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" library_window_switch_to_page (self, _tmp6_); -#line 1055 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 915 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _g_object_unref0 (_tmp6_); -#line 7773 "LibraryWindow.c" +#line 6315 "LibraryWindow.c" } -#line 1052 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 912 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _g_object_unref0 (entry); -#line 7777 "LibraryWindow.c" +#line 6319 "LibraryWindow.c" } @@ -7790,66 +6332,66 @@ void library_window_switch_to_photo_page (LibraryWindow* self, CollectionPage* c CollectionPage* _tmp10_ = NULL; Photo* _tmp11_ = NULL; LibraryPhotoPage* _tmp12_ = NULL; -#line 1058 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 918 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" g_return_if_fail (IS_LIBRARY_WINDOW (self)); -#line 1058 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 918 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" g_return_if_fail (IS_COLLECTION_PAGE (controller)); -#line 1058 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 918 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" g_return_if_fail (IS_PHOTO (current)); -#line 1059 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 919 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp0_ = controller; -#line 1059 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 919 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp1_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, TYPE_PAGE, Page)); -#line 1059 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 919 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp2_ = _tmp1_; -#line 1059 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 919 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp3_ = current; -#line 1059 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 919 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp4_ = view_collection_get_view_for_source (_tmp2_, G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, TYPE_DATA_SOURCE, DataSource)); -#line 1059 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 919 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp5_ = _tmp4_; -#line 1059 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 919 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _vala_assert (_tmp5_ != NULL, "controller.get_view().get_view_for_source(current) != null"); -#line 1059 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 919 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _g_object_unref0 (_tmp5_); -#line 1059 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 919 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _data_collection_unref0 (_tmp2_); -#line 1060 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 920 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp6_ = self->priv->photo_page; -#line 1060 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 920 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" if (_tmp6_ == NULL) { -#line 7821 "LibraryWindow.c" +#line 6363 "LibraryWindow.c" LibraryPhotoPage* _tmp7_ = NULL; LibraryPhotoPage* _tmp8_ = NULL; -#line 1061 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 921 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp7_ = library_photo_page_new (); -#line 1061 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 921 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" g_object_ref_sink (_tmp7_); -#line 1061 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 921 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _g_object_unref0 (self->priv->photo_page); -#line 1061 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 921 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" self->priv->photo_page = _tmp7_; -#line 1062 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 922 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp8_ = self->priv->photo_page; -#line 1062 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 922 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" library_window_add_to_stack (self, G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, TYPE_PAGE, Page)); -#line 1066 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 926 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" spin_event_loop (); -#line 7838 "LibraryWindow.c" +#line 6380 "LibraryWindow.c" } -#line 1069 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 929 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp9_ = self->priv->photo_page; -#line 1069 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 929 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp10_ = controller; -#line 1069 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 929 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp11_ = current; -#line 1069 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 929 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" library_photo_page_display_for_collection (_tmp9_, _tmp10_, _tmp11_, NULL); -#line 1070 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 930 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp12_ = self->priv->photo_page; -#line 1070 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 930 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" library_window_switch_to_page (self, G_TYPE_CHECK_INSTANCE_CAST (_tmp12_, TYPE_PAGE, Page)); -#line 7852 "LibraryWindow.c" +#line 6394 "LibraryWindow.c" } @@ -7859,23 +6401,23 @@ void library_window_switch_to_import_queue_page (LibraryWindow* self) { LibraryImportQueueSidebarEntry* _tmp2_ = NULL; Page* _tmp3_ = NULL; Page* _tmp4_ = NULL; -#line 1073 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 933 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" g_return_if_fail (IS_LIBRARY_WINDOW (self)); -#line 1074 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 934 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp0_ = self->priv->library_branch; -#line 1074 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 934 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp1_ = library_branch_get_import_queue_entry (_tmp0_); -#line 1074 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 934 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp2_ = _tmp1_; -#line 1074 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 934 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp3_ = sidebar_page_representative_get_page (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, SIDEBAR_TYPE_PAGE_REPRESENTATIVE, SidebarPageRepresentative)); -#line 1074 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 934 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp4_ = _tmp3_; -#line 1074 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 934 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" library_window_switch_to_page (self, _tmp4_); -#line 1074 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 934 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _g_object_unref0 (_tmp4_); -#line 7878 "LibraryWindow.c" +#line 6420 "LibraryWindow.c" } @@ -7896,169 +6438,169 @@ static void library_window_on_camera_added (LibraryWindow* self, DiscoveredCamer gboolean _tmp13_ = FALSE; GMount* _tmp14_ = NULL; GError * _inner_error_ = NULL; -#line 1077 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 937 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" g_return_if_fail (IS_LIBRARY_WINDOW (self)); -#line 1077 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 937 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" g_return_if_fail (IS_DISCOVERED_CAMERA (camera)); -#line 1078 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 938 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp0_ = self->priv->camera_branch; -#line 1078 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 938 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp1_ = camera; -#line 1078 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 938 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp2_ = camera_branch_get_entry_for_camera (_tmp0_, _tmp1_); -#line 1078 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 938 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" entry = _tmp2_; -#line 1079 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 939 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp3_ = entry; -#line 1079 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 939 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" if (_tmp3_ == NULL) { -#line 1080 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 940 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _g_object_unref0 (entry); -#line 1080 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 940 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" return; -#line 7919 "LibraryWindow.c" +#line 6461 "LibraryWindow.c" } -#line 1082 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 942 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp4_ = entry; -#line 1082 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 942 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp5_ = sidebar_page_representative_get_page (G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, SIDEBAR_TYPE_PAGE_REPRESENTATIVE, SidebarPageRepresentative)); -#line 1082 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 942 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" page = G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, TYPE_IMPORT_PAGE, ImportPage); -#line 1083 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 943 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp6_ = camera; -#line 1083 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 943 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp7_ = _tmp6_->uri; -#line 1083 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 943 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp8_ = g_file_new_for_uri (_tmp7_); -#line 1083 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 943 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" uri_file = _tmp8_; -#line 1086 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 946 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" mount = NULL; -#line 7937 "LibraryWindow.c" +#line 6479 "LibraryWindow.c" { GMount* _tmp9_ = NULL; GFile* _tmp10_ = NULL; GMount* _tmp11_ = NULL; GMount* _tmp12_ = NULL; -#line 1088 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 948 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp10_ = uri_file; -#line 1088 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 948 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp11_ = g_file_find_enclosing_mount (_tmp10_, NULL, &_inner_error_); -#line 1088 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 948 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp9_ = _tmp11_; -#line 1088 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 948 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 7951 "LibraryWindow.c" - goto __catch40_g_error; +#line 6493 "LibraryWindow.c" + goto __catch39_g_error; } -#line 1088 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 948 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp12_ = _tmp9_; -#line 1088 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 948 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp9_ = NULL; -#line 1088 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 948 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _g_object_unref0 (mount); -#line 1088 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 948 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" mount = _tmp12_; -#line 1087 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 947 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _g_object_unref0 (_tmp9_); -#line 7964 "LibraryWindow.c" +#line 6506 "LibraryWindow.c" } - goto __finally40; - __catch40_g_error: + goto __finally39; + __catch39_g_error: { GError* err = NULL; -#line 1087 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 947 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" err = _inner_error_; -#line 1087 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 947 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _inner_error_ = NULL; -#line 1087 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 947 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _g_error_free0 (err); -#line 7976 "LibraryWindow.c" +#line 6518 "LibraryWindow.c" } - __finally40: -#line 1087 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" + __finally39: +#line 947 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 1087 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 947 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _g_object_unref0 (mount); -#line 1087 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 947 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _g_object_unref0 (uri_file); -#line 1087 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 947 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _g_object_unref0 (page); -#line 1087 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 947 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _g_object_unref0 (entry); -#line 1087 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 947 "/home/jens/Source/shotwell/src/library/LibraryWindow.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 1087 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 947 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" g_clear_error (&_inner_error_); -#line 1087 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 947 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" return; -#line 7995 "LibraryWindow.c" +#line 6537 "LibraryWindow.c" } -#line 1094 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 954 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp14_ = mount; -#line 1094 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 954 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" if (_tmp14_ != NULL) { -#line 8001 "LibraryWindow.c" +#line 6543 "LibraryWindow.c" DiscoveredCamera* _tmp15_ = NULL; const gchar* _tmp16_ = NULL; gboolean _tmp17_ = FALSE; -#line 1094 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 954 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp15_ = camera; -#line 1094 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 954 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp16_ = _tmp15_->uri; -#line 1094 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 954 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp17_ = g_str_has_prefix (_tmp16_, "file://"); -#line 1094 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 954 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp13_ = !_tmp17_; -#line 8013 "LibraryWindow.c" +#line 6555 "LibraryWindow.c" } else { -#line 1094 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 954 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp13_ = FALSE; -#line 8017 "LibraryWindow.c" +#line 6559 "LibraryWindow.c" } -#line 1094 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 954 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" if (_tmp13_) { -#line 8021 "LibraryWindow.c" +#line 6563 "LibraryWindow.c" ImportPage* _tmp18_ = NULL; GMount* _tmp19_ = NULL; gboolean _tmp20_ = FALSE; -#line 1095 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 955 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp18_ = page; -#line 1095 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 955 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp19_ = mount; -#line 1095 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 955 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp20_ = import_page_unmount_camera (_tmp18_, _tmp19_); -#line 1095 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 955 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" if (_tmp20_) { -#line 8033 "LibraryWindow.c" +#line 6575 "LibraryWindow.c" ImportPage* _tmp21_ = NULL; -#line 1096 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 956 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp21_ = page; -#line 1096 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 956 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" library_window_switch_to_page (self, G_TYPE_CHECK_INSTANCE_CAST (_tmp21_, TYPE_PAGE, Page)); -#line 8039 "LibraryWindow.c" +#line 6581 "LibraryWindow.c" } else { -#line 1098 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 958 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" app_window_error_message ("Unable to unmount the camera at this time.", NULL); -#line 8043 "LibraryWindow.c" +#line 6585 "LibraryWindow.c" } } else { ImportPage* _tmp22_ = NULL; -#line 1100 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 960 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp22_ = page; -#line 1100 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 960 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" library_window_switch_to_page (self, G_TYPE_CHECK_INSTANCE_CAST (_tmp22_, TYPE_PAGE, Page)); -#line 8051 "LibraryWindow.c" +#line 6593 "LibraryWindow.c" } -#line 1077 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 937 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _g_object_unref0 (mount); -#line 1077 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 937 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _g_object_unref0 (uri_file); -#line 1077 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 937 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _g_object_unref0 (page); -#line 1077 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 937 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _g_object_unref0 (entry); -#line 8061 "LibraryWindow.c" +#line 6603 "LibraryWindow.c" } @@ -8067,25 +6609,25 @@ void library_window_add_to_stack (LibraryWindow* self, Page* page) { GtkStack* _tmp1_ = NULL; Page* _tmp2_ = NULL; GtkStack* _tmp3_ = NULL; -#line 1105 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 965 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" g_return_if_fail (IS_LIBRARY_WINDOW (self)); -#line 1105 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 965 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" g_return_if_fail (IS_PAGE (page)); -#line 1107 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 967 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp0_ = page; -#line 1107 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 967 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" gtk_widget_show_all (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, gtk_widget_get_type (), GtkWidget)); -#line 1109 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 969 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp1_ = self->priv->stack; -#line 1109 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 969 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp2_ = page; -#line 1109 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 969 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" gtk_container_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, gtk_container_get_type (), GtkContainer), G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, gtk_widget_get_type (), GtkWidget)); -#line 1111 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 971 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp3_ = self->priv->stack; -#line 1111 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 971 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" gtk_widget_show_all (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, gtk_widget_get_type (), GtkWidget)); -#line 8088 "LibraryWindow.c" +#line 6630 "LibraryWindow.c" } @@ -8093,206 +6635,235 @@ static void library_window_remove_from_stack (LibraryWindow* self, Page* page) { GtkStack* _tmp0_ = NULL; Page* _tmp1_ = NULL; GtkStack* _tmp2_ = NULL; -#line 1114 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 974 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" g_return_if_fail (IS_LIBRARY_WINDOW (self)); -#line 1114 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 974 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" g_return_if_fail (IS_PAGE (page)); -#line 1115 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 975 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp0_ = self->priv->stack; -#line 1115 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 975 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp1_ = page; -#line 1115 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 975 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" gtk_container_remove (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, gtk_container_get_type (), GtkContainer), G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, gtk_widget_get_type (), GtkWidget)); -#line 1118 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 978 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp2_ = self->priv->stack; -#line 1118 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 978 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" gtk_widget_show_all (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, gtk_widget_get_type (), GtkWidget)); -#line 8110 "LibraryWindow.c" +#line 6652 "LibraryWindow.c" +} + + +static GVariant* _variant_new6 (gboolean value) { +#line 985 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" + return g_variant_ref_sink (g_variant_new_boolean (value)); +#line 6659 "LibraryWindow.c" +} + + +static GVariant* _variant_new7 (gboolean value) { +#line 989 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" + return g_variant_ref_sink (g_variant_new_boolean (value)); +#line 6666 "LibraryWindow.c" +} + + +static GVariant* _variant_new8 (gboolean value) { +#line 993 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" + return g_variant_ref_sink (g_variant_new_boolean (value)); +#line 6673 "LibraryWindow.c" +} + + +static GVariant* _variant_new9 (const gchar* value) { +#line 1004 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" + return g_variant_ref_sink (g_variant_new_string (value)); +#line 6680 "LibraryWindow.c" } static void library_window_load_configuration (LibraryWindow* self) { - GtkToggleAction* basic_display_action = NULL; - GtkAction* _tmp0_ = NULL; - GtkToggleAction* _tmp1_ = NULL; - GtkToggleAction* _tmp2_ = NULL; - GtkToggleAction* _tmp3_ = NULL; + GAction* basic_display_action = NULL; + GAction* _tmp0_ = NULL; + GAction* _tmp1_ = NULL; + GAction* _tmp2_ = NULL; + GAction* _tmp3_ = NULL; ConfigFacade* _tmp4_ = NULL; ConfigFacade* _tmp5_ = NULL; gboolean _tmp6_ = FALSE; - GtkToggleAction* extended_display_action = NULL; - GtkAction* _tmp7_ = NULL; - GtkToggleAction* _tmp8_ = NULL; - GtkToggleAction* _tmp9_ = NULL; - GtkToggleAction* _tmp10_ = NULL; - ConfigFacade* _tmp11_ = NULL; + GVariant* _tmp7_ = NULL; + GAction* extended_display_action = NULL; + GAction* _tmp8_ = NULL; + GAction* _tmp9_ = NULL; + GAction* _tmp10_ = NULL; + GAction* _tmp11_ = NULL; ConfigFacade* _tmp12_ = NULL; - gboolean _tmp13_ = FALSE; - GtkToggleAction* search_bar_display_action = NULL; - GtkAction* _tmp14_ = NULL; - GtkToggleAction* _tmp15_ = NULL; - GtkToggleAction* _tmp16_ = NULL; - GtkToggleAction* _tmp17_ = NULL; - ConfigFacade* _tmp18_ = NULL; - ConfigFacade* _tmp19_ = NULL; - gboolean _tmp20_ = FALSE; - GtkRadioAction* sort_events_action = NULL; - GtkAction* _tmp21_ = NULL; - GtkRadioAction* _tmp22_ = NULL; - GtkRadioAction* _tmp23_ = NULL; - gint _tmp24_ = 0; - ConfigFacade* _tmp25_ = NULL; - ConfigFacade* _tmp26_ = NULL; - gboolean _tmp27_ = FALSE; - gboolean _tmp28_ = FALSE; - gint event_sort_val = 0; - GtkRadioAction* _tmp29_ = NULL; -#line 1122 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" + ConfigFacade* _tmp13_ = NULL; + gboolean _tmp14_ = FALSE; + GVariant* _tmp15_ = NULL; + GAction* search_bar_display_action = NULL; + GAction* _tmp16_ = NULL; + GAction* _tmp17_ = NULL; + GAction* _tmp18_ = NULL; + GAction* _tmp19_ = NULL; + ConfigFacade* _tmp20_ = NULL; + ConfigFacade* _tmp21_ = NULL; + gboolean _tmp22_ = FALSE; + GVariant* _tmp23_ = NULL; + GAction* sort_events_action = NULL; + GAction* _tmp24_ = NULL; + GAction* _tmp25_ = NULL; + GAction* _tmp26_ = NULL; + const gchar* _tmp27_ = NULL; + ConfigFacade* _tmp28_ = NULL; + ConfigFacade* _tmp29_ = NULL; + gboolean _tmp30_ = FALSE; + gboolean _tmp31_ = FALSE; + gchar* event_sort_val = NULL; + gchar* _tmp32_ = NULL; + GAction* _tmp33_ = NULL; + GVariant* _tmp34_ = NULL; +#line 982 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" g_return_if_fail (IS_LIBRARY_WINDOW (self)); -#line 1123 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp0_ = app_window_get_common_action (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_APP_WINDOW, AppWindow), "CommonDisplayBasicProperties"); -#line 1123 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp1_ = G_TYPE_CHECK_INSTANCE_TYPE (_tmp0_, gtk_toggle_action_get_type ()) ? ((GtkToggleAction*) _tmp0_) : NULL; -#line 1123 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - if (_tmp1_ == NULL) { -#line 1123 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _g_object_unref0 (_tmp0_); -#line 8160 "LibraryWindow.c" - } -#line 1123 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 983 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" + _tmp0_ = g_action_map_lookup_action (G_TYPE_CHECK_INSTANCE_CAST (self, g_action_map_get_type (), GActionMap), "CommonDisplayBasicProperties"); +#line 983 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" + _tmp1_ = _g_object_ref0 (_tmp0_); +#line 983 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" basic_display_action = _tmp1_; -#line 1125 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 984 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp2_ = basic_display_action; -#line 1125 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 984 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _vala_assert (_tmp2_ != NULL, "basic_display_action != null"); -#line 1126 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 985 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp3_ = basic_display_action; -#line 1126 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 985 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp4_ = config_facade_get_instance (); -#line 1126 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 985 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp5_ = _tmp4_; -#line 1126 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 985 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp6_ = configuration_facade_get_display_basic_properties (G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade)); -#line 1126 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - gtk_toggle_action_set_active (_tmp3_, _tmp6_); -#line 1126 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 985 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" + _tmp7_ = _variant_new6 (_tmp6_); +#line 985 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" + g_action_change_state (_tmp3_, _tmp7_); +#line 985 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" + _g_variant_unref0 (_tmp7_); +#line 985 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _g_object_unref0 (_tmp5_); -#line 1128 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp7_ = app_window_get_common_action (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_APP_WINDOW, AppWindow), "CommonDisplayExtendedProperties"); -#line 1128 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp8_ = G_TYPE_CHECK_INSTANCE_TYPE (_tmp7_, gtk_toggle_action_get_type ()) ? ((GtkToggleAction*) _tmp7_) : NULL; -#line 1128 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - if (_tmp8_ == NULL) { -#line 1128 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _g_object_unref0 (_tmp7_); -#line 8188 "LibraryWindow.c" - } -#line 1128 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - extended_display_action = _tmp8_; -#line 1130 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp9_ = extended_display_action; -#line 1130 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _vala_assert (_tmp9_ != NULL, "extended_display_action != null"); -#line 1131 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 987 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" + _tmp8_ = g_action_map_lookup_action (G_TYPE_CHECK_INSTANCE_CAST (self, g_action_map_get_type (), GActionMap), "CommonDisplayExtendedProperties"); +#line 987 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" + _tmp9_ = _g_object_ref0 (_tmp8_); +#line 987 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" + extended_display_action = _tmp9_; +#line 988 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp10_ = extended_display_action; -#line 1131 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp11_ = config_facade_get_instance (); -#line 1131 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp12_ = _tmp11_; -#line 1131 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp13_ = configuration_facade_get_display_extended_properties (G_TYPE_CHECK_INSTANCE_CAST (_tmp12_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade)); -#line 1131 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - gtk_toggle_action_set_active (_tmp10_, _tmp13_); -#line 1131 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _g_object_unref0 (_tmp12_); -#line 1133 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp14_ = app_window_get_common_action (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_APP_WINDOW, AppWindow), "CommonDisplaySearchbar"); -#line 1133 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp15_ = G_TYPE_CHECK_INSTANCE_TYPE (_tmp14_, gtk_toggle_action_get_type ()) ? ((GtkToggleAction*) _tmp14_) : NULL; -#line 1133 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - if (_tmp15_ == NULL) { -#line 1133 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _g_object_unref0 (_tmp14_); -#line 8216 "LibraryWindow.c" - } -#line 1133 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - search_bar_display_action = _tmp15_; -#line 1135 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp16_ = search_bar_display_action; -#line 1135 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _vala_assert (_tmp16_ != NULL, "search_bar_display_action != null"); -#line 1136 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp17_ = search_bar_display_action; -#line 1136 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp18_ = config_facade_get_instance (); -#line 1136 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp19_ = _tmp18_; -#line 1136 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp20_ = configuration_facade_get_display_search_bar (G_TYPE_CHECK_INSTANCE_CAST (_tmp19_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade)); -#line 1136 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - gtk_toggle_action_set_active (_tmp17_, _tmp20_); -#line 1136 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _g_object_unref0 (_tmp19_); -#line 1138 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp21_ = app_window_get_common_action (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_APP_WINDOW, AppWindow), "CommonSortEventsAscending"); -#line 1138 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp22_ = G_TYPE_CHECK_INSTANCE_TYPE (_tmp21_, gtk_radio_action_get_type ()) ? ((GtkRadioAction*) _tmp21_) : NULL; -#line 1138 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - if (_tmp22_ == NULL) { -#line 1138 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _g_object_unref0 (_tmp21_); -#line 8244 "LibraryWindow.c" - } -#line 1138 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - sort_events_action = _tmp22_; -#line 1140 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp23_ = sort_events_action; -#line 1140 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _vala_assert (_tmp23_ != NULL, "sort_events_action != null"); -#line 1145 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp25_ = config_facade_get_instance (); -#line 1145 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp26_ = _tmp25_; -#line 1145 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp27_ = configuration_facade_get_events_sort_ascending (G_TYPE_CHECK_INSTANCE_CAST (_tmp26_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade)); -#line 1145 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp28_ = _tmp27_; -#line 1145 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _g_object_unref0 (_tmp26_); -#line 1145 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - if (_tmp28_) { -#line 1145 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp24_ = LIBRARY_WINDOW_SORT_EVENTS_ORDER_ASCENDING; -#line 8266 "LibraryWindow.c" +#line 988 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" + _vala_assert (_tmp10_ != NULL, "extended_display_action != null"); +#line 989 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" + _tmp11_ = extended_display_action; +#line 989 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" + _tmp12_ = config_facade_get_instance (); +#line 989 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" + _tmp13_ = _tmp12_; +#line 989 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" + _tmp14_ = configuration_facade_get_display_extended_properties (G_TYPE_CHECK_INSTANCE_CAST (_tmp13_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade)); +#line 989 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" + _tmp15_ = _variant_new7 (_tmp14_); +#line 989 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" + g_action_change_state (_tmp11_, _tmp15_); +#line 989 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" + _g_variant_unref0 (_tmp15_); +#line 989 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" + _g_object_unref0 (_tmp13_); +#line 991 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" + _tmp16_ = g_action_map_lookup_action (G_TYPE_CHECK_INSTANCE_CAST (self, g_action_map_get_type (), GActionMap), "CommonDisplaySearchbar"); +#line 991 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" + _tmp17_ = _g_object_ref0 (_tmp16_); +#line 991 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" + search_bar_display_action = _tmp17_; +#line 992 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" + _tmp18_ = search_bar_display_action; +#line 992 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" + _vala_assert (_tmp18_ != NULL, "search_bar_display_action != null"); +#line 993 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" + _tmp19_ = search_bar_display_action; +#line 993 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" + _tmp20_ = config_facade_get_instance (); +#line 993 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" + _tmp21_ = _tmp20_; +#line 993 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" + _tmp22_ = configuration_facade_get_display_search_bar (G_TYPE_CHECK_INSTANCE_CAST (_tmp21_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade)); +#line 993 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" + _tmp23_ = _variant_new8 (_tmp22_); +#line 993 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" + g_action_change_state (_tmp19_, _tmp23_); +#line 993 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" + _g_variant_unref0 (_tmp23_); +#line 993 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" + _g_object_unref0 (_tmp21_); +#line 995 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" + _tmp24_ = g_action_map_lookup_action (G_TYPE_CHECK_INSTANCE_CAST (self, g_action_map_get_type (), GActionMap), "CommonSortEvents"); +#line 995 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" + _tmp25_ = _g_object_ref0 (_tmp24_); +#line 995 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" + sort_events_action = _tmp25_; +#line 996 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" + _tmp26_ = sort_events_action; +#line 996 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" + _vala_assert (_tmp26_ != NULL, "sort_events_action != null"); +#line 1001 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" + _tmp28_ = config_facade_get_instance (); +#line 1001 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" + _tmp29_ = _tmp28_; +#line 1001 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" + _tmp30_ = configuration_facade_get_events_sort_ascending (G_TYPE_CHECK_INSTANCE_CAST (_tmp29_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade)); +#line 1001 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" + _tmp31_ = _tmp30_; +#line 1001 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" + _g_object_unref0 (_tmp29_); +#line 1001 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" + if (_tmp31_) { +#line 1001 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" + _tmp27_ = LIBRARY_WINDOW_SORT_EVENTS_ORDER_ASCENDING; +#line 6829 "LibraryWindow.c" } else { -#line 1146 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp24_ = LIBRARY_WINDOW_SORT_EVENTS_ORDER_DESCENDING; -#line 8270 "LibraryWindow.c" - } -#line 1145 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - event_sort_val = _tmp24_; -#line 1148 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp29_ = sort_events_action; -#line 1148 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - gtk_radio_action_set_current_value (_tmp29_, event_sort_val); -#line 1122 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1002 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" + _tmp27_ = LIBRARY_WINDOW_SORT_EVENTS_ORDER_DESCENDING; +#line 6833 "LibraryWindow.c" + } +#line 1001 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" + _tmp32_ = g_strdup (_tmp27_); +#line 1001 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" + event_sort_val = _tmp32_; +#line 1004 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" + _tmp33_ = sort_events_action; +#line 1004 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" + _tmp34_ = _variant_new9 (event_sort_val); +#line 1004 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" + g_action_change_state (_tmp33_, _tmp34_); +#line 1004 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" + _g_variant_unref0 (_tmp34_); +#line 982 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" + _g_free0 (event_sort_val); +#line 982 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _g_object_unref0 (sort_events_action); -#line 1122 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 982 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _g_object_unref0 (search_bar_display_action); -#line 1122 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 982 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _g_object_unref0 (extended_display_action); -#line 1122 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 982 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _g_object_unref0 (basic_display_action); -#line 8286 "LibraryWindow.c" +#line 6857 "LibraryWindow.c" } static gboolean _library_window_on_pulse_background_progress_bar_gsource_func (gpointer self) { gboolean result; result = library_window_on_pulse_background_progress_bar ((LibraryWindow*) self); -#line 1163 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1019 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" return result; -#line 8295 "LibraryWindow.c" +#line 6866 "LibraryWindow.c" } @@ -8305,62 +6876,62 @@ static void library_window_start_pulse_background_progress_bar (LibraryWindow* s const gchar* _tmp5_ = NULL; GtkProgressBar* _tmp6_ = NULL; guint _tmp7_ = 0U; -#line 1151 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1007 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" g_return_if_fail (IS_LIBRARY_WINDOW (self)); -#line 1151 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1007 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" g_return_if_fail (label != NULL); -#line 1152 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1008 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp0_ = priority; -#line 1152 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1008 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp1_ = self->priv->current_progress_priority; -#line 1152 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1008 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" if (_tmp0_ < _tmp1_) { -#line 1153 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1009 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" return; -#line 8320 "LibraryWindow.c" +#line 6891 "LibraryWindow.c" } -#line 1155 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1011 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp2_ = priority; -#line 1155 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1011 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" library_window_stop_pulse_background_progress_bar (self, _tmp2_, FALSE); -#line 1157 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1013 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp3_ = priority; -#line 1157 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1013 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" self->priv->current_progress_priority = _tmp3_; -#line 1159 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1015 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp4_ = self->priv->background_progress_bar; -#line 1159 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1015 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp5_ = label; -#line 1159 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1015 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" gtk_progress_bar_set_text (_tmp4_, _tmp5_); -#line 1160 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1016 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp6_ = self->priv->background_progress_bar; -#line 1160 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1016 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" gtk_progress_bar_pulse (_tmp6_); -#line 1161 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1017 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" library_window_show_background_progress_bar (self); -#line 1163 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1019 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp7_ = g_timeout_add_full (G_PRIORITY_DEFAULT, (guint) LIBRARY_WINDOW_BACKGROUND_PROGRESS_PULSE_MSEC, _library_window_on_pulse_background_progress_bar_gsource_func, g_object_ref (self), g_object_unref); -#line 1163 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1019 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" self->priv->background_progress_pulse_id = _tmp7_; -#line 8346 "LibraryWindow.c" +#line 6917 "LibraryWindow.c" } static gboolean library_window_on_pulse_background_progress_bar (LibraryWindow* self) { gboolean result = FALSE; GtkProgressBar* _tmp0_ = NULL; -#line 1167 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1023 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" g_return_val_if_fail (IS_LIBRARY_WINDOW (self), FALSE); -#line 1168 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1024 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp0_ = self->priv->background_progress_bar; -#line 1168 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1024 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" gtk_progress_bar_pulse (_tmp0_); -#line 1170 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1026 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" result = TRUE; -#line 1170 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1026 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" return result; -#line 8363 "LibraryWindow.c" +#line 6934 "LibraryWindow.c" } @@ -8369,43 +6940,43 @@ static void library_window_stop_pulse_background_progress_bar (LibraryWindow* se gint _tmp1_ = 0; guint _tmp2_ = 0U; gboolean _tmp4_ = FALSE; -#line 1173 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1029 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" g_return_if_fail (IS_LIBRARY_WINDOW (self)); -#line 1174 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1030 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp0_ = priority; -#line 1174 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1030 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp1_ = self->priv->current_progress_priority; -#line 1174 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1030 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" if (_tmp0_ < _tmp1_) { -#line 1175 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1031 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" return; -#line 8382 "LibraryWindow.c" +#line 6953 "LibraryWindow.c" } -#line 1177 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1033 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp2_ = self->priv->background_progress_pulse_id; -#line 1177 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1033 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" if (_tmp2_ != ((guint) 0)) { -#line 8388 "LibraryWindow.c" +#line 6959 "LibraryWindow.c" guint _tmp3_ = 0U; -#line 1178 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1034 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp3_ = self->priv->background_progress_pulse_id; -#line 1178 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1034 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" g_source_remove (_tmp3_); -#line 1179 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1035 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" self->priv->background_progress_pulse_id = (guint) 0; -#line 8396 "LibraryWindow.c" +#line 6967 "LibraryWindow.c" } -#line 1182 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1038 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp4_ = clear; -#line 1182 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1038 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" if (_tmp4_) { -#line 8402 "LibraryWindow.c" +#line 6973 "LibraryWindow.c" gint _tmp5_ = 0; -#line 1183 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1039 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp5_ = priority; -#line 1183 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1039 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" library_window_clear_background_progress_bar (self, _tmp5_); -#line 8408 "LibraryWindow.c" +#line 6979 "LibraryWindow.c" } } @@ -8429,102 +7000,102 @@ static void library_window_update_background_progress_bar (LibraryWindow* self, gdouble _tmp18_ = 0.0; gchar* _tmp19_ = NULL; gchar* _tmp20_ = NULL; -#line 1186 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1042 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" g_return_if_fail (IS_LIBRARY_WINDOW (self)); -#line 1186 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1042 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" g_return_if_fail (label != NULL); -#line 1188 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1044 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp0_ = priority; -#line 1188 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1044 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp1_ = self->priv->current_progress_priority; -#line 1188 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1044 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" if (_tmp0_ < _tmp1_) { -#line 1189 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1045 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" return; -#line 8444 "LibraryWindow.c" +#line 7015 "LibraryWindow.c" } -#line 1191 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1047 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp2_ = priority; -#line 1191 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1047 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" library_window_stop_pulse_background_progress_bar (self, _tmp2_, FALSE); -#line 1193 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1049 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp5_ = count; -#line 1193 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1049 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" if (_tmp5_ <= 0.0) { -#line 1193 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1049 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp4_ = TRUE; -#line 8456 "LibraryWindow.c" +#line 7027 "LibraryWindow.c" } else { gdouble _tmp6_ = 0.0; -#line 1193 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1049 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp6_ = total; -#line 1193 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1049 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp4_ = _tmp6_ <= 0.0; -#line 8463 "LibraryWindow.c" +#line 7034 "LibraryWindow.c" } -#line 1193 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1049 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" if (_tmp4_) { -#line 1193 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1049 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp3_ = TRUE; -#line 8469 "LibraryWindow.c" +#line 7040 "LibraryWindow.c" } else { gdouble _tmp7_ = 0.0; gdouble _tmp8_ = 0.0; -#line 1193 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1049 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp7_ = count; -#line 1193 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1049 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp8_ = total; -#line 1193 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1049 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp3_ = _tmp7_ >= _tmp8_; -#line 8479 "LibraryWindow.c" +#line 7050 "LibraryWindow.c" } -#line 1193 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1049 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" if (_tmp3_) { -#line 8483 "LibraryWindow.c" +#line 7054 "LibraryWindow.c" gint _tmp9_ = 0; -#line 1194 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1050 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp9_ = priority; -#line 1194 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1050 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" library_window_clear_background_progress_bar (self, _tmp9_); -#line 1196 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1052 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" return; -#line 8491 "LibraryWindow.c" +#line 7062 "LibraryWindow.c" } -#line 1199 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1055 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp10_ = priority; -#line 1199 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1055 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" self->priv->current_progress_priority = _tmp10_; -#line 1201 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1057 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp11_ = count; -#line 1201 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1057 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp12_ = total; -#line 1201 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1057 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" fraction = _tmp11_ / _tmp12_; -#line 1202 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1058 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp13_ = self->priv->background_progress_bar; -#line 1202 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1058 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp14_ = fraction; -#line 1202 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1058 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" gtk_progress_bar_set_fraction (_tmp13_, _tmp14_); -#line 1203 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1059 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp15_ = self->priv->background_progress_bar; -#line 1203 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1059 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp16_ = _ ("%s (%d%%)"); -#line 1203 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1059 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp17_ = label; -#line 1203 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1059 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp18_ = fraction; -#line 1203 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1059 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp19_ = g_strdup_printf (_tmp16_, _tmp17_, (gint) (_tmp18_ * 100.0)); -#line 1203 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1059 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp20_ = _tmp19_; -#line 1203 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1059 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" gtk_progress_bar_set_text (_tmp15_, _tmp20_); -#line 1203 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1059 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _g_free0 (_tmp20_); -#line 1204 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1060 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" library_window_show_background_progress_bar (self); -#line 8527 "LibraryWindow.c" +#line 7098 "LibraryWindow.c" } @@ -8534,149 +7105,149 @@ static void library_window_clear_background_progress_bar (LibraryWindow* self, g gint _tmp2_ = 0; GtkProgressBar* _tmp3_ = NULL; GtkProgressBar* _tmp4_ = NULL; -#line 1213 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1069 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" g_return_if_fail (IS_LIBRARY_WINDOW (self)); -#line 1214 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1070 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp0_ = priority; -#line 1214 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1070 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp1_ = self->priv->current_progress_priority; -#line 1214 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1070 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" if (_tmp0_ < _tmp1_) { -#line 1215 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1071 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" return; -#line 8547 "LibraryWindow.c" +#line 7118 "LibraryWindow.c" } -#line 1217 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1073 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp2_ = priority; -#line 1217 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1073 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" library_window_stop_pulse_background_progress_bar (self, _tmp2_, FALSE); -#line 1219 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1075 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" self->priv->current_progress_priority = 0; -#line 1221 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1077 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp3_ = self->priv->background_progress_bar; -#line 1221 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1077 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" gtk_progress_bar_set_fraction (_tmp3_, 0.0); -#line 1222 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1078 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp4_ = self->priv->background_progress_bar; -#line 1222 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1078 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" gtk_progress_bar_set_text (_tmp4_, ""); -#line 1223 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1079 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" library_window_hide_background_progress_bar (self); -#line 8565 "LibraryWindow.c" +#line 7136 "LibraryWindow.c" } static void library_window_show_background_progress_bar (LibraryWindow* self) { gboolean _tmp0_ = FALSE; -#line 1231 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1087 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" g_return_if_fail (IS_LIBRARY_WINDOW (self)); -#line 1232 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1088 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp0_ = self->priv->background_progress_displayed; -#line 1232 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1088 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" if (!_tmp0_) { -#line 8577 "LibraryWindow.c" +#line 7148 "LibraryWindow.c" GtkBox* _tmp1_ = NULL; GtkFrame* _tmp2_ = NULL; GtkFrame* _tmp3_ = NULL; -#line 1233 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1089 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp1_ = self->priv->top_section; -#line 1233 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1089 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp2_ = self->priv->background_progress_frame; -#line 1233 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1089 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" gtk_box_pack_end (_tmp1_, G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, gtk_widget_get_type (), GtkWidget), FALSE, FALSE, (guint) 0); -#line 1234 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1090 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp3_ = self->priv->background_progress_frame; -#line 1234 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1090 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" gtk_widget_show_all (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, gtk_widget_get_type (), GtkWidget)); -#line 1235 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1091 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" self->priv->background_progress_displayed = TRUE; -#line 8593 "LibraryWindow.c" +#line 7164 "LibraryWindow.c" } } static void library_window_hide_background_progress_bar (LibraryWindow* self) { gboolean _tmp0_ = FALSE; -#line 1239 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1095 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" g_return_if_fail (IS_LIBRARY_WINDOW (self)); -#line 1240 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1096 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp0_ = self->priv->background_progress_displayed; -#line 1240 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1096 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" if (_tmp0_) { -#line 8606 "LibraryWindow.c" +#line 7177 "LibraryWindow.c" GtkBox* _tmp1_ = NULL; GtkFrame* _tmp2_ = NULL; -#line 1241 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1097 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp1_ = self->priv->top_section; -#line 1241 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1097 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp2_ = self->priv->background_progress_frame; -#line 1241 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1097 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" gtk_container_remove (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, gtk_container_get_type (), GtkContainer), G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, gtk_widget_get_type (), GtkWidget)); -#line 1242 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1098 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" self->priv->background_progress_displayed = FALSE; -#line 8617 "LibraryWindow.c" +#line 7188 "LibraryWindow.c" } } static void library_window_on_library_monitor_discovery_started (LibraryWindow* self) { const gchar* _tmp0_ = NULL; -#line 1246 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1102 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" g_return_if_fail (IS_LIBRARY_WINDOW (self)); -#line 1247 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1103 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp0_ = _ ("Updating library…"); -#line 1247 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1103 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" library_window_start_pulse_background_progress_bar (self, _tmp0_, LIBRARY_WINDOW_STARTUP_SCAN_PROGRESS_PRIORITY); -#line 8630 "LibraryWindow.c" +#line 7201 "LibraryWindow.c" } static void library_window_on_library_monitor_discovery_completed (LibraryWindow* self) { -#line 1250 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1106 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" g_return_if_fail (IS_LIBRARY_WINDOW (self)); -#line 1251 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1107 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" library_window_stop_pulse_background_progress_bar (self, LIBRARY_WINDOW_STARTUP_SCAN_PROGRESS_PRIORITY, TRUE); -#line 8639 "LibraryWindow.c" +#line 7210 "LibraryWindow.c" } static void library_window_on_library_monitor_auto_update_progress (LibraryWindow* self, gint completed_files, gint total_files) { gint _tmp0_ = 0; -#line 1254 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1110 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" g_return_if_fail (IS_LIBRARY_WINDOW (self)); -#line 1255 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1111 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp0_ = total_files; -#line 1255 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1111 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" if (_tmp0_ < LIBRARY_WINDOW_MIN_PROGRESS_BAR_FILES) { -#line 1256 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1112 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" library_window_clear_background_progress_bar (self, LIBRARY_WINDOW_REALTIME_UPDATE_PROGRESS_PRIORITY); -#line 8653 "LibraryWindow.c" +#line 7224 "LibraryWindow.c" } else { const gchar* _tmp1_ = NULL; gint _tmp2_ = 0; gint _tmp3_ = 0; -#line 1258 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1114 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp1_ = _ ("Updating library…"); -#line 1258 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1114 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp2_ = completed_files; -#line 1258 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1114 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp3_ = total_files; -#line 1258 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1114 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" library_window_update_background_progress_bar (self, _tmp1_, LIBRARY_WINDOW_REALTIME_UPDATE_PROGRESS_PRIORITY, (gdouble) _tmp2_, (gdouble) _tmp3_); -#line 8666 "LibraryWindow.c" +#line 7237 "LibraryWindow.c" } } static void library_window_on_library_monitor_auto_import_preparing (LibraryWindow* self) { const gchar* _tmp0_ = NULL; -#line 1263 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1119 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" g_return_if_fail (IS_LIBRARY_WINDOW (self)); -#line 1264 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1120 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp0_ = _ ("Preparing to auto-import photos…"); -#line 1264 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1120 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" library_window_start_pulse_background_progress_bar (self, _tmp0_, LIBRARY_WINDOW_REALTIME_IMPORT_PROGRESS_PRIORITY); -#line 8679 "LibraryWindow.c" +#line 7250 "LibraryWindow.c" } @@ -8684,44 +7255,44 @@ static void library_window_on_library_monitor_auto_import_progress (LibraryWindo const gchar* _tmp0_ = NULL; guint64 _tmp1_ = 0ULL; guint64 _tmp2_ = 0ULL; -#line 1268 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1124 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" g_return_if_fail (IS_LIBRARY_WINDOW (self)); -#line 1269 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1125 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp0_ = _ ("Auto-importing photos…"); -#line 1269 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1125 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp1_ = completed_bytes; -#line 1269 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1125 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp2_ = total_bytes; -#line 1269 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1125 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" library_window_update_background_progress_bar (self, _tmp0_, LIBRARY_WINDOW_REALTIME_IMPORT_PROGRESS_PRIORITY, (gdouble) _tmp1_, (gdouble) _tmp2_); -#line 8697 "LibraryWindow.c" +#line 7268 "LibraryWindow.c" } static void library_window_on_metadata_writer_progress (LibraryWindow* self, guint completed, guint total) { guint _tmp0_ = 0U; -#line 1273 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1129 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" g_return_if_fail (IS_LIBRARY_WINDOW (self)); -#line 1274 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1130 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp0_ = total; -#line 1274 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1130 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" if (_tmp0_ < ((guint) LIBRARY_WINDOW_MIN_PROGRESS_BAR_FILES)) { -#line 1275 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1131 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" library_window_clear_background_progress_bar (self, LIBRARY_WINDOW_METADATA_WRITER_PROGRESS_PRIORITY); -#line 8711 "LibraryWindow.c" +#line 7282 "LibraryWindow.c" } else { const gchar* _tmp1_ = NULL; guint _tmp2_ = 0U; guint _tmp3_ = 0U; -#line 1277 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1133 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp1_ = _ ("Writing metadata to files…"); -#line 1277 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1133 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp2_ = completed; -#line 1277 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1133 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp3_ = total; -#line 1277 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1133 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" library_window_update_background_progress_bar (self, _tmp1_, LIBRARY_WINDOW_METADATA_WRITER_PROGRESS_PRIORITY, (gdouble) _tmp2_, (gdouble) _tmp3_); -#line 8724 "LibraryWindow.c" +#line 7295 "LibraryWindow.c" } } @@ -8735,229 +7306,255 @@ static void library_window_create_layout (LibraryWindow* self, Page* start_page) GtkProgressBar* _tmp4_ = NULL; GtkFrame* _tmp5_ = NULL; GtkStyleContext* _tmp6_ = NULL; - GtkAlignment* bottom_alignment = NULL; - GtkAlignment* _tmp7_ = NULL; + BasicProperties* _tmp7_ = NULL; BasicProperties* _tmp8_ = NULL; - GtkFrame* _tmp9_ = NULL; - GtkFrame* _tmp10_ = NULL; - GtkStyleContext* _tmp11_ = NULL; - GtkBox* _tmp12_ = NULL; - GtkPaned* _tmp13_ = NULL; - GtkBox* _tmp14_ = NULL; - GtkPaned* _tmp15_ = NULL; - GtkFrame* _tmp16_ = NULL; - GtkPaned* _tmp17_ = NULL; - GtkBox* _tmp18_ = NULL; + BasicProperties* _tmp9_ = NULL; + BasicProperties* _tmp10_ = NULL; + BasicProperties* _tmp11_ = NULL; + BasicProperties* _tmp12_ = NULL; + BasicProperties* _tmp13_ = NULL; + BasicProperties* _tmp14_ = NULL; + GtkFrame* _tmp15_ = NULL; + BasicProperties* _tmp16_ = NULL; + GtkFrame* _tmp17_ = NULL; + GtkStyleContext* _tmp18_ = NULL; GtkBox* _tmp19_ = NULL; - SearchFilterToolbar* _tmp20_ = NULL; + GtkPaned* _tmp20_ = NULL; GtkBox* _tmp21_ = NULL; - GtkStack* _tmp22_ = NULL; - GtkPaned* _tmp23_ = NULL; + GtkPaned* _tmp22_ = NULL; + GtkFrame* _tmp23_ = NULL; GtkPaned* _tmp24_ = NULL; - GtkPaned* _tmp25_ = NULL; - SidebarTree* _tmp26_ = NULL; - GtkPaned* _tmp27_ = NULL; + GtkBox* _tmp25_ = NULL; + GtkBox* _tmp26_ = NULL; + SearchFilterToolbar* _tmp27_ = NULL; GtkBox* _tmp28_ = NULL; - GtkPaned* _tmp29_ = NULL; - ConfigFacade* _tmp30_ = NULL; - ConfigFacade* _tmp31_ = NULL; - gint _tmp32_ = 0; - GtkStack* _tmp33_ = NULL; - gint _tmp34_ = 0; - gint _tmp35_ = 0; - GtkBox* _tmp36_ = NULL; - GtkPaned* _tmp37_ = NULL; - GtkBox* _tmp38_ = NULL; - Page* _tmp39_ = NULL; - Page* _tmp40_ = NULL; -#line 1282 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" + GtkStack* _tmp29_ = NULL; + GtkPaned* _tmp30_ = NULL; + GtkPaned* _tmp31_ = NULL; + GtkPaned* _tmp32_ = NULL; + SidebarTree* _tmp33_ = NULL; + GtkPaned* _tmp34_ = NULL; + GtkBox* _tmp35_ = NULL; + GtkPaned* _tmp36_ = NULL; + ConfigFacade* _tmp37_ = NULL; + ConfigFacade* _tmp38_ = NULL; + gint _tmp39_ = 0; + GtkStack* _tmp40_ = NULL; + gint _tmp41_ = 0; + gint _tmp42_ = 0; + GtkBox* _tmp43_ = NULL; + GtkPaned* _tmp44_ = NULL; + GtkBox* _tmp45_ = NULL; + Page* _tmp46_ = NULL; + Page* _tmp47_ = NULL; +#line 1138 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" g_return_if_fail (IS_LIBRARY_WINDOW (self)); -#line 1282 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1138 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" g_return_if_fail (IS_PAGE (start_page)); -#line 1285 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1141 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp0_ = (GtkScrolledWindow*) gtk_scrolled_window_new (NULL, NULL); -#line 1285 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1141 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" g_object_ref_sink (_tmp0_); -#line 1285 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1141 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" scrolled_sidebar = _tmp0_; -#line 1286 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1142 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" gtk_scrolled_window_set_policy (scrolled_sidebar, GTK_POLICY_NEVER, GTK_POLICY_AUTOMATIC); -#line 1287 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1143 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp1_ = self->priv->sidebar_tree; -#line 1287 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1143 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" gtk_container_add (G_TYPE_CHECK_INSTANCE_CAST (scrolled_sidebar, gtk_container_get_type (), GtkContainer), G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, gtk_widget_get_type (), GtkWidget)); -#line 1289 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1145 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp2_ = self->priv->background_progress_frame; -#line 1289 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1145 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" gtk_container_set_border_width (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, gtk_container_get_type (), GtkContainer), (guint) 2); -#line 1290 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1146 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp3_ = self->priv->background_progress_frame; -#line 1290 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1146 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp4_ = self->priv->background_progress_bar; -#line 1290 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1146 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" gtk_container_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, gtk_container_get_type (), GtkContainer), G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, gtk_widget_get_type (), GtkWidget)); -#line 1291 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1147 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp5_ = self->priv->background_progress_frame; -#line 1291 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1147 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp6_ = gtk_widget_get_style_context (G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, gtk_widget_get_type (), GtkWidget)); -#line 1291 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1147 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" gtk_style_context_remove_class (_tmp6_, "frame"); -#line 1294 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp7_ = (GtkAlignment*) gtk_alignment_new ((gfloat) 0, 0.5f, (gfloat) 1, (gfloat) 0); -#line 1294 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - g_object_ref_sink (_tmp7_); -#line 1294 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - bottom_alignment = _tmp7_; -#line 1296 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - gtk_alignment_set_padding (bottom_alignment, (guint) 10, (guint) 10, (guint) 6, (guint) 0); -#line 1297 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1150 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" + _tmp7_ = self->priv->basic_properties; +#line 1150 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" + gtk_widget_set_halign (G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, gtk_widget_get_type (), GtkWidget), GTK_ALIGN_FILL); +#line 1151 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp8_ = self->priv->basic_properties; -#line 1297 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - gtk_container_add (G_TYPE_CHECK_INSTANCE_CAST (bottom_alignment, gtk_container_get_type (), GtkContainer), G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, gtk_widget_get_type (), GtkWidget)); -#line 1299 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp9_ = self->priv->bottom_frame; -#line 1299 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - gtk_container_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, gtk_container_get_type (), GtkContainer), G_TYPE_CHECK_INSTANCE_CAST (bottom_alignment, gtk_widget_get_type (), GtkWidget)); -#line 1300 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp10_ = self->priv->bottom_frame; -#line 1300 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp11_ = gtk_widget_get_style_context (G_TYPE_CHECK_INSTANCE_CAST (_tmp10_, gtk_widget_get_type (), GtkWidget)); -#line 1300 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - gtk_style_context_remove_class (_tmp11_, "frame"); -#line 1304 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp12_ = self->priv->top_section; -#line 1304 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - gtk_box_pack_start (_tmp12_, G_TYPE_CHECK_INSTANCE_CAST (scrolled_sidebar, gtk_widget_get_type (), GtkWidget), TRUE, TRUE, (guint) 0); -#line 1306 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp13_ = self->priv->sidebar_paned; -#line 1306 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp14_ = self->priv->top_section; -#line 1306 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - gtk_paned_pack1 (_tmp13_, G_TYPE_CHECK_INSTANCE_CAST (_tmp14_, gtk_widget_get_type (), GtkWidget), TRUE, FALSE); -#line 1307 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp15_ = self->priv->sidebar_paned; -#line 1307 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp16_ = self->priv->bottom_frame; -#line 1307 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - gtk_paned_pack2 (_tmp15_, G_TYPE_CHECK_INSTANCE_CAST (_tmp16_, gtk_widget_get_type (), GtkWidget), FALSE, FALSE); -#line 1308 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp17_ = self->priv->sidebar_paned; -#line 1308 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - gtk_paned_set_position (_tmp17_, 1000); -#line 1310 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp18_ = (GtkBox*) gtk_box_new (GTK_ORIENTATION_VERTICAL, 0); -#line 1310 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - g_object_ref_sink (_tmp18_); -#line 1310 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1151 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" + gtk_widget_set_valign (G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, gtk_widget_get_type (), GtkWidget), GTK_ALIGN_CENTER); +#line 1152 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" + _tmp9_ = self->priv->basic_properties; +#line 1152 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" + gtk_widget_set_hexpand (G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, gtk_widget_get_type (), GtkWidget), TRUE); +#line 1153 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" + _tmp10_ = self->priv->basic_properties; +#line 1153 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" + gtk_widget_set_vexpand (G_TYPE_CHECK_INSTANCE_CAST (_tmp10_, gtk_widget_get_type (), GtkWidget), FALSE); +#line 1154 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" + _tmp11_ = self->priv->basic_properties; +#line 1154 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" + gtk_widget_set_margin_top (G_TYPE_CHECK_INSTANCE_CAST (_tmp11_, gtk_widget_get_type (), GtkWidget), 10); +#line 1155 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" + _tmp12_ = self->priv->basic_properties; +#line 1155 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" + gtk_widget_set_margin_bottom (G_TYPE_CHECK_INSTANCE_CAST (_tmp12_, gtk_widget_get_type (), GtkWidget), 10); +#line 1156 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" + _tmp13_ = self->priv->basic_properties; +#line 1156 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" + gtk_widget_set_margin_start (G_TYPE_CHECK_INSTANCE_CAST (_tmp13_, gtk_widget_get_type (), GtkWidget), 6); +#line 1157 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" + _tmp14_ = self->priv->basic_properties; +#line 1157 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" + gtk_widget_set_margin_end (G_TYPE_CHECK_INSTANCE_CAST (_tmp14_, gtk_widget_get_type (), GtkWidget), 0); +#line 1159 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" + _tmp15_ = self->priv->bottom_frame; +#line 1159 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" + _tmp16_ = self->priv->basic_properties; +#line 1159 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" + gtk_container_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp15_, gtk_container_get_type (), GtkContainer), G_TYPE_CHECK_INSTANCE_CAST (_tmp16_, gtk_widget_get_type (), GtkWidget)); +#line 1160 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" + _tmp17_ = self->priv->bottom_frame; +#line 1160 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" + _tmp18_ = gtk_widget_get_style_context (G_TYPE_CHECK_INSTANCE_CAST (_tmp17_, gtk_widget_get_type (), GtkWidget)); +#line 1160 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" + gtk_style_context_remove_class (_tmp18_, "frame"); +#line 1164 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" + _tmp19_ = self->priv->top_section; +#line 1164 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" + gtk_box_pack_start (_tmp19_, G_TYPE_CHECK_INSTANCE_CAST (scrolled_sidebar, gtk_widget_get_type (), GtkWidget), TRUE, TRUE, (guint) 0); +#line 1166 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" + _tmp20_ = self->priv->sidebar_paned; +#line 1166 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" + _tmp21_ = self->priv->top_section; +#line 1166 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" + gtk_paned_pack1 (_tmp20_, G_TYPE_CHECK_INSTANCE_CAST (_tmp21_, gtk_widget_get_type (), GtkWidget), TRUE, FALSE); +#line 1167 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" + _tmp22_ = self->priv->sidebar_paned; +#line 1167 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" + _tmp23_ = self->priv->bottom_frame; +#line 1167 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" + gtk_paned_pack2 (_tmp22_, G_TYPE_CHECK_INSTANCE_CAST (_tmp23_, gtk_widget_get_type (), GtkWidget), FALSE, FALSE); +#line 1168 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" + _tmp24_ = self->priv->sidebar_paned; +#line 1168 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" + gtk_paned_set_position (_tmp24_, 1000); +#line 1170 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" + _tmp25_ = (GtkBox*) gtk_box_new (GTK_ORIENTATION_VERTICAL, 0); +#line 1170 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" + g_object_ref_sink (_tmp25_); +#line 1170 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _g_object_unref0 (self->priv->right_vbox); -#line 1310 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - self->priv->right_vbox = _tmp18_; -#line 1311 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp19_ = self->priv->right_vbox; -#line 1311 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp20_ = self->priv->search_toolbar; -#line 1311 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - gtk_box_pack_start (_tmp19_, G_TYPE_CHECK_INSTANCE_CAST (_tmp20_, gtk_widget_get_type (), GtkWidget), FALSE, FALSE, (guint) 0); -#line 1312 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp21_ = self->priv->right_vbox; -#line 1312 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp22_ = self->priv->stack; -#line 1312 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - gtk_box_pack_start (_tmp21_, G_TYPE_CHECK_INSTANCE_CAST (_tmp22_, gtk_widget_get_type (), GtkWidget), TRUE, TRUE, (guint) 0); -#line 1314 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp23_ = (GtkPaned*) gtk_paned_new (GTK_ORIENTATION_HORIZONTAL); -#line 1314 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - g_object_ref_sink (_tmp23_); -#line 1314 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _g_object_unref0 (self->priv->client_paned); -#line 1314 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - self->priv->client_paned = _tmp23_; -#line 1315 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp24_ = self->priv->client_paned; -#line 1315 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp25_ = self->priv->sidebar_paned; -#line 1315 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - gtk_paned_pack1 (_tmp24_, G_TYPE_CHECK_INSTANCE_CAST (_tmp25_, gtk_widget_get_type (), GtkWidget), FALSE, FALSE); -#line 1316 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp26_ = self->priv->sidebar_tree; -#line 1316 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - gtk_widget_set_size_request (G_TYPE_CHECK_INSTANCE_CAST (_tmp26_, gtk_widget_get_type (), GtkWidget), LIBRARY_WINDOW_SIDEBAR_MIN_WIDTH, -1); -#line 1317 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp27_ = self->priv->client_paned; -#line 1317 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1170 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" + self->priv->right_vbox = _tmp25_; +#line 1171 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" + _tmp26_ = self->priv->right_vbox; +#line 1171 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" + _tmp27_ = self->priv->search_toolbar; +#line 1171 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" + gtk_box_pack_start (_tmp26_, G_TYPE_CHECK_INSTANCE_CAST (_tmp27_, gtk_widget_get_type (), GtkWidget), FALSE, FALSE, (guint) 0); +#line 1172 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp28_ = self->priv->right_vbox; -#line 1317 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - gtk_paned_pack2 (_tmp27_, G_TYPE_CHECK_INSTANCE_CAST (_tmp28_, gtk_widget_get_type (), GtkWidget), TRUE, FALSE); -#line 1318 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp29_ = self->priv->client_paned; -#line 1318 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp30_ = config_facade_get_instance (); -#line 1318 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp31_ = _tmp30_; -#line 1318 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp32_ = configuration_facade_get_sidebar_position (G_TYPE_CHECK_INSTANCE_CAST (_tmp31_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade)); -#line 1318 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - gtk_paned_set_position (_tmp29_, _tmp32_); -#line 1318 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _g_object_unref0 (_tmp31_); -#line 1320 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp33_ = self->priv->stack; -#line 1320 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp34_ = library_window_get_PAGE_MIN_WIDTH (); -#line 1320 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp35_ = _tmp34_; -#line 1320 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - gtk_widget_set_size_request (G_TYPE_CHECK_INSTANCE_CAST (_tmp33_, gtk_widget_get_type (), GtkWidget), _tmp35_, -1); -#line 1322 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp36_ = self->priv->layout; -#line 1322 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp37_ = self->priv->client_paned; -#line 1322 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - gtk_box_pack_end (_tmp36_, G_TYPE_CHECK_INSTANCE_CAST (_tmp37_, gtk_widget_get_type (), GtkWidget), TRUE, TRUE, (guint) 0); -#line 1324 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp38_ = self->priv->layout; -#line 1324 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - gtk_container_add (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_container_get_type (), GtkContainer), G_TYPE_CHECK_INSTANCE_CAST (_tmp38_, gtk_widget_get_type (), GtkWidget)); -#line 1326 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp39_ = start_page; -#line 1326 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - library_window_switch_to_page (self, _tmp39_); -#line 1327 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp40_ = start_page; -#line 1327 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - gtk_widget_grab_focus (G_TYPE_CHECK_INSTANCE_CAST (_tmp40_, gtk_widget_get_type (), GtkWidget)); -#line 1282 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _g_object_unref0 (bottom_alignment); -#line 1282 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1172 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" + _tmp29_ = self->priv->stack; +#line 1172 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" + gtk_box_pack_start (_tmp28_, G_TYPE_CHECK_INSTANCE_CAST (_tmp29_, gtk_widget_get_type (), GtkWidget), TRUE, TRUE, (guint) 0); +#line 1174 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" + _tmp30_ = (GtkPaned*) gtk_paned_new (GTK_ORIENTATION_HORIZONTAL); +#line 1174 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" + g_object_ref_sink (_tmp30_); +#line 1174 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" + _g_object_unref0 (self->priv->client_paned); +#line 1174 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" + self->priv->client_paned = _tmp30_; +#line 1175 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" + _tmp31_ = self->priv->client_paned; +#line 1175 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" + _tmp32_ = self->priv->sidebar_paned; +#line 1175 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" + gtk_paned_pack1 (_tmp31_, G_TYPE_CHECK_INSTANCE_CAST (_tmp32_, gtk_widget_get_type (), GtkWidget), FALSE, FALSE); +#line 1176 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" + _tmp33_ = self->priv->sidebar_tree; +#line 1176 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" + gtk_widget_set_size_request (G_TYPE_CHECK_INSTANCE_CAST (_tmp33_, gtk_widget_get_type (), GtkWidget), LIBRARY_WINDOW_SIDEBAR_MIN_WIDTH, -1); +#line 1177 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" + _tmp34_ = self->priv->client_paned; +#line 1177 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" + _tmp35_ = self->priv->right_vbox; +#line 1177 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" + gtk_paned_pack2 (_tmp34_, G_TYPE_CHECK_INSTANCE_CAST (_tmp35_, gtk_widget_get_type (), GtkWidget), TRUE, FALSE); +#line 1178 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" + _tmp36_ = self->priv->client_paned; +#line 1178 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" + _tmp37_ = config_facade_get_instance (); +#line 1178 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" + _tmp38_ = _tmp37_; +#line 1178 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" + _tmp39_ = configuration_facade_get_sidebar_position (G_TYPE_CHECK_INSTANCE_CAST (_tmp38_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade)); +#line 1178 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" + gtk_paned_set_position (_tmp36_, _tmp39_); +#line 1178 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" + _g_object_unref0 (_tmp38_); +#line 1180 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" + _tmp40_ = self->priv->stack; +#line 1180 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" + _tmp41_ = library_window_get_PAGE_MIN_WIDTH (); +#line 1180 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" + _tmp42_ = _tmp41_; +#line 1180 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" + gtk_widget_set_size_request (G_TYPE_CHECK_INSTANCE_CAST (_tmp40_, gtk_widget_get_type (), GtkWidget), _tmp42_, -1); +#line 1182 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" + _tmp43_ = self->priv->layout; +#line 1182 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" + _tmp44_ = self->priv->client_paned; +#line 1182 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" + gtk_box_pack_end (_tmp43_, G_TYPE_CHECK_INSTANCE_CAST (_tmp44_, gtk_widget_get_type (), GtkWidget), TRUE, TRUE, (guint) 0); +#line 1184 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" + _tmp45_ = self->priv->layout; +#line 1184 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" + gtk_container_add (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_container_get_type (), GtkContainer), G_TYPE_CHECK_INSTANCE_CAST (_tmp45_, gtk_widget_get_type (), GtkWidget)); +#line 1186 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" + _tmp46_ = start_page; +#line 1186 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" + library_window_switch_to_page (self, _tmp46_); +#line 1187 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" + _tmp47_ = start_page; +#line 1187 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" + gtk_widget_grab_focus (G_TYPE_CHECK_INSTANCE_CAST (_tmp47_, gtk_widget_get_type (), GtkWidget)); +#line 1138 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _g_object_unref0 (scrolled_sidebar); -#line 8933 "LibraryWindow.c" +#line 7530 "LibraryWindow.c" } static void library_window_real_set_current_page (PageWindow* base, Page* page) { LibraryWindow * self; Page* _tmp0_ = NULL; -#line 1330 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1190 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_LIBRARY_WINDOW, LibraryWindow); -#line 1330 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1190 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" g_return_if_fail (IS_PAGE (page)); -#line 1332 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1192 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp0_ = page; -#line 1332 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1192 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" library_window_switch_to_page (self, _tmp0_); -#line 8948 "LibraryWindow.c" +#line 7545 "LibraryWindow.c" } void library_window_set_page_switching_enabled (LibraryWindow* self, gboolean should_enable) { gboolean _tmp0_ = FALSE; -#line 1335 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1195 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" g_return_if_fail (IS_LIBRARY_WINDOW (self)); -#line 1336 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1196 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp0_ = should_enable; -#line 1336 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1196 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" self->priv->page_switching_enabled = _tmp0_; -#line 8960 "LibraryWindow.c" +#line 7557 "LibraryWindow.c" } @@ -8986,48 +7583,51 @@ void library_window_switch_to_page (LibraryWindow* self, Page* page) { Page* _tmp40_ = NULL; Page* _tmp41_ = NULL; Page* _tmp42_ = NULL; - GtkToolbar* toolbar = NULL; Page* _tmp43_ = NULL; - GtkToolbar* _tmp44_ = NULL; - GtkToolbar* _tmp45_ = NULL; - Page* _tmp51_ = NULL; -#line 1339 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" + GMenuModel* _tmp44_ = NULL; + GMenuModel* _tmp45_ = NULL; + GtkToolbar* toolbar = NULL; + Page* _tmp46_ = NULL; + GtkToolbar* _tmp47_ = NULL; + GtkToolbar* _tmp48_ = NULL; + Page* _tmp54_ = NULL; +#line 1199 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" g_return_if_fail (IS_LIBRARY_WINDOW (self)); -#line 1339 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1199 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" g_return_if_fail (IS_PAGE (page)); -#line 1340 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1200 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp0_ = self->priv->page_switching_enabled; -#line 1340 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1200 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" if (!_tmp0_) { -#line 1341 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1201 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" return; -#line 9004 "LibraryWindow.c" +#line 7604 "LibraryWindow.c" } -#line 1343 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1203 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp1_ = page; -#line 1343 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1203 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp2_ = page_window_get_current_page (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE_WINDOW, PageWindow)); -#line 1343 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1203 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp3_ = _tmp2_; -#line 1343 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1203 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp4_ = _tmp1_ == _tmp3_; -#line 1343 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1203 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _g_object_unref0 (_tmp3_); -#line 1343 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1203 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" if (_tmp4_) { -#line 1344 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1204 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" return; -#line 9020 "LibraryWindow.c" +#line 7620 "LibraryWindow.c" } -#line 1346 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1206 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp5_ = page_window_get_current_page (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE_WINDOW, PageWindow)); -#line 1346 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1206 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" current_page = _tmp5_; -#line 1347 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1207 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp6_ = current_page; -#line 1347 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1207 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" if (_tmp6_ != NULL) { -#line 9030 "LibraryWindow.c" +#line 7630 "LibraryWindow.c" GtkToolbar* toolbar = NULL; Page* _tmp7_ = NULL; GtkToolbar* _tmp8_ = NULL; @@ -9035,92 +7635,96 @@ void library_window_switch_to_page (LibraryWindow* self, Page* page) { Page* _tmp12_ = NULL; Page* _tmp13_ = NULL; Page* _tmp15_ = NULL; -#line 1348 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1208 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" + gtk_application_window_set_show_menubar (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_application_window_get_type (), GtkApplicationWindow), FALSE); +#line 1209 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" + application_set_menubar (NULL); +#line 1211 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp7_ = current_page; -#line 1348 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1211 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp8_ = page_get_toolbar (_tmp7_); -#line 1348 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1211 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" toolbar = _tmp8_; -#line 1349 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1212 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp9_ = toolbar; -#line 1349 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1212 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" if (_tmp9_ != NULL) { -#line 9048 "LibraryWindow.c" +#line 7652 "LibraryWindow.c" GtkBox* _tmp10_ = NULL; GtkToolbar* _tmp11_ = NULL; -#line 1350 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1213 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp10_ = self->priv->right_vbox; -#line 1350 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1213 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp11_ = toolbar; -#line 1350 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1213 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" gtk_container_remove (G_TYPE_CHECK_INSTANCE_CAST (_tmp10_, gtk_container_get_type (), GtkContainer), G_TYPE_CHECK_INSTANCE_CAST (_tmp11_, gtk_widget_get_type (), GtkWidget)); -#line 9057 "LibraryWindow.c" +#line 7661 "LibraryWindow.c" } -#line 1352 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1215 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp12_ = current_page; -#line 1352 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1215 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" page_switching_from (_tmp12_); -#line 1356 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1219 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp13_ = current_page; -#line 1356 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1219 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" if (G_TYPE_CHECK_INSTANCE_TYPE (_tmp13_, TYPE_LIBRARY_PHOTO_PAGE)) { -#line 9067 "LibraryWindow.c" +#line 7671 "LibraryWindow.c" SidebarTree* _tmp14_ = NULL; -#line 1357 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1220 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp14_ = self->priv->sidebar_tree; -#line 1357 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1220 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" sidebar_tree_enable_editing (_tmp14_); -#line 9073 "LibraryWindow.c" +#line 7677 "LibraryWindow.c" } -#line 1360 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1223 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp15_ = current_page; -#line 1360 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1223 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" library_window_unsubscribe_from_basic_information (self, _tmp15_); -#line 1347 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1207 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _g_object_unref0 (toolbar); -#line 9081 "LibraryWindow.c" +#line 7685 "LibraryWindow.c" } -#line 1363 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1226 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp16_ = self->priv->stack; -#line 1363 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1226 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp17_ = page; -#line 1363 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1226 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" gtk_stack_set_visible_child (_tmp16_, G_TYPE_CHECK_INSTANCE_CAST (_tmp17_, gtk_widget_get_type (), GtkWidget)); -#line 1367 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1230 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp18_ = page; -#line 1367 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1230 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" PAGE_WINDOW_CLASS (library_window_parent_class)->set_current_page (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_APP_WINDOW, AppWindow), TYPE_PAGE_WINDOW, PageWindow), _tmp18_); -#line 1373 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1236 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp19_ = page; -#line 1373 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1236 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" if (G_TYPE_CHECK_INSTANCE_TYPE (_tmp19_, TYPE_LIBRARY_PHOTO_PAGE)) { -#line 9097 "LibraryWindow.c" +#line 7701 "LibraryWindow.c" SidebarTree* _tmp20_ = NULL; -#line 1374 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1237 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp20_ = self->priv->sidebar_tree; -#line 1374 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1237 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" sidebar_tree_disable_editing (_tmp20_); -#line 9103 "LibraryWindow.c" +#line 7707 "LibraryWindow.c" } -#line 1377 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1240 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp21_ = library_window_should_show_search_bar (self); -#line 1377 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1240 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp22_ = page; -#line 1377 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1240 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" library_window_toggle_search_bar (self, _tmp21_, G_TYPE_CHECK_INSTANCE_TYPE (_tmp22_, TYPE_CHECKERBOARD_PAGE) ? ((CheckerboardPage*) _tmp22_) : NULL); -#line 1380 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1243 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp23_ = self->priv->page_map; -#line 1380 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1243 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp24_ = page; -#line 1380 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1243 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp25_ = gee_abstract_map_get (G_TYPE_CHECK_INSTANCE_CAST (_tmp23_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp24_); -#line 1380 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1243 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" entry = (SidebarEntry*) _tmp25_; -#line 1381 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1244 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp26_ = entry; -#line 1381 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1244 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" if (_tmp26_ != NULL) { -#line 9123 "LibraryWindow.c" +#line 7727 "LibraryWindow.c" SidebarExpandableEntry* expandable_entry = NULL; SidebarEntry* _tmp27_ = NULL; SidebarExpandableEntry* _tmp28_ = NULL; @@ -9128,129 +7732,141 @@ void library_window_switch_to_page (LibraryWindow* self, Page* page) { SidebarExpandableEntry* _tmp30_ = NULL; SidebarTree* _tmp35_ = NULL; SidebarEntry* _tmp36_ = NULL; -#line 1384 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1247 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp27_ = entry; -#line 1384 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1247 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp28_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp27_, SIDEBAR_TYPE_EXPANDABLE_ENTRY) ? ((SidebarExpandableEntry*) _tmp27_) : NULL); -#line 1384 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1247 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" expandable_entry = _tmp28_; -#line 1385 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1248 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp30_ = expandable_entry; -#line 1385 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1248 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" if (_tmp30_ != NULL) { -#line 9141 "LibraryWindow.c" +#line 7745 "LibraryWindow.c" SidebarExpandableEntry* _tmp31_ = NULL; gboolean _tmp32_ = FALSE; -#line 1385 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1248 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp31_ = expandable_entry; -#line 1385 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1248 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp32_ = sidebar_expandable_entry_expand_on_select (_tmp31_); -#line 1385 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1248 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp29_ = _tmp32_; -#line 9150 "LibraryWindow.c" +#line 7754 "LibraryWindow.c" } else { -#line 1385 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1248 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp29_ = FALSE; -#line 9154 "LibraryWindow.c" +#line 7758 "LibraryWindow.c" } -#line 1385 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1248 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" if (_tmp29_) { -#line 9158 "LibraryWindow.c" +#line 7762 "LibraryWindow.c" SidebarTree* _tmp33_ = NULL; SidebarEntry* _tmp34_ = NULL; -#line 1386 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1249 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp33_ = self->priv->sidebar_tree; -#line 1386 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1249 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp34_ = entry; -#line 1386 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1249 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" sidebar_tree_expand_to_entry (_tmp33_, _tmp34_); -#line 9167 "LibraryWindow.c" +#line 7771 "LibraryWindow.c" } -#line 1388 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1251 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp35_ = self->priv->sidebar_tree; -#line 1388 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1251 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp36_ = entry; -#line 1388 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1251 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" sidebar_tree_place_cursor (_tmp35_, _tmp36_, TRUE); -#line 1381 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1244 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _g_object_unref0 (expandable_entry); -#line 9177 "LibraryWindow.c" +#line 7781 "LibraryWindow.c" } -#line 1391 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1254 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" library_window_on_update_properties (self); -#line 1393 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1256 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp37_ = page; -#line 1393 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1256 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" if (G_TYPE_CHECK_INSTANCE_TYPE (_tmp37_, TYPE_CHECKERBOARD_PAGE)) { -#line 9185 "LibraryWindow.c" +#line 7789 "LibraryWindow.c" Page* _tmp38_ = NULL; -#line 1394 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1257 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp38_ = page; -#line 1394 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1257 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" library_window_init_view_filter (self, G_TYPE_CHECK_INSTANCE_CAST (_tmp38_, TYPE_CHECKERBOARD_PAGE, CheckerboardPage)); -#line 9191 "LibraryWindow.c" +#line 7795 "LibraryWindow.c" } -#line 1396 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1259 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp39_ = page; -#line 1396 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1259 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" gtk_widget_show_all (G_TYPE_CHECK_INSTANCE_CAST (_tmp39_, gtk_widget_get_type (), GtkWidget)); -#line 1399 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1262 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp40_ = page_window_get_current_page (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE_WINDOW, PageWindow)); -#line 1399 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1262 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp41_ = _tmp40_; -#line 1399 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1262 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" library_window_subscribe_for_basic_information (self, _tmp41_); -#line 1399 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1262 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _g_object_unref0 (_tmp41_); -#line 1401 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1264 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp42_ = page; -#line 1401 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1264 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" page_switched_to (_tmp42_); -#line 1403 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1266 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp43_ = page; -#line 1403 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp44_ = page_get_toolbar (_tmp43_); -#line 1403 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - toolbar = _tmp44_; -#line 1404 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp45_ = toolbar; -#line 1404 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - if (_tmp45_ != NULL) { -#line 9219 "LibraryWindow.c" - GtkBox* _tmp46_ = NULL; - GtkToolbar* _tmp47_ = NULL; - GtkToolbar* _tmp48_ = NULL; - GtkToolbar* _tmp49_ = NULL; - gboolean _tmp50_ = FALSE; -#line 1405 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp46_ = self->priv->right_vbox; -#line 1405 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp47_ = toolbar; -#line 1405 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - gtk_container_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp46_, gtk_container_get_type (), GtkContainer), G_TYPE_CHECK_INSTANCE_CAST (_tmp47_, gtk_widget_get_type (), GtkWidget)); -#line 1406 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp48_ = toolbar; -#line 1406 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - gtk_widget_show_all (G_TYPE_CHECK_INSTANCE_CAST (_tmp48_, gtk_widget_get_type (), GtkWidget)); -#line 1407 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp49_ = toolbar; -#line 1407 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp50_ = library_window_is_toolbar_visible (self); -#line 1407 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - gtk_widget_set_visible (G_TYPE_CHECK_INSTANCE_CAST (_tmp49_, gtk_widget_get_type (), GtkWidget), _tmp50_); -#line 9241 "LibraryWindow.c" +#line 1266 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" + _tmp44_ = page_get_menubar (_tmp43_); +#line 1266 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" + _tmp45_ = _tmp44_; +#line 1266 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" + application_set_menubar (_tmp45_); +#line 1266 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" + _g_object_unref0 (_tmp45_); +#line 1267 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" + gtk_application_window_set_show_menubar (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_application_window_get_type (), GtkApplicationWindow), TRUE); +#line 1269 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" + _tmp46_ = page; +#line 1269 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" + _tmp47_ = page_get_toolbar (_tmp46_); +#line 1269 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" + toolbar = _tmp47_; +#line 1270 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" + _tmp48_ = toolbar; +#line 1270 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" + if (_tmp48_ != NULL) { +#line 7835 "LibraryWindow.c" + GtkBox* _tmp49_ = NULL; + GtkToolbar* _tmp50_ = NULL; + GtkToolbar* _tmp51_ = NULL; + GtkToolbar* _tmp52_ = NULL; + gboolean _tmp53_ = FALSE; +#line 1271 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" + _tmp49_ = self->priv->right_vbox; +#line 1271 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" + _tmp50_ = toolbar; +#line 1271 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" + gtk_container_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp49_, gtk_container_get_type (), GtkContainer), G_TYPE_CHECK_INSTANCE_CAST (_tmp50_, gtk_widget_get_type (), GtkWidget)); +#line 1272 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" + _tmp51_ = toolbar; +#line 1272 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" + gtk_widget_show_all (G_TYPE_CHECK_INSTANCE_CAST (_tmp51_, gtk_widget_get_type (), GtkWidget)); +#line 1273 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" + _tmp52_ = toolbar; +#line 1273 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" + _tmp53_ = library_window_is_toolbar_visible (self); +#line 1273 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" + gtk_widget_set_visible (G_TYPE_CHECK_INSTANCE_CAST (_tmp52_, gtk_widget_get_type (), GtkWidget), _tmp53_); +#line 7857 "LibraryWindow.c" } -#line 1410 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp51_ = page; -#line 1410 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - page_ready (_tmp51_); -#line 1339 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1276 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" + _tmp54_ = page; +#line 1276 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" + page_ready (_tmp54_); +#line 1199 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _g_object_unref0 (toolbar); -#line 1339 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1199 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _g_object_unref0 (entry); -#line 1339 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1199 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _g_object_unref0 (current_page); -#line 9253 "LibraryWindow.c" +#line 7869 "LibraryWindow.c" } @@ -9265,41 +7881,41 @@ static void library_window_init_view_filter (LibraryWindow* self, CheckerboardPa CheckerboardPage* _tmp7_ = NULL; SearchViewFilter* _tmp8_ = NULL; SearchViewFilter* _tmp9_ = NULL; -#line 1413 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1279 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" g_return_if_fail (IS_LIBRARY_WINDOW (self)); -#line 1413 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1279 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" g_return_if_fail (IS_CHECKERBOARD_PAGE (page)); -#line 1414 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1280 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp0_ = self->priv->search_toolbar; -#line 1414 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1280 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp1_ = page; -#line 1414 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1280 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp2_ = checkerboard_page_get_search_view_filter (_tmp1_); -#line 1414 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1280 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp3_ = _tmp2_; -#line 1414 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1280 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" search_filter_toolbar_set_view_filter (_tmp0_, _tmp3_); -#line 1414 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1280 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _view_filter_unref0 (_tmp3_); -#line 1415 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1281 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp4_ = page; -#line 1415 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1281 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp5_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, TYPE_PAGE, Page)); -#line 1415 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1281 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp6_ = _tmp5_; -#line 1415 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1281 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp7_ = page; -#line 1415 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1281 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp8_ = checkerboard_page_get_search_view_filter (_tmp7_); -#line 1415 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1281 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp9_ = _tmp8_; -#line 1415 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1281 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" view_collection_install_view_filter (_tmp6_, G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, TYPE_VIEW_FILTER, ViewFilter)); -#line 1415 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1281 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _view_filter_unref0 (_tmp9_); -#line 1415 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1281 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _data_collection_unref0 (_tmp6_); -#line 9302 "LibraryWindow.c" +#line 7918 "LibraryWindow.c" } @@ -9309,35 +7925,35 @@ static gboolean library_window_should_show_search_bar (LibraryWindow* self) { Page* _tmp1_ = NULL; Page* _tmp2_ = NULL; gboolean _tmp3_ = FALSE; -#line 1418 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1284 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" g_return_val_if_fail (IS_LIBRARY_WINDOW (self), FALSE); -#line 1419 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1285 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp1_ = page_window_get_current_page (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE_WINDOW, PageWindow)); -#line 1419 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1285 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp2_ = _tmp1_; -#line 1419 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1285 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp3_ = G_TYPE_CHECK_INSTANCE_TYPE (_tmp2_, TYPE_CHECKERBOARD_PAGE); -#line 1419 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1285 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _g_object_unref0 (_tmp2_); -#line 1419 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1285 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" if (_tmp3_) { -#line 9324 "LibraryWindow.c" +#line 7940 "LibraryWindow.c" gboolean _tmp4_ = FALSE; -#line 1419 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1285 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp4_ = self->priv->is_search_toolbar_visible; -#line 1419 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1285 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp0_ = _tmp4_; -#line 9330 "LibraryWindow.c" +#line 7946 "LibraryWindow.c" } else { -#line 1419 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1285 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp0_ = FALSE; -#line 9334 "LibraryWindow.c" +#line 7950 "LibraryWindow.c" } -#line 1419 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1285 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" result = _tmp0_; -#line 1419 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1285 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" return result; -#line 9340 "LibraryWindow.c" +#line 7956 "LibraryWindow.c" } @@ -9345,21 +7961,21 @@ static void library_window_toggle_search_bar (LibraryWindow* self, gboolean show SearchFilterToolbar* _tmp0_ = NULL; gboolean _tmp1_ = FALSE; gboolean _tmp2_ = FALSE; -#line 1423 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1289 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" g_return_if_fail (IS_LIBRARY_WINDOW (self)); -#line 1423 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1289 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" g_return_if_fail ((page == NULL) || IS_CHECKERBOARD_PAGE (page)); -#line 1424 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1290 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp0_ = self->priv->search_toolbar; -#line 1424 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1290 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp1_ = show; -#line 1424 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1290 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" gtk_revealer_set_reveal_child (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, gtk_revealer_get_type (), GtkRevealer), _tmp1_); -#line 1425 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1291 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp2_ = show; -#line 1425 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1291 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" if (_tmp2_) { -#line 9362 "LibraryWindow.c" +#line 7978 "LibraryWindow.c" CheckerboardPage* _tmp3_ = NULL; SearchFilterToolbar* _tmp4_ = NULL; CheckerboardPage* _tmp5_ = NULL; @@ -9371,70 +7987,70 @@ static void library_window_toggle_search_bar (LibraryWindow* self, gboolean show CheckerboardPage* _tmp11_ = NULL; SearchViewFilter* _tmp12_ = NULL; SearchViewFilter* _tmp13_ = NULL; -#line 1426 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1292 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp3_ = page; -#line 1426 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1292 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _vala_assert (NULL != _tmp3_, "null != page"); -#line 1427 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1293 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp4_ = self->priv->search_toolbar; -#line 1427 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1293 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp5_ = page; -#line 1427 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1293 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp6_ = checkerboard_page_get_search_view_filter (_tmp5_); -#line 1427 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1293 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp7_ = _tmp6_; -#line 1427 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1293 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" search_filter_toolbar_set_view_filter (_tmp4_, _tmp7_); -#line 1427 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1293 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _view_filter_unref0 (_tmp7_); -#line 1428 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1294 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp8_ = page; -#line 1428 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1294 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp9_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, TYPE_PAGE, Page)); -#line 1428 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1294 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp10_ = _tmp9_; -#line 1428 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1294 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp11_ = page; -#line 1428 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1294 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp12_ = checkerboard_page_get_search_view_filter (_tmp11_); -#line 1428 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1294 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp13_ = _tmp12_; -#line 1428 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1294 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" view_collection_install_view_filter (_tmp10_, G_TYPE_CHECK_INSTANCE_CAST (_tmp13_, TYPE_VIEW_FILTER, ViewFilter)); -#line 1428 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1294 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _view_filter_unref0 (_tmp13_); -#line 1428 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1294 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _data_collection_unref0 (_tmp10_); -#line 9408 "LibraryWindow.c" +#line 8024 "LibraryWindow.c" } else { CheckerboardPage* _tmp14_ = NULL; -#line 1430 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1296 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp14_ = page; -#line 1430 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1296 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" if (_tmp14_ != NULL) { -#line 9415 "LibraryWindow.c" +#line 8031 "LibraryWindow.c" CheckerboardPage* _tmp15_ = NULL; ViewCollection* _tmp16_ = NULL; ViewCollection* _tmp17_ = NULL; DisabledViewFilter* _tmp18_ = NULL; DisabledViewFilter* _tmp19_ = NULL; -#line 1431 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1297 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp15_ = page; -#line 1431 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1297 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp16_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (_tmp15_, TYPE_PAGE, Page)); -#line 1431 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1297 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp17_ = _tmp16_; -#line 1431 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1297 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp18_ = disabled_view_filter_new (); -#line 1431 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1297 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp19_ = _tmp18_; -#line 1431 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1297 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" view_collection_install_view_filter (_tmp17_, G_TYPE_CHECK_INSTANCE_CAST (_tmp19_, TYPE_VIEW_FILTER, ViewFilter)); -#line 1431 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1297 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _view_filter_unref0 (_tmp19_); -#line 1431 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1297 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _data_collection_unref0 (_tmp17_); -#line 9437 "LibraryWindow.c" +#line 8053 "LibraryWindow.c" } } } @@ -9448,33 +8064,33 @@ static void library_window_on_page_created (LibraryWindow* self, SidebarPageRepr Page* _tmp4_ = NULL; SidebarPageRepresentative* _tmp5_ = NULL; Page* _tmp6_ = NULL; -#line 1435 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1301 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" g_return_if_fail (IS_LIBRARY_WINDOW (self)); -#line 1435 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1301 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" g_return_if_fail (SIDEBAR_IS_PAGE_REPRESENTATIVE (entry)); -#line 1435 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1301 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" g_return_if_fail (IS_PAGE (page)); -#line 1436 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1302 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp0_ = self->priv->page_map; -#line 1436 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1302 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp1_ = page; -#line 1436 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1302 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp2_ = gee_abstract_map_has_key (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp1_); -#line 1436 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1302 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _vala_assert (!_tmp2_, "!page_map.has_key(page)"); -#line 1437 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1303 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp3_ = self->priv->page_map; -#line 1437 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1303 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp4_ = page; -#line 1437 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1303 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp5_ = entry; -#line 1437 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1303 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" gee_abstract_map_set (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp4_, G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, SIDEBAR_TYPE_ENTRY, SidebarEntry)); -#line 1439 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1305 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp6_ = page; -#line 1439 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1305 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" library_window_add_to_stack (self, _tmp6_); -#line 9477 "LibraryWindow.c" +#line 8093 "LibraryWindow.c" } @@ -9488,61 +8104,61 @@ static void library_window_on_destroying_page (LibraryWindow* self, SidebarPageR GeeHashMap* _tmp10_ = NULL; Page* _tmp11_ = NULL; gboolean _tmp12_ = FALSE; -#line 1442 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1308 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" g_return_if_fail (IS_LIBRARY_WINDOW (self)); -#line 1442 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1308 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" g_return_if_fail (SIDEBAR_IS_PAGE_REPRESENTATIVE (entry)); -#line 1442 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1308 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" g_return_if_fail (IS_PAGE (page)); -#line 1444 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1310 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp0_ = page; -#line 1444 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1310 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp1_ = page_window_get_current_page (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE_WINDOW, PageWindow)); -#line 1444 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1310 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp2_ = _tmp1_; -#line 1444 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1310 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp3_ = _tmp0_ == _tmp2_; -#line 1444 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1310 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _g_object_unref0 (_tmp2_); -#line 1444 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1310 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" if (_tmp3_) { -#line 9509 "LibraryWindow.c" +#line 8125 "LibraryWindow.c" LibraryBranch* _tmp4_ = NULL; LibraryPhotosEntry* _tmp5_ = NULL; LibraryPhotosEntry* _tmp6_ = NULL; Page* _tmp7_ = NULL; Page* _tmp8_ = NULL; -#line 1445 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1311 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp4_ = self->priv->library_branch; -#line 1445 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1311 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp5_ = library_branch_get_photos_entry (_tmp4_); -#line 1445 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1311 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp6_ = _tmp5_; -#line 1445 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1311 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp7_ = sidebar_page_representative_get_page (G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, SIDEBAR_TYPE_PAGE_REPRESENTATIVE, SidebarPageRepresentative)); -#line 1445 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1311 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp8_ = _tmp7_; -#line 1445 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1311 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" library_window_switch_to_page (self, _tmp8_); -#line 1445 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1311 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _g_object_unref0 (_tmp8_); -#line 9529 "LibraryWindow.c" +#line 8145 "LibraryWindow.c" } -#line 1447 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1313 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp9_ = page; -#line 1447 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1313 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" library_window_remove_from_stack (self, _tmp9_); -#line 1449 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1315 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp10_ = self->priv->page_map; -#line 1449 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1315 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp11_ = page; -#line 1449 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1315 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp12_ = gee_abstract_map_unset (G_TYPE_CHECK_INSTANCE_CAST (_tmp10_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp11_, NULL); -#line 1449 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1315 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" removed = _tmp12_; -#line 1450 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1316 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _vala_assert (removed, "removed"); -#line 9545 "LibraryWindow.c" +#line 8161 "LibraryWindow.c" } @@ -9551,39 +8167,39 @@ static void library_window_on_sidebar_entry_selected (LibraryWindow* self, Sideb SidebarSelectableEntry* _tmp0_ = NULL; SidebarPageRepresentative* _tmp1_ = NULL; SidebarPageRepresentative* _tmp2_ = NULL; -#line 1453 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1319 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" g_return_if_fail (IS_LIBRARY_WINDOW (self)); -#line 1453 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1319 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" g_return_if_fail (SIDEBAR_IS_SELECTABLE_ENTRY (selectable)); -#line 1454 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1320 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp0_ = selectable; -#line 1454 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1320 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp1_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp0_, SIDEBAR_TYPE_PAGE_REPRESENTATIVE) ? ((SidebarPageRepresentative*) _tmp0_) : NULL); -#line 1454 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1320 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" page_rep = _tmp1_; -#line 1455 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1321 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp2_ = page_rep; -#line 1455 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1321 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" if (_tmp2_ != NULL) { -#line 9568 "LibraryWindow.c" +#line 8184 "LibraryWindow.c" SidebarPageRepresentative* _tmp3_ = NULL; Page* _tmp4_ = NULL; Page* _tmp5_ = NULL; -#line 1456 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1322 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp3_ = page_rep; -#line 1456 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1322 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp4_ = sidebar_page_representative_get_page (_tmp3_); -#line 1456 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1322 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp5_ = _tmp4_; -#line 1456 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1322 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" library_window_switch_to_page (self, _tmp5_); -#line 1456 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1322 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _g_object_unref0 (_tmp5_); -#line 9582 "LibraryWindow.c" +#line 8198 "LibraryWindow.c" } -#line 1453 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1319 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _g_object_unref0 (page_rep); -#line 9586 "LibraryWindow.c" +#line 8202 "LibraryWindow.c" } @@ -9604,207 +8220,207 @@ static void library_window_on_sidebar_selected_entry_removed (LibraryWindow* sel LibraryPhotosEntry* _tmp32_ = NULL; Page* _tmp33_ = NULL; Page* _tmp34_ = NULL; -#line 1459 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1325 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" g_return_if_fail (IS_LIBRARY_WINDOW (self)); -#line 1459 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1325 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" g_return_if_fail (SIDEBAR_IS_SELECTABLE_ENTRY (selectable)); -#line 1463 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1329 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp0_ = self->priv->library_branch; -#line 1463 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1329 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp1_ = library_branch_get_last_imported_entry (_tmp0_); -#line 1463 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1329 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp2_ = _tmp1_; -#line 1463 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1329 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp3_ = _g_object_ref0 (_tmp2_); -#line 1463 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1329 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" last_import_entry = _tmp3_; -#line 1466 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1332 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp5_ = selectable; -#line 1466 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1332 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" if (G_TYPE_CHECK_INSTANCE_TYPE (_tmp5_, LIBRARY_TYPE_IMPORT_QUEUE_SIDEBAR_ENTRY)) { -#line 9625 "LibraryWindow.c" +#line 8241 "LibraryWindow.c" LibraryLastImportSidebarEntry* _tmp6_ = NULL; gboolean _tmp7_ = FALSE; gboolean _tmp8_ = FALSE; -#line 1466 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1332 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp6_ = last_import_entry; -#line 1466 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1332 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp7_ = library_hideable_page_entry_get_visible (G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, LIBRARY_TYPE_HIDEABLE_PAGE_ENTRY, LibraryHideablePageEntry)); -#line 1466 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1332 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp8_ = _tmp7_; -#line 1466 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1332 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp4_ = _tmp8_; -#line 9637 "LibraryWindow.c" +#line 8253 "LibraryWindow.c" } else { -#line 1466 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1332 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp4_ = FALSE; -#line 9641 "LibraryWindow.c" +#line 8257 "LibraryWindow.c" } -#line 1466 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1332 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" if (_tmp4_) { -#line 9645 "LibraryWindow.c" +#line 8261 "LibraryWindow.c" LibraryLastImportSidebarEntry* _tmp9_ = NULL; Page* _tmp10_ = NULL; Page* _tmp11_ = NULL; -#line 1467 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1333 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp9_ = last_import_entry; -#line 1467 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1333 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp10_ = sidebar_page_representative_get_page (G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, SIDEBAR_TYPE_PAGE_REPRESENTATIVE, SidebarPageRepresentative)); -#line 1467 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1333 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp11_ = _tmp10_; -#line 1467 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1333 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" library_window_switch_to_page (self, _tmp11_); -#line 1467 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1333 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _g_object_unref0 (_tmp11_); -#line 1469 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1335 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _g_object_unref0 (last_import_entry); -#line 1469 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1335 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" return; -#line 9663 "LibraryWindow.c" +#line 8279 "LibraryWindow.c" } -#line 1473 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1339 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp13_ = selectable; -#line 1473 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1339 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" if (G_TYPE_CHECK_INSTANCE_TYPE (_tmp13_, EVENTS_TYPE_EVENT_ENTRY)) { -#line 9669 "LibraryWindow.c" +#line 8285 "LibraryWindow.c" EventsBranch* _tmp14_ = NULL; gboolean _tmp15_ = FALSE; -#line 1473 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1339 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp14_ = self->priv->events_branch; -#line 1473 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1339 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp15_ = sidebar_branch_get_show_branch (G_TYPE_CHECK_INSTANCE_CAST (_tmp14_, SIDEBAR_TYPE_BRANCH, SidebarBranch)); -#line 1473 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1339 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp12_ = _tmp15_; -#line 9678 "LibraryWindow.c" +#line 8294 "LibraryWindow.c" } else { -#line 1473 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1339 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp12_ = FALSE; -#line 9682 "LibraryWindow.c" +#line 8298 "LibraryWindow.c" } -#line 1473 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1339 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" if (_tmp12_) { -#line 9686 "LibraryWindow.c" +#line 8302 "LibraryWindow.c" EventsBranch* _tmp16_ = NULL; EventsMasterDirectoryEntry* _tmp17_ = NULL; EventsMasterDirectoryEntry* _tmp18_ = NULL; Page* _tmp19_ = NULL; Page* _tmp20_ = NULL; -#line 1474 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1340 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp16_ = self->priv->events_branch; -#line 1474 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1340 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp17_ = events_branch_get_master_entry (_tmp16_); -#line 1474 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1340 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp18_ = _tmp17_; -#line 1474 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1340 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp19_ = sidebar_page_representative_get_page (G_TYPE_CHECK_INSTANCE_CAST (_tmp18_, SIDEBAR_TYPE_PAGE_REPRESENTATIVE, SidebarPageRepresentative)); -#line 1474 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1340 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp20_ = _tmp19_; -#line 1474 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1340 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" library_window_switch_to_page (self, _tmp20_); -#line 1474 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1340 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _g_object_unref0 (_tmp20_); -#line 1474 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1340 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _g_object_unref0 (_tmp18_); -#line 1476 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1342 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _g_object_unref0 (last_import_entry); -#line 1476 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1342 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" return; -#line 9712 "LibraryWindow.c" +#line 8328 "LibraryWindow.c" } -#line 1480 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1346 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp22_ = selectable; -#line 1480 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1346 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" if (G_TYPE_CHECK_INSTANCE_TYPE (_tmp22_, EVENTS_TYPE_DIRECTORY_ENTRY)) { -#line 9718 "LibraryWindow.c" +#line 8334 "LibraryWindow.c" EventsBranch* _tmp23_ = NULL; gboolean _tmp24_ = FALSE; -#line 1480 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1346 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp23_ = self->priv->events_branch; -#line 1480 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1346 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp24_ = sidebar_branch_get_show_branch (G_TYPE_CHECK_INSTANCE_CAST (_tmp23_, SIDEBAR_TYPE_BRANCH, SidebarBranch)); -#line 1480 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1346 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp21_ = _tmp24_; -#line 9727 "LibraryWindow.c" +#line 8343 "LibraryWindow.c" } else { -#line 1480 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1346 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp21_ = FALSE; -#line 9731 "LibraryWindow.c" +#line 8347 "LibraryWindow.c" } -#line 1480 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1346 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" if (_tmp21_) { -#line 9735 "LibraryWindow.c" +#line 8351 "LibraryWindow.c" EventsBranch* _tmp25_ = NULL; EventsMasterDirectoryEntry* _tmp26_ = NULL; EventsMasterDirectoryEntry* _tmp27_ = NULL; Page* _tmp28_ = NULL; Page* _tmp29_ = NULL; -#line 1481 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1347 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp25_ = self->priv->events_branch; -#line 1481 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1347 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp26_ = events_branch_get_master_entry (_tmp25_); -#line 1481 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1347 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp27_ = _tmp26_; -#line 1481 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1347 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp28_ = sidebar_page_representative_get_page (G_TYPE_CHECK_INSTANCE_CAST (_tmp27_, SIDEBAR_TYPE_PAGE_REPRESENTATIVE, SidebarPageRepresentative)); -#line 1481 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1347 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp29_ = _tmp28_; -#line 1481 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1347 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" library_window_switch_to_page (self, _tmp29_); -#line 1481 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1347 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _g_object_unref0 (_tmp29_); -#line 1481 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1347 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _g_object_unref0 (_tmp27_); -#line 1483 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1349 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _g_object_unref0 (last_import_entry); -#line 1483 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1349 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" return; -#line 9761 "LibraryWindow.c" +#line 8377 "LibraryWindow.c" } -#line 1487 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1353 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp30_ = self->priv->library_branch; -#line 1487 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1353 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp31_ = library_branch_get_photos_entry (_tmp30_); -#line 1487 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1353 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp32_ = _tmp31_; -#line 1487 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1353 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp33_ = sidebar_page_representative_get_page (G_TYPE_CHECK_INSTANCE_CAST (_tmp32_, SIDEBAR_TYPE_PAGE_REPRESENTATIVE, SidebarPageRepresentative)); -#line 1487 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1353 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp34_ = _tmp33_; -#line 1487 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1353 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" library_window_switch_to_page (self, _tmp34_); -#line 1487 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1353 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _g_object_unref0 (_tmp34_); -#line 1459 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1325 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _g_object_unref0 (last_import_entry); -#line 9779 "LibraryWindow.c" +#line 8395 "LibraryWindow.c" } static void _library_window_on_update_properties_view_collection_items_state_changed (ViewCollection* _sender, GeeIterable* changed, gpointer self) { -#line 1493 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1359 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" library_window_on_update_properties ((LibraryWindow*) self); -#line 9786 "LibraryWindow.c" +#line 8402 "LibraryWindow.c" } static void _library_window_on_update_properties_data_collection_items_altered (DataCollection* _sender, GeeMap* items, gpointer self) { -#line 1494 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1360 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" library_window_on_update_properties ((LibraryWindow*) self); -#line 9793 "LibraryWindow.c" +#line 8409 "LibraryWindow.c" } static void _library_window_on_update_properties_data_collection_contents_altered (DataCollection* _sender, GeeIterable* added, GeeIterable* removed, gpointer self) { -#line 1495 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1361 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" library_window_on_update_properties ((LibraryWindow*) self); -#line 9800 "LibraryWindow.c" +#line 8416 "LibraryWindow.c" } static void _library_window_on_update_properties_view_collection_items_visibility_changed (ViewCollection* _sender, GeeCollection* changed, gpointer self) { -#line 1496 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1362 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" library_window_on_update_properties ((LibraryWindow*) self); -#line 9807 "LibraryWindow.c" +#line 8423 "LibraryWindow.c" } @@ -9812,27 +8428,27 @@ static void library_window_subscribe_for_basic_information (LibraryWindow* self, ViewCollection* view = NULL; Page* _tmp0_ = NULL; ViewCollection* _tmp1_ = NULL; -#line 1490 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1356 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" g_return_if_fail (IS_LIBRARY_WINDOW (self)); -#line 1490 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1356 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" g_return_if_fail (IS_PAGE (page)); -#line 1491 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1357 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp0_ = page; -#line 1491 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1357 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp1_ = page_get_view (_tmp0_); -#line 1491 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1357 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" view = _tmp1_; -#line 1493 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1359 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" g_signal_connect_object (view, "items-state-changed", (GCallback) _library_window_on_update_properties_view_collection_items_state_changed, self, 0); -#line 1494 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1360 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (view, TYPE_DATA_COLLECTION, DataCollection), "items-altered", (GCallback) _library_window_on_update_properties_data_collection_items_altered, self, 0); -#line 1495 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1361 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (view, TYPE_DATA_COLLECTION, DataCollection), "contents-altered", (GCallback) _library_window_on_update_properties_data_collection_contents_altered, self, 0); -#line 1496 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1362 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" g_signal_connect_object (view, "items-visibility-changed", (GCallback) _library_window_on_update_properties_view_collection_items_visibility_changed, self, 0); -#line 1490 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1356 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _data_collection_unref0 (view); -#line 9835 "LibraryWindow.c" +#line 8451 "LibraryWindow.c" } @@ -9844,47 +8460,47 @@ static void library_window_unsubscribe_from_basic_information (LibraryWindow* se guint _tmp3_ = 0U; guint _tmp4_ = 0U; guint _tmp5_ = 0U; -#line 1499 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1365 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" g_return_if_fail (IS_LIBRARY_WINDOW (self)); -#line 1499 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1365 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" g_return_if_fail (IS_PAGE (page)); -#line 1500 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1366 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp0_ = page; -#line 1500 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1366 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp1_ = page_get_view (_tmp0_); -#line 1500 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1366 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" view = _tmp1_; -#line 1502 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1368 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" g_signal_parse_name ("items-state-changed", TYPE_VIEW_COLLECTION, &_tmp2_, NULL, FALSE); -#line 1502 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1368 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" g_signal_handlers_disconnect_matched (view, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp2_, 0, NULL, (GCallback) _library_window_on_update_properties_view_collection_items_state_changed, self); -#line 1503 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1369 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" g_signal_parse_name ("items-altered", TYPE_DATA_COLLECTION, &_tmp3_, NULL, FALSE); -#line 1503 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1369 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" g_signal_handlers_disconnect_matched (G_TYPE_CHECK_INSTANCE_CAST (view, TYPE_DATA_COLLECTION, DataCollection), G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp3_, 0, NULL, (GCallback) _library_window_on_update_properties_data_collection_items_altered, self); -#line 1504 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1370 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" g_signal_parse_name ("contents-altered", TYPE_DATA_COLLECTION, &_tmp4_, NULL, FALSE); -#line 1504 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1370 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" g_signal_handlers_disconnect_matched (G_TYPE_CHECK_INSTANCE_CAST (view, TYPE_DATA_COLLECTION, DataCollection), G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp4_, 0, NULL, (GCallback) _library_window_on_update_properties_data_collection_contents_altered, self); -#line 1505 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1371 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" g_signal_parse_name ("items-visibility-changed", TYPE_VIEW_COLLECTION, &_tmp5_, NULL, FALSE); -#line 1505 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1371 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" g_signal_handlers_disconnect_matched (view, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp5_, 0, NULL, (GCallback) _library_window_on_update_properties_view_collection_items_visibility_changed, self); -#line 1499 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1365 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _data_collection_unref0 (view); -#line 9875 "LibraryWindow.c" +#line 8491 "LibraryWindow.c" } static void library_window_on_update_properties (LibraryWindow* self) { OneShotScheduler* _tmp0_ = NULL; -#line 1508 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1374 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" g_return_if_fail (IS_LIBRARY_WINDOW (self)); -#line 1509 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1375 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp0_ = self->priv->properties_scheduler; -#line 1509 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1375 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" one_shot_scheduler_at_idle (_tmp0_); -#line 9887 "LibraryWindow.c" +#line 8503 "LibraryWindow.c" } @@ -9895,55 +8511,55 @@ static void library_window_on_update_properties_now (LibraryWindow* self) { ExtendedPropertiesWindow* _tmp6_ = NULL; gboolean _tmp7_ = FALSE; gboolean _tmp8_ = FALSE; -#line 1512 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1378 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" g_return_if_fail (IS_LIBRARY_WINDOW (self)); -#line 1513 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1379 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp0_ = self->priv->bottom_frame; -#line 1513 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1379 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp1_ = gtk_widget_get_visible (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, gtk_widget_get_type (), GtkWidget)); -#line 1513 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1379 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp2_ = _tmp1_; -#line 1513 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1379 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" if (_tmp2_) { -#line 9908 "LibraryWindow.c" +#line 8524 "LibraryWindow.c" BasicProperties* _tmp3_ = NULL; Page* _tmp4_ = NULL; Page* _tmp5_ = NULL; -#line 1514 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1380 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp3_ = self->priv->basic_properties; -#line 1514 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1380 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp4_ = page_window_get_current_page (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE_WINDOW, PageWindow)); -#line 1514 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1380 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp5_ = _tmp4_; -#line 1514 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1380 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" properties_update_properties (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, TYPE_PROPERTIES, Properties), _tmp5_); -#line 1514 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1380 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _g_object_unref0 (_tmp5_); -#line 9922 "LibraryWindow.c" +#line 8538 "LibraryWindow.c" } -#line 1516 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1382 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp6_ = self->priv->extended_properties; -#line 1516 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1382 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp7_ = gtk_widget_get_visible (G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, gtk_widget_get_type (), GtkWidget)); -#line 1516 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1382 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp8_ = _tmp7_; -#line 1516 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1382 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" if (_tmp8_) { -#line 9932 "LibraryWindow.c" +#line 8548 "LibraryWindow.c" ExtendedPropertiesWindow* _tmp9_ = NULL; Page* _tmp10_ = NULL; Page* _tmp11_ = NULL; -#line 1517 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1383 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp9_ = self->priv->extended_properties; -#line 1517 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1383 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp10_ = page_window_get_current_page (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE_WINDOW, PageWindow)); -#line 1517 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1383 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp11_ = _tmp10_; -#line 1517 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1383 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" extended_properties_window_update_properties (_tmp9_, _tmp11_); -#line 1517 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1383 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _g_object_unref0 (_tmp11_); -#line 9946 "LibraryWindow.c" +#line 8562 "LibraryWindow.c" } } @@ -9957,7 +8573,7 @@ static gchar* string_replace (const gchar* self, const gchar* old, const gchar* g_return_val_if_fail (old != NULL, NULL); #line 1380 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" g_return_val_if_fail (replacement != NULL, NULL); -#line 9960 "LibraryWindow.c" +#line 8576 "LibraryWindow.c" { GRegex* regex = NULL; const gchar* _tmp0_ = NULL; @@ -9988,8 +8604,8 @@ static gchar* string_replace (const gchar* self, const gchar* old, const gchar* if (G_UNLIKELY (_inner_error_ != NULL)) { #line 1382 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" if (_inner_error_->domain == G_REGEX_ERROR) { -#line 9991 "LibraryWindow.c" - goto __catch42_g_regex_error; +#line 8607 "LibraryWindow.c" + goto __catch41_g_regex_error; } #line 1382 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" g_critical ("file %s: line %d: unexpected error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code); @@ -9997,7 +8613,7 @@ static gchar* string_replace (const gchar* self, const gchar* old, const gchar* g_clear_error (&_inner_error_); #line 1382 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" return NULL; -#line 10000 "LibraryWindow.c" +#line 8616 "LibraryWindow.c" } #line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp6_ = regex; @@ -10013,8 +8629,8 @@ static gchar* string_replace (const gchar* self, const gchar* old, const gchar* _g_regex_unref0 (regex); #line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" if (_inner_error_->domain == G_REGEX_ERROR) { -#line 10016 "LibraryWindow.c" - goto __catch42_g_regex_error; +#line 8632 "LibraryWindow.c" + goto __catch41_g_regex_error; } #line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _g_regex_unref0 (regex); @@ -10024,7 +8640,7 @@ static gchar* string_replace (const gchar* self, const gchar* old, const gchar* g_clear_error (&_inner_error_); #line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" return NULL; -#line 10027 "LibraryWindow.c" +#line 8643 "LibraryWindow.c" } #line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp9_ = _tmp5_; @@ -10038,10 +8654,10 @@ static gchar* string_replace (const gchar* self, const gchar* old, const gchar* _g_regex_unref0 (regex); #line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" return result; -#line 10041 "LibraryWindow.c" +#line 8657 "LibraryWindow.c" } - goto __finally42; - __catch42_g_regex_error: + goto __finally41; + __catch41_g_regex_error: { GError* e = NULL; #line 1381 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" @@ -10052,9 +8668,9 @@ static gchar* string_replace (const gchar* self, const gchar* old, const gchar* g_assert_not_reached (); #line 1381 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _g_error_free0 (e); -#line 10055 "LibraryWindow.c" +#line 8671 "LibraryWindow.c" } - __finally42: + __finally41: #line 1381 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" if (G_UNLIKELY (_inner_error_ != NULL)) { #line 1381 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" @@ -10063,7 +8679,7 @@ static gchar* string_replace (const gchar* self, const gchar* old, const gchar* g_clear_error (&_inner_error_); #line 1381 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" return NULL; -#line 10066 "LibraryWindow.c" +#line 8682 "LibraryWindow.c" } } @@ -10081,188 +8697,188 @@ void library_window_mounted_camera_shell_notification (LibraryWindow* self, cons gboolean _tmp13_ = FALSE; gboolean _tmp18_ = FALSE; GError * _inner_error_ = NULL; -#line 1520 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1386 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" g_return_if_fail (IS_LIBRARY_WINDOW (self)); -#line 1520 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1386 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" g_return_if_fail (uri != NULL); -#line 1521 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1387 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp0_ = uri; -#line 1521 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - g_debug ("LibraryWindow.vala:1521: mount point reported: %s", _tmp0_); -#line 1524 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1387 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" + g_debug ("LibraryWindow.vala:1387: mount point reported: %s", _tmp0_); +#line 1390 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp1_ = uri; -#line 1524 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1390 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp2_ = library_window_is_mount_uri_supported (_tmp1_); -#line 1524 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1390 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" if (!_tmp2_) { -#line 10098 "LibraryWindow.c" +#line 8714 "LibraryWindow.c" const gchar* _tmp3_ = NULL; -#line 1525 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1391 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp3_ = uri; -#line 1525 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - g_debug ("LibraryWindow.vala:1525: Unsupported mount scheme: %s", _tmp3_); -#line 1527 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1391 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" + g_debug ("LibraryWindow.vala:1391: Unsupported mount scheme: %s", _tmp3_); +#line 1393 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" return; -#line 10106 "LibraryWindow.c" +#line 8722 "LibraryWindow.c" } -#line 1530 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1396 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp4_ = uri; -#line 1530 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1396 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp5_ = g_file_new_for_uri (_tmp4_); -#line 1530 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1396 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" uri_file = _tmp5_; -#line 1533 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1399 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" mount = NULL; -#line 10116 "LibraryWindow.c" +#line 8732 "LibraryWindow.c" { GMount* _tmp6_ = NULL; GFile* _tmp7_ = NULL; GMount* _tmp8_ = NULL; GMount* _tmp9_ = NULL; -#line 1535 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1401 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp7_ = uri_file; -#line 1535 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1401 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp8_ = g_file_find_enclosing_mount (_tmp7_, NULL, &_inner_error_); -#line 1535 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1401 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp6_ = _tmp8_; -#line 1535 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1401 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 10130 "LibraryWindow.c" - goto __catch41_g_error; +#line 8746 "LibraryWindow.c" + goto __catch40_g_error; } -#line 1535 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1401 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp9_ = _tmp6_; -#line 1535 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1401 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp6_ = NULL; -#line 1535 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1401 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _g_object_unref0 (mount); -#line 1535 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1401 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" mount = _tmp9_; -#line 1534 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1400 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _g_object_unref0 (_tmp6_); -#line 10143 "LibraryWindow.c" +#line 8759 "LibraryWindow.c" } - goto __finally41; - __catch41_g_error: + goto __finally40; + __catch40_g_error: { GError* err = NULL; GError* _tmp10_ = NULL; const gchar* _tmp11_ = NULL; -#line 1534 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1400 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" err = _inner_error_; -#line 1534 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1400 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _inner_error_ = NULL; -#line 1537 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1403 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp10_ = err; -#line 1537 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1403 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp11_ = _tmp10_->message; -#line 1537 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - g_debug ("LibraryWindow.vala:1537: %s", _tmp11_); -#line 1539 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1403 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" + g_debug ("LibraryWindow.vala:1403: %s", _tmp11_); +#line 1405 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _g_error_free0 (err); -#line 1539 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1405 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _g_object_unref0 (mount); -#line 1539 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1405 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _g_object_unref0 (uri_file); -#line 1539 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1405 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" return; -#line 10169 "LibraryWindow.c" +#line 8785 "LibraryWindow.c" } - __finally41: -#line 1534 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" + __finally40: +#line 1400 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 1534 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1400 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _g_object_unref0 (mount); -#line 1534 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1400 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _g_object_unref0 (uri_file); -#line 1534 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1400 "/home/jens/Source/shotwell/src/library/LibraryWindow.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 1534 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1400 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" g_clear_error (&_inner_error_); -#line 1534 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1400 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" return; -#line 10184 "LibraryWindow.c" +#line 8800 "LibraryWindow.c" } -#line 1543 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1409 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" alt_uri = NULL; -#line 1544 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1410 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp12_ = uri; -#line 1544 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1410 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp13_ = g_str_has_prefix (_tmp12_, "file://"); -#line 1544 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1410 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" if (_tmp13_) { -#line 10194 "LibraryWindow.c" +#line 8810 "LibraryWindow.c" const gchar* _tmp14_ = NULL; gchar* _tmp15_ = NULL; gchar* _tmp16_ = NULL; gchar* _tmp17_ = NULL; -#line 1545 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1411 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp14_ = uri; -#line 1545 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1411 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp15_ = string_replace (_tmp14_, "file://", "disk:"); -#line 1545 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1411 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp16_ = _tmp15_; -#line 1545 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1411 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp17_ = camera_table_get_port_uri (_tmp16_); -#line 1545 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1411 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _g_free0 (alt_uri); -#line 1545 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1411 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" alt_uri = _tmp17_; -#line 1545 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1411 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _g_free0 (_tmp16_); -#line 10213 "LibraryWindow.c" +#line 8829 "LibraryWindow.c" } -#line 1548 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1414 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp18_ = at_startup; -#line 1548 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1414 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" if (_tmp18_) { -#line 10219 "LibraryWindow.c" +#line 8835 "LibraryWindow.c" const gchar* _tmp19_ = NULL; gboolean _tmp20_ = FALSE; const gchar* _tmp23_ = NULL; gboolean _tmp24_ = FALSE; -#line 1549 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1415 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp19_ = uri; -#line 1549 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1415 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp20_ = is_string_empty (_tmp19_); -#line 1549 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1415 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" if (!_tmp20_) { -#line 10230 "LibraryWindow.c" +#line 8846 "LibraryWindow.c" GeeHashSet* _tmp21_ = NULL; const gchar* _tmp22_ = NULL; -#line 1550 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1416 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp21_ = library_window_initial_camera_uris; -#line 1550 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1416 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp22_ = uri; -#line 1550 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1416 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" gee_abstract_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp21_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), _tmp22_); -#line 10239 "LibraryWindow.c" +#line 8855 "LibraryWindow.c" } -#line 1552 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1418 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp23_ = alt_uri; -#line 1552 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1418 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp24_ = is_string_empty (_tmp23_); -#line 1552 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1418 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" if (!_tmp24_) { -#line 10247 "LibraryWindow.c" +#line 8863 "LibraryWindow.c" GeeHashSet* _tmp25_ = NULL; const gchar* _tmp26_ = NULL; -#line 1553 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1419 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp25_ = library_window_initial_camera_uris; -#line 1553 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1419 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp26_ = alt_uri; -#line 1553 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1419 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" gee_abstract_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp25_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), _tmp26_); -#line 10256 "LibraryWindow.c" +#line 8872 "LibraryWindow.c" } } -#line 1520 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1386 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _g_free0 (alt_uri); -#line 1520 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1386 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _g_object_unref0 (mount); -#line 1520 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1386 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _g_object_unref0 (uri_file); -#line 10265 "LibraryWindow.c" +#line 8881 "LibraryWindow.c" } @@ -10279,97 +8895,97 @@ static gboolean library_window_real_key_press_event (GtkWidget* base, GdkEventKe GdkEventKey* _tmp13_ = NULL; guint _tmp14_ = 0U; const gchar* _tmp15_ = NULL; -#line 1557 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1423 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_LIBRARY_WINDOW, LibraryWindow); -#line 1557 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1423 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" g_return_val_if_fail (event != NULL, FALSE); -#line 1558 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1424 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp2_ = self->priv->sidebar_tree; -#line 1558 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1424 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" g_object_get (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, gtk_widget_get_type (), GtkWidget), "has-focus", &_tmp3_, NULL); -#line 1558 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1424 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp4_ = _tmp3_; -#line 1558 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1424 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" if (_tmp4_) { -#line 10294 "LibraryWindow.c" +#line 8910 "LibraryWindow.c" SidebarTree* _tmp5_ = NULL; GdkEventKey* _tmp6_ = NULL; gboolean _tmp7_ = FALSE; -#line 1558 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1424 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp5_ = self->priv->sidebar_tree; -#line 1558 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1424 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp6_ = event; -#line 1558 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1424 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp7_ = sidebar_tree_is_keypress_interpreted (_tmp5_, _tmp6_); -#line 1558 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1424 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp1_ = _tmp7_; -#line 10306 "LibraryWindow.c" +#line 8922 "LibraryWindow.c" } else { -#line 1558 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1424 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp1_ = FALSE; -#line 10310 "LibraryWindow.c" +#line 8926 "LibraryWindow.c" } -#line 1558 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1424 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" if (_tmp1_) { -#line 10314 "LibraryWindow.c" +#line 8930 "LibraryWindow.c" SidebarTree* _tmp8_ = NULL; GdkEventKey* _tmp9_ = NULL; gboolean _tmp10_ = FALSE; -#line 1559 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1425 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp8_ = self->priv->sidebar_tree; -#line 1559 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1425 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp9_ = event; -#line 1559 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1425 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" g_signal_emit_by_name (G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, gtk_widget_get_type (), GtkWidget), "key-press-event", _tmp9_, &_tmp10_); -#line 1559 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1425 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp0_ = _tmp10_; -#line 10326 "LibraryWindow.c" +#line 8942 "LibraryWindow.c" } else { -#line 1558 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1424 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp0_ = FALSE; -#line 10330 "LibraryWindow.c" +#line 8946 "LibraryWindow.c" } -#line 1558 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1424 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" if (_tmp0_) { -#line 1560 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1426 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" result = TRUE; -#line 1560 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1426 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" return result; -#line 10338 "LibraryWindow.c" +#line 8954 "LibraryWindow.c" } -#line 1563 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1429 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp11_ = event; -#line 1563 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1429 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp12_ = GTK_WIDGET_CLASS (library_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), _tmp11_); -#line 1563 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1429 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" if (_tmp12_) { -#line 1564 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1430 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" result = TRUE; -#line 1564 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1430 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" return result; -#line 10350 "LibraryWindow.c" +#line 8966 "LibraryWindow.c" } -#line 1566 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1432 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp13_ = event; -#line 1566 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1432 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp14_ = _tmp13_->keyval; -#line 1566 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1432 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp15_ = gdk_keyval_name (_tmp14_); -#line 1566 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1432 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" if (g_strcmp0 (_tmp15_, "Escape") == 0) { -#line 1567 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1433 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" library_window_on_clear_search (self); -#line 1568 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1434 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" result = TRUE; -#line 1568 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1434 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" return result; -#line 10366 "LibraryWindow.c" +#line 8982 "LibraryWindow.c" } -#line 1571 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1437 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" result = FALSE; -#line 1571 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1437 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" return result; -#line 10372 "LibraryWindow.c" +#line 8988 "LibraryWindow.c" } @@ -10385,14 +9001,14 @@ gint library_window_get_PAGE_MIN_WIDTH (void) { result = _tmp1_ + (CHECKERBOARD_LAYOUT_COLUMN_GUTTER_PADDING * 2); #line 12 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" return result; -#line 10388 "LibraryWindow.c" +#line 9004 "LibraryWindow.c" } static gpointer _data_collection_ref0 (gpointer self) { #line 78 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" return self ? data_collection_ref (self) : NULL; -#line 10395 "LibraryWindow.c" +#line 9011 "LibraryWindow.c" } @@ -10438,14 +9054,14 @@ static LibraryWindowFullscreenPhotoPage* library_window_fullscreen_photo_page_co self->priv->view = _tmp5_; #line 75 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" return self; -#line 10441 "LibraryWindow.c" +#line 9057 "LibraryWindow.c" } static LibraryWindowFullscreenPhotoPage* library_window_fullscreen_photo_page_new (CollectionPage* collection, Photo* start, ViewCollection* view) { #line 75 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" return library_window_fullscreen_photo_page_construct (LIBRARY_WINDOW_TYPE_FULLSCREEN_PHOTO_PAGE, collection, start, view); -#line 10448 "LibraryWindow.c" +#line 9064 "LibraryWindow.c" } @@ -10466,7 +9082,7 @@ static void library_window_fullscreen_photo_page_real_switched_to (Page* base) { library_photo_page_display_for_collection (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_LIBRARY_PHOTO_PAGE, LibraryPhotoPage), _tmp0_, _tmp1_, _tmp2_); #line 84 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" PAGE_CLASS (library_window_fullscreen_photo_page_parent_class)->switched_to (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_LIBRARY_PHOTO_PAGE, LibraryPhotoPage), TYPE_PAGE, Page)); -#line 10469 "LibraryWindow.c" +#line 9085 "LibraryWindow.c" } @@ -10481,7 +9097,7 @@ static void library_window_fullscreen_photo_page_real_init_collect_ui_filenames _tmp0_ = ui_filenames; #line 90 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" gee_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GEE_TYPE_COLLECTION, GeeCollection), "photo_context.ui"); -#line 10484 "LibraryWindow.c" +#line 9100 "LibraryWindow.c" } @@ -10496,14 +9112,14 @@ static void library_window_fullscreen_photo_page_class_init (LibraryWindowFullsc ((PageClass *) klass)->init_collect_ui_filenames = library_window_fullscreen_photo_page_real_init_collect_ui_filenames; #line 70 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" G_OBJECT_CLASS (klass)->finalize = library_window_fullscreen_photo_page_finalize; -#line 10499 "LibraryWindow.c" +#line 9115 "LibraryWindow.c" } static void library_window_fullscreen_photo_page_instance_init (LibraryWindowFullscreenPhotoPage * self) { #line 70 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" self->priv = LIBRARY_WINDOW_FULLSCREEN_PHOTO_PAGE_GET_PRIVATE (self); -#line 10506 "LibraryWindow.c" +#line 9122 "LibraryWindow.c" } @@ -10519,7 +9135,7 @@ static void library_window_fullscreen_photo_page_finalize (GObject* obj) { _data_collection_unref0 (self->priv->view); #line 70 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" G_OBJECT_CLASS (library_window_fullscreen_photo_page_parent_class)->finalize (obj); -#line 10522 "LibraryWindow.c" +#line 9138 "LibraryWindow.c" } @@ -10542,9 +9158,7 @@ static void library_window_class_init (LibraryWindowClass * klass) { #line 7 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" g_type_class_add_private (klass, sizeof (LibraryWindowPrivate)); #line 7 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - ((AppWindowClass *) klass)->create_common_action_groups = library_window_real_create_common_action_groups; -#line 7 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - ((AppWindowClass *) klass)->replace_common_placeholders = library_window_real_replace_common_placeholders; + ((AppWindowClass *) klass)->add_actions = library_window_real_add_actions; #line 7 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" ((PageWindowClass *) klass)->switched_pages = library_window_real_switched_pages; #line 7 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" @@ -10571,11 +9185,11 @@ static void library_window_class_init (LibraryWindowClass * klass) { G_OBJECT_CLASS (klass)->get_property = _vala_library_window_get_property; #line 7 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" G_OBJECT_CLASS (klass)->finalize = library_window_finalize; -#line 121 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 119 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp0_ = gee_hash_set_new (G_TYPE_STRING, (GBoxedCopyFunc) g_strdup, g_free, NULL, NULL, NULL, NULL, NULL, NULL); -#line 121 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 119 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" library_window_initial_camera_uris = _tmp0_; -#line 10578 "LibraryWindow.c" +#line 9192 "LibraryWindow.c" } @@ -10585,21 +9199,20 @@ static void library_window_instance_init (LibraryWindow * self) { GtkPaned* _tmp2_ = NULL; GtkPaned* _tmp3_ = NULL; GtkFrame* _tmp4_ = NULL; - GtkActionGroup* _tmp5_ = NULL; - LibraryBranch* _tmp6_ = NULL; - TagsBranch* _tmp7_ = NULL; - FoldersBranch* _tmp8_ = NULL; - EventsBranch* _tmp9_ = NULL; - CameraBranch* _tmp10_ = NULL; - SearchesBranch* _tmp11_ = NULL; - GeeHashMap* _tmp12_ = NULL; - SearchFilterActions* _tmp13_ = NULL; - GtkBox* _tmp14_ = NULL; - GtkFrame* _tmp15_ = NULL; - GtkProgressBar* _tmp16_ = NULL; - BasicProperties* _tmp17_ = NULL; - GtkStack* _tmp18_ = NULL; - GtkBox* _tmp19_ = NULL; + LibraryBranch* _tmp5_ = NULL; + TagsBranch* _tmp6_ = NULL; + FoldersBranch* _tmp7_ = NULL; + EventsBranch* _tmp8_ = NULL; + CameraBranch* _tmp9_ = NULL; + SearchesBranch* _tmp10_ = NULL; + GeeHashMap* _tmp11_ = NULL; + SearchFilterActions* _tmp12_ = NULL; + GtkBox* _tmp13_ = NULL; + GtkFrame* _tmp14_ = NULL; + GtkProgressBar* _tmp15_ = NULL; + BasicProperties* _tmp16_ = NULL; + GtkStack* _tmp17_ = NULL; + GtkBox* _tmp18_ = NULL; #line 7 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" self->priv = LIBRARY_WINDOW_GET_PRIVATE (self); #line 95 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" @@ -10627,94 +9240,90 @@ static void library_window_instance_init (LibraryWindow * self) { #line 99 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" self->priv->bottom_frame = _tmp4_; #line 101 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp5_ = gtk_action_group_new ("LibraryWindowGlobalActionGroup"); -#line 101 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - self->priv->common_action_group = _tmp5_; -#line 103 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" self->priv->properties_scheduler = NULL; -#line 104 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 102 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" self->priv->notify_library_is_home_dir = TRUE; +#line 106 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" + _tmp5_ = library_branch_new (); +#line 106 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" + self->priv->library_branch = _tmp5_; +#line 107 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" + _tmp6_ = tags_branch_new (); +#line 107 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" + self->priv->tags_branch = _tmp6_; #line 108 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp6_ = library_branch_new (); + _tmp7_ = folders_branch_new (); #line 108 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - self->priv->library_branch = _tmp6_; + self->priv->folders_branch = _tmp7_; #line 109 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp7_ = tags_branch_new (); + _tmp8_ = events_branch_new (); #line 109 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - self->priv->tags_branch = _tmp7_; + self->priv->events_branch = _tmp8_; #line 110 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp8_ = folders_branch_new (); + _tmp9_ = camera_branch_new (); #line 110 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - self->priv->folders_branch = _tmp8_; + self->priv->camera_branch = _tmp9_; #line 111 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp9_ = events_branch_new (); + _tmp10_ = searches_branch_new (); #line 111 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - self->priv->events_branch = _tmp9_; -#line 112 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp10_ = camera_branch_new (); + self->priv->saved_search_branch = _tmp10_; #line 112 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - self->priv->camera_branch = _tmp10_; -#line 113 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp11_ = searches_branch_new (); -#line 113 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - self->priv->saved_search_branch = _tmp11_; -#line 114 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" self->priv->page_switching_enabled = TRUE; +#line 114 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" + _tmp11_ = gee_hash_map_new (TYPE_PAGE, (GBoxedCopyFunc) g_object_ref, g_object_unref, SIDEBAR_TYPE_ENTRY, (GBoxedCopyFunc) g_object_ref, g_object_unref, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL); +#line 114 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" + self->priv->page_map = _tmp11_; #line 116 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp12_ = gee_hash_map_new (TYPE_PAGE, (GBoxedCopyFunc) g_object_ref, g_object_unref, SIDEBAR_TYPE_ENTRY, (GBoxedCopyFunc) g_object_ref, g_object_unref, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL); -#line 116 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - self->priv->page_map = _tmp12_; -#line 118 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" self->priv->photo_page = NULL; -#line 123 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 121 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" self->priv->is_search_toolbar_visible = FALSE; -#line 128 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp13_ = search_filter_actions_new (); -#line 128 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - self->priv->search_actions = _tmp13_; -#line 131 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp14_ = (GtkBox*) gtk_box_new (GTK_ORIENTATION_VERTICAL, 0); -#line 131 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 126 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" + _tmp12_ = search_filter_actions_new (); +#line 126 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" + self->priv->search_actions = _tmp12_; +#line 129 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" + _tmp13_ = (GtkBox*) gtk_box_new (GTK_ORIENTATION_VERTICAL, 0); +#line 129 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" + g_object_ref_sink (_tmp13_); +#line 129 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" + self->priv->top_section = _tmp13_; +#line 130 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" + _tmp14_ = (GtkFrame*) gtk_frame_new (NULL); +#line 130 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" g_object_ref_sink (_tmp14_); +#line 130 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" + self->priv->background_progress_frame = _tmp14_; +#line 131 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" + _tmp15_ = (GtkProgressBar*) gtk_progress_bar_new (); #line 131 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - self->priv->top_section = _tmp14_; -#line 132 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp15_ = (GtkFrame*) gtk_frame_new (NULL); -#line 132 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" g_object_ref_sink (_tmp15_); +#line 131 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" + self->priv->background_progress_bar = _tmp15_; #line 132 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - self->priv->background_progress_frame = _tmp15_; -#line 133 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp16_ = (GtkProgressBar*) gtk_progress_bar_new (); -#line 133 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" + self->priv->background_progress_displayed = FALSE; +#line 134 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" + _tmp16_ = basic_properties_new (); +#line 134 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" g_object_ref_sink (_tmp16_); -#line 133 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - self->priv->background_progress_bar = _tmp16_; #line 134 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - self->priv->background_progress_displayed = FALSE; -#line 136 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp17_ = basic_properties_new (); -#line 136 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" + self->priv->basic_properties = _tmp16_; +#line 137 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" + _tmp17_ = (GtkStack*) gtk_stack_new (); +#line 137 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" g_object_ref_sink (_tmp17_); -#line 136 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - self->priv->basic_properties = _tmp17_; -#line 139 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp18_ = (GtkStack*) gtk_stack_new (); -#line 139 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 137 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" + self->priv->stack = _tmp17_; +#line 138 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" + _tmp18_ = (GtkBox*) gtk_box_new (GTK_ORIENTATION_VERTICAL, 0); +#line 138 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" g_object_ref_sink (_tmp18_); -#line 139 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - self->priv->stack = _tmp18_; -#line 140 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp19_ = (GtkBox*) gtk_box_new (GTK_ORIENTATION_VERTICAL, 0); -#line 140 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - g_object_ref_sink (_tmp19_); -#line 140 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - self->priv->layout = _tmp19_; -#line 143 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 138 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" + self->priv->layout = _tmp18_; +#line 141 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" self->priv->current_progress_priority = 0; -#line 144 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 142 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" self->priv->background_progress_pulse_id = (guint) 0; -#line 10717 "LibraryWindow.c" +#line 9326 "LibraryWindow.c" } @@ -10754,51 +9363,51 @@ static void library_window_finalize (GObject* obj) { guint _tmp45_ = 0U; #line 7 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_LIBRARY_WINDOW, LibraryWindow); -#line 231 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 215 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp0_ = self->priv->sidebar_tree; -#line 231 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 215 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" g_signal_parse_name ("page-created", SIDEBAR_TYPE_TREE, &_tmp1_, NULL, FALSE); -#line 231 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 215 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" g_signal_handlers_disconnect_matched (_tmp0_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp1_, 0, NULL, (GCallback) _library_window_on_page_created_sidebar_tree_page_created, self); -#line 232 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 216 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp2_ = self->priv->sidebar_tree; -#line 232 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 216 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" g_signal_parse_name ("destroying-page", SIDEBAR_TYPE_TREE, &_tmp3_, NULL, FALSE); -#line 232 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 216 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" g_signal_handlers_disconnect_matched (_tmp2_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp3_, 0, NULL, (GCallback) _library_window_on_destroying_page_sidebar_tree_destroying_page, self); -#line 233 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 217 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp4_ = self->priv->sidebar_tree; -#line 233 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 217 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" g_signal_parse_name ("entry-selected", SIDEBAR_TYPE_TREE, &_tmp5_, NULL, FALSE); -#line 233 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 217 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" g_signal_handlers_disconnect_matched (_tmp4_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp5_, 0, NULL, (GCallback) _library_window_on_sidebar_entry_selected_sidebar_tree_entry_selected, self); -#line 234 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 218 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp6_ = self->priv->sidebar_tree; -#line 234 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 218 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" g_signal_parse_name ("selected-entry-removed", SIDEBAR_TYPE_TREE, &_tmp7_, NULL, FALSE); -#line 234 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 218 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" g_signal_handlers_disconnect_matched (_tmp6_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp7_, 0, NULL, (GCallback) _library_window_on_sidebar_selected_entry_removed_sidebar_tree_selected_entry_removed, self); -#line 236 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 220 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp8_ = page_window_get_current_page (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE_WINDOW, PageWindow)); -#line 236 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 220 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp9_ = _tmp8_; -#line 236 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 220 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" library_window_unsubscribe_from_basic_information (self, _tmp9_); -#line 236 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 220 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _g_object_unref0 (_tmp9_); -#line 238 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 222 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp10_ = self->priv->extended_properties; -#line 238 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 222 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" g_signal_parse_name ("hide", gtk_widget_get_type (), &_tmp11_, NULL, FALSE); -#line 238 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 222 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" g_signal_handlers_disconnect_matched (G_TYPE_CHECK_INSTANCE_CAST (_tmp10_, gtk_widget_get_type (), GtkWidget), G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp11_, 0, NULL, (GCallback) _library_window_hide_extended_properties_gtk_widget_hide, self); -#line 239 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 223 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp12_ = self->priv->extended_properties; -#line 239 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 223 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" g_signal_parse_name ("show", gtk_widget_get_type (), &_tmp13_, NULL, FALSE); -#line 239 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 223 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" g_signal_handlers_disconnect_matched (G_TYPE_CHECK_INSTANCE_CAST (_tmp12_, gtk_widget_get_type (), GtkWidget), G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp13_, 0, NULL, (GCallback) _library_window_show_extended_properties_gtk_widget_show, self); -#line 10801 "LibraryWindow.c" +#line 9410 "LibraryWindow.c" { GeeIterator* _media_sources_it = NULL; MediaCollectionRegistry* _tmp14_ = NULL; @@ -10807,27 +9416,27 @@ static void library_window_finalize (GObject* obj) { GeeCollection* _tmp17_ = NULL; GeeIterator* _tmp18_ = NULL; GeeIterator* _tmp19_ = NULL; -#line 241 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 225 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp14_ = media_collection_registry_get_instance (); -#line 241 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 225 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp15_ = _tmp14_; -#line 241 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 225 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp16_ = media_collection_registry_get_all (_tmp15_); -#line 241 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 225 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp17_ = _tmp16_; -#line 241 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 225 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp18_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp17_, GEE_TYPE_ITERABLE, GeeIterable)); -#line 241 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 225 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp19_ = _tmp18_; -#line 241 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 225 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _g_object_unref0 (_tmp17_); -#line 241 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 225 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _media_collection_registry_unref0 (_tmp15_); -#line 241 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 225 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _media_sources_it = _tmp19_; -#line 241 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 225 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" while (TRUE) { -#line 10830 "LibraryWindow.c" +#line 9439 "LibraryWindow.c" GeeIterator* _tmp20_ = NULL; gboolean _tmp21_ = FALSE; MediaSourceCollection* media_sources = NULL; @@ -10837,105 +9446,105 @@ static void library_window_finalize (GObject* obj) { guint _tmp25_ = 0U; MediaSourceCollection* _tmp26_ = NULL; guint _tmp27_ = 0U; -#line 241 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 225 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp20_ = _media_sources_it; -#line 241 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 225 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp21_ = gee_iterator_next (_tmp20_); -#line 241 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 225 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" if (!_tmp21_) { -#line 241 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 225 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" break; -#line 10848 "LibraryWindow.c" +#line 9457 "LibraryWindow.c" } -#line 241 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 225 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp22_ = _media_sources_it; -#line 241 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 225 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp23_ = gee_iterator_get (_tmp22_); -#line 241 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 225 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" media_sources = (MediaSourceCollection*) _tmp23_; -#line 242 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 226 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp24_ = media_sources; -#line 242 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 226 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" g_signal_parse_name ("trashcan-contents-altered", TYPE_MEDIA_SOURCE_COLLECTION, &_tmp25_, NULL, FALSE); -#line 242 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 226 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" g_signal_handlers_disconnect_matched (_tmp24_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp25_, 0, NULL, (GCallback) _library_window_on_trashcan_contents_altered_media_source_collection_trashcan_contents_altered, self); -#line 243 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 227 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp26_ = media_sources; -#line 243 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 227 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" g_signal_parse_name ("items-altered", TYPE_DATA_COLLECTION, &_tmp27_, NULL, FALSE); -#line 243 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 227 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" g_signal_handlers_disconnect_matched (G_TYPE_CHECK_INSTANCE_CAST (_tmp26_, TYPE_DATA_COLLECTION, DataCollection), G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp27_, 0, NULL, (GCallback) _library_window_on_media_altered_data_collection_items_altered, self); -#line 241 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 225 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _data_collection_unref0 (media_sources); -#line 10870 "LibraryWindow.c" +#line 9479 "LibraryWindow.c" } -#line 241 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 225 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _g_object_unref0 (_media_sources_it); -#line 10874 "LibraryWindow.c" +#line 9483 "LibraryWindow.c" } -#line 246 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 230 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp28_ = metadata_writer_get_instance (); -#line 246 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 230 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp29_ = _tmp28_; -#line 246 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 230 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" g_signal_parse_name ("progress", TYPE_METADATA_WRITER, &_tmp30_, NULL, FALSE); -#line 246 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 230 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" g_signal_handlers_disconnect_matched (_tmp29_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp30_, 0, NULL, (GCallback) _library_window_on_metadata_writer_progress_metadata_writer_progress, self); -#line 246 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 230 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _g_object_unref0 (_tmp29_); -#line 248 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 232 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp31_ = library_monitor_pool_get_instance (); -#line 248 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 232 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp32_ = _tmp31_; -#line 248 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 232 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp33_ = library_monitor_pool_get_monitor (_tmp32_); -#line 248 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 232 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp34_ = _tmp33_; -#line 248 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 232 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _library_monitor_pool_unref0 (_tmp32_); -#line 248 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 232 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" monitor = _tmp34_; -#line 249 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 233 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp35_ = monitor; -#line 249 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 233 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" if (_tmp35_ != NULL) { -#line 10902 "LibraryWindow.c" +#line 9511 "LibraryWindow.c" LibraryMonitor* _tmp36_ = NULL; -#line 250 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 234 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp36_ = monitor; -#line 250 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 234 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" library_window_on_library_monitor_destroyed (self, _tmp36_); -#line 10908 "LibraryWindow.c" +#line 9517 "LibraryWindow.c" } -#line 252 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 236 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp37_ = library_monitor_pool_get_instance (); -#line 252 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 236 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp38_ = _tmp37_; -#line 252 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 236 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" g_signal_parse_name ("monitor-installed", TYPE_LIBRARY_MONITOR_POOL, &_tmp39_, NULL, FALSE); -#line 252 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 236 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" g_signal_handlers_disconnect_matched (_tmp38_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp39_, 0, NULL, (GCallback) _library_window_on_library_monitor_installed_library_monitor_pool_monitor_installed, self); -#line 252 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 236 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _library_monitor_pool_unref0 (_tmp38_); -#line 253 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 237 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp40_ = library_monitor_pool_get_instance (); -#line 253 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 237 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp41_ = _tmp40_; -#line 253 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 237 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" g_signal_parse_name ("monitor-destroyed", TYPE_LIBRARY_MONITOR_POOL, &_tmp42_, NULL, FALSE); -#line 253 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 237 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" g_signal_handlers_disconnect_matched (_tmp41_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp42_, 0, NULL, (GCallback) _library_window_on_library_monitor_destroyed_library_monitor_pool_monitor_destroyed, self); -#line 253 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 237 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _library_monitor_pool_unref0 (_tmp41_); -#line 255 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 239 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp43_ = camera_table_get_instance (); -#line 255 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 239 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp44_ = _tmp43_; -#line 255 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 239 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" g_signal_parse_name ("camera-added", TYPE_CAMERA_TABLE, &_tmp45_, NULL, FALSE); -#line 255 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 239 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" g_signal_handlers_disconnect_matched (_tmp44_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp45_, 0, NULL, (GCallback) _library_window_on_camera_added_camera_table_camera_added, self); -#line 255 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 239 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _camera_table_unref0 (_tmp44_); #line 7 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _g_object_unref0 (monitor); @@ -10948,50 +9557,48 @@ static void library_window_finalize (GObject* obj) { #line 99 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _g_object_unref0 (self->priv->bottom_frame); #line 101 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _g_object_unref0 (self->priv->common_action_group); -#line 103 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _one_shot_scheduler_unref0 (self->priv->properties_scheduler); -#line 107 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 105 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _g_object_unref0 (self->priv->sidebar_tree); -#line 108 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 106 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _g_object_unref0 (self->priv->library_branch); -#line 109 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 107 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _g_object_unref0 (self->priv->tags_branch); -#line 110 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 108 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _g_object_unref0 (self->priv->folders_branch); -#line 111 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 109 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _g_object_unref0 (self->priv->events_branch); -#line 112 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 110 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _g_object_unref0 (self->priv->camera_branch); -#line 113 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 111 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _g_object_unref0 (self->priv->saved_search_branch); -#line 116 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 114 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _g_object_unref0 (self->priv->page_map); -#line 118 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 116 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _g_object_unref0 (self->priv->photo_page); -#line 128 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 126 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _search_filter_actions_unref0 (self->priv->search_actions); -#line 129 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 127 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _g_object_unref0 (self->priv->search_toolbar); -#line 131 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 129 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _g_object_unref0 (self->priv->top_section); -#line 132 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 130 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _g_object_unref0 (self->priv->background_progress_frame); -#line 133 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 131 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _g_object_unref0 (self->priv->background_progress_bar); -#line 136 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 134 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _g_object_unref0 (self->priv->basic_properties); -#line 137 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 135 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _g_object_unref0 (self->priv->extended_properties); -#line 139 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 137 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _g_object_unref0 (self->priv->stack); -#line 140 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 138 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _g_object_unref0 (self->priv->layout); -#line 141 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 139 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _g_object_unref0 (self->priv->right_vbox); #line 7 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" G_OBJECT_CLASS (library_window_parent_class)->finalize (obj); -#line 10994 "LibraryWindow.c" +#line 9601 "LibraryWindow.c" } @@ -11012,13 +9619,13 @@ static void _vala_library_window_get_property (GObject * object, guint property_ self = G_TYPE_CHECK_INSTANCE_CAST (object, TYPE_LIBRARY_WINDOW, LibraryWindow); #line 7 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" switch (property_id) { -#line 11015 "LibraryWindow.c" +#line 9622 "LibraryWindow.c" default: #line 7 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec); #line 7 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" break; -#line 11021 "LibraryWindow.c" +#line 9628 "LibraryWindow.c" } } diff --git a/src/library/LibraryWindow.vala b/src/library/LibraryWindow.vala index b464f11..2a34462 100644 --- a/src/library/LibraryWindow.vala +++ b/src/library/LibraryWindow.vala @@ -13,8 +13,8 @@ public class LibraryWindow : AppWindow { } } - public const int SORT_EVENTS_ORDER_ASCENDING = 0; - public const int SORT_EVENTS_ORDER_DESCENDING = 1; + public const string SORT_EVENTS_ORDER_ASCENDING = "ascending"; + public const string SORT_EVENTS_ORDER_DESCENDING = "descending"; private const string[] SUPPORTED_MOUNT_SCHEMES = { "gphoto2:", @@ -98,8 +98,6 @@ public class LibraryWindow : AppWindow { private Gtk.Paned client_paned = new Gtk.Paned(Gtk.Orientation.HORIZONTAL); private Gtk.Frame bottom_frame = new Gtk.Frame(null); - private Gtk.ActionGroup common_action_group = new Gtk.ActionGroup("LibraryWindowGlobalActionGroup"); - private OneShotScheduler properties_scheduler = null; private bool notify_library_is_home_dir = true; @@ -175,21 +173,7 @@ public class LibraryWindow : AppWindow { // setup search bar and add its accelerators to the window search_toolbar = new SearchFilterToolbar(search_actions); - - try { - File ui_file = Resources.get_ui("top.ui"); - ui.add_ui_from_file(ui_file.get_path()); - } catch (Error e) { - error(e.message); - } - - Gtk.MenuBar? menubar = ui.get_widget("/MenuBar") as Gtk.MenuBar; - layout.add(menubar); - - // We never want to invoke show_all() on the menubar since that will show empty menus, - // which should be hidden. - menubar.no_show_all = true; - + // create the main layout & start at the Library page create_layout(library_branch.photos_entry.get_page()); @@ -276,227 +260,87 @@ public class LibraryWindow : AppWindow { monitor.auto_import_preparing.disconnect(on_library_monitor_auto_import_preparing); monitor.auto_import_progress.disconnect(on_library_monitor_auto_import_progress); } - - private Gtk.ActionEntry[] create_common_actions() { - Gtk.ActionEntry[] actions = new Gtk.ActionEntry[0]; - - Gtk.ActionEntry import = { "CommonFileImport", Resources.IMPORT, - TRANSLATABLE, "<Ctrl>I", TRANSLATABLE, on_file_import }; - import.label = _("_Import From Folder…"); - import.tooltip = _("Import photos from disk to library"); - actions += import; - - Gtk.ActionEntry import_from_external = { - "ExternalLibraryImport", Resources.IMPORT, TRANSLATABLE, - null, TRANSLATABLE, on_external_library_import - }; - import_from_external.label = _("Import From _Application…"); - actions += import_from_external; - - Gtk.ActionEntry sort = { "CommonSortEvents", null, TRANSLATABLE, null, null, null }; - sort.label = _("Sort _Events"); - actions += sort; - - Gtk.ActionEntry preferences = { "CommonPreferences", Resources.PREFERENCES_LABEL, TRANSLATABLE, - null, TRANSLATABLE, on_preferences }; - preferences.label = Resources.PREFERENCES_MENU; - actions += preferences; - - Gtk.ActionEntry empty = { "CommonEmptyTrash", null, TRANSLATABLE, null, null, - on_empty_trash }; - empty.label = _("Empty T_rash"); - empty.tooltip = _("Delete all photos in the trash"); - actions += empty; - - Gtk.ActionEntry jump_to_event = { "CommonJumpToEvent", null, TRANSLATABLE, null, - TRANSLATABLE, on_jump_to_event }; - jump_to_event.label = _("View Eve_nt for Photo"); - actions += jump_to_event; - - Gtk.ActionEntry find = { "CommonFind", null, TRANSLATABLE, null, null, on_find }; - find.label = _("_Find"); - find.tooltip = _("Find photos and videos by search criteria"); - actions += find; - - // add the common action for the FilterPhotos submenu (the submenu contains items from - // SearchFilterActions) - Gtk.ActionEntry filter_photos = { "CommonFilterPhotos", null, TRANSLATABLE, null, null, null }; - filter_photos.label = Resources.FILTER_PHOTOS_MENU; - actions += filter_photos; - - Gtk.ActionEntry new_search = { "CommonNewSearch", null, TRANSLATABLE, "<Ctrl>S", null, - on_new_search }; - new_search.label = _("Ne_w Saved Search…"); - actions += new_search; - // top-level menus - - Gtk.ActionEntry file = { "FileMenu", null, TRANSLATABLE, null, null, null }; - file.label = _("_File"); - actions += file; - - Gtk.ActionEntry edit = { "EditMenu", null, TRANSLATABLE, null, null, null }; - edit.label = _("_Edit"); - actions += edit; - - Gtk.ActionEntry view = { "ViewMenu", null, TRANSLATABLE, null, null, null }; - view.label = _("_View"); - actions += view; - - Gtk.ActionEntry photo = { "PhotoMenu", null, TRANSLATABLE, null, null, null }; - photo.label = _("_Photo"); - actions += photo; - - Gtk.ActionEntry photos = { "PhotosMenu", null, TRANSLATABLE, null, null, null }; - photos.label = _("_Photos"); - actions += photos; - - Gtk.ActionEntry event = { "EventsMenu", null, TRANSLATABLE, null, null, null }; - event.label = _("Even_ts"); - actions += event; - - Gtk.ActionEntry tags = { "TagsMenu", null, TRANSLATABLE, null, null, null }; - tags.label = _("Ta_gs"); - actions += tags; - - Gtk.ActionEntry help = { "HelpMenu", null, TRANSLATABLE, null, null, null }; - help.label = _("_Help"); - actions += help; - - return actions; - } - - private Gtk.ToggleActionEntry[] create_common_toggle_actions() { - Gtk.ToggleActionEntry[] actions = new Gtk.ToggleActionEntry[0]; - - Gtk.ToggleActionEntry basic_props = { "CommonDisplayBasicProperties", null, - TRANSLATABLE, "<Ctrl><Shift>I", TRANSLATABLE, on_display_basic_properties, false }; - basic_props.label = _("_Basic Information"); - basic_props.tooltip = _("Display basic information for the selection"); - actions += basic_props; - - Gtk.ToggleActionEntry extended_props = { "CommonDisplayExtendedProperties", null, - TRANSLATABLE, "<Ctrl><Shift>X", TRANSLATABLE, on_display_extended_properties, false }; - extended_props.label = _("E_xtended Information"); - extended_props.tooltip = _("Display extended information for the selection"); - actions += extended_props; - - Gtk.ToggleActionEntry searchbar = { "CommonDisplaySearchbar", "edit-find", TRANSLATABLE, - "F8", TRANSLATABLE, on_display_searchbar, is_search_toolbar_visible }; - searchbar.label = _("_Search Bar"); - searchbar.tooltip = _("Display the search bar"); - actions += searchbar; - - Gtk.ToggleActionEntry sidebar = { "CommonDisplaySidebar", null, TRANSLATABLE, - "F9", TRANSLATABLE, on_display_sidebar, is_sidebar_visible() }; - sidebar.label = _("S_idebar"); - sidebar.tooltip = _("Display the sidebar"); - actions += sidebar; - - Gtk.ToggleActionEntry toolbar = { "CommonDisplayToolbar", null, TRANSLATABLE, - "<Ctrl>F9", TRANSLATABLE, on_display_toolbar, is_toolbar_visible() }; - toolbar.label = _("T_oolbar"); - toolbar.tooltip = _("Display the tool bar"); - actions += toolbar; - - return actions; - } - - private void add_common_radio_actions(Gtk.ActionGroup group) { - Gtk.RadioActionEntry[] actions = new Gtk.RadioActionEntry[0]; - - Gtk.RadioActionEntry ascending = { "CommonSortEventsAscending", - Resources.SORT_ASCENDING_LABEL, TRANSLATABLE, null, TRANSLATABLE, - SORT_EVENTS_ORDER_ASCENDING }; - ascending.label = _("_Ascending"); - ascending.tooltip = _("Sort photos in an ascending order"); - actions += ascending; + private const GLib.ActionEntry[] common_actions = { + // Normal actions + { "CommonFileImport", on_file_import }, + { "ExternalLibraryImport", on_external_library_import }, + { "CommonPreferences", on_preferences }, + { "CommonEmptyTrash", on_empty_trash }, + { "CommonJumpToEvent", on_jump_to_event }, + { "CommonFind", on_find }, + { "CommonNewSearch", on_new_search }, - Gtk.RadioActionEntry descending = { "CommonSortEventsDescending", - Resources.SORT_DESCENDING_LABEL, TRANSLATABLE, null, TRANSLATABLE, - SORT_EVENTS_ORDER_DESCENDING }; - descending.label = _("D_escending"); - descending.tooltip = _("Sort photos in a descending order"); - actions += descending; - - group.add_radio_actions(actions, SORT_EVENTS_ORDER_ASCENDING, on_events_sort_changed); - } - - protected override Gtk.ActionGroup[] create_common_action_groups() { - Gtk.ActionGroup[] groups = base.create_common_action_groups(); - - common_action_group.add_actions(create_common_actions(), this); - common_action_group.add_toggle_actions(create_common_toggle_actions(), this); - add_common_radio_actions(common_action_group); - - Gtk.Action? action = common_action_group.get_action("CommonDisplaySearchbar"); - if (action != null) { - action.short_label = Resources.FIND_LABEL; - action.is_important = true; - } - - groups += common_action_group; - groups += search_actions.get_action_group(); - - return groups; - } - - public override void replace_common_placeholders(Gtk.UIManager ui) { - base.replace_common_placeholders(ui); + // Toogle actions + { "CommonDisplayBasicProperties", on_action_toggle, null, "false", on_display_basic_properties }, + { "CommonDisplayExtendedProperties", on_action_toggle, null, "false", on_display_extended_properties }, + +#if 0 + { "CommonDisplaySearchbar", on_display_searchbar, null, is_search_toolbar_visible.to_string () }, + { "CommonDisplaySidebar", on_display_sidebar, null, is_sidebar_visible ().to_string () }, + { "CommonDisplayToolbar", on_display_toolbar, null, is_toolbar_visible ().to_string () } +#endif + { "CommonDisplaySearchbar", on_action_toggle, null, "false", on_display_searchbar }, + { "CommonDisplaySidebar", on_action_toggle, null, "true", on_display_sidebar }, + { "CommonDisplayToolbar", on_action_toggle, null, "true", on_display_toolbar }, + + { "CommonSortEvents", on_action_radio, "s", "'ascending'", on_events_sort_changed } + }; + + protected override void add_actions () { + base.add_actions (); + this.add_action_entries (common_actions, this); + this.add_action_entries (search_actions.get_actions (), search_actions); } - + protected override void switched_pages(Page? old_page, Page? new_page) { base.switched_pages(old_page, new_page); - + // monitor when the ViewFilter is changed in any page if (old_page != null) { old_page.get_view().view_filter_installed.disconnect(on_view_filter_installed); old_page.get_view().view_filter_removed.disconnect(on_view_filter_removed); } - + if (new_page != null) { new_page.get_view().view_filter_installed.connect(on_view_filter_installed); new_page.get_view().view_filter_removed.connect(on_view_filter_removed); } - + search_actions.monitor_page_contents(old_page, new_page); } - + private void on_view_filter_installed(ViewFilter filter) { filter.refresh.connect(on_view_filter_refreshed); } - + private void on_view_filter_removed(ViewFilter filter) { filter.refresh.disconnect(on_view_filter_refreshed); } - + private void on_view_filter_refreshed() { // if view filter is reset to show all items, do nothing (leave searchbar in current // state) if (!get_current_page().get_view().are_items_filtered_out()) return; - + // always show the searchbar when items are filtered - Gtk.ToggleAction? display_searchbar = get_common_action("CommonDisplaySearchbar") - as Gtk.ToggleAction; - if (display_searchbar != null) - display_searchbar.active = true; + var action = this.lookup_action ("CommonDisplaySearchbar"); + + if (action != null) + action.change_state (true); } - + // show_all() may make visible certain items we wish to keep programmatically hidden public override void show_all() { base.show_all(); - - Gtk.ToggleAction? basic_properties_action = get_current_page().get_common_action( - "CommonDisplayBasicProperties") as Gtk.ToggleAction; + + var basic_properties_action = get_current_page ().get_common_action + ("CommonDisplayBasicProperties"); assert(basic_properties_action != null); - - if (!basic_properties_action.get_active()) + + if (!basic_properties_action.get_state().get_boolean()) bottom_frame.hide(); - - Gtk.ToggleAction? searchbar_action = get_current_page().get_common_action( - "CommonDisplaySearchbar") as Gtk.ToggleAction; - assert(searchbar_action != null); // Make sure rejected pictures are not being displayed on startup CheckerboardPage? current_page = get_current_page() as CheckerboardPage; @@ -504,27 +348,27 @@ public class LibraryWindow : AppWindow { init_view_filter(current_page); toggle_search_bar(should_show_search_bar(), current_page); - + // Sidebar set_sidebar_visible(is_sidebar_visible()); } - + public static LibraryWindow get_app() { assert(instance is LibraryWindow); - + return (LibraryWindow) instance; } - + // This may be called before Debug.init(), so no error logging may be made public static bool is_mount_uri_supported(string uri) { foreach (string scheme in SUPPORTED_MOUNT_SCHEMES) { if (uri.has_prefix(scheme)) return true; } - + return false; } - + public override string get_app_role() { return Resources.APP_LIBRARY_ROLE; } @@ -536,7 +380,7 @@ public class LibraryWindow : AppWindow { else debug("No tag entry found for rename"); } - + public void rename_event_in_sidebar(Event event) { Events.EventEntry? entry = events_branch.get_entry_for_event(event); if (entry != null) @@ -544,7 +388,7 @@ public class LibraryWindow : AppWindow { else debug("No event entry found for rename"); } - + public void rename_search_in_sidebar(SavedSearch search) { Searches.SidebarEntry? entry = saved_search_branch.get_entry_for_saved_search(search); if (entry != null) @@ -552,28 +396,28 @@ public class LibraryWindow : AppWindow { else debug("No search entry found for rename"); } - + protected override void on_quit() { Config.Facade.get_instance().set_library_window_state(maximized, dimensions); Config.Facade.get_instance().set_sidebar_position(client_paned.position); - + base.on_quit(); } - + private Photo? get_start_fullscreen_photo(CollectionPage page) { ViewCollection view = page.get_view(); - + // if a selection is present, use the first selected LibraryPhoto, otherwise do // nothing; if no selection present, use the first LibraryPhoto Gee.List<DataSource>? sources = (view.get_selected_count() > 0) ? view.get_selected_sources_of_type(typeof(LibraryPhoto)) : view.get_sources_of_type(typeof(LibraryPhoto)); - + return (sources != null && sources.size != 0) ? (Photo) sources[0] : null; } - + private bool get_fullscreen_photo(Page page, out CollectionPage collection, out Photo start, out ViewCollection? view_collection = null) { collection = null; @@ -586,7 +430,7 @@ public class LibraryWindow : AppWindow { Photo? photo = get_start_fullscreen_photo(collection); if (photo == null) return false; - + start = photo; view_collection = null; @@ -601,11 +445,11 @@ public class LibraryWindow : AppWindow { Event? event = (Event?) ((DataView) view.get_at(0)).get_source(); if (event == null) return false; - + Events.EventEntry? entry = events_branch.get_entry_for_event(event); if (entry == null) return false; - + collection = (EventPage) entry.get_page(); Photo? photo = get_start_fullscreen_photo(collection); if (photo == null) @@ -616,7 +460,7 @@ public class LibraryWindow : AppWindow { return true; } - + if (page is LibraryPhotoPage) { LibraryPhotoPage photo_page = (LibraryPhotoPage) page; @@ -626,11 +470,11 @@ public class LibraryWindow : AppWindow { if (!photo_page.has_photo()) return false; - + collection = controller; start = photo_page.get_photo(); view_collection = photo_page.get_view(); - + return true; } @@ -652,7 +496,7 @@ public class LibraryWindow : AppWindow { go_fullscreen(fs_photo); } - + private void on_file_import() { Gtk.FileChooserDialog import_dialog = new Gtk.FileChooserDialog(_("Import From Folder"), null, Gtk.FileChooserAction.SELECT_FOLDER, Resources.CANCEL_LABEL, Gtk.ResponseType.CANCEL, @@ -670,7 +514,7 @@ public class LibraryWindow : AppWindow { ? Gtk.ResponseType.REJECT : copy_files_dialog(); if (copy_files_response != Gtk.ResponseType.CANCEL) { - dispatch_import_jobs(import_dialog.get_uris(), "folders", + dispatch_import_jobs(import_dialog.get_uris(), "folders", copy_files_response == Gtk.ResponseType.ACCEPT); } } @@ -689,7 +533,7 @@ public class LibraryWindow : AppWindow { base.update_common_action_availability(old_page, new_page); bool is_checkerboard = new_page is CheckerboardPage; - + set_common_action_sensitive("CommonDisplaySearchbar", is_checkerboard); set_common_action_sensitive("CommonFind", is_checkerboard); } @@ -717,7 +561,7 @@ public class LibraryWindow : AppWindow { private bool can_empty_trash() { return (LibraryPhoto.global.get_trashcan_count() > 0) || (Video.global.get_trashcan_count() > 0); } - + private void on_empty_trash() { Gee.ArrayList<MediaSource> to_remove = new Gee.ArrayList<MediaSource>(); to_remove.add_all(LibraryPhoto.global.get_trashcan_contents()); @@ -762,10 +606,9 @@ public class LibraryWindow : AppWindow { } private void on_find() { - Gtk.ToggleAction action = (Gtk.ToggleAction) get_current_page().get_common_action( - "CommonDisplaySearchbar"); - action.active = true; - + var action = this.lookup_action ("CommonDisplaySearchbar"); + action.change_state (true); + // give it focus (which should move cursor to the text entry control) search_toolbar.take_focus(); } @@ -780,24 +623,27 @@ public class LibraryWindow : AppWindow { } public int get_events_sort() { - Gtk.RadioAction? action = get_common_action("CommonSortEventsAscending") as Gtk.RadioAction; + var action = this.lookup_action ("CommonSortEvents") as GLib.SimpleAction; - return (action != null) ? action.current_value : SORT_EVENTS_ORDER_DESCENDING; + return (action != null) ? (action.state.get_string () == SORT_EVENTS_ORDER_ASCENDING) + ? 0 : 1 + : 1; } - private void on_events_sort_changed(Gtk.Action action, Gtk.Action c) { - Gtk.RadioAction current = (Gtk.RadioAction) c; + private void on_events_sort_changed(GLib.SimpleAction action, Variant? value) { Config.Facade.get_instance().set_events_sort_ascending( - current.current_value == SORT_EVENTS_ORDER_ASCENDING); + value.get_string () == SORT_EVENTS_ORDER_ASCENDING); + + action.set_state (value); } private void on_preferences() { PreferencesDialog.show(); } - private void on_display_basic_properties(Gtk.Action action) { - bool display = ((Gtk.ToggleAction) action).get_active(); + private void on_display_basic_properties(GLib.SimpleAction action, Variant? value) { + bool display = value.get_boolean (); if (display) { basic_properties.update_properties(get_current_page()); @@ -810,10 +656,20 @@ public class LibraryWindow : AppWindow { // sync the setting so it will persist Config.Facade.get_instance().set_display_basic_properties(display); + action.set_state (value); } - private void on_display_extended_properties(Gtk.Action action) { - bool display = ((Gtk.ToggleAction) action).get_active(); + private void on_action_toggle (GLib.Action action, Variant? value) { + Variant new_state = ! (bool) action.get_state (); + action.change_state (new_state); + } + + private void on_action_radio (GLib.Action action, Variant? value) { + action.change_state (value); + } + + private void on_display_extended_properties(GLib.SimpleAction action, Variant? value) { + bool display = value.get_boolean (); if (display) { extended_properties.update_properties(get_current_page()); @@ -821,12 +677,17 @@ public class LibraryWindow : AppWindow { } else { extended_properties.hide(); } + + action.set_state (value); } - private void on_display_searchbar(Gtk.Action action) { - bool is_shown = ((Gtk.ToggleAction) action).get_active(); + private void on_display_searchbar(GLib.SimpleAction action, Variant? value) { + bool is_shown = value.get_boolean (); + Config.Facade.get_instance().set_display_search_bar(is_shown); show_search_bar(is_shown); + + action.set_state (value); } public void show_search_bar(bool display) { @@ -839,9 +700,10 @@ public class LibraryWindow : AppWindow { search_actions.reset(); } - private void on_display_sidebar(Gtk.Action action) { - set_sidebar_visible(((Gtk.ToggleAction) action).get_active()); - + private void on_display_sidebar(GLib.SimpleAction action, Variant? variant) { + set_sidebar_visible(variant.get_boolean ()); + + action.set_state (variant); } private void set_sidebar_visible(bool visible) { @@ -853,8 +715,10 @@ public class LibraryWindow : AppWindow { return Config.Facade.get_instance().get_display_sidebar(); } - private void on_display_toolbar (Gtk.Action action) { - set_toolbar_visible ((action as Gtk.ToggleAction).get_active ()); + private void on_display_toolbar (GLib.SimpleAction action, Variant? variant) { + set_toolbar_visible (variant.get_boolean ()); + + action.set_state (variant); } private void set_toolbar_visible (bool visible) { @@ -878,10 +742,8 @@ public class LibraryWindow : AppWindow { } private void sync_extended_properties(bool show) { - Gtk.ToggleAction? extended_display_action = get_common_action("CommonDisplayExtendedProperties") - as Gtk.ToggleAction; - assert(extended_display_action != null); - extended_display_action.set_active(show); + var action = this.lookup_action ("CommonDisplayExtendedProperties"); + action.change_state (show); // sync the setting so it will persist Config.Facade.get_instance().set_display_extended_properties(show); @@ -951,9 +813,7 @@ public class LibraryWindow : AppWindow { public override bool drag_motion(Gdk.DragContext context, int x, int y, uint time) { Gdk.Atom target = Gtk.drag_dest_find_target(this, context, Gtk.drag_dest_get_target_list(this)); - // Want to use GDK_NONE (or, properly bound, Gdk.Atom.NONE) but GTK3 doesn't have it bound - // See: https://bugzilla.gnome.org/show_bug.cgi?id=655094 - if (((int) target) == 0) { + if (target == Gdk.Atom.NONE) { debug("drag target is GDK_NONE"); Gdk.drag_status(context, 0, time); @@ -966,7 +826,7 @@ public class LibraryWindow : AppWindow { return true; } - + // since we cannot set a default action, we must set it when we spy a drag motion Gdk.DragAction drag_action = get_drag_action(); @@ -1120,32 +980,28 @@ public class LibraryWindow : AppWindow { // check for settings that should persist between instances private void load_configuration() { - Gtk.ToggleAction? basic_display_action = get_common_action("CommonDisplayBasicProperties") - as Gtk.ToggleAction; + var basic_display_action = lookup_action("CommonDisplayBasicProperties"); assert(basic_display_action != null); - basic_display_action.set_active(Config.Facade.get_instance().get_display_basic_properties()); + basic_display_action.change_state (Config.Facade.get_instance().get_display_basic_properties()); - Gtk.ToggleAction? extended_display_action = get_common_action("CommonDisplayExtendedProperties") - as Gtk.ToggleAction; + var extended_display_action = lookup_action("CommonDisplayExtendedProperties"); assert(extended_display_action != null); - extended_display_action.set_active(Config.Facade.get_instance().get_display_extended_properties()); + extended_display_action.change_state(Config.Facade.get_instance().get_display_extended_properties()); - Gtk.ToggleAction? search_bar_display_action = get_common_action("CommonDisplaySearchbar") - as Gtk.ToggleAction; + var search_bar_display_action = lookup_action("CommonDisplaySearchbar"); assert(search_bar_display_action != null); - search_bar_display_action.set_active(Config.Facade.get_instance().get_display_search_bar()); + search_bar_display_action.change_state(Config.Facade.get_instance().get_display_search_bar()); - Gtk.RadioAction? sort_events_action = get_common_action("CommonSortEventsAscending") - as Gtk.RadioAction; + var sort_events_action = lookup_action("CommonSortEvents"); assert(sort_events_action != null); // Ticket #3321 - Event sorting order wasn't saving on exit. // Instead of calling set_active against one of the toggles, call // set_current_value against the entire radio group... - int event_sort_val = Config.Facade.get_instance().get_events_sort_ascending() ? SORT_EVENTS_ORDER_ASCENDING : + string event_sort_val = Config.Facade.get_instance().get_events_sort_ascending() ? SORT_EVENTS_ORDER_ASCENDING : SORT_EVENTS_ORDER_DESCENDING; - sort_events_action.set_current_value(event_sort_val); + sort_events_action.change_state (event_sort_val); } private void start_pulse_background_progress_bar(string label, int priority) { @@ -1291,12 +1147,16 @@ public class LibraryWindow : AppWindow { background_progress_frame.get_style_context().remove_class("frame"); // pad the bottom frame (properties) - Gtk.Alignment bottom_alignment = new Gtk.Alignment(0, 0.5f, 1, 0); - - bottom_alignment.set_padding(10, 10, 6, 0); - bottom_alignment.add(basic_properties); + basic_properties.halign = Gtk.Align.FILL; + basic_properties.valign = Gtk.Align.CENTER; + basic_properties.hexpand = true; + basic_properties.vexpand = false; + basic_properties.margin_top = 10; + basic_properties.margin_bottom = 10; + basic_properties.margin_start = 6; + basic_properties.margin_end = 0; - bottom_frame.add(bottom_alignment); + bottom_frame.add(basic_properties); bottom_frame.get_style_context().remove_class("frame"); // "attach" the progress bar to the sidebar tree, so the movable ridge is to resize the @@ -1345,6 +1205,9 @@ public class LibraryWindow : AppWindow { Page current_page = get_current_page(); if (current_page != null) { + set_show_menubar (false); + Application.set_menubar (null); + Gtk.Toolbar toolbar = current_page.get_toolbar(); if (toolbar != null) right_vbox.remove(toolbar); @@ -1399,6 +1262,9 @@ public class LibraryWindow : AppWindow { subscribe_for_basic_information(get_current_page()); page.switched_to(); + + Application.set_menubar (page.get_menubar ()); + set_show_menubar (true); Gtk.Toolbar toolbar = page.get_toolbar(); if (toolbar != null) { diff --git a/src/library/OfflinePage.c b/src/library/OfflinePage.c index 739d6b1..03b9c80 100644 --- a/src/library/OfflinePage.c +++ b/src/library/OfflinePage.c @@ -304,6 +304,16 @@ typedef struct _ViewCollectionClass ViewCollectionClass; #define _data_collection_unref0(var) ((var == NULL) ? NULL : (var = (data_collection_unref (var), NULL))) #define _g_object_unref0(var) ((var == NULL) ? NULL : (var = (g_object_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_MEDIA_SOURCE_ITEM (media_source_item_get_type ()) #define MEDIA_SOURCE_ITEM(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), TYPE_MEDIA_SOURCE_ITEM, MediaSourceItem)) #define MEDIA_SOURCE_ITEM_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), TYPE_MEDIA_SOURCE_ITEM, MediaSourceItemClass)) @@ -342,16 +352,6 @@ typedef struct _OfflinePageOfflineViewClass OfflinePageOfflineViewClass; typedef struct _Marker Marker; typedef struct _MarkerIface MarkerIface; -#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_PROGRESS_DIALOG (progress_dialog_get_type ()) #define PROGRESS_DIALOG(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), TYPE_PROGRESS_DIALOG, ProgressDialog)) #define PROGRESS_DIALOG_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), TYPE_PROGRESS_DIALOG, ProgressDialogClass)) @@ -445,7 +445,7 @@ typedef struct _OfflinePageOfflineSearchViewFilterPrivate OfflinePageOfflineSear struct _Page { GtkScrolledWindow parent_instance; PagePrivate * priv; - GtkUIManager* ui; + GtkBuilder* builder; GtkToolbar* toolbar; gboolean in_view; }; @@ -455,8 +455,6 @@ struct _PageClass { void (*set_page_name) (Page* self, const gchar* page_name); void (*set_container) (Page* self, GtkWindow* container); void (*clear_container) (Page* self); - GtkMenuBar* (*get_menubar) (Page* self); - GtkWidget* (*get_page_ui_widget) (Page* self, const gchar* path); GtkToolbar* (*get_toolbar) (Page* self); GtkMenu* (*get_page_context_menu) (Page* self); void (*switching_from) (Page* self); @@ -464,10 +462,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 (*init_collect_ui_filenames) (Page* self, GeeList* ui_filenames); - GtkActionEntry* (*init_collect_action_entries) (Page* self, int* result_length1); - GtkToggleActionEntry* (*init_collect_toggle_action_entries) (Page* self, int* result_length1); - void (*register_radio_actions) (Page* self, GtkActionGroup* action_group); InjectionGroup** (*init_collect_injection_groups) (Page* self, int* result_length1); void (*init_actions) (Page* self, gint selected_count, gint count); void (*update_actions) (Page* self, gint selected_count, gint count); @@ -784,6 +780,8 @@ GType video_source_collection_get_type (void) G_GNUC_CONST; static OfflinePageOfflineSearchViewFilter* offline_page_offline_search_view_filter_new (void); static OfflinePageOfflineSearchViewFilter* offline_page_offline_search_view_filter_construct (GType object_type); #define OFFLINE_PAGE_NAME _ ("Missing Files") +static void offline_page_on_remove_from_library (OfflinePage* self); +static void _offline_page_on_remove_from_library_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self); OfflinePage* offline_page_new (void); OfflinePage* offline_page_construct (GType object_type); CheckerboardPage* checkerboard_page_construct (GType object_type, const gchar* page_name); @@ -796,19 +794,13 @@ MediaViewTracker* media_view_tracker_construct (GType object_type, ViewCollectio GeeCollection* media_source_collection_get_offline_bin_contents (MediaSourceCollection* self); static void offline_page_real_init_collect_ui_filenames (Page* base, GeeList* ui_filenames); void page_init_collect_ui_filenames (Page* self, GeeList* ui_filenames); -static GtkActionEntry* offline_page_real_init_collect_action_entries (Page* base, int* result_length1); -GtkActionEntry* page_init_collect_action_entries (Page* self, int* result_length1); -#define RESOURCES_REMOVE_LABEL _ ("_Remove") -#define TRANSLATABLE "translatable" -static void offline_page_on_remove_from_library (OfflinePage* self); -static void _offline_page_on_remove_from_library_gtk_action_callback (GtkAction* action, gpointer self); -#define RESOURCES_REMOVE_FROM_LIBRARY_MENU _ ("R_emove From Library") -#define RESOURCES_DELETE_FROM_LIBRARY_TOOLTIP _ ("Remove the selected photos from the library") -static void _vala_array_add88 (GtkActionEntry** array, int* length, int* size, const GtkActionEntry* value); +static void offline_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 CoreViewTracker* offline_page_real_get_view_tracker (CheckerboardPage* base); static void offline_page_real_update_actions (Page* base, gint selected_count, gint count); void page_set_action_sensitive (Page* self, const gchar* name, gboolean sensitive); -void page_set_action_important (Page* self, const gchar* name, gboolean important); void page_update_actions (Page* self, gint selected_count, gint count); gboolean data_collection_add (DataCollection* self, DataObject* object); static OfflinePageOfflineView* offline_page_offline_view_new (MediaSource* source); @@ -823,8 +815,6 @@ DataView* view_collection_get_view_for_source (ViewCollection* self, DataSource* void data_collection_remove_marked (DataCollection* self, Marker* m); GeeList* view_collection_get_selected_sources (ViewCollection* self); gboolean remove_offline_dialog (GtkWindow* owner, gint count); -GType app_window_get_type (void) G_GNUC_CONST; -AppWindow* app_window_get_instance (void); void page_window_set_busy_cursor (PageWindow* self); GType progress_dialog_get_type (void) G_GNUC_CONST; ProgressDialog* progress_dialog_new (GtkWindow* owner, const gchar* text, GCancellable* cancellable); @@ -866,11 +856,19 @@ GType search_filter_criteria_get_type (void) G_GNUC_CONST; DefaultSearchViewFilter* default_search_view_filter_construct (GType object_type); static void offline_page_finalize (GObject* obj); +static const GActionEntry OFFLINE_PAGE_entries[1] = {{"RemoveFromLibrary", _offline_page_on_remove_from_library_gsimple_action_activate_callback}}; static void _offline_page_on_offline_contents_altered_media_source_collection_offline_contents_altered (MediaSourceCollection* _sender, GeeCollection* added, GeeCollection* removed, gpointer self) { #line 45 "/home/jens/Source/shotwell/src/library/OfflinePage.vala" offline_page_on_offline_contents_altered ((OfflinePage*) self, added, removed); -#line 874 "OfflinePage.c" +#line 865 "OfflinePage.c" +} + + +static void _offline_page_on_remove_from_library_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self) { +#line 55 "/home/jens/Source/shotwell/src/library/OfflinePage.vala" + offline_page_on_remove_from_library ((OfflinePage*) self); +#line 872 "OfflinePage.c" } @@ -890,9 +888,9 @@ OfflinePage* offline_page_construct (GType object_type) { #line 29 "/home/jens/Source/shotwell/src/library/OfflinePage.vala" self = (OfflinePage*) checkerboard_page_construct (object_type, OFFLINE_PAGE_NAME); #line 31 "/home/jens/Source/shotwell/src/library/OfflinePage.vala" - checkerboard_page_init_item_context_menu (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_CHECKERBOARD_PAGE, CheckerboardPage), "/OfflineContextMenu"); + checkerboard_page_init_item_context_menu (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_CHECKERBOARD_PAGE, CheckerboardPage), "OfflineContextMenu"); #line 32 "/home/jens/Source/shotwell/src/library/OfflinePage.vala" - page_init_toolbar (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "/OfflineToolbar"); + page_init_toolbar (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "OfflineToolbar"); #line 34 "/home/jens/Source/shotwell/src/library/OfflinePage.vala" _tmp0_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page)); #line 34 "/home/jens/Source/shotwell/src/library/OfflinePage.vala" @@ -935,14 +933,14 @@ OfflinePage* offline_page_construct (GType object_type) { _g_object_unref0 (_tmp10_); #line 28 "/home/jens/Source/shotwell/src/library/OfflinePage.vala" return self; -#line 939 "OfflinePage.c" +#line 937 "OfflinePage.c" } OfflinePage* offline_page_new (void) { #line 28 "/home/jens/Source/shotwell/src/library/OfflinePage.vala" return offline_page_construct (TYPE_OFFLINE_PAGE); -#line 946 "OfflinePage.c" +#line 944 "OfflinePage.c" } @@ -962,105 +960,34 @@ static void offline_page_real_init_collect_ui_filenames (Page* base, GeeList* ui _tmp1_ = ui_filenames; #line 52 "/home/jens/Source/shotwell/src/library/OfflinePage.vala" gee_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, GEE_TYPE_COLLECTION, GeeCollection), "offline.ui"); -#line 966 "OfflinePage.c" -} - - -static void _offline_page_on_remove_from_library_gtk_action_callback (GtkAction* action, gpointer self) { -#line 58 "/home/jens/Source/shotwell/src/library/OfflinePage.vala" - offline_page_on_remove_from_library ((OfflinePage*) self); -#line 973 "OfflinePage.c" -} - - -static void _vala_array_add88 (GtkActionEntry** array, int* length, int* size, const GtkActionEntry* value) { -#line 62 "/home/jens/Source/shotwell/src/library/OfflinePage.vala" - if ((*length) == (*size)) { -#line 62 "/home/jens/Source/shotwell/src/library/OfflinePage.vala" - *size = (*size) ? (2 * (*size)) : 4; -#line 62 "/home/jens/Source/shotwell/src/library/OfflinePage.vala" - *array = g_renew (GtkActionEntry, *array, *size); -#line 984 "OfflinePage.c" - } -#line 62 "/home/jens/Source/shotwell/src/library/OfflinePage.vala" - (*array)[(*length)++] = *value; -#line 988 "OfflinePage.c" +#line 964 "OfflinePage.c" } -static GtkActionEntry* offline_page_real_init_collect_action_entries (Page* base, int* result_length1) { +static void offline_page_real_add_actions (Page* base) { OfflinePage * self; - GtkActionEntry* result = NULL; - GtkActionEntry* actions = NULL; - gint _tmp0_ = 0; - GtkActionEntry* _tmp1_ = NULL; - gint actions_length1 = 0; - gint _actions_size_ = 0; - GtkActionEntry remove = {0}; - GtkActionEntry _tmp2_ = {0}; - GtkActionEntry* _tmp3_ = NULL; - gint _tmp3__length1 = 0; - GtkActionEntry _tmp4_ = {0}; - GtkActionEntry* _tmp5_ = NULL; - gint _tmp5__length1 = 0; -#line 55 "/home/jens/Source/shotwell/src/library/OfflinePage.vala" + AppWindow* _tmp0_ = NULL; + AppWindow* _tmp1_ = NULL; +#line 59 "/home/jens/Source/shotwell/src/library/OfflinePage.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_OFFLINE_PAGE, OfflinePage); -#line 56 "/home/jens/Source/shotwell/src/library/OfflinePage.vala" - _tmp1_ = PAGE_CLASS (offline_page_parent_class)->init_collect_action_entries (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_CHECKERBOARD_PAGE, CheckerboardPage), TYPE_PAGE, Page), &_tmp0_); -#line 56 "/home/jens/Source/shotwell/src/library/OfflinePage.vala" - actions = _tmp1_; -#line 56 "/home/jens/Source/shotwell/src/library/OfflinePage.vala" - actions_length1 = _tmp0_; -#line 56 "/home/jens/Source/shotwell/src/library/OfflinePage.vala" - _actions_size_ = actions_length1; -#line 58 "/home/jens/Source/shotwell/src/library/OfflinePage.vala" - _tmp2_.name = "RemoveFromLibrary"; -#line 58 "/home/jens/Source/shotwell/src/library/OfflinePage.vala" - _tmp2_.stock_id = RESOURCES_REMOVE_LABEL; -#line 58 "/home/jens/Source/shotwell/src/library/OfflinePage.vala" - _tmp2_.label = TRANSLATABLE; -#line 58 "/home/jens/Source/shotwell/src/library/OfflinePage.vala" - _tmp2_.accelerator = "Delete"; -#line 58 "/home/jens/Source/shotwell/src/library/OfflinePage.vala" - _tmp2_.tooltip = TRANSLATABLE; -#line 58 "/home/jens/Source/shotwell/src/library/OfflinePage.vala" - _tmp2_.callback = (GCallback) _offline_page_on_remove_from_library_gtk_action_callback; -#line 58 "/home/jens/Source/shotwell/src/library/OfflinePage.vala" - remove = _tmp2_; #line 60 "/home/jens/Source/shotwell/src/library/OfflinePage.vala" - remove.label = RESOURCES_REMOVE_FROM_LIBRARY_MENU; -#line 61 "/home/jens/Source/shotwell/src/library/OfflinePage.vala" - remove.tooltip = RESOURCES_DELETE_FROM_LIBRARY_TOOLTIP; + PAGE_CLASS (offline_page_parent_class)->add_actions (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_CHECKERBOARD_PAGE, CheckerboardPage), TYPE_PAGE, Page)); #line 62 "/home/jens/Source/shotwell/src/library/OfflinePage.vala" - _tmp3_ = actions; + _tmp0_ = app_window_get_instance (); #line 62 "/home/jens/Source/shotwell/src/library/OfflinePage.vala" - _tmp3__length1 = actions_length1; + _tmp1_ = _tmp0_; #line 62 "/home/jens/Source/shotwell/src/library/OfflinePage.vala" - _tmp4_ = remove; + g_action_map_add_action_entries (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, g_action_map_get_type (), GActionMap), OFFLINE_PAGE_entries, G_N_ELEMENTS (OFFLINE_PAGE_entries), self); #line 62 "/home/jens/Source/shotwell/src/library/OfflinePage.vala" - _vala_array_add88 (&actions, &actions_length1, &_actions_size_, &_tmp4_); -#line 64 "/home/jens/Source/shotwell/src/library/OfflinePage.vala" - _tmp5_ = actions; -#line 64 "/home/jens/Source/shotwell/src/library/OfflinePage.vala" - _tmp5__length1 = actions_length1; -#line 64 "/home/jens/Source/shotwell/src/library/OfflinePage.vala" - if (result_length1) { -#line 64 "/home/jens/Source/shotwell/src/library/OfflinePage.vala" - *result_length1 = _tmp5__length1; -#line 1051 "OfflinePage.c" - } -#line 64 "/home/jens/Source/shotwell/src/library/OfflinePage.vala" - result = _tmp5_; -#line 64 "/home/jens/Source/shotwell/src/library/OfflinePage.vala" - return result; -#line 1057 "OfflinePage.c" + _g_object_unref0 (_tmp1_); +#line 984 "OfflinePage.c" } static gpointer _core_tracker_ref0 (gpointer self) { -#line 68 "/home/jens/Source/shotwell/src/library/OfflinePage.vala" +#line 66 "/home/jens/Source/shotwell/src/library/OfflinePage.vala" return self ? core_tracker_ref (self) : NULL; -#line 1064 "OfflinePage.c" +#line 991 "OfflinePage.c" } @@ -1069,17 +996,17 @@ static CoreViewTracker* offline_page_real_get_view_tracker (CheckerboardPage* ba CoreViewTracker* result = NULL; MediaViewTracker* _tmp0_ = NULL; CoreViewTracker* _tmp1_ = NULL; -#line 67 "/home/jens/Source/shotwell/src/library/OfflinePage.vala" +#line 65 "/home/jens/Source/shotwell/src/library/OfflinePage.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_OFFLINE_PAGE, OfflinePage); -#line 68 "/home/jens/Source/shotwell/src/library/OfflinePage.vala" +#line 66 "/home/jens/Source/shotwell/src/library/OfflinePage.vala" _tmp0_ = self->priv->tracker; -#line 68 "/home/jens/Source/shotwell/src/library/OfflinePage.vala" +#line 66 "/home/jens/Source/shotwell/src/library/OfflinePage.vala" _tmp1_ = _core_tracker_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, CORE_TYPE_VIEW_TRACKER, CoreViewTracker)); -#line 68 "/home/jens/Source/shotwell/src/library/OfflinePage.vala" +#line 66 "/home/jens/Source/shotwell/src/library/OfflinePage.vala" result = _tmp1_; -#line 68 "/home/jens/Source/shotwell/src/library/OfflinePage.vala" +#line 66 "/home/jens/Source/shotwell/src/library/OfflinePage.vala" return result; -#line 1083 "OfflinePage.c" +#line 1010 "OfflinePage.c" } @@ -1088,51 +1015,49 @@ static void offline_page_real_update_actions (Page* base, gint selected_count, g gint _tmp0_ = 0; gint _tmp1_ = 0; gint _tmp2_ = 0; -#line 71 "/home/jens/Source/shotwell/src/library/OfflinePage.vala" +#line 69 "/home/jens/Source/shotwell/src/library/OfflinePage.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_OFFLINE_PAGE, OfflinePage); -#line 72 "/home/jens/Source/shotwell/src/library/OfflinePage.vala" +#line 70 "/home/jens/Source/shotwell/src/library/OfflinePage.vala" _tmp0_ = selected_count; -#line 72 "/home/jens/Source/shotwell/src/library/OfflinePage.vala" +#line 70 "/home/jens/Source/shotwell/src/library/OfflinePage.vala" page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "RemoveFromLibrary", _tmp0_ > 0); -#line 73 "/home/jens/Source/shotwell/src/library/OfflinePage.vala" - page_set_action_important (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "RemoveFromLibrary", TRUE); -#line 75 "/home/jens/Source/shotwell/src/library/OfflinePage.vala" +#line 72 "/home/jens/Source/shotwell/src/library/OfflinePage.vala" _tmp1_ = selected_count; -#line 75 "/home/jens/Source/shotwell/src/library/OfflinePage.vala" +#line 72 "/home/jens/Source/shotwell/src/library/OfflinePage.vala" _tmp2_ = count; -#line 75 "/home/jens/Source/shotwell/src/library/OfflinePage.vala" +#line 72 "/home/jens/Source/shotwell/src/library/OfflinePage.vala" PAGE_CLASS (offline_page_parent_class)->update_actions (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_CHECKERBOARD_PAGE, CheckerboardPage), TYPE_PAGE, Page), _tmp1_, _tmp2_); -#line 1106 "OfflinePage.c" +#line 1031 "OfflinePage.c" } static void offline_page_on_offline_contents_altered (OfflinePage* self, GeeCollection* added, GeeCollection* removed) { GeeCollection* _tmp0_ = NULL; GeeCollection* _tmp12_ = NULL; -#line 78 "/home/jens/Source/shotwell/src/library/OfflinePage.vala" +#line 75 "/home/jens/Source/shotwell/src/library/OfflinePage.vala" g_return_if_fail (IS_OFFLINE_PAGE (self)); -#line 78 "/home/jens/Source/shotwell/src/library/OfflinePage.vala" +#line 75 "/home/jens/Source/shotwell/src/library/OfflinePage.vala" g_return_if_fail ((added == NULL) || GEE_IS_COLLECTION (added)); -#line 78 "/home/jens/Source/shotwell/src/library/OfflinePage.vala" +#line 75 "/home/jens/Source/shotwell/src/library/OfflinePage.vala" g_return_if_fail ((removed == NULL) || GEE_IS_COLLECTION (removed)); -#line 80 "/home/jens/Source/shotwell/src/library/OfflinePage.vala" +#line 77 "/home/jens/Source/shotwell/src/library/OfflinePage.vala" _tmp0_ = added; -#line 80 "/home/jens/Source/shotwell/src/library/OfflinePage.vala" +#line 77 "/home/jens/Source/shotwell/src/library/OfflinePage.vala" if (_tmp0_ != NULL) { -#line 1123 "OfflinePage.c" +#line 1048 "OfflinePage.c" { GeeIterator* _source_it = NULL; GeeCollection* _tmp1_ = NULL; GeeIterator* _tmp2_ = NULL; -#line 81 "/home/jens/Source/shotwell/src/library/OfflinePage.vala" +#line 78 "/home/jens/Source/shotwell/src/library/OfflinePage.vala" _tmp1_ = added; -#line 81 "/home/jens/Source/shotwell/src/library/OfflinePage.vala" +#line 78 "/home/jens/Source/shotwell/src/library/OfflinePage.vala" _tmp2_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, GEE_TYPE_ITERABLE, GeeIterable)); -#line 81 "/home/jens/Source/shotwell/src/library/OfflinePage.vala" +#line 78 "/home/jens/Source/shotwell/src/library/OfflinePage.vala" _source_it = _tmp2_; -#line 81 "/home/jens/Source/shotwell/src/library/OfflinePage.vala" +#line 78 "/home/jens/Source/shotwell/src/library/OfflinePage.vala" while (TRUE) { -#line 1136 "OfflinePage.c" +#line 1061 "OfflinePage.c" GeeIterator* _tmp3_ = NULL; gboolean _tmp4_ = FALSE; MediaSource* source = NULL; @@ -1143,52 +1068,52 @@ static void offline_page_on_offline_contents_altered (OfflinePage* self, GeeColl MediaSource* _tmp9_ = NULL; OfflinePageOfflineView* _tmp10_ = NULL; OfflinePageOfflineView* _tmp11_ = NULL; -#line 81 "/home/jens/Source/shotwell/src/library/OfflinePage.vala" +#line 78 "/home/jens/Source/shotwell/src/library/OfflinePage.vala" _tmp3_ = _source_it; -#line 81 "/home/jens/Source/shotwell/src/library/OfflinePage.vala" +#line 78 "/home/jens/Source/shotwell/src/library/OfflinePage.vala" _tmp4_ = gee_iterator_next (_tmp3_); -#line 81 "/home/jens/Source/shotwell/src/library/OfflinePage.vala" +#line 78 "/home/jens/Source/shotwell/src/library/OfflinePage.vala" if (!_tmp4_) { -#line 81 "/home/jens/Source/shotwell/src/library/OfflinePage.vala" +#line 78 "/home/jens/Source/shotwell/src/library/OfflinePage.vala" break; -#line 1155 "OfflinePage.c" +#line 1080 "OfflinePage.c" } -#line 81 "/home/jens/Source/shotwell/src/library/OfflinePage.vala" +#line 78 "/home/jens/Source/shotwell/src/library/OfflinePage.vala" _tmp5_ = _source_it; -#line 81 "/home/jens/Source/shotwell/src/library/OfflinePage.vala" +#line 78 "/home/jens/Source/shotwell/src/library/OfflinePage.vala" _tmp6_ = gee_iterator_get (_tmp5_); -#line 81 "/home/jens/Source/shotwell/src/library/OfflinePage.vala" +#line 78 "/home/jens/Source/shotwell/src/library/OfflinePage.vala" source = (MediaSource*) _tmp6_; -#line 82 "/home/jens/Source/shotwell/src/library/OfflinePage.vala" +#line 79 "/home/jens/Source/shotwell/src/library/OfflinePage.vala" _tmp7_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page)); -#line 82 "/home/jens/Source/shotwell/src/library/OfflinePage.vala" +#line 79 "/home/jens/Source/shotwell/src/library/OfflinePage.vala" _tmp8_ = _tmp7_; -#line 82 "/home/jens/Source/shotwell/src/library/OfflinePage.vala" +#line 79 "/home/jens/Source/shotwell/src/library/OfflinePage.vala" _tmp9_ = source; -#line 82 "/home/jens/Source/shotwell/src/library/OfflinePage.vala" +#line 79 "/home/jens/Source/shotwell/src/library/OfflinePage.vala" _tmp10_ = offline_page_offline_view_new (_tmp9_); -#line 82 "/home/jens/Source/shotwell/src/library/OfflinePage.vala" +#line 79 "/home/jens/Source/shotwell/src/library/OfflinePage.vala" _tmp11_ = _tmp10_; -#line 82 "/home/jens/Source/shotwell/src/library/OfflinePage.vala" +#line 79 "/home/jens/Source/shotwell/src/library/OfflinePage.vala" data_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, TYPE_DATA_COLLECTION, DataCollection), G_TYPE_CHECK_INSTANCE_CAST (_tmp11_, TYPE_DATA_OBJECT, DataObject)); -#line 82 "/home/jens/Source/shotwell/src/library/OfflinePage.vala" +#line 79 "/home/jens/Source/shotwell/src/library/OfflinePage.vala" _g_object_unref0 (_tmp11_); -#line 82 "/home/jens/Source/shotwell/src/library/OfflinePage.vala" +#line 79 "/home/jens/Source/shotwell/src/library/OfflinePage.vala" _data_collection_unref0 (_tmp8_); -#line 81 "/home/jens/Source/shotwell/src/library/OfflinePage.vala" +#line 78 "/home/jens/Source/shotwell/src/library/OfflinePage.vala" _g_object_unref0 (source); -#line 1181 "OfflinePage.c" +#line 1106 "OfflinePage.c" } -#line 81 "/home/jens/Source/shotwell/src/library/OfflinePage.vala" +#line 78 "/home/jens/Source/shotwell/src/library/OfflinePage.vala" _g_object_unref0 (_source_it); -#line 1185 "OfflinePage.c" +#line 1110 "OfflinePage.c" } } -#line 85 "/home/jens/Source/shotwell/src/library/OfflinePage.vala" +#line 82 "/home/jens/Source/shotwell/src/library/OfflinePage.vala" _tmp12_ = removed; -#line 85 "/home/jens/Source/shotwell/src/library/OfflinePage.vala" +#line 82 "/home/jens/Source/shotwell/src/library/OfflinePage.vala" if (_tmp12_ != NULL) { -#line 1192 "OfflinePage.c" +#line 1117 "OfflinePage.c" Marker* marker = NULL; ViewCollection* _tmp13_ = NULL; ViewCollection* _tmp14_ = NULL; @@ -1197,32 +1122,32 @@ static void offline_page_on_offline_contents_altered (OfflinePage* self, GeeColl ViewCollection* _tmp29_ = NULL; ViewCollection* _tmp30_ = NULL; Marker* _tmp31_ = NULL; -#line 86 "/home/jens/Source/shotwell/src/library/OfflinePage.vala" +#line 83 "/home/jens/Source/shotwell/src/library/OfflinePage.vala" _tmp13_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page)); -#line 86 "/home/jens/Source/shotwell/src/library/OfflinePage.vala" +#line 83 "/home/jens/Source/shotwell/src/library/OfflinePage.vala" _tmp14_ = _tmp13_; -#line 86 "/home/jens/Source/shotwell/src/library/OfflinePage.vala" +#line 83 "/home/jens/Source/shotwell/src/library/OfflinePage.vala" _tmp15_ = data_collection_start_marking (G_TYPE_CHECK_INSTANCE_CAST (_tmp14_, TYPE_DATA_COLLECTION, DataCollection)); -#line 86 "/home/jens/Source/shotwell/src/library/OfflinePage.vala" +#line 83 "/home/jens/Source/shotwell/src/library/OfflinePage.vala" _tmp16_ = _tmp15_; -#line 86 "/home/jens/Source/shotwell/src/library/OfflinePage.vala" +#line 83 "/home/jens/Source/shotwell/src/library/OfflinePage.vala" _data_collection_unref0 (_tmp14_); -#line 86 "/home/jens/Source/shotwell/src/library/OfflinePage.vala" +#line 83 "/home/jens/Source/shotwell/src/library/OfflinePage.vala" marker = _tmp16_; -#line 1213 "OfflinePage.c" +#line 1138 "OfflinePage.c" { GeeIterator* _source_it = NULL; GeeCollection* _tmp17_ = NULL; GeeIterator* _tmp18_ = NULL; -#line 87 "/home/jens/Source/shotwell/src/library/OfflinePage.vala" +#line 84 "/home/jens/Source/shotwell/src/library/OfflinePage.vala" _tmp17_ = removed; -#line 87 "/home/jens/Source/shotwell/src/library/OfflinePage.vala" +#line 84 "/home/jens/Source/shotwell/src/library/OfflinePage.vala" _tmp18_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp17_, GEE_TYPE_ITERABLE, GeeIterable)); -#line 87 "/home/jens/Source/shotwell/src/library/OfflinePage.vala" +#line 84 "/home/jens/Source/shotwell/src/library/OfflinePage.vala" _source_it = _tmp18_; -#line 87 "/home/jens/Source/shotwell/src/library/OfflinePage.vala" +#line 84 "/home/jens/Source/shotwell/src/library/OfflinePage.vala" while (TRUE) { -#line 1226 "OfflinePage.c" +#line 1151 "OfflinePage.c" GeeIterator* _tmp19_ = NULL; gboolean _tmp20_ = FALSE; MediaSource* source = NULL; @@ -1234,61 +1159,61 @@ static void offline_page_on_offline_contents_altered (OfflinePage* self, GeeColl MediaSource* _tmp26_ = NULL; DataView* _tmp27_ = NULL; DataView* _tmp28_ = NULL; -#line 87 "/home/jens/Source/shotwell/src/library/OfflinePage.vala" +#line 84 "/home/jens/Source/shotwell/src/library/OfflinePage.vala" _tmp19_ = _source_it; -#line 87 "/home/jens/Source/shotwell/src/library/OfflinePage.vala" +#line 84 "/home/jens/Source/shotwell/src/library/OfflinePage.vala" _tmp20_ = gee_iterator_next (_tmp19_); -#line 87 "/home/jens/Source/shotwell/src/library/OfflinePage.vala" +#line 84 "/home/jens/Source/shotwell/src/library/OfflinePage.vala" if (!_tmp20_) { -#line 87 "/home/jens/Source/shotwell/src/library/OfflinePage.vala" +#line 84 "/home/jens/Source/shotwell/src/library/OfflinePage.vala" break; -#line 1246 "OfflinePage.c" +#line 1171 "OfflinePage.c" } -#line 87 "/home/jens/Source/shotwell/src/library/OfflinePage.vala" +#line 84 "/home/jens/Source/shotwell/src/library/OfflinePage.vala" _tmp21_ = _source_it; -#line 87 "/home/jens/Source/shotwell/src/library/OfflinePage.vala" +#line 84 "/home/jens/Source/shotwell/src/library/OfflinePage.vala" _tmp22_ = gee_iterator_get (_tmp21_); -#line 87 "/home/jens/Source/shotwell/src/library/OfflinePage.vala" +#line 84 "/home/jens/Source/shotwell/src/library/OfflinePage.vala" source = (MediaSource*) _tmp22_; -#line 88 "/home/jens/Source/shotwell/src/library/OfflinePage.vala" +#line 85 "/home/jens/Source/shotwell/src/library/OfflinePage.vala" _tmp23_ = marker; -#line 88 "/home/jens/Source/shotwell/src/library/OfflinePage.vala" +#line 85 "/home/jens/Source/shotwell/src/library/OfflinePage.vala" _tmp24_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page)); -#line 88 "/home/jens/Source/shotwell/src/library/OfflinePage.vala" +#line 85 "/home/jens/Source/shotwell/src/library/OfflinePage.vala" _tmp25_ = _tmp24_; -#line 88 "/home/jens/Source/shotwell/src/library/OfflinePage.vala" +#line 85 "/home/jens/Source/shotwell/src/library/OfflinePage.vala" _tmp26_ = source; -#line 88 "/home/jens/Source/shotwell/src/library/OfflinePage.vala" +#line 85 "/home/jens/Source/shotwell/src/library/OfflinePage.vala" _tmp27_ = view_collection_get_view_for_source (_tmp25_, G_TYPE_CHECK_INSTANCE_CAST (_tmp26_, TYPE_DATA_SOURCE, DataSource)); -#line 88 "/home/jens/Source/shotwell/src/library/OfflinePage.vala" +#line 85 "/home/jens/Source/shotwell/src/library/OfflinePage.vala" _tmp28_ = _tmp27_; -#line 88 "/home/jens/Source/shotwell/src/library/OfflinePage.vala" +#line 85 "/home/jens/Source/shotwell/src/library/OfflinePage.vala" marker_mark (_tmp23_, G_TYPE_CHECK_INSTANCE_CAST (_tmp28_, TYPE_DATA_OBJECT, DataObject)); -#line 88 "/home/jens/Source/shotwell/src/library/OfflinePage.vala" +#line 85 "/home/jens/Source/shotwell/src/library/OfflinePage.vala" _g_object_unref0 (_tmp28_); -#line 88 "/home/jens/Source/shotwell/src/library/OfflinePage.vala" +#line 85 "/home/jens/Source/shotwell/src/library/OfflinePage.vala" _data_collection_unref0 (_tmp25_); -#line 87 "/home/jens/Source/shotwell/src/library/OfflinePage.vala" +#line 84 "/home/jens/Source/shotwell/src/library/OfflinePage.vala" _g_object_unref0 (source); -#line 1274 "OfflinePage.c" +#line 1199 "OfflinePage.c" } -#line 87 "/home/jens/Source/shotwell/src/library/OfflinePage.vala" +#line 84 "/home/jens/Source/shotwell/src/library/OfflinePage.vala" _g_object_unref0 (_source_it); -#line 1278 "OfflinePage.c" +#line 1203 "OfflinePage.c" } -#line 89 "/home/jens/Source/shotwell/src/library/OfflinePage.vala" +#line 86 "/home/jens/Source/shotwell/src/library/OfflinePage.vala" _tmp29_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page)); -#line 89 "/home/jens/Source/shotwell/src/library/OfflinePage.vala" +#line 86 "/home/jens/Source/shotwell/src/library/OfflinePage.vala" _tmp30_ = _tmp29_; -#line 89 "/home/jens/Source/shotwell/src/library/OfflinePage.vala" +#line 86 "/home/jens/Source/shotwell/src/library/OfflinePage.vala" _tmp31_ = marker; -#line 89 "/home/jens/Source/shotwell/src/library/OfflinePage.vala" +#line 86 "/home/jens/Source/shotwell/src/library/OfflinePage.vala" data_collection_remove_marked (G_TYPE_CHECK_INSTANCE_CAST (_tmp30_, TYPE_DATA_COLLECTION, DataCollection), _tmp31_); -#line 89 "/home/jens/Source/shotwell/src/library/OfflinePage.vala" +#line 86 "/home/jens/Source/shotwell/src/library/OfflinePage.vala" _data_collection_unref0 (_tmp30_); -#line 85 "/home/jens/Source/shotwell/src/library/OfflinePage.vala" +#line 82 "/home/jens/Source/shotwell/src/library/OfflinePage.vala" _g_object_unref0 (marker); -#line 1292 "OfflinePage.c" +#line 1217 "OfflinePage.c" } } @@ -1296,9 +1221,9 @@ static void offline_page_on_offline_contents_altered (OfflinePage* self, GeeColl static gboolean _progress_dialog_monitor_progress_monitor (guint64 current, guint64 total, gboolean do_event_loop, gpointer self) { gboolean result; result = progress_dialog_monitor ((ProgressDialog*) self, current, total, do_event_loop); -#line 113 "/home/jens/Source/shotwell/src/library/OfflinePage.vala" +#line 110 "/home/jens/Source/shotwell/src/library/OfflinePage.vala" return result; -#line 1302 "OfflinePage.c" +#line 1227 "OfflinePage.c" } @@ -1335,198 +1260,198 @@ static void offline_page_on_remove_from_library (OfflinePage* self) { ProgressDialog* _tmp39_ = NULL; AppWindow* _tmp41_ = NULL; AppWindow* _tmp42_ = NULL; -#line 93 "/home/jens/Source/shotwell/src/library/OfflinePage.vala" +#line 90 "/home/jens/Source/shotwell/src/library/OfflinePage.vala" g_return_if_fail (IS_OFFLINE_PAGE (self)); -#line 94 "/home/jens/Source/shotwell/src/library/OfflinePage.vala" +#line 91 "/home/jens/Source/shotwell/src/library/OfflinePage.vala" _tmp0_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page)); -#line 94 "/home/jens/Source/shotwell/src/library/OfflinePage.vala" +#line 91 "/home/jens/Source/shotwell/src/library/OfflinePage.vala" _tmp1_ = _tmp0_; -#line 94 "/home/jens/Source/shotwell/src/library/OfflinePage.vala" +#line 91 "/home/jens/Source/shotwell/src/library/OfflinePage.vala" _tmp2_ = view_collection_get_selected_sources (_tmp1_); -#line 94 "/home/jens/Source/shotwell/src/library/OfflinePage.vala" +#line 91 "/home/jens/Source/shotwell/src/library/OfflinePage.vala" _tmp3_ = G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, GEE_TYPE_COLLECTION, GeeCollection); -#line 94 "/home/jens/Source/shotwell/src/library/OfflinePage.vala" +#line 91 "/home/jens/Source/shotwell/src/library/OfflinePage.vala" _data_collection_unref0 (_tmp1_); -#line 94 "/home/jens/Source/shotwell/src/library/OfflinePage.vala" +#line 91 "/home/jens/Source/shotwell/src/library/OfflinePage.vala" sources = _tmp3_; -#line 96 "/home/jens/Source/shotwell/src/library/OfflinePage.vala" +#line 93 "/home/jens/Source/shotwell/src/library/OfflinePage.vala" _tmp4_ = sources; -#line 96 "/home/jens/Source/shotwell/src/library/OfflinePage.vala" +#line 93 "/home/jens/Source/shotwell/src/library/OfflinePage.vala" _tmp5_ = gee_collection_get_size (_tmp4_); -#line 96 "/home/jens/Source/shotwell/src/library/OfflinePage.vala" +#line 93 "/home/jens/Source/shotwell/src/library/OfflinePage.vala" _tmp6_ = _tmp5_; -#line 96 "/home/jens/Source/shotwell/src/library/OfflinePage.vala" +#line 93 "/home/jens/Source/shotwell/src/library/OfflinePage.vala" if (_tmp6_ == 0) { -#line 97 "/home/jens/Source/shotwell/src/library/OfflinePage.vala" +#line 94 "/home/jens/Source/shotwell/src/library/OfflinePage.vala" _g_object_unref0 (sources); -#line 97 "/home/jens/Source/shotwell/src/library/OfflinePage.vala" +#line 94 "/home/jens/Source/shotwell/src/library/OfflinePage.vala" return; -#line 1365 "OfflinePage.c" +#line 1290 "OfflinePage.c" } -#line 99 "/home/jens/Source/shotwell/src/library/OfflinePage.vala" +#line 96 "/home/jens/Source/shotwell/src/library/OfflinePage.vala" _tmp7_ = app_window_get_instance (); -#line 99 "/home/jens/Source/shotwell/src/library/OfflinePage.vala" +#line 96 "/home/jens/Source/shotwell/src/library/OfflinePage.vala" _tmp8_ = _tmp7_; -#line 99 "/home/jens/Source/shotwell/src/library/OfflinePage.vala" +#line 96 "/home/jens/Source/shotwell/src/library/OfflinePage.vala" _tmp9_ = sources; -#line 99 "/home/jens/Source/shotwell/src/library/OfflinePage.vala" +#line 96 "/home/jens/Source/shotwell/src/library/OfflinePage.vala" _tmp10_ = gee_collection_get_size (_tmp9_); -#line 99 "/home/jens/Source/shotwell/src/library/OfflinePage.vala" +#line 96 "/home/jens/Source/shotwell/src/library/OfflinePage.vala" _tmp11_ = _tmp10_; -#line 99 "/home/jens/Source/shotwell/src/library/OfflinePage.vala" +#line 96 "/home/jens/Source/shotwell/src/library/OfflinePage.vala" _tmp12_ = remove_offline_dialog (G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, gtk_window_get_type (), GtkWindow), _tmp11_); -#line 99 "/home/jens/Source/shotwell/src/library/OfflinePage.vala" +#line 96 "/home/jens/Source/shotwell/src/library/OfflinePage.vala" _tmp13_ = !_tmp12_; -#line 99 "/home/jens/Source/shotwell/src/library/OfflinePage.vala" +#line 96 "/home/jens/Source/shotwell/src/library/OfflinePage.vala" _g_object_unref0 (_tmp8_); -#line 99 "/home/jens/Source/shotwell/src/library/OfflinePage.vala" +#line 96 "/home/jens/Source/shotwell/src/library/OfflinePage.vala" if (_tmp13_) { -#line 100 "/home/jens/Source/shotwell/src/library/OfflinePage.vala" +#line 97 "/home/jens/Source/shotwell/src/library/OfflinePage.vala" _g_object_unref0 (sources); -#line 100 "/home/jens/Source/shotwell/src/library/OfflinePage.vala" +#line 97 "/home/jens/Source/shotwell/src/library/OfflinePage.vala" return; -#line 1389 "OfflinePage.c" +#line 1314 "OfflinePage.c" } -#line 102 "/home/jens/Source/shotwell/src/library/OfflinePage.vala" +#line 99 "/home/jens/Source/shotwell/src/library/OfflinePage.vala" _tmp14_ = app_window_get_instance (); -#line 102 "/home/jens/Source/shotwell/src/library/OfflinePage.vala" +#line 99 "/home/jens/Source/shotwell/src/library/OfflinePage.vala" _tmp15_ = _tmp14_; -#line 102 "/home/jens/Source/shotwell/src/library/OfflinePage.vala" +#line 99 "/home/jens/Source/shotwell/src/library/OfflinePage.vala" page_window_set_busy_cursor (G_TYPE_CHECK_INSTANCE_CAST (_tmp15_, TYPE_PAGE_WINDOW, PageWindow)); -#line 102 "/home/jens/Source/shotwell/src/library/OfflinePage.vala" +#line 99 "/home/jens/Source/shotwell/src/library/OfflinePage.vala" _g_object_unref0 (_tmp15_); -#line 104 "/home/jens/Source/shotwell/src/library/OfflinePage.vala" +#line 101 "/home/jens/Source/shotwell/src/library/OfflinePage.vala" progress = NULL; -#line 105 "/home/jens/Source/shotwell/src/library/OfflinePage.vala" +#line 102 "/home/jens/Source/shotwell/src/library/OfflinePage.vala" _tmp16_ = sources; -#line 105 "/home/jens/Source/shotwell/src/library/OfflinePage.vala" +#line 102 "/home/jens/Source/shotwell/src/library/OfflinePage.vala" _tmp17_ = gee_collection_get_size (_tmp16_); -#line 105 "/home/jens/Source/shotwell/src/library/OfflinePage.vala" +#line 102 "/home/jens/Source/shotwell/src/library/OfflinePage.vala" _tmp18_ = _tmp17_; -#line 105 "/home/jens/Source/shotwell/src/library/OfflinePage.vala" +#line 102 "/home/jens/Source/shotwell/src/library/OfflinePage.vala" if (_tmp18_ >= 20) { -#line 1409 "OfflinePage.c" +#line 1334 "OfflinePage.c" AppWindow* _tmp19_ = NULL; AppWindow* _tmp20_ = NULL; const gchar* _tmp21_ = NULL; ProgressDialog* _tmp22_ = NULL; -#line 106 "/home/jens/Source/shotwell/src/library/OfflinePage.vala" +#line 103 "/home/jens/Source/shotwell/src/library/OfflinePage.vala" _tmp19_ = app_window_get_instance (); -#line 106 "/home/jens/Source/shotwell/src/library/OfflinePage.vala" +#line 103 "/home/jens/Source/shotwell/src/library/OfflinePage.vala" _tmp20_ = _tmp19_; -#line 106 "/home/jens/Source/shotwell/src/library/OfflinePage.vala" +#line 103 "/home/jens/Source/shotwell/src/library/OfflinePage.vala" _tmp21_ = _ ("Deleting…"); -#line 106 "/home/jens/Source/shotwell/src/library/OfflinePage.vala" +#line 103 "/home/jens/Source/shotwell/src/library/OfflinePage.vala" _tmp22_ = progress_dialog_new (G_TYPE_CHECK_INSTANCE_CAST (_tmp20_, gtk_window_get_type (), GtkWindow), _tmp21_, NULL); -#line 106 "/home/jens/Source/shotwell/src/library/OfflinePage.vala" +#line 103 "/home/jens/Source/shotwell/src/library/OfflinePage.vala" g_object_ref_sink (_tmp22_); -#line 106 "/home/jens/Source/shotwell/src/library/OfflinePage.vala" +#line 103 "/home/jens/Source/shotwell/src/library/OfflinePage.vala" _g_object_unref0 (progress); -#line 106 "/home/jens/Source/shotwell/src/library/OfflinePage.vala" +#line 103 "/home/jens/Source/shotwell/src/library/OfflinePage.vala" progress = _tmp22_; -#line 106 "/home/jens/Source/shotwell/src/library/OfflinePage.vala" +#line 103 "/home/jens/Source/shotwell/src/library/OfflinePage.vala" _g_object_unref0 (_tmp20_); -#line 1430 "OfflinePage.c" +#line 1355 "OfflinePage.c" } -#line 108 "/home/jens/Source/shotwell/src/library/OfflinePage.vala" +#line 105 "/home/jens/Source/shotwell/src/library/OfflinePage.vala" _tmp23_ = gee_array_list_new (TYPE_LIBRARY_PHOTO, (GBoxedCopyFunc) g_object_ref, g_object_unref, NULL, NULL, NULL); -#line 108 "/home/jens/Source/shotwell/src/library/OfflinePage.vala" +#line 105 "/home/jens/Source/shotwell/src/library/OfflinePage.vala" photos = _tmp23_; -#line 109 "/home/jens/Source/shotwell/src/library/OfflinePage.vala" +#line 106 "/home/jens/Source/shotwell/src/library/OfflinePage.vala" _tmp24_ = gee_array_list_new (TYPE_VIDEO, (GBoxedCopyFunc) g_object_ref, g_object_unref, NULL, NULL, NULL); -#line 109 "/home/jens/Source/shotwell/src/library/OfflinePage.vala" +#line 106 "/home/jens/Source/shotwell/src/library/OfflinePage.vala" videos = _tmp24_; -#line 110 "/home/jens/Source/shotwell/src/library/OfflinePage.vala" +#line 107 "/home/jens/Source/shotwell/src/library/OfflinePage.vala" _tmp25_ = sources; -#line 110 "/home/jens/Source/shotwell/src/library/OfflinePage.vala" +#line 107 "/home/jens/Source/shotwell/src/library/OfflinePage.vala" _tmp26_ = photos; -#line 110 "/home/jens/Source/shotwell/src/library/OfflinePage.vala" +#line 107 "/home/jens/Source/shotwell/src/library/OfflinePage.vala" _tmp27_ = videos; -#line 110 "/home/jens/Source/shotwell/src/library/OfflinePage.vala" +#line 107 "/home/jens/Source/shotwell/src/library/OfflinePage.vala" media_source_collection_filter_media (_tmp25_, G_TYPE_CHECK_INSTANCE_CAST (_tmp26_, GEE_TYPE_COLLECTION, GeeCollection), G_TYPE_CHECK_INSTANCE_CAST (_tmp27_, GEE_TYPE_COLLECTION, GeeCollection)); -#line 112 "/home/jens/Source/shotwell/src/library/OfflinePage.vala" +#line 109 "/home/jens/Source/shotwell/src/library/OfflinePage.vala" _tmp28_ = progress; -#line 112 "/home/jens/Source/shotwell/src/library/OfflinePage.vala" +#line 109 "/home/jens/Source/shotwell/src/library/OfflinePage.vala" if (_tmp28_ != NULL) { -#line 1452 "OfflinePage.c" +#line 1377 "OfflinePage.c" LibraryPhotoSourceCollection* _tmp29_ = NULL; GeeArrayList* _tmp30_ = NULL; ProgressDialog* _tmp31_ = NULL; VideoSourceCollection* _tmp32_ = NULL; GeeArrayList* _tmp33_ = NULL; ProgressDialog* _tmp34_ = NULL; -#line 113 "/home/jens/Source/shotwell/src/library/OfflinePage.vala" +#line 110 "/home/jens/Source/shotwell/src/library/OfflinePage.vala" _tmp29_ = library_photo_global; -#line 113 "/home/jens/Source/shotwell/src/library/OfflinePage.vala" +#line 110 "/home/jens/Source/shotwell/src/library/OfflinePage.vala" _tmp30_ = photos; -#line 113 "/home/jens/Source/shotwell/src/library/OfflinePage.vala" +#line 110 "/home/jens/Source/shotwell/src/library/OfflinePage.vala" _tmp31_ = progress; -#line 113 "/home/jens/Source/shotwell/src/library/OfflinePage.vala" +#line 110 "/home/jens/Source/shotwell/src/library/OfflinePage.vala" media_source_collection_remove_from_app (G_TYPE_CHECK_INSTANCE_CAST (_tmp29_, TYPE_MEDIA_SOURCE_COLLECTION, MediaSourceCollection), G_TYPE_CHECK_INSTANCE_CAST (_tmp30_, GEE_TYPE_COLLECTION, GeeCollection), FALSE, _progress_dialog_monitor_progress_monitor, _tmp31_, NULL); -#line 114 "/home/jens/Source/shotwell/src/library/OfflinePage.vala" +#line 111 "/home/jens/Source/shotwell/src/library/OfflinePage.vala" _tmp32_ = video_global; -#line 114 "/home/jens/Source/shotwell/src/library/OfflinePage.vala" +#line 111 "/home/jens/Source/shotwell/src/library/OfflinePage.vala" _tmp33_ = videos; -#line 114 "/home/jens/Source/shotwell/src/library/OfflinePage.vala" +#line 111 "/home/jens/Source/shotwell/src/library/OfflinePage.vala" _tmp34_ = progress; -#line 114 "/home/jens/Source/shotwell/src/library/OfflinePage.vala" +#line 111 "/home/jens/Source/shotwell/src/library/OfflinePage.vala" media_source_collection_remove_from_app (G_TYPE_CHECK_INSTANCE_CAST (_tmp32_, TYPE_MEDIA_SOURCE_COLLECTION, MediaSourceCollection), G_TYPE_CHECK_INSTANCE_CAST (_tmp33_, GEE_TYPE_COLLECTION, GeeCollection), FALSE, _progress_dialog_monitor_progress_monitor, _tmp34_, NULL); -#line 1475 "OfflinePage.c" +#line 1400 "OfflinePage.c" } else { LibraryPhotoSourceCollection* _tmp35_ = NULL; GeeArrayList* _tmp36_ = NULL; VideoSourceCollection* _tmp37_ = NULL; GeeArrayList* _tmp38_ = NULL; -#line 116 "/home/jens/Source/shotwell/src/library/OfflinePage.vala" +#line 113 "/home/jens/Source/shotwell/src/library/OfflinePage.vala" _tmp35_ = library_photo_global; -#line 116 "/home/jens/Source/shotwell/src/library/OfflinePage.vala" +#line 113 "/home/jens/Source/shotwell/src/library/OfflinePage.vala" _tmp36_ = photos; -#line 116 "/home/jens/Source/shotwell/src/library/OfflinePage.vala" +#line 113 "/home/jens/Source/shotwell/src/library/OfflinePage.vala" media_source_collection_remove_from_app (G_TYPE_CHECK_INSTANCE_CAST (_tmp35_, TYPE_MEDIA_SOURCE_COLLECTION, MediaSourceCollection), G_TYPE_CHECK_INSTANCE_CAST (_tmp36_, GEE_TYPE_COLLECTION, GeeCollection), FALSE, NULL, NULL, NULL); -#line 117 "/home/jens/Source/shotwell/src/library/OfflinePage.vala" +#line 114 "/home/jens/Source/shotwell/src/library/OfflinePage.vala" _tmp37_ = video_global; -#line 117 "/home/jens/Source/shotwell/src/library/OfflinePage.vala" +#line 114 "/home/jens/Source/shotwell/src/library/OfflinePage.vala" _tmp38_ = videos; -#line 117 "/home/jens/Source/shotwell/src/library/OfflinePage.vala" +#line 114 "/home/jens/Source/shotwell/src/library/OfflinePage.vala" media_source_collection_remove_from_app (G_TYPE_CHECK_INSTANCE_CAST (_tmp37_, TYPE_MEDIA_SOURCE_COLLECTION, MediaSourceCollection), G_TYPE_CHECK_INSTANCE_CAST (_tmp38_, GEE_TYPE_COLLECTION, GeeCollection), FALSE, NULL, NULL, NULL); -#line 1493 "OfflinePage.c" +#line 1418 "OfflinePage.c" } -#line 120 "/home/jens/Source/shotwell/src/library/OfflinePage.vala" +#line 117 "/home/jens/Source/shotwell/src/library/OfflinePage.vala" _tmp39_ = progress; -#line 120 "/home/jens/Source/shotwell/src/library/OfflinePage.vala" +#line 117 "/home/jens/Source/shotwell/src/library/OfflinePage.vala" if (_tmp39_ != NULL) { -#line 1499 "OfflinePage.c" +#line 1424 "OfflinePage.c" ProgressDialog* _tmp40_ = NULL; -#line 121 "/home/jens/Source/shotwell/src/library/OfflinePage.vala" +#line 118 "/home/jens/Source/shotwell/src/library/OfflinePage.vala" _tmp40_ = progress; -#line 121 "/home/jens/Source/shotwell/src/library/OfflinePage.vala" +#line 118 "/home/jens/Source/shotwell/src/library/OfflinePage.vala" progress_dialog_close (_tmp40_); -#line 1505 "OfflinePage.c" +#line 1430 "OfflinePage.c" } -#line 123 "/home/jens/Source/shotwell/src/library/OfflinePage.vala" +#line 120 "/home/jens/Source/shotwell/src/library/OfflinePage.vala" _tmp41_ = app_window_get_instance (); -#line 123 "/home/jens/Source/shotwell/src/library/OfflinePage.vala" +#line 120 "/home/jens/Source/shotwell/src/library/OfflinePage.vala" _tmp42_ = _tmp41_; -#line 123 "/home/jens/Source/shotwell/src/library/OfflinePage.vala" +#line 120 "/home/jens/Source/shotwell/src/library/OfflinePage.vala" page_window_set_normal_cursor (G_TYPE_CHECK_INSTANCE_CAST (_tmp42_, TYPE_PAGE_WINDOW, PageWindow)); -#line 123 "/home/jens/Source/shotwell/src/library/OfflinePage.vala" +#line 120 "/home/jens/Source/shotwell/src/library/OfflinePage.vala" _g_object_unref0 (_tmp42_); -#line 93 "/home/jens/Source/shotwell/src/library/OfflinePage.vala" +#line 90 "/home/jens/Source/shotwell/src/library/OfflinePage.vala" _g_object_unref0 (videos); -#line 93 "/home/jens/Source/shotwell/src/library/OfflinePage.vala" +#line 90 "/home/jens/Source/shotwell/src/library/OfflinePage.vala" _g_object_unref0 (photos); -#line 93 "/home/jens/Source/shotwell/src/library/OfflinePage.vala" +#line 90 "/home/jens/Source/shotwell/src/library/OfflinePage.vala" _g_object_unref0 (progress); -#line 93 "/home/jens/Source/shotwell/src/library/OfflinePage.vala" +#line 90 "/home/jens/Source/shotwell/src/library/OfflinePage.vala" _g_object_unref0 (sources); -#line 1523 "OfflinePage.c" +#line 1448 "OfflinePage.c" } static gpointer _view_filter_ref0 (gpointer self) { -#line 127 "/home/jens/Source/shotwell/src/library/OfflinePage.vala" +#line 124 "/home/jens/Source/shotwell/src/library/OfflinePage.vala" return self ? view_filter_ref (self) : NULL; -#line 1530 "OfflinePage.c" +#line 1455 "OfflinePage.c" } @@ -1535,17 +1460,17 @@ static SearchViewFilter* offline_page_real_get_search_view_filter (CheckerboardP SearchViewFilter* result = NULL; OfflinePageOfflineSearchViewFilter* _tmp0_ = NULL; SearchViewFilter* _tmp1_ = NULL; -#line 126 "/home/jens/Source/shotwell/src/library/OfflinePage.vala" +#line 123 "/home/jens/Source/shotwell/src/library/OfflinePage.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_OFFLINE_PAGE, OfflinePage); -#line 127 "/home/jens/Source/shotwell/src/library/OfflinePage.vala" +#line 124 "/home/jens/Source/shotwell/src/library/OfflinePage.vala" _tmp0_ = self->priv->search_filter; -#line 127 "/home/jens/Source/shotwell/src/library/OfflinePage.vala" +#line 124 "/home/jens/Source/shotwell/src/library/OfflinePage.vala" _tmp1_ = _view_filter_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, TYPE_SEARCH_VIEW_FILTER, SearchViewFilter)); -#line 127 "/home/jens/Source/shotwell/src/library/OfflinePage.vala" +#line 124 "/home/jens/Source/shotwell/src/library/OfflinePage.vala" result = _tmp1_; -#line 127 "/home/jens/Source/shotwell/src/library/OfflinePage.vala" +#line 124 "/home/jens/Source/shotwell/src/library/OfflinePage.vala" return result; -#line 1549 "OfflinePage.c" +#line 1474 "OfflinePage.c" } @@ -1574,21 +1499,21 @@ static OfflinePageOfflineView* offline_page_offline_view_construct (GType object _vala_assert (_tmp4_, "source.is_offline()"); #line 11 "/home/jens/Source/shotwell/src/library/OfflinePage.vala" return self; -#line 1578 "OfflinePage.c" +#line 1503 "OfflinePage.c" } static OfflinePageOfflineView* offline_page_offline_view_new (MediaSource* source) { #line 11 "/home/jens/Source/shotwell/src/library/OfflinePage.vala" return offline_page_offline_view_construct (OFFLINE_PAGE_TYPE_OFFLINE_VIEW, source); -#line 1585 "OfflinePage.c" +#line 1510 "OfflinePage.c" } static void offline_page_offline_view_class_init (OfflinePageOfflineViewClass * klass) { #line 10 "/home/jens/Source/shotwell/src/library/OfflinePage.vala" offline_page_offline_view_parent_class = g_type_class_peek_parent (klass); -#line 1592 "OfflinePage.c" +#line 1517 "OfflinePage.c" } @@ -1617,7 +1542,7 @@ static guint offline_page_offline_search_view_filter_real_get_criteria (SearchVi result = (guint) ((((SEARCH_FILTER_CRITERIA_TEXT | SEARCH_FILTER_CRITERIA_FLAG) | SEARCH_FILTER_CRITERIA_MEDIA) | SEARCH_FILTER_CRITERIA_RATING) | SEARCH_FILTER_CRITERIA_SAVEDSEARCH); #line 20 "/home/jens/Source/shotwell/src/library/OfflinePage.vala" return result; -#line 1621 "OfflinePage.c" +#line 1546 "OfflinePage.c" } @@ -1627,14 +1552,14 @@ static OfflinePageOfflineSearchViewFilter* offline_page_offline_search_view_filt self = (OfflinePageOfflineSearchViewFilter*) default_search_view_filter_construct (object_type); #line 18 "/home/jens/Source/shotwell/src/library/OfflinePage.vala" return self; -#line 1631 "OfflinePage.c" +#line 1556 "OfflinePage.c" } static OfflinePageOfflineSearchViewFilter* offline_page_offline_search_view_filter_new (void) { #line 18 "/home/jens/Source/shotwell/src/library/OfflinePage.vala" return offline_page_offline_search_view_filter_construct (OFFLINE_PAGE_TYPE_OFFLINE_SEARCH_VIEW_FILTER); -#line 1638 "OfflinePage.c" +#line 1563 "OfflinePage.c" } @@ -1643,7 +1568,7 @@ static void offline_page_offline_search_view_filter_class_init (OfflinePageOffli offline_page_offline_search_view_filter_parent_class = g_type_class_peek_parent (klass); #line 18 "/home/jens/Source/shotwell/src/library/OfflinePage.vala" ((SearchViewFilterClass *) klass)->get_criteria = offline_page_offline_search_view_filter_real_get_criteria; -#line 1647 "OfflinePage.c" +#line 1572 "OfflinePage.c" } @@ -1671,7 +1596,7 @@ static void offline_page_class_init (OfflinePageClass * klass) { #line 7 "/home/jens/Source/shotwell/src/library/OfflinePage.vala" ((PageClass *) klass)->init_collect_ui_filenames = offline_page_real_init_collect_ui_filenames; #line 7 "/home/jens/Source/shotwell/src/library/OfflinePage.vala" - ((PageClass *) klass)->init_collect_action_entries = offline_page_real_init_collect_action_entries; + ((PageClass *) klass)->add_actions = offline_page_real_add_actions; #line 7 "/home/jens/Source/shotwell/src/library/OfflinePage.vala" ((CheckerboardPageClass *) klass)->get_view_tracker = offline_page_real_get_view_tracker; #line 7 "/home/jens/Source/shotwell/src/library/OfflinePage.vala" @@ -1680,7 +1605,7 @@ static void offline_page_class_init (OfflinePageClass * klass) { ((CheckerboardPageClass *) klass)->get_search_view_filter = offline_page_real_get_search_view_filter; #line 7 "/home/jens/Source/shotwell/src/library/OfflinePage.vala" G_OBJECT_CLASS (klass)->finalize = offline_page_finalize; -#line 1684 "OfflinePage.c" +#line 1609 "OfflinePage.c" } @@ -1692,7 +1617,7 @@ static void offline_page_instance_init (OfflinePage * self) { _tmp0_ = offline_page_offline_search_view_filter_new (); #line 25 "/home/jens/Source/shotwell/src/library/OfflinePage.vala" self->priv->search_filter = _tmp0_; -#line 1696 "OfflinePage.c" +#line 1621 "OfflinePage.c" } @@ -1722,7 +1647,7 @@ static void offline_page_finalize (GObject* obj) { _core_tracker_unref0 (self->priv->tracker); #line 7 "/home/jens/Source/shotwell/src/library/OfflinePage.vala" G_OBJECT_CLASS (offline_page_parent_class)->finalize (obj); -#line 1726 "OfflinePage.c" +#line 1651 "OfflinePage.c" } diff --git a/src/library/OfflinePage.vala b/src/library/OfflinePage.vala index 899dc53..bd916d0 100644 --- a/src/library/OfflinePage.vala +++ b/src/library/OfflinePage.vala @@ -28,8 +28,8 @@ public class OfflinePage : CheckerboardPage { public OfflinePage() { base (NAME); - init_item_context_menu("/OfflineContextMenu"); - init_toolbar("/OfflineToolbar"); + init_item_context_menu("OfflineContextMenu"); + init_toolbar("OfflineToolbar"); tracker = new MediaViewTracker(get_view()); @@ -51,27 +51,24 @@ public class OfflinePage : CheckerboardPage { ui_filenames.add("offline.ui"); } - - protected override Gtk.ActionEntry[] init_collect_action_entries() { - Gtk.ActionEntry[] actions = base.init_collect_action_entries(); - - Gtk.ActionEntry remove = { "RemoveFromLibrary", Resources.REMOVE_LABEL, TRANSLATABLE, "Delete", - TRANSLATABLE, on_remove_from_library }; - remove.label = Resources.REMOVE_FROM_LIBRARY_MENU; - remove.tooltip = Resources.DELETE_FROM_LIBRARY_TOOLTIP; - actions += remove; - - return actions; + + private const GLib.ActionEntry[] entries = { + { "RemoveFromLibrary", on_remove_from_library } + }; + + protected override void add_actions () { + base.add_actions (); + + AppWindow.get_instance ().add_action_entries (entries, this); } - + public override Core.ViewTracker? get_view_tracker() { return tracker; } protected override void update_actions(int selected_count, int count) { set_action_sensitive("RemoveFromLibrary", selected_count > 0); - set_action_important("RemoveFromLibrary", true); - + base.update_actions(selected_count, count); } diff --git a/src/library/TrashPage.c b/src/library/TrashPage.c index 78ec0e1..2186ff1 100644 --- a/src/library/TrashPage.c +++ b/src/library/TrashPage.c @@ -15,6 +15,7 @@ #include <gee.h> #include <gdk/gdk.h> #include <glib/gi18n-lib.h> +#include <gio/gio.h> #include <cairo.h> #include <float.h> #include <math.h> @@ -303,6 +304,16 @@ typedef struct _VideoSourceCollection VideoSourceCollection; typedef struct _VideoSourceCollectionClass VideoSourceCollectionClass; #define _g_object_unref0(var) ((var == NULL) ? NULL : (var = (g_object_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_MEDIA_SOURCE_ITEM (media_source_item_get_type ()) #define MEDIA_SOURCE_ITEM(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), TYPE_MEDIA_SOURCE_ITEM, MediaSourceItem)) #define MEDIA_SOURCE_ITEM_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), TYPE_MEDIA_SOURCE_ITEM, MediaSourceItemClass)) @@ -445,7 +456,7 @@ typedef struct _TrashPageTrashSearchViewFilterPrivate TrashPageTrashSearchViewFi struct _Page { GtkScrolledWindow parent_instance; PagePrivate * priv; - GtkUIManager* ui; + GtkBuilder* builder; GtkToolbar* toolbar; gboolean in_view; }; @@ -455,8 +466,6 @@ struct _PageClass { void (*set_page_name) (Page* self, const gchar* page_name); void (*set_container) (Page* self, GtkWindow* container); void (*clear_container) (Page* self); - GtkMenuBar* (*get_menubar) (Page* self); - GtkWidget* (*get_page_ui_widget) (Page* self, const gchar* path); GtkToolbar* (*get_toolbar) (Page* self); GtkMenu* (*get_page_context_menu) (Page* self); void (*switching_from) (Page* self); @@ -464,10 +473,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 (*init_collect_ui_filenames) (Page* self, GeeList* ui_filenames); - GtkActionEntry* (*init_collect_action_entries) (Page* self, int* result_length1); - GtkToggleActionEntry* (*init_collect_toggle_action_entries) (Page* self, int* result_length1); - void (*register_radio_actions) (Page* self, GtkActionGroup* action_group); InjectionGroup** (*init_collect_injection_groups) (Page* self, int* result_length1); void (*init_actions) (Page* self, gint selected_count, gint count); void (*update_actions) (Page* self, gint selected_count, gint count); @@ -766,6 +773,10 @@ enum { static TrashPageTrashSearchViewFilter* trash_page_trash_search_view_filter_new (void); static TrashPageTrashSearchViewFilter* trash_page_trash_search_view_filter_construct (GType object_type); #define TRASH_PAGE_NAME _ ("Trash") +static void trash_page_on_delete (TrashPage* self); +static void _trash_page_on_delete_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self); +static void trash_page_on_restore (TrashPage* self); +static void _trash_page_on_restore_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self); TrashPage* trash_page_new (void); TrashPage* trash_page_construct (GType object_type); CheckerboardPage* checkerboard_page_construct (GType object_type, const gchar* page_name); @@ -796,21 +807,10 @@ GType video_source_collection_get_type (void) G_GNUC_CONST; GeeCollection* media_source_collection_get_trashcan_contents (MediaSourceCollection* self); static void trash_page_real_init_collect_ui_filenames (Page* base, GeeList* ui_filenames); void page_init_collect_ui_filenames (Page* self, GeeList* ui_filenames); -static GtkActionEntry* trash_page_real_init_collect_action_entries (Page* base, int* result_length1); -GtkActionEntry* page_init_collect_action_entries (Page* self, int* result_length1); -#define RESOURCES_DELETE_LABEL _ ("_Delete") -#define TRANSLATABLE "translatable" -static void trash_page_on_delete (TrashPage* self); -static void _trash_page_on_delete_gtk_action_callback (GtkAction* action, gpointer self); -#define RESOURCES_DELETE_PHOTOS_MENU _ ("_Delete") -#define RESOURCES_DELETE_FROM_TRASH_TOOLTIP _ ("Remove the selected photos from the trash") -static void _vala_array_add89 (GtkActionEntry** array, int* length, int* size, const GtkActionEntry* value); -#define RESOURCES_UNDELETE_LABEL _ ("_Undelete") -static void trash_page_on_restore (TrashPage* self); -static void _trash_page_on_restore_gtk_action_callback (GtkAction* action, gpointer self); -#define RESOURCES_RESTORE_PHOTOS_MENU _ ("_Restore") -#define RESOURCES_RESTORE_PHOTOS_TOOLTIP _ ("Move the selected photos back into the library") -static void _vala_array_add90 (GtkActionEntry** array, int* length, int* size, const GtkActionEntry* value); +static void trash_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 CoreViewTracker* trash_page_real_get_view_tracker (CheckerboardPage* base); static void trash_page_real_update_actions (Page* base, gint selected_count, gint count); void page_set_action_sensitive (Page* self, const gchar* name, gboolean sensitive); @@ -875,11 +875,26 @@ GType search_filter_criteria_get_type (void) G_GNUC_CONST; DefaultSearchViewFilter* default_search_view_filter_construct (GType object_type); static void trash_page_finalize (GObject* obj); +static const GActionEntry TRASH_PAGE_entries[2] = {{"Delete", _trash_page_on_delete_gsimple_action_activate_callback}, {"Restore", _trash_page_on_restore_gsimple_action_activate_callback}}; + +static void _trash_page_on_delete_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self) { +#line 50 "/home/jens/Source/shotwell/src/library/TrashPage.vala" + trash_page_on_delete ((TrashPage*) self); +#line 884 "TrashPage.c" +} + + +static void _trash_page_on_restore_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self) { +#line 50 "/home/jens/Source/shotwell/src/library/TrashPage.vala" + trash_page_on_restore ((TrashPage*) self); +#line 891 "TrashPage.c" +} + static void _trash_page_on_trashcan_contents_altered_media_source_collection_trashcan_contents_altered (MediaSourceCollection* _sender, GeeCollection* added, GeeCollection* removed, gpointer self) { #line 38 "/home/jens/Source/shotwell/src/library/TrashPage.vala" trash_page_on_trashcan_contents_altered ((TrashPage*) self, added, removed); -#line 883 "TrashPage.c" +#line 898 "TrashPage.c" } @@ -899,11 +914,11 @@ TrashPage* trash_page_construct (GType object_type) { #line 29 "/home/jens/Source/shotwell/src/library/TrashPage.vala" self = (TrashPage*) checkerboard_page_construct (object_type, TRASH_PAGE_NAME); #line 31 "/home/jens/Source/shotwell/src/library/TrashPage.vala" - checkerboard_page_init_item_context_menu (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_CHECKERBOARD_PAGE, CheckerboardPage), "/TrashContextMenu"); + checkerboard_page_init_item_context_menu (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_CHECKERBOARD_PAGE, CheckerboardPage), "TrashContextMenu"); #line 32 "/home/jens/Source/shotwell/src/library/TrashPage.vala" - checkerboard_page_init_page_context_menu (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_CHECKERBOARD_PAGE, CheckerboardPage), "/TrashPageMenu"); + checkerboard_page_init_page_context_menu (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_CHECKERBOARD_PAGE, CheckerboardPage), "TrashPageMenu"); #line 33 "/home/jens/Source/shotwell/src/library/TrashPage.vala" - page_init_toolbar (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "/TrashToolbar"); + page_init_toolbar (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "TrashToolbar"); #line 35 "/home/jens/Source/shotwell/src/library/TrashPage.vala" _tmp0_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page)); #line 35 "/home/jens/Source/shotwell/src/library/TrashPage.vala" @@ -946,14 +961,14 @@ TrashPage* trash_page_construct (GType object_type) { _g_object_unref0 (_tmp10_); #line 28 "/home/jens/Source/shotwell/src/library/TrashPage.vala" return self; -#line 950 "TrashPage.c" +#line 965 "TrashPage.c" } TrashPage* trash_page_new (void) { #line 28 "/home/jens/Source/shotwell/src/library/TrashPage.vala" return trash_page_construct (TYPE_TRASH_PAGE); -#line 957 "TrashPage.c" +#line 972 "TrashPage.c" } @@ -973,158 +988,34 @@ static void trash_page_real_init_collect_ui_filenames (Page* base, GeeList* ui_f _tmp1_ = ui_filenames; #line 47 "/home/jens/Source/shotwell/src/library/TrashPage.vala" gee_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, GEE_TYPE_COLLECTION, GeeCollection), "trash.ui"); -#line 977 "TrashPage.c" -} - - -static void _trash_page_on_delete_gtk_action_callback (GtkAction* action, gpointer self) { -#line 53 "/home/jens/Source/shotwell/src/library/TrashPage.vala" - trash_page_on_delete ((TrashPage*) self); -#line 984 "TrashPage.c" -} - - -static void _vala_array_add89 (GtkActionEntry** array, int* length, int* size, const GtkActionEntry* value) { -#line 57 "/home/jens/Source/shotwell/src/library/TrashPage.vala" - if ((*length) == (*size)) { -#line 57 "/home/jens/Source/shotwell/src/library/TrashPage.vala" - *size = (*size) ? (2 * (*size)) : 4; -#line 57 "/home/jens/Source/shotwell/src/library/TrashPage.vala" - *array = g_renew (GtkActionEntry, *array, *size); -#line 995 "TrashPage.c" - } -#line 57 "/home/jens/Source/shotwell/src/library/TrashPage.vala" - (*array)[(*length)++] = *value; -#line 999 "TrashPage.c" +#line 992 "TrashPage.c" } -static void _trash_page_on_restore_gtk_action_callback (GtkAction* action, gpointer self) { -#line 59 "/home/jens/Source/shotwell/src/library/TrashPage.vala" - trash_page_on_restore ((TrashPage*) self); -#line 1006 "TrashPage.c" -} - - -static void _vala_array_add90 (GtkActionEntry** array, int* length, int* size, const GtkActionEntry* value) { -#line 63 "/home/jens/Source/shotwell/src/library/TrashPage.vala" - if ((*length) == (*size)) { -#line 63 "/home/jens/Source/shotwell/src/library/TrashPage.vala" - *size = (*size) ? (2 * (*size)) : 4; -#line 63 "/home/jens/Source/shotwell/src/library/TrashPage.vala" - *array = g_renew (GtkActionEntry, *array, *size); -#line 1017 "TrashPage.c" - } -#line 63 "/home/jens/Source/shotwell/src/library/TrashPage.vala" - (*array)[(*length)++] = *value; -#line 1021 "TrashPage.c" -} - - -static GtkActionEntry* trash_page_real_init_collect_action_entries (Page* base, int* result_length1) { +static void trash_page_real_add_actions (Page* base) { TrashPage * self; - GtkActionEntry* result = NULL; - GtkActionEntry* actions = NULL; - gint _tmp0_ = 0; - GtkActionEntry* _tmp1_ = NULL; - gint actions_length1 = 0; - gint _actions_size_ = 0; - GtkActionEntry delete_action = {0}; - GtkActionEntry _tmp2_ = {0}; - GtkActionEntry* _tmp3_ = NULL; - gint _tmp3__length1 = 0; - GtkActionEntry _tmp4_ = {0}; - GtkActionEntry restore = {0}; - GtkActionEntry _tmp5_ = {0}; - GtkActionEntry* _tmp6_ = NULL; - gint _tmp6__length1 = 0; - GtkActionEntry _tmp7_ = {0}; - GtkActionEntry* _tmp8_ = NULL; - gint _tmp8__length1 = 0; -#line 50 "/home/jens/Source/shotwell/src/library/TrashPage.vala" - self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_TRASH_PAGE, TrashPage); -#line 51 "/home/jens/Source/shotwell/src/library/TrashPage.vala" - _tmp1_ = PAGE_CLASS (trash_page_parent_class)->init_collect_action_entries (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_CHECKERBOARD_PAGE, CheckerboardPage), TYPE_PAGE, Page), &_tmp0_); -#line 51 "/home/jens/Source/shotwell/src/library/TrashPage.vala" - actions = _tmp1_; -#line 51 "/home/jens/Source/shotwell/src/library/TrashPage.vala" - actions_length1 = _tmp0_; -#line 51 "/home/jens/Source/shotwell/src/library/TrashPage.vala" - _actions_size_ = actions_length1; -#line 53 "/home/jens/Source/shotwell/src/library/TrashPage.vala" - _tmp2_.name = "Delete"; -#line 53 "/home/jens/Source/shotwell/src/library/TrashPage.vala" - _tmp2_.stock_id = RESOURCES_DELETE_LABEL; -#line 53 "/home/jens/Source/shotwell/src/library/TrashPage.vala" - _tmp2_.label = TRANSLATABLE; -#line 53 "/home/jens/Source/shotwell/src/library/TrashPage.vala" - _tmp2_.accelerator = "Delete"; -#line 53 "/home/jens/Source/shotwell/src/library/TrashPage.vala" - _tmp2_.tooltip = TRANSLATABLE; -#line 53 "/home/jens/Source/shotwell/src/library/TrashPage.vala" - _tmp2_.callback = (GCallback) _trash_page_on_delete_gtk_action_callback; -#line 53 "/home/jens/Source/shotwell/src/library/TrashPage.vala" - delete_action = _tmp2_; + AppWindow* _tmp0_ = NULL; + AppWindow* _tmp1_ = NULL; #line 55 "/home/jens/Source/shotwell/src/library/TrashPage.vala" - delete_action.label = RESOURCES_DELETE_PHOTOS_MENU; + self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_TRASH_PAGE, TrashPage); #line 56 "/home/jens/Source/shotwell/src/library/TrashPage.vala" - delete_action.tooltip = RESOURCES_DELETE_FROM_TRASH_TOOLTIP; -#line 57 "/home/jens/Source/shotwell/src/library/TrashPage.vala" - _tmp3_ = actions; -#line 57 "/home/jens/Source/shotwell/src/library/TrashPage.vala" - _tmp3__length1 = actions_length1; -#line 57 "/home/jens/Source/shotwell/src/library/TrashPage.vala" - _tmp4_ = delete_action; -#line 57 "/home/jens/Source/shotwell/src/library/TrashPage.vala" - _vala_array_add89 (&actions, &actions_length1, &_actions_size_, &_tmp4_); -#line 59 "/home/jens/Source/shotwell/src/library/TrashPage.vala" - _tmp5_.name = "Restore"; -#line 59 "/home/jens/Source/shotwell/src/library/TrashPage.vala" - _tmp5_.stock_id = RESOURCES_UNDELETE_LABEL; -#line 59 "/home/jens/Source/shotwell/src/library/TrashPage.vala" - _tmp5_.label = TRANSLATABLE; -#line 59 "/home/jens/Source/shotwell/src/library/TrashPage.vala" - _tmp5_.accelerator = NULL; -#line 59 "/home/jens/Source/shotwell/src/library/TrashPage.vala" - _tmp5_.tooltip = TRANSLATABLE; -#line 59 "/home/jens/Source/shotwell/src/library/TrashPage.vala" - _tmp5_.callback = (GCallback) _trash_page_on_restore_gtk_action_callback; -#line 59 "/home/jens/Source/shotwell/src/library/TrashPage.vala" - restore = _tmp5_; -#line 61 "/home/jens/Source/shotwell/src/library/TrashPage.vala" - restore.label = RESOURCES_RESTORE_PHOTOS_MENU; -#line 62 "/home/jens/Source/shotwell/src/library/TrashPage.vala" - restore.tooltip = RESOURCES_RESTORE_PHOTOS_TOOLTIP; -#line 63 "/home/jens/Source/shotwell/src/library/TrashPage.vala" - _tmp6_ = actions; -#line 63 "/home/jens/Source/shotwell/src/library/TrashPage.vala" - _tmp6__length1 = actions_length1; -#line 63 "/home/jens/Source/shotwell/src/library/TrashPage.vala" - _tmp7_ = restore; -#line 63 "/home/jens/Source/shotwell/src/library/TrashPage.vala" - _vala_array_add90 (&actions, &actions_length1, &_actions_size_, &_tmp7_); -#line 65 "/home/jens/Source/shotwell/src/library/TrashPage.vala" - _tmp8_ = actions; -#line 65 "/home/jens/Source/shotwell/src/library/TrashPage.vala" - _tmp8__length1 = actions_length1; -#line 65 "/home/jens/Source/shotwell/src/library/TrashPage.vala" - if (result_length1) { -#line 65 "/home/jens/Source/shotwell/src/library/TrashPage.vala" - *result_length1 = _tmp8__length1; -#line 1115 "TrashPage.c" - } -#line 65 "/home/jens/Source/shotwell/src/library/TrashPage.vala" - result = _tmp8_; -#line 65 "/home/jens/Source/shotwell/src/library/TrashPage.vala" - return result; -#line 1121 "TrashPage.c" + PAGE_CLASS (trash_page_parent_class)->add_actions (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_CHECKERBOARD_PAGE, CheckerboardPage), TYPE_PAGE, Page)); +#line 58 "/home/jens/Source/shotwell/src/library/TrashPage.vala" + _tmp0_ = app_window_get_instance (); +#line 58 "/home/jens/Source/shotwell/src/library/TrashPage.vala" + _tmp1_ = _tmp0_; +#line 58 "/home/jens/Source/shotwell/src/library/TrashPage.vala" + g_action_map_add_action_entries (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, g_action_map_get_type (), GActionMap), TRASH_PAGE_entries, G_N_ELEMENTS (TRASH_PAGE_entries), self); +#line 58 "/home/jens/Source/shotwell/src/library/TrashPage.vala" + _g_object_unref0 (_tmp1_); +#line 1012 "TrashPage.c" } static gpointer _core_tracker_ref0 (gpointer self) { -#line 69 "/home/jens/Source/shotwell/src/library/TrashPage.vala" +#line 62 "/home/jens/Source/shotwell/src/library/TrashPage.vala" return self ? core_tracker_ref (self) : NULL; -#line 1128 "TrashPage.c" +#line 1019 "TrashPage.c" } @@ -1133,17 +1024,17 @@ static CoreViewTracker* trash_page_real_get_view_tracker (CheckerboardPage* base CoreViewTracker* result = NULL; MediaViewTracker* _tmp0_ = NULL; CoreViewTracker* _tmp1_ = NULL; -#line 68 "/home/jens/Source/shotwell/src/library/TrashPage.vala" +#line 61 "/home/jens/Source/shotwell/src/library/TrashPage.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_TRASH_PAGE, TrashPage); -#line 69 "/home/jens/Source/shotwell/src/library/TrashPage.vala" +#line 62 "/home/jens/Source/shotwell/src/library/TrashPage.vala" _tmp0_ = self->priv->tracker; -#line 69 "/home/jens/Source/shotwell/src/library/TrashPage.vala" +#line 62 "/home/jens/Source/shotwell/src/library/TrashPage.vala" _tmp1_ = _core_tracker_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, CORE_TYPE_VIEW_TRACKER, CoreViewTracker)); -#line 69 "/home/jens/Source/shotwell/src/library/TrashPage.vala" +#line 62 "/home/jens/Source/shotwell/src/library/TrashPage.vala" result = _tmp1_; -#line 69 "/home/jens/Source/shotwell/src/library/TrashPage.vala" +#line 62 "/home/jens/Source/shotwell/src/library/TrashPage.vala" return result; -#line 1147 "TrashPage.c" +#line 1038 "TrashPage.c" } @@ -1153,59 +1044,59 @@ static void trash_page_real_update_actions (Page* base, gint selected_count, gin gint _tmp0_ = 0; gint _tmp1_ = 0; gint _tmp2_ = 0; -#line 72 "/home/jens/Source/shotwell/src/library/TrashPage.vala" +#line 65 "/home/jens/Source/shotwell/src/library/TrashPage.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_TRASH_PAGE, TrashPage); -#line 73 "/home/jens/Source/shotwell/src/library/TrashPage.vala" +#line 66 "/home/jens/Source/shotwell/src/library/TrashPage.vala" _tmp0_ = selected_count; -#line 73 "/home/jens/Source/shotwell/src/library/TrashPage.vala" +#line 66 "/home/jens/Source/shotwell/src/library/TrashPage.vala" has_selected = _tmp0_ > 0; -#line 75 "/home/jens/Source/shotwell/src/library/TrashPage.vala" +#line 68 "/home/jens/Source/shotwell/src/library/TrashPage.vala" page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "Delete", has_selected); -#line 76 "/home/jens/Source/shotwell/src/library/TrashPage.vala" +#line 69 "/home/jens/Source/shotwell/src/library/TrashPage.vala" page_set_action_important (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "Delete", TRUE); -#line 77 "/home/jens/Source/shotwell/src/library/TrashPage.vala" +#line 70 "/home/jens/Source/shotwell/src/library/TrashPage.vala" page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "Restore", has_selected); -#line 78 "/home/jens/Source/shotwell/src/library/TrashPage.vala" +#line 71 "/home/jens/Source/shotwell/src/library/TrashPage.vala" page_set_action_important (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "Restore", TRUE); -#line 79 "/home/jens/Source/shotwell/src/library/TrashPage.vala" +#line 72 "/home/jens/Source/shotwell/src/library/TrashPage.vala" page_set_common_action_important (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "CommonEmptyTrash", TRUE); -#line 81 "/home/jens/Source/shotwell/src/library/TrashPage.vala" +#line 74 "/home/jens/Source/shotwell/src/library/TrashPage.vala" _tmp1_ = selected_count; -#line 81 "/home/jens/Source/shotwell/src/library/TrashPage.vala" +#line 74 "/home/jens/Source/shotwell/src/library/TrashPage.vala" _tmp2_ = count; -#line 81 "/home/jens/Source/shotwell/src/library/TrashPage.vala" +#line 74 "/home/jens/Source/shotwell/src/library/TrashPage.vala" PAGE_CLASS (trash_page_parent_class)->update_actions (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_CHECKERBOARD_PAGE, CheckerboardPage), TYPE_PAGE, Page), _tmp1_, _tmp2_); -#line 1179 "TrashPage.c" +#line 1070 "TrashPage.c" } static void trash_page_on_trashcan_contents_altered (TrashPage* self, GeeCollection* added, GeeCollection* removed) { GeeCollection* _tmp0_ = NULL; GeeCollection* _tmp12_ = NULL; -#line 84 "/home/jens/Source/shotwell/src/library/TrashPage.vala" +#line 77 "/home/jens/Source/shotwell/src/library/TrashPage.vala" g_return_if_fail (IS_TRASH_PAGE (self)); -#line 84 "/home/jens/Source/shotwell/src/library/TrashPage.vala" +#line 77 "/home/jens/Source/shotwell/src/library/TrashPage.vala" g_return_if_fail ((added == NULL) || GEE_IS_COLLECTION (added)); -#line 84 "/home/jens/Source/shotwell/src/library/TrashPage.vala" +#line 77 "/home/jens/Source/shotwell/src/library/TrashPage.vala" g_return_if_fail ((removed == NULL) || GEE_IS_COLLECTION (removed)); -#line 86 "/home/jens/Source/shotwell/src/library/TrashPage.vala" +#line 79 "/home/jens/Source/shotwell/src/library/TrashPage.vala" _tmp0_ = added; -#line 86 "/home/jens/Source/shotwell/src/library/TrashPage.vala" +#line 79 "/home/jens/Source/shotwell/src/library/TrashPage.vala" if (_tmp0_ != NULL) { -#line 1196 "TrashPage.c" +#line 1087 "TrashPage.c" { GeeIterator* _source_it = NULL; GeeCollection* _tmp1_ = NULL; GeeIterator* _tmp2_ = NULL; -#line 87 "/home/jens/Source/shotwell/src/library/TrashPage.vala" +#line 80 "/home/jens/Source/shotwell/src/library/TrashPage.vala" _tmp1_ = added; -#line 87 "/home/jens/Source/shotwell/src/library/TrashPage.vala" +#line 80 "/home/jens/Source/shotwell/src/library/TrashPage.vala" _tmp2_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, GEE_TYPE_ITERABLE, GeeIterable)); -#line 87 "/home/jens/Source/shotwell/src/library/TrashPage.vala" +#line 80 "/home/jens/Source/shotwell/src/library/TrashPage.vala" _source_it = _tmp2_; -#line 87 "/home/jens/Source/shotwell/src/library/TrashPage.vala" +#line 80 "/home/jens/Source/shotwell/src/library/TrashPage.vala" while (TRUE) { -#line 1209 "TrashPage.c" +#line 1100 "TrashPage.c" GeeIterator* _tmp3_ = NULL; gboolean _tmp4_ = FALSE; MediaSource* source = NULL; @@ -1216,52 +1107,52 @@ static void trash_page_on_trashcan_contents_altered (TrashPage* self, GeeCollect MediaSource* _tmp9_ = NULL; TrashPageTrashView* _tmp10_ = NULL; TrashPageTrashView* _tmp11_ = NULL; -#line 87 "/home/jens/Source/shotwell/src/library/TrashPage.vala" +#line 80 "/home/jens/Source/shotwell/src/library/TrashPage.vala" _tmp3_ = _source_it; -#line 87 "/home/jens/Source/shotwell/src/library/TrashPage.vala" +#line 80 "/home/jens/Source/shotwell/src/library/TrashPage.vala" _tmp4_ = gee_iterator_next (_tmp3_); -#line 87 "/home/jens/Source/shotwell/src/library/TrashPage.vala" +#line 80 "/home/jens/Source/shotwell/src/library/TrashPage.vala" if (!_tmp4_) { -#line 87 "/home/jens/Source/shotwell/src/library/TrashPage.vala" +#line 80 "/home/jens/Source/shotwell/src/library/TrashPage.vala" break; -#line 1228 "TrashPage.c" +#line 1119 "TrashPage.c" } -#line 87 "/home/jens/Source/shotwell/src/library/TrashPage.vala" +#line 80 "/home/jens/Source/shotwell/src/library/TrashPage.vala" _tmp5_ = _source_it; -#line 87 "/home/jens/Source/shotwell/src/library/TrashPage.vala" +#line 80 "/home/jens/Source/shotwell/src/library/TrashPage.vala" _tmp6_ = gee_iterator_get (_tmp5_); -#line 87 "/home/jens/Source/shotwell/src/library/TrashPage.vala" +#line 80 "/home/jens/Source/shotwell/src/library/TrashPage.vala" source = (MediaSource*) _tmp6_; -#line 88 "/home/jens/Source/shotwell/src/library/TrashPage.vala" +#line 81 "/home/jens/Source/shotwell/src/library/TrashPage.vala" _tmp7_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page)); -#line 88 "/home/jens/Source/shotwell/src/library/TrashPage.vala" +#line 81 "/home/jens/Source/shotwell/src/library/TrashPage.vala" _tmp8_ = _tmp7_; -#line 88 "/home/jens/Source/shotwell/src/library/TrashPage.vala" +#line 81 "/home/jens/Source/shotwell/src/library/TrashPage.vala" _tmp9_ = source; -#line 88 "/home/jens/Source/shotwell/src/library/TrashPage.vala" +#line 81 "/home/jens/Source/shotwell/src/library/TrashPage.vala" _tmp10_ = trash_page_trash_view_new (_tmp9_); -#line 88 "/home/jens/Source/shotwell/src/library/TrashPage.vala" +#line 81 "/home/jens/Source/shotwell/src/library/TrashPage.vala" _tmp11_ = _tmp10_; -#line 88 "/home/jens/Source/shotwell/src/library/TrashPage.vala" +#line 81 "/home/jens/Source/shotwell/src/library/TrashPage.vala" data_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, TYPE_DATA_COLLECTION, DataCollection), G_TYPE_CHECK_INSTANCE_CAST (_tmp11_, TYPE_DATA_OBJECT, DataObject)); -#line 88 "/home/jens/Source/shotwell/src/library/TrashPage.vala" +#line 81 "/home/jens/Source/shotwell/src/library/TrashPage.vala" _g_object_unref0 (_tmp11_); -#line 88 "/home/jens/Source/shotwell/src/library/TrashPage.vala" +#line 81 "/home/jens/Source/shotwell/src/library/TrashPage.vala" _data_collection_unref0 (_tmp8_); -#line 87 "/home/jens/Source/shotwell/src/library/TrashPage.vala" +#line 80 "/home/jens/Source/shotwell/src/library/TrashPage.vala" _g_object_unref0 (source); -#line 1254 "TrashPage.c" +#line 1145 "TrashPage.c" } -#line 87 "/home/jens/Source/shotwell/src/library/TrashPage.vala" +#line 80 "/home/jens/Source/shotwell/src/library/TrashPage.vala" _g_object_unref0 (_source_it); -#line 1258 "TrashPage.c" +#line 1149 "TrashPage.c" } } -#line 91 "/home/jens/Source/shotwell/src/library/TrashPage.vala" +#line 84 "/home/jens/Source/shotwell/src/library/TrashPage.vala" _tmp12_ = removed; -#line 91 "/home/jens/Source/shotwell/src/library/TrashPage.vala" +#line 84 "/home/jens/Source/shotwell/src/library/TrashPage.vala" if (_tmp12_ != NULL) { -#line 1265 "TrashPage.c" +#line 1156 "TrashPage.c" Marker* marker = NULL; ViewCollection* _tmp13_ = NULL; ViewCollection* _tmp14_ = NULL; @@ -1270,32 +1161,32 @@ static void trash_page_on_trashcan_contents_altered (TrashPage* self, GeeCollect ViewCollection* _tmp29_ = NULL; ViewCollection* _tmp30_ = NULL; Marker* _tmp31_ = NULL; -#line 92 "/home/jens/Source/shotwell/src/library/TrashPage.vala" +#line 85 "/home/jens/Source/shotwell/src/library/TrashPage.vala" _tmp13_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page)); -#line 92 "/home/jens/Source/shotwell/src/library/TrashPage.vala" +#line 85 "/home/jens/Source/shotwell/src/library/TrashPage.vala" _tmp14_ = _tmp13_; -#line 92 "/home/jens/Source/shotwell/src/library/TrashPage.vala" +#line 85 "/home/jens/Source/shotwell/src/library/TrashPage.vala" _tmp15_ = data_collection_start_marking (G_TYPE_CHECK_INSTANCE_CAST (_tmp14_, TYPE_DATA_COLLECTION, DataCollection)); -#line 92 "/home/jens/Source/shotwell/src/library/TrashPage.vala" +#line 85 "/home/jens/Source/shotwell/src/library/TrashPage.vala" _tmp16_ = _tmp15_; -#line 92 "/home/jens/Source/shotwell/src/library/TrashPage.vala" +#line 85 "/home/jens/Source/shotwell/src/library/TrashPage.vala" _data_collection_unref0 (_tmp14_); -#line 92 "/home/jens/Source/shotwell/src/library/TrashPage.vala" +#line 85 "/home/jens/Source/shotwell/src/library/TrashPage.vala" marker = _tmp16_; -#line 1286 "TrashPage.c" +#line 1177 "TrashPage.c" { GeeIterator* _source_it = NULL; GeeCollection* _tmp17_ = NULL; GeeIterator* _tmp18_ = NULL; -#line 93 "/home/jens/Source/shotwell/src/library/TrashPage.vala" +#line 86 "/home/jens/Source/shotwell/src/library/TrashPage.vala" _tmp17_ = removed; -#line 93 "/home/jens/Source/shotwell/src/library/TrashPage.vala" +#line 86 "/home/jens/Source/shotwell/src/library/TrashPage.vala" _tmp18_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp17_, GEE_TYPE_ITERABLE, GeeIterable)); -#line 93 "/home/jens/Source/shotwell/src/library/TrashPage.vala" +#line 86 "/home/jens/Source/shotwell/src/library/TrashPage.vala" _source_it = _tmp18_; -#line 93 "/home/jens/Source/shotwell/src/library/TrashPage.vala" +#line 86 "/home/jens/Source/shotwell/src/library/TrashPage.vala" while (TRUE) { -#line 1299 "TrashPage.c" +#line 1190 "TrashPage.c" GeeIterator* _tmp19_ = NULL; gboolean _tmp20_ = FALSE; MediaSource* source = NULL; @@ -1307,61 +1198,61 @@ static void trash_page_on_trashcan_contents_altered (TrashPage* self, GeeCollect MediaSource* _tmp26_ = NULL; DataView* _tmp27_ = NULL; DataView* _tmp28_ = NULL; -#line 93 "/home/jens/Source/shotwell/src/library/TrashPage.vala" +#line 86 "/home/jens/Source/shotwell/src/library/TrashPage.vala" _tmp19_ = _source_it; -#line 93 "/home/jens/Source/shotwell/src/library/TrashPage.vala" +#line 86 "/home/jens/Source/shotwell/src/library/TrashPage.vala" _tmp20_ = gee_iterator_next (_tmp19_); -#line 93 "/home/jens/Source/shotwell/src/library/TrashPage.vala" +#line 86 "/home/jens/Source/shotwell/src/library/TrashPage.vala" if (!_tmp20_) { -#line 93 "/home/jens/Source/shotwell/src/library/TrashPage.vala" +#line 86 "/home/jens/Source/shotwell/src/library/TrashPage.vala" break; -#line 1319 "TrashPage.c" +#line 1210 "TrashPage.c" } -#line 93 "/home/jens/Source/shotwell/src/library/TrashPage.vala" +#line 86 "/home/jens/Source/shotwell/src/library/TrashPage.vala" _tmp21_ = _source_it; -#line 93 "/home/jens/Source/shotwell/src/library/TrashPage.vala" +#line 86 "/home/jens/Source/shotwell/src/library/TrashPage.vala" _tmp22_ = gee_iterator_get (_tmp21_); -#line 93 "/home/jens/Source/shotwell/src/library/TrashPage.vala" +#line 86 "/home/jens/Source/shotwell/src/library/TrashPage.vala" source = (MediaSource*) _tmp22_; -#line 94 "/home/jens/Source/shotwell/src/library/TrashPage.vala" +#line 87 "/home/jens/Source/shotwell/src/library/TrashPage.vala" _tmp23_ = marker; -#line 94 "/home/jens/Source/shotwell/src/library/TrashPage.vala" +#line 87 "/home/jens/Source/shotwell/src/library/TrashPage.vala" _tmp24_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page)); -#line 94 "/home/jens/Source/shotwell/src/library/TrashPage.vala" +#line 87 "/home/jens/Source/shotwell/src/library/TrashPage.vala" _tmp25_ = _tmp24_; -#line 94 "/home/jens/Source/shotwell/src/library/TrashPage.vala" +#line 87 "/home/jens/Source/shotwell/src/library/TrashPage.vala" _tmp26_ = source; -#line 94 "/home/jens/Source/shotwell/src/library/TrashPage.vala" +#line 87 "/home/jens/Source/shotwell/src/library/TrashPage.vala" _tmp27_ = view_collection_get_view_for_source (_tmp25_, G_TYPE_CHECK_INSTANCE_CAST (_tmp26_, TYPE_DATA_SOURCE, DataSource)); -#line 94 "/home/jens/Source/shotwell/src/library/TrashPage.vala" +#line 87 "/home/jens/Source/shotwell/src/library/TrashPage.vala" _tmp28_ = _tmp27_; -#line 94 "/home/jens/Source/shotwell/src/library/TrashPage.vala" +#line 87 "/home/jens/Source/shotwell/src/library/TrashPage.vala" marker_mark (_tmp23_, G_TYPE_CHECK_INSTANCE_CAST (_tmp28_, TYPE_DATA_OBJECT, DataObject)); -#line 94 "/home/jens/Source/shotwell/src/library/TrashPage.vala" +#line 87 "/home/jens/Source/shotwell/src/library/TrashPage.vala" _g_object_unref0 (_tmp28_); -#line 94 "/home/jens/Source/shotwell/src/library/TrashPage.vala" +#line 87 "/home/jens/Source/shotwell/src/library/TrashPage.vala" _data_collection_unref0 (_tmp25_); -#line 93 "/home/jens/Source/shotwell/src/library/TrashPage.vala" +#line 86 "/home/jens/Source/shotwell/src/library/TrashPage.vala" _g_object_unref0 (source); -#line 1347 "TrashPage.c" +#line 1238 "TrashPage.c" } -#line 93 "/home/jens/Source/shotwell/src/library/TrashPage.vala" +#line 86 "/home/jens/Source/shotwell/src/library/TrashPage.vala" _g_object_unref0 (_source_it); -#line 1351 "TrashPage.c" +#line 1242 "TrashPage.c" } -#line 95 "/home/jens/Source/shotwell/src/library/TrashPage.vala" +#line 88 "/home/jens/Source/shotwell/src/library/TrashPage.vala" _tmp29_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page)); -#line 95 "/home/jens/Source/shotwell/src/library/TrashPage.vala" +#line 88 "/home/jens/Source/shotwell/src/library/TrashPage.vala" _tmp30_ = _tmp29_; -#line 95 "/home/jens/Source/shotwell/src/library/TrashPage.vala" +#line 88 "/home/jens/Source/shotwell/src/library/TrashPage.vala" _tmp31_ = marker; -#line 95 "/home/jens/Source/shotwell/src/library/TrashPage.vala" +#line 88 "/home/jens/Source/shotwell/src/library/TrashPage.vala" data_collection_remove_marked (G_TYPE_CHECK_INSTANCE_CAST (_tmp30_, TYPE_DATA_COLLECTION, DataCollection), _tmp31_); -#line 95 "/home/jens/Source/shotwell/src/library/TrashPage.vala" +#line 88 "/home/jens/Source/shotwell/src/library/TrashPage.vala" _data_collection_unref0 (_tmp30_); -#line 91 "/home/jens/Source/shotwell/src/library/TrashPage.vala" +#line 84 "/home/jens/Source/shotwell/src/library/TrashPage.vala" _g_object_unref0 (marker); -#line 1365 "TrashPage.c" +#line 1256 "TrashPage.c" } } @@ -1379,51 +1270,51 @@ static void trash_page_on_restore (TrashPage* self) { GeeCollection* _tmp9_ = NULL; TrashUntrashPhotosCommand* _tmp10_ = NULL; TrashUntrashPhotosCommand* _tmp11_ = NULL; -#line 99 "/home/jens/Source/shotwell/src/library/TrashPage.vala" +#line 92 "/home/jens/Source/shotwell/src/library/TrashPage.vala" g_return_if_fail (IS_TRASH_PAGE (self)); -#line 100 "/home/jens/Source/shotwell/src/library/TrashPage.vala" +#line 93 "/home/jens/Source/shotwell/src/library/TrashPage.vala" _tmp0_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page)); -#line 100 "/home/jens/Source/shotwell/src/library/TrashPage.vala" +#line 93 "/home/jens/Source/shotwell/src/library/TrashPage.vala" _tmp1_ = _tmp0_; -#line 100 "/home/jens/Source/shotwell/src/library/TrashPage.vala" +#line 93 "/home/jens/Source/shotwell/src/library/TrashPage.vala" _tmp2_ = view_collection_get_selected_count (_tmp1_); -#line 100 "/home/jens/Source/shotwell/src/library/TrashPage.vala" +#line 93 "/home/jens/Source/shotwell/src/library/TrashPage.vala" _tmp3_ = _tmp2_ == 0; -#line 100 "/home/jens/Source/shotwell/src/library/TrashPage.vala" +#line 93 "/home/jens/Source/shotwell/src/library/TrashPage.vala" _data_collection_unref0 (_tmp1_); -#line 100 "/home/jens/Source/shotwell/src/library/TrashPage.vala" +#line 93 "/home/jens/Source/shotwell/src/library/TrashPage.vala" if (_tmp3_) { -#line 101 "/home/jens/Source/shotwell/src/library/TrashPage.vala" +#line 94 "/home/jens/Source/shotwell/src/library/TrashPage.vala" return; -#line 1399 "TrashPage.c" +#line 1290 "TrashPage.c" } -#line 103 "/home/jens/Source/shotwell/src/library/TrashPage.vala" +#line 96 "/home/jens/Source/shotwell/src/library/TrashPage.vala" _tmp4_ = page_get_command_manager (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page)); -#line 103 "/home/jens/Source/shotwell/src/library/TrashPage.vala" +#line 96 "/home/jens/Source/shotwell/src/library/TrashPage.vala" _tmp5_ = _tmp4_; -#line 103 "/home/jens/Source/shotwell/src/library/TrashPage.vala" +#line 96 "/home/jens/Source/shotwell/src/library/TrashPage.vala" _tmp6_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page)); -#line 103 "/home/jens/Source/shotwell/src/library/TrashPage.vala" +#line 96 "/home/jens/Source/shotwell/src/library/TrashPage.vala" _tmp7_ = _tmp6_; -#line 103 "/home/jens/Source/shotwell/src/library/TrashPage.vala" +#line 96 "/home/jens/Source/shotwell/src/library/TrashPage.vala" _tmp8_ = view_collection_get_selected_sources (_tmp7_); -#line 103 "/home/jens/Source/shotwell/src/library/TrashPage.vala" +#line 96 "/home/jens/Source/shotwell/src/library/TrashPage.vala" _tmp9_ = G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, GEE_TYPE_COLLECTION, GeeCollection); -#line 103 "/home/jens/Source/shotwell/src/library/TrashPage.vala" +#line 96 "/home/jens/Source/shotwell/src/library/TrashPage.vala" _tmp10_ = trash_untrash_photos_command_new (_tmp9_, FALSE); -#line 103 "/home/jens/Source/shotwell/src/library/TrashPage.vala" +#line 96 "/home/jens/Source/shotwell/src/library/TrashPage.vala" _tmp11_ = _tmp10_; -#line 103 "/home/jens/Source/shotwell/src/library/TrashPage.vala" +#line 96 "/home/jens/Source/shotwell/src/library/TrashPage.vala" command_manager_execute (_tmp5_, G_TYPE_CHECK_INSTANCE_CAST (_tmp11_, TYPE_COMMAND, Command)); -#line 103 "/home/jens/Source/shotwell/src/library/TrashPage.vala" +#line 96 "/home/jens/Source/shotwell/src/library/TrashPage.vala" _g_object_unref0 (_tmp11_); -#line 103 "/home/jens/Source/shotwell/src/library/TrashPage.vala" +#line 96 "/home/jens/Source/shotwell/src/library/TrashPage.vala" _g_object_unref0 (_tmp9_); -#line 103 "/home/jens/Source/shotwell/src/library/TrashPage.vala" +#line 96 "/home/jens/Source/shotwell/src/library/TrashPage.vala" _data_collection_unref0 (_tmp7_); -#line 103 "/home/jens/Source/shotwell/src/library/TrashPage.vala" +#line 96 "/home/jens/Source/shotwell/src/library/TrashPage.vala" _command_manager_unref0 (_tmp5_); -#line 1427 "TrashPage.c" +#line 1318 "TrashPage.c" } @@ -1432,17 +1323,17 @@ static gchar* trash_page_real_get_view_empty_message (CheckerboardPage* base) { gchar* result = NULL; const gchar* _tmp0_ = NULL; gchar* _tmp1_ = NULL; -#line 107 "/home/jens/Source/shotwell/src/library/TrashPage.vala" +#line 100 "/home/jens/Source/shotwell/src/library/TrashPage.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_TRASH_PAGE, TrashPage); -#line 108 "/home/jens/Source/shotwell/src/library/TrashPage.vala" +#line 101 "/home/jens/Source/shotwell/src/library/TrashPage.vala" _tmp0_ = _ ("Trash is empty"); -#line 108 "/home/jens/Source/shotwell/src/library/TrashPage.vala" +#line 101 "/home/jens/Source/shotwell/src/library/TrashPage.vala" _tmp1_ = g_strdup (_tmp0_); -#line 108 "/home/jens/Source/shotwell/src/library/TrashPage.vala" +#line 101 "/home/jens/Source/shotwell/src/library/TrashPage.vala" result = _tmp1_; -#line 108 "/home/jens/Source/shotwell/src/library/TrashPage.vala" +#line 101 "/home/jens/Source/shotwell/src/library/TrashPage.vala" return result; -#line 1446 "TrashPage.c" +#line 1337 "TrashPage.c" } @@ -1457,55 +1348,55 @@ static void trash_page_on_delete (TrashPage* self) { GeeList* _tmp8_ = NULL; GeeCollection* _tmp9_ = NULL; const gchar* _tmp10_ = NULL; -#line 111 "/home/jens/Source/shotwell/src/library/TrashPage.vala" +#line 104 "/home/jens/Source/shotwell/src/library/TrashPage.vala" g_return_if_fail (IS_TRASH_PAGE (self)); -#line 113 "/home/jens/Source/shotwell/src/library/TrashPage.vala" +#line 106 "/home/jens/Source/shotwell/src/library/TrashPage.vala" _tmp1_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page)); -#line 113 "/home/jens/Source/shotwell/src/library/TrashPage.vala" +#line 106 "/home/jens/Source/shotwell/src/library/TrashPage.vala" _tmp2_ = _tmp1_; -#line 113 "/home/jens/Source/shotwell/src/library/TrashPage.vala" +#line 106 "/home/jens/Source/shotwell/src/library/TrashPage.vala" _tmp3_ = view_collection_get_selected_count (_tmp2_); -#line 113 "/home/jens/Source/shotwell/src/library/TrashPage.vala" +#line 106 "/home/jens/Source/shotwell/src/library/TrashPage.vala" _tmp4_ = _tmp3_ == 1; -#line 113 "/home/jens/Source/shotwell/src/library/TrashPage.vala" +#line 106 "/home/jens/Source/shotwell/src/library/TrashPage.vala" _data_collection_unref0 (_tmp2_); -#line 113 "/home/jens/Source/shotwell/src/library/TrashPage.vala" +#line 106 "/home/jens/Source/shotwell/src/library/TrashPage.vala" if (_tmp4_) { -#line 113 "/home/jens/Source/shotwell/src/library/TrashPage.vala" +#line 106 "/home/jens/Source/shotwell/src/library/TrashPage.vala" _tmp0_ = "Deleting a Photo"; -#line 1477 "TrashPage.c" +#line 1368 "TrashPage.c" } else { const gchar* _tmp5_ = NULL; -#line 113 "/home/jens/Source/shotwell/src/library/TrashPage.vala" +#line 106 "/home/jens/Source/shotwell/src/library/TrashPage.vala" _tmp5_ = _ ("Deleting Photos"); -#line 113 "/home/jens/Source/shotwell/src/library/TrashPage.vala" +#line 106 "/home/jens/Source/shotwell/src/library/TrashPage.vala" _tmp0_ = _tmp5_; -#line 1484 "TrashPage.c" +#line 1375 "TrashPage.c" } -#line 112 "/home/jens/Source/shotwell/src/library/TrashPage.vala" +#line 105 "/home/jens/Source/shotwell/src/library/TrashPage.vala" _tmp6_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page)); -#line 112 "/home/jens/Source/shotwell/src/library/TrashPage.vala" +#line 105 "/home/jens/Source/shotwell/src/library/TrashPage.vala" _tmp7_ = _tmp6_; -#line 112 "/home/jens/Source/shotwell/src/library/TrashPage.vala" +#line 105 "/home/jens/Source/shotwell/src/library/TrashPage.vala" _tmp8_ = view_collection_get_selected_sources (_tmp7_); -#line 112 "/home/jens/Source/shotwell/src/library/TrashPage.vala" +#line 105 "/home/jens/Source/shotwell/src/library/TrashPage.vala" _tmp9_ = G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, GEE_TYPE_COLLECTION, GeeCollection); -#line 112 "/home/jens/Source/shotwell/src/library/TrashPage.vala" +#line 105 "/home/jens/Source/shotwell/src/library/TrashPage.vala" _tmp10_ = _ ("Delete"); -#line 112 "/home/jens/Source/shotwell/src/library/TrashPage.vala" +#line 105 "/home/jens/Source/shotwell/src/library/TrashPage.vala" remove_from_app (_tmp9_, _tmp10_, _tmp0_); -#line 112 "/home/jens/Source/shotwell/src/library/TrashPage.vala" +#line 105 "/home/jens/Source/shotwell/src/library/TrashPage.vala" _g_object_unref0 (_tmp9_); -#line 112 "/home/jens/Source/shotwell/src/library/TrashPage.vala" +#line 105 "/home/jens/Source/shotwell/src/library/TrashPage.vala" _data_collection_unref0 (_tmp7_); -#line 1502 "TrashPage.c" +#line 1393 "TrashPage.c" } static gpointer _view_filter_ref0 (gpointer self) { -#line 117 "/home/jens/Source/shotwell/src/library/TrashPage.vala" +#line 110 "/home/jens/Source/shotwell/src/library/TrashPage.vala" return self ? view_filter_ref (self) : NULL; -#line 1509 "TrashPage.c" +#line 1400 "TrashPage.c" } @@ -1514,17 +1405,17 @@ static SearchViewFilter* trash_page_real_get_search_view_filter (CheckerboardPag SearchViewFilter* result = NULL; TrashPageTrashSearchViewFilter* _tmp0_ = NULL; SearchViewFilter* _tmp1_ = NULL; -#line 116 "/home/jens/Source/shotwell/src/library/TrashPage.vala" +#line 109 "/home/jens/Source/shotwell/src/library/TrashPage.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_TRASH_PAGE, TrashPage); -#line 117 "/home/jens/Source/shotwell/src/library/TrashPage.vala" +#line 110 "/home/jens/Source/shotwell/src/library/TrashPage.vala" _tmp0_ = self->priv->search_filter; -#line 117 "/home/jens/Source/shotwell/src/library/TrashPage.vala" +#line 110 "/home/jens/Source/shotwell/src/library/TrashPage.vala" _tmp1_ = _view_filter_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, TYPE_SEARCH_VIEW_FILTER, SearchViewFilter)); -#line 117 "/home/jens/Source/shotwell/src/library/TrashPage.vala" +#line 110 "/home/jens/Source/shotwell/src/library/TrashPage.vala" result = _tmp1_; -#line 117 "/home/jens/Source/shotwell/src/library/TrashPage.vala" +#line 110 "/home/jens/Source/shotwell/src/library/TrashPage.vala" return result; -#line 1528 "TrashPage.c" +#line 1419 "TrashPage.c" } @@ -1553,21 +1444,21 @@ static TrashPageTrashView* trash_page_trash_view_construct (GType object_type, M _vala_assert (_tmp4_, "source.is_trashed()"); #line 11 "/home/jens/Source/shotwell/src/library/TrashPage.vala" return self; -#line 1557 "TrashPage.c" +#line 1448 "TrashPage.c" } static TrashPageTrashView* trash_page_trash_view_new (MediaSource* source) { #line 11 "/home/jens/Source/shotwell/src/library/TrashPage.vala" return trash_page_trash_view_construct (TRASH_PAGE_TYPE_TRASH_VIEW, source); -#line 1564 "TrashPage.c" +#line 1455 "TrashPage.c" } static void trash_page_trash_view_class_init (TrashPageTrashViewClass * klass) { #line 10 "/home/jens/Source/shotwell/src/library/TrashPage.vala" trash_page_trash_view_parent_class = g_type_class_peek_parent (klass); -#line 1571 "TrashPage.c" +#line 1462 "TrashPage.c" } @@ -1596,7 +1487,7 @@ static guint trash_page_trash_search_view_filter_real_get_criteria (SearchViewFi result = (guint) ((((SEARCH_FILTER_CRITERIA_TEXT | SEARCH_FILTER_CRITERIA_FLAG) | SEARCH_FILTER_CRITERIA_MEDIA) | SEARCH_FILTER_CRITERIA_RATING) | SEARCH_FILTER_CRITERIA_SAVEDSEARCH); #line 20 "/home/jens/Source/shotwell/src/library/TrashPage.vala" return result; -#line 1600 "TrashPage.c" +#line 1491 "TrashPage.c" } @@ -1606,14 +1497,14 @@ static TrashPageTrashSearchViewFilter* trash_page_trash_search_view_filter_const self = (TrashPageTrashSearchViewFilter*) default_search_view_filter_construct (object_type); #line 18 "/home/jens/Source/shotwell/src/library/TrashPage.vala" return self; -#line 1610 "TrashPage.c" +#line 1501 "TrashPage.c" } static TrashPageTrashSearchViewFilter* trash_page_trash_search_view_filter_new (void) { #line 18 "/home/jens/Source/shotwell/src/library/TrashPage.vala" return trash_page_trash_search_view_filter_construct (TRASH_PAGE_TYPE_TRASH_SEARCH_VIEW_FILTER); -#line 1617 "TrashPage.c" +#line 1508 "TrashPage.c" } @@ -1622,7 +1513,7 @@ static void trash_page_trash_search_view_filter_class_init (TrashPageTrashSearch trash_page_trash_search_view_filter_parent_class = g_type_class_peek_parent (klass); #line 18 "/home/jens/Source/shotwell/src/library/TrashPage.vala" ((SearchViewFilterClass *) klass)->get_criteria = trash_page_trash_search_view_filter_real_get_criteria; -#line 1626 "TrashPage.c" +#line 1517 "TrashPage.c" } @@ -1650,7 +1541,7 @@ static void trash_page_class_init (TrashPageClass * klass) { #line 7 "/home/jens/Source/shotwell/src/library/TrashPage.vala" ((PageClass *) klass)->init_collect_ui_filenames = trash_page_real_init_collect_ui_filenames; #line 7 "/home/jens/Source/shotwell/src/library/TrashPage.vala" - ((PageClass *) klass)->init_collect_action_entries = trash_page_real_init_collect_action_entries; + ((PageClass *) klass)->add_actions = trash_page_real_add_actions; #line 7 "/home/jens/Source/shotwell/src/library/TrashPage.vala" ((CheckerboardPageClass *) klass)->get_view_tracker = trash_page_real_get_view_tracker; #line 7 "/home/jens/Source/shotwell/src/library/TrashPage.vala" @@ -1661,7 +1552,7 @@ static void trash_page_class_init (TrashPageClass * klass) { ((CheckerboardPageClass *) klass)->get_search_view_filter = trash_page_real_get_search_view_filter; #line 7 "/home/jens/Source/shotwell/src/library/TrashPage.vala" G_OBJECT_CLASS (klass)->finalize = trash_page_finalize; -#line 1665 "TrashPage.c" +#line 1556 "TrashPage.c" } @@ -1673,7 +1564,7 @@ static void trash_page_instance_init (TrashPage * self) { _tmp0_ = trash_page_trash_search_view_filter_new (); #line 25 "/home/jens/Source/shotwell/src/library/TrashPage.vala" self->priv->search_filter = _tmp0_; -#line 1677 "TrashPage.c" +#line 1568 "TrashPage.c" } @@ -1687,7 +1578,7 @@ static void trash_page_finalize (GObject* obj) { _core_tracker_unref0 (self->priv->tracker); #line 7 "/home/jens/Source/shotwell/src/library/TrashPage.vala" G_OBJECT_CLASS (trash_page_parent_class)->finalize (obj); -#line 1691 "TrashPage.c" +#line 1582 "TrashPage.c" } diff --git a/src/library/TrashPage.vala b/src/library/TrashPage.vala index 0a38ac0..943c5e1 100644 --- a/src/library/TrashPage.vala +++ b/src/library/TrashPage.vala @@ -28,9 +28,9 @@ public class TrashPage : CheckerboardPage { public TrashPage() { base (NAME); - init_item_context_menu("/TrashContextMenu"); - init_page_context_menu("/TrashPageMenu"); - init_toolbar("/TrashToolbar"); + init_item_context_menu("TrashContextMenu"); + init_page_context_menu("TrashPageMenu"); + init_toolbar("TrashToolbar"); tracker = new MediaViewTracker(get_view()); @@ -46,25 +46,18 @@ public class TrashPage : CheckerboardPage { ui_filenames.add("trash.ui"); } - - protected override Gtk.ActionEntry[] init_collect_action_entries() { - Gtk.ActionEntry[] actions = base.init_collect_action_entries(); - - Gtk.ActionEntry delete_action = { "Delete", Resources.DELETE_LABEL, TRANSLATABLE, "Delete", - TRANSLATABLE, on_delete }; - delete_action.label = Resources.DELETE_PHOTOS_MENU; - delete_action.tooltip = Resources.DELETE_FROM_TRASH_TOOLTIP; - actions += delete_action; - - Gtk.ActionEntry restore = { "Restore", Resources.UNDELETE_LABEL, TRANSLATABLE, null, TRANSLATABLE, - on_restore }; - restore.label = Resources.RESTORE_PHOTOS_MENU; - restore.tooltip = Resources.RESTORE_PHOTOS_TOOLTIP; - actions += restore; - - return actions; + + private const GLib.ActionEntry[] entries = { + { "Delete", on_delete }, + { "Restore", on_restore } + }; + + protected override void add_actions () { + base.add_actions (); + + AppWindow.get_instance ().add_action_entries (entries, this); } - + public override Core.ViewTracker? get_view_tracker() { return tracker; } |