From ab841afa5cb39058d9ab2cebb67cfe6369443f6e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Frings-F=C3=BCrst?= Date: Mon, 25 Jun 2018 20:55:59 +0200 Subject: New upstream version 0.28.3 --- src/library/ImportQueueSidebarEntry.c | 165 ++++++++++++++++++++++------------ 1 file changed, 108 insertions(+), 57 deletions(-) (limited to 'src/library/ImportQueueSidebarEntry.c') diff --git a/src/library/ImportQueueSidebarEntry.c b/src/library/ImportQueueSidebarEntry.c index bd9e970..b878989 100644 --- a/src/library/ImportQueueSidebarEntry.c +++ b/src/library/ImportQueueSidebarEntry.c @@ -1,4 +1,4 @@ -/* ImportQueueSidebarEntry.c generated by valac 0.36.6, the Vala compiler +/* ImportQueueSidebarEntry.c generated by valac 0.40.4, the Vala compiler * generated from ImportQueueSidebarEntry.vala, do not modify */ /* Copyright 2016 Software Freedom Conservancy Inc. @@ -7,6 +7,7 @@ * (version 2.1 or later). See the COPYING file in this distribution. */ + #include #include #include @@ -100,6 +101,11 @@ typedef struct _LibraryHideablePageEntryPrivate LibraryHideablePageEntryPrivate; typedef struct _LibraryImportQueueSidebarEntry LibraryImportQueueSidebarEntry; typedef struct _LibraryImportQueueSidebarEntryClass LibraryImportQueueSidebarEntryClass; typedef struct _LibraryImportQueueSidebarEntryPrivate LibraryImportQueueSidebarEntryPrivate; +enum { + LIBRARY_IMPORT_QUEUE_SIDEBAR_ENTRY_0_PROPERTY, + LIBRARY_IMPORT_QUEUE_SIDEBAR_ENTRY_NUM_PROPERTIES +}; +static GParamSpec* library_import_queue_sidebar_entry_properties[LIBRARY_IMPORT_QUEUE_SIDEBAR_ENTRY_NUM_PROPERTIES]; #define TYPE_SINGLE_PHOTO_PAGE (single_photo_page_get_type ()) #define SINGLE_PHOTO_PAGE(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), TYPE_SINGLE_PHOTO_PAGE, SinglePhotoPage)) @@ -201,17 +207,19 @@ GType sidebar_contextable_get_type (void) G_GNUC_CONST; GType sidebar_simple_page_entry_get_type (void) G_GNUC_CONST; GType library_hideable_page_entry_get_type (void) G_GNUC_CONST; GType library_import_queue_sidebar_entry_get_type (void) G_GNUC_CONST; -enum { - LIBRARY_IMPORT_QUEUE_SIDEBAR_ENTRY_DUMMY_PROPERTY -}; LibraryImportQueueSidebarEntry* library_import_queue_sidebar_entry_new (void); LibraryImportQueueSidebarEntry* library_import_queue_sidebar_entry_construct (GType object_type); LibraryHideablePageEntry* library_hideable_page_entry_construct (GType object_type); static void library_import_queue_sidebar_entry_on_page_created (LibraryImportQueueSidebarEntry* self); -static void _library_import_queue_sidebar_entry_on_page_created_sidebar_page_representative_page_created (SidebarPageRepresentative* _sender, Page* page, gpointer self); +static void _library_import_queue_sidebar_entry_on_page_created_sidebar_page_representative_page_created (SidebarPageRepresentative* _sender, + Page* page, + gpointer self); static void library_import_queue_sidebar_entry_on_destroying_page (LibraryImportQueueSidebarEntry* self); -static void _library_import_queue_sidebar_entry_on_destroying_page_sidebar_page_representative_destroying_page (SidebarPageRepresentative* _sender, Page* page, gpointer self); -void library_hideable_page_entry_set_visible (LibraryHideablePageEntry* self, gboolean value); +static void _library_import_queue_sidebar_entry_on_destroying_page_sidebar_page_representative_destroying_page (SidebarPageRepresentative* _sender, + Page* page, + gpointer self); +void library_hideable_page_entry_set_visible (LibraryHideablePageEntry* self, + gboolean value); static gchar* library_import_queue_sidebar_entry_real_get_sidebar_name (SidebarSimplePageEntry* base); #define IMPORT_QUEUE_PAGE_NAME _ ("Importing…") static gchar* library_import_queue_sidebar_entry_real_get_sidebar_icon (SidebarSimplePageEntry* base); @@ -225,28 +233,46 @@ static ImportQueuePage* library_import_queue_sidebar_entry_get_queue_page (Libra Page* sidebar_page_representative_get_page (SidebarPageRepresentative* self); static void library_import_queue_sidebar_entry_on_batch_added_or_removed (LibraryImportQueueSidebarEntry* self); GType batch_import_get_type (void) G_GNUC_CONST; -static void _library_import_queue_sidebar_entry_on_batch_added_or_removed_import_queue_page_batch_added (ImportQueuePage* _sender, BatchImport* batch_import, gpointer self); -static void _library_import_queue_sidebar_entry_on_batch_added_or_removed_import_queue_page_batch_removed (ImportQueuePage* _sender, BatchImport* batch_import, gpointer self); +static void _library_import_queue_sidebar_entry_on_batch_added_or_removed_import_queue_page_batch_added (ImportQueuePage* _sender, + BatchImport* batch_import, + gpointer self); +static void _library_import_queue_sidebar_entry_on_batch_added_or_removed_import_queue_page_batch_removed (ImportQueuePage* _sender, + BatchImport* batch_import, + gpointer self); gint import_queue_page_get_batch_count (ImportQueuePage* self); -void library_import_queue_sidebar_entry_enqueue_and_schedule (LibraryImportQueueSidebarEntry* self, BatchImport* batch_import, gboolean allow_user_cancel); -void import_queue_page_enqueue_and_schedule (ImportQueuePage* self, BatchImport* batch_import, gboolean allow_user_cancel); - - -static void _library_import_queue_sidebar_entry_on_page_created_sidebar_page_representative_page_created (SidebarPageRepresentative* _sender, Page* page, gpointer self) { +void library_import_queue_sidebar_entry_enqueue_and_schedule (LibraryImportQueueSidebarEntry* self, + BatchImport* batch_import, + gboolean allow_user_cancel); +void import_queue_page_enqueue_and_schedule (ImportQueuePage* self, + BatchImport* batch_import, + gboolean allow_user_cancel); + + +static void +_library_import_queue_sidebar_entry_on_page_created_sidebar_page_representative_page_created (SidebarPageRepresentative* _sender, + Page* page, + gpointer self) +{ #line 10 "/home/jens/Source/shotwell/src/library/ImportQueueSidebarEntry.vala" library_import_queue_sidebar_entry_on_page_created ((LibraryImportQueueSidebarEntry*) self); -#line 239 "ImportQueueSidebarEntry.c" +#line 259 "ImportQueueSidebarEntry.c" } -static void _library_import_queue_sidebar_entry_on_destroying_page_sidebar_page_representative_destroying_page (SidebarPageRepresentative* _sender, Page* page, gpointer self) { +static void +_library_import_queue_sidebar_entry_on_destroying_page_sidebar_page_representative_destroying_page (SidebarPageRepresentative* _sender, + Page* page, + gpointer self) +{ #line 11 "/home/jens/Source/shotwell/src/library/ImportQueueSidebarEntry.vala" library_import_queue_sidebar_entry_on_destroying_page ((LibraryImportQueueSidebarEntry*) self); -#line 246 "ImportQueueSidebarEntry.c" +#line 270 "ImportQueueSidebarEntry.c" } -LibraryImportQueueSidebarEntry* library_import_queue_sidebar_entry_construct (GType object_type) { +LibraryImportQueueSidebarEntry* +library_import_queue_sidebar_entry_construct (GType object_type) +{ LibraryImportQueueSidebarEntry * self = NULL; #line 8 "/home/jens/Source/shotwell/src/library/ImportQueueSidebarEntry.vala" self = (LibraryImportQueueSidebarEntry*) library_hideable_page_entry_construct (object_type); @@ -258,18 +284,22 @@ LibraryImportQueueSidebarEntry* library_import_queue_sidebar_entry_construct (GT library_hideable_page_entry_set_visible (G_TYPE_CHECK_INSTANCE_CAST (self, LIBRARY_TYPE_HIDEABLE_PAGE_ENTRY, LibraryHideablePageEntry), FALSE); #line 8 "/home/jens/Source/shotwell/src/library/ImportQueueSidebarEntry.vala" return self; -#line 262 "ImportQueueSidebarEntry.c" +#line 288 "ImportQueueSidebarEntry.c" } -LibraryImportQueueSidebarEntry* library_import_queue_sidebar_entry_new (void) { +LibraryImportQueueSidebarEntry* +library_import_queue_sidebar_entry_new (void) +{ #line 8 "/home/jens/Source/shotwell/src/library/ImportQueueSidebarEntry.vala" return library_import_queue_sidebar_entry_construct (LIBRARY_TYPE_IMPORT_QUEUE_SIDEBAR_ENTRY); -#line 269 "ImportQueueSidebarEntry.c" +#line 297 "ImportQueueSidebarEntry.c" } -static gchar* library_import_queue_sidebar_entry_real_get_sidebar_name (SidebarSimplePageEntry* base) { +static gchar* +library_import_queue_sidebar_entry_real_get_sidebar_name (SidebarSimplePageEntry* base) +{ LibraryImportQueueSidebarEntry * self; gchar* result = NULL; gchar* _tmp0_; @@ -281,11 +311,13 @@ static gchar* library_import_queue_sidebar_entry_real_get_sidebar_name (SidebarS result = _tmp0_; #line 20 "/home/jens/Source/shotwell/src/library/ImportQueueSidebarEntry.vala" return result; -#line 285 "ImportQueueSidebarEntry.c" +#line 315 "ImportQueueSidebarEntry.c" } -static gchar* library_import_queue_sidebar_entry_real_get_sidebar_icon (SidebarSimplePageEntry* base) { +static gchar* +library_import_queue_sidebar_entry_real_get_sidebar_icon (SidebarSimplePageEntry* base) +{ LibraryImportQueueSidebarEntry * self; gchar* result = NULL; gchar* _tmp0_; @@ -297,11 +329,13 @@ static gchar* library_import_queue_sidebar_entry_real_get_sidebar_icon (SidebarS result = _tmp0_; #line 24 "/home/jens/Source/shotwell/src/library/ImportQueueSidebarEntry.vala" return result; -#line 301 "ImportQueueSidebarEntry.c" +#line 333 "ImportQueueSidebarEntry.c" } -static Page* library_import_queue_sidebar_entry_real_create_page (SidebarSimplePageEntry* base) { +static Page* +library_import_queue_sidebar_entry_real_create_page (SidebarSimplePageEntry* base) +{ LibraryImportQueueSidebarEntry * self; Page* result = NULL; ImportQueuePage* _tmp0_; @@ -315,11 +349,13 @@ static Page* library_import_queue_sidebar_entry_real_create_page (SidebarSimpleP result = G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, TYPE_PAGE, Page); #line 28 "/home/jens/Source/shotwell/src/library/ImportQueueSidebarEntry.vala" return result; -#line 319 "ImportQueueSidebarEntry.c" +#line 353 "ImportQueueSidebarEntry.c" } -static ImportQueuePage* library_import_queue_sidebar_entry_get_queue_page (LibraryImportQueueSidebarEntry* self) { +static ImportQueuePage* +library_import_queue_sidebar_entry_get_queue_page (LibraryImportQueueSidebarEntry* self) +{ ImportQueuePage* result = NULL; Page* _tmp0_; ImportQueuePage* _tmp1_; @@ -333,31 +369,41 @@ static ImportQueuePage* library_import_queue_sidebar_entry_get_queue_page (Libra if (_tmp1_ == NULL) { #line 32 "/home/jens/Source/shotwell/src/library/ImportQueueSidebarEntry.vala" _g_object_unref0 (_tmp0_); -#line 337 "ImportQueueSidebarEntry.c" +#line 373 "ImportQueueSidebarEntry.c" } #line 32 "/home/jens/Source/shotwell/src/library/ImportQueueSidebarEntry.vala" result = _tmp1_; #line 32 "/home/jens/Source/shotwell/src/library/ImportQueueSidebarEntry.vala" return result; -#line 343 "ImportQueueSidebarEntry.c" +#line 379 "ImportQueueSidebarEntry.c" } -static void _library_import_queue_sidebar_entry_on_batch_added_or_removed_import_queue_page_batch_added (ImportQueuePage* _sender, BatchImport* batch_import, gpointer self) { +static void +_library_import_queue_sidebar_entry_on_batch_added_or_removed_import_queue_page_batch_added (ImportQueuePage* _sender, + BatchImport* batch_import, + gpointer self) +{ #line 36 "/home/jens/Source/shotwell/src/library/ImportQueueSidebarEntry.vala" library_import_queue_sidebar_entry_on_batch_added_or_removed ((LibraryImportQueueSidebarEntry*) self); -#line 350 "ImportQueueSidebarEntry.c" +#line 390 "ImportQueueSidebarEntry.c" } -static void _library_import_queue_sidebar_entry_on_batch_added_or_removed_import_queue_page_batch_removed (ImportQueuePage* _sender, BatchImport* batch_import, gpointer self) { +static void +_library_import_queue_sidebar_entry_on_batch_added_or_removed_import_queue_page_batch_removed (ImportQueuePage* _sender, + BatchImport* batch_import, + gpointer self) +{ #line 37 "/home/jens/Source/shotwell/src/library/ImportQueueSidebarEntry.vala" library_import_queue_sidebar_entry_on_batch_added_or_removed ((LibraryImportQueueSidebarEntry*) self); -#line 357 "ImportQueueSidebarEntry.c" +#line 401 "ImportQueueSidebarEntry.c" } -static void library_import_queue_sidebar_entry_on_page_created (LibraryImportQueueSidebarEntry* self) { +static void +library_import_queue_sidebar_entry_on_page_created (LibraryImportQueueSidebarEntry* self) +{ ImportQueuePage* _tmp0_; ImportQueuePage* _tmp1_; ImportQueuePage* _tmp2_; @@ -380,11 +426,13 @@ static void library_import_queue_sidebar_entry_on_page_created (LibraryImportQue g_signal_connect_object (_tmp3_, "batch-removed", (GCallback) _library_import_queue_sidebar_entry_on_batch_added_or_removed_import_queue_page_batch_removed, self, 0); #line 37 "/home/jens/Source/shotwell/src/library/ImportQueueSidebarEntry.vala" _g_object_unref0 (_tmp3_); -#line 384 "ImportQueueSidebarEntry.c" +#line 430 "ImportQueueSidebarEntry.c" } -static void library_import_queue_sidebar_entry_on_destroying_page (LibraryImportQueueSidebarEntry* self) { +static void +library_import_queue_sidebar_entry_on_destroying_page (LibraryImportQueueSidebarEntry* self) +{ ImportQueuePage* _tmp0_; ImportQueuePage* _tmp1_; guint _tmp2_; @@ -413,14 +461,15 @@ static void library_import_queue_sidebar_entry_on_destroying_page (LibraryImport g_signal_handlers_disconnect_matched (_tmp4_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp5_, 0, NULL, (GCallback) _library_import_queue_sidebar_entry_on_batch_added_or_removed_import_queue_page_batch_removed, self); #line 42 "/home/jens/Source/shotwell/src/library/ImportQueueSidebarEntry.vala" _g_object_unref0 (_tmp4_); -#line 417 "ImportQueueSidebarEntry.c" +#line 465 "ImportQueueSidebarEntry.c" } -static void library_import_queue_sidebar_entry_on_batch_added_or_removed (LibraryImportQueueSidebarEntry* self) { +static void +library_import_queue_sidebar_entry_on_batch_added_or_removed (LibraryImportQueueSidebarEntry* self) +{ ImportQueuePage* _tmp0_; ImportQueuePage* _tmp1_; - gint _tmp2_; #line 45 "/home/jens/Source/shotwell/src/library/ImportQueueSidebarEntry.vala" g_return_if_fail (LIBRARY_IS_IMPORT_QUEUE_SIDEBAR_ENTRY (self)); #line 46 "/home/jens/Source/shotwell/src/library/ImportQueueSidebarEntry.vala" @@ -428,20 +477,20 @@ static void library_import_queue_sidebar_entry_on_batch_added_or_removed (Librar #line 46 "/home/jens/Source/shotwell/src/library/ImportQueueSidebarEntry.vala" _tmp1_ = _tmp0_; #line 46 "/home/jens/Source/shotwell/src/library/ImportQueueSidebarEntry.vala" - _tmp2_ = import_queue_page_get_batch_count (_tmp1_); -#line 46 "/home/jens/Source/shotwell/src/library/ImportQueueSidebarEntry.vala" - library_hideable_page_entry_set_visible (G_TYPE_CHECK_INSTANCE_CAST (self, LIBRARY_TYPE_HIDEABLE_PAGE_ENTRY, LibraryHideablePageEntry), _tmp2_ > 0); + library_hideable_page_entry_set_visible (G_TYPE_CHECK_INSTANCE_CAST (self, LIBRARY_TYPE_HIDEABLE_PAGE_ENTRY, LibraryHideablePageEntry), import_queue_page_get_batch_count (_tmp1_) > 0); #line 46 "/home/jens/Source/shotwell/src/library/ImportQueueSidebarEntry.vala" _g_object_unref0 (_tmp1_); -#line 437 "ImportQueueSidebarEntry.c" +#line 484 "ImportQueueSidebarEntry.c" } -void library_import_queue_sidebar_entry_enqueue_and_schedule (LibraryImportQueueSidebarEntry* self, BatchImport* batch_import, gboolean allow_user_cancel) { +void +library_import_queue_sidebar_entry_enqueue_and_schedule (LibraryImportQueueSidebarEntry* self, + BatchImport* batch_import, + gboolean allow_user_cancel) +{ ImportQueuePage* _tmp0_; ImportQueuePage* _tmp1_; - BatchImport* _tmp2_; - gboolean _tmp3_; #line 49 "/home/jens/Source/shotwell/src/library/ImportQueueSidebarEntry.vala" g_return_if_fail (LIBRARY_IS_IMPORT_QUEUE_SIDEBAR_ENTRY (self)); #line 49 "/home/jens/Source/shotwell/src/library/ImportQueueSidebarEntry.vala" @@ -453,18 +502,16 @@ void library_import_queue_sidebar_entry_enqueue_and_schedule (LibraryImportQueue #line 53 "/home/jens/Source/shotwell/src/library/ImportQueueSidebarEntry.vala" _tmp1_ = _tmp0_; #line 53 "/home/jens/Source/shotwell/src/library/ImportQueueSidebarEntry.vala" - _tmp2_ = batch_import; -#line 53 "/home/jens/Source/shotwell/src/library/ImportQueueSidebarEntry.vala" - _tmp3_ = allow_user_cancel; -#line 53 "/home/jens/Source/shotwell/src/library/ImportQueueSidebarEntry.vala" - import_queue_page_enqueue_and_schedule (_tmp1_, _tmp2_, _tmp3_); + import_queue_page_enqueue_and_schedule (_tmp1_, batch_import, allow_user_cancel); #line 53 "/home/jens/Source/shotwell/src/library/ImportQueueSidebarEntry.vala" _g_object_unref0 (_tmp1_); -#line 464 "ImportQueueSidebarEntry.c" +#line 509 "ImportQueueSidebarEntry.c" } -static void library_import_queue_sidebar_entry_class_init (LibraryImportQueueSidebarEntryClass * klass) { +static void +library_import_queue_sidebar_entry_class_init (LibraryImportQueueSidebarEntryClass * klass) +{ #line 7 "/home/jens/Source/shotwell/src/library/ImportQueueSidebarEntry.vala" library_import_queue_sidebar_entry_parent_class = g_type_class_peek_parent (klass); #line 7 "/home/jens/Source/shotwell/src/library/ImportQueueSidebarEntry.vala" @@ -473,15 +520,19 @@ static void library_import_queue_sidebar_entry_class_init (LibraryImportQueueSid ((SidebarSimplePageEntryClass *) klass)->get_sidebar_icon = (gchar* (*) (SidebarSimplePageEntry *)) library_import_queue_sidebar_entry_real_get_sidebar_icon; #line 7 "/home/jens/Source/shotwell/src/library/ImportQueueSidebarEntry.vala" ((SidebarSimplePageEntryClass *) klass)->create_page = (Page* (*) (SidebarSimplePageEntry *)) library_import_queue_sidebar_entry_real_create_page; -#line 477 "ImportQueueSidebarEntry.c" +#line 524 "ImportQueueSidebarEntry.c" } -static void library_import_queue_sidebar_entry_instance_init (LibraryImportQueueSidebarEntry * self) { +static void +library_import_queue_sidebar_entry_instance_init (LibraryImportQueueSidebarEntry * self) +{ } -GType library_import_queue_sidebar_entry_get_type (void) { +GType +library_import_queue_sidebar_entry_get_type (void) +{ static volatile gsize library_import_queue_sidebar_entry_type_id__volatile = 0; if (g_once_init_enter (&library_import_queue_sidebar_entry_type_id__volatile)) { static const GTypeInfo g_define_type_info = { sizeof (LibraryImportQueueSidebarEntryClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) library_import_queue_sidebar_entry_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (LibraryImportQueueSidebarEntry), 0, (GInstanceInitFunc) library_import_queue_sidebar_entry_instance_init, NULL }; -- cgit v1.2.3