← Back to branch summary

~ubuntu-branches/ubuntu/trusty/pango1.0/trusty-proposed

« back to all changes in this revision

Viewing changes to pango/modules.c

  • Committer: Package Import Robot
  • Author(s): Martin Pitt
  • Date: 2012-11-12 13:23:16 UTC
  • mfrom: (1.6.5) (63.3.31 sid)
  • Revision ID: package-import@ubuntu.com-20121112132316-1cffyagrjxx8tvmg
Tags: 1.30.1-1
https://launchpad.net/bugs/837145
https://launchpad.net/bugs/986008
https://launchpad.net/bugs/1073637
* New upstream bug fix release.
* debian/libpango1.0-0.symbols: Add new symbol from this release.
* Grab a few fixes from upstream (via Ubuntu package, thanks Robert Ancell):
  - 00git_missing_prototype.patch: Add missing method prototype.
  - 00git_memory_leak.patch: Fix memory leak (LP: #837145)
  - 00git_thai_zero_width_spaces.patch: correctly handle zero width spaces
    in Thai (LP: #986008)
* Add debian/tests: Simple compile/link/run autopkg test. Thanks to Rafał
  Cieślak! (LP: #1073637)
* debian/control.in: Set Vcs-* to experimental branch.

Show diffs side-by-side

added added

removed removed

Lines of Context:
pango/modules.c
404
404
}
405
405
 
406
406
static gboolean /* Returns true if succeeded, false if failed */
407
 
process_module_file (FILE *module_file)
 
407
process_module_file (FILE *module_file, const gchar *module_file_dir)
408
408
{
409
409
  GString *line_buf = g_string_new (NULL);
410
410
  GString *tmp_buf = g_string_new (NULL);
442
442
          switch (i)
443
443
            {
444
444
            case 0:
 
445
              if (!g_path_is_absolute (tmp_buf->str)) {
 
446
                const gchar *abs_file_name = g_build_filename (module_file_dir, tmp_buf->str, NULL);
 
447
                g_string_assign (tmp_buf, abs_file_name);
 
448
                g_free ((gpointer) abs_file_name);
 
449
              }
445
450
              pair->module = find_or_create_module (tmp_buf->str);
446
451
              break;
447
452
            case 1:
591
596
                  module_file = g_fopen (pathname, "r");
592
597
                  if (module_file)
593
598
                    {
594
 
                      process_module_file(module_file);
 
599
                      const gchar *module_file_dir = g_path_get_dirname (files[n]);
 
600
                      process_module_file(module_file, module_file_dir);
 
601
                      g_free ((gpointer) module_file_dir);
595
602
                      fclose(module_file);
596
603
                    }
597
604
                  g_free (pathname);
604
611
          module_file = g_fopen (files[n], "r");
605
612
          if (module_file)
606
613
            {
607
 
              process_module_file(module_file);
 
614
              const gchar *module_file_dir = g_path_get_dirname (files[n]);
 
615
              process_module_file(module_file, module_file_dir);
 
616
              g_free ((gpointer) module_file_dir);
608
617
              fclose(module_file);
609
618
            }
610
619
        }