Fix some issues under wayland
* d/p/Don-t-crash-in-window_get_workspace-under-Wayland.patch:
+ Added. Fix crash under wayland
* d/p/Don-t-call-XInitThreads-in-Wayland.patch:
+ Don't bother initting X threas when running under wayland
Sjoerd Simons
8 years ago
| 0 | 0 | empathy (3.12.11-2) UNRELEASED; urgency=medium |
| 1 | 1 | |
| 2 | [ Laurent Bigonville ] | |
| 2 | 3 | * Remove empathy-dbg package and rely on automatic dbgsym package |
| 3 | 4 | |
| 4 | -- Laurent Bigonville <bigon@debian.org> Fri, 18 Mar 2016 18:22:33 +0100 | |
| 5 | [ Sjoerd Simons ] | |
| 6 | * d/p/Don-t-crash-in-window_get_workspace-under-Wayland.patch: | |
| 7 | + Added. Fix crash under wayland | |
| 8 | * d/p/Don-t-call-XInitThreads-in-Wayland.patch: | |
| 9 | + Don't bother initting X threas when running under wayland | |
| 10 | ||
| 11 | -- Sjoerd Simons <sjoerd@debian.org> Mon, 28 Mar 2016 08:24:23 +0200 | |
| 5 | 12 | |
| 6 | 13 | empathy (3.12.11-1) unstable; urgency=medium |
| 7 | 14 |
| 0 | From a9ede294c57bc5738be3c33cba4ef88b9a7d4a0e Mon Sep 17 00:00:00 2001 | |
| 1 | From: Michael Catanzaro <mcatanzaro@igalia.com> | |
| 2 | Date: Sat, 16 Jan 2016 06:59:50 -0600 | |
| 3 | Subject: [PATCH] Don't call XInitThreads in Wayland | |
| 4 | ||
| 5 | This doesn't fix anything in particular, but seems like a good idea.... | |
| 6 | --- | |
| 7 | src/empathy-call.c | 9 ++++++--- | |
| 8 | 1 file changed, 6 insertions(+), 3 deletions(-) | |
| 9 | ||
| 10 | diff --git a/src/empathy-call.c b/src/empathy-call.c | |
| 11 | index 9919041..3bc1488 100644 | |
| 12 | --- a/src/empathy-call.c | |
| 13 | +++ b/src/empathy-call.c | |
| 14 | @@ -28,6 +28,7 @@ | |
| 15 | #include <tp-account-widgets/tpaw-utils.h> | |
| 16 | ||
| 17 | #ifdef CLUTTER_WINDOWING_X11 | |
| 18 | +#include <gdk/gdkx.h> | |
| 19 | #include <X11/Xlib.h> | |
| 20 | #endif | |
| 21 | ||
| 22 | @@ -215,9 +216,11 @@ main (int argc, | |
| 23 | g_setenv ("GST_DEBUG_DUMP_DOT_DIR", g_get_tmp_dir (), FALSE); | |
| 24 | ||
| 25 | #ifdef GDK_WINDOWING_X11 | |
| 26 | - /* We can't call clutter_gst_init() before gtk_clutter_init(), so no choice | |
| 27 | - * but to intiialise X11 threading ourself */ | |
| 28 | - XInitThreads (); | |
| 29 | + if (GDK_IS_X11_DISPLAY (gdk_display_get_default ())) { | |
| 30 | + /* We can't call clutter_gst_init() before gtk_clutter_init(), so no choice | |
| 31 | + * but to intiialise X11 threading ourself */ | |
| 32 | + XInitThreads (); | |
| 33 | + } | |
| 34 | #endif | |
| 35 | ||
| 36 | optcontext = g_option_context_new (N_("- Empathy Audio/Video Client")); | |
| 37 | -- | |
| 38 | 2.8.0.rc3 | |
| 39 |
| 0 | From 942395f7b81e4a81922c8bcb1c11f9676d32f3f8 Mon Sep 17 00:00:00 2001 | |
| 1 | From: Michael Catanzaro <mcatanzaro@igalia.com> | |
| 2 | Date: Sat, 16 Jan 2016 00:20:15 -0600 | |
| 3 | Subject: [PATCH] Don't crash in window_get_workspace under Wayland | |
| 4 | ||
| 5 | --- | |
| 6 | libempathy-gtk/empathy-ui-utils.c | 9 +++++++++ | |
| 7 | 1 file changed, 9 insertions(+) | |
| 8 | ||
| 9 | diff --git a/libempathy-gtk/empathy-ui-utils.c b/libempathy-gtk/empathy-ui-utils.c | |
| 10 | index fb080ce..e662c69 100644 | |
| 11 | --- a/libempathy-gtk/empathy-ui-utils.c | |
| 12 | +++ b/libempathy-gtk/empathy-ui-utils.c | |
| 13 | @@ -1122,6 +1122,8 @@ out: | |
| 14 | g_free (cmd); | |
| 15 | } | |
| 16 | ||
| 17 | +#ifdef GDK_WINDOWING_X11 | |
| 18 | + | |
| 19 | /* Most of the workspace manipulation code has been copied from libwnck | |
| 20 | * Copyright (C) 2001 Havoc Pennington | |
| 21 | * Copyright (C) 2005-2007 Vincent Untz | |
| 22 | @@ -1213,18 +1215,24 @@ window_get_workspace (Screen *xscreen, | |
| 23 | return number; | |
| 24 | } | |
| 25 | ||
| 26 | +#endif | |
| 27 | + | |
| 28 | /* Ask X to move to the desktop on which @window currently is | |
| 29 | * and the present @window. */ | |
| 30 | void | |
| 31 | empathy_move_to_window_desktop (GtkWindow *window, | |
| 32 | guint32 timestamp) | |
| 33 | { | |
| 34 | +#ifdef GDK_WINDOWING_X11 | |
| 35 | GdkScreen *screen; | |
| 36 | Screen *xscreen; | |
| 37 | GdkWindow *gdk_window; | |
| 38 | int workspace; | |
| 39 | ||
| 40 | screen = gtk_window_get_screen (window); | |
| 41 | + if (!GDK_IS_X11_SCREEN (screen)) | |
| 42 | + goto out; | |
| 43 | + | |
| 44 | xscreen = gdk_x11_screen_get_xscreen (screen); | |
| 45 | gdk_window = gtk_widget_get_window (GTK_WIDGET (window)); | |
| 46 | ||
| 47 | @@ -1237,6 +1245,7 @@ empathy_move_to_window_desktop (GtkWindow *window, | |
| 48 | ||
| 49 | out: | |
| 50 | gtk_window_present_with_time (window, timestamp); | |
| 51 | +#endif | |
| 52 | } | |
| 53 | ||
| 54 | void | |
| 55 | -- | |
| 56 | 2.8.0.rc3 | |
| 57 |