Merge branch 'master' into shareddata

avahiclient.cpp

@@ -207,6 +207,12 @@ public:
 		avahi_service_browser_free(browser);
 		browser = NULL;
 
+        QMap<QString, QZeroConfService>::iterator i;
+		for (i = pub->services.begin(); i != pub->services.end(); i++) {
+            emit pub->serviceRemoved(i.value());
+
+		}
+
 		pub->services.clear();
 
 		QMap<QString, AvahiServiceResolver *>::iterator r;
@@ -227,6 +233,7 @@ public:
 };
 
 
+
 QZeroConf::QZeroConf(QObject *parent) : QObject(parent)
 {
 	pri = new QZeroConfPrivate(this);
@@ -266,6 +273,14 @@ void QZeroConf::stopServicePublish(void)
 	}
 }
 
+bool QZeroConf::publishExists(void)
+{
+	if (pri->group)
+		return true;
+	else
+		return false;
+}
+
 // http://www.zeroconf.org/rendezvous/txtrecords.html
 
 void QZeroConf::addServiceTxtRecord(QString nameOnly)
@@ -309,3 +324,11 @@ void QZeroConf::stopBrowser(void)
 {
 	pri->broswerCleanUp();
 }
+
+bool QZeroConf::browserExists(void)
+{
+	if (pri->browser)
+		return true;
+	else
+		return false;
+}