diff options
| author | Ettore Perazzoli <ettore@src.gnome.org> | 2003-03-20 02:32:52 +0800 |
|---|---|---|
| committer | Ettore Perazzoli <ettore@src.gnome.org> | 2003-03-20 02:32:52 +0800 |
| commit | ec3cf6dfcd221bbce0a79df5431c4a737a2a7161 (patch) | |
| tree | ec02a46a80230d2881309cfb69355c208f2a7586 /shell/evolution-folder-selector-button.c | |
| parent | 28a37c0885ab3c031350f99f454774abfca8c35c (diff) | |
| download | gsoc2013-evolution-ec3cf6dfcd221bbce0a79df5431c4a737a2a7161.tar gsoc2013-evolution-ec3cf6dfcd221bbce0a79df5431c4a737a2a7161.tar.gz gsoc2013-evolution-ec3cf6dfcd221bbce0a79df5431c4a737a2a7161.tar.bz2 gsoc2013-evolution-ec3cf6dfcd221bbce0a79df5431c4a737a2a7161.tar.lz gsoc2013-evolution-ec3cf6dfcd221bbce0a79df5431c4a737a2a7161.tar.xz gsoc2013-evolution-ec3cf6dfcd221bbce0a79df5431c4a737a2a7161.tar.zst gsoc2013-evolution-ec3cf6dfcd221bbce0a79df5431c4a737a2a7161.zip | |
If you can't get a pixbuf icon for the folder's type, do not crash.
* 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
Diffstat (limited to 'shell/evolution-folder-selector-button.c')
| -rw-r--r-- | shell/evolution-folder-selector-button.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/shell/evolution-folder-selector-button.c b/shell/evolution-folder-selector-button.c index 70d221d6f0..0a01874c06 100644 --- a/shell/evolution-folder-selector-button.c +++ b/shell/evolution-folder-selector-button.c @@ -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, '/'); |