network-manager-applet r630 - in trunk: . src/connection-editor

[dcbw svn gnome org]

Author: dcbw
Date: Mon Mar 31 03:02:03 2008
New Revision: 630
URL: http://svn.gnome.org/viewvc/network-manager-applet?rev=630&view=rev

Log:
2008-03-30  Dan Williams  <dcbw redhat com>

	* src/connection-editor/main.c
		- (main): init the crypto system so that NSS and gnutls don't segfault
			when editing EAP-TLS and EAP-TTLS connections



Modified:
   trunk/ChangeLog
   trunk/src/connection-editor/main.c

Modified: trunk/src/connection-editor/main.c
==============================================================================
--- trunk/src/connection-editor/main.c	(original)
+++ trunk/src/connection-editor/main.c	Mon Mar 31 03:02:03 2008
@@ -24,12 +24,14 @@
 #include <dbus/dbus-glib.h>
 
 #include "nm-connection-list.h"
+#include "crypto.h"
 
 int
 main (int argc, char *argv[])
 {
 	NMConnectionList *list;
 	DBusGConnection *ignore;
+	GError *error = NULL;
 
 	gtk_init (&argc, &argv);
 
@@ -40,9 +42,17 @@
 	ignore = dbus_g_bus_get (DBUS_BUS_SYSTEM, NULL);
 	dbus_g_connection_unref (ignore);
 
+	if (!crypto_init (&error)) {
+		g_warning ("Couldn't initilize crypto system: %d %s",
+		           error->code, error->message);
+		return 1;
+	}
+
 	list = nm_connection_list_new ();
 	nm_connection_list_run_and_close (list);
 	g_object_unref (list);
 
+	crypto_deinit ();
+
 	return 0;
 }