summaryrefslogtreecommitdiff
path: root/src/library/ImportQueueSidebarEntry.c
diff options
context:
space:
mode:
authorJörg Frings-Fürst <debian@jff-webhosting.net>2017-11-12 16:48:02 +0100
committerJörg Frings-Fürst <debian@jff-webhosting.net>2017-11-12 16:48:02 +0100
commitabdaad68fb94e2d61448a6dfc14847df8a2c32b9 (patch)
tree26855c5dd3bfffdbf319d5ba4a38223a28de3e7c /src/library/ImportQueueSidebarEntry.c
parent0f67b3cc674377559e66c5a6729fd499049a992f (diff)
parentdd7f98a232efe86f6e6055119c9414a0f9d9e67b (diff)
Merge branch 'feature/upstream' into develop
Diffstat (limited to 'src/library/ImportQueueSidebarEntry.c')
-rw-r--r--src/library/ImportQueueSidebarEntry.c52
1 files changed, 26 insertions, 26 deletions
diff --git a/src/library/ImportQueueSidebarEntry.c b/src/library/ImportQueueSidebarEntry.c
index cd17564..bd9e970 100644
--- a/src/library/ImportQueueSidebarEntry.c
+++ b/src/library/ImportQueueSidebarEntry.c
@@ -1,4 +1,4 @@
-/* ImportQueueSidebarEntry.c generated by valac 0.34.7, the Vala compiler
+/* ImportQueueSidebarEntry.c generated by valac 0.36.6, the Vala compiler
* generated from ImportQueueSidebarEntry.vala, do not modify */
/* Copyright 2016 Software Freedom Conservancy Inc.
@@ -272,7 +272,7 @@ LibraryImportQueueSidebarEntry* library_import_queue_sidebar_entry_new (void) {
static gchar* library_import_queue_sidebar_entry_real_get_sidebar_name (SidebarSimplePageEntry* base) {
LibraryImportQueueSidebarEntry * self;
gchar* result = NULL;
- gchar* _tmp0_ = NULL;
+ gchar* _tmp0_;
#line 19 "/home/jens/Source/shotwell/src/library/ImportQueueSidebarEntry.vala"
self = G_TYPE_CHECK_INSTANCE_CAST (base, LIBRARY_TYPE_IMPORT_QUEUE_SIDEBAR_ENTRY, LibraryImportQueueSidebarEntry);
#line 20 "/home/jens/Source/shotwell/src/library/ImportQueueSidebarEntry.vala"
@@ -288,7 +288,7 @@ static gchar* library_import_queue_sidebar_entry_real_get_sidebar_name (SidebarS
static gchar* library_import_queue_sidebar_entry_real_get_sidebar_icon (SidebarSimplePageEntry* base) {
LibraryImportQueueSidebarEntry * self;
gchar* result = NULL;
- gchar* _tmp0_ = NULL;
+ gchar* _tmp0_;
#line 23 "/home/jens/Source/shotwell/src/library/ImportQueueSidebarEntry.vala"
self = G_TYPE_CHECK_INSTANCE_CAST (base, LIBRARY_TYPE_IMPORT_QUEUE_SIDEBAR_ENTRY, LibraryImportQueueSidebarEntry);
#line 24 "/home/jens/Source/shotwell/src/library/ImportQueueSidebarEntry.vala"
@@ -304,7 +304,7 @@ static gchar* library_import_queue_sidebar_entry_real_get_sidebar_icon (SidebarS
static Page* library_import_queue_sidebar_entry_real_create_page (SidebarSimplePageEntry* base) {
LibraryImportQueueSidebarEntry * self;
Page* result = NULL;
- ImportQueuePage* _tmp0_ = NULL;
+ ImportQueuePage* _tmp0_;
#line 27 "/home/jens/Source/shotwell/src/library/ImportQueueSidebarEntry.vala"
self = G_TYPE_CHECK_INSTANCE_CAST (base, LIBRARY_TYPE_IMPORT_QUEUE_SIDEBAR_ENTRY, LibraryImportQueueSidebarEntry);
#line 28 "/home/jens/Source/shotwell/src/library/ImportQueueSidebarEntry.vala"
@@ -321,8 +321,8 @@ static Page* library_import_queue_sidebar_entry_real_create_page (SidebarSimpleP
static ImportQueuePage* library_import_queue_sidebar_entry_get_queue_page (LibraryImportQueueSidebarEntry* self) {
ImportQueuePage* result = NULL;
- Page* _tmp0_ = NULL;
- ImportQueuePage* _tmp1_ = NULL;
+ Page* _tmp0_;
+ ImportQueuePage* _tmp1_;
#line 31 "/home/jens/Source/shotwell/src/library/ImportQueueSidebarEntry.vala"
g_return_val_if_fail (LIBRARY_IS_IMPORT_QUEUE_SIDEBAR_ENTRY (self), NULL);
#line 32 "/home/jens/Source/shotwell/src/library/ImportQueueSidebarEntry.vala"
@@ -358,10 +358,10 @@ static void _library_import_queue_sidebar_entry_on_batch_added_or_removed_import
static void library_import_queue_sidebar_entry_on_page_created (LibraryImportQueueSidebarEntry* self) {
- ImportQueuePage* _tmp0_ = NULL;
- ImportQueuePage* _tmp1_ = NULL;
- ImportQueuePage* _tmp2_ = NULL;
- ImportQueuePage* _tmp3_ = NULL;
+ ImportQueuePage* _tmp0_;
+ ImportQueuePage* _tmp1_;
+ ImportQueuePage* _tmp2_;
+ ImportQueuePage* _tmp3_;
#line 35 "/home/jens/Source/shotwell/src/library/ImportQueueSidebarEntry.vala"
g_return_if_fail (LIBRARY_IS_IMPORT_QUEUE_SIDEBAR_ENTRY (self));
#line 36 "/home/jens/Source/shotwell/src/library/ImportQueueSidebarEntry.vala"
@@ -385,12 +385,12 @@ static void library_import_queue_sidebar_entry_on_page_created (LibraryImportQue
static void library_import_queue_sidebar_entry_on_destroying_page (LibraryImportQueueSidebarEntry* self) {
- ImportQueuePage* _tmp0_ = NULL;
- ImportQueuePage* _tmp1_ = NULL;
- guint _tmp2_ = 0U;
- ImportQueuePage* _tmp3_ = NULL;
- ImportQueuePage* _tmp4_ = NULL;
- guint _tmp5_ = 0U;
+ ImportQueuePage* _tmp0_;
+ ImportQueuePage* _tmp1_;
+ guint _tmp2_;
+ ImportQueuePage* _tmp3_;
+ ImportQueuePage* _tmp4_;
+ guint _tmp5_;
#line 40 "/home/jens/Source/shotwell/src/library/ImportQueueSidebarEntry.vala"
g_return_if_fail (LIBRARY_IS_IMPORT_QUEUE_SIDEBAR_ENTRY (self));
#line 41 "/home/jens/Source/shotwell/src/library/ImportQueueSidebarEntry.vala"
@@ -418,9 +418,9 @@ static void library_import_queue_sidebar_entry_on_destroying_page (LibraryImport
static void library_import_queue_sidebar_entry_on_batch_added_or_removed (LibraryImportQueueSidebarEntry* self) {
- ImportQueuePage* _tmp0_ = NULL;
- ImportQueuePage* _tmp1_ = NULL;
- gint _tmp2_ = 0;
+ 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"
@@ -438,10 +438,10 @@ static void library_import_queue_sidebar_entry_on_batch_added_or_removed (Librar
void library_import_queue_sidebar_entry_enqueue_and_schedule (LibraryImportQueueSidebarEntry* self, BatchImport* batch_import, gboolean allow_user_cancel) {
- ImportQueuePage* _tmp0_ = NULL;
- ImportQueuePage* _tmp1_ = NULL;
- BatchImport* _tmp2_ = NULL;
- gboolean _tmp3_ = FALSE;
+ 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"
@@ -468,11 +468,11 @@ static void library_import_queue_sidebar_entry_class_init (LibraryImportQueueSid
#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"
- ((SidebarSimplePageEntryClass *) klass)->get_sidebar_name = (gchar* (*)(SidebarSimplePageEntry*)) library_import_queue_sidebar_entry_real_get_sidebar_name;
+ ((SidebarSimplePageEntryClass *) klass)->get_sidebar_name = (gchar* (*) (SidebarSimplePageEntry *)) library_import_queue_sidebar_entry_real_get_sidebar_name;
#line 7 "/home/jens/Source/shotwell/src/library/ImportQueueSidebarEntry.vala"
- ((SidebarSimplePageEntryClass *) klass)->get_sidebar_icon = (gchar* (*)(SidebarSimplePageEntry*)) library_import_queue_sidebar_entry_real_get_sidebar_icon;
+ ((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;
+ ((SidebarSimplePageEntryClass *) klass)->create_page = (Page* (*) (SidebarSimplePageEntry *)) library_import_queue_sidebar_entry_real_create_page;
#line 477 "ImportQueueSidebarEntry.c"
}