diff options
| author | monsta <[email protected]> | 2016-12-02 00:45:36 +0300 |
|---|---|---|
| committer | monsta <[email protected]> | 2016-12-02 00:50:14 +0300 |
| commit | 0c27d18ab5efb721a2f02549767016c81fc6ce2c (patch) | |
| tree | 76b7b89cface072e011a3757a833e9090bab44f2 /capplets/keyboard | |
| parent | 1aa83d45ebf9599c6d4d3f47211c3961282e98f0 (diff) | |
| download | mate-control-center-0c27d18ab5efb721a2f02549767016c81fc6ce2c.tar.bz2 mate-control-center-0c27d18ab5efb721a2f02549767016c81fc6ce2c.tar.xz | |
move to GTK+3 (>= 3.14), drop GTK+2 code and --with-gtk build option
and require libmatekbd, libmate-desktop, marco, m-s-d >= 1.17
Diffstat (limited to 'capplets/keyboard')
| -rw-r--r-- | capplets/keyboard/mate-keyboard-properties-a11y.c | 15 | ||||
| -rw-r--r-- | capplets/keyboard/mate-keyboard-properties-xkbot.c | 4 | ||||
| -rw-r--r-- | capplets/keyboard/mate-keyboard-properties.c | 4 |
3 files changed, 0 insertions, 23 deletions
diff --git a/capplets/keyboard/mate-keyboard-properties-a11y.c b/capplets/keyboard/mate-keyboard-properties-a11y.c index 7a3b566e..23aea9e1 100644 --- a/capplets/keyboard/mate-keyboard-properties-a11y.c +++ b/capplets/keyboard/mate-keyboard-properties-a11y.c @@ -320,19 +320,4 @@ setup_a11y_tabs (GtkBuilder *dialog) gtk_range_get_adjustment (GTK_RANGE (WID ("mousekeys_init_delay_slide"))), "value", G_SETTINGS_BIND_DEFAULT); - -#if !GTK_CHECK_VERSION (3, 0, 0) - const char *range_names[] = { - "slowkeys_delay_slide", - "bouncekeys_delay_slide", - "mousekeys_accel_time_slide", - "mousekeys_max_speed_slide", - "mousekeys_init_delay_slide" - }; - - int i; - for (i = 0; i < 5; ++i) { - gtk_range_set_update_policy (GTK_RANGE (WID (range_names[i])), GTK_UPDATE_DISCONTINUOUS); - } -#endif } diff --git a/capplets/keyboard/mate-keyboard-properties-xkbot.c b/capplets/keyboard/mate-keyboard-properties-xkbot.c index 90301082..6f59498a 100644 --- a/capplets/keyboard/mate-keyboard-properties-xkbot.c +++ b/capplets/keyboard/mate-keyboard-properties-xkbot.c @@ -327,11 +327,7 @@ xkb_options_add_group (XklConfigRegistry * config_registry, g_free (titlemarkup); align = gtk_alignment_new (0, 0, 1, 1); gtk_alignment_set_padding (GTK_ALIGNMENT (align), 6, 12, 12, 0); -#if GTK_CHECK_VERSION (3, 0, 0) vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 6); -#else - vbox = gtk_vbox_new (TRUE, 6); -#endif gtk_container_add (GTK_CONTAINER (align), vbox); gtk_container_add (GTK_CONTAINER (current_expander), align); diff --git a/capplets/keyboard/mate-keyboard-properties.c b/capplets/keyboard/mate-keyboard-properties.c index d0418616..66dd13c0 100644 --- a/capplets/keyboard/mate-keyboard-properties.c +++ b/capplets/keyboard/mate-keyboard-properties.c @@ -186,10 +186,6 @@ setup_dialog (GtkBuilder * dialog) gtk_notebook_remove_page (nb, tb_page); } -#if !GTK_CHECK_VERSION (3, 0, 0) - gtk_range_set_update_policy (GTK_RANGE (WID ("cursor_blink_time_scale")), GTK_UPDATE_DISCONTINUOUS); -#endif - g_signal_connect (WID ("keyboard_dialog"), "response", (GCallback) dialog_response, NULL); |