callisto-debian/evolution
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

$(BONOBO_CONF_CFLAGS) was here twice, took out one of them.

Browse Source 
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.

svn path=/trunk/; revision=11402
This commit is contained in:
Jason Leach
2001-07-25 16:55:28 +00:00
committed by Jacob Leach
parent 0fbf9cd43f
commit fcfda658fd
3 changed files with 10 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
shell/ChangeLog
View File

@ -1,3 +1,11 @@
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> 2001-07-25 Jason Leach <jleach@ximian.com>
* e-task-widget.c: #include <libgnome/gnome-defs.h> and * e-task-widget.c: #include <libgnome/gnome-defs.h> and

1
shell/Makefile.am
View File

@ -7,7 +7,6 @@ INCLUDES = -O \
$(BONOBO_GNOME_CFLAGS) \ $(BONOBO_GNOME_CFLAGS) \
$(BONOBO_CONF_CFLAGS) \ $(BONOBO_CONF_CFLAGS) \
$(EXTRA_GNOME_CFLAGS) \ $(EXTRA_GNOME_CFLAGS) \
$(BONOBO_CONF_CFLAGS) \
-DEVOLUTION_IMAGES=\""$(datadir)/images/evolution"\" \ -DEVOLUTION_IMAGES=\""$(datadir)/images/evolution"\" \
-DEVOLUTION_LOCALEDIR=\""$(localedir)"\" \ -DEVOLUTION_LOCALEDIR=\""$(localedir)"\" \
-DEVOLUTION_DATADIR=\""$(datadir)"\" \ -DEVOLUTION_DATADIR=\""$(datadir)"\" \

3
shell/e-shell-view.c
View File

@ -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"); 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); copy_of_uri = g_strdup (uri);
control = g_hash_table_lookup (priv->uri_to_control, uri); control = g_hash_table_lookup (priv->uri_to_control, uri);
if (control == NULL) { if (control == NULL) {
g_warning ("What?! Destroyed socket for non-existing URI? -- %s", uri); g_warning ("What?! Destroyed socket for non-existing URI? -- %s", uri);
g_free (copy_of_uri);
return; return;
} }