default dran and drop behaviour

[Darko Obradovic <dobradovic gmx de>]

A few months ago we had the discussion about the default drag and drop  
behaviour and the corresponding balsa-option. As far as I interpreted  
the HIG, it points towards using "Move" as default for balsa's  
situation, the option was there to comfort balsa-1.4-users. where it  
was just the other way round.

Attached is a patch against 2.0.14 which cleanly removes the pref for  
that and hardcodes "Move" as default. To copy things you have to press  
CTRL, so it's no regression this time.

Darko Obradovic
diff -ruN balsa-2.0.14/src/balsa-app.c balsa-2.0.14-move_hardcoded/src/balsa-app.c
--- balsa-2.0.14/src/balsa-app.c	2003-07-16 09:18:01.000000000 +0200
+++ balsa-2.0.14-move_hardcoded/src/balsa-app.c	2003-09-11 14:15:34.000000000 +0200
@@ -445,7 +445,6 @@
     /* Message filing */
     balsa_app.folder_mru=NULL;
     balsa_app.fcc_mru=NULL;
-    balsa_app.drag_default_is_move=TRUE;
 
     /* Mailbox views */
     balsa_app.mailbox_views =
diff -ruN balsa-2.0.14/src/balsa-app.h balsa-2.0.14-move_hardcoded/src/balsa-app.h
--- balsa-2.0.14/src/balsa-app.h	2003-07-27 20:25:29.000000000 +0200
+++ balsa-2.0.14-move_hardcoded/src/balsa-app.h	2003-09-11 14:07:21.000000000 +0200
@@ -383,7 +383,6 @@
 
     GList *folder_mru;
     GList *fcc_mru;
-    gint drag_default_is_move;
     gboolean delete_immediately;
     gboolean hide_deleted;
 
diff -ruN balsa-2.0.14/src/balsa-mblist.c balsa-2.0.14-move_hardcoded/src/balsa-mblist.c
--- balsa-2.0.14/src/balsa-mblist.c	2003-07-18 10:06:28.000000000 +0200
+++ balsa-2.0.14-move_hardcoded/src/balsa-mblist.c	2003-09-11 14:18:00.000000000 +0200
@@ -305,11 +305,10 @@
                                     GTK_TREE_VIEW_DROP_INTO_OR_BEFORE);
     gtk_tree_path_free(path);
 
-    if (balsa_app.drag_default_is_move)
-        gdk_drag_status(context,
-                        (context->actions ==
-                         GDK_ACTION_COPY) ? GDK_ACTION_COPY :
-                        GDK_ACTION_MOVE, time);
+    gdk_drag_status(context,
+                    (context->actions ==
+                     GDK_ACTION_COPY) ? GDK_ACTION_COPY :
+                    GDK_ACTION_MOVE, time);
 
     return (ret_val && can_drop);
 }
diff -ruN balsa-2.0.14/src/main-window.c balsa-2.0.14-move_hardcoded/src/main-window.c
--- balsa-2.0.14/src/main-window.c	2003-08-07 15:14:33.000000000 +0200
+++ balsa-2.0.14-move_hardcoded/src/main-window.c	2003-09-11 14:18:14.000000000 +0200
@@ -3251,11 +3251,11 @@
 notebook_drag_motion_cb(GtkWidget * widget, GdkDragContext * context,
                         gint x, gint y, guint time, gpointer user_data)
 {
-    if (balsa_app.drag_default_is_move)
-        gdk_drag_status(context,
-                        (context->actions ==
-                         GDK_ACTION_COPY) ? GDK_ACTION_COPY :
-                        GDK_ACTION_MOVE, time);
+    gdk_drag_status(context,
+                    (context->actions ==
+                     GDK_ACTION_COPY) ? GDK_ACTION_COPY :
+                    GDK_ACTION_MOVE, time);
+
     return FALSE;
 }
 
