summaryrefslogtreecommitdiff
path: root/capplets
diff options
context:
space:
mode:
Diffstat (limited to 'capplets')
-rw-r--r--capplets/about-me/e-image-chooser.c12
-rw-r--r--capplets/keybindings/eggcellrendererkeys.c4
-rw-r--r--capplets/keyboard/mate-keyboard-properties-xkbltadd.c4
-rw-r--r--capplets/keyboard/mate-keyboard-properties-xkbmc.c7
-rw-r--r--capplets/windows/mate-window-properties.c12
5 files changed, 2 insertions, 37 deletions
diff --git a/capplets/about-me/e-image-chooser.c b/capplets/about-me/e-image-chooser.c
index c9f35fc2..8a404ee8 100644
--- a/capplets/about-me/e-image-chooser.c
+++ b/capplets/about-me/e-image-chooser.c
@@ -281,11 +281,7 @@ image_drag_motion_cb (GtkWidget *widget,
if (!chooser->priv->editable)
return FALSE;
-#if GTK_CHECK_VERSION (3, 0, 0)
for (p = gdk_drag_context_list_targets (context); p; p = p->next) {
-#else
- for (p = context->targets; p != NULL; p = p->next) {
-#endif
char *possible_type;
possible_type = gdk_atom_name (GDK_POINTER_TO_ATOM (p->data));
@@ -311,19 +307,11 @@ image_drag_drop_cb (GtkWidget *widget,
if (!chooser->priv->editable)
return FALSE;
-#if GTK_CHECK_VERSION (3, 0, 0)
if (gdk_drag_context_list_targets (context) == NULL) {
-#else
- if (context->targets == NULL) {
-#endif
return FALSE;
}
-#if GTK_CHECK_VERSION (3, 0, 0)
for (p = gdk_drag_context_list_targets (context); p; p = p->next) {
-#else
- for (p = context->targets; p != NULL; p = p->next) {
-#endif
char *possible_type;
possible_type = gdk_atom_name (GDK_POINTER_TO_ATOM (p->data));
diff --git a/capplets/keybindings/eggcellrendererkeys.c b/capplets/keybindings/eggcellrendererkeys.c
index 9dffeda7..22ea7a79 100644
--- a/capplets/keybindings/eggcellrendererkeys.c
+++ b/capplets/keybindings/eggcellrendererkeys.c
@@ -320,11 +320,7 @@ static gboolean is_modifier(guint keycode)
XModifierKeymap* mod_keymap;
gboolean retval = FALSE;
-#if GTK_CHECK_VERSION (3, 0, 0)
mod_keymap = XGetModifierMapping(gdk_x11_display_get_xdisplay(gdk_display_get_default()));
-#else
- mod_keymap = XGetModifierMapping(gdk_display);
-#endif
map_size = 8 * mod_keymap->max_keypermod;
i = 0;
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 <glib/gi18n.h>
#include <gtk/gtk.h>
-#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);
}
diff --git a/capplets/windows/mate-window-properties.c b/capplets/windows/mate-window-properties.c
index e32e14d7..219b724f 100644
--- a/capplets/windows/mate-window-properties.c
+++ b/capplets/windows/mate-window-properties.c
@@ -592,28 +592,16 @@ reload_mouse_modifiers (void)
int min_keycode, max_keycode;
int mod_meta, mod_super, mod_hyper;
-#if GTK_CHECK_VERSION (3, 0, 0)
XDisplayKeycodes (gdk_x11_display_get_xdisplay(gdk_display_get_default()),
-#else
- XDisplayKeycodes (gdk_display,
-#endif
&min_keycode,
&max_keycode);
-#if GTK_CHECK_VERSION (3, 0, 0)
keymap = XGetKeyboardMapping (gdk_x11_display_get_xdisplay(gdk_display_get_default()),
-#else
- keymap = XGetKeyboardMapping (gdk_display,
-#endif
min_keycode,
max_keycode - min_keycode,
&keysyms_per_keycode);
-#if GTK_CHECK_VERSION (3, 0, 0)
modmap = XGetModifierMapping (gdk_x11_display_get_xdisplay(gdk_display_get_default()));
-#else
- modmap = XGetModifierMapping (gdk_display);
-#endif
have_super = FALSE;
have_meta = FALSE;