← Back to branch summary

~noskcaj/ubuntu/utopic/gnome-tweak-tool/merge

« back to all changes in this revision

Viewing changes to .pc/fix_crash_for_non-shell_use.patch/gtweak/tweaks/tweak_group_shell.py

  • Committer: Jackson Doak
  • Date: 2014-06-13 20:33:26 UTC
  • mfrom: (9.1.4 sid)
  • Revision ID: noskcaj@ubuntu.com-20140613203326-9juxtbsxkzfxxvhp
* Merge from Debian unstable.  Remaining changes:
  - debian/patches/fix_crash_for_non-shell_use.patch:
    + Don't crash if gnome-shell is not running.

Show diffs side-by-side

added added

removed removed

Lines of Context:
.pc/fix_crash_for_non-shell_use.patch/gtweak/tweaks/tweak_group_shell.py
47
47
        _GSettingsTweak.__init__(self, name, "org.gnome.mutter", "dynamic-workspaces", **options)
48
48
 
49
49
        default = self.STATUS.keys()[self.STATUS.values().index(self.settings[self.key_name])]
50
 
        key_options = [("dynamic", _("Dynamics")), ("static", _("Static"))]
 
50
        key_options = [("dynamic", _("Dynamic")), ("static", _("Static"))]
51
51
 
52
52
        self.combo = build_combo_box_text(default, *key_options)
53
53
        self.combo.connect('changed', self._on_combo_changed)