← Back to branch summary

~darkxst/ubuntu/saucy/gnome-shell/upstart_log

« back to all changes in this revision

Viewing changes to src/shell-app.c

  • Committer: Package Import Robot
  • Author(s): Jeremy Bicha
  • Date: 2013-05-31 12:01:12 UTC
  • mfrom: (1.1.49) (19.1.36 experimental)
  • Revision ID: package-import@ubuntu.com-20130531120112-ew91khxf051x9i2r
Tags: 3.8.2-1ubuntu1
https://launchpad.net/bugs/1185869
https://launchpad.net/bugs/1185721
https://launchpad.net/bugs/1064584
* Merge with Debian (LP: #1185869, #1185721). Remaining changes:
  - debian/control.in:
    + Build-depend on libsystemd-login-dev & libsystemd-daemon-dev
    + Depend on gdm instead of gdm3
    + Don't recommend gnome-session-fallback
  - debian/patches/40_change-pam-name-to-match-gdm.patch:
  - debian/patches/revert-suspend-break.patch:
    + Disabled, not needed on Ubuntu
  - debian/patches/ubuntu-lightdm-user-switching.patch:
    + Allow user switching when using LightDM. Thanks Gerhard Stein
      for rebasing against gnome-shell 3.8!
  - debian/patches/ubuntu_lock_on_suspend.patch
    + Respect Ubuntu's lock-on-suspend setting.
      Disabled until it can be rewritten.
  - debian/patches/git_relock_screen_after_crash.patch:
    + Add Upstream fix for unlocked session after crash (LP: #1064584)
* Note that the new GNOME Classic mode (which requires installing
  gnome-shell-extensions) won't work until gnome-session 3.8 is
  available in Ubuntu

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/shell-app.c
1319
1319
 
1320
1320
  appinfo = gmenu_tree_entry_get_app_info (app->entry);
1321
1321
  name = g_app_info_get_name (G_APP_INFO (appinfo));
1322
 
  app->casefolded_name = shell_util_normalize_and_casefold (name);
 
1322
  app->casefolded_name = shell_util_normalize_casefold_and_unaccent (name);
1323
1323
 
1324
1324
  generic_name = g_desktop_app_info_get_generic_name (appinfo);
1325
1325
  if (generic_name)
1326
 
    app->casefolded_generic_name = shell_util_normalize_and_casefold (generic_name);
 
1326
    app->casefolded_generic_name = shell_util_normalize_casefold_and_unaccent (generic_name);
1327
1327
  else
1328
1328
    app->casefolded_generic_name = NULL;
1329
1329
 
1330
1330
  exec = g_app_info_get_executable (G_APP_INFO (appinfo));
1331
 
  normalized_exec = shell_util_normalize_and_casefold (exec);
 
1331
  normalized_exec = shell_util_normalize_casefold_and_unaccent (exec);
1332
1332
  app->casefolded_exec = trim_exec_line (normalized_exec);
1333
1333
  g_free (normalized_exec);
1334
1334
 
1343
1343
      i = 0;
1344
1344
      while (keywords[i])
1345
1345
        {
1346
 
          app->casefolded_keywords[i] = shell_util_normalize_and_casefold (keywords[i]);
 
1346
          app->casefolded_keywords[i] = shell_util_normalize_casefold_and_unaccent (keywords[i]);
1347
1347
          ++i;
1348
1348
        }
1349
1349
      app->casefolded_keywords[i] = NULL;