summaryrefslogtreecommitdiff
path: root/src/direct/DirectView.c
diff options
context:
space:
mode:
authorJörg Frings-Fürst <debian@jff-webhosting.net>2017-11-12 15:53:58 +0100
committerJörg Frings-Fürst <debian@jff-webhosting.net>2017-11-12 15:53:58 +0100
commit2492891f112caac6076ce49721d9d5d78a152c3a (patch)
tree36dd11a60bd963e6bd44e2e312b6e4b57d1849ea /src/direct/DirectView.c
parent3c829c50a8f705402bdc759946d49ae7caebd003 (diff)
New upstream version 0.26.4upstream/0.26.4
Diffstat (limited to 'src/direct/DirectView.c')
-rw-r--r--src/direct/DirectView.c64
1 files changed, 32 insertions, 32 deletions
diff --git a/src/direct/DirectView.c b/src/direct/DirectView.c
index da18fc5..7ad6acd 100644
--- a/src/direct/DirectView.c
+++ b/src/direct/DirectView.c
@@ -1,4 +1,4 @@
-/* DirectView.c generated by valac 0.34.7, the Vala compiler
+/* DirectView.c generated by valac 0.36.6, the Vala compiler
* generated from DirectView.vala, do not modify */
/* Copyright 2016 Software Freedom Conservancy Inc.
@@ -448,7 +448,7 @@ DataView* data_view_construct (GType object_type, DataSource* source);
GFile* media_source_get_file (MediaSource* self);
GFile* direct_view_get_file (DirectView* self);
gchar* direct_view_get_collate_key (DirectView* self);
-static void direct_view_finalize (GObject* obj);
+static void direct_view_finalize (GObject * obj);
GType marker_get_type (void) G_GNUC_CONST;
GType view_collection_get_type (void) G_GNUC_CONST;
gpointer view_filter_ref (gpointer instance);
@@ -499,9 +499,9 @@ ViewManager* view_manager_construct (GType object_type);
DirectView* direct_view_construct (GType object_type, DirectPhoto* source) {
DirectView * self = NULL;
- DirectPhoto* _tmp0_ = NULL;
- DirectPhoto* _tmp1_ = NULL;
- GFile* _tmp2_ = NULL;
+ DirectPhoto* _tmp0_;
+ DirectPhoto* _tmp1_;
+ GFile* _tmp2_;
#line 11 "/home/jens/Source/shotwell/src/direct/DirectView.vala"
g_return_val_if_fail (IS_DIRECT_PHOTO (source), NULL);
#line 12 "/home/jens/Source/shotwell/src/direct/DirectView.vala"
@@ -538,8 +538,8 @@ static gpointer _g_object_ref0 (gpointer self) {
GFile* direct_view_get_file (DirectView* self) {
GFile* result = NULL;
- GFile* _tmp0_ = NULL;
- GFile* _tmp1_ = NULL;
+ GFile* _tmp0_;
+ GFile* _tmp1_;
#line 17 "/home/jens/Source/shotwell/src/direct/DirectView.vala"
g_return_val_if_fail (IS_DIRECT_VIEW (self), NULL);
#line 18 "/home/jens/Source/shotwell/src/direct/DirectView.vala"
@@ -556,9 +556,9 @@ GFile* direct_view_get_file (DirectView* self) {
gchar* direct_view_get_collate_key (DirectView* self) {
gchar* result = NULL;
- const gchar* _tmp0_ = NULL;
- const gchar* _tmp5_ = NULL;
- gchar* _tmp6_ = NULL;
+ const gchar* _tmp0_;
+ const gchar* _tmp5_;
+ gchar* _tmp6_;
#line 21 "/home/jens/Source/shotwell/src/direct/DirectView.vala"
g_return_val_if_fail (IS_DIRECT_VIEW (self), NULL);
#line 22 "/home/jens/Source/shotwell/src/direct/DirectView.vala"
@@ -566,10 +566,10 @@ gchar* direct_view_get_collate_key (DirectView* self) {
#line 22 "/home/jens/Source/shotwell/src/direct/DirectView.vala"
if (_tmp0_ == NULL) {
#line 569 "DirectView.c"
- GFile* _tmp1_ = NULL;
- gchar* _tmp2_ = NULL;
- gchar* _tmp3_ = NULL;
- gchar* _tmp4_ = NULL;
+ GFile* _tmp1_;
+ gchar* _tmp2_;
+ gchar* _tmp3_;
+ gchar* _tmp4_;
#line 23 "/home/jens/Source/shotwell/src/direct/DirectView.vala"
_tmp1_ = self->priv->file;
#line 23 "/home/jens/Source/shotwell/src/direct/DirectView.vala"
@@ -618,7 +618,7 @@ static void direct_view_instance_init (DirectView * self) {
}
-static void direct_view_finalize (GObject* obj) {
+static void direct_view_finalize (GObject * obj) {
DirectView * self;
#line 7 "/home/jens/Source/shotwell/src/direct/DirectView.vala"
self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_DIRECT_VIEW, DirectView);
@@ -655,11 +655,11 @@ static gint64 _direct_view_collection_filename_comparator_comparator (void* a, v
DirectViewCollection* direct_view_collection_construct (GType object_type) {
DirectViewCollection* self = NULL;
- DirectPhotoSourceCollection* _tmp0_ = NULL;
- DirectViewCollectionDirectViewManager* _tmp1_ = NULL;
- DirectViewCollectionDirectViewManager* _tmp2_ = NULL;
- ViewCollectionMonitor* _tmp3_ = NULL;
- ViewCollectionMonitor* _tmp4_ = NULL;
+ DirectPhotoSourceCollection* _tmp0_;
+ DirectViewCollectionDirectViewManager* _tmp1_;
+ DirectViewCollectionDirectViewManager* _tmp2_;
+ ViewCollectionMonitor* _tmp3_;
+ ViewCollectionMonitor* _tmp4_;
#line 37 "/home/jens/Source/shotwell/src/direct/DirectView.vala"
self = (DirectViewCollection*) view_collection_construct (object_type, "DirectViewCollection");
#line 39 "/home/jens/Source/shotwell/src/direct/DirectView.vala"
@@ -694,16 +694,16 @@ DirectViewCollection* direct_view_collection_new (void) {
static gint64 direct_view_collection_filename_comparator (void* a, void* b) {
gint64 result = 0LL;
DirectView* aview = NULL;
- void* _tmp0_ = NULL;
+ void* _tmp0_;
DirectView* bview = NULL;
- void* _tmp1_ = NULL;
- GCompareFunc _tmp2_ = NULL;
- gchar* _tmp3_ = NULL;
- gchar* _tmp4_ = NULL;
- gchar* _tmp5_ = NULL;
- gchar* _tmp6_ = NULL;
- gint _tmp7_ = 0;
- gint64 _tmp8_ = 0LL;
+ void* _tmp1_;
+ GCompareFunc _tmp2_;
+ gchar* _tmp3_;
+ gchar* _tmp4_;
+ gchar* _tmp5_;
+ gchar* _tmp6_;
+ gint _tmp7_;
+ gint64 _tmp8_;
#line 44 "/home/jens/Source/shotwell/src/direct/DirectView.vala"
_tmp0_ = a;
#line 44 "/home/jens/Source/shotwell/src/direct/DirectView.vala"
@@ -741,8 +741,8 @@ static gint64 direct_view_collection_filename_comparator (void* a, void* b) {
static DataView* direct_view_collection_direct_view_manager_real_create_view (ViewManager* base, DataSource* source) {
DirectViewCollectionDirectViewManager * self;
DataView* result = NULL;
- DataSource* _tmp0_ = NULL;
- DirectView* _tmp1_ = NULL;
+ DataSource* _tmp0_;
+ DirectView* _tmp1_;
#line 31 "/home/jens/Source/shotwell/src/direct/DirectView.vala"
self = G_TYPE_CHECK_INSTANCE_CAST (base, DIRECT_VIEW_COLLECTION_TYPE_DIRECT_VIEW_MANAGER, DirectViewCollectionDirectViewManager);
#line 31 "/home/jens/Source/shotwell/src/direct/DirectView.vala"
@@ -780,7 +780,7 @@ static void direct_view_collection_direct_view_manager_class_init (DirectViewCol
#line 30 "/home/jens/Source/shotwell/src/direct/DirectView.vala"
direct_view_collection_direct_view_manager_parent_class = g_type_class_peek_parent (klass);
#line 30 "/home/jens/Source/shotwell/src/direct/DirectView.vala"
- ((ViewManagerClass *) klass)->create_view = (DataView* (*)(ViewManager*, DataSource*)) direct_view_collection_direct_view_manager_real_create_view;
+ ((ViewManagerClass *) klass)->create_view = (DataView* (*) (ViewManager *, DataSource*)) direct_view_collection_direct_view_manager_real_create_view;
#line 785 "DirectView.c"
}