avoid deprecated gdk_screen_get_number

5 files changed, 14 insertions, 13 deletions

diff --git a/applets/notification_area/system-tray/na-tray-manager.c b/applets/notification_area/system-tray/na-tray-manager.c
index 94d3003d..3886a10d 100644
--- a/applets/notification_area/system-tray/na-tray-manager.c
+++ b/applets/notification_area/system-tray/na-tray-manager.c
@@ -780,7 +780,7 @@ na_tray_manager_manage_screen_x11 (NaTrayManager *manager,
                          GDK_PROPERTY_CHANGE_MASK | GDK_STRUCTURE_MASK);
 
   selection_atom_name = g_strdup_printf ("_NET_SYSTEM_TRAY_S%d",
-					 gdk_screen_get_number (screen));
+					 gdk_x11_screen_get_screen_number (screen));
   manager->selection_atom = gdk_atom_intern (selection_atom_name, FALSE);
   g_free (selection_atom_name);
 
@@ -886,7 +886,7 @@ na_tray_manager_check_running_screen_x11 (GdkScreen *screen)
 
   display = gdk_screen_get_display (screen);
   selection_atom_name = g_strdup_printf ("_NET_SYSTEM_TRAY_S%d",
-                                         gdk_screen_get_number (screen));
+                                         gdk_x11_screen_get_screen_number (screen));
   selection_atom = gdk_x11_get_xatom_by_name_for_display (display,
                                                           selection_atom_name);
   g_free (selection_atom_name);
diff --git a/applets/notification_area/system-tray/na-tray.c b/applets/notification_area/system-tray/na-tray.c
index c2488ecf..94fe6911 100644
--- a/applets/notification_area/system-tray/na-tray.c
+++ b/applets/notification_area/system-tray/na-tray.c
@@ -13,7 +13,7 @@
  * WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
  * General Public License for more details.
- * 
+ *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
@@ -103,7 +103,7 @@ get_tray (TraysScreen *trays_screen)
 {
   if (trays_screen->all_trays == NULL)
     return NULL;
-  
+
   return trays_screen->all_trays->data;
 }
 
@@ -282,7 +282,7 @@ message_sent (NaTrayManager *manager,
   icontip = g_hash_table_lookup (trays_screen->tip_table, icon);
 
   find_buffer.id = id;
-  if (icontip && 
+  if (icontip &&
       (icontip->id == id ||
        g_slist_find_custom (icontip->buffer, &find_buffer,
                             icon_tip_buffer_compare) != NULL))
@@ -437,7 +437,7 @@ na_tray_constructor (GType type,
       initialized = TRUE;
     }
 
-  screen_number = gdk_screen_get_number (priv->screen);
+  screen_number = gdk_x11_screen_get_screen_number (priv->screen);
 
   if (trays_screens [screen_number].tray_manager == NULL)
     {
@@ -477,7 +477,7 @@ na_tray_constructor (GType type,
           g_object_unref (tray_manager);
         }
     }
-      
+
   priv->trays_screen = &trays_screens [screen_number];
   trays_screens [screen_number].all_trays = g_slist_append (trays_screens [screen_number].all_trays,
                                                             tray);
@@ -711,7 +711,7 @@ idle_redraw_cb (NaTray *tray)
 
   g_hash_table_foreach (priv->trays_screen->icon_table,
                         (GHFunc) na_tray_child_force_redraw, NULL);
-  
+
   priv->idle_redraw_id = 0;
 
   return FALSE;
diff --git a/applets/notification_area/testtray.c b/applets/notification_area/testtray.c
index b2ce0fa2..cc36c02f 100644
--- a/applets/notification_area/testtray.c
+++ b/applets/notification_area/testtray.c
@@ -139,7 +139,7 @@ create_tray_on_screen (GdkScreen *screen,
 				     "Override tray manager?");
     gtk_message_dialog_format_secondary_text (GTK_MESSAGE_DIALOG (dialog),
 					     "There is already a tray manager running on screen %d.",
-					     gdk_screen_get_number (screen));
+					     gdk_x11_screen_get_screen_number (screen));
     gtk_window_set_screen (GTK_WINDOW (dialog), screen);
     g_signal_connect (dialog, "response", G_CALLBACK (warning_dialog_response_cb), screen);
     gtk_window_present (GTK_WINDOW (dialog));
@@ -149,7 +149,7 @@ create_tray_on_screen (GdkScreen *screen,
 
   data = g_new0 (TrayData, 1);
   data->screen = screen;
-  data->screen_num = gdk_screen_get_number (screen);
+  data->screen_num = gdk_x11_screen_get_screen_number (screen);
 
   data->window = window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
   g_object_weak_ref (G_OBJECT (window), (GWeakNotify) maybe_quit, NULL);
@@ -274,7 +274,7 @@ main (int argc, char *argv[])
   screen = gdk_display_get_default_screen (display);
 
   create_tray_on_screen (screen, FALSE);
-  
+
   gtk_main ();
 
 #ifdef PROVIDE_WATCHER_SERVICE
diff --git a/applets/wncklet/showdesktop.c b/applets/wncklet/showdesktop.c
index a9aebb10..59d537cf 100644
--- a/applets/wncklet/showdesktop.c
+++ b/applets/wncklet/showdesktop.c
@@ -361,7 +361,7 @@ static void show_desktop_applet_realized(MatePanelApplet* applet, gpointer data)
 		g_signal_handlers_disconnect_by_func(sdd->icon_theme, theme_changed_callback, sdd);
 
 	screen = gtk_widget_get_screen(sdd->applet);
-	sdd->wnck_screen = wnck_screen_get(gdk_screen_get_number (screen));
+	sdd->wnck_screen = wnck_screen_get(gdk_x11_screen_get_screen_number (screen));
 
 	if (sdd->wnck_screen != NULL)
 		wncklet_connect_while_alive(sdd->wnck_screen, "showing_desktop_changed", G_CALLBACK(show_desktop_changed_callback), sdd, sdd->applet);
diff --git a/applets/wncklet/wncklet.c b/applets/wncklet/wncklet.c
index d9b9fd47..7ad3c0a1 100644
--- a/applets/wncklet/wncklet.c
+++ b/applets/wncklet/wncklet.c
@@ -30,6 +30,7 @@
 
 #include <glib/gi18n.h>
 #include <gtk/gtk.h>
+#include <gdk/gdkx.h>
 #define WNCK_I_KNOW_THIS_IS_UNSTABLE
 #include <libwnck/libwnck.h>
 
@@ -99,7 +100,7 @@ WnckScreen* wncklet_get_screen(GtkWidget* applet)
 	if (!gtk_widget_has_screen(applet))
 		return wnck_screen_get_default();
 
-	screen_num = gdk_screen_get_number(gtk_widget_get_screen(applet));
+	screen_num = gdk_x11_screen_get_screen_number(gtk_widget_get_screen(applet));
 
 	return wnck_screen_get(screen_num);
 }