Be nice and clean up curl when exiting. Remove gconf_init, it's deprecated.

diff --git a/src/mapper.c b/src/mapper.c
index aa5c5da4e6281919dae0801b3b1df5c2b337518a..f497828f96f613b66417a6e902c2f490699e75c9 100644 (file)
--- a/src/mapper.c
+++ b/src/mapper.c
@@ -222,7 +222,6 @@ gtk_init(&argc, &argv);
 #if defined (WITH_GST)
 gst_init(&argc, &argv);
 #endif
-gconf_init(argc, argv, NULL);
 gnome_vfs_init();
 curl_global_init(CURL_GLOBAL_NOTHING);
 timezone_init();
@@ -242,5 +241,6 @@ gnome_vfs_shutdown();
 #ifdef WITH_OSSO
 osso_deinitialize(_osso);
 #endif
+curl_global_cleanup();
 return 0;
 }