diff options
| author | monsta <[email protected]> | 2016-10-31 17:22:27 +0300 |
|---|---|---|
| committer | monsta <[email protected]> | 2016-10-31 17:22:27 +0300 |
| commit | 2eebee804b2d643c20cab019fb8149095423370a (patch) | |
| tree | ba795dabbd5367f405328201a9f69bc2802131fc | |
| parent | 76e0ee3104a68d57e85aa4148702a888c0677bdf (diff) | |
| download | mate-settings-daemon-2eebee804b2d643c20cab019fb8149095423370a.tar.bz2 mate-settings-daemon-2eebee804b2d643c20cab019fb8149095423370a.tar.xz | |
mouse: use more common g_strcmp0 function instead of g_str_equal
as described in docs:
https://developer.gnome.org/glib/stable/glib-Hash-Tables.html#g-str-equal
> Note that this function is primarily meant as a hash table comparison function.
> For a general-purpose, NULL-safe string comparison function, see g_strcmp0().
| -rw-r--r-- | plugins/mouse/msd-mouse-manager.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/plugins/mouse/msd-mouse-manager.c b/plugins/mouse/msd-mouse-manager.c index 305bf88..61b52a2 100644 --- a/plugins/mouse/msd-mouse-manager.c +++ b/plugins/mouse/msd-mouse-manager.c @@ -1013,11 +1013,11 @@ mouse_callback (GSettings *settings, set_motion_threshold (manager, g_settings_get_int (settings, key)); } else if (g_strcmp0 (key, KEY_TOUCHPAD_DISABLE_W_TYPING) == 0) { set_disable_w_typing (manager, g_settings_get_boolean (settings, key)); - } else if (g_str_equal (key, KEY_MIDDLE_BUTTON_EMULATION)) { + } else if (g_strcmp0 (key, KEY_MIDDLE_BUTTON_EMULATION) == 0) { set_middle_button_all (manager, g_settings_get_boolean (settings, key)); } else if (g_strcmp0 (key, KEY_TOUCHPAD_TAP_TO_CLICK) == 0) { set_tap_to_click_all (manager); - } else if (g_str_equal (key, KEY_TOUCHPAD_TWO_FINGER_CLICK) || g_str_equal (key, KEY_TOUCHPAD_THREE_FINGER_CLICK)) { + } else if ((g_strcmp0 (key, KEY_TOUCHPAD_TWO_FINGER_CLICK) == 0) || (g_strcmp0 (key, KEY_TOUCHPAD_THREE_FINGER_CLICK) == 0)) { set_click_actions_all (manager); } else if (g_strcmp0 (key, KEY_TOUCHPAD_ONE_FINGER_TAP) == 0) { set_tap_to_click_all (manager); @@ -1027,7 +1027,7 @@ mouse_callback (GSettings *settings, set_tap_to_click_all (manager); } else if (g_strcmp0 (key, KEY_VERT_EDGE_SCROLL) == 0 || g_strcmp0 (key, KEY_HORIZ_EDGE_SCROLL) == 0 || g_strcmp0 (key, KEY_VERT_TWO_FINGER_SCROLL) == 0 || g_strcmp0 (key, KEY_HORIZ_TWO_FINGER_SCROLL) == 0) { set_scrolling (manager->priv->settings_touchpad); - } else if (g_str_equal (key, KEY_TOUCHPAD_NATURAL_SCROLL)) { + } else if (g_strcmp0 (key, KEY_TOUCHPAD_NATURAL_SCROLL) == 0) { set_natural_scroll_all (manager); } else if (g_strcmp0 (key, KEY_MOUSE_LOCATE_POINTER) == 0) { set_locate_pointer (manager, g_settings_get_boolean (settings, key)); |