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/keybindings | |
| 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/keybindings')
| -rw-r--r-- | capplets/keybindings/eggcellrendererkeys.c | 4 | ||||
| -rw-r--r-- | capplets/keybindings/mate-keybinding-properties.c | 6 |
2 files changed, 0 insertions, 10 deletions
diff --git a/capplets/keybindings/eggcellrendererkeys.c b/capplets/keybindings/eggcellrendererkeys.c index b521cf0a..8cd91ce9 100644 --- a/capplets/keybindings/eggcellrendererkeys.c +++ b/capplets/keybindings/eggcellrendererkeys.c @@ -6,10 +6,6 @@ #include "eggcellrendererkeys.h" #include "eggaccelerators.h" -#if !GTK_CHECK_VERSION(3,0,0) -#define gtk_widget_get_preferred_size(x,y,z) gtk_widget_size_request(x,y) -#endif - #ifndef EGG_COMPILATION #ifndef _ #define _(x) dgettext (GETTEXT_PACKAGE, x) diff --git a/capplets/keybindings/mate-keybinding-properties.c b/capplets/keybindings/mate-keybinding-properties.c index f06ab09b..9d548569 100644 --- a/capplets/keybindings/mate-keybinding-properties.c +++ b/capplets/keybindings/mate-keybinding-properties.c @@ -19,10 +19,6 @@ #include "activate-settings-daemon.h" #include "dconf-util.h" -#if !GTK_CHECK_VERSION(3,0,0) -#define gtk_widget_get_preferred_size(x,y,z) gtk_widget_size_request(x,y) -#endif - #define GSETTINGS_KEYBINDINGS_DIR "/org/mate/desktop/keybindings/" #define CUSTOM_KEYBINDING_SCHEMA "org.mate.control-center.keybinding" @@ -1891,13 +1887,11 @@ setup_dialog (GtkBuilder *builder, GSettings *marco_settings) /* set up the dialog */ reload_key_entries (builder); -#if GTK_CHECK_VERSION(3, 0, 0) widget = _gtk_builder_get_widget (builder, "mate-keybinding-dialog"); gtk_window_set_default_size (GTK_WINDOW (widget), 400, 500); widget = _gtk_builder_get_widget (builder, "label-suggest"); gtk_label_set_line_wrap (GTK_LABEL (widget), TRUE); gtk_label_set_max_width_chars (GTK_LABEL (widget), 60); -#endif widget = _gtk_builder_get_widget (builder, "mate-keybinding-dialog"); capplet_set_icon (widget, "preferences-desktop-keyboard-shortcuts"); |