Web   ·   Wiki   ·   Activities   ·   Blog   ·   Lists   ·   Chat   ·   Meeting   ·   Bugs   ·   Git   ·   Translate   ·   Archive   ·   People   ·   Donate
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--ChangeLog7
-rw-r--r--shell/main.c2
2 files changed, 8 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 561f1cd..e1235b1 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -2,6 +2,13 @@
* 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):
+
Fix memory leak.
2006-08-21 Carlos Garcia Campos <carlosgc@gnome.org>
diff --git a/shell/main.c b/shell/main.c
index 41b8b18..928f7fa 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;
}