Updating branch refs/heads/master
to bc967c55639ff34f87ff1c6a0d7333851a7170d6 (commit)
from b29e1278f9915fbfdca801170038e229c881f179 (commit)
commit bc967c55639ff34f87ff1c6a0d7333851a7170d6
Author: Christian Dywan <[email protected]>
Date: Sat May 12 03:21:01 2012 +0200
On X11 display name :0 is equivalent to :0.0
Fixes: https://bugs.launchpad.net/midori/+bug/874719
midori/midori-app.c | 5 +++++
1 files changed, 5 insertions(+), 0 deletions(-)
diff --git a/midori/midori-app.c b/midori/midori-app.c
index 84d5025..8c361f9 100644
--- a/midori/midori-app.c
+++ b/midori/midori-app.c
@@ -734,7 +734,12 @@ midori_app_create_instance (MidoriApp* app)
#endif
}
+ #ifdef GDK_WINDOWING_X11
+ /* On X11: :0 or :0.0 which is equivalent */
+ display_name = g_strndup (gdk_display_get_name (display), 2);
+ #else
display_name = g_strdup (gdk_display_get_name (display));
+ #endif
n = strlen (display_name);
for (i = 0; i < n; i++)
if (strchr (":.\\/", display_name[i]))
_______________________________________________
Xfce4-commits mailing list
[email protected]
https://mail.xfce.org/mailman/listinfo/xfce4-commits
