Don't popup a menu if no scan results.
[dhcpcd-ui] / menu.c
diff --git a/menu.c b/menu.c
index 317628def2519d2c2b3e32e12d53c238d5915825..a826c9f34fe6d6d6cdd7a41a8cc3a7ff5844fdee 100644 (file)
--- a/menu.c
+++ b/menu.c
@@ -74,7 +74,7 @@ url_hook(GtkAboutDialog *dialog, const char *url, _unused gpointer p)
 static void
 ssid_hook(_unused GtkMenuItem *item, gpointer data)
 {
-       wpa_configure((const char *)data);
+       wpa_configure((const struct if_ap *)data);
 }
 
 static void
@@ -102,6 +102,7 @@ add_scan_results(GtkMenu *menu, const struct if_msg *ifm)
        double perc;
        int strength;
        const char *icon;
+       char *tip;
 
        for (gl = ifm->scan_results; gl; gl = gl->next) {
                ifa = (const struct if_ap *)gl->data;
@@ -129,12 +130,16 @@ add_scan_results(GtkMenu *menu, const struct if_msg *ifm)
                perc = strength / 100.0;
                gtk_progress_bar_set_fraction(GTK_PROGRESS_BAR(bar), perc);
 
+               tip = g_strconcat(ifa->bssid, " ", ifa->flags, NULL);
+               gtk_widget_set_tooltip_text(item, tip);
+               g_free(tip);
+
                gtk_widget_show(label);
                gtk_widget_show(bar);
                gtk_widget_show(image);
                gtk_widget_show(box);
                g_signal_connect(G_OBJECT(item), "activate",
-                               G_CALLBACK(ssid_hook), ifa->ssid);
+                               G_CALLBACK(ssid_hook), gl->data);
                gtk_menu_shell_append(GTK_MENU_SHELL(menu), item);
        }
 }
@@ -145,18 +150,21 @@ on_activate(GtkStatusIcon *icon, _unused guint button, _unused guint32 atime, _u
        GtkMenu *menu;
        const struct if_msg *ifm;
        GList *gl;
-       size_t n;
+       size_t n, na;
 
        notify_close();
 
-       n = 0;
+       n = na =0;
        for (gl = interfaces; gl; gl = gl->next) {
                ifm = (const struct if_msg *)gl->data;
-               if (ifm->wireless)
-                       if (++n > 1)
+               if (ifm->wireless) {
+                       if (ifm->scan_results != NULL)
+                               ++na;
+                       if (++n > 1 && na != 0)
                                break;
+               }
        }
-       if (n == 0)
+       if (n == 0 || (n == 1 && na == 0))
                return;
 
        menu = (GtkMenu *)gtk_menu_new();