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

If you can't get a pixbuf icon for the folder's type, do not crash.

Browse Source 
* evolution-folder-selector-button.c (set_folder): If you can't
get a pixbuf icon for the folder's type, do not crash.  [#39599]

* e-shell.c (impl_Shell__get_displayName): Removed.  [#38974]
(e_shell_class_init): Do not install anymore.

* Evolution-Shell.idl: Remove displayName attribute.

svn path=/trunk/; revision=20359
This commit is contained in:
Ettore Perazzoli
2003-03-19 18:32:52 +00:00
parent 28a37c0885
commit ec3cf6dfcd
4 changed files with 27 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
shell/evolution-folder-selector-button.c
View File

@ -95,7 +95,6 @@ set_folder (EvolutionFolderSelectorButton *folder_selector_button,
priv->selected_folder = folder;
if (!folder) {
/* FIXME: Will this work? */
gtk_image_set_from_pixbuf (GTK_IMAGE (priv->icon), NULL);
gtk_label_set_text (GTK_LABEL (priv->label),
_("<click here to select a folder>"));
@ -103,8 +102,10 @@ set_folder (EvolutionFolderSelectorButton *folder_selector_button,
}
pixbuf = evolution_shell_client_get_pixbuf_for_type (priv->shell_client, folder->type, TRUE);
gtk_image_set_from_pixbuf (GTK_IMAGE (priv->icon), pixbuf);
g_object_unref (pixbuf);
if (pixbuf != NULL) {
gtk_image_set_from_pixbuf (GTK_IMAGE (priv->icon), pixbuf);
g_object_unref (pixbuf);
}
storage_lname = NULL;
p = strchr (folder->evolutionUri, '/');