← Back to branch summary

~ubuntu-branches/ubuntu/trusty/gimp/trusty

« back to all changes in this revision

Viewing changes to app/core/gimp-modules.c

  • Committer: Package Import Robot
  • Author(s): Jeremy Bicha
  • Date: 2013-03-08 13:26:03 UTC
  • mfrom: (1.1.28) (0.4.19 sid)
  • Revision ID: package-import@ubuntu.com-20130308132603-h14fmrgazi3roobr
Tags: 2.8.4-1ubuntu1
https://launchpad.net/bugs/1132767
* Synchronize with Debian (LP: #1132767). Remaining changes:
  - debian/patches/02_help-message.patch,
    debian/patches/03_gimp.desktop.in.in.patch:
    + Update some strings for Ubuntu
  - debian/control:
    + Update description
  - debian/rules:
    + Set gettext domain and update translation templates
* Dropped changes:
  - CVE-2012-5576.patch: Applied in new version
  - fix-python-multiarch-includes.patch: No longer needed
* debian/patches/link-against-lm.patch:
  - Link against lm to fix underlinking build failure
* debian/control, debian/rules:
  - Run autoreconf for above patch

Show diffs side-by-side

added added

removed removed

Lines of Context:
app/core/gimp-modules.c
73
73
  if (gimp->no_interface)
74
74
    return;
75
75
 
 
76
  /* FIXME, gimp->be_verbose is not yet initialized in init() */
 
77
  gimp->module_db->verbose = gimp->be_verbose;
 
78
 
76
79
  filename = gimp_personal_rc_file ("modulerc");
77
80
 
78
81
  if (gimp->be_verbose)
201
204
      if (writer)
202
205
        {
203
206
          gimp_config_writer_open (writer, "module-load-inhibit");
204
 
          gimp_config_writer_printf (writer, "\"%s\"", p);
 
207
          gimp_config_writer_string (writer, p);
205
208
          gimp_config_writer_close (writer);
206
209
 
207
210
          gimp_config_writer_finish (writer, "end of modulerc", &error);