* src/folderview.[ch]

* src/summaryview.[ch]
* src/mimeview.[ch]
	plug DnD leaks

diff --git a/ChangeLog.claws b/ChangeLog.claws
index c2c0130b9e1669b1f068379cce56017d186cdf60..3db0ce84a458c6b98d3c2c63d9c5ada8691eb843 100644 (file)
--- a/ChangeLog.claws
+++ b/ChangeLog.claws
@@ -1,3 +1,10 @@
+2003-07-17 [alfons]    0.9.3claws15
+
+       * src/folderview.[ch]
+       * src/summaryview.[ch]
+       * src/mimeview.[ch]
+               plug DnD leaks 
+
 2003-07-17 [paul]      0.9.3claws14
 
        * src/inc.c

diff --git a/configure.ac b/configure.ac
index 1a16fbafd884f4437ff49ce80db95c07943cb2c5..758768b756cedb66e05335526f43fc6998e3994a 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -11,7 +11,7 @@ MINOR_VERSION=9
 MICRO_VERSION=3
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=claws14
+EXTRA_VERSION=claws15
 VERSION=$MAJOR_VERSION.$MINOR_VERSION.$MICRO_VERSION$EXTRA_VERSION
 
 dnl set $target

diff --git a/src/folderview.c b/src/folderview.c
index d15392208ebe8bd41316d33caa2005b3dc7e8542..b4973d2f66a08747e60afb5a8f549eafec034af5 100644 (file)
--- a/src/folderview.c
+++ b/src/folderview.c
@@ -352,6 +352,10 @@ static GtkItemFactoryEntry folderview_news_popup_entries[] =
        {N_("/S_coring..."),            NULL, folderview_scoring_cb, 0, NULL}
 };
 
+GtkTargetEntry folderview_drag_types[] =
+{
+       {"text/plain", GTK_TARGET_SAME_APP, TARGET_DUMMY}
+};
 
 FolderView *folderview_create(void)
 {
@@ -486,10 +490,9 @@ FolderView *folderview_create(void)
                           folderview);
 
         /* drop callback */
-       gtk_drag_dest_set(ctree, GTK_DEST_DEFAULT_ALL &
-                         ~GTK_DEST_DEFAULT_HIGHLIGHT,
+       gtk_drag_dest_set(ctree, GTK_DEST_DEFAULT_ALL & ~GTK_DEST_DEFAULT_HIGHLIGHT,
                          summary_drag_types, 1,
-                         GDK_ACTION_MOVE|GDK_ACTION_COPY|GDK_ACTION_DEFAULT);
+                         GDK_ACTION_MOVE | GDK_ACTION_COPY | GDK_ACTION_DEFAULT);
        gtk_signal_connect(GTK_OBJECT(ctree), "drag_motion",
                           GTK_SIGNAL_FUNC(folderview_drag_motion_cb),
                           folderview);
@@ -518,6 +521,7 @@ FolderView *folderview_create(void)
 
        gtk_widget_show_all(scrolledwin);
 
+       folderview->target_list = gtk_target_list_new(folderview_drag_types, 1);
        folderview_list = g_list_append(folderview_list, folderview);
 
        return folderview;
@@ -2799,26 +2803,17 @@ void folderview_reflect_prefs_pixmap_theme(FolderView *folderview)
        folderview_set_all();
 }
 
-GtkTargetEntry folderview_drag_types[1] =
-{
-       {"text/plain", GTK_TARGET_SAME_APP, TARGET_DUMMY}
-};
-
-
 static void folderview_start_drag(GtkWidget *widget, gint button, GdkEvent *event,
                                  FolderView       *folderview)
 {
-       GtkTargetList *list;
        GdkDragContext *context;
 
        g_return_if_fail(folderview != NULL);
        if (folderview->selected == NULL) return;
 
-       list = gtk_target_list_new(folderview_drag_types, 1);
-
        folderview->nodes_to_recollapse = NULL; /* in case the last drag has been cancelled */
        
-       context = gtk_drag_begin(widget, list,
+       context = gtk_drag_begin(widget, folderview->target_list,
                                 GDK_ACTION_MOVE|GDK_ACTION_COPY|GDK_ACTION_DEFAULT, button, event);
        gtk_drag_set_icon_default(context);
 }

diff --git a/src/folderview.h b/src/folderview.h
index bfec50a05ac1b84cf636072aab4d93d09e8b6bbf..530e113c9c736d55f329f317120feacf495ad10b 100644 (file)
--- a/src/folderview.h
+++ b/src/folderview.h
@@ -61,6 +61,7 @@ struct _FolderView
        
        /* for drag and drop */
        GSList *nodes_to_recollapse;
+       GtkTargetList *target_list; /* DnD */
 };
 
 FolderView *folderview_create          (void);

