summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorinfirit <[email protected]>2014-05-27 16:30:06 +0200
committerinfirit <[email protected]>2014-05-27 16:30:06 +0200
commit469b3c47fce9ea13e50a4448064f97cf297452f8 (patch)
tree64f7c20f6b55b3e3811103c7571292194864eb7f
parent13d0f05fb98284839d1dea3fc667903c8a82a40b (diff)
downloadmate-control-center-469b3c47fce9ea13e50a4448064f97cf297452f8.tar.bz2
mate-control-center-469b3c47fce9ea13e50a4448064f97cf297452f8.tar.xz
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
Diffstat
-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
-rw-r--r--libslab/app-shell.c5
-rw-r--r--libslab/libslab-utils.c4
-rw-r--r--typing-break/drw-selection.c4
-rw-r--r--typing-break/main.c4
9 files changed, 4 insertions, 52 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;
diff --git a/libslab/app-shell.c b/libslab/app-shell.c
index e5844be3..19d98bf2 100644
--- a/libslab/app-shell.c
+++ b/libslab/app-shell.c
@@ -28,7 +28,6 @@
#include <gdk/gdkkeysyms.h>
#if GTK_CHECK_VERSION (3, 0, 0)
#include <gdk/gdkkeysyms-compat.h>
-#define gtk_widget_hide_all gtk_widget_hide
#endif
#include <sys/types.h>
#include <sys/stat.h>
@@ -112,7 +111,7 @@ show_shell (AppShellData * app_data)
{
gtk_widget_show_all (app_data->main_app);
if (!app_data->static_actions)
- gtk_widget_hide_all (app_data->actions_section); /* don't show unless a launcher is selected */
+ gtk_widget_hide (app_data->actions_section); /* don't show unless a launcher is selected */
if (app_data->main_app_window_shown_once)
gtk_window_move (GTK_WINDOW (app_data->main_app),
@@ -381,7 +380,7 @@ relayout_shell (AppShellData * app_data)
gtk_widget_show_all (shell);
if (!app_data->static_actions && !app_data->last_clicked_launcher)
- gtk_widget_hide_all (app_data->actions_section); /* don't show unless a launcher is selected */
+ gtk_widget_hide (app_data->actions_section); /* don't show unless a launcher is selected */
}
static GtkWidget *
diff --git a/libslab/libslab-utils.c b/libslab/libslab-utils.c
index 5c553069..66d1e4d3 100644
--- a/libslab/libslab-utils.c
+++ b/libslab/libslab-utils.c
@@ -191,11 +191,7 @@ libslab_get_current_screen (void)
event = gtk_get_current_event ();
if (event) {
if (event->any.window)
-#if GTK_CHECK_VERSION (3, 0, 0)
screen = gtk_window_get_screen (GTK_WINDOW (event->any.window));
-#else
- screen = gdk_drawable_get_screen (GDK_DRAWABLE (event->any.window));
-#endif
gdk_event_free (event);
}
diff --git a/typing-break/drw-selection.c b/typing-break/drw-selection.c
index 5f6b81f7..48b7db55 100644
--- a/typing-break/drw-selection.c
+++ b/typing-break/drw-selection.c
@@ -78,11 +78,7 @@ drw_selection_find_existing (DrwSelection *drw_selection)
gdk_x11_get_xatom_by_name (SELECTION_NAME));
if (old) {
XSelectInput (xdisplay, old, StructureNotifyMask);
-#if GTK_CHECK_VERSION (3, 0, 0)
drw_selection->owner_window = gdk_x11_window_foreign_new_for_display (gdk_display_get_default (), old);
-#else
- drw_selection->owner_window = gdk_window_foreign_new (old);
-#endif
}
XSync (xdisplay, False);
diff --git a/typing-break/main.c b/typing-break/main.c
index 9186915b..b0b50405 100644
--- a/typing-break/main.c
+++ b/typing-break/main.c
@@ -35,11 +35,7 @@ gboolean debug = FALSE;
static gboolean
have_tray (void)
{
-#if GTK_CHECK_VERSION (3, 0, 0)
Screen *xscreen = DefaultScreenOfDisplay (gdk_x11_display_get_xdisplay(gdk_display_get_default()));
-#else
- Screen *xscreen = DefaultScreenOfDisplay (gdk_display);
-#endif
Atom selection_atom;
char *selection_atom_name;
generated by cgit v1.2.1 (git 2.18.0) at 2024-06-12 06:47:50 +0000