Update upstream source from tag 'upstream/0.26.4'

Update to upstream version '0.26.4'
with Debian dir fae3cc48a8ec2f37979206f90dc828cbebee14c4

1 files changed, 78 insertions, 78 deletions

diff --git a/src/direct/DirectWindow.c b/src/direct/DirectWindow.c
index 265200a..16c0212 100644
--- a/src/direct/DirectWindow.c
+++ b/src/direct/DirectWindow.c
@@ -1,4 +1,4 @@
-/* DirectWindow.c generated by valac 0.34.7, the Vala compiler
+/* DirectWindow.c generated by valac 0.36.6, the Vala compiler
  * generated from DirectWindow.vala, do not modify */
 
 /* Copyright 2016 Software Freedom Conservancy Inc.
@@ -358,7 +358,7 @@ static gboolean direct_window_real_delete_event (GtkWidget* base, GdkEventAny* e
 static gboolean direct_window_real_button_press_event (GtkWidget* base, GdkEventButton* event);
 void app_window_on_fullscreen (AppWindow* self);
 static gboolean direct_window_real_key_press_event (GtkWidget* base, GdkEventKey* event);
-static void direct_window_finalize (GObject* obj);
+static void direct_window_finalize (GObject * obj);
 
 
 static void _direct_window_on_photo_changed_data_collection_items_altered (DataCollection* _sender, GeeMap* items, gpointer self) {
@@ -377,26 +377,26 @@ static void _direct_window_on_photo_changed_view_collection_items_state_changed
 
 DirectWindow* direct_window_construct (GType object_type, GFile* file) {
 	DirectWindow * self = NULL;
-	GFile* _tmp0_ = NULL;
-	DirectPhotoPage* _tmp1_ = NULL;
-	DirectPhotoPage* _tmp2_ = NULL;
-	ViewCollection* _tmp3_ = NULL;
-	ViewCollection* _tmp4_ = NULL;
-	DirectPhotoPage* _tmp5_ = NULL;
-	ViewCollection* _tmp6_ = NULL;
-	ViewCollection* _tmp7_ = NULL;
-	DirectPhotoPage* _tmp8_ = NULL;
-	GFile* _tmp9_ = NULL;
-	DirectPhotoPage* _tmp10_ = NULL;
+	GFile* _tmp0_;
+	DirectPhotoPage* _tmp1_;
+	DirectPhotoPage* _tmp2_;
+	ViewCollection* _tmp3_;
+	ViewCollection* _tmp4_;
+	DirectPhotoPage* _tmp5_;
+	ViewCollection* _tmp6_;
+	ViewCollection* _tmp7_;
+	DirectPhotoPage* _tmp8_;
+	GFile* _tmp9_;
+	DirectPhotoPage* _tmp10_;
 	GtkBox* layout = NULL;
-	GtkBox* _tmp11_ = NULL;
-	DirectPhotoPage* _tmp12_ = NULL;
-	DirectPhotoPage* _tmp13_ = NULL;
-	GtkToolbar* _tmp14_ = NULL;
-	GtkToolbar* _tmp15_ = NULL;
-	DirectPhotoPage* _tmp16_ = NULL;
-	GMenuModel* _tmp17_ = NULL;
-	GMenuModel* _tmp18_ = NULL;
+	GtkBox* _tmp11_;
+	DirectPhotoPage* _tmp12_;
+	DirectPhotoPage* _tmp13_;
+	GtkToolbar* _tmp14_;
+	GtkToolbar* _tmp15_;
+	DirectPhotoPage* _tmp16_;
+	GMenuModel* _tmp17_;
+	GMenuModel* _tmp18_;
 #line 10 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala"
 	g_return_val_if_fail (G_IS_FILE (file), NULL);
 #line 10 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala"
@@ -499,8 +499,8 @@ static gpointer _g_object_ref0 (gpointer self) {
 
 DirectWindow* direct_window_get_app (void) {
 	DirectWindow* result = NULL;
-	AppWindow* _tmp0_ = NULL;
-	DirectWindow* _tmp1_ = NULL;
+	AppWindow* _tmp0_;
+	DirectWindow* _tmp1_;
 #line 33 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala"
 	_tmp0_ = app_window_instance;
 #line 33 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala"
@@ -515,7 +515,7 @@ DirectWindow* direct_window_get_app (void) {
 
 DirectPhotoPage* direct_window_get_direct_page (DirectWindow* self) {
 	DirectPhotoPage* result = NULL;
-	Page* _tmp0_ = NULL;
+	Page* _tmp0_;
 #line 36 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala"
 	g_return_val_if_fail (IS_DIRECT_WINDOW (self), NULL);
 #line 37 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala"
@@ -530,17 +530,17 @@ DirectPhotoPage* direct_window_get_direct_page (DirectWindow* self) {
 
 void direct_window_update_title (DirectWindow* self, GFile* file, gboolean modified) {
 	const gchar* _tmp0_ = NULL;
-	gboolean _tmp1_ = FALSE;
-	GFile* _tmp2_ = NULL;
-	gchar* _tmp3_ = NULL;
-	gchar* _tmp4_ = NULL;
-	GFile* _tmp5_ = NULL;
-	GFile* _tmp6_ = NULL;
-	GFile* _tmp7_ = NULL;
-	gchar* _tmp8_ = NULL;
-	gchar* _tmp9_ = NULL;
-	gchar* _tmp10_ = NULL;
-	gchar* _tmp11_ = NULL;
+	gboolean _tmp1_;
+	GFile* _tmp2_;
+	gchar* _tmp3_;
+	gchar* _tmp4_;
+	GFile* _tmp5_;
+	GFile* _tmp6_;
+	GFile* _tmp7_;
+	gchar* _tmp8_;
+	gchar* _tmp9_;
+	gchar* _tmp10_;
+	gchar* _tmp11_;
 #line 40 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala"
 	g_return_if_fail (IS_DIRECT_WINDOW (self));
 #line 40 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala"
@@ -594,12 +594,12 @@ void direct_window_update_title (DirectWindow* self, GFile* file, gboolean modif
 static void direct_window_real_on_fullscreen (AppWindow* base) {
 	DirectWindow * self;
 	GFile* file = NULL;
-	DirectPhotoPage* _tmp0_ = NULL;
-	DirectPhotoPage* _tmp1_ = NULL;
-	GFile* _tmp2_ = NULL;
-	GFile* _tmp3_ = NULL;
-	DirectFullscreenPhotoPage* _tmp4_ = NULL;
-	DirectFullscreenPhotoPage* _tmp5_ = NULL;
+	DirectPhotoPage* _tmp0_;
+	DirectPhotoPage* _tmp1_;
+	GFile* _tmp2_;
+	GFile* _tmp3_;
+	DirectFullscreenPhotoPage* _tmp4_;
+	DirectFullscreenPhotoPage* _tmp5_;
 #line 45 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_DIRECT_WINDOW, DirectWindow);
 #line 46 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala"
@@ -633,7 +633,7 @@ static void direct_window_real_on_fullscreen (AppWindow* base) {
 static gchar* direct_window_real_get_app_role (AppWindow* base) {
 	DirectWindow * self;
 	gchar* result = NULL;
-	gchar* _tmp0_ = NULL;
+	gchar* _tmp0_;
 #line 51 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_DIRECT_WINDOW, DirectWindow);
 #line 52 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala"
@@ -648,9 +648,9 @@ static gchar* direct_window_real_get_app_role (AppWindow* base) {
 
 static void direct_window_on_photo_changed (DirectWindow* self) {
 	Photo* photo = NULL;
-	DirectPhotoPage* _tmp0_ = NULL;
-	Photo* _tmp1_ = NULL;
-	Photo* _tmp2_ = NULL;
+	DirectPhotoPage* _tmp0_;
+	Photo* _tmp1_;
+	Photo* _tmp2_;
 #line 55 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala"
 	g_return_if_fail (IS_DIRECT_WINDOW (self));
 #line 56 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala"
@@ -664,11 +664,11 @@ static void direct_window_on_photo_changed (DirectWindow* self) {
 #line 57 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala"
 	if (_tmp2_ != NULL) {
 #line 667 "DirectWindow.c"
-		Photo* _tmp3_ = NULL;
-		GFile* _tmp4_ = NULL;
-		GFile* _tmp5_ = NULL;
-		Photo* _tmp6_ = NULL;
-		gboolean _tmp7_ = FALSE;
+		Photo* _tmp3_;
+		GFile* _tmp4_;
+		GFile* _tmp5_;
+		Photo* _tmp6_;
+		gboolean _tmp7_;
 #line 58 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala"
 		_tmp3_ = photo;
 #line 58 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala"
@@ -693,14 +693,14 @@ static void direct_window_on_photo_changed (DirectWindow* self) {
 
 static void direct_window_real_on_quit (AppWindow* base) {
 	DirectWindow * self;
-	DirectPhotoPage* _tmp0_ = NULL;
-	DirectPhotoPage* _tmp1_ = NULL;
-	gboolean _tmp2_ = FALSE;
-	gboolean _tmp3_ = FALSE;
-	ConfigFacade* _tmp4_ = NULL;
-	ConfigFacade* _tmp5_ = NULL;
-	gboolean _tmp6_ = FALSE;
-	Dimensions _tmp7_ = {0};
+	DirectPhotoPage* _tmp0_;
+	DirectPhotoPage* _tmp1_;
+	gboolean _tmp2_;
+	gboolean _tmp3_;
+	ConfigFacade* _tmp4_;
+	ConfigFacade* _tmp5_;
+	gboolean _tmp6_;
+	Dimensions _tmp7_;
 #line 61 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_DIRECT_WINDOW, DirectWindow);
 #line 62 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala"
@@ -740,10 +740,10 @@ static void direct_window_real_on_quit (AppWindow* base) {
 static gboolean direct_window_real_delete_event (GtkWidget* base, GdkEventAny* event) {
 	DirectWindow * self;
 	gboolean result = FALSE;
-	DirectPhotoPage* _tmp0_ = NULL;
-	DirectPhotoPage* _tmp1_ = NULL;
-	gboolean _tmp2_ = FALSE;
-	gboolean _tmp3_ = FALSE;
+	DirectPhotoPage* _tmp0_;
+	DirectPhotoPage* _tmp1_;
+	gboolean _tmp2_;
+	gboolean _tmp3_;
 	gboolean _tmp4_ = FALSE;
 #line 70 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_DIRECT_WINDOW, DirectWindow);
@@ -770,8 +770,8 @@ static gboolean direct_window_real_delete_event (GtkWidget* base, GdkEventAny* e
 #line 74 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala"
 	if (GTK_WIDGET_CLASS (direct_window_parent_class)->delete_event != NULL) {
 #line 773 "DirectWindow.c"
-		GdkEventAny* _tmp5_ = NULL;
-		gboolean _tmp6_ = FALSE;
+		GdkEventAny* _tmp5_;
+		gboolean _tmp6_;
 #line 74 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala"
 		_tmp5_ = event;
 #line 74 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala"
@@ -795,8 +795,8 @@ static gboolean direct_window_real_delete_event (GtkWidget* base, GdkEventAny* e
 static gboolean direct_window_real_button_press_event (GtkWidget* base, GdkEventButton* event) {
 	DirectWindow * self;
 	gboolean result = FALSE;
-	GdkEventButton* _tmp0_ = NULL;
-	GdkEventType _tmp1_ = 0;
+	GdkEventButton* _tmp0_;
+	GdkEventType _tmp1_;
 #line 77 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_DIRECT_WINDOW, DirectWindow);
 #line 77 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala"
@@ -826,9 +826,9 @@ static gboolean direct_window_real_button_press_event (GtkWidget* base, GdkEvent
 static gboolean direct_window_real_key_press_event (GtkWidget* base, GdkEventKey* event) {
 	DirectWindow * self;
 	gboolean result = FALSE;
-	GdkEventKey* _tmp0_ = NULL;
-	guint _tmp1_ = 0U;
-	const gchar* _tmp2_ = NULL;
+	GdkEventKey* _tmp0_;
+	guint _tmp1_;
+	const gchar* _tmp2_;
 	gboolean _tmp3_ = FALSE;
 #line 87 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_DIRECT_WINDOW, DirectWindow);
@@ -853,8 +853,8 @@ static gboolean direct_window_real_key_press_event (GtkWidget* base, GdkEventKey
 #line 96 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala"
 	if (GTK_WIDGET_CLASS (direct_window_parent_class)->key_press_event != NULL) {
 #line 856 "DirectWindow.c"
-		GdkEventKey* _tmp4_ = NULL;
-		gboolean _tmp5_ = FALSE;
+		GdkEventKey* _tmp4_;
+		gboolean _tmp5_;
 #line 96 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala"
 		_tmp4_ = event;
 #line 96 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala"
@@ -881,17 +881,17 @@ static void direct_window_class_init (DirectWindowClass * klass) {
 #line 7 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala"
 	g_type_class_add_private (klass, sizeof (DirectWindowPrivate));
 #line 7 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala"
-	((AppWindowClass *) klass)->on_fullscreen = (void (*)(AppWindow*)) direct_window_real_on_fullscreen;
+	((AppWindowClass *) klass)->on_fullscreen = (void (*) (AppWindow *)) direct_window_real_on_fullscreen;
 #line 7 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala"
-	((AppWindowClass *) klass)->get_app_role = (gchar* (*)(AppWindow*)) direct_window_real_get_app_role;
+	((AppWindowClass *) klass)->get_app_role = (gchar* (*) (AppWindow *)) direct_window_real_get_app_role;
 #line 7 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala"
-	((AppWindowClass *) klass)->on_quit = (void (*)(AppWindow*)) direct_window_real_on_quit;
+	((AppWindowClass *) klass)->on_quit = (void (*) (AppWindow *)) direct_window_real_on_quit;
 #line 7 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala"
-	((GtkWidgetClass *) klass)->delete_event = (gboolean (*)(GtkWidget*, GdkEventAny*)) direct_window_real_delete_event;
+	((GtkWidgetClass *) klass)->delete_event = (gboolean (*) (GtkWidget *, GdkEventAny*)) direct_window_real_delete_event;
 #line 7 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala"
-	((GtkWidgetClass *) klass)->button_press_event = (gboolean (*)(GtkWidget*, GdkEventButton*)) direct_window_real_button_press_event;
+	((GtkWidgetClass *) klass)->button_press_event = (gboolean (*) (GtkWidget *, GdkEventButton*)) direct_window_real_button_press_event;
 #line 7 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala"
-	((GtkWidgetClass *) klass)->key_press_event = (gboolean (*)(GtkWidget*, GdkEventKey*)) direct_window_real_key_press_event;
+	((GtkWidgetClass *) klass)->key_press_event = (gboolean (*) (GtkWidget *, GdkEventKey*)) direct_window_real_key_press_event;
 #line 7 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala"
 	G_OBJECT_CLASS (klass)->finalize = direct_window_finalize;
 #line 898 "DirectWindow.c"
@@ -905,7 +905,7 @@ static void direct_window_instance_init (DirectWindow * self) {
 }
 
 
-static void direct_window_finalize (GObject* obj) {
+static void direct_window_finalize (GObject * obj) {
 	DirectWindow * self;
 #line 7 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_DIRECT_WINDOW, DirectWindow);