Merge tag 'upstream/3.15.4'

Upstream version 3.15.4

1 files changed, 11 insertions, 11 deletions

diff --git a/src/book-view.c b/src/book-view.c
index 4ae0fd2..dbfdba3 100644
--- a/src/book-view.c
+++ b/src/book-view.c
@@ -1,4 +1,4 @@
-/* book-view.c generated by valac 0.24.0, the Vala compiler
+/* book-view.c generated by valac 0.26.1, the Vala compiler
  * generated from book-view.vala, do not modify */
 
 /*
@@ -3739,55 +3739,55 @@ static void book_view_finalize (GObject* obj) {
 #line 127 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	_tmp8_ = self->priv->drawing_area;
 #line 127 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-	g_signal_parse_name ("configure-event", GTK_TYPE_WIDGET, &_tmp9_, NULL, FALSE);
+	g_signal_parse_name ("configure-event", gtk_widget_get_type (), &_tmp9_, NULL, FALSE);
 #line 127 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	g_signal_handlers_disconnect_matched (_tmp8_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp9_, 0, NULL, (GCallback) _book_view_configure_cb_gtk_widget_configure_event, self);
 #line 128 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	_tmp10_ = self->priv->drawing_area;
 #line 128 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-	g_signal_parse_name ("draw", GTK_TYPE_WIDGET, &_tmp11_, NULL, FALSE);
+	g_signal_parse_name ("draw", gtk_widget_get_type (), &_tmp11_, NULL, FALSE);
 #line 128 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	g_signal_handlers_disconnect_matched (_tmp10_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp11_, 0, NULL, (GCallback) _book_view_draw_cb_gtk_widget_draw, self);
 #line 129 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	_tmp12_ = self->priv->drawing_area;
 #line 129 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-	g_signal_parse_name ("motion-notify-event", GTK_TYPE_WIDGET, &_tmp13_, NULL, FALSE);
+	g_signal_parse_name ("motion-notify-event", gtk_widget_get_type (), &_tmp13_, NULL, FALSE);
 #line 129 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	g_signal_handlers_disconnect_matched (_tmp12_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp13_, 0, NULL, (GCallback) _book_view_motion_cb_gtk_widget_motion_notify_event, self);
 #line 130 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	_tmp14_ = self->priv->drawing_area;
 #line 130 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-	g_signal_parse_name ("key-press-event", GTK_TYPE_WIDGET, &_tmp15_, NULL, FALSE);
+	g_signal_parse_name ("key-press-event", gtk_widget_get_type (), &_tmp15_, NULL, FALSE);
 #line 130 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	g_signal_handlers_disconnect_matched (_tmp14_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp15_, 0, NULL, (GCallback) _book_view_key_cb_gtk_widget_key_press_event, self);
 #line 131 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	_tmp16_ = self->priv->drawing_area;
 #line 131 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-	g_signal_parse_name ("button-press-event", GTK_TYPE_WIDGET, &_tmp17_, NULL, FALSE);
+	g_signal_parse_name ("button-press-event", gtk_widget_get_type (), &_tmp17_, NULL, FALSE);
 #line 131 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	g_signal_handlers_disconnect_matched (_tmp16_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp17_, 0, NULL, (GCallback) _book_view_button_cb_gtk_widget_button_press_event, self);
 #line 132 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	_tmp18_ = self->priv->drawing_area;
 #line 132 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-	g_signal_parse_name ("button-release-event", GTK_TYPE_WIDGET, &_tmp19_, NULL, FALSE);
+	g_signal_parse_name ("button-release-event", gtk_widget_get_type (), &_tmp19_, NULL, FALSE);
 #line 132 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	g_signal_handlers_disconnect_matched (_tmp18_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp19_, 0, NULL, (GCallback) _book_view_button_cb_gtk_widget_button_release_event, self);
 #line 133 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	_tmp20_ = self->priv->drawing_area;
 #line 133 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-	g_signal_parse_name ("focus-in-event", GTK_TYPE_WIDGET, &_tmp21_, NULL, FALSE);
+	g_signal_parse_name ("focus-in-event", gtk_widget_get_type (), &_tmp21_, NULL, FALSE);
 #line 133 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	g_signal_handlers_disconnect_matched (_tmp20_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp21_, 0, NULL, (GCallback) _book_view_focus_cb_gtk_widget_focus_in_event, self);
 #line 134 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	_tmp22_ = self->priv->drawing_area;
 #line 134 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-	g_signal_parse_name ("focus-out-event", GTK_TYPE_WIDGET, &_tmp23_, NULL, FALSE);
+	g_signal_parse_name ("focus-out-event", gtk_widget_get_type (), &_tmp23_, NULL, FALSE);
 #line 134 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	g_signal_handlers_disconnect_matched (_tmp22_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp23_, 0, NULL, (GCallback) _book_view_focus_cb_gtk_widget_focus_out_event, self);
 #line 135 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	_tmp24_ = self->priv->adjustment;
 #line 135 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-	g_signal_parse_name ("value-changed", GTK_TYPE_ADJUSTMENT, &_tmp25_, NULL, FALSE);
+	g_signal_parse_name ("value-changed", gtk_adjustment_get_type (), &_tmp25_, NULL, FALSE);
 #line 135 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	g_signal_handlers_disconnect_matched (_tmp24_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp25_, 0, NULL, (GCallback) _book_view_scroll_cb_gtk_adjustment_value_changed, self);
 #line 18 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
@@ -3813,7 +3813,7 @@ GType book_view_get_type (void) {
 	if (g_once_init_enter (&book_view_type_id__volatile)) {
 		static const GTypeInfo g_define_type_info = { sizeof (BookViewClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) book_view_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (BookView), 0, (GInstanceInitFunc) book_view_instance_init, NULL };
 		GType book_view_type_id;
-		book_view_type_id = g_type_register_static (GTK_TYPE_BOX, "BookView", &g_define_type_info, 0);
+		book_view_type_id = g_type_register_static (gtk_box_get_type (), "BookView", &g_define_type_info, 0);
 		g_once_init_leave (&book_view_type_id__volatile, book_view_type_id);
 	}
 	return book_view_type_id__volatile;