diff --git a/src/mimeview.c b/src/mimeview.c
index 95cb33f8287bbee2a33189bc14a633478a56901f..eee0f61b0744c7f306d90fa141df9dd82bd14858 100644 (file)
--- a/src/mimeview.c
+++ b/src/mimeview.c
@@ -228,6 +228,8 @@ MimeView *mimeview_create(MainWindow *mainwin)
        mimeview->popupfactory  = popupfactory;
        mimeview->type          = -1;
 
+       mimeview->target_list   = gtk_target_list_new(mimeview_mime_types, 1); 
+       
        mimeviews = g_slist_prepend(mimeviews, mimeview);
 
        return mimeview;
@@ -362,6 +364,7 @@ void mimeview_destroy(MimeView *mimeview)
                viewer->destroy_viewer(viewer);
        }
        g_slist_free(mimeview->viewers);
+       gtk_target_list_unref(mimeview->target_list);
 
        procmime_mimeinfo_free_all(mimeview->mimeinfo);
        g_free(mimeview->file);
@@ -682,7 +685,6 @@ static void mimeview_selected(GtkCTree *ctree, GtkCTreeNode *node, gint column,
 static void mimeview_start_drag(GtkWidget *widget, gint button,
                                GdkEvent *event, MimeView *mimeview)
 {
-       GtkTargetList *list;
        GdkDragContext *context;
        MimeInfo *partinfo;
 
@@ -691,8 +693,7 @@ static void mimeview_start_drag(GtkWidget *widget, gint button,
        partinfo = mimeview_get_selected_part(mimeview);
        if (partinfo->filename == NULL && partinfo->name == NULL) return;
 
-       list = gtk_target_list_new(mimeview_mime_types, 1);
-       context = gtk_drag_begin(widget, list,
+       context = gtk_drag_begin(widget, mimeview->target_list,
                                 GDK_ACTION_COPY, button, event);
        gtk_drag_set_icon_default(context);
 }

diff --git a/src/mimeview.h b/src/mimeview.h
index 6420950b37a34a7189ea7b6032eb65a0960cace7..997c5c772376ab73282883f882443006d228ce87 100644 (file)
--- a/src/mimeview.h
+++ b/src/mimeview.h
@@ -70,6 +70,8 @@ struct _MimeView
        gchar *file;
 
        GSList *viewers;
+
+       GtkTargetList *target_list; /* DnD */
 };
 
 struct _MimeViewerFactory

diff --git a/src/summaryview.c b/src/summaryview.c
index 82637311bb79c7b16d0dd52b9f3290bb9e061650..6c3558cfd09e2b9ce4059e7aff43bcd9f6072a32 100644 (file)
--- a/src/summaryview.c
+++ b/src/summaryview.c
@@ -709,6 +709,8 @@ SummaryView *summary_create(void)
        summaryview->msginfo_update_callback_id =
                hooks_register_hook(MSGINFO_UPDATE_HOOKLIST, summary_update_msg, (gpointer) summaryview);
 
+       summaryview->target_list = gtk_target_list_new(summary_drag_types, 1);
+
        /* CLAWS: need this to get the SummaryView * from
         * the CList */
        gtk_object_set_data(GTK_OBJECT(ctree), "summaryview", (gpointer)summaryview); 
@@ -4836,7 +4838,6 @@ static void summary_locked_clicked(GtkWidget *button,
 static void summary_start_drag(GtkWidget *widget, gint button, GdkEvent *event,
                               SummaryView *summaryview)
 {
-       GtkTargetList *list;
        GdkDragContext *context;
 
        g_return_if_fail(summaryview != NULL);
@@ -4844,9 +4845,7 @@ static void summary_start_drag(GtkWidget *widget, gint button, GdkEvent *event,
        g_return_if_fail(summaryview->folder_item->folder != NULL);
        if (summaryview->selected == NULL) return;
 
-       list = gtk_target_list_new(summary_drag_types, 1);
-
-       context = gtk_drag_begin(widget, list,
+       context = gtk_drag_begin(widget, summaryview->target_list,
                                 GDK_ACTION_MOVE|GDK_ACTION_COPY|GDK_ACTION_DEFAULT, button, event);
        gtk_drag_set_icon_default(context);
 }

diff --git a/src/summaryview.h b/src/summaryview.h
index d0b35a71cbbf864da67e1b046dbcb9f57d0b1d95..d3d2d5b6cbe016eb0470755abcd5ce8102f2cce0 100644 (file)
--- a/src/summaryview.h
+++ b/src/summaryview.h
@@ -165,6 +165,8 @@ private:
        /* list for moving/deleting messages */
        GSList *mlist;
        int msginfo_update_callback_id;
+
+       GtkTargetList *target_list; /* DnD */
 };
 
 SummaryView    *summary_create(void);