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

A warning fix from Jacob. Bug #5057.

Browse Source 
2001-07-25  Jason Leach  <jleach@ximian.com>

	* e-shortcuts-view.c (icon_callback): A warning fix from Jacob.
	Bug #5057.

svn path=/trunk/; revision=11403
This commit is contained in:
Jason Leach
2001-07-25 17:45:57 +00:00
committed by Jacob Leach
parent fcfda658fd
commit ee16607d42
2 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
shell/ChangeLog
View File

@ -1,10 +1,13 @@
2001-07-25 Jason Leach <jleach@ximian.com>
* e-shortcuts-view.c (icon_callback): A warning fix from Jacob.
Bug #5057.
* 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.
amazing Jacob B. Bug #5054.
2001-07-25 Jason Leach <jleach@ximian.com>

6
shell/e-shortcuts-view.c
View File

@ -105,7 +105,7 @@ icon_callback (EShortcutBar *shortcut_bar,
folder_type_registry = e_storage_set_get_folder_type_registry (storage_set);
if (strcmp ("evolution:/My Evolution", uri) == 0) {
type = g_strdup ("My Evolution");
type = "My Evolution";
} else {
folder = e_storage_set_get_folder (storage_set,
get_storage_set_path_from_uri (uri));
@ -113,14 +113,14 @@ icon_callback (EShortcutBar *shortcut_bar,
if (folder == NULL)
return NULL;
type = g_strdup (e_folder_get_type_string (folder));
type = e_folder_get_type_string (folder);
if (type == NULL)
return NULL;
}
/* FIXME mini icons? */
pixbuf = e_folder_type_registry_get_icon_for_type (folder_type_registry, type, FALSE);
g_free (type);
if (pixbuf != NULL)
gdk_pixbuf_ref (pixbuf);