diff options
| author | Srinivasa Ragavan <sragavan@src.gnome.org> | 2007-06-18 13:00:24 +0800 |
|---|---|---|
| committer | Srinivasa Ragavan <sragavan@src.gnome.org> | 2007-06-18 13:00:24 +0800 |
| commit | 099149d13d64a4d8d77869fb03ba4192714afba7 (patch) | |
| tree | 076fe1d0cfc6803fcbb8a18c258fc383c4ca3fb7 | |
| parent | a872b0e67e4ed760693bc0a686c0104a4663974f (diff) | |
| download | gsoc2013-evolution-099149d13d64a4d8d77869fb03ba4192714afba7.tar gsoc2013-evolution-099149d13d64a4d8d77869fb03ba4192714afba7.tar.gz gsoc2013-evolution-099149d13d64a4d8d77869fb03ba4192714afba7.tar.bz2 gsoc2013-evolution-099149d13d64a4d8d77869fb03ba4192714afba7.tar.lz gsoc2013-evolution-099149d13d64a4d8d77869fb03ba4192714afba7.tar.xz gsoc2013-evolution-099149d13d64a4d8d77869fb03ba4192714afba7.tar.zst gsoc2013-evolution-099149d13d64a4d8d77869fb03ba4192714afba7.zip | |
** Fix for bug #444107
svn path=/branches/gnome-2-18/; revision=33692
| -rw-r--r-- | composer/ChangeLog | 7 | ||||
| -rw-r--r-- | composer/e-msg-composer.c | 11 |
2 files changed, 13 insertions, 5 deletions
diff --git a/composer/ChangeLog b/composer/ChangeLog index 470b047e92..21ba431d19 100644 --- a/composer/ChangeLog +++ b/composer/ChangeLog @@ -1,3 +1,10 @@ +2007-06-18 Srinivasa Ragavan <sragavan@novell.com> + + ** Fix for bug #444107 + + * e-msg-composer.c: (drop_action), (drop_popup_copy), + (drop_popup_move), (drag_data_received): + 2007-06-01 Srinivasa Ragavan <sragavan@novell.com> ** Fix for bug #315012 from Pascal Terjan diff --git a/composer/e-msg-composer.c b/composer/e-msg-composer.c index ea18272b1b..840b6d6f17 100644 --- a/composer/e-msg-composer.c +++ b/composer/e-msg-composer.c @@ -2975,7 +2975,7 @@ attachment_guess_mime_type (const char *file_name) } static void -drop_action(EMsgComposer *composer, GdkDragContext *context, guint32 action, GtkSelectionData *selection, guint info, guint time) +drop_action(EMsgComposer *composer, GdkDragContext *context, guint32 action, GtkSelectionData *selection, guint info, guint time, gboolean html_dnd) { char *tmp, *str, **urls, *type; CamelMimePart *mime_part; @@ -3029,7 +3029,7 @@ drop_action(EMsgComposer *composer, GdkDragContext *context, guint32 action, Gtk if (!g_ascii_strcasecmp (url->protocol, "file")) { type = attachment_guess_mime_type (str); - if (strncmp (type, "image", 5) || (!p->send_html && !strncmp (type, "image", 5))) + if (strncmp (type, "image", 5) || !html_dnd || (!p->send_html && !strncmp (type, "image", 5))) e_attachment_bar_attach (E_ATTACHMENT_BAR (p->attachment_bar), url->path, "attachment"); } else { @@ -3163,14 +3163,14 @@ static void drop_popup_copy(EPopup *ep, EPopupItem *item, void *data) { struct _drop_data *m = data; - drop_action(m->composer, m->context, GDK_ACTION_COPY, m->selection, m->info, m->time); + drop_action(m->composer, m->context, GDK_ACTION_COPY, m->selection, m->info, m->time, FALSE); } static void drop_popup_move(EPopup *ep, EPopupItem *item, void *data) { struct _drop_data *m = data; - drop_action(m->composer, m->context, GDK_ACTION_MOVE, m->selection, m->info, m->time); + drop_action(m->composer, m->context, GDK_ACTION_MOVE, m->selection, m->info, m->time, FALSE); } static void @@ -3238,10 +3238,11 @@ drag_data_received (GtkWidget *w, GdkDragContext *context, menu = e_popup_create_menu_once((EPopup *)emp, NULL, 0); gtk_menu_popup(menu, NULL, NULL, NULL, NULL, 0, time); } else { - drop_action(composer, context, context->action, selection, info, time); + drop_action(composer, context, context->action, selection, info, time, w != composer); } } + static gboolean drag_motion(GObject *o, GdkDragContext *context, gint x, gint y, guint time, EMsgComposer *composer) { |