[Xfce4-commits] <postler:master> Use the new org.elementary.dexterserver

[Christian Dywan]

Updating branch refs/heads/master
         to 55e405b7c9dc2e93e6cbabbbefbd47a2d015f262 (commit)
       from 43ea54042a88826122e4a8f9a0164ddec65012ae (commit)

commit 55e405b7c9dc2e93e6cbabbbefbd47a2d015f262
Author: Christian Dywan <christian at twotoasts.de>
Date:   Tue Dec 21 20:42:59 2010 +0100

    Use the new org.elementary.dexterserver

 postler/dexter.vala           |   12 ++++++------
 postler/postler-composer.vala |    2 +-
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/postler/dexter.vala b/postler/dexter.vala
index 812a502..d8a830b 100644
--- a/postler/dexter.vala
+++ b/postler/dexter.vala
@@ -11,10 +11,10 @@
 
 namespace Dexter {
 
-    [DBus (name = "org.elementary.dexterservice")]
+    [DBus (name = "org.elementary.dexterserver")]
     interface DexterService : Object {
         public abstract string get_name (string email_address) throws IOError;
-        public abstract string[] search_contacts (string keywords) throws IOError;
+        public abstract string[] autocomplete_contact (string keywords) throws IOError;
         public abstract void show_window () throws IOError;
     }
 
@@ -23,8 +23,8 @@ namespace Dexter {
         public Dexter () {
             try {
                 service = Bus.get_proxy_sync (BusType.SESSION,
-                                              "org.elementary.dexterservice",
-                                              "/org/elementary/dexterservice");
+                                              "org.elementary.dexterserver",
+                                              "/org/elementary/dexterserver");
                 /* Ensure Dexter is running, ignore errors, without is fine */
                 Process.spawn_async (null, { "dexter", "-d" }, null,
                     SpawnFlags.SEARCH_PATH
@@ -41,9 +41,9 @@ namespace Dexter {
                 return null;
             }
         }
-        public string[] search_contacts (string keywords) {
+        public string[] autocomplete_contact (string keywords) {
             try {
-                return service.search_contacts (keywords);
+                return service.autocomplete_contact (keywords);
             } catch (GLib.Error error) {
                 return {};
             }
diff --git a/postler/postler-composer.vala b/postler/postler-composer.vala
index 48585ab..535f7d9 100644
--- a/postler/postler-composer.vala
+++ b/postler/postler-composer.vala
@@ -358,7 +358,7 @@ public class Postler.Composer : Gtk.Window {
             var model = entry.get_completion ().model as Gtk.ListStore;
             if (model.iter_n_children (null) > 0)
                 return;
-            string[] contacts = dexter.search_contacts (entry.text);
+            string[] contacts = dexter.autocomplete_contact (entry.text);
             foreach (string contact in contacts) {
                 Gtk.TreeIter iter;
                 model.append (out iter);