firmware: switched to D-Bus

2 files changed, 33 insertions, 0 deletions

diff --git a/hardinfo/info.c b/hardinfo/info.c
index f888ddac..2d1d4159 100644
--- a/hardinfo/info.c
+++ b/hardinfo/info.c
@@ -431,6 +431,19 @@ gchar *info_flatten(struct Info *info)
     return g_string_free(values, FALSE);
 }
 
+void info_remove_group(struct Info *info, guint index)
+{
+    struct InfoGroup *grp;
+
+    if (index >= info->groups->len)
+        return;
+
+    grp = &g_array_index(info->groups, struct InfoGroup, index);
+    free_group_fields(grp);
+
+    g_array_remove_index(info->groups, index);
+}
+
 struct InfoField *info_find_field(struct Info *info, const gchar *tag, const gchar *name) {
     struct InfoGroup *group;
     struct InfoField *field;
diff --git a/hardinfo/util.c b/hardinfo/util.c
index b1db6922..89c3ffd4 100644
--- a/hardinfo/util.c
+++ b/hardinfo/util.c
@@ -1349,6 +1349,26 @@ gboolean g_strv_contains(const gchar * const * strv, const gchar *str) {
 }
 #endif
 
+gchar *hardinfo_clean_grpname(const gchar *v, int replacing) {
+    gchar *clean, *p;
+
+    p = clean = g_strdup(v);
+    while (*p != 0) {
+        switch(*p) {
+            case '[':
+                *p = '('; break;
+            case ']':
+                *p = ')'; break;
+            default:
+                break;
+        }
+        p++;
+    }
+    if (replacing)
+        g_free((gpointer)v);
+    return clean;
+}
+
 /* Hardinfo labels that have # are truncated and/or hidden.
  * Labels can't have $ because that is the delimiter in
  * moreinfo. */