aboutsummaryrefslogtreecommitdiff
path: root/lib/common.vala
diff options
context:
space:
mode:
authorWilliam Hua <william.hua@canonical.com>2013-08-08 14:53:16 -0400
committerWilliam Hua <william.hua@canonical.com>2013-08-08 14:53:16 -0400
commit61af9c29ee77c21923f65d06c1e3f17bafa90b97 (patch)
tree48708c38f417b77063b69168eae185d59d38531c /lib/common.vala
parent4f411bb4a5a7350ba3142c885e52383914c24a7a (diff)
parent0e3bb46532e1858f2cfee808bd66efa225cb2d94 (diff)
downloadayatana-indicator-keyboard-61af9c29ee77c21923f65d06c1e3f17bafa90b97.tar.gz
ayatana-indicator-keyboard-61af9c29ee77c21923f65d06c1e3f17bafa90b97.tar.bz2
ayatana-indicator-keyboard-61af9c29ee77c21923f65d06c1e3f17bafa90b97.zip
Split useful code into separate Source object.
Diffstat (limited to 'lib/common.vala')
-rw-r--r--lib/common.vala16
1 files changed, 10 insertions, 6 deletions
diff --git a/lib/common.vala b/lib/common.vala
index 4d8b9add..9824bc26 100644
--- a/lib/common.vala
+++ b/lib/common.vala
@@ -16,18 +16,22 @@
* Authors: William Hua <william.hua@canonical.com>
*/
-string get_abbreviation (string name) {
+string? abbreviate (string? name) {
var index = 0;
unichar first;
unichar second;
- if (name.get_next_char (ref index, out first)) {
- if (name.get_next_char (ref index, out second)) {
- return @"$((!) first.toupper ().to_string ())$((!) second.to_string ())";
+ if (name != null) {
+ if (((!) name).get_next_char (ref index, out first)) {
+ if (((!) name).get_next_char (ref index, out second)) {
+ return @"$((!) first.toupper ().to_string ())$((!) second.to_string ())";
+ } else {
+ return first.toupper ().to_string ();
+ }
} else {
- return (!) first.toupper ().to_string ();
+ return "";
}
} else {
- return "";
+ return null;
}
}