diff options
| author | Milan Crha <mcrha@redhat.com> | 2009-07-24 17:31:21 +0800 |
|---|---|---|
| committer | Milan Crha <mcrha@redhat.com> | 2009-07-24 17:31:21 +0800 |
| commit | 20da1867ea97adc3b1e07b759aafd276e1c6c75a (patch) | |
| tree | ea90086091bcba131cf2ab011676e46313fd4fb9 /addressbook/gui | |
| parent | 0e72ddbf7c85edd77156fb1ac7691fe293bb7554 (diff) | |
| download | gsoc2013-evolution-20da1867ea97adc3b1e07b759aafd276e1c6c75a.tar.gz gsoc2013-evolution-20da1867ea97adc3b1e07b759aafd276e1c6c75a.tar.zst gsoc2013-evolution-20da1867ea97adc3b1e07b759aafd276e1c6c75a.zip | |
Bug #589580 - Crashes when dragging an image to the contact editor
Diffstat (limited to 'addressbook/gui')
| -rw-r--r-- | addressbook/gui/contact-editor/e-contact-editor.c | 4 | ||||
| -rw-r--r-- | addressbook/gui/widgets/eab-gui-util.c | 3 |
2 files changed, 4 insertions, 3 deletions
diff --git a/addressbook/gui/contact-editor/e-contact-editor.c b/addressbook/gui/contact-editor/e-contact-editor.c index abcfe8cb19..fc4c8ff8df 100644 --- a/addressbook/gui/contact-editor/e-contact-editor.c +++ b/addressbook/gui/contact-editor/e-contact-editor.c @@ -2201,7 +2201,7 @@ fill_in_simple_field (EContactEditor *editor, GtkWidget *widget, gint field_id) editor->image_set = TRUE; } else { - gchar *file_name = e_icon_factory_get_icon_filename ("stock_person", 48); + gchar *file_name = e_icon_factory_get_icon_filename ("stock_person", GTK_ICON_SIZE_DIALOG); e_image_chooser_set_from_file (E_IMAGE_CHOOSER (widget), file_name); editor->image_set = FALSE; g_free (file_name); @@ -2766,7 +2766,7 @@ image_cleared (EContactEditor *editor) image_chooser = glade_xml_get_widget (editor->gui, "image-chooser"); - file_name = e_icon_factory_get_icon_filename ("stock_person", 48); + file_name = e_icon_factory_get_icon_filename ("stock_person", GTK_ICON_SIZE_DIALOG); g_signal_handlers_block_by_func (image_chooser, image_chooser_changed, editor); e_image_chooser_set_from_file (E_IMAGE_CHOOSER (image_chooser), file_name); diff --git a/addressbook/gui/widgets/eab-gui-util.c b/addressbook/gui/widgets/eab-gui-util.c index 87601d7271..c11ff5351a 100644 --- a/addressbook/gui/widgets/eab-gui-util.c +++ b/addressbook/gui/widgets/eab-gui-util.c @@ -1023,7 +1023,8 @@ eab_create_image_chooser_widget(gchar *name, if (string1) { filename = e_icon_factory_get_icon_filename (string1, GTK_ICON_SIZE_DIALOG); - e_image_chooser_set_from_file (E_IMAGE_CHOOSER (w), filename); + if (filename && *filename) + e_image_chooser_set_from_file (E_IMAGE_CHOOSER (w), filename); g_free (filename); } |