[dss-commits] digitalSTROM Server branch, master, updated. c87cf46766c06bb5ec6c92477b81b91fedfcc55b

[git version control]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "digitalSTROM Server".

The branch, master has been updated
       via  c87cf46766c06bb5ec6c92477b81b91fedfcc55b (commit)
      from  156a771c54bd8100a53681a5546b914a93dba0f1 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit c87cf46766c06bb5ec6c92477b81b91fedfcc55b
Author: Johannes Winkelmann <johannes.winkelmann at aizo.com>
Date:   Mon Jan 11 13:54:15 2010 +0100

    compilation fixes for bonjour.cpp in USE_AVAHI case

-----------------------------------------------------------------------

Changes:
diff --git a/core/bonjour.cpp b/core/bonjour.cpp
index e226529..042c971 100644
--- a/core/bonjour.cpp
+++ b/core/bonjour.cpp
@@ -86,7 +86,7 @@ static void entry_group_callback(AvahiEntryGroup *g, AvahiEntryGroupState state,
     switch (state) {
         case AVAHI_ENTRY_GROUP_ESTABLISHED :
             /* The entry group has been established successfully */
-            Logger::getInstance()->log(std::string("Service '") + name + "' successfully established.", lsInfo)
+            Logger::getInstance()->log(std::string("Service '") + name + "' successfully established.", lsInfo);
             break;
 
         case AVAHI_ENTRY_GROUP_COLLISION : {
@@ -137,7 +137,7 @@ static void create_services(AvahiClient *c) {
      * because it was reset previously, add our entries.  */
 
     if (avahi_entry_group_is_empty(group)) {
-        Logger::getInstance()->log("Adding service '" + name + "'", lsInfo);
+        Logger::getInstance()->log(std::string("Adding service '") + name + "'", lsInfo);
 
         /* We will now add two services and one subtype to the entry
          * group. The two services have the same name, but differ in
@@ -239,7 +239,7 @@ static void client_callback(AvahiClient *c, AvahiClientState state, AVAHI_GCC_UN
 
     /* Allocate main loop object */
     if (!(simple_poll = avahi_simple_poll_new())) {
-        Logger::getInstance->log("Failed to create simple poll object.", lsError);
+        Logger::getInstance()->log("Failed to create simple poll object.", lsError);
         goto fail;
     }
 


hooks/post-receive
-- 
digitalSTROM Server