From fcfda658fd965a09798f13b435a2b4d853e16c5c Mon Sep 17 00:00:00 2001 From: Jason Leach Date: Wed, 25 Jul 2001 16:55:28 +0000 Subject: $(BONOBO_CONF_CFLAGS) was here twice, took out one of them. 2001-07-25 Jason Leach * 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. svn path=/trunk/; revision=11402 --- shell/ChangeLog | 8 ++++++++ shell/Makefile.am | 1 - shell/e-shell-view.c | 3 ++- 3 files changed, 10 insertions(+), 2 deletions(-) (limited to 'shell') diff --git a/shell/ChangeLog b/shell/ChangeLog index 85ddb6da8f..93c511493a 100644 --- a/shell/ChangeLog +++ b/shell/ChangeLog @@ -1,3 +1,11 @@ +2001-07-25 Jason Leach + + * 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 * e-task-widget.c: #include and 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; } -- cgit v1.2.3