avoid deprecated gdk_screen_get_number

5 files changed, 8 insertions, 8 deletions

diff --git a/plugins/background/msd-background-manager.c b/plugins/background/msd-background-manager.c
index f3e2242..b3cbdc4 100644
--- a/plugins/background/msd-background-manager.c
+++ b/plugins/background/msd-background-manager.c
@@ -259,7 +259,7 @@ on_screen_size_changed (GdkScreen            *screen,
 	if (!p->msd_can_draw || p->draw_in_progress || caja_is_drawing_bg (manager))
 		return;
 
-	gint scr_num = gdk_screen_get_number (screen);
+	gint scr_num = gdk_x11_screen_get_screen_number (screen);
 	gchar *old_size = g_list_nth_data (manager->priv->scr_sizes, scr_num);
 	gchar *new_size = g_strdup_printf ("%dx%d", gdk_screen_get_width (screen),
 						    gdk_screen_get_height (screen));
diff --git a/plugins/keybindings/msd-keybindings-manager.c b/plugins/keybindings/msd-keybindings-manager.c
index c022547..0927927 100644
--- a/plugins/keybindings/msd-keybindings-manager.c
+++ b/plugins/keybindings/msd-keybindings-manager.c
@@ -397,7 +397,7 @@ screen_exec_display_string (GdkScreen *screen)
                 g_string_truncate (str, p - str->str);
         }
 
-        g_string_append_printf (str, ".%d", gdk_screen_get_number (screen));
+        g_string_append_printf (str, ".%d", gdk_x11_screen_get_screen_number (screen));
 
         return g_string_free (str, FALSE);
 }
diff --git a/plugins/keyboard/delayed-dialog.c b/plugins/keyboard/delayed-dialog.c
index 0027c04..c2e469e 100644
--- a/plugins/keyboard/delayed-dialog.c
+++ b/plugins/keyboard/delayed-dialog.c
@@ -53,7 +53,7 @@ msd_delayed_show_dialog (GtkWidget *dialog)
          * it's an unknown out-of-process window.
          */
         snprintf (selection_name, sizeof (selection_name), "WM_S%d",
-                  gdk_screen_get_number (screen));
+                  gdk_x11_screen_get_screen_number (screen));
         selection_atom = XInternAtom (xdisplay, selection_name, True);
         if (selection_atom &&
             XGetSelectionOwner (xdisplay, selection_atom) != None) {
@@ -112,7 +112,7 @@ message_filter (GdkXEvent *xevent, GdkEvent *event, gpointer data)
                 GtkWidget *dialog = l->data;
                 next = l->next;
 
-                if (gdk_screen_get_number (gtk_widget_get_screen (dialog)) == screen) {
+                if (gdk_x11_screen_get_screen_number (gtk_widget_get_screen (dialog)) == screen) {
                         gtk_widget_show (dialog);
                         dialogs = g_slist_remove (dialogs, dialog);
                 }
diff --git a/plugins/media-keys/msd-media-keys-manager.c b/plugins/media-keys/msd-media-keys-manager.c
index 32d5d34..1a8d291 100644
--- a/plugins/media-keys/msd-media-keys-manager.c
+++ b/plugins/media-keys/msd-media-keys-manager.c
@@ -1114,7 +1114,7 @@ start_media_keys_idle_cb (MsdMediaKeysManager *manager)
                 mate_settings_profile_start ("gdk_window_add_filter");
 
                 g_debug ("adding key filter for screen: %d",
-                         gdk_screen_get_number (l->data));
+                         gdk_x11_screen_get_screen_number (l->data));
 
                 gdk_window_add_filter (gdk_screen_get_root_window (l->data),
                                        (GdkFilterFunc)acme_filter_events,
diff --git a/plugins/xsettings/msd-xsettings-manager.c b/plugins/xsettings/msd-xsettings-manager.c
index 445be61..b88e71f 100644
--- a/plugins/xsettings/msd-xsettings-manager.c
+++ b/plugins/xsettings/msd-xsettings-manager.c
@@ -415,7 +415,7 @@ update_property (GString *props, const gchar* key, const gchar* value)
         needle_len = strlen (needle);
         if (g_str_has_prefix (props->str, needle))
                 found = props->str;
-        else 
+        else
                 found = strstr (props->str, needle);
 
         if (found) {
@@ -652,7 +652,7 @@ setup_xsettings_managers (MateXSettingsManager *manager)
         n_screens = gdk_display_get_n_screens (display);
 
         res = xsettings_manager_check_running (gdk_x11_display_get_xdisplay (display),
-                                               gdk_screen_get_number (gdk_screen_get_default ()));
+                                               gdk_x11_screen_get_screen_number (gdk_screen_get_default ()));
         if (res) {
                 g_warning ("You can only run one xsettings manager at a time; exiting");
                 return FALSE;
@@ -667,7 +667,7 @@ setup_xsettings_managers (MateXSettingsManager *manager)
                 screen = gdk_display_get_screen (display, i);
 
                 manager->priv->managers [i] = xsettings_manager_new (gdk_x11_display_get_xdisplay (display),
-                                                                     gdk_screen_get_number (screen),
+                                                                     gdk_x11_screen_get_screen_number (screen),
                                                                      terminate_cb,
                                                                      &terminated);
                 if (! manager->priv->managers [i]) {