ui/gtk3: Error handling with display == null

BUG=rhbz#2188800
ibus · Nov 25, 2023 · 0a7a4d1 · 0a7a4d1
1 parent 1be3e2f
commit 0a7a4d1
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 5 deletions.
diff --git a/ui/gtk3/bindingcommon.vala b/ui/gtk3/bindingcommon.vala
@@ -263,10 +263,14 @@ class BindingCommon {
         return m_default_is_xdisplay;
     }
 
-    public static Gdk.X11.Display get_xdisplay() {
+    public static Gdk.X11.Display? get_xdisplay() {
         if (m_xdisplay != null)
             return m_xdisplay;
         var display = Gdk.Display.get_default();
+        if (display == null) {
+            error("You should open a display for IBus panel.");
+            return null;
+        }
         Type instance_type = display.get_type();
         Type x11_type = typeof(Gdk.X11.Display);
         if (instance_type.is_a(x11_type)) {

diff --git a/ui/gtk3/panel.vala b/ui/gtk3/panel.vala
@@ -1422,9 +1422,12 @@ class Panel : IBus.PanelService {
 
         Gdk.Display display_backup = null;
         if (use_x11 && !BindingCommon.default_is_xdisplay()) {
+            var display = BindingCommon.get_xdisplay();
             display_backup = Gdk.Display.get_default();
-            Gdk.DisplayManager.get().set_default_display(
-                    (Gdk.Display)BindingCommon.get_xdisplay());
+            if (display != null) {
+                Gdk.DisplayManager.get().set_default_display(
+                        (Gdk.Display)display);
+            }
         }
 
         // Show system menu
@@ -1476,9 +1479,12 @@ class Panel : IBus.PanelService {
     private Gtk.Menu create_activate_menu(bool use_x11 = false) {
         Gdk.Display display_backup = null;
         if (use_x11 && !BindingCommon.default_is_xdisplay()) {
+            var display = BindingCommon.get_xdisplay();
             display_backup = Gdk.Display.get_default();
-            Gdk.DisplayManager.get().set_default_display(
-                    (Gdk.Display)BindingCommon.get_xdisplay());
+            if (display != null) {
+                Gdk.DisplayManager.get().set_default_display(
+                        (Gdk.Display)display);
+            }
         }
         m_ime_menu = new Gtk.Menu();