← Back to branch summary

~ubuntu-branches/ubuntu/trusty/gnome-shell/trusty-proposed

« back to all changes in this revision

Viewing changes to .pc/git_relock_screen_after_crash.patch/js/ui/main.js

  • Committer: Package Import Robot
  • Author(s): Jeremy Bicha
  • Date: 2013-06-16 19:14:01 UTC
  • mfrom: (1.1.50) (19.1.37 experimental)
  • Revision ID: package-import@ubuntu.com-20130616191401-kef9vj3obfuvusrn
Tags: 3.8.3-1ubuntu1
* Merge with Debian. Remaining changes:
  - debian/control.in:
    + Build-depend on libsystemd-login-dev & libsystemd-daemon-dev
    + Depend on gdm instead of gdm3
  - 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.
  - 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:
    + Backport fix to ensure session is locked after crash
* debian/patches/revert-input-source-changes.patch:
  - Temporarily revert input source changes that need gnome-settings-daemon
    and gnome-control-center 3.8.3 to be useful
* debian/patches/revert-notification-settings-link.patch:
  - Don't link to Notification Settings since that's only available
    with gnome-control-center >= 3.8.

Show diffs side-by-side

added added

removed removed

Lines of Context:
.pc/git_relock_screen_after_crash.patch/js/ui/main.js
38
38
const XdndHandler = imports.ui.xdndHandler;
39
39
const Util = imports.misc.util;
40
40
 
41
 
const OVERRIDES_SCHEMA = 'org.gnome.shell.overrides';
42
41
const DEFAULT_BACKGROUND_COLOR = Clutter.Color.from_pixel(0x2e3436ff);
43
42
 
44
43
let componentManager = null;
68
67
let _startDate;
69
68
let _defaultCssStylesheet = null;
70
69
let _cssStylesheet = null;
71
 
let _overridesSettings = null;
 
70
let _workspacesSettings = null;
72
71
 
73
72
function _sessionUpdated() {
74
73
    _loadDefaultStylesheet();
106
105
 
107
106
function _sessionsLoaded() {
108
107
    sessionMode.connect('updated', _sessionUpdated);
 
108
    _initializePrefs();
109
109
    _initializeUI();
110
110
 
111
111
    shellDBusService = new ShellDBus.GnomeShell();
114
114
    _sessionUpdated();
115
115
}
116
116
 
 
117
function _initializePrefs() {
 
118
    let keys = new Gio.Settings({ schema: sessionMode.overridesSchema }).list_keys();
 
119
    for (let i = 0; i < keys.length; i++)
 
120
        Meta.prefs_override_preference_schema (keys[i], sessionMode.overridesSchema);
 
121
 
 
122
    let workspacesSchema;
 
123
    if (keys.indexOf('dynamic-workspaces') > -1)
 
124
        workspacesSchema = sessionMode.overridesSchema;
 
125
    else
 
126
        workspacesSchema = 'org.gnome.mutter';
 
127
 
 
128
     _workspacesSettings = new Gio.Settings({ schema: workspacesSchema });
 
129
     _workspacesSettings.connect('changed::dynamic-workspaces', _queueCheckWorkspaces);
 
130
}
 
131
 
117
132
function _initializeUI() {
118
133
    // Ensure ShellWindowTracker and ShellAppUsage are initialized; this will
119
134
    // also initialize ShellAppSystem first.  ShellAppSystem
179
194
        Scripting.runPerfScript(module, perfOutput);
180
195
    }
181
196
 
182
 
    _overridesSettings = new Gio.Settings({ schema: OVERRIDES_SCHEMA });
183
 
    _overridesSettings.connect('changed::dynamic-workspaces', _queueCheckWorkspaces);
184
 
 
185
197
    global.screen.connect('notify::n-workspaces', _nWorkspacesChanged);
186
198
 
187
199
    global.screen.connect('window-entered-monitor', _windowEnteredMonitor);