aboutsummaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
authorWilliam Hua <william.hua@canonical.com>2013-11-22 08:33:43 -0500
committerWilliam Hua <william.hua@canonical.com>2013-11-22 08:33:43 -0500
commit2fe7f0a9f585136f5a09aab9fe48ed0468dd3cf3 (patch)
treedaf1b679e47da69ae054a3f6a3aacfd6cc4c54f5 /lib
parentb6ec0422cf4d79196fa361be0831ae59ebfc0ba2 (diff)
downloadayatana-indicator-keyboard-2fe7f0a9f585136f5a09aab9fe48ed0468dd3cf3.tar.gz
ayatana-indicator-keyboard-2fe7f0a9f585136f5a09aab9fe48ed0468dd3cf3.tar.bz2
ayatana-indicator-keyboard-2fe7f0a9f585136f5a09aab9fe48ed0468dd3cf3.zip
Move greeter.vala to unity-greeter.vala.
Diffstat (limited to 'lib')
-rw-r--r--lib/Makefile.am8
-rw-r--r--lib/main.vala12
-rw-r--r--lib/unity-greeter.vala (renamed from lib/greeter.vala)2
3 files changed, 11 insertions, 11 deletions
diff --git a/lib/Makefile.am b/lib/Makefile.am
index 72f5f949..1af5469e 100644
--- a/lib/Makefile.am
+++ b/lib/Makefile.am
@@ -5,10 +5,10 @@ AM_LDFLAGS = -lm
AM_VALAFLAGS = --metadatadir $(top_srcdir)/deps \
--vapidir $(top_srcdir)/deps
-indicator_keyboard_service_SOURCES = main.vala \
- source.vala \
- common.vala \
- greeter.vala
+indicator_keyboard_service_SOURCES = main.vala \
+ source.vala \
+ common.vala \
+ unity-greeter.vala
indicator_keyboard_service_VALAFLAGS = $(AM_VALAFLAGS) \
--pkg gee-1.0 \
--pkg posix \
diff --git a/lib/main.vala b/lib/main.vala
index 66147b18..305ebb81 100644
--- a/lib/main.vala
+++ b/lib/main.vala
@@ -41,7 +41,7 @@ public class Indicator.Keyboard.Service : Object {
private MenuModel? menu_model;
private Menu? sources_menu;
- private Greeter? greeter;
+ private UnityGreeter? unity_greeter;
private string? greeter_user;
private uint lightdm_current;
@@ -127,9 +127,9 @@ public class Indicator.Keyboard.Service : Object {
[DBus (visible = false)]
private void update_greeter_user () {
- if (greeter_user == null && greeter != null) {
+ if (greeter_user == null && unity_greeter != null) {
try {
- greeter_user = ((!) greeter).get_active_entry ();
+ greeter_user = ((!) unity_greeter).get_active_entry ();
} catch (IOError error) {
warning ("error: %s", error.message);
}
@@ -773,8 +773,8 @@ public class Indicator.Keyboard.Service : Object {
[DBus (visible = false)]
private void handle_name_appeared (DBusConnection connection, string name, string name_owner) {
try {
- greeter = Bus.get_proxy_sync (BusType.SESSION, name, "/list");
- ((!) greeter).entry_selected.connect (handle_entry_selected);
+ unity_greeter = Bus.get_proxy_sync (BusType.SESSION, name, "/list");
+ ((!) unity_greeter).entry_selected.connect (handle_entry_selected);
} catch (IOError error) {
warning ("error: %s", error.message);
}
@@ -782,7 +782,7 @@ public class Indicator.Keyboard.Service : Object {
[DBus (visible = false)]
private void handle_name_vanished (DBusConnection connection, string name) {
- greeter = null;
+ unity_greeter = null;
}
[DBus (visible = false)]
diff --git a/lib/greeter.vala b/lib/unity-greeter.vala
index c378bbd5..2cdfe05c 100644
--- a/lib/greeter.vala
+++ b/lib/unity-greeter.vala
@@ -17,7 +17,7 @@
*/
[DBus (name="com.canonical.UnityGreeter.List")]
-public interface Greeter : Object {
+public interface UnityGreeter : Object {
public abstract string get_active_entry () throws IOError;
public abstract void set_active_entry (string entry_name) throws IOError;