summaryrefslogtreecommitdiff
path: root/src/library/TrashSidebarEntry.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/TrashSidebarEntry.c
parent0f67b3cc674377559e66c5a6729fd499049a992f (diff)
parentdd7f98a232efe86f6e6055119c9414a0f9d9e67b (diff)
Merge branch 'feature/upstream' into develop
Diffstat (limited to 'src/library/TrashSidebarEntry.c')
-rw-r--r--src/library/TrashSidebarEntry.c112
1 files changed, 56 insertions, 56 deletions
diff --git a/src/library/TrashSidebarEntry.c b/src/library/TrashSidebarEntry.c
index 8e620d7..9b8a030 100644
--- a/src/library/TrashSidebarEntry.c
+++ b/src/library/TrashSidebarEntry.c
@@ -1,4 +1,4 @@
-/* TrashSidebarEntry.c generated by valac 0.34.7, the Vala compiler
+/* TrashSidebarEntry.c generated by valac 0.36.6, the Vala compiler
* generated from TrashSidebarEntry.vala, do not modify */
/* Copyright 2016 Software Freedom Conservancy Inc.
@@ -310,7 +310,7 @@ struct _LibraryTrashSidebarEntryClass {
static gpointer library_trash_sidebar_entry_parent_class = NULL;
-static SidebarInternalDropTargetEntryIface* library_trash_sidebar_entry_sidebar_internal_drop_target_entry_parent_iface = NULL;
+static SidebarInternalDropTargetEntryIface * library_trash_sidebar_entry_sidebar_internal_drop_target_entry_parent_iface = NULL;
GType sidebar_tree_get_type (void) G_GNUC_CONST;
GType sidebar_entry_get_type (void) G_GNUC_CONST;
@@ -382,7 +382,7 @@ TrashPage* trash_page_new (void);
TrashPage* trash_page_construct (GType object_type);
GType checkerboard_page_get_type (void) G_GNUC_CONST;
GType trash_page_get_type (void) G_GNUC_CONST;
-static void library_trash_sidebar_entry_finalize (GObject* obj);
+static void library_trash_sidebar_entry_finalize (GObject * obj);
static void _library_trash_sidebar_entry_on_trashcan_contents_altered_media_source_collection_trashcan_contents_altered (MediaSourceCollection* _sender, GeeCollection* added, GeeCollection* removed, gpointer self) {
@@ -399,12 +399,12 @@ LibraryTrashSidebarEntry* library_trash_sidebar_entry_construct (GType object_ty
#line 400 "TrashSidebarEntry.c"
{
GeeIterator* _media_sources_it = NULL;
- MediaCollectionRegistry* _tmp0_ = NULL;
- MediaCollectionRegistry* _tmp1_ = NULL;
- GeeCollection* _tmp2_ = NULL;
- GeeCollection* _tmp3_ = NULL;
- GeeIterator* _tmp4_ = NULL;
- GeeIterator* _tmp5_ = NULL;
+ MediaCollectionRegistry* _tmp0_;
+ MediaCollectionRegistry* _tmp1_;
+ GeeCollection* _tmp2_;
+ GeeCollection* _tmp3_;
+ GeeIterator* _tmp4_;
+ GeeIterator* _tmp5_;
#line 10 "/home/jens/Source/shotwell/src/library/TrashSidebarEntry.vala"
_tmp0_ = media_collection_registry_get_instance ();
#line 10 "/home/jens/Source/shotwell/src/library/TrashSidebarEntry.vala"
@@ -426,12 +426,12 @@ LibraryTrashSidebarEntry* library_trash_sidebar_entry_construct (GType object_ty
#line 10 "/home/jens/Source/shotwell/src/library/TrashSidebarEntry.vala"
while (TRUE) {
#line 429 "TrashSidebarEntry.c"
- GeeIterator* _tmp6_ = NULL;
- gboolean _tmp7_ = FALSE;
+ GeeIterator* _tmp6_;
+ gboolean _tmp7_;
MediaSourceCollection* media_sources = NULL;
- GeeIterator* _tmp8_ = NULL;
- gpointer _tmp9_ = NULL;
- MediaSourceCollection* _tmp10_ = NULL;
+ GeeIterator* _tmp8_;
+ gpointer _tmp9_;
+ MediaSourceCollection* _tmp10_;
#line 10 "/home/jens/Source/shotwell/src/library/TrashSidebarEntry.vala"
_tmp6_ = _media_sources_it;
#line 10 "/home/jens/Source/shotwell/src/library/TrashSidebarEntry.vala"
@@ -484,7 +484,7 @@ void library_trash_sidebar_entry_terminate (void) {
static gchar* library_trash_sidebar_entry_real_get_sidebar_name (SidebarSimplePageEntry* base) {
LibraryTrashSidebarEntry * self;
gchar* result = NULL;
- gchar* _tmp0_ = NULL;
+ gchar* _tmp0_;
#line 25 "/home/jens/Source/shotwell/src/library/TrashSidebarEntry.vala"
self = G_TYPE_CHECK_INSTANCE_CAST (base, LIBRARY_TYPE_TRASH_SIDEBAR_ENTRY, LibraryTrashSidebarEntry);
#line 26 "/home/jens/Source/shotwell/src/library/TrashSidebarEntry.vala"
@@ -500,7 +500,7 @@ static gchar* library_trash_sidebar_entry_real_get_sidebar_name (SidebarSimplePa
static gchar* library_trash_sidebar_entry_real_get_sidebar_icon (SidebarSimplePageEntry* base) {
LibraryTrashSidebarEntry * self;
gchar* result = NULL;
- gchar* _tmp0_ = NULL;
+ gchar* _tmp0_;
#line 29 "/home/jens/Source/shotwell/src/library/TrashSidebarEntry.vala"
self = G_TYPE_CHECK_INSTANCE_CAST (base, LIBRARY_TYPE_TRASH_SIDEBAR_ENTRY, LibraryTrashSidebarEntry);
#line 30 "/home/jens/Source/shotwell/src/library/TrashSidebarEntry.vala"
@@ -515,15 +515,15 @@ static gchar* library_trash_sidebar_entry_real_get_sidebar_icon (SidebarSimplePa
static gchar* library_trash_sidebar_entry_get_current_icon (void) {
gchar* result = NULL;
- gchar* _tmp13_ = NULL;
+ gchar* _tmp13_;
{
GeeIterator* _media_sources_it = NULL;
- MediaCollectionRegistry* _tmp0_ = NULL;
- MediaCollectionRegistry* _tmp1_ = NULL;
- GeeCollection* _tmp2_ = NULL;
- GeeCollection* _tmp3_ = NULL;
- GeeIterator* _tmp4_ = NULL;
- GeeIterator* _tmp5_ = NULL;
+ MediaCollectionRegistry* _tmp0_;
+ MediaCollectionRegistry* _tmp1_;
+ GeeCollection* _tmp2_;
+ GeeCollection* _tmp3_;
+ GeeIterator* _tmp4_;
+ GeeIterator* _tmp5_;
#line 34 "/home/jens/Source/shotwell/src/library/TrashSidebarEntry.vala"
_tmp0_ = media_collection_registry_get_instance ();
#line 34 "/home/jens/Source/shotwell/src/library/TrashSidebarEntry.vala"
@@ -545,13 +545,13 @@ static gchar* library_trash_sidebar_entry_get_current_icon (void) {
#line 34 "/home/jens/Source/shotwell/src/library/TrashSidebarEntry.vala"
while (TRUE) {
#line 548 "TrashSidebarEntry.c"
- GeeIterator* _tmp6_ = NULL;
- gboolean _tmp7_ = FALSE;
+ GeeIterator* _tmp6_;
+ gboolean _tmp7_;
MediaSourceCollection* media_sources = NULL;
- GeeIterator* _tmp8_ = NULL;
- gpointer _tmp9_ = NULL;
- MediaSourceCollection* _tmp10_ = NULL;
- gint _tmp11_ = 0;
+ GeeIterator* _tmp8_;
+ gpointer _tmp9_;
+ MediaSourceCollection* _tmp10_;
+ gint _tmp11_;
#line 34 "/home/jens/Source/shotwell/src/library/TrashSidebarEntry.vala"
_tmp6_ = _media_sources_it;
#line 34 "/home/jens/Source/shotwell/src/library/TrashSidebarEntry.vala"
@@ -575,7 +575,7 @@ static gchar* library_trash_sidebar_entry_get_current_icon (void) {
#line 35 "/home/jens/Source/shotwell/src/library/TrashSidebarEntry.vala"
if (_tmp11_ > 0) {
#line 578 "TrashSidebarEntry.c"
- gchar* _tmp12_ = NULL;
+ gchar* _tmp12_;
#line 36 "/home/jens/Source/shotwell/src/library/TrashSidebarEntry.vala"
_tmp12_ = g_strdup (RESOURCES_ICON_TRASH_FULL);
#line 36 "/home/jens/Source/shotwell/src/library/TrashSidebarEntry.vala"
@@ -609,11 +609,11 @@ static gchar* library_trash_sidebar_entry_get_current_icon (void) {
static gboolean library_trash_sidebar_entry_real_internal_drop_received (SidebarInternalDropTargetEntry* base, GeeList* media) {
LibraryTrashSidebarEntry * self;
gboolean result = FALSE;
- CommandManager* _tmp0_ = NULL;
- CommandManager* _tmp1_ = NULL;
- GeeList* _tmp2_ = NULL;
- TrashUntrashPhotosCommand* _tmp3_ = NULL;
- TrashUntrashPhotosCommand* _tmp4_ = NULL;
+ CommandManager* _tmp0_;
+ CommandManager* _tmp1_;
+ GeeList* _tmp2_;
+ TrashUntrashPhotosCommand* _tmp3_;
+ TrashUntrashPhotosCommand* _tmp4_;
#line 42 "/home/jens/Source/shotwell/src/library/TrashSidebarEntry.vala"
self = G_TYPE_CHECK_INSTANCE_CAST (base, LIBRARY_TYPE_TRASH_SIDEBAR_ENTRY, LibraryTrashSidebarEntry);
#line 42 "/home/jens/Source/shotwell/src/library/TrashSidebarEntry.vala"
@@ -660,7 +660,7 @@ static gboolean library_trash_sidebar_entry_real_internal_drop_received_arbitrar
static Page* library_trash_sidebar_entry_real_create_page (SidebarSimplePageEntry* base) {
LibraryTrashSidebarEntry * self;
Page* result = NULL;
- TrashPage* _tmp0_ = NULL;
+ TrashPage* _tmp0_;
#line 52 "/home/jens/Source/shotwell/src/library/TrashSidebarEntry.vala"
self = G_TYPE_CHECK_INSTANCE_CAST (base, LIBRARY_TYPE_TRASH_SIDEBAR_ENTRY, LibraryTrashSidebarEntry);
#line 53 "/home/jens/Source/shotwell/src/library/TrashSidebarEntry.vala"
@@ -676,8 +676,8 @@ static Page* library_trash_sidebar_entry_real_create_page (SidebarSimplePageEntr
static void library_trash_sidebar_entry_on_trashcan_contents_altered (LibraryTrashSidebarEntry* self) {
- gchar* _tmp0_ = NULL;
- gchar* _tmp1_ = NULL;
+ gchar* _tmp0_;
+ gchar* _tmp1_;
#line 56 "/home/jens/Source/shotwell/src/library/TrashSidebarEntry.vala"
g_return_if_fail (LIBRARY_IS_TRASH_SIDEBAR_ENTRY (self));
#line 57 "/home/jens/Source/shotwell/src/library/TrashSidebarEntry.vala"
@@ -696,11 +696,11 @@ static void library_trash_sidebar_entry_class_init (LibraryTrashSidebarEntryClas
#line 7 "/home/jens/Source/shotwell/src/library/TrashSidebarEntry.vala"
library_trash_sidebar_entry_parent_class = g_type_class_peek_parent (klass);
#line 7 "/home/jens/Source/shotwell/src/library/TrashSidebarEntry.vala"
- ((SidebarSimplePageEntryClass *) klass)->get_sidebar_name = (gchar* (*)(SidebarSimplePageEntry*)) library_trash_sidebar_entry_real_get_sidebar_name;
+ ((SidebarSimplePageEntryClass *) klass)->get_sidebar_name = (gchar* (*) (SidebarSimplePageEntry *)) library_trash_sidebar_entry_real_get_sidebar_name;
#line 7 "/home/jens/Source/shotwell/src/library/TrashSidebarEntry.vala"
- ((SidebarSimplePageEntryClass *) klass)->get_sidebar_icon = (gchar* (*)(SidebarSimplePageEntry*)) library_trash_sidebar_entry_real_get_sidebar_icon;
+ ((SidebarSimplePageEntryClass *) klass)->get_sidebar_icon = (gchar* (*) (SidebarSimplePageEntry *)) library_trash_sidebar_entry_real_get_sidebar_icon;
#line 7 "/home/jens/Source/shotwell/src/library/TrashSidebarEntry.vala"
- ((SidebarSimplePageEntryClass *) klass)->create_page = (Page* (*)(SidebarSimplePageEntry*)) library_trash_sidebar_entry_real_create_page;
+ ((SidebarSimplePageEntryClass *) klass)->create_page = (Page* (*) (SidebarSimplePageEntry *)) library_trash_sidebar_entry_real_create_page;
#line 7 "/home/jens/Source/shotwell/src/library/TrashSidebarEntry.vala"
G_OBJECT_CLASS (klass)->finalize = library_trash_sidebar_entry_finalize;
#line 707 "TrashSidebarEntry.c"
@@ -711,9 +711,9 @@ static void library_trash_sidebar_entry_sidebar_internal_drop_target_entry_inter
#line 7 "/home/jens/Source/shotwell/src/library/TrashSidebarEntry.vala"
library_trash_sidebar_entry_sidebar_internal_drop_target_entry_parent_iface = g_type_interface_peek_parent (iface);
#line 7 "/home/jens/Source/shotwell/src/library/TrashSidebarEntry.vala"
- iface->internal_drop_received = (gboolean (*)(SidebarInternalDropTargetEntry*, GeeList*)) library_trash_sidebar_entry_real_internal_drop_received;
+ iface->internal_drop_received = (gboolean (*) (SidebarInternalDropTargetEntry *, GeeList*)) library_trash_sidebar_entry_real_internal_drop_received;
#line 7 "/home/jens/Source/shotwell/src/library/TrashSidebarEntry.vala"
- iface->internal_drop_received_arbitrary = (gboolean (*)(SidebarInternalDropTargetEntry*, GtkSelectionData*)) library_trash_sidebar_entry_real_internal_drop_received_arbitrary;
+ iface->internal_drop_received_arbitrary = (gboolean (*) (SidebarInternalDropTargetEntry *, GtkSelectionData*)) library_trash_sidebar_entry_real_internal_drop_received_arbitrary;
#line 718 "TrashSidebarEntry.c"
}
@@ -722,19 +722,19 @@ static void library_trash_sidebar_entry_instance_init (LibraryTrashSidebarEntry
}
-static void library_trash_sidebar_entry_finalize (GObject* obj) {
+static void library_trash_sidebar_entry_finalize (GObject * obj) {
LibraryTrashSidebarEntry * self;
#line 7 "/home/jens/Source/shotwell/src/library/TrashSidebarEntry.vala"
self = G_TYPE_CHECK_INSTANCE_CAST (obj, LIBRARY_TYPE_TRASH_SIDEBAR_ENTRY, LibraryTrashSidebarEntry);
#line 730 "TrashSidebarEntry.c"
{
GeeIterator* _media_sources_it = NULL;
- MediaCollectionRegistry* _tmp0_ = NULL;
- MediaCollectionRegistry* _tmp1_ = NULL;
- GeeCollection* _tmp2_ = NULL;
- GeeCollection* _tmp3_ = NULL;
- GeeIterator* _tmp4_ = NULL;
- GeeIterator* _tmp5_ = NULL;
+ MediaCollectionRegistry* _tmp0_;
+ MediaCollectionRegistry* _tmp1_;
+ GeeCollection* _tmp2_;
+ GeeCollection* _tmp3_;
+ GeeIterator* _tmp4_;
+ GeeIterator* _tmp5_;
#line 15 "/home/jens/Source/shotwell/src/library/TrashSidebarEntry.vala"
_tmp0_ = media_collection_registry_get_instance ();
#line 15 "/home/jens/Source/shotwell/src/library/TrashSidebarEntry.vala"
@@ -756,13 +756,13 @@ static void library_trash_sidebar_entry_finalize (GObject* obj) {
#line 15 "/home/jens/Source/shotwell/src/library/TrashSidebarEntry.vala"
while (TRUE) {
#line 759 "TrashSidebarEntry.c"
- GeeIterator* _tmp6_ = NULL;
- gboolean _tmp7_ = FALSE;
+ GeeIterator* _tmp6_;
+ gboolean _tmp7_;
MediaSourceCollection* media_sources = NULL;
- GeeIterator* _tmp8_ = NULL;
- gpointer _tmp9_ = NULL;
- MediaSourceCollection* _tmp10_ = NULL;
- guint _tmp11_ = 0U;
+ GeeIterator* _tmp8_;
+ gpointer _tmp9_;
+ MediaSourceCollection* _tmp10_;
+ guint _tmp11_;
#line 15 "/home/jens/Source/shotwell/src/library/TrashSidebarEntry.vala"
_tmp6_ = _media_sources_it;
#line 15 "/home/jens/Source/shotwell/src/library/TrashSidebarEntry.vala"