← Back to branch summary

~attente/glib/gicon-upstream

« back to all changes in this revision

Viewing changes to gio/glib-compile-resources.c

  • Committer: Package Import Robot
  • Author(s): Iain Lane, Josselin Mouette, Iain Lane
  • Date: 2012-10-17 11:51:14 UTC
  • mfrom: (172.1.3 experimental)
  • Revision ID: package-import@ubuntu.com-20121017115114-gqog9lavags5afi1
Tags: 2.34.1-1
https://launchpad.net/bugs/1044322
[ Josselin Mouette ]
* Require libelfg0-dev, not libelf-dev which has nothing to do with 
  it.

[ Iain Lane ]
* New upstream release
  + GTimeZone support for zoneinfo version 1
  + Leak in glib-compile-resources
  + g_settings_bind: use canonical property name
  + Port gio tests from pygobject to pygi
* Switch python-gobject-2 BD to python-gi, folowing porting of tests. 
* debian/patches/50_git_gmenuexporter_allow_null_bus_on_name_vanished.patch:
  Cherry-pick upstream patch to fix crash when GBusNameVanishedCallback is
  called with a NULL GDBusConnection. (LP: #1044322)

Show diffs side-by-side

added added

removed removed

Lines of Context:
gio/glib-compile-resources.c
269
269
      if (state->preproc_options)
270
270
        {
271
271
          gchar **options;
272
 
          gchar *stderr_child = NULL;
273
272
          guint i;
274
273
          gboolean xml_stripblanks = FALSE;
275
274
          gboolean to_pixdata = FALSE;
296
295
            {
297
296
              gchar *argv[8];
298
297
              int status, fd, argc;
 
298
              gchar *stderr_child = NULL;
299
299
 
300
300
              tmp_file = g_strdup ("resource-XXXXXXXX");
301
301
              if ((fd = g_mkstemp (tmp_file)) == -1)
334
334
                {
335
335
                  g_set_error (error, G_IO_ERROR, G_IO_ERROR_FAILED,
336
336
                               _("Error processing input file with xmllint:\n%s"), stderr_child);
 
337
                  g_free (stderr_child);
337
338
                  goto cleanup;
338
339
                }
339
340
 
389
390
                {
390
391
                  g_set_error (error, G_IO_ERROR, G_IO_ERROR_FAILED,
391
392
                               _("Error processing input file with to-pixdata:\n%s"), stderr_child);
 
393
                  g_free (stderr_child);
392
394
                  goto cleanup;
393
395
                }
394
396