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 561f1cd484e225491c70252438e8257f25021860..e1235b1912de0614a130fe612e36144fee605233 100644 (file)
--- 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 41b8b18f8683f581ace859a1efa5e0b9455c8fe6..928f7fa8dd16a8a028243d4b83f72b3783aaf645 100644 (file)
--- 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;
                }