Merge pull request #3 from benpicco/mastermate-system-monitor-1.2.1

sync with upstream

1 files changed, 7 insertions, 2 deletions

diff --git a/src/procman.cpp b/src/procman.cpp
index 16640c3..bffb4af 100644
--- a/src/procman.cpp
+++ b/src/procman.cpp
@@ -728,11 +728,12 @@ main (int argc, char *argv[])
 		exit (0);
 	}
 
+	/* initialize rsvg */
+	rsvg_init ();
+
 	gtk_window_set_default_icon_name ("utilities-system-monitor");
 	g_set_application_name(_("System Monitor"));
 
-	mateconf_init (argc, argv, NULL);
-
 	client = mateconf_client_get_default ();
 	mateconf_client_add_dir(client, "/apps/procman", MATECONF_CLIENT_PRELOAD_NONE, NULL);
 
@@ -768,6 +769,10 @@ main (int argc, char *argv[])
 
 	glibtop_close ();
 
+	// This function should only be called just before program exit.
+	// See MATE bug #592100 for a discussion about this.
+	rsvg_term ();
+
 	return 0;
 }