[Xfce4-commits] <postler:master> Only instantiate service when aquiring the name

[Christian Dywan]

Updating branch refs/heads/master
         to d9087f4cdd2eba03eceac87db430ebd94955cfec (commit)
       from 634d8cb3dab1cd79da734e4210eb968491001ff4 (commit)

commit d9087f4cdd2eba03eceac87db430ebd94955cfec
Author: Christian Dywan <christian at twotoasts.de>
Date:   Wed Mar 30 22:32:11 2011 +0200

    Only instantiate service when aquiring the name
    
    Also reset the item when quitting.

 postler/dockmanager.vala     |    5 +++++
 postler/postler-service.vala |    8 ++++----
 2 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/postler/dockmanager.vala b/postler/dockmanager.vala
index d48df4b..503c49c 100644
--- a/postler/dockmanager.vala
+++ b/postler/dockmanager.vala
@@ -73,6 +73,7 @@ namespace Dock {
                 foreach (string object_path in dockitems) {
                     update_service (object_path);
                     set_badge (last_count);
+                    break;
                }
             });
             manager.item_removed.connect ((object_path) => {
@@ -117,6 +118,10 @@ namespace Dock {
             update_service (object_path);
         }
 
+        public void reset () {
+            set_badge (0);
+        }
+
         public void update_dock_item (HashTable<string, Variant> hints) {
             try {
                 if (service == null)
diff --git a/postler/postler-service.vala b/postler/postler-service.vala
index efafa40..c363369 100644
--- a/postler/postler-service.vala
+++ b/postler/postler-service.vala
@@ -424,24 +424,24 @@ namespace Postler {
         public signal void sent (string account, string filename, string error_message);
 
         public void quit () {
+            dockitem.reset ();
             Gtk.main_quit ();
         }
     }
 
     public class Service {
         void bus_aquired (DBusConnection conn) {
+        }
+
+        void name_aquired (DBusConnection conn) {
             try {
                 conn.register_object ("/org/elementary/postler",
                                       new PostlerService ());
             } catch (IOError e) {
                 stderr.printf ("Could not register service\n");
-                done (1);
             }
         }
 
-        void name_aquired () {
-        }
-
         void name_lost () {
             done (0);
         }