fixes for power kernel 47 breaking temperature and voltage readings

[monky] / src / iconv_tools.c

diff --git a/src/iconv_tools.c b/src/iconv_tools.c
index 0c4912b..f2a8e5d 100644 (file)
--- a/src/iconv_tools.c
+++ b/src/iconv_tools.c
@@ -10,7 +10,7 @@
  * Please see COPYING for details
  *
  * Copyright (c) 2004, Hannu Saransaari and Lauri Hakkarainen
- * Copyright (c) 2005-2009 Brenden Matthews, Philip Kovacs, et. al.
+ * Copyright (c) 2005-2010 Brenden Matthews, Philip Kovacs, et. al.
  *     (see AUTHORS)
  * All rights reserved.
  *
@@ -29,8 +29,8 @@
  */
 
 #include "config.h"
-#include "logging.h"
 #include "text_object.h"
+#include "logging.h"
 #include <iconv.h>
 #include <stdio.h>
 #include <stdlib.h>
@@ -128,7 +128,7 @@ void init_iconv_start(struct text_object *obj, void *free_at_crash, const char *
                if (new_iconv == (iconv_t) (-1)) {
                        NORM_ERR("Can't convert from %s to %s.", iconv_from, iconv_to);
                } else {
-                       obj->a = register_iconv(&new_iconv);
+                       obj->data.i = register_iconv(&new_iconv);
                        iconv_converting = 1;
                }
        }
@@ -142,7 +142,7 @@ void init_iconv_stop(void)
 void do_iconv_start(struct text_object *obj)
 {
        iconv_converting = 1;
-       iconv_selected = obj->a;
+       iconv_selected = obj->data.i;
 }
 
 void do_iconv_stop(void)