simple-scan-team team mailing list archive

[Joseph Nuzman <jnuzman@xxxxxxxxx>]

Joseph Nuzman has proposed merging lp:~jnuzman/simple-scan/bug-843361 into lp:simple-scan.

Requested reviews:
  Robert Ancell (robert-ancell)

For more details, see:
https://code.launchpad.net/~jnuzman/simple-scan/bug-843361/+merge/113867

Intended to fix bug#843361.  Developed against 3.4.2.
-- 
https://code.launchpad.net/~jnuzman/simple-scan/bug-843361/+merge/113867
Your team Simple Scan Development Team is subscribed to branch lp:simple-scan.

=== modified file 'NEWS'
--- NEWS	2012-07-03 02:11:06 +0000
+++ NEWS	2012-07-08 18:45:23 +0000
@@ -1,4 +1,12 @@
+<<<<<<< TREE
 Overview of changes in simple-scan 3.5.3
+=======
+Overview of changes in simple-scan 3.4.2
+
+  * Fix save dialog filter labels
+
+Overview of changes in simple-scan 3.4.1
+>>>>>>> MERGE-SOURCE
 
   * Always set scanner options in the same order to avoid options resetting
     options already set.

=== modified file 'configure.ac'
--- configure.ac	2012-07-03 02:11:06 +0000
+++ configure.ac	2012-07-08 18:45:23 +0000
@@ -1,7 +1,11 @@
 dnl Process this file with autoconf to produce a configure script.
 
 AC_INIT(configure.ac)
+<<<<<<< TREE
 AM_INIT_AUTOMAKE(simple-scan, 3.5.3)
+=======
+AM_INIT_AUTOMAKE(simple-scan, 3.4.2)
+>>>>>>> MERGE-SOURCE
 AM_CONFIG_HEADER(config.h)
 AM_MAINTAINER_MODE
 GNOME_MAINTAINER_MODE_DEFINES

=== modified file 'src/book-view.vala'
--- src/book-view.vala	2012-05-28 17:27:53 +0000
+++ src/book-view.vala	2012-07-08 18:45:23 +0000
@@ -43,13 +43,6 @@
     {
         this.book = book;
 
-        /* Load existing pages */
-        for (var i = 0; i < book.get_n_pages (); i++)
-        {
-            Page page = book.get_page (i);
-            add_cb (book, page);
-        }
-
         select_page (book.get_page (0));
 
         /* Watch for new pages */
@@ -82,6 +75,13 @@
         drawing_area.focus_out_event.connect_after (focus_cb);
         adjustment.value_changed.connect (scroll_cb);
 
+        /* Load existing pages */
+        for (var i = 0; i < book.get_n_pages (); i++)
+        {
+            Page page = book.get_page (i);
+            add_cb (book, page);
+        }
+
         drawing_area.show ();
     }
 

=== modified file 'src/book.vala'
--- src/book.vala	2012-05-15 09:48:22 +0000
+++ src/book.vala	2012-07-08 18:45:23 +0000
@@ -28,8 +28,8 @@
 
     public void clear ()
     {
+        cleared ();
         pages = null;
-        cleared ();
     }
 
     private void page_changed_cb (Page page)

=== modified file 'src/page-view.vala'
--- src/page-view.vala	2011-06-11 09:30:07 +0000
+++ src/page-view.vala	2012-07-08 18:45:23 +0000
@@ -80,6 +80,17 @@
         page.scan_direction_changed.connect (scan_direction_changed_cb);
     }
 
+    ~PageView ()
+    {
+        page.pixels_changed.disconnect (page_pixels_changed_cb);
+        page.size_changed.disconnect (page_size_changed_cb);
+        page.crop_changed.disconnect (page_overlay_changed_cb);
+        page.scan_line_changed.disconnect (page_overlay_changed_cb);
+        page.scan_direction_changed.disconnect (scan_direction_changed_cb);
+    }
+
+
+
     public Page get_page ()
     {
         return page;

=== modified file 'src/ui.vala'