Merge lp://qastaging/~jnuzman/simple-scan/bug-843361 into lp://qastaging/~simple-scan-team/simple-scan/trunk

Proposed by Joseph Nuzman
Status: Merged
Merged at revision: 589
Proposed branch: lp://qastaging/~jnuzman/simple-scan/bug-843361
Merge into: lp://qastaging/~simple-scan-team/simple-scan/trunk
Diff against target: 102 lines (+31/-8) (has conflicts)
5 files modified
NEWS (+8/-0)
configure.ac (+4/-0)
src/book-view.vala (+7/-7)
src/book.vala (+1/-1)
src/page-view.vala (+11/-0)
Text conflict in NEWS
Text conflict in configure.ac
To merge this branch: bzr merge lp://qastaging/~jnuzman/simple-scan/bug-843361
Reviewer Review Type Date Requested Status
Robert Ancell Pending
Review via email: mp+113867@code.qastaging.launchpad.net

Description of the change

Intended to fix bug#843361. Developed against 3.4.2.

To post a comment you must log in.
Revision history for this message
Robert Ancell (robert-ancell) wrote :

Hi, thanks for this.

I've committed the signal disconnections along with some other ones. I'm a little wary of committing the other changes as I'm not sure why they fix the problem but am investigating the code around these.

Revision history for this message
Joseph Nuzman (jnuzman) wrote :

OK, looks good.

As to the other changes:

Moving existing page add to end of BookView constructor: looks problematic
to me to populate the page_data hash and then a few lines later initialize
page_data with with "new".

Emitting cleared signal before destroying pages list in Book.clear(): I
wanted to ensure the pages were still around to disconnect from when the
PageView destructor is called, but I guess since the PageView holds a
reference to the Page, it shouldn't be an issue.

Joe

On Thu, Jul 12, 2012 at 8:46 AM, Robert Ancell
<email address hidden>wrote:

> Hi, thanks for this.
>
> I've committed the signal disconnections along with some other ones. I'm a
> little wary of committing the other changes as I'm not sure why they fix
> the problem but am investigating the code around these.
> --
> https://code.launchpad.net/~jnuzman/simple-scan/bug-843361/+merge/113867<https://code.launchpad.net/%7Ejnuzman/simple-scan/bug-843361/+merge/113867>
> You are the owner of lp:~jnuzman/simple-scan/bug-843361.
>

Revision history for this message
Michael Nagel (nailor) wrote :

can this merge request be closed?

the main problem seems fixed, and for the other suggested changes a new ticket/bu report/merge request should be created.

Revision history for this message
Joseph Nuzman (jnuzman) wrote :

Yes, I'm fine with closing the merge request.

Revision history for this message
Michael Nagel (nailor) wrote :

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
The diff is not available at this time. You can reload the page or download it.

Subscribers

People subscribed via source and target branches