Attachment 583938 Details for Bug 808789 – futile attempt to patch gedit

[patch] futile attempt to patch gedit

gedit-mismatched-DISPLAY.diff (text/plain), 1.11 KB, created by Edward Sheldrake on 2012-05-11 21:47:59 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Edward Sheldrake

Created: 2012-05-11 21:47:59 UTC

Size: 1.11 KB

patch

obsolete

>diff --git a/gedit/gedit-app.c b/gedit/gedit-app.c
>index 51a2bc0..e8dfca3 100644
>--- a/gedit/gedit-app.c
>+++ b/gedit/gedit-app.c
>@@ -889,7 +889,6 @@ is_in_viewport (GeditWindow  *window,
> 		gint          viewport_y)
> {
> 	GdkScreen *s;
>-	GdkDisplay *display;
> 	GdkWindow *gdkwindow;
> 	const gchar *cur_name;
> 	const gchar *name;
>@@ -899,18 +898,21 @@ is_in_viewport (GeditWindow  *window,
> 	gint sc_width, sc_height;
> 	gint x, y, width, height;
> 	gint vp_x, vp_y;
>+	gint names_cmp;
> 
> 	/* Check for screen and display match */
>-	display = gdk_screen_get_display (screen);
>-	cur_name = gdk_display_get_name (display);
>+	cur_name = gdk_screen_make_display_name (screen);
> 	cur_n = gdk_screen_get_number (screen);
> 
> 	s = gtk_window_get_screen (GTK_WINDOW (window));
>-	display = gdk_screen_get_display (s);
>-	name = gdk_display_get_name (display);
>+	name = gdk_screen_make_display_name (s);
> 	n = gdk_screen_get_number (s);
> 
>-	if (strcmp (cur_name, name) != 0 || cur_n != n)
>+	names_cmp = strcmp (cur_name, name);
>+	g_free (cur_name);
>+	g_free (name);
>+
>+	if (names_cmp != 0 || cur_n != n)
> 		return FALSE;
> 
> 	/* Check for workspace match */

Actions: View | Diff

Attachments on bug 808789: 574246 | 581967 | 583935 | 583938