← Back to branch summary

~ubuntu-branches/ubuntu/maverick/gimp/maverick

« back to all changes in this revision

Viewing changes to plug-ins/pygimp/pygimp-pdb.c

  • Committer: Bazaar Package Importer
  • Author(s): Didier Roche
  • Date: 2010-02-26 19:10:31 UTC
  • mfrom: (1.1.22 upstream) (0.4.4 sid)
  • Revision ID: james.westby@ubuntu.com-20100226191031-d11l96bebdllen1n
Tags: 2.6.8-2ubuntu1
* Merge with debian, remaining changes:
  + debian/patches/02_help-message.patch,
    debian/patches/03_gimp.desktop.in.in.patch:
    - updated some strings for ubuntu
  + debian/rules:
    - updated translation templates
  + debian/control:
    - set Vcs-Bzr url

Show diffs side-by-side

added added

removed removed

Lines of Context:
plug-ins/pygimp/pygimp-pdb.c
285
285
            value = pygimp_drawable_new(NULL, params[i].data.d_drawable);
286
286
            break;
287
287
        case GIMP_PDB_SELECTION:
288
 
            value = pygimp_layer_new(params[i].data.d_selection);
 
288
            value = pygimp_channel_new(params[i].data.d_selection);
289
289
            break;
290
290
        case GIMP_PDB_COLORARRAY:
291
291
            if (params[i].data.d_colorarray == NULL) {
539
539
            ret[i].data.d_channel = ((PyGimpDrawable *)item)->ID;
540
540
            break;
541
541
        case GIMP_PDB_SELECTION:
542
 
            check(!pygimp_layer_check(item));
543
 
            ret[i].data.d_selection = ((PyGimpLayer *)item)->ID;
 
542
            if (item == Py_None) {
 
543
                ret[i].data.d_channel = -1;
 
544
                break;
 
545
            }
 
546
            check(!pygimp_channel_check(item));
 
547
            ret[i].data.d_selection = ((PyGimpChannel *)item)->ID;
544
548
            break;
545
549
        case GIMP_PDB_COLORARRAY:
546
550
            {