[Openvas-commits] r3500 - in trunk/openvas-manager: . src

[scm-commit@wald.intevation.org]

Author: mattm
Date: 2009-05-27 20:49:15 +0200 (Wed, 27 May 2009)
New Revision: 3500

Modified:
   trunk/openvas-manager/ChangeLog
   trunk/openvas-manager/src/omp.c
Log:
	* src/omp.c (send_plugin): Correct g_convert charset names.

Modified: trunk/openvas-manager/ChangeLog
===================================================================
--- trunk/openvas-manager/ChangeLog	2009-05-27 17:09:37 UTC (rev 3499)
+++ trunk/openvas-manager/ChangeLog	2009-05-27 18:49:15 UTC (rev 3500)
@@ -1,5 +1,9 @@
 2009-05-27  Matthew Mundell <mmundell at intevation.de>
 
+	* src/omp.c (send_plugin): Correct g_convert charset names.
+
+2009-05-27  Matthew Mundell <mmundell at intevation.de>
+
 	Switch to libopenvas nvtis for plugin information.
 
 	* src/manage.c (find_plugin, free_plugin_for_hash_table)

Modified: trunk/openvas-manager/src/omp.c
===================================================================
--- trunk/openvas-manager/src/omp.c	2009-05-27 17:09:37 UTC (rev 3499)
+++ trunk/openvas-manager/src/omp.c	2009-05-27 18:49:15 UTC (rev 3500)
@@ -874,11 +874,13 @@
     {
       gsize dummy;
 
+#define stringify (x) #x
+
 #define DEF(x)                                                    \
       char* x = nvti_ ## x (plugin);                              \
-      /* FIX Temp hack. */                                        \
+      /* FIX The g_convert is a temp hack. */                     \
       gchar* x ## _utf8 = x ? g_convert (x, strlen (x),           \
-                                         "utf-8", "iso_8895-1",   \
+                                         "UTF-8", "ISO_8859-1",   \
                                          NULL, &dummy, NULL)      \
                             : NULL;                               \
       gchar* x ## _text = x ## _utf8                              \
@@ -893,6 +895,8 @@
       DEF (version);
       DEF (tag);
 
+#undef DEF
+
       msg = g_strdup_printf ("<nvt>"
                              "<oid>%s</oid>"
                              "<name>%s</name>"