← Back to branch summary

~ubuntu-branches/ubuntu/vivid/gnome-desktop3/vivid

« back to all changes in this revision

Viewing changes to libgnome-desktop/gnome-xkb-info.c

  • Committer: Package Import Robot
  • Author(s): Jackson Doak
  • Date: 2014-10-31 07:46:09 UTC
  • mfrom: (1.6.5) (32.1.1 vivid-proposed)
  • Revision ID: package-import@ubuntu.com-20141031074609-gb280wdsxsgldc91
Tags: 3.14.1-1ubuntu1
* Merge with Debian, Remaining changes:
  - debian/patches:
    + 04_compute_average_color.patch: Compute the avergage color in
      gnome-desktop itself, not in unity to fix some races (LP #963140)
    + tweak_color_computation.patch, Patch from Gord, no patch header,
      no bug link.
    + git_revert_draw_background.patch
    + ubuntu_language.patch, Ported relevant bits from g-c-c 
      52_region_language.patch, as required for gnome 3.8 region panel
    + ubuntu_language_list_from_SUPPORTED.patch,
      adds api to get list of available languages from SUPPORTED file.
      To be used by gnome 3.8 region panel language installation.
  - debian/libgnome-desktop-3-10.symbols:
    + Add symbols included in Ubuntu patches
  - debian/control.in:
    + Mark gnome-desktop3-data Multi-Arch: foreign

Show diffs side-by-side

added added

removed removed

Lines of Context:
libgnome-desktop/gnome-xkb-info.c
287
287
{
288
288
  GHashTable *set;
289
289
 
290
 
  if (!layout->xkb_name)
 
290
  if (!layout->id)
291
291
    return;
292
292
 
293
293
  set = g_hash_table_lookup (table, key);
298
298
    }
299
299
  else
300
300
    {
301
 
      if (g_hash_table_contains (set, layout->xkb_name))
 
301
      if (g_hash_table_contains (set, layout->id))
302
302
        return;
303
303
    }
304
 
  g_hash_table_replace (set, layout->xkb_name, layout);
 
304
  g_hash_table_replace (set, layout->id, layout);
305
305
}
306
306
 
307
307
static void