← Back to branch summary

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

« back to all changes in this revision

Viewing changes to pango/querymodules.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/querymodules.c
44
44
#endif
45
45
#define SOEXT_LEN ((int) strlen (SOEXT))
46
46
 
 
47
static gboolean system_mode;
 
48
 
47
49
static gboolean
48
50
string_needs_escape (const char *str)
49
51
{
205
207
    {
206
208
      {"version",       0, G_OPTION_FLAG_NO_ARG, G_OPTION_ARG_CALLBACK, &show_version,
207
209
       "Show version numbers",                                             NULL},
 
210
      {"system",        0, 0, G_OPTION_ARG_NONE, &system_mode,
 
211
       "Do not load configuration from home directory", NULL},
208
212
      {NULL}
209
213
    };
210
214
 
237
241
      char **dirs;
238
242
      int i;
239
243
 
240
 
      path = pango_config_key_get ("Pango/ModulesPath");
 
244
      if (system_mode)
 
245
        path = pango_config_key_get_system ("Pango/ModulesPath");
 
246
      else
 
247
        path = pango_config_key_get ("Pango/ModulesPath");
241
248
      if (!path)
242
249
        path = g_build_filename (pango_get_lib_subdirectory (),
243
250
                                 MODULE_VERSION,