Fix notifications

[dhcpcd-ui] / src / dhcpcd-gtk / main.c

diff --git a/src/dhcpcd-gtk/main.c b/src/dhcpcd-gtk/main.c
index 9caf5fe3249cc1a410b1add145afbc5559f5dfda..3319cacfec059b842b5fb808523e936427cfac07 100644 (file)
--- a/src/dhcpcd-gtk/main.c
+++ b/src/dhcpcd-gtk/main.c
@@ -121,46 +121,31 @@ animate_online(_unused gpointer data)
 static void
 update_online(DHCPCD_CONNECTION *con, bool showif)
 {
-       bool ison, iscarrier, isstop;
+       bool ison, iscarrier;
        char *msg, *msgs, *tmp;
-       DHCPCD_IF *ifs, *i, *j;
+       DHCPCD_IF *ifs, *i;
 
        ison = iscarrier = false;
        msgs = NULL;
        ifs = dhcpcd_interfaces(con);
        for (i = ifs; i; i = i->next) {
-               if (showif)
-                       g_message("%s: %s", i->ifname, i->reason);
-               if (strcmp(i->reason, "RELEASE") == 0 ||
-                   strcmp(i->reason, "STOP") == 0)
-                       continue;
-               if (strcmp(i->type, "ipv4") != 0) {
-                       isstop = false;
-                       for (j = ifs; j; j = j->next)
-                               if (strcmp(j->ifname, i->ifname) == 0 &&
-                                   strcmp(j->type, "ipv4") == 0)
-                               {
-                                       if (strcmp(j->reason, "STOP") == 0)
-                                               isstop = true;
-                                       break;
-                               }
-                       if (isstop)
-                               continue;
-               }
                if (i->up)
                        ison = iscarrier = true;
                if (!iscarrier && g_strcmp0(i->reason, "CARRIER") == 0)
                        iscarrier = true;
                msg = dhcpcd_if_message(i);
                if (msg) {
+                       if (showif)
+                               g_message("%s", msg);
                        if (msgs) {
                                tmp = g_strconcat(msgs, "\n", msg, NULL);
                                g_free(msgs);
                                g_free(msg);
                                msgs = tmp;
                        } else
-                                   msgs = msg;
-               }
+                               msgs = msg;
+               } else if (showif)
+                       g_message("%s: %s", i->ifname, i->reason);
        }
 
        if (online != ison || carrier != iscarrier) {
@@ -212,7 +197,6 @@ notify(const char *title, const char *msg, const char *icon)
                return;
        /* Don't spam the same message */
        if (notify_last_msg) {
-                       return;
                if (notify_last_msg && strcmp(msg, notify_last_msg) == 0)
                        return;
                g_free(notify_last_msg);
@@ -253,7 +237,7 @@ event_cb(DHCPCD_CONNECTION *con, DHCPCD_IF *i, _unused void *data)
        char *msg;
        const char *icon;
 
-       g_message("%s: %s", i->ifname, i->reason);
+       g_message("interface event: %s: %s", i->ifname, i->reason);
        update_online(con, false);
 
        /* We should ignore renew and stop so we don't annoy the user */
@@ -262,14 +246,17 @@ event_cb(DHCPCD_CONNECTION *con, DHCPCD_IF *i, _unused void *data)
                return;
 
        msg = dhcpcd_if_message(i);
-       if (i->up)
-               icon = "network-transmit-receive";
-       //else
-       //      icon = "network-transmit";
-       if (!i->up)
-               icon = "network-offline";
-       notify(_("Network event"), msg, icon);
-       g_free(msg);
+       if (msg) {
+               g_message("%s", msg);
+               if (i->up)
+                       icon = "network-transmit-receive";
+               //else
+               //      icon = "network-transmit";
+               if (!i->up)
+                       icon = "network-offline";
+               notify(_("Network event"), msg, icon);
+               g_free(msg);
+       }
 }
 
 static void