Skip to content
Commits on Source (9)
============
Version 42.1
============
- Brown paper bag release
============
Version 42.0
============
- Translation updates
Keyboard:
- Clear content of gtk-im-module setting
=============
Version 42.rc
=============
......
project(
'gnome-settings-daemon', 'c',
version: '42.rc',
version: '42.1',
license: [ 'GPL2+', 'LGPLv2+' ],
meson_version: '>= 0.49.0'
)
......
......@@ -67,6 +67,8 @@
#define DEFAULT_LAYOUT "us"
#define SETTINGS_PORTED_FILE ".gsd-keyboard.settings-ported"
struct _GsdKeyboardManager
{
GObject parent;
......@@ -541,6 +543,14 @@ gsd_keyboard_manager_finalize (GObject *object)
G_OBJECT_CLASS (gsd_keyboard_manager_parent_class)->finalize (object);
}
static GVariant *
reset_gtk_im_module (GVariant *variant,
GVariant *old_default,
GVariant *new_default)
{
return NULL;
}
static void
migrate_keyboard_settings (void)
{
......@@ -550,12 +560,37 @@ migrate_keyboard_settings (void)
{ "delay", "delay", NULL },
{ "remember-numlock-state", "remember-numlock-state", NULL },
};
g_autofree char *filename = NULL;
gsd_settings_migrate_check ("org.gnome.settings-daemon.peripherals.keyboard.deprecated",
"/org/gnome/settings-daemon/peripherals/keyboard/",
"org.gnome.desktop.peripherals.keyboard",
"/org/gnome/desktop/peripherals/keyboard/",
entries, G_N_ELEMENTS (entries));
/* In prior versions to GNOME 42, the gtk-im-module setting was
* owned by gsd-keyboard. Reset it once before giving it back
* to the user.
*/
filename = g_build_filename (g_get_user_config_dir (),
SETTINGS_PORTED_FILE,
NULL);
if (!g_file_test (filename, G_FILE_TEST_EXISTS)) {
GsdSettingsMigrateEntry im_entry[] = {
{ "gtk-im-module", "gtk-im-module", reset_gtk_im_module },
};
g_autoptr(GError) error = NULL;
gsd_settings_migrate_check ("org.gnome.desktop.interface",
"/org/gnome/desktop/interface/",
"org.gnome.desktop.interface",
"/org/gnome/desktop/interface/",
im_entry, G_N_ELEMENTS (im_entry));
if (!g_file_set_contents (filename, "", -1, &error))
g_warning ("Error migrating gtk-im-module: %s", error->message);
}
}
GsdKeyboardManager *
......
......@@ -637,7 +637,7 @@ class PowerPluginTest4(PowerPluginBase):
dbus_interface='org.gnome.SessionManager')
# At this point logind should suspend for us
@unittest.skipIf(mutter_version <= (42, 'alpha'), reason="mutter is too old and may be buggy")
@unittest.skipIf(mutter_version <= (42, 0), reason="mutter is too old and may be buggy")
def test_unblank_on_lid_open(self):
'''Check that we do unblank on lid opening, if the machine will not suspend'''
......
......@@ -1733,14 +1733,14 @@ msgstr "Hardwarový režim „letadlo“"
#: plugins/media-keys/gsd-media-keys-manager.c:2592
#, no-c-format
msgid "Screencast from %d %t.webm"
msgstr "Nahrávka obrazovky z %d %t.webm"
msgstr "Nahrávka obrazovky pořízená %d %t.webm"
#. translators: this is the name of the file that gets made up
#. * with the screenshot
#: plugins/media-keys/gsd-screenshot-utils.c:240
#, c-format
msgid "Screenshot from %s"
msgstr "Snímek z %s"
msgstr "Snímek obrazovky pořízený %s"
#: plugins/power/gpm-common.c:91
msgid "Unknown time"
......
This diff is collapsed.
This diff is collapsed.