diff options
Diffstat (limited to 'shell')
| -rw-r--r-- | shell/ChangeLog | 8 | ||||
| -rw-r--r-- | shell/Makefile.am | 1 | ||||
| -rw-r--r-- | shell/e-shell-view.c | 3 |
3 files changed, 10 insertions, 2 deletions
diff --git a/shell/ChangeLog b/shell/ChangeLog index 85ddb6da8f..93c511493a 100644 --- a/shell/ChangeLog +++ b/shell/ChangeLog @@ -1,5 +1,13 @@ 2001-07-25 Jason Leach <jleach@ximian.com> + * Makefile.am (INCLUDES): $(BONOBO_CONF_CFLAGS) was here twice, + took out one of them. + + * e-shell-view.c (socket_destroy_cb): Mem leak fix. Thanks to the + amazing Jacob B. Bug #5054. + +2001-07-25 Jason Leach <jleach@ximian.com> + * e-task-widget.c: #include <libgnome/gnome-defs.h> and <libgnome/gnome-i18n.h> instead of the full <libgnome/libgnome.h>, as noted by a comment here. diff --git a/shell/Makefile.am b/shell/Makefile.am index 7aecad0ae3..4785fdae6e 100644 --- a/shell/Makefile.am +++ b/shell/Makefile.am @@ -7,7 +7,6 @@ INCLUDES = -O \ $(BONOBO_GNOME_CFLAGS) \ $(BONOBO_CONF_CFLAGS) \ $(EXTRA_GNOME_CFLAGS) \ - $(BONOBO_CONF_CFLAGS) \ -DEVOLUTION_IMAGES=\""$(datadir)/images/evolution"\" \ -DEVOLUTION_LOCALEDIR=\""$(localedir)"\" \ -DEVOLUTION_DATADIR=\""$(datadir)"\" \ diff --git a/shell/e-shell-view.c b/shell/e-shell-view.c index 7fc721cd97..d2f8d74920 100644 --- a/shell/e-shell-view.c +++ b/shell/e-shell-view.c @@ -1592,12 +1592,13 @@ socket_destroy_cb (GtkWidget *socket_widget, gpointer data) uri = (const char *) gtk_object_get_data (GTK_OBJECT (socket_widget), "e_shell_view_folder_uri"); - /* Strdup here as the string will be freed when the socket is destroyed. */ + /* Strdup here as the string will be freed when the socket is destroyed. */ copy_of_uri = g_strdup (uri); control = g_hash_table_lookup (priv->uri_to_control, uri); if (control == NULL) { g_warning ("What?! Destroyed socket for non-existing URI? -- %s", uri); + g_free (copy_of_uri); return; } |