avoid deprecated gdk_screen_get_number

author: ZenWalker <[email protected]> 2017-07-16 04:18:38 +0200
committer: lukefromdc <[email protected]> 2017-07-16 20:55:54 -0400
commit: 7bee2f870bcf850f68fdf8d8db4bd2e914ece143 (patch)
tree: 3eec98f92a396c40e0db2b1cfaf531489294492e /mate-panel
parent: cf46fb7f03d6ab0e106fa1cbfbf180fbbb9a5b75 (diff)
download: mate-panel-7bee2f870bcf850f68fdf8d8db4bd2e914ece143.tar.bz2
mate-panel-7bee2f870bcf850f68fdf8d8db4bd2e914ece143.tar.xz
7 files changed, 52 insertions, 50 deletions
diff --git a/mate-panel/libegg/eggdesktopfile.c b/mate-panel/libegg/eggdesktopfile.c
index 384fd475..f7c231a8 100644
--- a/mate-panel/libegg/eggdesktopfile.c
+++ b/mate-panel/libegg/eggdesktopfile.c
@@ -1185,7 +1185,7 @@ egg_desktop_file_launchv (EggDesktopFile *desktop_file,
 display = gdk_display_get_default ();
 screen = gdk_display_get_default_screen (display);
 }
- screen_num = gdk_screen_get_number (screen);
+ screen_num = gdk_x11_screen_get_screen_number (screen);
 
 translated_documents = translate_document_list (desktop_file, documents);
 docs = translated_documents;
@@ -1364,7 +1364,7 @@ egg_desktop_file_launch (EggDesktopFile *desktop_file,
 EGG_DESKTOP_FILE_ERROR_NOT_LAUNCHABLE,
 _("Can't pass document URIs to a 'Type=Link' desktop entry"));
 return FALSE;
- } 
+ }
 
 if (!parse_link (desktop_file, &app_desktop_file, &documents, error))
 return FALSE;
@@ -1483,10 +1483,10 @@ egg_set_desktop_file_without_defaults (const char *desktop_file_path)
 
 /**
 * egg_get_desktop_file:
- * 
+ *
 * Gets the application's #EggDesktopFile, as set by
 * egg_set_desktop_file().
- * 
+ *
 * Return value: the #EggDesktopFile, or %NULL if it hasn't been set.
 **/
 EggDesktopFile *
diff --git a/mate-panel/libmate-panel-applet-private/panel-applet-container.c b/mate-panel/libmate-panel-applet-private/panel-applet-container.c
index 95fca64b..e4232fcb 100644
--- a/mate-panel/libmate-panel-applet-private/panel-applet-container.c
+++ b/mate-panel/libmate-panel-applet-private/panel-applet-container.c
@@ -479,7 +479,7 @@ mate_panel_applet_container_get_applet (MatePanelAppletContainer *container,
 
 /* we can't use the screen of the container widget since it's not in a
 * widget hierarchy yet */
- screen_number = gdk_screen_get_number (screen);
+ screen_number = gdk_x11_screen_get_screen_number (screen);
 
 data = g_new (AppletFactoryData, 1);
 data->result = result;
diff --git a/mate-panel/panel-layout.c b/mate-panel/panel-layout.c
index 9275dfaf..11d616ec 100644
--- a/mate-panel/panel-layout.c
+++ b/mate-panel/panel-layout.c
@@ -28,6 +28,7 @@
 
 #include <glib.h>
 #include <gio/gio.h>
+#include <gdk/gdkx.h>
 
 #include <libmate-desktop/mate-dconf.h>
 #include <libmate-desktop/mate-gsettings.h>
@@ -180,7 +181,7 @@ panel_layout_append_group_helper (GKeyFile *keyfile,
 }
 g_strfreev (existing_ids);
 g_free (dconf_path);
- 
+
 if (existing_id || !id)
 unique_id = panel_profile_find_new_id (type);
 else
@@ -285,10 +286,10 @@ panel_layout_apply_default_from_gkeyfile (GdkScreen *screen)
 gchar **groups = NULL;
 GError *error = NULL;
 int i;
- 
- screen_n = gdk_screen_get_number (screen);
+
+ screen_n = gdk_x11_screen_get_screen_number (screen);
 layout_file = panel_layout_filename();
- 
+
 if (layout_file)
 {
 keyfile = g_key_file_new ();
@@ -298,12 +299,12 @@ panel_layout_apply_default_from_gkeyfile (GdkScreen *screen)
 &error))
 {
 groups = g_key_file_get_groups (keyfile, NULL);
- 
+
 for (i = 0; groups[i] != NULL; i++) {
- 
+
 if (g_strcmp0 (groups[i], "Toplevel") == 0 ||
 g_str_has_prefix (groups[i], "Toplevel "))
- 
+
 panel_layout_append_group_helper (
 keyfile, groups[i],
 screen_n,
@@ -315,10 +316,10 @@ panel_layout_apply_default_from_gkeyfile (GdkScreen *screen)
 panel_layout_toplevel_keys,
 G_N_ELEMENTS (panel_layout_toplevel_keys),
 "toplevel");
- 
+
 else if (g_strcmp0 (groups[i], "Object") == 0 ||
 g_str_has_prefix (groups[i], "Object "))
- 
+
 panel_layout_append_group_helper (
 keyfile, groups[i],
 -1,
@@ -330,14 +331,14 @@ panel_layout_apply_default_from_gkeyfile (GdkScreen *screen)
 panel_layout_object_keys,
 G_N_ELEMENTS (panel_layout_object_keys),
 "object");
- 
+
 else
- 
+
 g_warning ("Unknown group in default layout: '%s'",
 groups[i]);
- 
+
 }
- 
+
 }
 else
 {
@@ -345,19 +346,19 @@ panel_layout_apply_default_from_gkeyfile (GdkScreen *screen)
 layout_file, error->message);
 g_error_free (error);
 }
