← Back to branch summary

~canonical-dx-team/ubuntu/maverick/gtk+2.0/menuproxy

« back to all changes in this revision

Viewing changes to gtk/gtkpapersize.c

  • Committer: Bazaar Package Importer
  • Author(s): Sebastian Dröge
  • Date: 2010-05-31 09:45:32 UTC
  • mfrom: (1.11.5 upstream)
  • mto: This revision was merged to the branch mainline in revision 166.
  • Revision ID: james.westby@ubuntu.com-20100531094532-1epna8bbb2fob68f
Tags: 2.21.1-1
* New upstream development release:
  + debian/rules,
    debian/libgtk2.0-0.symbols:
    - Update for new API symbols.
  + debian/patches/070_mandatory-relibtoolize.patch:
    - Regenerated for the new version.

Show diffs side-by-side

added added

removed removed

Lines of Context:
gtk/gtkpapersize.c
669
669
  if (!locale)
670
670
    return GTK_PAPER_NAME_A4;
671
671
 
672
 
  if (g_str_has_prefix (locale, "en_CA") ||
673
 
      g_str_has_prefix (locale, "en_US") ||
674
 
      g_str_has_prefix (locale, "es_PR") ||
675
 
      g_str_has_prefix (locale, "es_US"))
 
672
  /* CLDR 1.8.1
 
673
   * http://unicode.org/repos/cldr-tmp/trunk/diff/supplemental/territory_language_information.html
 
674
   */
 
675
  if (g_regex_match_simple("[^_.@]{2,3}_(BZ|CA|CL|CO|CR|GT|MX|NI|PA|PH|PR|SV|US|VE)",
 
676
                           locale, G_REGEX_ANCHORED, G_REGEX_MATCH_ANCHORED))
676
677
    paper_size = GTK_PAPER_NAME_LETTER;
677
678
  else
678
679
    paper_size = GTK_PAPER_NAME_A4;