← Back to branch summary

~ubuntu-branches/ubuntu/vivid/nip2/vivid-proposed

« back to all changes in this revision

Viewing changes to src/conversionview.c

  • Committer: Bazaar Package Importer
  • Author(s): Michael Terry
  • Date: 2009-05-12 09:26:46 UTC
  • mfrom: (1.2.11 upstream) (2.1.4 squeeze)
  • Revision ID: james.westby@ubuntu.com-20090512092646-j8lb1w2x69pvgma4
Tags: 7.18.1-1ubuntu1
https://launchpad.net/bugs/375435
* Merge from debian unstable (LP: #375435), remaining changes:
  - debian/control: Also Recommend abrowser

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/conversionview.c
78
78
        Imagemodel *imagemodel = cv->imagemodel;
79
79
        double min, max;
80
80
 
81
 
        set_hourglass();
 
81
        progress_begin();
82
82
        if( !conversionview_findmaxmin( imagemodel, &min, &max ) ) {
83
 
                set_pointer();
 
83
                progress_end();
84
84
                box_alert( wid );
85
85
                return;
86
86
        }
87
 
        set_pointer();
 
87
        progress_end();
88
88
 
89
89
        if( max - min < 1e-20 ) {
90
90
                error_top( _( "Unable to scale image." ) );
338
338
static void
339
339
conversionview_link( Conversionview *cv, Imagemodel *imagemodel )
340
340
{
341
 
        assert( !cv->imagemodel );
 
341
        g_assert( !cv->imagemodel );
342
342
 
343
343
        cv->imagemodel = imagemodel;
344
344
        g_signal_connect( G_OBJECT( cv->imagemodel ),