diff options
Diffstat (limited to 'src/book-view.c')
| -rw-r--r-- | src/book-view.c | 1954 |
1 files changed, 968 insertions, 986 deletions
diff --git a/src/book-view.c b/src/book-view.c index d6cfdc9..4ae0fd2 100644 --- a/src/book-view.c +++ b/src/book-view.c @@ -1,4 +1,4 @@ -/* book-view.c generated by valac 0.22.1, the Vala compiler +/* book-view.c generated by valac 0.24.0, the Vala compiler * generated from book-view.vala, do not modify */ /* @@ -180,8 +180,8 @@ static void book_view_layout_into (BookView* self, gint width, gint height, gint gint page_get_dpi (Page* self); gint page_get_width (Page* self); gint page_get_height (Page* self); -void page_view_set_width (PageView* self, gint width); -void page_view_set_height (PageView* self, gint height); +void page_view_set_width (PageView* self, gint value); +void page_view_set_height (PageView* self, gint value); gint page_view_get_height (PageView* self); void page_view_set_x_offset (PageView* self, gint value); void page_view_set_y_offset (PageView* self, gint value); @@ -205,35 +205,35 @@ static void _vala_book_view_set_property (GObject * object, guint property_id, c static void _book_view_add_cb_book_page_added (Book* _sender, Page* page, gpointer self) { #line 123 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala" - book_view_add_cb (self, _sender, page); + book_view_add_cb ((BookView*) self, _sender, page); #line 210 "book-view.c" } static void _book_view_remove_cb_book_page_removed (Book* _sender, Page* page, gpointer self) { #line 124 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala" - book_view_remove_cb (self, _sender, page); + book_view_remove_cb ((BookView*) self, _sender, page); #line 217 "book-view.c" } static void _book_view_reorder_cb_book_reordered (Book* _sender, gpointer self) { #line 125 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala" - book_view_reorder_cb (self, _sender); + book_view_reorder_cb ((BookView*) self, _sender); #line 224 "book-view.c" } static void _book_view_clear_cb_book_cleared (Book* _sender, gpointer self) { #line 126 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala" - book_view_clear_cb (self, _sender); + book_view_clear_cb ((BookView*) self, _sender); #line 231 "book-view.c" } static gboolean _book_view_configure_cb_gtk_widget_configure_event (GtkWidget* _sender, GdkEventConfigure* event, gpointer self) { gboolean result; - result = book_view_configure_cb (self, _sender, event); + result = book_view_configure_cb ((BookView*) self, _sender, event); #line 127 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala" return result; #line 240 "book-view.c" @@ -242,7 +242,7 @@ static gboolean _book_view_configure_cb_gtk_widget_configure_event (GtkWidget* _ static gboolean _book_view_draw_cb_gtk_widget_draw (GtkWidget* _sender, cairo_t* cr, gpointer self) { gboolean result; - result = book_view_draw_cb (self, _sender, cr); + result = book_view_draw_cb ((BookView*) self, _sender, cr); #line 128 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala" return result; #line 249 "book-view.c" @@ -251,7 +251,7 @@ static gboolean _book_view_draw_cb_gtk_widget_draw (GtkWidget* _sender, cairo_t* static gboolean _book_view_motion_cb_gtk_widget_motion_notify_event (GtkWidget* _sender, GdkEventMotion* event, gpointer self) { gboolean result; - result = book_view_motion_cb (self, _sender, event); + result = book_view_motion_cb ((BookView*) self, _sender, event); #line 129 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala" return result; #line 258 "book-view.c" @@ -260,7 +260,7 @@ static gboolean _book_view_motion_cb_gtk_widget_motion_notify_event (GtkWidget* static gboolean _book_view_key_cb_gtk_widget_key_press_event (GtkWidget* _sender, GdkEventKey* event, gpointer self) { gboolean result; - result = book_view_key_cb (self, _sender, event); + result = book_view_key_cb ((BookView*) self, _sender, event); #line 130 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala" return result; #line 267 "book-view.c" @@ -269,7 +269,7 @@ static gboolean _book_view_key_cb_gtk_widget_key_press_event (GtkWidget* _sender static gboolean _book_view_button_cb_gtk_widget_button_press_event (GtkWidget* _sender, GdkEventButton* event, gpointer self) { gboolean result; - result = book_view_button_cb (self, _sender, event); + result = book_view_button_cb ((BookView*) self, _sender, event); #line 131 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala" return result; #line 276 "book-view.c" @@ -278,7 +278,7 @@ static gboolean _book_view_button_cb_gtk_widget_button_press_event (GtkWidget* _ static gboolean _book_view_button_cb_gtk_widget_button_release_event (GtkWidget* _sender, GdkEventButton* event, gpointer self) { gboolean result; - result = book_view_button_cb (self, _sender, event); + result = book_view_button_cb ((BookView*) self, _sender, event); #line 132 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala" return result; #line 285 "book-view.c" @@ -287,7 +287,7 @@ static gboolean _book_view_button_cb_gtk_widget_button_release_event (GtkWidget* static gboolean _book_view_focus_cb_gtk_widget_focus_in_event (GtkWidget* _sender, GdkEventFocus* event, gpointer self) { gboolean result; - result = book_view_focus_cb (self, _sender, event); + result = book_view_focus_cb ((BookView*) self, _sender, event); #line 133 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala" return result; #line 294 "book-view.c" @@ -296,7 +296,7 @@ static gboolean _book_view_focus_cb_gtk_widget_focus_in_event (GtkWidget* _sende static gboolean _book_view_focus_cb_gtk_widget_focus_out_event (GtkWidget* _sender, GdkEventFocus* event, gpointer self) { gboolean result; - result = book_view_focus_cb (self, _sender, event); + result = book_view_focus_cb ((BookView*) self, _sender, event); #line 134 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala" return result; #line 303 "book-view.c" @@ -305,7 +305,7 @@ static gboolean _book_view_focus_cb_gtk_widget_focus_out_event (GtkWidget* _send static void _book_view_scroll_cb_gtk_adjustment_value_changed (GtkAdjustment* _sender, gpointer self) { #line 135 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala" - book_view_scroll_cb (self, _sender); + book_view_scroll_cb ((BookView*) self, _sender); #line 310 "book-view.c" } @@ -334,23 +334,24 @@ static gpointer _g_object_ref0 (gpointer self) { BookView* book_view_construct (GType object_type, Book* book) { BookView * self = NULL; Book* _tmp0_ = NULL; - Book* _tmp13_ = NULL; + Book* _tmp12_ = NULL; + Page* _tmp13_ = NULL; Page* _tmp14_ = NULL; - Page* _tmp15_ = NULL; + Book* _tmp15_ = NULL; Book* _tmp16_ = NULL; Book* _tmp17_ = NULL; Book* _tmp18_ = NULL; - Book* _tmp19_ = NULL; - GHashFunc _tmp20_ = NULL; - GEqualFunc _tmp21_ = NULL; - GHashTable* _tmp22_ = NULL; - GtkDrawingArea* _tmp23_ = NULL; + GHashFunc _tmp19_ = NULL; + GEqualFunc _tmp20_ = NULL; + GHashTable* _tmp21_ = NULL; + GtkDrawingArea* _tmp22_ = NULL; + GtkWidget* _tmp23_ = NULL; GtkWidget* _tmp24_ = NULL; GtkWidget* _tmp25_ = NULL; GtkWidget* _tmp26_ = NULL; - GtkWidget* _tmp27_ = NULL; + GtkScrollbar* _tmp27_ = NULL; GtkScrollbar* _tmp28_ = NULL; - GtkScrollbar* _tmp29_ = NULL; + GtkAdjustment* _tmp29_ = NULL; GtkAdjustment* _tmp30_ = NULL; GtkAdjustment* _tmp31_ = NULL; GtkScrollbar* _tmp32_ = NULL; @@ -372,154 +373,153 @@ BookView* book_view_construct (GType object_type, Book* book) { _tmp0_ = book; #line 77 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala" book_view_set_book (self, _tmp0_); -#line 376 "book-view.c" +#line 377 "book-view.c" { gint i = 0; #line 80 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala" i = 0; -#line 381 "book-view.c" +#line 382 "book-view.c" { gboolean _tmp1_ = FALSE; #line 80 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala" _tmp1_ = TRUE; #line 80 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala" while (TRUE) { -#line 388 "book-view.c" - gboolean _tmp2_ = FALSE; - gint _tmp4_ = 0; - Book* _tmp5_ = NULL; +#line 389 "book-view.c" + gint _tmp3_ = 0; + Book* _tmp4_ = NULL; + guint _tmp5_ = 0U; guint _tmp6_ = 0U; - guint _tmp7_ = 0U; Page* page = NULL; - Book* _tmp8_ = NULL; - gint _tmp9_ = 0; - Page* _tmp10_ = NULL; - Book* _tmp11_ = NULL; - Page* _tmp12_ = NULL; -#line 80 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala" - _tmp2_ = _tmp1_; + Book* _tmp7_ = NULL; + gint _tmp8_ = 0; + Page* _tmp9_ = NULL; + Book* _tmp10_ = NULL; + Page* _tmp11_ = NULL; #line 80 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala" - if (!_tmp2_) { -#line 404 "book-view.c" - gint _tmp3_ = 0; + if (!_tmp1_) { +#line 402 "book-view.c" + gint _tmp2_ = 0; #line 80 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala" - _tmp3_ = i; + _tmp2_ = i; #line 80 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala" - i = _tmp3_ + 1; -#line 410 "book-view.c" + i = _tmp2_ + 1; +#line 408 "book-view.c" } #line 80 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala" _tmp1_ = FALSE; #line 80 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala" - _tmp4_ = i; + _tmp3_ = i; #line 80 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala" - _tmp5_ = book; + _tmp4_ = book; #line 80 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala" - _tmp6_ = book_get_n_pages (_tmp5_); + _tmp5_ = book_get_n_pages (_tmp4_); #line 80 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala" - _tmp7_ = _tmp6_; + _tmp6_ = _tmp5_; #line 80 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala" - if (!(((guint) _tmp4_) < _tmp7_)) { + if (!(((guint) _tmp3_) < _tmp6_)) { #line 80 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala" break; -#line 426 "book-view.c" +#line 424 "book-view.c" } #line 82 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala" - _tmp8_ = book; + _tmp7_ = book; #line 82 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala" - _tmp9_ = i; + _tmp8_ = i; #line 82 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala" - _tmp10_ = book_get_page (_tmp8_, _tmp9_); + _tmp9_ = book_get_page (_tmp7_, _tmp8_); #line 82 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala" - page = _tmp10_; + page = _tmp9_; #line 83 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala" - _tmp11_ = book; + _tmp10_ = book; #line 83 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala" - _tmp12_ = page; + _tmp11_ = page; #line 83 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala" - book_view_add_cb (self, _tmp11_, _tmp12_); + book_view_add_cb (self, _tmp10_, _tmp11_); #line 80 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala" _page_unref0 (page); -#line 444 "book-view.c" +#line 442 "book-view.c" } } } #line 86 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala" - _tmp13_ = book; + _tmp12_ = book; #line 86 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala" - _tmp14_ = book_get_page (_tmp13_, 0); + _tmp13_ = book_get_page (_tmp12_, 0); #line 86 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala" - _tmp15_ = _tmp14_; + _tmp14_ = _tmp13_; #line 86 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala" - book_view_set_selected_page (self, _tmp15_); + book_view_set_selected_page (self, _tmp14_); #line 86 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala" - _page_unref0 (_tmp15_); + _page_unref0 (_tmp14_); #line 89 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala" - _tmp16_ = book; + _tmp15_ = book; #line 89 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala" - g_signal_connect_object (_tmp16_, "page-added", (GCallback) _book_view_add_cb_book_page_added, self, 0); + g_signal_connect_object (_tmp15_, "page-added", (GCallback) _book_view_add_cb_book_page_added, self, 0); #line 90 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala" - _tmp17_ = book; + _tmp16_ = book; #line 90 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala" - g_signal_connect_object (_tmp17_, "page-removed", (GCallback) _book_view_remove_cb_book_page_removed, self, 0); + g_signal_connect_object (_tmp16_, "page-removed", (GCallback) _book_view_remove_cb_book_page_removed, self, 0); #line 91 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala" - _tmp18_ = book; + _tmp17_ = book; #line 91 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala" - g_signal_connect_object (_tmp18_, "reordered", (GCallback) _book_view_reorder_cb_book_reordered, self, 0); + g_signal_connect_object (_tmp17_, "reordered", (GCallback) _book_view_reorder_cb_book_reordered, self, 0); #line 92 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala" - _tmp19_ = book; + _tmp18_ = book; #line 92 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala" - g_signal_connect_object (_tmp19_, "cleared", (GCallback) _book_view_clear_cb_book_cleared, self, 0); + g_signal_connect_object (_tmp18_, "cleared", (GCallback) _book_view_clear_cb_book_cleared, self, 0); #line 94 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala" self->priv->need_layout = TRUE; #line 95 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala" - _tmp20_ = g_direct_hash; + _tmp19_ = g_direct_hash; #line 95 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala" - _tmp21_ = g_direct_equal; + _tmp20_ = g_direct_equal; #line 95 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala" - _tmp22_ = g_hash_table_new_full (_tmp20_, _tmp21_, _page_unref0_, _page_view_unref0_); + _tmp21_ = g_hash_table_new_full (_tmp19_, _tmp20_, _page_unref0_, _page_view_unref0_); #line 95 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala" _g_hash_table_unref0 (self->priv->page_data); #line 95 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala" - self->priv->page_data = _tmp22_; + self->priv->page_data = _tmp21_; #line 96 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala" self->priv->cursor = GDK_ARROW; #line 98 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala" - _tmp23_ = (GtkDrawingArea*) gtk_drawing_area_new (); + _tmp22_ = (GtkDrawingArea*) gtk_drawing_area_new (); #line 98 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala" - g_object_ref_sink (_tmp23_); + g_object_ref_sink (_tmp22_); #line 98 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala" _g_object_unref0 (self->priv->drawing_area); #line 98 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala" - self->priv->drawing_area = (GtkWidget*) _tmp23_; + self->priv->drawing_area = (GtkWidget*) _tmp22_; #line 99 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala" - _tmp24_ = self->priv->drawing_area; + _tmp23_ = self->priv->drawing_area; #line 99 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala" - gtk_widget_set_size_request (_tmp24_, 200, 100); + gtk_widget_set_size_request (_tmp23_, 200, 100); #line 100 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala" - _tmp25_ = self->priv->drawing_area; + _tmp24_ = self->priv->drawing_area; #line 100 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala" - gtk_widget_set_can_focus (_tmp25_, TRUE); + g_object_set (_tmp24_, "can-focus", TRUE, NULL); #line 101 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala" - _tmp26_ = self->priv->drawing_area; + _tmp25_ = self->priv->drawing_area; #line 101 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala" - gtk_widget_set_events (_tmp26_, (gint) (((((GDK_POINTER_MOTION_MASK | GDK_BUTTON_PRESS_MASK) | GDK_BUTTON_RELEASE_MASK) | GDK_FOCUS_CHANGE_MASK) | GDK_STRUCTURE_MASK) | GDK_SCROLL_MASK)); + gtk_widget_set_events (_tmp25_, ((((GDK_POINTER_MOTION_MASK | GDK_BUTTON_PRESS_MASK) | GDK_BUTTON_RELEASE_MASK) | GDK_FOCUS_CHANGE_MASK) | GDK_STRUCTURE_MASK) | GDK_SCROLL_MASK); #line 102 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala" - _tmp27_ = self->priv->drawing_area; + _tmp26_ = self->priv->drawing_area; #line 102 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala" - gtk_box_pack_start ((GtkBox*) self, _tmp27_, TRUE, TRUE, (guint) 0); + gtk_box_pack_start ((GtkBox*) self, _tmp26_, TRUE, TRUE, (guint) 0); #line 104 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala" - _tmp28_ = (GtkScrollbar*) gtk_scrollbar_new (GTK_ORIENTATION_HORIZONTAL, NULL); + _tmp27_ = (GtkScrollbar*) gtk_scrollbar_new (GTK_ORIENTATION_HORIZONTAL, NULL); #line 104 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala" - g_object_ref_sink (_tmp28_); + g_object_ref_sink (_tmp27_); #line 104 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala" _g_object_unref0 (self->priv->scroll); #line 104 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala" - self->priv->scroll = _tmp28_; + self->priv->scroll = _tmp27_; #line 105 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala" - _tmp29_ = self->priv->scroll; + _tmp28_ = self->priv->scroll; #line 105 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala" - _tmp30_ = gtk_range_get_adjustment ((GtkRange*) _tmp29_); + _tmp29_ = gtk_range_get_adjustment ((GtkRange*) _tmp28_); +#line 105 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala" + _tmp30_ = _tmp29_; #line 105 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala" _tmp31_ = _g_object_ref0 (_tmp30_); #line 105 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala" @@ -569,7 +569,7 @@ BookView* book_view_construct (GType object_type, Book* book) { #line 118 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala" _tmp42_ = self->priv->drawing_area; #line 118 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala" - gtk_widget_show (_tmp42_); + gtk_widget_set_visible (_tmp42_, TRUE); #line 74 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala" return self; #line 576 "book-view.c" @@ -627,8 +627,8 @@ static PageView* book_view_get_nth_page (BookView* self, gint n) { static PageView* book_view_get_next_page (BookView* self, PageView* page) { PageView* result = NULL; + PageView* _tmp18_ = NULL; PageView* _tmp19_ = NULL; - PageView* _tmp20_ = NULL; #line 144 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala" g_return_val_if_fail (self != NULL, NULL); #line 144 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala" @@ -646,114 +646,111 @@ static PageView* book_view_get_next_page (BookView* self, PageView* page) { #line 146 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala" while (TRUE) { #line 649 "book-view.c" - gboolean _tmp1_ = FALSE; Page* p = NULL; - Book* _tmp3_ = NULL; - gint _tmp4_ = 0; + Book* _tmp2_ = NULL; + gint _tmp3_ = 0; + Page* _tmp4_ = NULL; Page* _tmp5_ = NULL; Page* _tmp6_ = NULL; - Page* _tmp7_ = NULL; - PageView* _tmp8_ = NULL; + PageView* _tmp7_ = NULL; + Page* _tmp8_ = NULL; Page* _tmp9_ = NULL; - Page* _tmp10_ = NULL; #line 146 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala" - _tmp1_ = _tmp0_; -#line 146 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala" - if (!_tmp1_) { -#line 664 "book-view.c" - gint _tmp2_ = 0; + if (!_tmp0_) { +#line 661 "book-view.c" + gint _tmp1_ = 0; #line 146 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala" - _tmp2_ = i; + _tmp1_ = i; #line 146 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala" - i = _tmp2_ + 1; -#line 670 "book-view.c" + i = _tmp1_ + 1; +#line 667 "book-view.c" } #line 146 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala" _tmp0_ = FALSE; #line 148 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala" - _tmp3_ = self->priv->_book; + _tmp2_ = self->priv->_book; #line 148 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala" - _tmp4_ = i; + _tmp3_ = i; #line 148 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala" - _tmp5_ = book_get_page (_tmp3_, _tmp4_); + _tmp4_ = book_get_page (_tmp2_, _tmp3_); #line 148 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala" - p = _tmp5_; + p = _tmp4_; #line 149 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala" - _tmp6_ = p; + _tmp5_ = p; #line 149 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala" - if (_tmp6_ == NULL) { + if (_tmp5_ == NULL) { #line 150 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala" _page_unref0 (p); #line 150 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala" break; -#line 690 "book-view.c" +#line 687 "book-view.c" } #line 151 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala" - _tmp7_ = p; + _tmp6_ = p; #line 151 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala" - _tmp8_ = page; + _tmp7_ = page; #line 151 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala" - _tmp9_ = page_view_get_page (_tmp8_); + _tmp8_ = page_view_get_page (_tmp7_); #line 151 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala" - _tmp10_ = _tmp9_; + _tmp9_ = _tmp8_; #line 151 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala" - if (_tmp7_ == _tmp10_) { -#line 702 "book-view.c" - Book* _tmp11_ = NULL; - gint _tmp12_ = 0; + if (_tmp6_ == _tmp9_) { +#line 699 "book-view.c" + Book* _tmp10_ = NULL; + gint _tmp11_ = 0; + Page* _tmp12_ = NULL; Page* _tmp13_ = NULL; - Page* _tmp14_ = NULL; #line 153 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala" - _tmp11_ = self->priv->_book; + _tmp10_ = self->priv->_book; #line 153 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala" - _tmp12_ = i; + _tmp11_ = i; #line 153 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala" - _tmp13_ = book_get_page (_tmp11_, _tmp12_ + 1); + _tmp12_ = book_get_page (_tmp10_, _tmp11_ + 1); #line 153 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala" _page_unref0 (p); #line 153 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala" - p = _tmp13_; + p = _tmp12_; #line 154 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala" - _tmp14_ = p; + _tmp13_ = p; #line 154 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala" - if (_tmp14_ != NULL) { -#line 721 "book-view.c" - GHashTable* _tmp15_ = NULL; - Page* _tmp16_ = NULL; - gconstpointer _tmp17_ = NULL; - PageView* _tmp18_ = NULL; + if (_tmp13_ != NULL) { +#line 718 "book-view.c" + GHashTable* _tmp14_ = NULL; + Page* _tmp15_ = NULL; + gconstpointer _tmp16_ = NULL; + PageView* _tmp17_ = NULL; #line 155 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala" - _tmp15_ = self->priv->page_data; + _tmp14_ = self->priv->page_data; #line 155 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala" - _tmp16_ = p; + _tmp15_ = p; #line 155 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala" - _tmp17_ = g_hash_table_lookup (_tmp15_, _tmp16_); + _tmp16_ = g_hash_table_lookup (_tmp14_, _tmp15_); #line 155 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala" - _tmp18_ = _page_view_ref0 ((PageView*) _tmp17_); + _tmp17_ = _page_view_ref0 ((PageView*) _tmp16_); #line 155 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala" - result = _tmp18_; + result = _tmp17_; #line 155 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala" _page_unref0 (p); #line 155 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala" return result; -#line 740 "book-view.c" +#line 737 "book-view.c" } } #line 146 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala" _page_unref0 (p); -#line 745 "book-view.c" +#line 742 "book-view.c" } } } #line 159 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala" - _tmp19_ = page; + _tmp18_ = page; #line 159 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala" - _tmp20_ = _page_view_ref0 (_tmp19_); + _tmp19_ = _page_view_ref0 (_tmp18_); #line 159 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala" - result = _tmp20_; + result = _tmp19_; #line 159 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala" return result; -#line 757 "book-view.c" +#line 754 "book-view.c" } @@ -762,8 +759,8 @@ static PageView* book_view_get_prev_page (BookView* self, PageView* page) { PageView* prev_page = NULL; PageView* _tmp0_ = NULL; PageView* _tmp1_ = NULL; + PageView* _tmp16_ = NULL; PageView* _tmp17_ = NULL; - PageView* _tmp18_ = NULL; #line 162 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala" g_return_val_if_fail (self != NULL, NULL); #line 162 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala" @@ -774,112 +771,109 @@ static PageView* book_view_get_prev_page (BookView* self, PageView* page) { _tmp1_ = _page_view_ref0 (_tmp0_); #line 164 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala" prev_page = _tmp1_; -#line 778 "book-view.c" +#line 775 "book-view.c" { gint i = 0; #line 165 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala" i = 0; -#line 783 "book-view.c" +#line 780 "book-view.c" { gboolean _tmp2_ = FALSE; #line 165 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala" _tmp2_ = TRUE; #line 165 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala" while (TRUE) { -#line 790 "book-view.c" - gboolean _tmp3_ = FALSE; +#line 787 "book-view.c" Page* p = NULL; - Book* _tmp5_ = NULL; - gint _tmp6_ = 0; + Book* _tmp4_ = NULL; + gint _tmp5_ = 0; + Page* _tmp6_ = NULL; Page* _tmp7_ = NULL; Page* _tmp8_ = NULL; - Page* _tmp9_ = NULL; - PageView* _tmp10_ = NULL; + PageView* _tmp9_ = NULL; + Page* _tmp10_ = NULL; Page* _tmp11_ = NULL; - Page* _tmp12_ = NULL; - GHashTable* _tmp13_ = NULL; - Page* _tmp14_ = NULL; - gconstpointer _tmp15_ = NULL; - PageView* _tmp16_ = NULL; + GHashTable* _tmp12_ = NULL; + Page* _tmp13_ = NULL; + gconstpointer _tmp14_ = NULL; + PageView* _tmp15_ = NULL; #line 165 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala" - _tmp3_ = _tmp2_; -#line 165 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala" - if (!_tmp3_) { -#line 809 "book-view.c" - gint _tmp4_ = 0; + if (!_tmp2_) { +#line 803 "book-view.c" + gint _tmp3_ = 0; #line 165 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala" - _tmp4_ = i; + _tmp3_ = i; #line 165 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala" - i = _tmp4_ + 1; -#line 815 "book-view.c" + i = _tmp3_ + 1; +#line 809 "book-view.c" } #line 165 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala" _tmp2_ = FALSE; #line 167 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala" - _tmp5_ = self->priv->_book; + _tmp4_ = self->priv->_book; #line 167 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala" - _tmp6_ = i; + _tmp5_ = i; #line 167 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala" - _tmp7_ = book_get_page (_tmp5_, _tmp6_); + _tmp6_ = book_get_page (_tmp4_, _tmp5_); #line 167 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala" - p = _tmp7_; + p = _tmp6_; #line 168 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala" - _tmp8_ = p; + _tmp7_ = p; #line 168 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala" - if (_tmp8_ == NULL) { + if (_tmp7_ == NULL) { #line 169 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala" _page_unref0 (p); #line 169 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala" break; -#line 835 "book-view.c" +#line 829 "book-view.c" } #line 170 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala" - _tmp9_ = p; + _tmp8_ = p; #line 170 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala" - _tmp10_ = page; + _tmp9_ = page; #line 170 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala" - _tmp11_ = page_view_get_page (_tmp10_); + _tmp10_ = page_view_get_page (_tmp9_); #line 170 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala" - _tmp12_ = _tmp11_; + _tmp11_ = _tmp10_; #line 170 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala" - if (_tmp9_ == _tmp12_) { + if (_tmp8_ == _tmp11_) { #line 171 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala" result = prev_page; #line 171 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala" _page_unref0 (p); #line 171 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala" return result; -#line 853 "book-view.c" +#line 847 "book-view.c" } #line 172 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala" - _tmp13_ = self->priv->page_data; + _tmp12_ = self->priv->page_data; #line 172 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala" - _tmp14_ = p; + _tmp13_ = p; #line 172 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala" - _tmp15_ = g_hash_table_lookup (_tmp13_, _tmp14_); + _tmp14_ = g_hash_table_lookup (_tmp12_, _tmp13_); #line 172 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala" - _tmp16_ = _page_view_ref0 ((PageView*) _tmp15_); + _tmp15_ = _page_view_ref0 ((PageView*) _tmp14_); #line 172 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala" _page_view_unref0 (prev_page); #line 172 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala" - prev_page = _tmp16_; + prev_page = _tmp15_; #line 165 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala" _page_unref0 (p); -#line 869 "book-view.c" +#line 863 "book-view.c" } } } #line 175 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala" - _tmp17_ = page; + _tmp16_ = page; #line 175 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala" - _tmp18_ = _page_view_ref0 (_tmp17_); + _tmp17_ = _page_view_ref0 (_tmp16_); #line 175 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala" - result = _tmp18_; + result = _tmp17_; #line 175 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala" _page_view_unref0 (prev_page); #line 175 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala" return result; -#line 883 "book-view.c" +#line 877 "book-view.c" } @@ -890,7 +884,7 @@ static void book_view_page_view_changed_cb (BookView* self, PageView* page) { g_return_if_fail (page != NULL); #line 180 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala" book_view_redraw (self); -#line 894 "book-view.c" +#line 888 "book-view.c" } @@ -903,28 +897,28 @@ static void book_view_page_view_size_changed_cb (BookView* self, PageView* page) self->priv->need_layout = TRUE; #line 186 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala" book_view_redraw (self); -#line 907 "book-view.c" +#line 901 "book-view.c" } static void _book_view_page_view_changed_cb_page_view_changed (PageView* _sender, gpointer self) { #line 192 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala" - book_view_page_view_changed_cb (self, _sender); -#line 914 "book-view.c" + book_view_page_view_changed_cb ((BookView*) self, _sender); +#line 908 "book-view.c" } static void _book_view_page_view_size_changed_cb_page_view_size_changed (PageView* _sender, gpointer self) { #line 193 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala" - book_view_page_view_size_changed_cb (self, _sender); -#line 921 "book-view.c" + book_view_page_view_size_changed_cb ((BookView*) self, _sender); +#line 915 "book-view.c" } static gpointer _page_ref0 (gpointer self) { #line 194 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala" return self ? page_ref (self) : NULL; -#line 928 "book-view.c" +#line 922 "book-view.c" } @@ -968,27 +962,26 @@ static void book_view_add_cb (BookView* self, Book* book, Page* page) { book_view_redraw (self); #line 189 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala" _page_view_unref0 (page_view); -#line 972 "book-view.c" +#line 966 "book-view.c" } static void book_view_set_selected_page_view (BookView* self, PageView* page) { gboolean _tmp0_ = FALSE; PageView* _tmp1_ = NULL; - gboolean _tmp4_ = FALSE; + PageView* _tmp5_ = NULL; PageView* _tmp6_ = NULL; PageView* _tmp7_ = NULL; - PageView* _tmp8_ = NULL; - GtkWidget* _tmp9_ = NULL; + GtkWidget* _tmp8_ = NULL; + gboolean _tmp9_ = FALSE; gboolean _tmp10_ = FALSE; - gboolean _tmp11_ = FALSE; #line 199 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala" g_return_if_fail (self != NULL); #line 202 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala" _tmp1_ = self->priv->selected_page_view; #line 202 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala" if (_tmp1_ != NULL) { -#line 992 "book-view.c" +#line 985 "book-view.c" PageView* _tmp2_ = NULL; PageView* _tmp3_ = NULL; #line 202 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala" @@ -997,62 +990,60 @@ static void book_view_set_selected_page_view (BookView* self, PageView* page) { _tmp3_ = self->priv->selected_page_view; #line 202 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala" _tmp0_ = _tmp2_ != _tmp3_; -#line 1001 "book-view.c" +#line 994 "book-view.c" } else { #line 202 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala" _tmp0_ = FALSE; -#line 1005 "book-view.c" +#line 998 "book-view.c" } #line 202 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala" - _tmp4_ = _tmp0_; -#line 202 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala" - if (_tmp4_) { -#line 1011 "book-view.c" - PageView* _tmp5_ = NULL; + if (_tmp0_) { +#line 1002 "book-view.c" + PageView* _tmp4_ = NULL; #line 203 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala" - _tmp5_ = self->priv->selected_page_view; + _tmp4_ = self->priv->selected_page_view; #line 203 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala" - page_view_set_selected (_tmp5_, TRUE); -#line 1017 "book-view.c" + page_view_set_selected (_tmp4_, TRUE); +#line 1008 "book-view.c" } #line 205 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala" - _tmp6_ = page; + _tmp5_ = page; #line 205 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala" - _tmp7_ = _page_view_ref0 (_tmp6_); + _tmp6_ = _page_view_ref0 (_tmp5_); #line 205 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala" _page_view_unref0 (self->priv->selected_page_view); #line 205 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala" - self->priv->selected_page_view = _tmp7_; + self->priv->selected_page_view = _tmp6_; #line 206 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala" - _tmp8_ = self->priv->selected_page_view; + _tmp7_ = self->priv->selected_page_view; #line 206 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala" - if (_tmp8_ == NULL) { + if (_tmp7_ == NULL) { #line 207 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala" return; -#line 1033 "book-view.c" +#line 1024 "book-view.c" } #line 210 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala" - _tmp9_ = self->priv->drawing_area; + _tmp8_ = self->priv->drawing_area; #line 210 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala" - g_object_get (_tmp9_, "has-focus", &_tmp10_, NULL); + g_object_get (_tmp8_, "has-focus", &_tmp9_, NULL); #line 210 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala" - _tmp11_ = _tmp10_; + _tmp10_ = _tmp9_; #line 210 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala" - if (!_tmp11_) { -#line 1043 "book-view.c" - PageView* _tmp12_ = NULL; + if (!_tmp10_) { +#line 1034 "book-view.c" + PageView* _tmp11_ = NULL; #line 211 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala" - _tmp12_ = self->priv->selected_page_view; + _tmp11_ = self->priv->selected_page_view; #line 211 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala" - page_view_set_selected (_tmp12_, FALSE); -#line 1049 "book-view.c" + page_view_set_selected (_tmp11_, FALSE); +#line 1040 "book-view.c" } else { - PageView* _tmp13_ = NULL; + PageView* _tmp12_ = NULL; #line 213 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala" - _tmp13_ = self->priv->selected_page_view; + _tmp12_ = self->priv->selected_page_view; #line 213 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala" - page_view_set_selected (_tmp13_, TRUE); -#line 1056 "book-view.c" + page_view_set_selected (_tmp12_, TRUE); +#line 1047 "book-view.c" } } @@ -1060,19 +1051,19 @@ static void book_view_set_selected_page_view (BookView* self, PageView* page) { static void book_view_show_page_view (BookView* self, PageView* page) { gboolean _tmp0_ = FALSE; PageView* _tmp1_ = NULL; - gboolean _tmp4_ = FALSE; GtkAllocation allocation = {0}; - GtkWidget* _tmp5_ = NULL; - GtkAllocation _tmp6_ = {0}; + GtkWidget* _tmp4_ = NULL; + GtkAllocation _tmp5_ = {0}; gint left_edge = 0; - PageView* _tmp7_ = NULL; + PageView* _tmp6_ = NULL; + gint _tmp7_ = 0; gint _tmp8_ = 0; - gint _tmp9_ = 0; gint right_edge = 0; - PageView* _tmp10_ = NULL; + PageView* _tmp9_ = NULL; + gint _tmp10_ = 0; gint _tmp11_ = 0; - gint _tmp12_ = 0; - PageView* _tmp13_ = NULL; + PageView* _tmp12_ = NULL; + gint _tmp13_ = 0; gint _tmp14_ = 0; gint _tmp15_ = 0; gint _tmp16_ = 0; @@ -1085,7 +1076,7 @@ static void book_view_show_page_view (BookView* self, PageView* page) { if (_tmp1_ == NULL) { #line 218 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala" _tmp0_ = TRUE; -#line 1089 "book-view.c" +#line 1080 "book-view.c" } else { GtkScrollbar* _tmp2_ = NULL; gboolean _tmp3_ = FALSE; @@ -1095,42 +1086,42 @@ static void book_view_show_page_view (BookView* self, PageView* page) { _tmp3_ = gtk_widget_get_visible ((GtkWidget*) _tmp2_); #line 218 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala" _tmp0_ = !_tmp3_; -#line 1099 "book-view.c" +#line 1090 "book-view.c" } #line 218 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala" - _tmp4_ = _tmp0_; -#line 218 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala" - if (_tmp4_) { + if (_tmp0_) { #line 219 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala" return; -#line 1107 "book-view.c" +#line 1096 "book-view.c" } #line 222 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala" - _tmp5_ = self->priv->drawing_area; + _tmp4_ = self->priv->drawing_area; #line 222 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala" - gtk_widget_get_allocation (_tmp5_, &_tmp6_); + gtk_widget_get_allocation (_tmp4_, &_tmp5_); #line 222 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala" - allocation = _tmp6_; + allocation = _tmp5_; #line 223 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala" - _tmp7_ = page; + _tmp6_ = page; #line 223 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala" - _tmp8_ = page_view_get_x_offset (_tmp7_); + _tmp7_ = page_view_get_x_offset (_tmp6_); #line 223 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala" - _tmp9_ = _tmp8_; + _tmp8_ = _tmp7_; #line 223 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala" - left_edge = _tmp9_; + left_edge = _tmp8_; #line 224 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala" - _tmp10_ = page; + _tmp9_ = page; #line 224 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala" - _tmp11_ = page_view_get_x_offset (_tmp10_); + _tmp10_ = page_view_get_x_offset (_tmp9_); +#line 224 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala" + _tmp11_ = _tmp10_; #line 224 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala" - _tmp12_ = _tmp11_; + _tmp12_ = page; #line 224 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala" - _tmp13_ = page; + _tmp13_ = page_view_get_width (_tmp12_); #line 224 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala" - _tmp14_ = page_view_get_width (_tmp13_); + _tmp14_ = _tmp13_; #line 224 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala" - right_edge = _tmp12_ + _tmp14_; + right_edge = _tmp11_ + _tmp14_; #line 226 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala" _tmp15_ = left_edge; #line 226 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala" @@ -1139,13 +1130,13 @@ static void book_view_show_page_view (BookView* self, PageView* page) { _tmp17_ = _tmp16_; #line 226 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala" if ((_tmp15_ - _tmp17_) < 0) { -#line 1143 "book-view.c" +#line 1134 "book-view.c" gint _tmp18_ = 0; #line 227 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala" _tmp18_ = left_edge; #line 227 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala" book_view_set_x_offset (self, _tmp18_); -#line 1149 "book-view.c" +#line 1140 "book-view.c" } else { gint _tmp19_ = 0; gint _tmp20_ = 0; @@ -1164,7 +1155,7 @@ static void book_view_show_page_view (BookView* self, PageView* page) { _tmp23_ = _tmp22_.width; #line 228 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala" if ((_tmp19_ - _tmp21_) > _tmp23_) { -#line 1168 "book-view.c" +#line 1159 "book-view.c" gint _tmp24_ = 0; GtkAllocation _tmp25_ = {0}; gint _tmp26_ = 0; @@ -1176,7 +1167,7 @@ static void book_view_show_page_view (BookView* self, PageView* page) { _tmp26_ = _tmp25_.width; #line 229 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala" book_view_set_x_offset (self, _tmp24_ - _tmp26_); -#line 1180 "book-view.c" +#line 1171 "book-view.c" } } } @@ -1204,7 +1195,7 @@ static void book_view_select_page_view (BookView* self, PageView* page) { _page_unref0 (p); #line 237 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala" return; -#line 1208 "book-view.c" +#line 1199 "book-view.c" } #line 239 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala" _tmp2_ = page; @@ -1216,20 +1207,20 @@ static void book_view_select_page_view (BookView* self, PageView* page) { if (_tmp3_) { #line 242 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala" self->priv->show_selected_page = TRUE; -#line 1220 "book-view.c" +#line 1211 "book-view.c" } else { PageView* _tmp4_ = NULL; #line 244 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala" _tmp4_ = page; #line 244 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala" book_view_show_page_view (self, _tmp4_); -#line 1227 "book-view.c" +#line 1218 "book-view.c" } #line 246 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala" _tmp5_ = page; #line 246 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala" if (_tmp5_ != NULL) { -#line 1233 "book-view.c" +#line 1224 "book-view.c" PageView* _tmp6_ = NULL; Page* _tmp7_ = NULL; Page* _tmp8_ = NULL; @@ -1246,7 +1237,7 @@ static void book_view_select_page_view (BookView* self, PageView* page) { _page_unref0 (p); #line 247 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala" p = _tmp9_; -#line 1250 "book-view.c" +#line 1241 "book-view.c" } #line 248 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala" _tmp10_ = p; @@ -1254,7 +1245,7 @@ static void book_view_select_page_view (BookView* self, PageView* page) { g_signal_emit_by_name (self, "page-selected", _tmp10_); #line 232 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala" _page_unref0 (p); -#line 1258 "book-view.c" +#line 1249 "book-view.c" } @@ -1295,7 +1286,7 @@ static void book_view_remove_cb (BookView* self, Book* book, Page* page) { _tmp4_ = _tmp3_; #line 256 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala" if (_tmp2_ == _tmp4_) { -#line 1299 "book-view.c" +#line 1290 "book-view.c" PageView* _tmp5_ = NULL; PageView* _tmp6_ = NULL; PageView* _tmp7_ = NULL; @@ -1314,7 +1305,7 @@ static void book_view_remove_cb (BookView* self, Book* book, Page* page) { _tmp8_ = self->priv->selected_page_view; #line 259 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala" if (_tmp7_ == _tmp8_) { -#line 1318 "book-view.c" +#line 1309 "book-view.c" PageView* _tmp9_ = NULL; PageView* _tmp10_ = NULL; #line 260 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala" @@ -1325,13 +1316,13 @@ static void book_view_remove_cb (BookView* self, Book* book, Page* page) { _page_view_unref0 (new_selection); #line 260 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala" new_selection = _tmp10_; -#line 1329 "book-view.c" +#line 1320 "book-view.c" } #line 261 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala" _page_view_unref0 (self->priv->selected_page_view); #line 261 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala" self->priv->selected_page_view = NULL; -#line 1335 "book-view.c" +#line 1326 "book-view.c" } #line 264 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala" _tmp11_ = self->priv->page_data; @@ -1369,7 +1360,7 @@ static void book_view_remove_cb (BookView* self, Book* book, Page* page) { _page_view_unref0 (page_view); #line 251 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala" _page_view_unref0 (new_selection); -#line 1373 "book-view.c" +#line 1364 "book-view.c" } @@ -1382,7 +1373,7 @@ static void book_view_reorder_cb (BookView* self, Book* book) { self->priv->need_layout = TRUE; #line 278 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala" book_view_redraw (self); -#line 1386 "book-view.c" +#line 1377 "book-view.c" } @@ -1406,7 +1397,7 @@ static void book_view_clear_cb (BookView* self, Book* book) { self->priv->need_layout = TRUE; #line 287 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala" book_view_redraw (self); -#line 1410 "book-view.c" +#line 1401 "book-view.c" } @@ -1424,7 +1415,7 @@ static gboolean book_view_configure_cb (BookView* self, GtkWidget* widget, GdkEv result = FALSE; #line 293 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala" return result; -#line 1428 "book-view.c" +#line 1419 "book-view.c" } @@ -1435,106 +1426,103 @@ static void book_view_layout_into (BookView* self, gint width, gint height, gint gint max_width = 0; gint max_height = 0; gdouble aspect = 0.0; + gint _tmp47_ = 0; + gint _tmp48_ = 0; + gdouble max_aspect = 0.0; gint _tmp49_ = 0; gint _tmp50_ = 0; - gdouble max_aspect = 0.0; - gint _tmp51_ = 0; - gint _tmp52_ = 0; gint spacing = 0; gint x_offset = 0; #line 296 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala" g_return_if_fail (self != NULL); #line 299 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala" max_dpi = 0; -#line 1450 "book-view.c" +#line 1441 "book-view.c" { gint i = 0; #line 300 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala" i = 0; -#line 1455 "book-view.c" +#line 1446 "book-view.c" { gboolean _tmp0_ = FALSE; #line 300 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala" _tmp0_ = TRUE; #line 300 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala" while (TRUE) { -#line 1462 "book-view.c" - gboolean _tmp1_ = FALSE; - gint _tmp3_ = 0; - Book* _tmp4_ = NULL; +#line 1453 "book-view.c" + gint _tmp2_ = 0; + Book* _tmp3_ = NULL; + guint _tmp4_ = 0U; guint _tmp5_ = 0U; - guint _tmp6_ = 0U; Page* page = NULL; - Book* _tmp7_ = NULL; - gint _tmp8_ = 0; + Book* _tmp6_ = NULL; + gint _tmp7_ = 0; + Page* _tmp8_ = NULL; Page* _tmp9_ = NULL; - Page* _tmp10_ = NULL; + gint _tmp10_ = 0; gint _tmp11_ = 0; gint _tmp12_ = 0; - gint _tmp13_ = 0; #line 300 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala" - _tmp1_ = _tmp0_; -#line 300 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala" - if (!_tmp1_) { -#line 1480 "book-view.c" - gint _tmp2_ = 0; + if (!_tmp0_) { +#line 1468 "book-view.c" + gint _tmp1_ = 0; #line 300 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala" - _tmp2_ = i; + _tmp1_ = i; #line 300 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala" - i = _tmp2_ + 1; -#line 1486 "book-view.c" + i = _tmp1_ + 1; +#line 1474 "book-view.c" } #line 300 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala" _tmp0_ = FALSE; #line 300 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala" - _tmp3_ = i; + _tmp2_ = i; #line 300 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala" - _tmp4_ = self->priv->_book; + _tmp3_ = self->priv->_book; #line 300 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala" - _tmp5_ = book_get_n_pages (_tmp4_); + _tmp4_ = book_get_n_pages (_tmp3_); #line 300 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala" - _tmp6_ = _tmp5_; + _tmp5_ = _tmp4_; #line 300 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala" - if (!(((guint) _tmp3_) < _tmp6_)) { + if (!(((guint) _tmp2_) < _tmp5_)) { #line 300 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala" break; -#line 1502 "book-view.c" +#line 1490 "book-view.c" } #line 302 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala" - _tmp7_ = self->priv->_book; + _tmp6_ = self->priv->_book; #line 302 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala" - _tmp8_ = i; + _tmp7_ = i; #line 302 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala" - _tmp9_ = book_get_page (_tmp7_, _tmp8_); + _tmp8_ = book_get_page (_tmp6_, _tmp7_); #line 302 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala" - page = _tmp9_; + page = _tmp8_; #line 303 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala" - _tmp10_ = page; + _tmp9_ = page; #line 303 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala" - _tmp11_ = page_get_dpi (_tmp10_); + _tmp10_ = page_get_dpi (_tmp9_); #line 303 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala" - _tmp12_ = _tmp11_; + _tmp11_ = _tmp10_; #line 303 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala" - _tmp13_ = max_dpi; + _tmp12_ = max_dpi; #line 303 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala" - if (_tmp12_ > _tmp13_) { -#line 1522 "book-view.c" - Page* _tmp14_ = NULL; + if (_tmp11_ > _tmp12_) { +#line 1510 "book-view.c" + Page* _tmp13_ = NULL; + gint _tmp14_ = 0; gint _tmp15_ = 0; - gint _tmp16_ = 0; #line 304 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala" - _tmp14_ = page; + _tmp13_ = page; #line 304 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala" - _tmp15_ = page_get_dpi (_tmp14_); + _tmp14_ = page_get_dpi (_tmp13_); #line 304 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala" - _tmp16_ = _tmp15_; + _tmp15_ = _tmp14_; #line 304 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala" - max_dpi = _tmp16_; -#line 1534 "book-view.c" + max_dpi = _tmp15_; +#line 1522 "book-view.c" } #line 300 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala" _page_unref0 (page); -#line 1538 "book-view.c" +#line 1526 "book-view.c" } } } @@ -1542,493 +1530,496 @@ static void book_view_layout_into (BookView* self, gint width, gint height, gint max_width = 0; #line 308 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala" max_height = 0; -#line 1546 "book-view.c" +#line 1534 "book-view.c" { gint i = 0; #line 309 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala" i = 0; -#line 1551 "book-view.c" +#line 1539 "book-view.c" { - gboolean _tmp17_ = FALSE; + gboolean _tmp16_ = FALSE; #line 309 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala" - _tmp17_ = TRUE; + _tmp16_ = TRUE; #line 309 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala" while (TRUE) { -#line 1558 "book-view.c" - gboolean _tmp18_ = FALSE; - gint _tmp20_ = 0; - Book* _tmp21_ = NULL; - guint _tmp22_ = 0U; - guint _tmp23_ = 0U; +#line 1546 "book-view.c" + gint _tmp18_ = 0; + Book* _tmp19_ = NULL; + guint _tmp20_ = 0U; + guint _tmp21_ = 0U; Page* page = NULL; - Book* _tmp24_ = NULL; - gint _tmp25_ = 0; - Page* _tmp26_ = NULL; + Book* _tmp22_ = NULL; + gint _tmp23_ = 0; + Page* _tmp24_ = NULL; gint w = 0; - Page* _tmp27_ = NULL; - gint _tmp28_ = 0; - gint _tmp29_ = 0; + Page* _tmp25_ = NULL; + gint _tmp26_ = 0; + gint _tmp27_ = 0; gint h = 0; - Page* _tmp30_ = NULL; + Page* _tmp28_ = NULL; + gint _tmp29_ = 0; + gint _tmp30_ = 0; gint _tmp31_ = 0; gint _tmp32_ = 0; - gint _tmp33_ = 0; + Page* _tmp33_ = NULL; gint _tmp34_ = 0; - Page* _tmp35_ = NULL; + gint _tmp35_ = 0; gint _tmp36_ = 0; gint _tmp37_ = 0; - gint _tmp38_ = 0; + Page* _tmp38_ = NULL; gint _tmp39_ = 0; - Page* _tmp40_ = NULL; + gint _tmp40_ = 0; gint _tmp41_ = 0; gint _tmp42_ = 0; - gint _tmp43_ = 0; gint _tmp44_ = 0; - gint _tmp46_ = 0; - gint _tmp47_ = 0; + gint _tmp45_ = 0; #line 309 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala" - _tmp18_ = _tmp17_; + if (!_tmp16_) { +#line 1579 "book-view.c" + gint _tmp17_ = 0; #line 309 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala" - if (!_tmp18_) { -#line 1594 "book-view.c" - gint _tmp19_ = 0; + _tmp17_ = i; #line 309 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala" - _tmp19_ = i; -#line 309 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala" - i = _tmp19_ + 1; -#line 1600 "book-view.c" + i = _tmp17_ + 1; +#line 1585 "book-view.c" } #line 309 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala" - _tmp17_ = FALSE; + _tmp16_ = FALSE; #line 309 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala" - _tmp20_ = i; + _tmp18_ = i; #line 309 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala" - _tmp21_ = self->priv->_book; + _tmp19_ = self->priv->_book; #line 309 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala" - _tmp22_ = book_get_n_pages (_tmp21_); + _tmp20_ = book_get_n_pages (_tmp19_); #line 309 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala" - _tmp23_ = _tmp22_; + _tmp21_ = _tmp20_; #line 309 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala" - if (!(((guint) _tmp20_) < _tmp23_)) { + if (!(((guint) _tmp18_) < _tmp21_)) { #line 309 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala" break; -#line 1616 "book-view.c" +#line 1601 "book-view.c" } #line 311 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala" - _tmp24_ = self->priv->_book; + _tmp22_ = self->priv->_book; #line 311 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala" - _tmp25_ = i; + _tmp23_ = i; #line 311 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala" - _tmp26_ = book_get_page (_tmp24_, _tmp25_); + _tmp24_ = book_get_page (_tmp22_, _tmp23_); #line 311 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala" - page = _tmp26_; + page = _tmp24_; #line 312 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala" - _tmp27_ = page; + _tmp25_ = page; #line 312 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala" - _tmp28_ = page_get_width (_tmp27_); + _tmp26_ = page_get_width (_tmp25_); #line 312 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala" - _tmp29_ = _tmp28_; + _tmp27_ = _tmp26_; #line 312 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala" - w = _tmp29_; + w = _tmp27_; #line 313 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala" - _tmp30_ = page; + _tmp28_ = page; #line 313 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala" - _tmp31_ = page_get_height (_tmp30_); + _tmp29_ = page_get_height (_tmp28_); #line 313 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala" - _tmp32_ = _tmp31_; + _tmp30_ = _tmp29_; #line 313 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala" - h = _tmp32_; + h = _tmp30_; #line 316 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala" - _tmp33_ = w; + _tmp31_ = w; #line 316 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala" - _tmp34_ = max_dpi; + _tmp32_ = max_dpi; #line 316 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala" - _tmp35_ = page; + _tmp33_ = page; #line 316 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala" - _tmp36_ = page_get_dpi (_tmp35_); + _tmp34_ = page_get_dpi (_tmp33_); #line 316 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala" - _tmp37_ = _tmp36_; + _tmp35_ = _tmp34_; #line 316 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala" - w = (gint) (((((gdouble) _tmp33_) * _tmp34_) / _tmp37_) + 0.5); + w = (gint) (((((gdouble) _tmp31_) * _tmp32_) / _tmp35_) + 0.5); #line 317 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala" - _tmp38_ = h; + _tmp36_ = h; #line 317 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala" - _tmp39_ = max_dpi; + _tmp37_ = max_dpi; #line 317 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala" - _tmp40_ = page; + _tmp38_ = page; #line 317 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala" - _tmp41_ = page_get_dpi (_tmp40_); + _tmp39_ = page_get_dpi (_tmp38_); #line 317 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala" - _tmp42_ = _tmp41_; + _tmp40_ = _tmp39_; #line 317 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala" - h = (gint) (((((gdouble) _tmp38_) * _tmp39_) / _tmp42_) + 0.5); + h = (gint) (((((gdouble) _tmp36_) * _tmp37_) / _tmp40_) + 0.5); #line 319 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala" - _tmp43_ = w; + _tmp41_ = w; #line 319 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala" - _tmp44_ = max_width; + _tmp42_ = max_width; #line 319 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala" - if (_tmp43_ > _tmp44_) { -#line 1672 "book-view.c" - gint _tmp45_ = 0; + if (_tmp41_ > _tmp42_) { +#line 1657 "book-view.c" + gint _tmp43_ = 0; #line 320 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala" - _tmp45_ = w; + _tmp43_ = w; #line 320 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala" - max_width = _tmp45_; -#line 1678 "book-view.c" + max_width = _tmp43_; +#line 1663 "book-view.c" } #line 321 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala" - _tmp46_ = h; + _tmp44_ = h; #line 321 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala" - _tmp47_ = max_height; + _tmp45_ = max_height; #line 321 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala" - if (_tmp46_ > _tmp47_) { -#line 1686 "book-view.c" - gint _tmp48_ = 0; + if (_tmp44_ > _tmp45_) { +#line 1671 "book-view.c" + gint _tmp46_ = 0; #line 322 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala" - _tmp48_ = h; + _tmp46_ = h; #line 322 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala" - max_height = _tmp48_; -#line 1692 "book-view.c" + max_height = _tmp46_; +#line 1677 "book-view.c" } #line 309 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala" _page_unref0 (page); -#line 1696 "book-view.c" +#line 1681 "book-view.c" } } } #line 325 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala" - _tmp49_ = width; + _tmp47_ = width; #line 325 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala" - _tmp50_ = height; + _tmp48_ = height; #line 325 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala" - aspect = ((gdouble) _tmp49_) / _tmp50_; + aspect = ((gdouble) _tmp47_) / _tmp48_; #line 326 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala" - _tmp51_ = max_width; + _tmp49_ = max_width; #line 326 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala" - _tmp52_ = max_height; + _tmp50_ = max_height; #line 326 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala" - max_aspect = ((gdouble) _tmp51_) / _tmp52_; + max_aspect = ((gdouble) _tmp49_) / _tmp50_; #line 329 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala" spacing = 12; #line 330 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala" _vala_book_width = 0; #line 331 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala" _vala_book_height = 0; -#line 1718 "book-view.c" +#line 1703 "book-view.c" { gint i = 0; #line 332 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala" i = 0; -#line 1723 "book-view.c" +#line 1708 "book-view.c" { - gboolean _tmp53_ = FALSE; + gboolean _tmp51_ = FALSE; #line 332 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala" - _tmp53_ = TRUE; + _tmp51_ = TRUE; #line 332 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala" while (TRUE) { -#line 1730 "book-view.c" - gboolean _tmp54_ = FALSE; - gint _tmp56_ = 0; - Book* _tmp57_ = NULL; - guint _tmp58_ = 0U; - guint _tmp59_ = 0U; +#line 1715 "book-view.c" + gint _tmp53_ = 0; + Book* _tmp54_ = NULL; + guint _tmp55_ = 0U; + guint _tmp56_ = 0U; PageView* page = NULL; - gint _tmp60_ = 0; - PageView* _tmp61_ = NULL; + gint _tmp57_ = 0; + PageView* _tmp58_ = NULL; Page* p = NULL; - PageView* _tmp62_ = NULL; - Page* _tmp63_ = NULL; - Page* _tmp64_ = NULL; - Page* _tmp65_ = NULL; - gdouble _tmp66_ = 0.0; - gdouble _tmp67_ = 0.0; + PageView* _tmp59_ = NULL; + Page* _tmp60_ = NULL; + Page* _tmp61_ = NULL; + Page* _tmp62_ = NULL; + gdouble _tmp63_ = 0.0; + gdouble _tmp64_ = 0.0; gint h = 0; - PageView* _tmp90_ = NULL; + PageView* _tmp87_ = NULL; + gint _tmp88_ = 0; + gint _tmp89_ = 0; + gint _tmp90_ = 0; gint _tmp91_ = 0; - gint _tmp92_ = 0; gint _tmp93_ = 0; + PageView* _tmp94_ = NULL; gint _tmp95_ = 0; - PageView* _tmp96_ = NULL; + gint _tmp96_ = 0; gint _tmp97_ = 0; - gint _tmp98_ = 0; #line 332 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala" - _tmp54_ = _tmp53_; -#line 332 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala" - if (!_tmp54_) { -#line 1759 "book-view.c" - gint _tmp55_ = 0; + if (!_tmp51_) { +#line 1743 "book-view.c" + gint _tmp52_ = 0; #line 332 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala" - _tmp55_ = i; + _tmp52_ = i; #line 332 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala" - i = _tmp55_ + 1; -#line 1765 "book-view.c" + i = _tmp52_ + 1; +#line 1749 "book-view.c" } #line 332 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala" - _tmp53_ = FALSE; + _tmp51_ = FALSE; #line 332 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala" - _tmp56_ = i; + _tmp53_ = i; #line 332 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala" - _tmp57_ = self->priv->_book; + _tmp54_ = self->priv->_book; #line 332 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala" - _tmp58_ = book_get_n_pages (_tmp57_); + _tmp55_ = book_get_n_pages (_tmp54_); #line 332 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala" - _tmp59_ = _tmp58_; + _tmp56_ = _tmp55_; #line 332 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala" - if (!(((guint) _tmp56_) < _tmp59_)) { + if (!(((guint) _tmp53_) < _tmp56_)) { #line 332 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala" break; -#line 1781 "book-view.c" +#line 1765 "book-view.c" } #line 334 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala" - _tmp60_ = i; + _tmp57_ = i; #line 334 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala" - _tmp61_ = book_view_get_nth_page (self, _tmp60_); + _tmp58_ = book_view_get_nth_page (self, _tmp57_); #line 334 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala" - page = _tmp61_; + page = _tmp58_; #line 335 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala" - _tmp62_ = page; + _tmp59_ = page; #line 335 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala" - _tmp63_ = page_view_get_page (_tmp62_); + _tmp60_ = page_view_get_page (_tmp59_); #line 335 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala" - _tmp64_ = _tmp63_; + _tmp61_ = _tmp60_; #line 335 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala" - _tmp65_ = _page_ref0 (_tmp64_); + _tmp62_ = _page_ref0 (_tmp61_); #line 335 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala" - p = _tmp65_; + p = _tmp62_; #line 338 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala" - _tmp66_ = max_aspect; + _tmp63_ = max_aspect; #line 338 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala" - _tmp67_ = aspect; + _tmp64_ = aspect; #line 338 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala" - if (_tmp66_ > _tmp67_) { -#line 1805 "book-view.c" + if (_tmp63_ > _tmp64_) { +#line 1789 "book-view.c" gint w = 0; - Page* _tmp68_ = NULL; + Page* _tmp65_ = NULL; + gint _tmp66_ = 0; + gint _tmp67_ = 0; + gint _tmp68_ = 0; gint _tmp69_ = 0; - gint _tmp70_ = 0; + Page* _tmp70_ = NULL; gint _tmp71_ = 0; gint _tmp72_ = 0; - Page* _tmp73_ = NULL; - gint _tmp74_ = 0; + gint _tmp73_ = 0; + PageView* _tmp74_ = NULL; gint _tmp75_ = 0; - gint _tmp76_ = 0; - PageView* _tmp77_ = NULL; - gint _tmp78_ = 0; #line 341 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala" - _tmp68_ = p; + _tmp65_ = p; #line 341 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala" - _tmp69_ = page_get_width (_tmp68_); + _tmp66_ = page_get_width (_tmp65_); #line 341 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala" - _tmp70_ = _tmp69_; + _tmp67_ = _tmp66_; #line 341 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala" - _tmp71_ = max_dpi; + _tmp68_ = max_dpi; #line 341 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala" - _tmp72_ = width; + _tmp69_ = width; #line 341 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala" - _tmp73_ = p; + _tmp70_ = p; #line 341 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala" - _tmp74_ = page_get_dpi (_tmp73_); + _tmp71_ = page_get_dpi (_tmp70_); #line 341 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala" - _tmp75_ = _tmp74_; + _tmp72_ = _tmp71_; #line 341 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala" - _tmp76_ = max_width; + _tmp73_ = max_width; #line 341 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala" - w = (gint) (((((gdouble) _tmp70_) * _tmp71_) * _tmp72_) / (_tmp75_ * _tmp76_)); + w = (gint) (((((gdouble) _tmp67_) * _tmp68_) * _tmp69_) / (_tmp72_ * _tmp73_)); #line 342 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala" - _tmp77_ = page; + _tmp74_ = page; #line 342 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala" - _tmp78_ = w; + _tmp75_ = w; #line 342 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala" - page_view_set_width (_tmp77_, _tmp78_); -#line 1844 "book-view.c" + page_view_set_width (_tmp74_, _tmp75_); +#line 1828 "book-view.c" } else { gint h = 0; - Page* _tmp79_ = NULL; + Page* _tmp76_ = NULL; + gint _tmp77_ = 0; + gint _tmp78_ = 0; + gint _tmp79_ = 0; gint _tmp80_ = 0; - gint _tmp81_ = 0; + Page* _tmp81_ = NULL; gint _tmp82_ = 0; gint _tmp83_ = 0; - Page* _tmp84_ = NULL; - gint _tmp85_ = 0; + gint _tmp84_ = 0; + PageView* _tmp85_ = NULL; gint _tmp86_ = 0; - gint _tmp87_ = 0; - PageView* _tmp88_ = NULL; - gint _tmp89_ = 0; #line 347 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala" - _tmp79_ = p; + _tmp76_ = p; #line 347 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala" - _tmp80_ = page_get_height (_tmp79_); + _tmp77_ = page_get_height (_tmp76_); #line 347 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala" - _tmp81_ = _tmp80_; + _tmp78_ = _tmp77_; #line 347 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala" - _tmp82_ = max_dpi; + _tmp79_ = max_dpi; #line 347 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala" - _tmp83_ = height; + _tmp80_ = height; #line 347 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala" - _tmp84_ = p; + _tmp81_ = p; #line 347 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala" - _tmp85_ = page_get_dpi (_tmp84_); + _tmp82_ = page_get_dpi (_tmp81_); #line 347 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala" - _tmp86_ = _tmp85_; + _tmp83_ = _tmp82_; #line 347 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala" - _tmp87_ = max_height; + _tmp84_ = max_height; #line 347 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala" - h = (gint) (((((gdouble) _tmp81_) * _tmp82_) * _tmp83_) / (_tmp86_ * _tmp87_)); + h = (gint) (((((gdouble) _tmp78_) * _tmp79_) * _tmp80_) / (_tmp83_ * _tmp84_)); #line 348 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala" - _tmp88_ = page; + _tmp85_ = page; #line 348 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala" - _tmp89_ = h; + _tmp86_ = h; #line 348 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala" - page_view_set_height (_tmp88_, _tmp89_); -#line 1884 "book-view.c" + page_view_set_height (_tmp85_, _tmp86_); +#line 1868 "book-view.c" } #line 351 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala" - _tmp90_ = page; + _tmp87_ = page; #line 351 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala" - _tmp91_ = page_view_get_height (_tmp90_); + _tmp88_ = page_view_get_height (_tmp87_); #line 351 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala" - h = _tmp91_; + _tmp89_ = _tmp88_; +#line 351 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala" + h = _tmp89_; #line 352 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala" - _tmp92_ = h; + _tmp90_ = h; #line 352 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala" - _tmp93_ = _vala_book_height; + _tmp91_ = _vala_book_height; #line 352 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala" - if (_tmp92_ > _tmp93_) { -#line 1898 "book-view.c" - gint _tmp94_ = 0; + if (_tmp90_ > _tmp91_) { +#line 1884 "book-view.c" + gint _tmp92_ = 0; #line 353 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala" - _tmp94_ = h; + _tmp92_ = h; #line 353 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala" - _vala_book_height = _tmp94_; -#line 1904 "book-view.c" + _vala_book_height = _tmp92_; +#line 1890 "book-view.c" } #line 354 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala" - _tmp95_ = _vala_book_width; + _tmp93_ = _vala_book_width; #line 354 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala" - _tmp96_ = page; + _tmp94_ = page; #line 354 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala" - _tmp97_ = page_view_get_width (_tmp96_); + _tmp95_ = page_view_get_width (_tmp94_); #line 354 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala" - _vala_book_width = _tmp95_ + _tmp97_; + _tmp96_ = _tmp95_; +#line 354 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala" + _vala_book_width = _tmp93_ + _tmp96_; #line 355 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala" - _tmp98_ = i; + _tmp97_ = i; #line 355 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala" - if (_tmp98_ != 0) { -#line 1918 "book-view.c" + if (_tmp97_ != 0) { +#line 1906 "book-view.c" + gint _tmp98_ = 0; gint _tmp99_ = 0; - gint _tmp100_ = 0; #line 356 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala" - _tmp99_ = _vala_book_width; + _tmp98_ = _vala_book_width; #line 356 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala" - _tmp100_ = spacing; + _tmp99_ = spacing; #line 356 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala" - _vala_book_width = _tmp99_ + _tmp100_; -#line 1927 "book-view.c" + _vala_book_width = _tmp98_ + _tmp99_; +#line 1915 "book-view.c" } #line 332 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala" _page_unref0 (p); #line 332 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala" _page_view_unref0 (page); -#line 1933 "book-view.c" +#line 1921 "book-view.c" } } } #line 359 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala" x_offset = 0; -#line 1939 "book-view.c" +#line 1927 "book-view.c" { gint i = 0; #line 360 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala" i = 0; -#line 1944 "book-view.c" +#line 1932 "book-view.c" { - gboolean _tmp101_ = FALSE; + gboolean _tmp100_ = FALSE; #line 360 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala" - _tmp101_ = TRUE; + _tmp100_ = TRUE; #line 360 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala" while (TRUE) { -#line 1951 "book-view.c" - gboolean _tmp102_ = FALSE; - gint _tmp104_ = 0; - Book* _tmp105_ = NULL; - guint _tmp106_ = 0U; - guint _tmp107_ = 0U; +#line 1939 "book-view.c" + gint _tmp102_ = 0; + Book* _tmp103_ = NULL; + guint _tmp104_ = 0U; + guint _tmp105_ = 0U; PageView* page = NULL; - gint _tmp108_ = 0; - PageView* _tmp109_ = NULL; - PageView* _tmp110_ = NULL; - gint _tmp111_ = 0; + gint _tmp106_ = 0; + PageView* _tmp107_ = NULL; + PageView* _tmp108_ = NULL; + gint _tmp109_ = 0; + gint _tmp110_ = 0; + PageView* _tmp111_ = NULL; gint _tmp112_ = 0; - PageView* _tmp113_ = NULL; + gint _tmp113_ = 0; gint _tmp114_ = 0; - gint _tmp115_ = 0; - PageView* _tmp116_ = NULL; - gint _tmp117_ = 0; - PageView* _tmp118_ = NULL; + PageView* _tmp115_ = NULL; + gint _tmp116_ = 0; + PageView* _tmp117_ = NULL; + gint _tmp118_ = 0; gint _tmp119_ = 0; #line 360 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala" - _tmp102_ = _tmp101_; -#line 360 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala" - if (!_tmp102_) { -#line 1974 "book-view.c" - gint _tmp103_ = 0; + if (!_tmp100_) { +#line 1961 "book-view.c" + gint _tmp101_ = 0; #line 360 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala" - _tmp103_ = i; + _tmp101_ = i; #line 360 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala" - i = _tmp103_ + 1; -#line 1980 "book-view.c" + i = _tmp101_ + 1; +#line 1967 "book-view.c" } #line 360 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala" - _tmp101_ = FALSE; + _tmp100_ = FALSE; #line 360 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala" - _tmp104_ = i; + _tmp102_ = i; #line 360 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala" - _tmp105_ = self->priv->_book; + _tmp103_ = self->priv->_book; #line 360 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala" - _tmp106_ = book_get_n_pages (_tmp105_); + _tmp104_ = book_get_n_pages (_tmp103_); #line 360 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala" - _tmp107_ = _tmp106_; + _tmp105_ = _tmp104_; #line 360 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala" - if (!(((guint) _tmp104_) < _tmp107_)) { + if (!(((guint) _tmp102_) < _tmp105_)) { #line 360 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala" break; -#line 1996 "book-view.c" +#line 1983 "book-view.c" } #line 362 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala" - _tmp108_ = i; + _tmp106_ = i; #line 362 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala" - _tmp109_ = book_view_get_nth_page (self, _tmp108_); + _tmp107_ = book_view_get_nth_page (self, _tmp106_); #line 362 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala" - page = _tmp109_; + page = _tmp107_; #line 365 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala" - _tmp110_ = page; + _tmp108_ = page; #line 365 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala" - _tmp111_ = x_offset; + _tmp109_ = x_offset; #line 365 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala" - page_view_set_x_offset (_tmp110_, _tmp111_); + page_view_set_x_offset (_tmp108_, _tmp109_); #line 366 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala" - _tmp112_ = x_offset; + _tmp110_ = x_offset; #line 366 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala" - _tmp113_ = page; + _tmp111_ = page; #line 366 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala" - _tmp114_ = page_view_get_width (_tmp113_); + _tmp112_ = page_view_get_width (_tmp111_); #line 366 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala" - _tmp115_ = spacing; + _tmp113_ = _tmp112_; #line 366 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala" - x_offset = _tmp112_ + (_tmp114_ + _tmp115_); + _tmp114_ = spacing; +#line 366 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala" + x_offset = _tmp110_ + (_tmp113_ + _tmp114_); +#line 369 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala" + _tmp115_ = page; #line 369 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala" - _tmp116_ = page; + _tmp116_ = height; #line 369 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala" - _tmp117_ = height; + _tmp117_ = page; #line 369 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala" - _tmp118_ = page; + _tmp118_ = page_view_get_height (_tmp117_); #line 369 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala" - _tmp119_ = page_view_get_height (_tmp118_); + _tmp119_ = _tmp118_; #line 369 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala" - page_view_set_y_offset (_tmp116_, (_tmp117_ - _tmp119_) / 2); + page_view_set_y_offset (_tmp115_, (_tmp116_ - _tmp119_) / 2); #line 360 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala" _page_view_unref0 (page); -#line 2032 "book-view.c" +#line 2023 "book-view.c" } } } @@ -2036,13 +2027,13 @@ static void book_view_layout_into (BookView* self, gint width, gint height, gint if (book_width) { #line 296 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala" *book_width = _vala_book_width; -#line 2040 "book-view.c" +#line 2031 "book-view.c" } #line 296 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala" if (book_height) { #line 296 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala" *book_height = _vala_book_height; -#line 2046 "book-view.c" +#line 2037 "book-view.c" } } @@ -2077,7 +2068,7 @@ static void book_view_layout (BookView* self) { gint _tmp19_ = 0; GtkAllocation _tmp20_ = {0}; gint _tmp21_ = 0; - gboolean _tmp55_ = FALSE; + gboolean _tmp54_ = FALSE; #line 373 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala" g_return_if_fail (self != NULL); #line 375 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala" @@ -2086,7 +2077,7 @@ static void book_view_layout (BookView* self) { if (!_tmp0_) { #line 376 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala" return; -#line 2090 "book-view.c" +#line 2081 "book-view.c" } #line 378 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala" self->priv->laying_out = TRUE; @@ -2118,7 +2109,7 @@ static void book_view_layout (BookView* self) { if (_tmp5_ < (_tmp7_ - _tmp9_)) { #line 388 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala" right_aligned = FALSE; -#line 2122 "book-view.c" +#line 2113 "book-view.c" } #line 391 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala" _tmp10_ = allocation; @@ -2152,7 +2143,7 @@ static void book_view_layout (BookView* self) { _tmp21_ = _tmp20_.width; #line 397 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala" if (_tmp19_ > _tmp21_) { -#line 2156 "book-view.c" +#line 2147 "book-view.c" GtkAllocation _tmp22_ = {0}; gint _tmp23_ = 0; gint _tmp24_ = 0; @@ -2171,8 +2162,7 @@ static void book_view_layout (BookView* self) { gint _tmp36_ = 0; gboolean _tmp37_ = FALSE; gboolean _tmp38_ = FALSE; - gboolean _tmp42_ = FALSE; - GtkScrollbar* _tmp44_ = NULL; + GtkScrollbar* _tmp43_ = NULL; #line 400 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala" _tmp22_ = allocation; #line 400 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala" @@ -2221,7 +2211,7 @@ static void book_view_layout (BookView* self) { if (_tmp38_) { #line 410 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala" _tmp37_ = TRUE; -#line 2225 "book-view.c" +#line 2215 "book-view.c" } else { gint _tmp39_ = 0; gint _tmp40_ = 0; @@ -2234,82 +2224,80 @@ static void book_view_layout (BookView* self) { _tmp41_ = max_offset; #line 410 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala" _tmp37_ = _tmp40_ > _tmp41_; -#line 2238 "book-view.c" +#line 2228 "book-view.c" } #line 410 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala" - _tmp42_ = _tmp37_; -#line 410 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala" - if (_tmp42_) { -#line 2244 "book-view.c" - gint _tmp43_ = 0; + if (_tmp37_) { +#line 2232 "book-view.c" + gint _tmp42_ = 0; #line 411 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala" - _tmp43_ = max_offset; + _tmp42_ = max_offset; #line 411 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala" - book_view_set_x_offset (self, _tmp43_); -#line 2250 "book-view.c" + book_view_set_x_offset (self, _tmp42_); +#line 2238 "book-view.c" } #line 413 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala" - _tmp44_ = self->priv->scroll; + _tmp43_ = self->priv->scroll; #line 413 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala" - gtk_widget_show ((GtkWidget*) _tmp44_); -#line 2256 "book-view.c" + gtk_widget_set_visible ((GtkWidget*) _tmp43_, TRUE); +#line 2244 "book-view.c" } else { - GtkScrollbar* _tmp45_ = NULL; + GtkScrollbar* _tmp44_ = NULL; gint offset = 0; - gint _tmp46_ = 0; - GtkAllocation _tmp47_ = {0}; - gint _tmp48_ = 0; - GtkAdjustment* _tmp49_ = NULL; - gint _tmp50_ = 0; - GtkAdjustment* _tmp51_ = NULL; - gint _tmp52_ = 0; - GtkAdjustment* _tmp53_ = NULL; - gint _tmp54_ = 0; + gint _tmp45_ = 0; + GtkAllocation _tmp46_ = {0}; + gint _tmp47_ = 0; + GtkAdjustment* _tmp48_ = NULL; + gint _tmp49_ = 0; + GtkAdjustment* _tmp50_ = NULL; + gint _tmp51_ = 0; + GtkAdjustment* _tmp52_ = NULL; + gint _tmp53_ = 0; #line 417 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala" - _tmp45_ = self->priv->scroll; + _tmp44_ = self->priv->scroll; #line 417 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala" - gtk_widget_hide ((GtkWidget*) _tmp45_); + gtk_widget_set_visible ((GtkWidget*) _tmp44_, FALSE); #line 418 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala" - _tmp46_ = book_width; + _tmp45_ = book_width; #line 418 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala" - _tmp47_ = allocation; + _tmp46_ = allocation; #line 418 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala" - _tmp48_ = _tmp47_.width; + _tmp47_ = _tmp46_.width; #line 418 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala" - offset = (_tmp46_ - _tmp48_) / 2; + offset = (_tmp45_ - _tmp47_) / 2; #line 419 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala" - _tmp49_ = self->priv->adjustment; + _tmp48_ = self->priv->adjustment; #line 419 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala" - _tmp50_ = offset; + _tmp49_ = offset; #line 419 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala" - gtk_adjustment_set_lower (_tmp49_, (gdouble) _tmp50_); + gtk_adjustment_set_lower (_tmp48_, (gdouble) _tmp49_); #line 420 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala" - _tmp51_ = self->priv->adjustment; + _tmp50_ = self->priv->adjustment; #line 420 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala" - _tmp52_ = offset; + _tmp51_ = offset; #line 420 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala" - gtk_adjustment_set_upper (_tmp51_, (gdouble) _tmp52_); + gtk_adjustment_set_upper (_tmp50_, (gdouble) _tmp51_); #line 421 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala" - _tmp53_ = self->priv->adjustment; + _tmp52_ = self->priv->adjustment; #line 421 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala" - gtk_adjustment_set_page_size (_tmp53_, (gdouble) 0); + gtk_adjustment_set_page_size (_tmp52_, (gdouble) 0); #line 422 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala" - _tmp54_ = offset; + _tmp53_ = offset; #line 422 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala" - book_view_set_x_offset (self, _tmp54_); -#line 2301 "book-view.c" + book_view_set_x_offset (self, _tmp53_); +#line 2289 "book-view.c" } #line 425 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala" - _tmp55_ = self->priv->show_selected_page; + _tmp54_ = self->priv->show_selected_page; #line 425 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala" - if (_tmp55_) { -#line 2307 "book-view.c" - PageView* _tmp56_ = NULL; + if (_tmp54_) { +#line 2295 "book-view.c" + PageView* _tmp55_ = NULL; #line 426 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala" - _tmp56_ = self->priv->selected_page_view; + _tmp55_ = self->priv->selected_page_view; #line 426 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala" - book_view_show_page_view (self, _tmp56_); -#line 2313 "book-view.c" + book_view_show_page_view (self, _tmp55_); +#line 2301 "book-view.c" } #line 428 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala" self->priv->need_layout = FALSE; @@ -2317,7 +2305,7 @@ static void book_view_layout (BookView* self) { self->priv->show_selected_page = FALSE; #line 430 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala" self->priv->laying_out = FALSE; -#line 2321 "book-view.c" +#line 2309 "book-view.c" } @@ -2353,7 +2341,7 @@ static gboolean book_view_draw_cb (BookView* self, GtkWidget* widget, cairo_t* c result = FALSE; #line 436 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala" return result; -#line 2357 "book-view.c" +#line 2345 "book-view.c" } #line 438 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala" book_view_layout (self); @@ -2369,117 +2357,116 @@ static gboolean book_view_draw_cb (BookView* self, GtkWidget* widget, cairo_t* c right = _tmp6_; #line 441 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala" bottom = _tmp7_; -#line 2373 "book-view.c" +#line 2361 "book-view.c" { gint i = 0; #line 444 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala" i = 0; -#line 2378 "book-view.c" +#line 2366 "book-view.c" { gboolean _tmp8_ = FALSE; #line 444 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala" _tmp8_ = TRUE; #line 444 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala" while (TRUE) { -#line 2385 "book-view.c" - gboolean _tmp9_ = FALSE; - gint _tmp11_ = 0; - Book* _tmp12_ = NULL; +#line 2373 "book-view.c" + gint _tmp10_ = 0; + Book* _tmp11_ = NULL; + guint _tmp12_ = 0U; guint _tmp13_ = 0U; - guint _tmp14_ = 0U; PageView* page = NULL; - gint _tmp15_ = 0; - PageView* _tmp16_ = NULL; + gint _tmp14_ = 0; + PageView* _tmp15_ = NULL; gint left_edge = 0; - PageView* _tmp17_ = NULL; + PageView* _tmp16_ = NULL; + gint _tmp17_ = 0; gint _tmp18_ = 0; gint _tmp19_ = 0; gint _tmp20_ = 0; - gint _tmp21_ = 0; gint right_edge = 0; - PageView* _tmp22_ = NULL; + PageView* _tmp21_ = NULL; + gint _tmp22_ = 0; gint _tmp23_ = 0; - gint _tmp24_ = 0; - PageView* _tmp25_ = NULL; + PageView* _tmp24_ = NULL; + gint _tmp25_ = 0; gint _tmp26_ = 0; gint _tmp27_ = 0; gint _tmp28_ = 0; gboolean _tmp29_ = FALSE; gint _tmp30_ = 0; gdouble _tmp31_ = 0.0; - gboolean _tmp34_ = FALSE; + cairo_t* _tmp34_ = NULL; cairo_t* _tmp35_ = NULL; - cairo_t* _tmp36_ = NULL; + gint _tmp36_ = 0; gint _tmp37_ = 0; - gint _tmp38_ = 0; - PageView* _tmp39_ = NULL; + PageView* _tmp38_ = NULL; + cairo_t* _tmp39_ = NULL; cairo_t* _tmp40_ = NULL; - cairo_t* _tmp41_ = NULL; - PageView* _tmp42_ = NULL; + PageView* _tmp41_ = NULL; + gboolean _tmp42_ = FALSE; gboolean _tmp43_ = FALSE; - gboolean _tmp44_ = FALSE; #line 444 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala" - _tmp9_ = _tmp8_; + if (!_tmp8_) { +#line 2411 "book-view.c" + gint _tmp9_ = 0; #line 444 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala" - if (!_tmp9_) { -#line 2426 "book-view.c" - gint _tmp10_ = 0; + _tmp9_ = i; #line 444 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala" - _tmp10_ = i; -#line 444 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala" - i = _tmp10_ + 1; -#line 2432 "book-view.c" + i = _tmp9_ + 1; +#line 2417 "book-view.c" } #line 444 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala" _tmp8_ = FALSE; #line 444 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala" - _tmp11_ = i; + _tmp10_ = i; #line 444 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala" - _tmp12_ = self->priv->_book; + _tmp11_ = self->priv->_book; #line 444 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala" - _tmp13_ = book_get_n_pages (_tmp12_); + _tmp12_ = book_get_n_pages (_tmp11_); #line 444 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala" - _tmp14_ = _tmp13_; + _tmp13_ = _tmp12_; #line 444 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala" - if (!(((guint) _tmp11_) < _tmp14_)) { + if (!(((guint) _tmp10_) < _tmp13_)) { #line 444 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala" break; -#line 2448 "book-view.c" +#line 2433 "book-view.c" } #line 446 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala" - _tmp15_ = i; + _tmp14_ = i; #line 446 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala" - _tmp16_ = book_view_get_nth_page (self, _tmp15_); + _tmp15_ = book_view_get_nth_page (self, _tmp14_); #line 446 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala" - page = _tmp16_; + page = _tmp15_; #line 447 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala" - _tmp17_ = page; + _tmp16_ = page; #line 447 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala" - _tmp18_ = page_view_get_x_offset (_tmp17_); + _tmp17_ = page_view_get_x_offset (_tmp16_); #line 447 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala" - _tmp19_ = _tmp18_; + _tmp18_ = _tmp17_; #line 447 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala" - _tmp20_ = book_view_get_x_offset (self); + _tmp19_ = book_view_get_x_offset (self); #line 447 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala" - _tmp21_ = _tmp20_; + _tmp20_ = _tmp19_; #line 447 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala" - left_edge = _tmp19_ - _tmp21_; + left_edge = _tmp18_ - _tmp20_; #line 448 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala" - _tmp22_ = page; + _tmp21_ = page; #line 448 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala" - _tmp23_ = page_view_get_x_offset (_tmp22_); + _tmp22_ = page_view_get_x_offset (_tmp21_); #line 448 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala" - _tmp24_ = _tmp23_; + _tmp23_ = _tmp22_; #line 448 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala" - _tmp25_ = page; + _tmp24_ = page; #line 448 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala" - _tmp26_ = page_view_get_width (_tmp25_); + _tmp25_ = page_view_get_width (_tmp24_); +#line 448 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala" + _tmp26_ = _tmp25_; #line 448 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala" _tmp27_ = book_view_get_x_offset (self); #line 448 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala" _tmp28_ = _tmp27_; #line 448 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala" - right_edge = (_tmp24_ + _tmp26_) - _tmp28_; + right_edge = (_tmp23_ + _tmp26_) - _tmp28_; #line 451 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala" _tmp30_ = right_edge; #line 451 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala" @@ -2488,7 +2475,7 @@ static gboolean book_view_draw_cb (BookView* self, GtkWidget* widget, cairo_t* c if (((gdouble) _tmp30_) < _tmp31_) { #line 451 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala" _tmp29_ = TRUE; -#line 2492 "book-view.c" +#line 2479 "book-view.c" } else { gint _tmp32_ = 0; gdouble _tmp33_ = 0.0; @@ -2498,101 +2485,105 @@ static gboolean book_view_draw_cb (BookView* self, GtkWidget* widget, cairo_t* c _tmp33_ = right; #line 451 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala" _tmp29_ = ((gdouble) _tmp32_) > _tmp33_; -#line 2502 "book-view.c" +#line 2489 "book-view.c" } #line 451 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala" - _tmp34_ = _tmp29_; -#line 451 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala" - if (_tmp34_) { + if (_tmp29_) { #line 452 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala" _page_view_unref0 (page); #line 452 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala" continue; -#line 2512 "book-view.c" +#line 2497 "book-view.c" } #line 454 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala" - _tmp35_ = context; + _tmp34_ = context; #line 454 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala" - cairo_save (_tmp35_); + cairo_save (_tmp34_); #line 455 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala" - _tmp36_ = context; + _tmp35_ = context; #line 455 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala" - _tmp37_ = book_view_get_x_offset (self); + _tmp36_ = book_view_get_x_offset (self); #line 455 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala" - _tmp38_ = _tmp37_; + _tmp37_ = _tmp36_; #line 455 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala" - cairo_translate (_tmp36_, (gdouble) (-_tmp38_), (gdouble) 0); + cairo_translate (_tmp35_, (gdouble) (-_tmp37_), (gdouble) 0); #line 456 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala" - _tmp39_ = page; + _tmp38_ = page; #line 456 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala" - _tmp40_ = context; + _tmp39_ = context; #line 456 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala" - page_view_render (_tmp39_, _tmp40_); + page_view_render (_tmp38_, _tmp39_); #line 457 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala" - _tmp41_ = context; + _tmp40_ = context; #line 457 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala" - cairo_restore (_tmp41_); + cairo_restore (_tmp40_); #line 459 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala" - _tmp42_ = page; + _tmp41_ = page; #line 459 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala" - _tmp43_ = page_view_get_selected (_tmp42_); + _tmp42_ = page_view_get_selected (_tmp41_); #line 459 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala" - _tmp44_ = _tmp43_; + _tmp43_ = _tmp42_; #line 459 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala" - if (_tmp44_) { -#line 2544 "book-view.c" - GtkWidget* _tmp45_ = NULL; - GtkStyleContext* _tmp46_ = NULL; - cairo_t* _tmp47_ = NULL; - PageView* _tmp48_ = NULL; + if (_tmp43_) { +#line 2529 "book-view.c" + GtkWidget* _tmp44_ = NULL; + GtkStyleContext* _tmp45_ = NULL; + cairo_t* _tmp46_ = NULL; + PageView* _tmp47_ = NULL; + gint _tmp48_ = 0; gint _tmp49_ = 0; gint _tmp50_ = 0; gint _tmp51_ = 0; - gint _tmp52_ = 0; - PageView* _tmp53_ = NULL; + PageView* _tmp52_ = NULL; + gint _tmp53_ = 0; gint _tmp54_ = 0; - gint _tmp55_ = 0; - PageView* _tmp56_ = NULL; + PageView* _tmp55_ = NULL; + gint _tmp56_ = 0; gint _tmp57_ = 0; PageView* _tmp58_ = NULL; gint _tmp59_ = 0; + gint _tmp60_ = 0; +#line 460 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala" + _tmp44_ = self->priv->drawing_area; #line 460 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala" - _tmp45_ = self->priv->drawing_area; + _tmp45_ = gtk_widget_get_style_context (_tmp44_); #line 460 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala" - _tmp46_ = gtk_widget_get_style_context (_tmp45_); + _tmp46_ = context; #line 460 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala" - _tmp47_ = context; + _tmp47_ = page; #line 460 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala" - _tmp48_ = page; + _tmp48_ = page_view_get_x_offset (_tmp47_); #line 460 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala" - _tmp49_ = page_view_get_x_offset (_tmp48_); + _tmp49_ = _tmp48_; #line 460 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala" - _tmp50_ = _tmp49_; + _tmp50_ = book_view_get_x_offset (self); #line 460 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala" - _tmp51_ = book_view_get_x_offset (self); + _tmp51_ = _tmp50_; #line 460 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala" - _tmp52_ = _tmp51_; + _tmp52_ = page; #line 460 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala" - _tmp53_ = page; + _tmp53_ = page_view_get_y_offset (_tmp52_); #line 460 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala" - _tmp54_ = page_view_get_y_offset (_tmp53_); + _tmp54_ = _tmp53_; #line 460 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala" - _tmp55_ = _tmp54_; + _tmp55_ = page; #line 460 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala" - _tmp56_ = page; + _tmp56_ = page_view_get_width (_tmp55_); #line 460 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala" - _tmp57_ = page_view_get_width (_tmp56_); + _tmp57_ = _tmp56_; #line 460 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala" _tmp58_ = page; #line 460 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala" _tmp59_ = page_view_get_height (_tmp58_); #line 460 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala" - gtk_render_focus (_tmp46_, _tmp47_, (gdouble) (_tmp50_ - _tmp52_), (gdouble) _tmp55_, (gdouble) _tmp57_, (gdouble) _tmp59_); -#line 2592 "book-view.c" + _tmp60_ = _tmp59_; +#line 460 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala" + gtk_render_focus (_tmp45_, _tmp46_, (gdouble) (_tmp49_ - _tmp51_), (gdouble) _tmp54_, (gdouble) _tmp57_, (gdouble) _tmp60_); +#line 2583 "book-view.c" } #line 444 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala" _page_view_unref0 (page); -#line 2596 "book-view.c" +#line 2587 "book-view.c" } } } @@ -2600,7 +2591,7 @@ static gboolean book_view_draw_cb (BookView* self, GtkWidget* widget, cairo_t* c result = FALSE; #line 467 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala" return result; -#line 2604 "book-view.c" +#line 2595 "book-view.c" } @@ -2617,34 +2608,34 @@ static PageView* book_view_get_page_at (BookView* self, gint x, gint y, gint* x_ _tmp0_ = _vala_y_; #line 472 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala" _vala_x_ = _tmp0_; -#line 2621 "book-view.c" +#line 2612 "book-view.c" { gint i = 0; #line 473 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala" i = 0; -#line 2626 "book-view.c" +#line 2617 "book-view.c" { gboolean _tmp1_ = FALSE; #line 473 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala" _tmp1_ = TRUE; #line 473 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala" while (TRUE) { -#line 2633 "book-view.c" - gboolean _tmp2_ = FALSE; - gint _tmp4_ = 0; - Book* _tmp5_ = NULL; +#line 2624 "book-view.c" + gint _tmp3_ = 0; + Book* _tmp4_ = NULL; + guint _tmp5_ = 0U; guint _tmp6_ = 0U; - guint _tmp7_ = 0U; PageView* page = NULL; - gint _tmp8_ = 0; - PageView* _tmp9_ = NULL; + gint _tmp7_ = 0; + PageView* _tmp8_ = NULL; gint left = 0; - PageView* _tmp10_ = NULL; + PageView* _tmp9_ = NULL; + gint _tmp10_ = 0; gint _tmp11_ = 0; - gint _tmp12_ = 0; gint right = 0; - gint _tmp13_ = 0; - PageView* _tmp14_ = NULL; + gint _tmp12_ = 0; + PageView* _tmp13_ = NULL; + gint _tmp14_ = 0; gint _tmp15_ = 0; gint top = 0; PageView* _tmp16_ = NULL; @@ -2654,64 +2645,62 @@ static PageView* book_view_get_page_at (BookView* self, gint x, gint y, gint* x_ gint _tmp19_ = 0; PageView* _tmp20_ = NULL; gint _tmp21_ = 0; - gboolean _tmp22_ = FALSE; + gint _tmp22_ = 0; gboolean _tmp23_ = FALSE; gboolean _tmp24_ = FALSE; - gint _tmp25_ = 0; + gboolean _tmp25_ = FALSE; gint _tmp26_ = 0; - gboolean _tmp29_ = FALSE; - gboolean _tmp32_ = FALSE; - gboolean _tmp35_ = FALSE; -#line 473 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala" - _tmp2_ = _tmp1_; + gint _tmp27_ = 0; #line 473 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala" - if (!_tmp2_) { -#line 2670 "book-view.c" - gint _tmp3_ = 0; + if (!_tmp1_) { +#line 2657 "book-view.c" + gint _tmp2_ = 0; #line 473 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala" - _tmp3_ = i; + _tmp2_ = i; #line 473 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala" - i = _tmp3_ + 1; -#line 2676 "book-view.c" + i = _tmp2_ + 1; +#line 2663 "book-view.c" } #line 473 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala" _tmp1_ = FALSE; #line 473 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala" - _tmp4_ = i; + _tmp3_ = i; #line 473 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala" - _tmp5_ = self->priv->_book; + _tmp4_ = self->priv->_book; #line 473 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala" - _tmp6_ = book_get_n_pages (_tmp5_); + _tmp5_ = book_get_n_pages (_tmp4_); #line 473 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala" - _tmp7_ = _tmp6_; + _tmp6_ = _tmp5_; #line 473 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala" - if (!(((guint) _tmp4_) < _tmp7_)) { + if (!(((guint) _tmp3_) < _tmp6_)) { #line 473 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala" break; -#line 2692 "book-view.c" +#line 2679 "book-view.c" } #line 475 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala" - _tmp8_ = i; + _tmp7_ = i; #line 475 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala" - _tmp9_ = book_view_get_nth_page (self, _tmp8_); + _tmp8_ = book_view_get_nth_page (self, _tmp7_); #line 475 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala" - page = _tmp9_; + page = _tmp8_; #line 476 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala" - _tmp10_ = page; + _tmp9_ = page; #line 476 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala" - _tmp11_ = page_view_get_x_offset (_tmp10_); + _tmp10_ = page_view_get_x_offset (_tmp9_); #line 476 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala" - _tmp12_ = _tmp11_; + _tmp11_ = _tmp10_; #line 476 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala" - left = _tmp12_; + left = _tmp11_; #line 477 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala" - _tmp13_ = left; + _tmp12_ = left; #line 477 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala" - _tmp14_ = page; + _tmp13_ = page; #line 477 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala" - _tmp15_ = page_view_get_width (_tmp14_); + _tmp14_ = page_view_get_width (_tmp13_); #line 477 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala" - right = _tmp13_ + _tmp15_; + _tmp15_ = _tmp14_; +#line 477 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala" + right = _tmp12_ + _tmp15_; #line 478 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala" _tmp16_ = page; #line 478 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala" @@ -2727,33 +2716,33 @@ static PageView* book_view_get_page_at (BookView* self, gint x, gint y, gint* x_ #line 479 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala" _tmp21_ = page_view_get_height (_tmp20_); #line 479 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala" - bottom = _tmp19_ + _tmp21_; + _tmp22_ = _tmp21_; +#line 479 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala" + bottom = _tmp19_ + _tmp22_; #line 480 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala" - _tmp25_ = x; + _tmp26_ = x; #line 480 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala" - _tmp26_ = left; + _tmp27_ = left; #line 480 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala" - if (_tmp25_ >= _tmp26_) { -#line 2738 "book-view.c" - gint _tmp27_ = 0; + if (_tmp26_ >= _tmp27_) { +#line 2729 "book-view.c" gint _tmp28_ = 0; + gint _tmp29_ = 0; #line 480 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala" - _tmp27_ = x; + _tmp28_ = x; #line 480 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala" - _tmp28_ = right; + _tmp29_ = right; #line 480 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala" - _tmp24_ = _tmp27_ <= _tmp28_; -#line 2747 "book-view.c" + _tmp25_ = _tmp28_ <= _tmp29_; +#line 2738 "book-view.c" } else { #line 480 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala" - _tmp24_ = FALSE; -#line 2751 "book-view.c" + _tmp25_ = FALSE; +#line 2742 "book-view.c" } #line 480 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala" - _tmp29_ = _tmp24_; -#line 480 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala" - if (_tmp29_) { -#line 2757 "book-view.c" + if (_tmp25_) { +#line 2746 "book-view.c" gint _tmp30_ = 0; gint _tmp31_ = 0; #line 480 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala" @@ -2761,74 +2750,70 @@ static PageView* book_view_get_page_at (BookView* self, gint x, gint y, gint* x_ #line 480 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala" _tmp31_ = top; #line 480 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala" - _tmp23_ = _tmp30_ >= _tmp31_; -#line 2766 "book-view.c" + _tmp24_ = _tmp30_ >= _tmp31_; +#line 2755 "book-view.c" } else { #line 480 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala" - _tmp23_ = FALSE; -#line 2770 "book-view.c" + _tmp24_ = FALSE; +#line 2759 "book-view.c" } #line 480 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala" - _tmp32_ = _tmp23_; -#line 480 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala" - if (_tmp32_) { -#line 2776 "book-view.c" + if (_tmp24_) { +#line 2763 "book-view.c" + gint _tmp32_ = 0; gint _tmp33_ = 0; - gint _tmp34_ = 0; #line 480 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala" - _tmp33_ = y; + _tmp32_ = y; #line 480 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala" - _tmp34_ = bottom; + _tmp33_ = bottom; #line 480 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala" - _tmp22_ = _tmp33_ <= _tmp34_; -#line 2785 "book-view.c" + _tmp23_ = _tmp32_ <= _tmp33_; +#line 2772 "book-view.c" } else { #line 480 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala" - _tmp22_ = FALSE; -#line 2789 "book-view.c" + _tmp23_ = FALSE; +#line 2776 "book-view.c" } #line 480 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala" - _tmp35_ = _tmp22_; -#line 480 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala" - if (_tmp35_) { -#line 2795 "book-view.c" + if (_tmp23_) { +#line 2780 "book-view.c" + gint _tmp34_ = 0; + gint _tmp35_ = 0; gint _tmp36_ = 0; gint _tmp37_ = 0; - gint _tmp38_ = 0; - gint _tmp39_ = 0; #line 482 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala" - _tmp36_ = x; + _tmp34_ = x; #line 482 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala" - _tmp37_ = left; + _tmp35_ = left; #line 482 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala" - _vala_x_ = _tmp36_ - _tmp37_; + _vala_x_ = _tmp34_ - _tmp35_; #line 483 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala" - _tmp38_ = y; + _tmp36_ = y; #line 483 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala" - _tmp39_ = top; + _tmp37_ = top; #line 483 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala" - _vala_y_ = _tmp38_ - _tmp39_; + _vala_y_ = _tmp36_ - _tmp37_; #line 484 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala" result = page; #line 484 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala" if (x_) { #line 484 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala" *x_ = _vala_x_; -#line 2818 "book-view.c" +#line 2803 "book-view.c" } #line 484 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala" if (y_) { #line 484 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala" *y_ = _vala_y_; -#line 2824 "book-view.c" +#line 2809 "book-view.c" } #line 484 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala" return result; -#line 2828 "book-view.c" +#line 2813 "book-view.c" } #line 473 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala" _page_view_unref0 (page); -#line 2832 "book-view.c" +#line 2817 "book-view.c" } } } @@ -2838,17 +2823,17 @@ static PageView* book_view_get_page_at (BookView* self, gint x, gint y, gint* x_ if (x_) { #line 488 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala" *x_ = _vala_x_; -#line 2842 "book-view.c" +#line 2827 "book-view.c" } #line 488 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala" if (y_) { #line 488 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala" *y_ = _vala_y_; -#line 2848 "book-view.c" +#line 2833 "book-view.c" } #line 488 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala" return result; -#line 2852 "book-view.c" +#line 2837 "book-view.c" } @@ -2857,12 +2842,12 @@ static gboolean book_view_button_cb (BookView* self, GtkWidget* widget, GdkEvent GtkWidget* _tmp0_ = NULL; gint x = 0; gint y = 0; - GdkEventButton _tmp1_ = {0}; + GdkEventButton* _tmp1_ = NULL; GdkEventType _tmp2_ = 0; PageView* _tmp13_ = NULL; - GdkEventButton _tmp14_ = {0}; + GdkEventButton* _tmp14_ = NULL; guint _tmp15_ = 0U; - GdkEventButton _tmp30_ = {0}; + GdkEventButton* _tmp30_ = NULL; guint _tmp31_ = 0U; #line 491 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala" g_return_val_if_fail (self != NULL, FALSE); @@ -2881,34 +2866,34 @@ static gboolean book_view_button_cb (BookView* self, GtkWidget* widget, GdkEvent #line 497 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala" y = 0; #line 498 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala" - _tmp1_ = *event; + _tmp1_ = event; #line 498 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala" - _tmp2_ = _tmp1_.type; + _tmp2_ = _tmp1_->type; #line 498 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala" if (_tmp2_ == GDK_BUTTON_PRESS) { -#line 2890 "book-view.c" - GdkEventButton _tmp3_ = {0}; +#line 2875 "book-view.c" + GdkEventButton* _tmp3_ = NULL; gdouble _tmp4_ = 0.0; gint _tmp5_ = 0; gint _tmp6_ = 0; - GdkEventButton _tmp7_ = {0}; + GdkEventButton* _tmp7_ = NULL; gdouble _tmp8_ = 0.0; gint _tmp9_ = 0; gint _tmp10_ = 0; PageView* _tmp11_ = NULL; PageView* _tmp12_ = NULL; #line 499 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala" - _tmp3_ = *event; + _tmp3_ = event; #line 499 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala" - _tmp4_ = _tmp3_.x; + _tmp4_ = _tmp3_->x; #line 499 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala" _tmp5_ = book_view_get_x_offset (self); #line 499 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala" _tmp6_ = _tmp5_; #line 499 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala" - _tmp7_ = *event; + _tmp7_ = event; #line 499 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala" - _tmp8_ = _tmp7_.y; + _tmp8_ = _tmp7_->y; #line 499 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala" _tmp11_ = book_view_get_page_at (self, (gint) (_tmp4_ + _tmp6_), (gint) _tmp8_, &_tmp9_, &_tmp10_); #line 499 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala" @@ -2921,7 +2906,7 @@ static gboolean book_view_button_cb (BookView* self, GtkWidget* widget, GdkEvent book_view_select_page_view (self, _tmp12_); #line 499 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala" _page_view_unref0 (_tmp12_); -#line 2925 "book-view.c" +#line 2910 "book-view.c" } #line 501 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala" _tmp13_ = self->priv->selected_page_view; @@ -2931,24 +2916,24 @@ static gboolean book_view_button_cb (BookView* self, GtkWidget* widget, GdkEvent result = FALSE; #line 502 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala" return result; -#line 2935 "book-view.c" +#line 2920 "book-view.c" } #line 505 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala" - _tmp14_ = *event; + _tmp14_ = event; #line 505 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala" - _tmp15_ = _tmp14_.button; + _tmp15_ = _tmp14_->button; #line 505 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala" if (_tmp15_ == ((guint) 1)) { -#line 2943 "book-view.c" - GdkEventButton _tmp16_ = {0}; +#line 2928 "book-view.c" + GdkEventButton* _tmp16_ = NULL; GdkEventType _tmp17_ = 0; #line 507 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala" - _tmp16_ = *event; + _tmp16_ = event; #line 507 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala" - _tmp17_ = _tmp16_.type; + _tmp17_ = _tmp16_->type; #line 507 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala" if (_tmp17_ == GDK_BUTTON_PRESS) { -#line 2952 "book-view.c" +#line 2937 "book-view.c" PageView* _tmp18_ = NULL; gint _tmp19_ = 0; gint _tmp20_ = 0; @@ -2960,17 +2945,17 @@ static gboolean book_view_button_cb (BookView* self, GtkWidget* widget, GdkEvent _tmp20_ = y; #line 508 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala" page_view_button_press (_tmp18_, _tmp19_, _tmp20_); -#line 2964 "book-view.c" +#line 2949 "book-view.c" } else { - GdkEventButton _tmp21_ = {0}; + GdkEventButton* _tmp21_ = NULL; GdkEventType _tmp22_ = 0; #line 509 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala" - _tmp21_ = *event; + _tmp21_ = event; #line 509 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala" - _tmp22_ = _tmp21_.type; + _tmp22_ = _tmp21_->type; #line 509 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala" if (_tmp22_ == GDK_BUTTON_RELEASE) { -#line 2974 "book-view.c" +#line 2959 "book-view.c" PageView* _tmp23_ = NULL; gint _tmp24_ = 0; gint _tmp25_ = 0; @@ -2982,17 +2967,17 @@ static gboolean book_view_button_cb (BookView* self, GtkWidget* widget, GdkEvent _tmp25_ = y; #line 510 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala" page_view_button_release (_tmp23_, _tmp24_, _tmp25_); -#line 2986 "book-view.c" +#line 2971 "book-view.c" } else { - GdkEventButton _tmp26_ = {0}; + GdkEventButton* _tmp26_ = NULL; GdkEventType _tmp27_ = 0; #line 511 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala" - _tmp26_ = *event; + _tmp26_ = event; #line 511 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala" - _tmp27_ = _tmp26_.type; + _tmp27_ = _tmp26_->type; #line 511 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala" if (_tmp27_ == GDK_2BUTTON_PRESS) { -#line 2996 "book-view.c" +#line 2981 "book-view.c" Page* _tmp28_ = NULL; Page* _tmp29_ = NULL; #line 512 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala" @@ -3001,26 +2986,26 @@ static gboolean book_view_button_cb (BookView* self, GtkWidget* widget, GdkEvent _tmp29_ = _tmp28_; #line 512 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala" g_signal_emit_by_name (self, "show-page", _tmp29_); -#line 3005 "book-view.c" +#line 2990 "book-view.c" } } } } #line 516 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala" - _tmp30_ = *event; + _tmp30_ = event; #line 516 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala" - _tmp31_ = _tmp30_.button; + _tmp31_ = _tmp30_->button; #line 516 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala" if (_tmp31_ == ((guint) 3)) { #line 517 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala" g_signal_emit_by_name (self, "show-menu"); -#line 3018 "book-view.c" +#line 3003 "book-view.c" } #line 519 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala" result = FALSE; #line 519 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala" return result; -#line 3024 "book-view.c" +#line 3009 "book-view.c" } @@ -3046,7 +3031,7 @@ static void book_view_set_cursor (BookView* self, GdkCursorType cursor) { _g_object_unref0 (c); #line 527 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala" return; -#line 3050 "book-view.c" +#line 3035 "book-view.c" } #line 528 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala" _tmp2_ = cursor; @@ -3070,7 +3055,7 @@ static void book_view_set_cursor (BookView* self, GdkCursorType cursor) { gdk_window_set_cursor (_tmp6_, _tmp7_); #line 522 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala" _g_object_unref0 (c); -#line 3074 "book-view.c" +#line 3059 "book-view.c" } @@ -3079,8 +3064,7 @@ static gboolean book_view_motion_cb (BookView* self, GtkWidget* widget, GdkEvent GdkCursorType cursor = 0; gboolean _tmp0_ = FALSE; PageView* _tmp1_ = NULL; - gboolean _tmp4_ = FALSE; - GdkCursorType _tmp39_ = 0; + GdkCursorType _tmp38_ = 0; #line 534 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala" g_return_val_if_fail (self != NULL, FALSE); #line 534 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala" @@ -3093,173 +3077,171 @@ static gboolean book_view_motion_cb (BookView* self, GtkWidget* widget, GdkEvent _tmp1_ = self->priv->selected_page_view; #line 539 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala" if (_tmp1_ != NULL) { -#line 3097 "book-view.c" - GdkEventMotion _tmp2_ = {0}; +#line 3081 "book-view.c" + GdkEventMotion* _tmp2_ = NULL; GdkModifierType _tmp3_ = 0; #line 539 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala" - _tmp2_ = *event; + _tmp2_ = event; #line 539 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala" - _tmp3_ = _tmp2_.state; + _tmp3_ = _tmp2_->state; #line 539 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala" _tmp0_ = (_tmp3_ & GDK_BUTTON1_MASK) != 0; -#line 3106 "book-view.c" +#line 3090 "book-view.c" } else { #line 539 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala" _tmp0_ = FALSE; -#line 3110 "book-view.c" +#line 3094 "book-view.c" } #line 539 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala" - _tmp4_ = _tmp0_; -#line 539 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala" - if (_tmp4_) { -#line 3116 "book-view.c" + if (_tmp0_) { +#line 3098 "book-view.c" gint x = 0; - GdkEventMotion _tmp5_ = {0}; - gdouble _tmp6_ = 0.0; + GdkEventMotion* _tmp4_ = NULL; + gdouble _tmp5_ = 0.0; + gint _tmp6_ = 0; gint _tmp7_ = 0; - gint _tmp8_ = 0; - PageView* _tmp9_ = NULL; + PageView* _tmp8_ = NULL; + gint _tmp9_ = 0; gint _tmp10_ = 0; - gint _tmp11_ = 0; gint y = 0; - GdkEventMotion _tmp12_ = {0}; - gdouble _tmp13_ = 0.0; - PageView* _tmp14_ = NULL; + GdkEventMotion* _tmp11_ = NULL; + gdouble _tmp12_ = 0.0; + PageView* _tmp13_ = NULL; + gint _tmp14_ = 0; gint _tmp15_ = 0; - gint _tmp16_ = 0; - PageView* _tmp17_ = NULL; + PageView* _tmp16_ = NULL; + gint _tmp17_ = 0; gint _tmp18_ = 0; - gint _tmp19_ = 0; - PageView* _tmp20_ = NULL; + PageView* _tmp19_ = NULL; + GdkCursorType _tmp20_ = 0; GdkCursorType _tmp21_ = 0; - GdkCursorType _tmp22_ = 0; #line 541 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala" - _tmp5_ = *event; + _tmp4_ = event; #line 541 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala" - _tmp6_ = _tmp5_.x; + _tmp5_ = _tmp4_->x; #line 541 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala" - _tmp7_ = book_view_get_x_offset (self); + _tmp6_ = book_view_get_x_offset (self); #line 541 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala" - _tmp8_ = _tmp7_; + _tmp7_ = _tmp6_; #line 541 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala" - _tmp9_ = self->priv->selected_page_view; + _tmp8_ = self->priv->selected_page_view; #line 541 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala" - _tmp10_ = page_view_get_x_offset (_tmp9_); + _tmp9_ = page_view_get_x_offset (_tmp8_); #line 541 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala" - _tmp11_ = _tmp10_; + _tmp10_ = _tmp9_; #line 541 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala" - x = (gint) ((_tmp6_ + _tmp8_) - _tmp11_); + x = (gint) ((_tmp5_ + _tmp7_) - _tmp10_); #line 542 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala" - _tmp12_ = *event; + _tmp11_ = event; #line 542 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala" - _tmp13_ = _tmp12_.y; + _tmp12_ = _tmp11_->y; #line 542 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala" - _tmp14_ = self->priv->selected_page_view; + _tmp13_ = self->priv->selected_page_view; #line 542 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala" - _tmp15_ = page_view_get_y_offset (_tmp14_); + _tmp14_ = page_view_get_y_offset (_tmp13_); #line 542 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala" - _tmp16_ = _tmp15_; + _tmp15_ = _tmp14_; #line 542 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala" - y = (gint) (_tmp13_ - _tmp16_); + y = (gint) (_tmp12_ - _tmp15_); #line 543 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala" - _tmp17_ = self->priv->selected_page_view; + _tmp16_ = self->priv->selected_page_view; #line 543 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala" - _tmp18_ = x; + _tmp17_ = x; #line 543 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala" - _tmp19_ = y; + _tmp18_ = y; #line 543 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala" - page_view_motion (_tmp17_, _tmp18_, _tmp19_); + page_view_motion (_tmp16_, _tmp17_, _tmp18_); #line 544 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala" - _tmp20_ = self->priv->selected_page_view; + _tmp19_ = self->priv->selected_page_view; #line 544 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala" - _tmp21_ = page_view_get_cursor (_tmp20_); + _tmp20_ = page_view_get_cursor (_tmp19_); #line 544 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala" - _tmp22_ = _tmp21_; + _tmp21_ = _tmp20_; #line 544 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala" - cursor = _tmp22_; -#line 3181 "book-view.c" + cursor = _tmp21_; +#line 3163 "book-view.c" } else { gint x = 0; gint y = 0; PageView* over_page = NULL; - GdkEventMotion _tmp23_ = {0}; - gdouble _tmp24_ = 0.0; + GdkEventMotion* _tmp22_ = NULL; + gdouble _tmp23_ = 0.0; + gint _tmp24_ = 0; gint _tmp25_ = 0; - gint _tmp26_ = 0; - GdkEventMotion _tmp27_ = {0}; - gdouble _tmp28_ = 0.0; + GdkEventMotion* _tmp26_ = NULL; + gdouble _tmp27_ = 0.0; + gint _tmp28_ = 0; gint _tmp29_ = 0; - gint _tmp30_ = 0; + PageView* _tmp30_ = NULL; PageView* _tmp31_ = NULL; - PageView* _tmp32_ = NULL; #line 549 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala" - _tmp23_ = *event; + _tmp22_ = event; #line 549 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala" - _tmp24_ = _tmp23_.x; + _tmp23_ = _tmp22_->x; #line 549 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala" - _tmp25_ = book_view_get_x_offset (self); + _tmp24_ = book_view_get_x_offset (self); #line 549 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala" - _tmp26_ = _tmp25_; + _tmp25_ = _tmp24_; #line 549 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala" - _tmp27_ = *event; + _tmp26_ = event; #line 549 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala" - _tmp28_ = _tmp27_.y; + _tmp27_ = _tmp26_->y; #line 549 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala" - _tmp31_ = book_view_get_page_at (self, (gint) (_tmp24_ + _tmp26_), (gint) _tmp28_, &_tmp29_, &_tmp30_); + _tmp30_ = book_view_get_page_at (self, (gint) (_tmp23_ + _tmp25_), (gint) _tmp27_, &_tmp28_, &_tmp29_); #line 549 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala" - x = _tmp29_; + x = _tmp28_; #line 549 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala" - y = _tmp30_; + y = _tmp29_; #line 549 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala" - over_page = _tmp31_; + over_page = _tmp30_; #line 550 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala" - _tmp32_ = over_page; + _tmp31_ = over_page; #line 550 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala" - if (_tmp32_ != NULL) { -#line 3220 "book-view.c" - PageView* _tmp33_ = NULL; + if (_tmp31_ != NULL) { +#line 3202 "book-view.c" + PageView* _tmp32_ = NULL; + gint _tmp33_ = 0; gint _tmp34_ = 0; - gint _tmp35_ = 0; - PageView* _tmp36_ = NULL; + PageView* _tmp35_ = NULL; + GdkCursorType _tmp36_ = 0; GdkCursorType _tmp37_ = 0; - GdkCursorType _tmp38_ = 0; #line 552 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala" - _tmp33_ = over_page; + _tmp32_ = over_page; #line 552 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala" - _tmp34_ = x; + _tmp33_ = x; #line 552 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala" - _tmp35_ = y; + _tmp34_ = y; #line 552 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala" - page_view_motion (_tmp33_, _tmp34_, _tmp35_); + page_view_motion (_tmp32_, _tmp33_, _tmp34_); #line 553 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala" - _tmp36_ = over_page; + _tmp35_ = over_page; #line 553 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala" - _tmp37_ = page_view_get_cursor (_tmp36_); + _tmp36_ = page_view_get_cursor (_tmp35_); #line 553 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala" - _tmp38_ = _tmp37_; + _tmp37_ = _tmp36_; #line 553 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala" - cursor = _tmp38_; -#line 3243 "book-view.c" + cursor = _tmp37_; +#line 3225 "book-view.c" } #line 539 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala" _page_view_unref0 (over_page); -#line 3247 "book-view.c" +#line 3229 "book-view.c" } #line 557 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala" - _tmp39_ = cursor; + _tmp38_ = cursor; #line 557 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala" - book_view_set_cursor (self, _tmp39_); + book_view_set_cursor (self, _tmp38_); #line 559 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala" result = FALSE; #line 559 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala" return result; -#line 3257 "book-view.c" +#line 3239 "book-view.c" } static gboolean book_view_key_cb (BookView* self, GtkWidget* widget, GdkEventKey* event) { gboolean result = FALSE; - GdkEventKey _tmp0_ = {0}; + GdkEventKey* _tmp0_ = NULL; guint _tmp1_ = 0U; #line 562 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala" g_return_val_if_fail (self != NULL, FALSE); @@ -3268,14 +3250,14 @@ static gboolean book_view_key_cb (BookView* self, GtkWidget* widget, GdkEventKey #line 562 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala" g_return_val_if_fail (event != NULL, FALSE); #line 564 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala" - _tmp0_ = *event; + _tmp0_ = event; #line 564 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala" - _tmp1_ = _tmp0_.keyval; + _tmp1_ = _tmp0_->keyval; #line 564 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala" switch (_tmp1_) { #line 564 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala" case 0xff50: -#line 3279 "book-view.c" +#line 3261 "book-view.c" { Book* _tmp2_ = NULL; Page* _tmp3_ = NULL; @@ -3294,11 +3276,11 @@ static gboolean book_view_key_cb (BookView* self, GtkWidget* widget, GdkEventKey result = TRUE; #line 568 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala" return result; -#line 3298 "book-view.c" +#line 3280 "book-view.c" } #line 564 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala" case 0xff51: -#line 3302 "book-view.c" +#line 3284 "book-view.c" { PageView* _tmp5_ = NULL; PageView* _tmp6_ = NULL; @@ -3317,11 +3299,11 @@ static gboolean book_view_key_cb (BookView* self, GtkWidget* widget, GdkEventKey result = TRUE; #line 571 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala" return result; -#line 3321 "book-view.c" +#line 3303 "book-view.c" } #line 564 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala" case 0xff53: -#line 3325 "book-view.c" +#line 3307 "book-view.c" { PageView* _tmp8_ = NULL; PageView* _tmp9_ = NULL; @@ -3340,11 +3322,11 @@ static gboolean book_view_key_cb (BookView* self, GtkWidget* widget, GdkEventKey result = TRUE; #line 574 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala" return result; -#line 3344 "book-view.c" +#line 3326 "book-view.c" } #line 564 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala" case 0xFF57: -#line 3348 "book-view.c" +#line 3330 "book-view.c" { Book* _tmp11_ = NULL; Book* _tmp12_ = NULL; @@ -3372,7 +3354,7 @@ static gboolean book_view_key_cb (BookView* self, GtkWidget* widget, GdkEventKey result = TRUE; #line 577 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala" return result; -#line 3376 "book-view.c" +#line 3358 "book-view.c" } default: { @@ -3380,7 +3362,7 @@ static gboolean book_view_key_cb (BookView* self, GtkWidget* widget, GdkEventKey result = FALSE; #line 580 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala" return result; -#line 3384 "book-view.c" +#line 3366 "book-view.c" } } } @@ -3403,7 +3385,7 @@ static gboolean book_view_focus_cb (BookView* self, GtkWidget* widget, GdkEventF result = FALSE; #line 587 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala" return result; -#line 3407 "book-view.c" +#line 3389 "book-view.c" } @@ -3419,7 +3401,7 @@ static void book_view_scroll_cb (BookView* self, GtkAdjustment* adjustment) { if (!_tmp0_) { #line 593 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala" book_view_redraw (self); -#line 3423 "book-view.c" +#line 3405 "book-view.c" } } @@ -3432,7 +3414,7 @@ void book_view_redraw (BookView* self) { _tmp0_ = self->priv->drawing_area; #line 598 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala" gtk_widget_queue_draw (_tmp0_); -#line 3436 "book-view.c" +#line 3418 "book-view.c" } @@ -3452,7 +3434,7 @@ void book_view_select_next_page (BookView* self) { book_view_select_page_view (self, _tmp2_); #line 603 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala" _page_view_unref0 (_tmp2_); -#line 3456 "book-view.c" +#line 3438 "book-view.c" } @@ -3472,7 +3454,7 @@ void book_view_select_prev_page (BookView* self) { book_view_select_page_view (self, _tmp2_); #line 608 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala" _page_view_unref0 (_tmp2_); -#line 3476 "book-view.c" +#line 3458 "book-view.c" } @@ -3487,14 +3469,14 @@ Book* book_view_get_book (BookView* self) { result = _tmp0_; #line 18 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala" return result; -#line 3491 "book-view.c" +#line 3473 "book-view.c" } static gpointer _book_ref0 (gpointer self) { #line 18 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala" return self ? book_ref (self) : NULL; -#line 3498 "book-view.c" +#line 3480 "book-view.c" } @@ -3513,7 +3495,7 @@ static void book_view_set_book (BookView* self, Book* value) { self->priv->_book = _tmp1_; #line 18 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala" g_object_notify ((GObject *) self, "book"); -#line 3517 "book-view.c" +#line 3499 "book-view.c" } @@ -3526,7 +3508,7 @@ Page* book_view_get_selected_page (BookView* self) { _tmp0_ = self->priv->selected_page_view; #line 32 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala" if (_tmp0_ != NULL) { -#line 3530 "book-view.c" +#line 3512 "book-view.c" PageView* _tmp1_ = NULL; Page* _tmp2_ = NULL; Page* _tmp3_ = NULL; @@ -3540,13 +3522,13 @@ Page* book_view_get_selected_page (BookView* self) { result = _tmp3_; #line 33 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala" return result; -#line 3544 "book-view.c" +#line 3526 "book-view.c" } else { #line 35 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala" result = NULL; #line 35 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala" return result; -#line 3550 "book-view.c" +#line 3532 "book-view.c" } } @@ -3568,13 +3550,13 @@ void book_view_set_selected_page (BookView* self, Page* value) { if (_tmp1_ == _tmp2_) { #line 40 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala" return; -#line 3572 "book-view.c" +#line 3554 "book-view.c" } #line 42 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala" _tmp3_ = value; #line 42 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala" if (_tmp3_ != NULL) { -#line 3578 "book-view.c" +#line 3560 "book-view.c" GHashTable* _tmp4_ = NULL; Page* _tmp5_ = NULL; gconstpointer _tmp6_ = NULL; @@ -3586,15 +3568,15 @@ void book_view_set_selected_page (BookView* self, Page* value) { _tmp6_ = g_hash_table_lookup (_tmp4_, _tmp5_); #line 43 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala" book_view_select_page_view (self, (PageView*) _tmp6_); -#line 3590 "book-view.c" +#line 3572 "book-view.c" } else { #line 45 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala" book_view_select_page_view (self, NULL); -#line 3594 "book-view.c" +#line 3576 "book-view.c" } #line 37 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala" g_object_notify ((GObject *) self, "selected-page"); -#line 3598 "book-view.c" +#line 3580 "book-view.c" } @@ -3612,7 +3594,7 @@ gint book_view_get_x_offset (BookView* self) { result = (gint) _tmp1_; #line 66 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala" return result; -#line 3616 "book-view.c" +#line 3598 "book-view.c" } @@ -3629,7 +3611,7 @@ void book_view_set_x_offset (BookView* self, gint value) { gtk_adjustment_set_value (_tmp0_, (gdouble) _tmp1_); #line 68 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala" g_object_notify ((GObject *) self, "x-offset"); -#line 3633 "book-view.c" +#line 3615 "book-view.c" } @@ -3648,19 +3630,19 @@ static void g_cclosure_user_marshal_VOID__PAGE (GClosure * closure, GValue * ret data1 = closure->data; #line 15 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala" data2 = param_values->data[0].v_pointer; -#line 3652 "book-view.c" +#line 3634 "book-view.c" } else { #line 15 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala" data1 = param_values->data[0].v_pointer; #line 15 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala" data2 = closure->data; -#line 3658 "book-view.c" +#line 3640 "book-view.c" } #line 15 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala" callback = (GMarshalFunc_VOID__PAGE) (marshal_data ? marshal_data : cc->callback); #line 15 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala" callback (data1, value_get_page (param_values + 1), data2); -#line 3664 "book-view.c" +#line 3646 "book-view.c" } @@ -3687,7 +3669,7 @@ static void book_view_class_init (BookViewClass * klass) { g_signal_new ("show_page", TYPE_BOOK_VIEW, G_SIGNAL_RUN_LAST, 0, NULL, NULL, g_cclosure_user_marshal_VOID__PAGE, G_TYPE_NONE, 1, TYPE_PAGE); #line 15 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala" g_signal_new ("show_menu", TYPE_BOOK_VIEW, G_SIGNAL_RUN_LAST, 0, NULL, NULL, g_cclosure_marshal_VOID__VOID, G_TYPE_NONE, 0); -#line 3691 "book-view.c" +#line 3673 "book-view.c" } @@ -3696,7 +3678,7 @@ static void book_view_instance_init (BookView * self) { self->priv = BOOK_VIEW_GET_PRIVATE (self); #line 27 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala" self->priv->selected_page_view = NULL; -#line 3700 "book-view.c" +#line 3682 "book-view.c" } @@ -3822,7 +3804,7 @@ static void book_view_finalize (GObject* obj) { _g_object_unref0 (self->priv->adjustment); #line 15 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala" G_OBJECT_CLASS (book_view_parent_class)->finalize (obj); -#line 3826 "book-view.c" +#line 3808 "book-view.c" } @@ -3861,13 +3843,13 @@ static void _vala_book_view_get_property (GObject * object, guint property_id, G g_value_set_int (value, book_view_get_x_offset (self)); #line 15 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala" break; -#line 3865 "book-view.c" +#line 3847 "book-view.c" default: #line 15 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala" G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec); #line 15 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala" break; -#line 3871 "book-view.c" +#line 3853 "book-view.c" } } @@ -3895,13 +3877,13 @@ static void _vala_book_view_set_property (GObject * object, guint property_id, c book_view_set_x_offset (self, g_value_get_int (value)); #line 15 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala" break; -#line 3899 "book-view.c" +#line 3881 "book-view.c" default: #line 15 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala" G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec); #line 15 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala" break; -#line 3905 "book-view.c" +#line 3887 "book-view.c" } } |