From f567e9ff05300634115ff060d058ae69a56449b1 Mon Sep 17 00:00:00 2001
From: Julian Sparber <julian@sparber.net>
Date: Fri, 29 Dec 2017 21:24:30 +0100
Subject: [PATCH] [feat] show user error msg when the avahi deamon is not
 running, close #3

---
 src/teleport-app.c    | 46 ++++++++++++++++++++++++++++++++++++++-----
 src/teleport-window.c | 18 +++++++++++++++--
 src/teleport-window.h |  5 ++++-
 3 files changed, 61 insertions(+), 8 deletions(-)

diff --git a/src/teleport-app.c b/src/teleport-app.c
index 4105bd5..223aa66 100644
--- a/src/teleport-app.c
+++ b/src/teleport-app.c
@@ -91,6 +91,45 @@ struct _TeleportApp {
 
 G_DEFINE_TYPE_WITH_PRIVATE (TeleportApp, teleport_app, GTK_TYPE_APPLICATION);
 
+static void
+on_avahi_appeared (GDBusConnection *connection,
+                  const gchar     *name,
+                  const gchar     *name_owner,
+                  gpointer         user_data)
+{
+  TeleportApp *app = user_data;
+  TeleportAppPrivate *priv = app->priv;
+  GtkWidget *window = priv->window;
+
+  teleport_show_no_device_message (TELEPORT_WINDOW (window), TRUE);
+  teleport_publish_run (teleport_get_device_name());
+  teleport_browser_run_avahi_service(priv->peerList);
+  teleport_show_no_avahi_message (TELEPORT_WINDOW (window), FALSE);
+}
+
+static void
+on_avahi_vanished (GDBusConnection *connection,
+                  const gchar     *name,
+                  gpointer         user_data)
+{
+  TeleportApp *app = user_data;
+  TeleportAppPrivate *priv = app->priv;
+  GtkWidget *window = priv->window;
+
+  teleport_show_no_device_message (TELEPORT_WINDOW (window), FALSE);
+  teleport_show_no_avahi_message (TELEPORT_WINDOW (window), TRUE);
+}
+
+static void
+watch_for_avahi_service (TeleportApp *application) {
+    g_bus_watch_name (G_BUS_TYPE_SYSTEM,
+                                 "org.freedesktop.Avahi",
+                                 G_BUS_NAME_WATCHER_FLAGS_NONE,
+                                 on_avahi_appeared,
+                                 on_avahi_vanished,
+                                 application,
+                                 NULL);
+}
 
 static void 
 save_file_callback (GSimpleAction *simple,
@@ -239,7 +278,7 @@ mainLoopRemovePeerCallback (gpointer peer)  {
   update_remote_device_list_remove((TeleportWindow *) window, (Peer *) peer);
   //if (teleport_peer_get_number (priv->peerList) == 0)
   if (teleport_peer_get_number (priv->peerList) == 0)
-    teleport_show_no_device_message (TELEPORT_WINDOW (window));
+    teleport_show_no_device_message (TELEPORT_WINDOW (window), TRUE);
   return G_SOURCE_REMOVE;
 }
 
@@ -295,10 +334,7 @@ teleport_app_startup (GApplication *app) {
 
   teleport_server_run();
 
-  if (!teleport_publish_run (teleport_get_device_name()))
-    if (!teleport_browser_run_avahi_service(priv->peerList)) {
-      /* Error when avahi doesn't run */
-  }
+  watch_for_avahi_service (TELEPORT_APP (app));
 }
 
 static void
diff --git a/src/teleport-window.c b/src/teleport-window.c
index ccee64e..8a7e820 100644
--- a/src/teleport-window.c
+++ b/src/teleport-window.c
@@ -219,11 +219,25 @@ teleport_get_download_directory (void)
 }
 
 void
-teleport_show_no_device_message (TeleportWindow *self)
+teleport_show_no_device_message (TeleportWindow *self, gboolean show)
 {
   TeleportWindowPrivate *priv;
   priv = teleport_window_get_instance_private (self);
-  gtk_widget_show (priv->remote_no_devices);
+  if (show)
+    gtk_widget_show (priv->remote_no_devices);
+  else
+    gtk_widget_hide (priv->remote_no_devices);
+}
+
+void
+teleport_show_no_avahi_message (TeleportWindow *self, gboolean show)
+{
+  TeleportWindowPrivate *priv;
+  priv = teleport_window_get_instance_private (self);
+  if (show)
+    gtk_widget_show (priv->remote_no_avahi);
+  else
+    gtk_widget_hide (priv->remote_no_avahi);
 }
 
 void
diff --git a/src/teleport-window.h b/src/teleport-window.h
index e346568..fbfad4f 100644
--- a/src/teleport-window.h
+++ b/src/teleport-window.h
@@ -40,6 +40,9 @@ void               update_remote_device_list_remove (TeleportWindow    *,
 
 gchar *            teleport_get_download_directory  (void); 
 gchar *            teleport_get_device_name         (void); 
-void               teleport_show_no_device_message  (TeleportWindow *);
+void               teleport_show_no_device_message  (TeleportWindow *,
+                                                     gboolean);
+void               teleport_show_no_avahi_message   (TeleportWindow *,
+                                                     gboolean);
 
 #endif /* __TELEPORT_WINDOW_H */