diff options
| author | infirit <[email protected]> | 2014-05-27 16:30:06 +0200 |
|---|---|---|
| committer | infirit <[email protected]> | 2014-05-27 16:30:06 +0200 |
| commit | 469b3c47fce9ea13e50a4448064f97cf297452f8 (patch) | |
| tree | 64f7c20f6b55b3e3811103c7571292194864eb7f /libslab | |
| parent | 13d0f05fb98284839d1dea3fc667903c8a82a40b (diff) | |
| download | mate-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 (limited to 'libslab')
| -rw-r--r-- | libslab/app-shell.c | 5 | ||||
| -rw-r--r-- | libslab/libslab-utils.c | 4 |
2 files changed, 2 insertions, 7 deletions
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); } |