- 
+
 }
 else {
 g_warning ("Cant find the layout file!");
 /* FIXME implement a fallback panel */
 }
- 
+
 if (groups)
 g_strfreev (groups);
- 
+
 if (keyfile)
 g_key_file_free (keyfile);
- 
+
 if (layout_file)
 g_free (layout_file);
 }
diff --git a/mate-panel/panel-multiscreen.c b/mate-panel/panel-multiscreen.c
index 64dda92e..7c6df59f 100644
--- a/mate-panel/panel-multiscreen.c
+++ b/mate-panel/panel-multiscreen.c
@@ -481,7 +481,7 @@ panel_multiscreen_monitors (GdkScreen *screen)
 {
 int n_screen;
 
- n_screen = gdk_screen_get_number (screen);
+ n_screen = gdk_x11_screen_get_screen_number (screen);
 
 g_return_val_if_fail (n_screen >= 0 && n_screen < screens, 1);
 
@@ -494,7 +494,7 @@ panel_multiscreen_x (GdkScreen *screen,
 {
 int n_screen;
 
- n_screen = gdk_screen_get_number (screen);
+ n_screen = gdk_x11_screen_get_screen_number (screen);
 
 g_return_val_if_fail (n_screen >= 0 && n_screen < screens, 0);
 g_return_val_if_fail (monitor >= 0 && monitor < monitors [n_screen], 0);
@@ -508,7 +508,7 @@ panel_multiscreen_y (GdkScreen *screen,
 {
 int n_screen;
 
- n_screen = gdk_screen_get_number (screen);
+ n_screen = gdk_x11_screen_get_screen_number (screen);
 
 g_return_val_if_fail (n_screen >= 0 && n_screen < screens, 0);
 g_return_val_if_fail (monitor >= 0 && monitor < monitors [n_screen], 0);
@@ -522,7 +522,7 @@ panel_multiscreen_width (GdkScreen *screen,
 {
 int n_screen;
 
- n_screen = gdk_screen_get_number (screen);
+ n_screen = gdk_x11_screen_get_screen_number (screen);
 
 g_return_val_if_fail (n_screen >= 0 && n_screen < screens, 0);
 g_return_val_if_fail (monitor >= 0 && monitor < monitors [n_screen], 0);
@@ -536,7 +536,7 @@ panel_multiscreen_height (GdkScreen *screen,
 {
 int n_screen;
 
- n_screen = gdk_screen_get_number (screen);
+ n_screen = gdk_x11_screen_get_screen_number (screen);
 
 g_return_val_if_fail (n_screen >= 0 && n_screen < screens, 0);
 g_return_val_if_fail (monitor >= 0 && monitor < monitors [n_screen], 0);
@@ -588,7 +588,7 @@ panel_multiscreen_get_monitor_at_point (GdkScreen *screen,
 /* not -1 as callers expect a real monitor */
 g_return_val_if_fail (GDK_IS_SCREEN (screen), 0);
 
- n_screen = gdk_screen_get_number (screen);
+ n_screen = gdk_x11_screen_get_screen_number (screen);
 
 n_monitors = monitors[n_screen];
 geoms = geometries[n_screen];
@@ -653,7 +653,7 @@ panel_multiscreen_is_at_visible_extreme (GdkScreen *screen,
 MonitorBounds monitor;
 int n_screen, i;
 
- n_screen = gdk_screen_get_number (screen);
+ n_screen = gdk_x11_screen_get_screen_number (screen);
 
 *leftmost = TRUE;
 *rightmost = TRUE;
diff --git a/mate-panel/panel-profile.c b/mate-panel/panel-profile.c
index 2b7784d4..7f5aea06 100644
--- a/mate-panel/panel-profile.c
+++ b/mate-panel/panel-profile.c
@@ -31,6 +31,7 @@
 #include <string.h>
 #include <glib/gi18n.h>
 #include <gio/gio.h>
+#include <gdk/gdkx.h>
 
 #include <libpanel-util/panel-list.h>
 #include <libmate-desktop/mate-dconf.h>
@@ -577,7 +578,7 @@ panel_profile_queue_toplevel_location_change (PanelToplevel *toplevel,
 if (change->screen_changed)
 g_settings_set_int (toplevel->queued_settings,
 "screen",
- gdk_screen_get_number (change->screen));
+ gdk_x11_screen_get_screen_number (change->screen));
 
 if (change->monitor_changed)
 g_settings_set_int (toplevel->queued_settings,
@@ -775,7 +776,7 @@ panel_profile_toplevel_change_notify (GSettings *settings,
 if (!strcmp (key, "screen")) {
 GdkScreen *screen;
 screen = gdk_display_get_screen (
- gdk_display_get_default (), 
+ gdk_display_get_default (),
 g_settings_get_int (settings, key));
 if (screen)
 gtk_window_set_screen (GTK_WINDOW (toplevel), screen);
@@ -980,13 +981,13 @@ panel_profile_create_toplevel (GdkScreen *screen)
 settings = g_settings_new_with_path (PANEL_TOPLEVEL_SCHEMA, path);
 g_free (path);
 
- g_settings_set_int (settings, PANEL_TOPLEVEL_SCREEN_KEY, gdk_screen_get_number (screen));
+ g_settings_set_int (settings, PANEL_TOPLEVEL_SCREEN_KEY, gdk_x11_screen_get_screen_number (screen));
 
 if (panel_profile_find_empty_spot (screen, &orientation, &monitor)) {
 g_settings_set_int (settings, PANEL_TOPLEVEL_MONITOR_KEY, monitor);
 g_settings_set_enum (settings, PANEL_TOPLEVEL_ORIENTATION_KEY, orientation);
 }
- 
+
 panel_profile_add_to_list (PANEL_GSETTINGS_TOPLEVELS, id);
 
 g_object_unref (settings);
@@ -1182,7 +1183,7 @@ panel_profile_load_and_show_toplevel (char *toplevel_id)
 GSettings *panel_settings;
 panel_settings = g_settings_new (PANEL_SCHEMA);
 objects = g_settings_get_strv (panel_settings, PANEL_OBJECT_ID_LIST_KEY);
- 
+
 if (objects) {
 panel_profile_object_id_list_update (objects);
 loading_queued_applets = TRUE;
@@ -1190,7 +1191,7 @@ panel_profile_load_and_show_toplevel (char *toplevel_id)
 
 if (!loading_queued_applets)
 mate_panel_applet_load_queued_applets (FALSE);
- 
+
 g_strfreev (objects);
 g_object_unref (panel_settings);
 }
@@ -1561,7 +1562,7 @@ panel_profile_load_list (GSettings *settings,
 gint i;
 
 changed_signal = g_strdup_printf ("changed::%s", key);
- g_signal_connect (settings, changed_signal, G_CALLBACK (notify_handler), NULL); 
+ g_signal_connect (settings, changed_signal, G_CALLBACK (notify_handler), NULL);
 g_free (changed_signal);
 
 list = g_settings_get_strv (settings, key);
@@ -1678,7 +1679,7 @@ panel_profile_can_be_moved_freely (PanelToplevel *toplevel)
 if (!g_settings_is_writable (toplevel->settings, PANEL_TOPLEVEL_MONITOR_KEY))
 return FALSE;
 
- /* For expanded panels we don't really have to check 
+ /* For expanded panels we don't really have to check
 x and y */
 if (panel_toplevel_get_expand (toplevel))
 return TRUE;
diff --git a/mate-panel/panel-struts.c b/mate-panel/panel-struts.c
index 4b3bd936..e83ede10 100644
--- a/mate-panel/panel-struts.c
+++ b/mate-panel/panel-struts.c
@@ -34,7 +34,7 @@ typedef struct {
 
 GdkScreen *screen;
 int monitor;
- 
+
 PanelOrientation orientation;
 GdkRectangle geometry;
 int strut_size;
@@ -221,7 +221,7 @@ panel_struts_allocate_struts (PanelToplevel *toplevel,
 geometry.height = geometry.y + geometry.height - monitor_y;
 geometry.y = monitor_y;
 }
- 
+
 if (geometry.y + geometry.height > monitor_y + monitor_height)
 geometry.height = monitor_y + monitor_height - geometry.y;
 }
@@ -372,8 +372,8 @@ panel_struts_compare (const PanelStrut *s1,
 int s2_depth;
 
 if (s1->screen != s2->screen)
- return gdk_screen_get_number (s1->screen) -
- gdk_screen_get_number (s2->screen);
+ return gdk_x11_screen_get_screen_number (s1->screen) -
+ gdk_x11_screen_get_screen_number (s2->screen);
 
 if (s1->monitor != s2->monitor)
 return s1->monitor - s2->monitor;
@@ -429,7 +429,7 @@ panel_struts_register_strut (PanelToplevel *toplevel,
 strut->strut_size = strut_size;
 strut->strut_start = strut_start;
 strut->strut_end = strut_end;
- 
+
 panel_struts_get_monitor_geometry (screen, monitor,
 &monitor_x, &monitor_y,
 &monitor_width, &monitor_height);
@@ -500,7 +500,7 @@ panel_struts_update_toplevel_geometry (PanelToplevel *toplevel,
 
 g_return_val_if_fail (x != NULL, FALSE);
 g_return_val_if_fail (y != NULL, FALSE);
- 
+
 if (!(strut = panel_struts_find_strut (toplevel)))
 return FALSE;
 
diff --git a/mate-panel/xstuff.c b/mate-panel/xstuff.c
index f9156c31..931b8255 100644
--- a/mate-panel/xstuff.c
+++ b/mate-panel/xstuff.c
@@ -137,7 +137,7 @@ zoom_draw (GtkWidget *widget,
 return FALSE;
 }
 
-static void 
+static void
 draw_zoom_animation_composited (GdkScreen *gscreen,
 int x, int y, int w, int h,
 GdkPixbuf *pixbuf,
@@ -208,10 +208,10 @@ draw_zoom_animation_composited (GdkScreen *gscreen,
 win);
 }
 
-static void 
+static void
 draw_zoom_animation (GdkScreen *gscreen,
 int x, int y, int w, int h,
- int fx, int fy, int fw, int fh, 
+ int fx, int fy, int fw, int fh,
 int steps)
 {
 #define FRAMES (MINIATURIZE_ANIMATION_FRAMES_Z)
@@ -229,7 +229,7 @@ draw_zoom_animation (GdkScreen *gscreen,
 
 dpy = gdk_x11_display_get_xdisplay (gdk_screen_get_display (gscreen));
 root_win = GDK_WINDOW_XID (gdk_screen_get_root_window (gscreen));
- screen = gdk_screen_get_number (gscreen);
+ screen = gdk_x11_screen_get_screen_number (gscreen);
 depth = DefaultDepth(dpy,screen);
 
 /* frame GC */
@@ -279,7 +279,7 @@ draw_zoom_animation (GdkScreen *gscreen,
 usleep(10);
 #endif
 for (j=0; j<FRAMES; j++) {
- XDrawRectangle(dpy, root_win, frame_gc, 
+ XDrawRectangle(dpy, root_win, frame_gc,
 cxi[j], cyi[j], cwi[j], chi[j]);
 if (j<FRAMES-1) {
 cx[j]=cx[j+1];
@@ -307,7 +307,7 @@ draw_zoom_animation (GdkScreen *gscreen,
 }
 
 for (j=0; j<FRAMES; j++) {
- XDrawRectangle(dpy, root_win, frame_gc, 
+ XDrawRectangle(dpy, root_win, frame_gc,
 cxi[j], cyi[j], cwi[j], chi[j]);
 }
 XFlush(dpy);
@@ -317,7 +317,7 @@ draw_zoom_animation (GdkScreen *gscreen,
 usleep(10);
 #endif
 for (j=0; j<FRAMES; j++) {
- XDrawRectangle(dpy, root_win, frame_gc, 
+ XDrawRectangle(dpy, root_win, frame_gc,
 cxi[j], cyi[j], cwi[j], chi[j]);
 }
author	ZenWalker <[email protected]>	2017-07-16 04:18:38 +0200
committer	lukefromdc <[email protected]>	2017-07-16 20:55:54 -0400
commit	7bee2f870bcf850f68fdf8d8db4bd2e914ece143 (patch)
tree	3eec98f92a396c40e0db2b1cfaf531489294492e /mate-panel
parent	cf46fb7f03d6ab0e106fa1cbfbf180fbbb9a5b75 (diff)
download	mate-panel-7bee2f870bcf850f68fdf8d8db4bd2e914ece143.tar.bz2 mate-panel-7bee2f870bcf850f68fdf8d8db4bd2e914ece143.tar.xz