poldek-noutf8.patch

   1 --- poldek-0.30-cvs20080820.23/pkgdir/pndir/description.c.old   2008-12-10 15:50:49.000000000 +0100
   2 +++ poldek-0.30-cvs20080820.23/pkgdir/pndir/description.c       2008-12-10 15:52:39.000000000 +0100
   3 @@ -165,9 +165,8 @@ struct pkguinf *pndir_load_pkguinf(tn_al
   4          /* start from the end => the last loaded one will be set as
   5             pkguinf default (see pkguinf_restore_i18n()) */
   6          for (i = n_array_size(langs) - 1; i >= 0; i--) {
   7 -            const char *lang, *loaded_lang = NULL;
   8 +            const char *lang;
   9              struct tndb *db;
  10 -            char lang_utf8[32];
  11              char dkey[512];
  12              int  dklen;
  13
  14 @@ -178,26 +177,17 @@ struct pkguinf *pndir_load_pkguinf(tn_al
  15              if ((db = pndir_db_dscr_h_get(db_dscr_h, lang)) == NULL)
  16                  continue;
  17
  18 -            n_snprintf(lang_utf8, sizeof(lang_utf8), "%s.UTF-8", lang);
  19 -            loaded_lang = lang_utf8;
  20 -
  21 -            dklen = n_snprintf(dkey, sizeof(dkey), "%s%s", key, lang_utf8);
  22 +            dklen = n_snprintf(dkey, sizeof(dkey), "%s%s", key, lang);
  23              vlen = tndb_get(db, dkey, dklen, val, sizeof(val));
  24 -
  25 -            if (vlen == 0) {     /* not exists */
  26 -                dklen = n_snprintf(dkey, sizeof(dkey), "%s%s", key, lang);
  27 -                vlen = tndb_get(db, dkey, dklen, val, sizeof(val));
  28 -                loaded_lang = lang;
  29 -            }
  30 -
  31 -            DBGF("ld %s: %s (%d)\n", pkg_id(pkg), loaded_lang ? loaded_lang : lang, vlen);
  32 +
  33 +            DBGF("ld %s: %s (%d)\n", pkg_id(pkg), lang, vlen);
  34
  35              if (vlen > 0) {
  36                  tn_buf_it it;
  37                  n_buf_clean(nbuf);
  38                  n_buf_init(nbuf, val, vlen);
  39                  n_buf_it_init(&it, nbuf);
  40 -                pkguinf_restore_i18n(pkgu, &it, loaded_lang);
  41 +                pkguinf_restore_i18n(pkgu, &it, lang);
  42              }
  43          }
  44      }