New upstream version 2.0.3preupstream/2.0.3pre

3 files changed, 9 insertions, 12 deletions

diff --git a/modules/network/net.c b/modules/network/net.c
index a75cf8b6..9a5cb5f1 100644
--- a/modules/network/net.c
+++ b/modules/network/net.c
@@ -1,10 +1,10 @@
 /*
  *    HardInfo - Displays System Information
- *    Copyright (C) 2003-2008 Leandro A. F. Pereira <leandro@hardinfo.org>
+ *    Copyright (C) 2003-2008 L. A. F. Pereira <l@tia.mat.br>
  *
  *    This program is free software; you can redistribute it and/or modify
  *    it under the terms of the GNU General Public License as published by
- *    the Free Software Foundation, version 2.
+ *    the Free Software Foundation, version 2 or later.
  *
  *    This program is distributed in the hope that it will be useful,
  *    but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -146,7 +146,7 @@ void get_wireless_info(int fd, NetInfo *netinfo)
   if (ioctl(fd, SIOCGIWMODE, &wi_req) < 0) {
     netinfo->wi_mode = 0;
   } else {
-    if (wi_req.u.mode >= 0 && wi_req.u.mode < 6) {
+    if (wi_req.u.mode < 6) {
       netinfo->wi_mode = wi_req.u.mode;
     } else {
       netinfo->wi_mode = 6;
diff --git a/modules/network/nfs.c b/modules/network/nfs.c
index 54bbfe0e..67095f92 100644
--- a/modules/network/nfs.c
+++ b/modules/network/nfs.c
@@ -1,10 +1,10 @@
 /*
  *    HardInfo - Displays System Information
- *    Copyright (C) 2003-2009 Leandro A. F. Pereira <leandro@hardinfo.org>
+ *    Copyright (C) 2003-2009 L. A. F. Pereira <l@tia.mat.br>
  *
  *    This program is free software; you can redistribute it and/or modify
  *    it under the terms of the GNU General Public License as published by
- *    the Free Software Foundation, version 2.
+ *    the Free Software Foundation, version 2 or later.
  *
  *    This program is distributed in the hope that it will be useful,
  *    but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/modules/network/samba.c b/modules/network/samba.c
index 7e8dc46c..e14742ea 100644
--- a/modules/network/samba.c
+++ b/modules/network/samba.c
@@ -1,10 +1,10 @@
 /*
  *    HardInfo - Displays System Information
- *    Copyright (C) 2003-2009 Leandro A. F. Pereira <leandro@hardinfo.org>
+ *    Copyright (C) 2003-2009 L. A. F. Pereira <l@tia.mat.br>
  *
  *    This program is free software; you can redistribute it and/or modify
  *    it under the terms of the GNU General Public License as published by
- *    the Free Software Foundation, version 2.
+ *    the Free Software Foundation, version 2 or later.
  *
  *    This program is distributed in the hope that it will be useful,
  *    but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -57,7 +57,7 @@ scan_samba_usershares(void)
     gchar *usershare, *cmdline;
     gsize length;
 
-    spawned = g_spawn_command_line_sync("net usershare list",
+    spawned = hardinfo_spawn_command_line_sync("net usershare list",
             &out, &err, &status, NULL);
 
     if (spawned && status == 0 && out != NULL) {
@@ -66,7 +66,7 @@ scan_samba_usershares(void)
         while(next_nl = strchr(p, '\n')) {
             cmdline = g_strdup_printf("net usershare info '%s'",
                                       strend(p, '\n'));
-            if (g_spawn_command_line_sync(cmdline,
+            if (hardinfo_spawn_command_line_sync(cmdline,
                         &usershare, NULL, NULL, NULL)) {
                 length = strlen(usershare);
                 scan_samba_from_string(usershare, length);
@@ -74,7 +74,6 @@ scan_samba_usershares(void)
             }
             g_free(cmdline);
 
-            shell_status_pulse();
             p = next_nl + 1;
         }
         g_free(out);
@@ -105,8 +104,6 @@ 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",