diff options
author | Jörg Frings-Fürst <debian@jff-webhosting.net> | 2017-11-12 16:48:02 +0100 |
---|---|---|
committer | Jörg Frings-Fürst <debian@jff-webhosting.net> | 2017-11-12 16:48:02 +0100 |
commit | abdaad68fb94e2d61448a6dfc14847df8a2c32b9 (patch) | |
tree | 26855c5dd3bfffdbf319d5ba4a38223a28de3e7c /src/util/ui.c | |
parent | 0f67b3cc674377559e66c5a6729fd499049a992f (diff) | |
parent | dd7f98a232efe86f6e6055119c9414a0f9d9e67b (diff) |
Merge branch 'feature/upstream' into develop
Diffstat (limited to 'src/util/ui.c')
-rw-r--r-- | src/util/ui.c | 40 |
1 files changed, 20 insertions, 20 deletions
diff --git a/src/util/ui.c b/src/util/ui.c index e881e93..8a7e0d7 100644 --- a/src/util/ui.c +++ b/src/util/ui.c @@ -1,4 +1,4 @@ -/* ui.c generated by valac 0.34.7, the Vala compiler +/* ui.c generated by valac 0.36.6, the Vala compiler * generated from ui.vala, do not modify */ /* Copyright 2016 Software Freedom Conservancy Inc. @@ -130,7 +130,7 @@ void spin_event_loop (void) { #line 39 "/home/jens/Source/shotwell/src/util/ui.vala" while (TRUE) { #line 133 "ui.c" - gboolean _tmp0_ = FALSE; + gboolean _tmp0_; #line 39 "/home/jens/Source/shotwell/src/util/ui.vala" _tmp0_ = gtk_events_pending (); #line 39 "/home/jens/Source/shotwell/src/util/ui.vala" @@ -148,9 +148,9 @@ void spin_event_loop (void) { AdjustmentRelation get_adjustment_relation (GtkAdjustment* adjustment, gint value) { AdjustmentRelation result = 0; - gint _tmp0_ = 0; - GtkAdjustment* _tmp1_ = NULL; - gdouble _tmp2_ = 0.0; + gint _tmp0_; + GtkAdjustment* _tmp1_; + gdouble _tmp2_; #line 43 "/home/jens/Source/shotwell/src/util/ui.vala" g_return_val_if_fail (GTK_IS_ADJUSTMENT (adjustment), 0); #line 44 "/home/jens/Source/shotwell/src/util/ui.vala" @@ -167,11 +167,11 @@ AdjustmentRelation get_adjustment_relation (GtkAdjustment* adjustment, gint valu return result; #line 169 "ui.c" } else { - gint _tmp3_ = 0; - GtkAdjustment* _tmp4_ = NULL; - gdouble _tmp5_ = 0.0; - GtkAdjustment* _tmp6_ = NULL; - gdouble _tmp7_ = 0.0; + gint _tmp3_; + GtkAdjustment* _tmp4_; + gdouble _tmp5_; + GtkAdjustment* _tmp6_; + gdouble _tmp7_; #line 46 "/home/jens/Source/shotwell/src/util/ui.vala" _tmp3_ = value; #line 46 "/home/jens/Source/shotwell/src/util/ui.vala" @@ -202,14 +202,14 @@ AdjustmentRelation get_adjustment_relation (GtkAdjustment* adjustment, gint valu void get_adjustment_page (GtkAdjustment* hadj, GtkAdjustment* vadj, GdkRectangle* result) { GdkRectangle rect = {0}; - GtkAdjustment* _tmp0_ = NULL; - gdouble _tmp1_ = 0.0; - GtkAdjustment* _tmp2_ = NULL; - gdouble _tmp3_ = 0.0; - GtkAdjustment* _tmp4_ = NULL; - gdouble _tmp5_ = 0.0; - GtkAdjustment* _tmp6_ = NULL; - gdouble _tmp7_ = 0.0; + GtkAdjustment* _tmp0_; + gdouble _tmp1_; + GtkAdjustment* _tmp2_; + gdouble _tmp3_; + GtkAdjustment* _tmp4_; + gdouble _tmp5_; + GtkAdjustment* _tmp6_; + gdouble _tmp7_; #line 52 "/home/jens/Source/shotwell/src/util/ui.vala" g_return_if_fail (GTK_IS_ADJUSTMENT (hadj)); #line 52 "/home/jens/Source/shotwell/src/util/ui.vala" @@ -250,8 +250,8 @@ void get_adjustment_page (GtkAdjustment* hadj, GtkAdjustment* vadj, GdkRectangle gboolean has_only_key_modifier (GdkModifierType field, GdkModifierType mask) { gboolean result = FALSE; - GdkModifierType _tmp0_ = 0; - GdkModifierType _tmp1_ = 0; + GdkModifierType _tmp0_; + GdkModifierType _tmp1_; #line 77 "/home/jens/Source/shotwell/src/util/ui.vala" _tmp0_ = field; #line 77 "/home/jens/Source/shotwell/src/util/ui.vala" |