diff options
| author | Morten Welinder <terra@gnome.org> | 2004-03-17 21:52:29 +0000 |
|---|---|---|
| committer | Morten Welinder <mortenw@src.gnome.org> | 2004-03-17 21:52:29 +0000 |
| commit | 72d48463da46cb7abfeceb86289109c4b77ae1cd (patch) | |
| tree | 9e775e4d48e349b1688138850c87209d9084dafa | |
| parent | 22767f65f7fb2699a996b2742fe66906e20b936f (diff) | |
| download | gtk+-72d48463da46cb7abfeceb86289109c4b77ae1cd.tar.gz | |
Free volumes not actually put into the shortcut list.
2004-03-17 Morten Welinder <terra@gnome.org>
* gtk/gtkfilechooserdefault.c (shortcuts_add_volumes): Free
volumes not actually put into the shortcut list.
| -rw-r--r-- | ChangeLog | 3 | ||||
| -rw-r--r-- | ChangeLog.pre-2-10 | 3 | ||||
| -rw-r--r-- | ChangeLog.pre-2-4 | 3 | ||||
| -rw-r--r-- | ChangeLog.pre-2-6 | 3 | ||||
| -rw-r--r-- | ChangeLog.pre-2-8 | 3 | ||||
| -rw-r--r-- | gtk/gtkfilechooserdefault.c | 11 |
6 files changed, 23 insertions, 3 deletions
@@ -1,5 +1,8 @@ 2004-03-17 Morten Welinder <terra@gnome.org> + * gtk/gtkfilechooserdefault.c (shortcuts_add_volumes): Free + volumes not actually put into the shortcut list. + * tests/prop-editor.c (object_changed): Plug leak. * tests/testfilechooser.c (main): Plug some leaks and expose diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index 290bf4a71e..5af0fb14fb 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,5 +1,8 @@ 2004-03-17 Morten Welinder <terra@gnome.org> + * gtk/gtkfilechooserdefault.c (shortcuts_add_volumes): Free + volumes not actually put into the shortcut list. + * tests/prop-editor.c (object_changed): Plug leak. * tests/testfilechooser.c (main): Plug some leaks and expose diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4 index 290bf4a71e..5af0fb14fb 100644 --- a/ChangeLog.pre-2-4 +++ b/ChangeLog.pre-2-4 @@ -1,5 +1,8 @@ 2004-03-17 Morten Welinder <terra@gnome.org> + * gtk/gtkfilechooserdefault.c (shortcuts_add_volumes): Free + volumes not actually put into the shortcut list. + * tests/prop-editor.c (object_changed): Plug leak. * tests/testfilechooser.c (main): Plug some leaks and expose diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6 index 290bf4a71e..5af0fb14fb 100644 --- a/ChangeLog.pre-2-6 +++ b/ChangeLog.pre-2-6 @@ -1,5 +1,8 @@ 2004-03-17 Morten Welinder <terra@gnome.org> + * gtk/gtkfilechooserdefault.c (shortcuts_add_volumes): Free + volumes not actually put into the shortcut list. + * tests/prop-editor.c (object_changed): Plug leak. * tests/testfilechooser.c (main): Plug some leaks and expose diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8 index 290bf4a71e..5af0fb14fb 100644 --- a/ChangeLog.pre-2-8 +++ b/ChangeLog.pre-2-8 @@ -1,5 +1,8 @@ 2004-03-17 Morten Welinder <terra@gnome.org> + * gtk/gtkfilechooserdefault.c (shortcuts_add_volumes): Free + volumes not actually put into the shortcut list. + * tests/prop-editor.c (object_changed): Plug leak. * tests/testfilechooser.c (main): Plug some leaks and expose diff --git a/gtk/gtkfilechooserdefault.c b/gtk/gtkfilechooserdefault.c index 39cda5688c..8987297667 100644 --- a/gtk/gtkfilechooserdefault.c +++ b/gtk/gtkfilechooserdefault.c @@ -1224,11 +1224,16 @@ shortcuts_add_volumes (GtkFileChooserDefault *impl) gtk_file_path_free (base_path); if (!is_local) - continue; + { + gtk_file_system_volume_free (impl->file_system, volume); + continue; + } } - shortcuts_insert_path (impl, start_row + n, TRUE, volume, NULL, NULL, FALSE, NULL); - n++; + if (shortcuts_insert_path (impl, start_row + n, TRUE, volume, NULL, NULL, FALSE, NULL)) + n++; + else + gtk_file_system_volume_free (impl->file_system, volume); } impl->num_volumes = n; |