diff -ruN balsa-2.0.14/src/pref-manager.c balsa-2.0.14-move_hardcoded/src/pref-manager.c
--- balsa-2.0.14/src/pref-manager.c	2003-07-27 20:25:29.000000000 +0200
+++ balsa-2.0.14-move_hardcoded/src/pref-manager.c	2003-09-11 14:04:33.000000000 +0200
@@ -84,7 +84,6 @@
     GtkWidget *close_mailbox_minutes;
     GtkWidget *commit_mailbox_auto;
     GtkWidget *commit_mailbox_minutes;
-    GtkWidget *drag_default_is_move;
     GtkWidget *delete_immediately;
     GtkWidget *hide_deleted;
 
@@ -523,9 +522,6 @@
     g_signal_connect(G_OBJECT(pui->commit_mailbox_minutes), "changed",
 		     G_CALLBACK(mailbox_commit_timer_modified_cb), property_box);
 
-    g_signal_connect(G_OBJECT(pui->drag_default_is_move), "toggled",
-		     G_CALLBACK(properties_modified_cb), property_box);
-
     g_signal_connect(G_OBJECT(pui->delete_immediately), "toggled",
 		     G_CALLBACK(properties_modified_cb), property_box);
     g_signal_connect(G_OBJECT(pui->hide_deleted), "toggled",
@@ -805,8 +801,6 @@
     balsa_app.commit_mailbox_timeout =
 	gtk_spin_button_get_value_as_int(GTK_SPIN_BUTTON
 					 (pui->commit_mailbox_minutes)) * 60;
-    balsa_app.drag_default_is_move =
-	GTK_TOGGLE_BUTTON(pui->drag_default_is_move)->active;
     balsa_app.delete_immediately =
         gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON
                                      (pui->delete_immediately));
@@ -1067,8 +1061,6 @@
 				 balsa_app.commit_mailbox_auto);
     gtk_spin_button_set_value(GTK_SPIN_BUTTON(pui->commit_mailbox_minutes),
 			      (float) balsa_app.commit_mailbox_timeout / 60);
-    gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(pui->drag_default_is_move),
-				 balsa_app.drag_default_is_move);
 
     gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON
                                  (pui->delete_immediately),
@@ -2540,10 +2532,6 @@
     label2 = gtk_label_new(_("minutes"));
     gtk_box_pack_start(GTK_BOX(hbox2), label2, FALSE, TRUE, 0);
 
-    pui->drag_default_is_move =
-        pm_group_add_check(group, _("Drag-and-drop moves "
-                                    "messages by default"));
-
     return group;
 }
 
diff -ruN balsa-2.0.14/src/save-restore.c balsa-2.0.14-move_hardcoded/src/save-restore.c
--- balsa-2.0.14/src/save-restore.c	2003-07-27 20:25:30.000000000 +0200
+++ balsa-2.0.14-move_hardcoded/src/save-restore.c	2003-09-11 14:45:52.000000000 +0200
@@ -744,7 +744,6 @@
 
     /* ... Progress Window Dialog */
     balsa_app.pwindow_option = d_get_gint("ProgressWindow", WHILERETR);
-    balsa_app.drag_default_is_move = d_get_gint("DragDefaultIsMove", 0);
     balsa_app.delete_immediately =
         gnome_config_get_bool("DeleteImmediately=false");
     balsa_app.hide_deleted =
@@ -1116,7 +1115,6 @@
     gnome_config_set_bool("MsgSizeAsLines", balsa_app.line_length);
     gnome_config_set_bool("PageDownMod", balsa_app.pgdownmod);
     gnome_config_set_int("PageDownPercent", balsa_app.pgdown_percent);
-    gnome_config_set_int("DragDefaultIsMove", balsa_app.drag_default_is_move);
     gnome_config_set_bool("DeleteImmediately",
                           balsa_app.delete_immediately);
     gnome_config_set_bool("HideDeleted",

PGP signature