diff options
| -rw-r--r-- | shell/ChangeLog | 5 | ||||
| -rw-r--r-- | shell/e-shortcuts-view.c | 6 |
2 files changed, 7 insertions, 4 deletions
diff --git a/shell/ChangeLog b/shell/ChangeLog index 93c511493a..1b12ea9c00 100644 --- a/shell/ChangeLog +++ b/shell/ChangeLog @@ -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> diff --git a/shell/e-shortcuts-view.c b/shell/e-shortcuts-view.c index 6f6dae5241..dc45bcd949 100644 --- a/shell/e-shortcuts-view.c +++ b/shell/e-shortcuts-view.c @@ -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); |