← Back to branch summary

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

« back to all changes in this revision

Viewing changes to src/main.c

  • 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:
src/main.c
36
36
#define SHELL_DBUS_SERVICE "org.gnome.Shell"
37
37
#define MAGNIFIER_DBUS_SERVICE "org.gnome.Magnifier"
38
38
 
39
 
#define OVERRIDES_SCHEMA "org.gnome.shell.overrides"
40
 
 
41
39
#define WM_NAME "GNOME Shell"
42
40
#define GNOME_WM_KEYBINDINGS "Mutter,GNOME Shell"
43
41
 
167
165
}
168
166
 
169
167
static void
170
 
shell_prefs_init (void)
171
 
{
172
 
  meta_prefs_override_preference_schema ("attach-modal-dialogs",
173
 
                                         OVERRIDES_SCHEMA);
174
 
  meta_prefs_override_preference_schema ("dynamic-workspaces",
175
 
                                         OVERRIDES_SCHEMA);
176
 
  meta_prefs_override_preference_schema ("workspaces-only-on-primary",
177
 
                                         OVERRIDES_SCHEMA);
178
 
  meta_prefs_override_preference_schema ("button-layout",
179
 
                                         OVERRIDES_SCHEMA);
180
 
  meta_prefs_override_preference_schema ("edge-tiling",
181
 
                                         OVERRIDES_SCHEMA);
182
 
  meta_prefs_override_preference_schema ("focus-change-on-pointer-rest",
183
 
                                         OVERRIDES_SCHEMA);
184
 
}
185
 
 
186
 
static void
187
168
shell_introspection_init (void)
188
169
{
189
170
 
409
390
  shell_dbus_init (meta_get_replace_current_wm ());
410
391
  shell_a11y_init ();
411
392
  shell_perf_log_init ();
412
 
  shell_prefs_init ();
413
393
  shell_introspection_init ();
414
394
  shell_fonts_init ();
415
395