diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/gpm-backlight.c | 14 | ||||
| -rw-r--r-- | src/gpm-common.c | 4 | ||||
| -rw-r--r-- | src/gpm-kbd-backlight.c | 14 | ||||
| -rw-r--r-- | src/gpm-manager.c | 8 | ||||
| -rw-r--r-- | src/msd-osd-window.c | 3 |
5 files changed, 1 insertions, 42 deletions
diff --git a/src/gpm-backlight.c b/src/gpm-backlight.c index fa54ad6..e066d06 100644 --- a/src/gpm-backlight.c +++ b/src/gpm-backlight.c @@ -208,11 +208,7 @@ gpm_backlight_dialog_show (GpmBacklight *backlight) GtkRequisition win_req; GdkScreen *pointer_screen; GdkRectangle geometry; -#if GTK_CHECK_VERSION (3, 22, 0) GdkMonitor *monitor; -#else - int monitor; -#endif GdkDisplay *display; GdkDeviceManager *device_manager; GdkDevice *device; @@ -241,21 +237,11 @@ gpm_backlight_dialog_show (GpmBacklight *backlight) &pointer_x, &pointer_y); -#if GTK_CHECK_VERSION (3, 22, 0) monitor = gdk_display_get_monitor_at_point (gdk_screen_get_display (pointer_screen), pointer_x, pointer_y); gdk_monitor_get_geometry (monitor, &geometry); -#else - monitor = gdk_screen_get_monitor_at_point (pointer_screen, - pointer_x, - pointer_y); - - gdk_screen_get_monitor_geometry (pointer_screen, - monitor, - &geometry); -#endif screen_w = geometry.width; screen_h = geometry.height; diff --git a/src/gpm-common.c b/src/gpm-common.c index 8b7834e..6556d85 100644 --- a/src/gpm-common.c +++ b/src/gpm-common.c @@ -145,11 +145,7 @@ gpm_help_display (const gchar *link_id) else uri = g_strdup ("help:mate-power-manager"); -#if GTK_CHECK_VERSION (3, 22, 0) gtk_show_uri_on_window (NULL, uri, GDK_CURRENT_TIME, &error); -#else - gtk_show_uri (NULL, uri, GDK_CURRENT_TIME, &error); -#endif if (error != NULL) { GtkWidget *d; diff --git a/src/gpm-kbd-backlight.c b/src/gpm-kbd-backlight.c index cc5d362..ec353e0 100644 --- a/src/gpm-kbd-backlight.c +++ b/src/gpm-kbd-backlight.c @@ -185,11 +185,7 @@ gpm_kbd_backlight_dialog_show (GpmKbdBacklight *backlight) GtkRequisition win_req; GdkScreen *pointer_screen; GdkRectangle geometry; -#if GTK_CHECK_VERSION (3, 22, 0) GdkMonitor *monitor; -#else - int monitor; -#endif GdkDisplay *display; GdkDeviceManager *device_manager; GdkDevice *device; @@ -218,21 +214,11 @@ gpm_kbd_backlight_dialog_show (GpmKbdBacklight *backlight) &pointer_x, &pointer_y); -#if GTK_CHECK_VERSION (3, 22, 0) monitor = gdk_display_get_monitor_at_point (gdk_screen_get_display (pointer_screen), pointer_x, pointer_y); gdk_monitor_get_geometry (monitor, &geometry); -#else - monitor = gdk_screen_get_monitor_at_point (pointer_screen, - pointer_x, - pointer_y); - - gdk_screen_get_monitor_geometry (pointer_screen, - monitor, - &geometry); -#endif screen_w = geometry.width; screen_h = geometry.height; diff --git a/src/gpm-manager.c b/src/gpm-manager.c index 784532a..91d787d 100644 --- a/src/gpm-manager.c +++ b/src/gpm-manager.c @@ -528,9 +528,6 @@ out: static void gpm_manager_sleep_failure_response_cb (GtkDialog *dialog, gint response_id, GpmManager *manager) { -#if !GTK_CHECK_VERSION (3, 22, 0) - GdkScreen *screen; -#endif GtkWidget *dialog_error; GError *error = NULL; gboolean ret; @@ -539,12 +536,7 @@ gpm_manager_sleep_failure_response_cb (GtkDialog *dialog, gint response_id, GpmM /* user clicked the help button */ if (response_id == GTK_RESPONSE_HELP) { uri = g_settings_get_string (manager->priv->settings, GPM_SETTINGS_NOTIFY_SLEEP_FAILED_URI); -#if GTK_CHECK_VERSION (3, 22, 0) ret = gtk_show_uri_on_window (GTK_WINDOW (dialog), uri, gtk_get_current_event_time (), &error); -#else - screen = gdk_screen_get_default(); - ret = gtk_show_uri (screen, uri, gtk_get_current_event_time (), &error); -#endif if (!ret) { dialog_error = gtk_message_dialog_new (NULL, GTK_DIALOG_MODAL, GTK_MESSAGE_INFO, GTK_BUTTONS_OK, "Failed to show uri %s", error->message); diff --git a/src/msd-osd-window.c b/src/msd-osd-window.c index cfc426f..0b006ad 100644 --- a/src/msd-osd-window.c +++ b/src/msd-osd-window.c @@ -400,9 +400,8 @@ msd_osd_window_class_init (MsdOsdWindowClass *klass) G_TYPE_NONE, 1, G_TYPE_POINTER); -#if GTK_CHECK_VERSION (3, 20, 0) gtk_widget_class_set_css_name (widget_class, "MsdOsdWindow"); -#endif + g_type_class_add_private (klass, sizeof (MsdOsdWindowPrivate)); } |