← Back to branch summary

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

« back to all changes in this revision

Viewing changes to src/imagemodel.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/imagemodel.c
79
79
                TRUE            /* IMAGEMODEL_SMUDGE */
80
80
        };
81
81
 
82
 
        assert( state < IMAGEMODEL_LAST );
 
82
        g_assert( state < IMAGEMODEL_LAST );
83
83
 
84
84
        return( state_paint[state] );
85
85
}
103
103
        case IMAGEMODEL_SMUDGE:         return( "IMAGEMODEL_SMUDGE" );
104
104
 
105
105
        default:
106
 
                assert( FALSE );
 
106
                g_assert( FALSE );
107
107
        }
108
108
}
109
109
#endif /*DEBUG*/
395
395
                imagemodel_state( imagemodel->pend_state ) );
396
396
#endif /*DEBUG*/
397
397
 
398
 
        if( result == IWINDOW_TRUE ) {
 
398
        if( result == IWINDOW_YES ) {
399
399
                imagemodel_set_paintbox( imagemodel, TRUE );
400
400
 
401
401
                if( imagemodel->state != imagemodel->pend_state ) {