From 469b3c47fce9ea13e50a4448064f97cf297452f8 Mon Sep 17 00:00:00 2001 From: infirit Date: Tue, 27 May 2014 16:30:06 +0200 Subject: Cleanup GTK_CHECK_VERSION and unify where possible gdk_display_get_default | since 2.2 gdk_x11_display_get_xdisplay | since 2.2 gdk_drag_context_list_targets | since 2.22 gdk_x11_window_foreign_new_for_display | since 2.24 gdk_drawable_get_screen | since 2.24 gtk_widget_hide | always --- capplets/keyboard/mate-keyboard-properties-xkbltadd.c | 4 ---- capplets/keyboard/mate-keyboard-properties-xkbmc.c | 7 ++----- 2 files changed, 2 insertions(+), 9 deletions(-) (limited to 'capplets/keyboard') diff --git a/capplets/keyboard/mate-keyboard-properties-xkbltadd.c b/capplets/keyboard/mate-keyboard-properties-xkbltadd.c index 3a079e83..7ec09919 100644 --- a/capplets/keyboard/mate-keyboard-properties-xkbltadd.c +++ b/capplets/keyboard/mate-keyboard-properties-xkbltadd.c @@ -545,11 +545,7 @@ xkb_layout_choose (GtkBuilder * dialog) } else #endif { -#if GTK_CHECK_VERSION (3, 0, 0) gtk_widget_hide (CWID ("vboxPreview")); -#else - gtk_widget_hide_all (CWID ("vboxPreview")); -#endif gtk_widget_hide (CWID ("btnPrint")); } diff --git a/capplets/keyboard/mate-keyboard-properties-xkbmc.c b/capplets/keyboard/mate-keyboard-properties-xkbmc.c index 1be85b36..e6ae7eb7 100644 --- a/capplets/keyboard/mate-keyboard-properties-xkbmc.c +++ b/capplets/keyboard/mate-keyboard-properties-xkbmc.c @@ -30,9 +30,6 @@ #include #include -#if GTK_CHECK_VERSION (3, 0, 0) -#define gtk_widget_hide_all gtk_widget_hide -#endif #include "capplet-util.h" @@ -332,8 +329,8 @@ choose_model (GtkBuilder * dialog) prepare_models_list (chooser_dialog); if (!fill_vendors_list (chooser_dialog)) { - gtk_widget_hide_all (CWID ("vendors_label")); - gtk_widget_hide_all (CWID ("vendors_scrolledwindow")); + gtk_widget_hide (CWID ("vendors_label")); + gtk_widget_hide (CWID ("vendors_scrolledwindow")); current_vendor_name = NULL; fill_models_list (chooser_dialog); } -- cgit v1.2.1