~unity-settings-daemon-team/unity-settings-daemon/trunk

« back to all changes in this revision

Viewing changes to gnome-settings-daemon/main.c

  • Committer: Bileto Bot
  • Author(s): Khurshid Alam
  • Date: 2020-03-11 16:32:10 UTC
  • mfrom: (4200.1.1 unity-settings-daemon)
  • Revision ID: ci-train-bot@canonical.com-20200311163210-ta55oofgp3pod2p6
* Port rest of the schemas gnome-settings-daemon-common to com.canonical.unity.settings-daemon. LP: #1842324

* When upstream moved persistant numlock-state to gsettings-desktop-schemas they converted it to boolean from enum. Since now we use our own schema, revert that change. This will make numlock work again in unity. Fixes LP: #1847858

 see https://gitlab.gnome.org/GNOME/gsettings-desktop-schemas/-/commit/d57c3c78336be544e1047127a27f9ddfcea6c8cb

* Remove gnome-settings-daemon-common from build dependency (LP: #1842324)

Approved by: Sebastien Bacher

Show diffs side-by-side

added added

removed removed

Lines of Context:
264
264
        GSettings *settings;
265
265
        gboolean enabled;
266
266
 
267
 
        settings = g_settings_new ("org.gnome.settings-daemon.plugins.keyboard");
 
267
        settings = g_settings_new ("com.canonical.unity.settings-daemon.plugins.keyboard");
268
268
        enabled = g_settings_get_boolean (settings, "active");
269
269
        g_object_unref (settings);
270
270