From 3685650b88da9164b090ac3e05adc392de7408d1 Mon Sep 17 00:00:00 2001 From: "Leandro A. F. Pereira" Date: Thu, 15 Oct 2009 11:43:47 -0300 Subject: More feedback while scanning time-intensive stuff --- hardinfo2/arch/linux/common/samba.h | 7 +++++++ hardinfo2/computer.c | 6 ++++++ 2 files changed, 13 insertions(+) diff --git a/hardinfo2/arch/linux/common/samba.h b/hardinfo2/arch/linux/common/samba.h index 9e9d2458..7d835612 100644 --- a/hardinfo2/arch/linux/common/samba.h +++ b/hardinfo2/arch/linux/common/samba.h @@ -34,6 +34,7 @@ scan_samba(void) if (g_file_get_contents("/etc/samba/smb.conf", &str, &length, NULL)) { + shell_status_update("Scanning SAMBA shares..."); scan_samba_from_string(str, length); g_free(str); } @@ -49,6 +50,8 @@ scan_samba_usershares(void) if ((usershare_list = popen("net usershare list", "r"))) { char buffer[512]; + shell_status_update("Scanning SAMBA user shares..."); + while (fgets(buffer, 512, usershare_list)) { gchar *usershare, *cmdline; gsize length; @@ -64,6 +67,8 @@ scan_samba_usershares(void) } g_free(cmdline); + + shell_status_pulse(); } pclose(usershare_list); @@ -93,6 +98,8 @@ scan_samba_from_string(gchar *str, gsize length) groups = g_key_file_get_groups(keyfile, NULL); while (groups[i]) { + shell_status_pulse(); + if (g_key_file_has_key(keyfile, groups[i], "path", NULL)) { gchar *path = g_key_file_get_string(keyfile, groups[i], "path", NULL); smb_shares_list = h_strdup_cprintf("%s=%s\n", diff --git a/hardinfo2/computer.c b/hardinfo2/computer.c index 3d5c6be4..ccc7b2c1 100644 --- a/hardinfo2/computer.c +++ b/hardinfo2/computer.c @@ -230,6 +230,7 @@ void scan_dev(gboolean reload) for (i = 0; i < G_N_ELEMENTS(detect_lang); i++) { gchar *version = NULL; gchar *output; + gchar *temp; GRegex *regex; GMatchInfo *match_info; gboolean found; @@ -264,6 +265,11 @@ void scan_dev(gboolean reload) } else { dev_list = h_strdup_cprintf("%s=Not found\n", dev_list, detect_lang[i].compiler_name); } + + temp = g_strdup_printf("Detecting version: %s", + detect_lang[i].compiler_name); + shell_status_update(temp); + g_free(temp); } SCAN_END(); -- cgit v1.2.3