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

[scm-commit@wald.intevation.org]

Author: mattm
Date: 2009-10-16 11:30:20 +0200 (Fri, 16 Oct 2009)
New Revision: 5573

Modified:
   trunk/openvas-client/ChangeLog
   trunk/openvas-client/openvas/prefs_dialog/prefs_scope_tree.c
Log:
	* openvas/prefs_dialog/prefs_scope_tree.c [USE_OMP]
	(set_cell_context_type): Only define if OTP is used.
	(scopetreeview_create_columns): Only create Type column if OTP is used.

Modified: trunk/openvas-client/ChangeLog
===================================================================
--- trunk/openvas-client/ChangeLog	2009-10-16 08:45:16 UTC (rev 5572)
+++ trunk/openvas-client/ChangeLog	2009-10-16 09:30:20 UTC (rev 5573)
@@ -1,3 +1,9 @@
+2009-10-16  Matthew Mundell <matthew.mundell at intevation.de>
+
+	* openvas/prefs_dialog/prefs_scope_tree.c [USE_OMP]
+	(set_cell_context_type): Only define if OTP is used.
+	(scopetreeview_create_columns): Only create Type column if OTP is used.
+
 2009-10-16  Felix Wolfsteller <felix.wolfsteller at intevation.de>
 
 	* Makefile: Added target for omp-cli, added to "all" target, install

Modified: trunk/openvas-client/openvas/prefs_dialog/prefs_scope_tree.c
===================================================================
--- trunk/openvas-client/openvas/prefs_dialog/prefs_scope_tree.c	2009-10-16 08:45:16 UTC (rev 5572)
+++ trunk/openvas-client/openvas/prefs_dialog/prefs_scope_tree.c	2009-10-16 09:30:20 UTC (rev 5573)
@@ -1889,7 +1889,7 @@
   g_free(text);
 }
 
-#ifdef USE_OMP
+#if defined (USE_OMP) && !defined (DISABLE_OTP)
 static void
 set_cell_context_type (GtkTreeViewColumn *tree_column, GtkCellRenderer *cell,
                        GtkTreeModel *tree_model, GtkTreeIter *iter,
@@ -1928,7 +1928,7 @@
         break;
     }
 }
-#endif /* USE_OMP */
+#endif /* USE_OMP and not DISABLE_OTP */
 
 /**
  * @brief Behave as if the currently selected report would have been freshly
@@ -1997,7 +1997,7 @@
   gtk_tree_view_column_set_cell_data_func(column, renderer, connected_data_func,
       view, NULL);
 
-#ifdef USE_OMP
+#if defined (USE_OMP) && !defined (DISABLE_OTP)
   column = gtk_tree_view_column_new();
   gtk_tree_view_column_set_resizable(GTK_TREE_VIEW_COLUMN(column), 1);
   gtk_tree_view_column_set_title(column, _("Type"));
@@ -2011,7 +2011,7 @@
   gtk_tree_view_column_set_cell_data_func(column, renderer,
 					  set_cell_context_type,
 					  (gpointer) COL_CONTEXT, NULL);
-#endif /* USE_OMP */
+#endif /* USE_OMP and not DISABLE_OTP */
 
   column = gtk_tree_view_column_new();
   gtk_tree_view_column_set_resizable(GTK_TREE_VIEW_COLUMN(column), 1);