From fe69cc8ca7be091c4c8989a594043bc7ba416d6a Mon Sep 17 00:00:00 2001 From: Roy Marples Date: Fri, 7 Nov 2014 11:31:57 +0000 Subject: [PATCH] Redraw the menu when we get or lose an AP from the scan results. Another fix to [6b883fb943] based on a suggestion from Simon Long. --- src/dhcpcd-gtk/menu.c | 10 +++++----- 1 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/dhcpcd-gtk/menu.c b/src/dhcpcd-gtk/menu.c index 58049eb..4cfbcb0 100644 --- a/src/dhcpcd-gtk/menu.c +++ b/src/dhcpcd-gtk/menu.c @@ -214,8 +214,7 @@ menu_update_scans(WI_SCAN *wi, DHCPCD_WI_SCAN *scans) { WI_MENU *wim, *win; DHCPCD_WI_SCAN *s; - bool found; - int adjust = 0; + bool found, update; if (menu == NULL) { dhcpcd_wi_scans_free(wi->scans); @@ -223,6 +222,7 @@ menu_update_scans(WI_SCAN *wi, DHCPCD_WI_SCAN *scans) return; } + update = false; TAILQ_FOREACH_SAFE(wim, &wi->menus, next, win) { found = false; for (s = scans; s; s = s->next) { @@ -237,7 +237,7 @@ menu_update_scans(WI_SCAN *wi, DHCPCD_WI_SCAN *scans) TAILQ_REMOVE(&wi->menus, wim, next); gtk_widget_destroy(wim->menu); g_free(wim); - adjust--; + update = true; } } @@ -255,14 +255,14 @@ menu_update_scans(WI_SCAN *wi, DHCPCD_WI_SCAN *scans) wim = create_menu(wi->ifmenu, wi, s); TAILQ_INSERT_TAIL(&wi->menus, wim, next); gtk_widget_show_all(wim->menu); - adjust++; + update = true; } } dhcpcd_wi_scans_free(wi->scans); wi->scans = scans; - if (adjust && gtk_widget_get_visible(wi->ifmenu)) + if (update && gtk_widget_get_visible(wi->ifmenu)) gtk_menu_reposition(GTK_MENU(wi->ifmenu)); } -- 1.7.1