~ubuntu-branches/ubuntu/vivid/ncbi-tools6/vivid-proposed

« back to all changes in this revision

Viewing changes to desktop/salpanel.c

  • Committer: Bazaar Package Importer
  • Author(s): Aaron M. Ucko
  • Date: 2009-03-19 10:17:26 UTC
  • mfrom: (1.3.1 upstream) (5.1.1 experimental)
  • Revision ID: james.westby@ubuntu.com-20090319101726-wjuj7ajnq0w5a0mg
Tags: 6.1.20090301-1
* New upstream release; uploading to unstable now that lenny is out.
* debian/lib{ncbi6,vibrant6a}.symbols: update accordingly.
* doc/man/*.1: update accordingly as well.
* debian/control: place lib*-dbg in the new debug section, per the
  current override file.
* debian/control: declare compliance with Policy 3.8.1 (no changes needed).
* api/aliread.c: merge in fix (from 6.1.20080302-4) to undefined use of
  sprintf caught by Kees Cook's scan.
* debian/watch: belatedly update regex to recognize releases like the
  previous one ([6.1.]20081116a).

Show diffs side-by-side

added added

removed removed

Lines of Context:
29
29
*
30
30
* Version Creation Date:   1/27/96
31
31
*
32
 
* $Revision: 6.92 $
 
32
* $Revision: 6.93 $
33
33
*
34
34
* File Description: 
35
35
*
6145
6145
    
6146
6146
    if (sfp != NULL
6147
6147
        || (aafdp->feattype == ADD_IMP
6148
 
            && feature_details_data->featdef_choice == FEATDEF_GENE))
 
6148
            && feature_details_data->featdef_choice == FEATDEF_GENE
 
6149
            && sep != NULL))
6149
6150
    {
6150
6151
      if (! StringHasNoText (feature_details_data->geneName) || ! StringHasNoText (feature_details_data->geneDesc)) 
6151
6152
      {