From: Carlos Garcia Campos <carlosgc@gnome.org>
Date: Mon, 21 Aug 2006 18:46:48 +0000 (+0000)
Subject: Revert my previous commit, gnome_program_init owns the option context. Fix
X-Git-Tag: EVINCE_0_6_0~33
X-Git-Url: https://www.fi.muni.cz/~kas/git//home/kas/public_html/git/?a=commitdiff_plain;h=25d98b033dd862161a97eb91c25723cef772c65e;p=evince.git

Revert my previous commit, gnome_program_init owns the option context. Fix

2006-08-21  Carlos Garcia Campos  <carlosgc@gnome.org>
	* shell/main.c: (main):
	Revert my previous commit, gnome_program_init owns the option context.
	Fix another memory leak in main. Both caught by Christian Persch.
---

diff --git a/ChangeLog b/ChangeLog
index 561f1cd4..e1235b19 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2006-08-21  Carlos Garcia Campos  <carlosgc@gnome.org>
+
+	* shell/main.c: (main):
+
+	Revert my previous commit, gnome_program_init owns the option context.
+	Fix another memory leak in main. Both caught by Christian Persch. 
+
 2006-08-21  Carlos Garcia Campos  <carlosgc@gnome.org>
 
 	* shell/main.c: (main):
diff --git a/shell/main.c b/shell/main.c
index 41b8b18f..928f7fa8 100644
--- a/shell/main.c
+++ b/shell/main.c
@@ -310,12 +310,12 @@ main (int argc, char *argv[])
                                       NULL);
 
 	args = arguments_parse ();
-	g_option_context_free (context);
 
 #ifdef ENABLE_DBUS
 	if (!ev_application_register_service (EV_APP)) {
 		if (load_files_remote (file_arguments, args)) {
 			g_hash_table_destroy (args);
+			g_object_unref (program);
 			
 			return 0;
 		}