diff options
Diffstat (limited to 'composer')
| -rw-r--r-- | composer/ChangeLog | 6 | ||||
| -rw-r--r-- | composer/e-msg-composer-select-file.c | 5 | ||||
| -rw-r--r-- | composer/e-msg-composer.c | 6 |
3 files changed, 12 insertions, 5 deletions
diff --git a/composer/ChangeLog b/composer/ChangeLog index 2ba38eab15..4b8f010237 100644 --- a/composer/ChangeLog +++ b/composer/ChangeLog @@ -1,3 +1,9 @@ +2001-12-11 Jeffrey Stedfast <fejj@ximian.com> + + * e-msg-composer-select-file.c + (file_selection_info_destroy_notify): If the widget is non-NULL, + then gtk_widget_destroy that bad boy... + 2001-12-10 Jeffrey Stedfast <fejj@ximian.com> * e-msg-composer-attachment-bar.c (add_from_user): diff --git a/composer/e-msg-composer-select-file.c b/composer/e-msg-composer-select-file.c index d193a7afed..82733f9e5b 100644 --- a/composer/e-msg-composer-select-file.c +++ b/composer/e-msg-composer-select-file.c @@ -187,9 +187,8 @@ file_selection_info_destroy_notify (void *data) info = (FileSelectionInfo *) data; - if (info->widget != NULL) { - gtk_object_unref (GTK_OBJECT (info->widget)); - } + if (info->widget != NULL) + gtk_widget_destroy (GTK_OBJECT (info->widget)); if (info->selected_files) { for (i = 0; i < info->selected_files->len; i++) diff --git a/composer/e-msg-composer.c b/composer/e-msg-composer.c index d9df329775..b81dd7aac1 100644 --- a/composer/e-msg-composer.c +++ b/composer/e-msg-composer.c @@ -2140,10 +2140,10 @@ message_rfc822_dnd (EMsgComposer *composer, CamelStream *stream) static void drag_data_received (EMsgComposer *composer, GdkDragContext *context, - gint x, gint y, GtkSelectionData *selection, + int x, int y, GtkSelectionData *selection, guint info, guint time) { - gchar *tmp, *filename, **filenames; + char *tmp, *filename, **filenames; CamelMimePart *mime_part; CamelStream *stream; CamelURL *url; @@ -2183,6 +2183,7 @@ drag_data_received (EMsgComposer *composer, GdkDragContext *context, g_free (filenames); break; case DND_TYPE_TEXT_VCARD: + printf ("dropping a text/x-vcard\n"); mime_part = camel_mime_part_new (); camel_mime_part_set_content (mime_part, selection->data, selection->length, "text/x-vcard"); @@ -2194,6 +2195,7 @@ drag_data_received (EMsgComposer *composer, GdkDragContext *context, camel_object_unref (CAMEL_OBJECT (mime_part)); default: + printf ("dropping an unknown\n"); break; } } |