2012-01-20 [pawel] 3.8.0cvs15

[claws.git] / src / mimeview.c

diff --git a/src/mimeview.c b/src/mimeview.c
index e706fd2ce47b043e44877c5248614dba15977d7d..0ab2c887e0f76dc112e0fc9e77accb84bb76c383 100644 (file)
--- a/src/mimeview.c
+++ b/src/mimeview.c
@@ -89,10 +89,6 @@ static gboolean mimeview_write_part          (const gchar    *filename,
 
 static void mimeview_selected          (GtkTreeSelection       *selection,
                                         MimeView       *mimeview);
-static void mimeview_start_drag        (GtkWidget      *widget,
-                                        gint            button,
-                                        GdkEvent       *event,
-                                        MimeView       *mimeview);
 static gint mimeview_button_pressed    (GtkWidget      *widget,
                                         GdkEventButton *event,
                                         MimeView       *mimeview);
@@ -337,16 +333,16 @@ MimeView *mimeview_create(MainWindow *mainwin)
 
        gtk_widget_show(ctree);
        gtk_container_add(GTK_CONTAINER(scrolledwin), ctree);
+       gtk_drag_source_set(ctree, GDK_BUTTON1_MASK|GDK_BUTTON3_MASK, 
+                           mimeview_mime_types, 1, GDK_ACTION_COPY);
 
        g_signal_connect(G_OBJECT(selection), "changed",
                         G_CALLBACK(mimeview_selected), mimeview);
-       g_signal_connect(G_OBJECT(ctree), "button-release-event",
+       g_signal_connect(G_OBJECT(ctree), "button_release_event",
                         G_CALLBACK(mimeview_button_pressed), mimeview);
-       g_signal_connect(G_OBJECT(ctree), "key-press-event",
+       g_signal_connect(G_OBJECT(ctree), "key_press_event",
                         G_CALLBACK(mimeview_key_pressed), mimeview);
-       g_signal_connect(G_OBJECT (ctree),"drag-begin",
-                        G_CALLBACK (mimeview_start_drag), mimeview);
-       g_signal_connect(G_OBJECT(ctree), "drag-data-get",
+       g_signal_connect(G_OBJECT(ctree), "drag_data_get",
                         G_CALLBACK(mimeview_drag_data_get), mimeview);
 
        mime_notebook = gtk_notebook_new();
@@ -1449,24 +1445,6 @@ static void mimeview_selected(GtkTreeSelection *selection, MimeView *mimeview)
        }
 }
 
-static void mimeview_start_drag(GtkWidget *widget, gint button,
-                               GdkEvent *event, MimeView *mimeview)
-{
-       GdkDragContext *context;
-       MimeInfo *partinfo;
-
-       cm_return_if_fail(mimeview != NULL);
-
-       partinfo = mimeview_get_selected_part(mimeview);
-       if (partinfo == NULL || 
-           partinfo->disposition == DISPOSITIONTYPE_INLINE)
-               return;
-
-       context = gtk_drag_begin(widget, mimeview->target_list,
-                                GDK_ACTION_COPY, button, event);
-       gtk_drag_set_icon_default(context);
-}
-
 static gint mimeview_button_pressed(GtkWidget *widget, GdkEventButton *event,
                                    MimeView *mimeview)
 {