← Back to branch summary

~ubuntu-branches/ubuntu/quantal/gimp/quantal

« back to all changes in this revision

Viewing changes to libgimp/gimp.c

  • Committer: Package Import Robot
  • Author(s): Robert Ancell
  • Date: 2012-09-19 17:16:47 UTC
  • mfrom: (1.1.27) (0.4.17 sid)
  • Revision ID: package-import@ubuntu.com-20120919171647-5dytjrc7bgb935we
Tags: 2.8.2-1ubuntu1
https://launchpad.net/bugs/1050831
* Merge from Debian unstable (LP: #1050831). Remaining Ubuntu changes:
* debian/control:
  - Update description
  - Build-depend on libtiff-dev instead of libtiff4-dev.
* debian/rules:
  - Set gettext domain and update translation templates
* debian/patches/02_help-message.patch:
* debian/patches/03_gimp.desktop.in.in.patch:
  - Update some strings for Ubuntu

Show diffs side-by-side

added added

removed removed

Lines of Context:
libgimp/gimp.c
1540
1540
gboolean
1541
1541
gimp_parasite_detach (const gchar *name)
1542
1542
{
1543
 
  return gimp_parasite_detach (name);
 
1543
  return gimp_detach_parasite (name);
1544
1544
}
1545
1545
 
1546
1546
/**
1587
1587
  GimpParasite *parasite = gimp_parasite_new (name, flags, size, data);
1588
1588
  gboolean      success;
1589
1589
 
1590
 
  success = gimp_parasite_attach (parasite);
 
1590
  success = gimp_attach_parasite (parasite);
1591
1591
 
1592
1592
  gimp_parasite_free (parasite);
1593
1593