ui/gtk3: Fix some warnings

- Try to disable Vala warnings with gtk_menu_shell_insert() workaround. - Stop string_slice() warning with different language lengths.
ibus · Dec 14, 2023 · 8470873 · 8470873
1 parent 2ede4a1
commit 8470873
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 8 deletions.
diff --git a/ui/gtk3/panel.vala b/ui/gtk3/panel.vala
@@ -1433,7 +1433,8 @@ class Panel : IBus.PanelService {
 
         item = new Gtk.MenuItem.with_label(_("Preferences"));
         item.activate.connect((i) => show_setup_dialog());
-        m_sys_menu.append(item);
+        // https://gitlab.gnome.org/GNOME/gtk/-/issues/5870
+        m_sys_menu.insert(item, -1);
 
 #if EMOJI_DICT
         item = new Gtk.MenuItem.with_label(_("Emoji Choice"));
@@ -1448,22 +1449,23 @@ class Panel : IBus.PanelService {
                  */
                 panel_extension(event);
         });
-        m_sys_menu.append(item);
+        // https://gitlab.gnome.org/GNOME/gtk/-/issues/5870
+        m_sys_menu.insert(item, -1);
 #endif
 
         item = new Gtk.MenuItem.with_label(_("About"));
         item.activate.connect((i) => show_about_dialog());
-        m_sys_menu.append(item);
+        m_sys_menu.insert(item, -1);
 
-        m_sys_menu.append(new Gtk.SeparatorMenuItem());
+        m_sys_menu.insert(new Gtk.SeparatorMenuItem(), -1);
 
         item = new Gtk.MenuItem.with_label(_("Restart"));
         item.activate.connect((i) => m_bus.exit(true));
-        m_sys_menu.append(item);
+        m_sys_menu.insert(item, -1);
 
         item = new Gtk.MenuItem.with_label(_("Quit"));
         item.activate.connect((i) => m_bus.exit(false));
-        m_sys_menu.append(item);
+        m_sys_menu.insert(item, -1);
 
         m_sys_menu.show_all();
 
@@ -1488,7 +1490,8 @@ class Panel : IBus.PanelService {
         // Show properties and IME switching menu
         m_property_manager.create_menu_items(m_ime_menu);
 
-        m_ime_menu.append(new Gtk.SeparatorMenuItem());
+        // https://gitlab.gnome.org/GNOME/gtk/-/issues/5870
+        m_ime_menu.insert(new Gtk.SeparatorMenuItem(), -1);
 
         // Append IMEs
         foreach (var engine in m_engines) {

diff --git a/ui/gtk3/switcher.vala b/ui/gtk3/switcher.vala
@@ -592,7 +592,9 @@ class Switcher : Gtk.Window {
         int index = 0;
 
         foreach (var saved_language in m_xkb_languages.get_values()) {
-            if (language == saved_language[0:length])
+            // Duplicated langauge is EN, EN_2 for E.G.
+            if (length <= saved_language.length &&
+                language == saved_language[0:length])
                 index++;
         }