Fixed small bug, and added im-config as a requirement for all IM

linuxmint · Oct 23, 2014 · 0256122 · 0256122
1 parent 151ece3
commit 0256122
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 11 deletions.
diff --git a/usr/lib/linuxmint/mintLocale/im.info b/usr/lib/linuxmint/mintLocale/im.info
@@ -1,4 +1,5 @@
 # IBus
+ibus	required	im-config
 ibus	required	ibus
 ibus	required	gir1.2-ibus-1.0
 ibus	required	ibus-clutter
@@ -59,6 +60,7 @@ ibus	optional	ibus-unikey
 ibus	optional	ibus-xkb
 
 # Fcitx
+fcitx	required	im-config
 fcitx	required	fcitx
 fcitx	required	fcitx-config-gtk
 fcitx	required	fcitx-frontend-all
@@ -146,6 +148,7 @@ fcitx	optional	fcitx-table-ziranma
 fcitx	optional	fcitx-unikey
 
 # SCIM
+scim	required	im-config
 scim	required	scim
 scim	required	scim-bridge-agent
 scim	required	scim-bridge-client-qt4
@@ -171,6 +174,7 @@ scim	optional	scim-thai
 scim	optional	scim-unikey
 
 # UIM
+uim	required	im-config
 uim	required	uim
 uim	required	uim-common
 uim	required	uim-dict-gtk

diff --git a/usr/lib/linuxmint/mintLocale/mintLocale.py b/usr/lib/linuxmint/mintLocale/mintLocale.py
@@ -524,16 +524,16 @@ def check_input_methods(self):
                 gtkbutton.hide()                
                 if IM in cache:
                     pkg = cache[IM]
+                    missing = []
+                    optional = []
+                    for req in self.im_info[IM].required:
+                        if req in cache and not cache[req].is_installed:
+                            missing.append(req)
+                    for req in self.im_info[IM].optional:
+                        if req in cache and not cache[req].is_installed:
+                            optional.append(req)
                     if pkg.is_installed:
-                        status = "<span foreground='#4ba048'>%s</span>" % _("Installed")
-                        missing = []
-                        optional = []
-                        for req in self.im_info[IM].required:
-                            if req in cache and not cache[req].is_installed:
-                                missing.append(req)
-                        for req in self.im_info[IM].optional:
-                            if req in cache and not cache[req].is_installed:
-                                optional.append(req)
+                        status = "<span foreground='#4ba048'>%s</span>" % _("Installed")                        
                         if len(missing) > 0:
                             status = "<span foreground='#a04848'>%s</span>" % (_("%d missing components!") % len(missing))
                             gtkbutton.set_label(_("Install the missing components"))
@@ -549,9 +549,9 @@ def check_input_methods(self):
                     else:
                         status = "<span foreground='#3C3C3C'>%s</span>" % _("Not installed")
                         gtkbutton.set_label(_("Add support for %s") % name)
-                        gtkbutton.set_tooltip_text('\n'.join(self.im_info[IM].required))                       
+                        gtkbutton.set_tooltip_text('\n'.join(missing))                       
                         gtkbutton.show()
-                        self.to_install[IM] = self.im_info[IM].required
+                        self.to_install[IM] = missing
 
                     gtklabel.set_markup("<a href='%s'>%s</a>\n<small><i><span foreground='#3C3C3C'>%s</span></i></small>" % (links[IM], name, status))
                 else: