[Openvas-commits] r2808 - in trunk/openvas-client: . nessus/prefs_dialog

[scm-commit@wald.intevation.org]

Author: jan
Date: 2009-03-16 22:52:10 +0100 (Mon, 16 Mar 2009)
New Revision: 2808

Modified:
   trunk/openvas-client/ChangeLog
   trunk/openvas-client/nessus/prefs_dialog/prefs_dialog.c
Log:
Further patches by Marcus Brinkmann towards a crosscompiling
OpenVAS-Client based on mingw.

* nessus/prefs_dialog/prefs_dialog.c (add_nessus_icon_set):
Some Windows header defines "small" and therefore the variable
here is renamed to "small_icon".



Modified: trunk/openvas-client/ChangeLog
===================================================================
--- trunk/openvas-client/ChangeLog	2009-03-16 21:45:34 UTC (rev 2807)
+++ trunk/openvas-client/ChangeLog	2009-03-16 21:52:10 UTC (rev 2808)
@@ -3,6 +3,15 @@
 	Further patches by Marcus Brinkmann towards a crosscompiling
 	OpenVAS-Client based on mingw.
 
+	* nessus/prefs_dialog/prefs_dialog.c (add_nessus_icon_set):
+	Some Windows header defines "small" and therefore the variable
+	here is renamed to "small_icon".
+
+2009-03-16  Jan-Oliver Wagner <jan-oliver.wagner at intevation.de>
+
+	Further patches by Marcus Brinkmann towards a crosscompiling
+	OpenVAS-Client based on mingw.
+
 	* src/util/openvas_ssh_key_create.c (openvas_ssh_privkey_create,
 	openvas_ssh_pubkey_create): stdout and stderr can be
 	macros in some build environments. Therefore renaming variables

Modified: trunk/openvas-client/nessus/prefs_dialog/prefs_dialog.c
===================================================================
--- trunk/openvas-client/nessus/prefs_dialog/prefs_dialog.c	2009-03-16 21:45:34 UTC (rev 2807)
+++ trunk/openvas-client/nessus/prefs_dialog/prefs_dialog.c	2009-03-16 21:52:10 UTC (rev 2808)
@@ -256,7 +256,7 @@
  */
 static void
 add_nessus_icon_set (GtkIconFactory *factory, const char *stock_id,
-                     const char **large, const char **small)
+                     const char **large, const char **small_icon)
 {
   GtkIconSet *iconset;
   GtkIconSource *source;
@@ -276,9 +276,9 @@
   g_object_unref(G_OBJECT(pixbuf));
 
   /* The "small" icon is used for the GTK_ICON_SIZE_MENU size */
-  if (small != NULL)
+  if (small_icon != NULL)
   {
-    pixbuf = gdk_pixbuf_new_from_xpm_data(small);
+    pixbuf = gdk_pixbuf_new_from_xpm_data(small_icon);
     source = gtk_icon_source_new();
     gtk_icon_source_set_pixbuf(source, pixbuf);
     gtk_icon_source_set_size_wildcarded(source, FALSE);