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

[scm-commit@wald.intevation.org]

Author: felix
Date: 2009-10-02 13:02:29 +0200 (Fri, 02 Oct 2009)
New Revision: 5356

Modified:
   trunk/openvas-client/ChangeLog
   trunk/openvas-client/openvas/prefs_dialog/prefs_context.c
   trunk/openvas-client/openvas/prefs_dialog/prefs_dialog_auth.c
Log:
* openvas/prefs_dialog/prefs_dialog_auth.c
(prefs_dialog_auth_connect_dialog): Initialize variables with NULL.

* openvas/prefs_dialog/prefs_context.c (prefs_context_update_widgets):
Guard CONTEXT_SERVER which is only defined if configured with
--enable-omp.


Modified: trunk/openvas-client/ChangeLog
===================================================================
--- trunk/openvas-client/ChangeLog	2009-10-02 10:33:53 UTC (rev 5355)
+++ trunk/openvas-client/ChangeLog	2009-10-02 11:02:29 UTC (rev 5356)
@@ -1,3 +1,12 @@
+2009-10-02  Felix Wolfsteller <felix.wolfsteller at intevation.de>
+
+	* openvas/prefs_dialog/prefs_dialog_auth.c
+	(prefs_dialog_auth_connect_dialog): Initialize variables with NULL.
+
+	* openvas/prefs_dialog/prefs_context.c (prefs_context_update_widgets):
+	Guard CONTEXT_SERVER which is only defined if configured with
+	--enable-omp.
+
 2009-09-30  Matthew Mundell <matthew.mundell at intevation.de>
 
 	* openvas/prefs_dialog/prefs_dialog.c (prefs_dialog_setup): Only define

Modified: trunk/openvas-client/openvas/prefs_dialog/prefs_context.c
===================================================================
--- trunk/openvas-client/openvas/prefs_dialog/prefs_context.c	2009-10-02 10:33:53 UTC (rev 5355)
+++ trunk/openvas-client/openvas/prefs_dialog/prefs_context.c	2009-10-02 11:02:29 UTC (rev 5356)
@@ -91,7 +91,11 @@
 #endif /* undefined DISABLE_OTP */
 
     prefs_context_enable_widget("EXECSCOPE_MENUITEM", type >= CONTEXT_SCOPE && action == CONTEXT_IDLE );
-    prefs_context_enable_widget("NEWSCOPE_MENUITEM", type >= CONTEXT_TASK || type == CONTEXT_SERVER);
+    prefs_context_enable_widget("NEWSCOPE_MENUITEM", type >= CONTEXT_TASK
+#ifdef USE_OMP
+        || type == CONTEXT_SERVER
+#endif
+                                );
     prefs_context_enable_widget("RENAMESCOPE_MENUITEM", type >= CONTEXT_SCOPE);
     prefs_context_enable_widget("DELETESCOPE_MENUITEM", type >= CONTEXT_SCOPE);
 

Modified: trunk/openvas-client/openvas/prefs_dialog/prefs_dialog_auth.c
===================================================================
--- trunk/openvas-client/openvas/prefs_dialog/prefs_dialog_auth.c	2009-10-02 10:33:53 UTC (rev 5355)
+++ trunk/openvas-client/openvas/prefs_dialog/prefs_dialog_auth.c	2009-10-02 11:02:29 UTC (rev 5356)
@@ -525,7 +525,8 @@
     if(gtk_dialog_run(GTK_DIALOG(auth->dialog)) == GTK_RESPONSE_OK)
     {
 #ifdef USE_OMP
-      struct context *original_context, *manager;
+      struct context *original_context = NULL;
+      struct context *manager = NULL;
 #endif
       const char *hostname;
       int port;