diff options
| author | ZenWalker <[email protected]> | 2017-08-05 00:42:08 +0200 |
|---|---|---|
| committer | raveit65 <[email protected]> | 2017-08-10 20:57:33 +0200 |
| commit | c11a2ac7a568b83fb0327e831519981a465bc51f (patch) | |
| tree | a8825590954425ab595d8a6d2d5b32ed852edc15 | |
| parent | 296116088fca1ea8a261c49233fec407bd9098f6 (diff) | |
| download | mate-notification-daemon-c11a2ac7a568b83fb0327e831519981a465bc51f.tar.bz2 mate-notification-daemon-c11a2ac7a568b83fb0327e831519981a465bc51f.tar.xz | |
avoid deprecated gdk_screen_get_n_monitors
| -rw-r--r-- | src/capplet/mate-notification-properties.c | 4 | ||||
| -rw-r--r-- | src/daemon/daemon.c | 16 | ||||
| -rw-r--r-- | src/daemon/stack.c | 8 |
3 files changed, 28 insertions, 0 deletions
diff --git a/src/capplet/mate-notification-properties.c b/src/capplet/mate-notification-properties.c index a1e322e..22229d3 100644 --- a/src/capplet/mate-notification-properties.c +++ b/src/capplet/mate-notification-properties.c @@ -213,7 +213,11 @@ static void notification_properties_dialog_setup_monitors(NotificationAppletDial screen = gdk_display_get_default_screen(display); g_assert(screen != NULL); +#if GTK_CHECK_VERSION (3, 22, 0) + num_monitors = gdk_display_get_n_monitors(display); +#else num_monitors = gdk_screen_get_n_monitors(screen); +#endif g_assert(num_monitors >= 1); store = gtk_list_store_new(N_COLUMNS_MONITOR, G_TYPE_INT); diff --git a/src/daemon/daemon.c b/src/daemon/daemon.c index 4b81c3c..2090885 100644 --- a/src/daemon/daemon.c +++ b/src/daemon/daemon.c @@ -185,13 +185,21 @@ static void create_stack_for_monitor(NotifyDaemon* daemon, GdkScreen* screen, in static void on_screen_monitors_changed(GdkScreen* screen, NotifyDaemon* daemon) { +#if GTK_CHECK_VERSION (3, 22, 0) + GdkDisplay *display; +#endif NotifyScreen* nscreen; int n_monitors; int i; nscreen = daemon->priv->screen; +#if GTK_CHECK_VERSION (3, 22, 0) + display = gdk_screen_get_display (screen); + n_monitors = gdk_display_get_n_monitors(display); +#else n_monitors = gdk_screen_get_n_monitors(screen); +#endif if (n_monitors > nscreen->n_stacks) { @@ -240,12 +248,20 @@ static void on_screen_monitors_changed(GdkScreen* screen, NotifyDaemon* daemon) static void create_stacks_for_screen(NotifyDaemon* daemon, GdkScreen *screen) { +#if GTK_CHECK_VERSION (3, 22, 0) + GdkDisplay *display; +#endif NotifyScreen* nscreen; int i; nscreen = daemon->priv->screen; +#if GTK_CHECK_VERSION (3, 22, 0) + display = gdk_screen_get_display (screen); + nscreen->n_stacks = gdk_display_get_n_monitors(display); +#else nscreen->n_stacks = gdk_screen_get_n_monitors(screen); +#endif nscreen->stacks = g_renew(NotifyStack*, nscreen->stacks, nscreen->n_stacks); diff --git a/src/daemon/stack.c b/src/daemon/stack.c index 0fd8775..38f9ed5 100644 --- a/src/daemon/stack.c +++ b/src/daemon/stack.c @@ -196,10 +196,18 @@ notify_stack_new (NotifyDaemon *daemon, NotifyStackLocation location) { NotifyStack *stack; +#if GTK_CHECK_VERSION (3, 22, 0) + GdkDisplay *display; + display = gdk_screen_get_display (screen); +#endif g_assert (daemon != NULL); g_assert (screen != NULL && GDK_IS_SCREEN (screen)); +#if GTK_CHECK_VERSION (3, 22, 0) + g_assert (monitor < (guint)gdk_display_get_n_monitors (display)); +#else g_assert (monitor < (guint)gdk_screen_get_n_monitors (screen)); +#endif g_assert (location != NOTIFY_STACK_LOCATION_UNKNOWN); stack = g_new0 (NotifyStack, 1); |