/pidgin/main: 7b62a2153898: Use gdk_cursor_new_for_display over ...

Changeset: 7b62a2153898850ffa592fb7de8ae3fd890c2523
Author:	 Elliott Sales de Andrade <[email protected]>
Date:	 2016-09-03 17:41 -0400
Branch:	 default
URL: https://hg.pidgin.im/pidgin/main/rev/7b62a2153898

Description:

Use gdk_cursor_new_for_display over gdk_cursor_new.

This was replaced long ago, but only deprecated in 3.16.

diffstat:

 pidgin/gtkblist.c                     |  6 ++++--
 pidgin/gtkconv.c                      |  6 ++++--
 pidgin/gtkscrollbook.c                |  6 ++++--
 pidgin/gtkstatusbox.c                 |  7 +++++--
 pidgin/gtkutils.c                     |  4 +++-
 pidgin/plugins/gestures/stroke-draw.c |  6 ++++--
 pidgin/plugins/screencap.c            |  8 ++++++--
 7 files changed, 30 insertions(+), 13 deletions(-)

diffs (155 lines):

diff --git a/pidgin/gtkblist.c b/pidgin/gtkblist.c
--- a/pidgin/gtkblist.c
+++ b/pidgin/gtkblist.c
@@ -5073,8 +5073,10 @@ headline_response_cb(GtkInfoBar *infobar
 static void
 headline_realize_cb(GtkWidget *widget, gpointer data)
 {
-	GdkCursor *hand_cursor = gdk_cursor_new(GDK_HAND2);
-	gdk_window_set_cursor(gtk_widget_get_window(widget), hand_cursor);
+	GdkWindow *window = gtk_widget_get_window(widget);
+	GdkDisplay *display = gdk_window_get_display(window);
+	GdkCursor *hand_cursor = gdk_cursor_new_for_display(display, GDK_HAND2);
+	gdk_window_set_cursor(window, hand_cursor);
 	g_object_unref(hand_cursor);
 }
 
diff --git a/pidgin/gtkconv.c b/pidgin/gtkconv.c
--- a/pidgin/gtkconv.c
+++ b/pidgin/gtkconv.c
@@ -9234,8 +9234,10 @@ notebook_init_grab(PidginConvWindow *gtk
 		gtkwin->drag_leave_signal = 0;
 	}
 
-	if (cursor == NULL)
-		cursor = gdk_cursor_new(GDK_FLEUR);
+	if (cursor == NULL) {
+		GdkDisplay *display = gtk_widget_get_display(gtkwin->notebook);
+		cursor = gdk_cursor_new_for_display(display, GDK_FLEUR);
+	}
 
 	/* Grab the pointer */
 	gtk_grab_add(gtkwin->notebook);
diff --git a/pidgin/gtkscrollbook.c b/pidgin/gtkscrollbook.c
--- a/pidgin/gtkscrollbook.c
+++ b/pidgin/gtkscrollbook.c
@@ -229,7 +229,8 @@ close_button_left_cb(GtkWidget *widget, 
 {
 	static GdkCursor *ptr = NULL;
 	if (ptr == NULL) {
-		ptr = gdk_cursor_new(GDK_LEFT_PTR);
+		GdkDisplay *display = gtk_widget_get_display(widget);
+		ptr = gdk_cursor_new_for_display(display, GDK_LEFT_PTR);
 	}
 
 	gtk_label_set_markup(label, "×");
@@ -242,7 +243,8 @@ close_button_entered_cb(GtkWidget *widge
 {
 	static GdkCursor *hand = NULL;
 	if (hand == NULL) {
-		hand = gdk_cursor_new(GDK_HAND2);
+		GdkDisplay *display = gtk_widget_get_display(widget);
+		hand = gdk_cursor_new_for_display(display, GDK_HAND2);
 	}
 
 	gtk_label_set_markup(label, "<u>×</u>");
diff --git a/pidgin/gtkstatusbox.c b/pidgin/gtkstatusbox.c
--- a/pidgin/gtkstatusbox.c
+++ b/pidgin/gtkstatusbox.c
@@ -385,6 +385,8 @@ static const GtkTargetEntry dnd_targets[
 static void
 setup_icon_box(PidginStatusBox *status_box)
 {
+	GdkDisplay *display;
+
 	if (status_box->icon_box != NULL)
 		return;
 
@@ -417,8 +419,9 @@ setup_icon_box(PidginStatusBox *status_b
 			g_object_unref(img);
 	}
 
-	status_box->hand_cursor = gdk_cursor_new (GDK_HAND2);
-	status_box->arrow_cursor = gdk_cursor_new (GDK_LEFT_PTR);
+	display = gtk_widget_get_display(status_box->icon_box);
+	status_box->hand_cursor = gdk_cursor_new_for_display(display, GDK_HAND2);
+	status_box->arrow_cursor = gdk_cursor_new_for_display(display, GDK_LEFT_PTR);
 
 	/* Set up DND */
 	gtk_drag_dest_set(status_box->icon_box,
diff --git a/pidgin/gtkutils.c b/pidgin/gtkutils.c
--- a/pidgin/gtkutils.c
+++ b/pidgin/gtkutils.c
@@ -2146,13 +2146,15 @@ pidgin_screenname_autocomplete_default_f
 
 void pidgin_set_cursor(GtkWidget *widget, GdkCursorType cursor_type)
 {
+	GdkDisplay *display;
 	GdkCursor *cursor;
 
 	g_return_if_fail(widget != NULL);
 	if (gtk_widget_get_window(widget) == NULL)
 		return;
 
-	cursor = gdk_cursor_new(cursor_type);
+	display = gtk_widget_get_display(widget);
+	cursor = gdk_cursor_new_for_display(display, cursor_type);
 	gdk_window_set_cursor(gtk_widget_get_window(widget), cursor);
 
 	g_object_unref(cursor);
diff --git a/pidgin/plugins/gestures/stroke-draw.c b/pidgin/plugins/gestures/stroke-draw.c
--- a/pidgin/plugins/gestures/stroke-draw.c
+++ b/pidgin/plugins/gestures/stroke-draw.c
@@ -154,8 +154,10 @@ process_event (GtkWidget *widget, GdkEve
 
       record_stroke_segment (widget);
 
-	  if (cursor == NULL)
-		  cursor = gdk_cursor_new(GDK_PENCIL);
+	  if (cursor == NULL) {
+		  GdkDisplay *display = gtk_widget_get_display(widget);
+		  cursor = gdk_cursor_new_for_display(display, GDK_PENCIL);
+	  }
 
       gdk_device_grab(gdk_event_get_device(event),
                       gtk_widget_get_window(widget), GDK_OWNERSHIP_WINDOW,
diff --git a/pidgin/plugins/screencap.c b/pidgin/plugins/screencap.c
--- a/pidgin/plugins/screencap.c
+++ b/pidgin/plugins/screencap.c
@@ -340,6 +340,7 @@ scrncap_draw_window(PidginWebView *webvi
 	int width, height;
 	cairo_t *cr;
 	cairo_surface_t *surface;
+	GdkDisplay *display;
 	GdkCursor *draw_cursor;
 
 	is_shooting = TRUE;
@@ -352,7 +353,8 @@ scrncap_draw_window(PidginWebView *webvi
 	g_signal_connect(G_OBJECT(draw_window), "destroy",
 		G_CALLBACK(scrncap_draw_window_close), NULL);
 
-	draw_cursor = gdk_cursor_new(GDK_PENCIL);
+	display = gtk_widget_get_display(current_window);
+	draw_cursor = gdk_cursor_new_for_display(display, GDK_PENCIL);
 	g_object_set_data_full(G_OBJECT(draw_window), "draw-cursor",
 		draw_cursor, g_object_unref);
 
@@ -544,15 +546,17 @@ static void
 scrncap_crop_window_realize(GtkWidget *crop_window, gpointer _unused)
 {
 	GdkWindow *gdkwindow;
+	GdkDisplay *display;
 	GdkCursor *cursor;
 
 	gdkwindow = gtk_widget_get_window(GTK_WIDGET(crop_window));
+	display = gdk_window_get_display(gdkwindow);
 
 	gdk_window_set_events(gdkwindow, gdk_window_get_events(gdkwindow) |
 		GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK |
 		GDK_BUTTON_MOTION_MASK);
 
-	cursor = gdk_cursor_new(GDK_CROSSHAIR);
+	cursor = gdk_cursor_new_for_display(display, GDK_CROSSHAIR);
 	gdk_window_set_cursor(gdkwindow, cursor);
 	g_object_unref(cursor);
 }

_______________________________________________
Commits mailing list
[email protected]
https://pidgin.im/cgi-bin/mailman/listinfo/commits