When manually creating a track, automatically give it a default name.

[andy/viking.git] / src / clipboard.c

diff --git a/src/clipboard.c b/src/clipboard.c
index 88521a72b3a824df8e8d8d61686e9cb19844fc3a..3a6f4910ea6707135525204d91601b0738d1c298 100644 (file)
--- a/src/clipboard.c
+++ b/src/clipboard.c
@@ -23,7 +23,6 @@
 #include "config.h"
 #endif
 
 #include "config.h"
 #endif
 

-#include <stdio.h>

 #include <string.h>
 #include <stdlib.h>
 #ifdef HAVE_SYS_TYPES_H
 #include <string.h>
 #include <stdlib.h>
 #ifdef HAVE_SYS_TYPES_H


@@ -111,7 +110,7 @@ static void clip_receive_viking ( GtkClipboard *c, GtkSelectionData *sd, gpointe
     }
     else
       a_dialog_error_msg_extra ( VIK_GTK_WINDOW_FROM_WIDGET(GTK_WIDGET(vlp)),
     }
     else
       a_dialog_error_msg_extra ( VIK_GTK_WINDOW_FROM_WIDGET(GTK_WIDGET(vlp)),

-                                _("The clipboard contains sublayer data for a %s layers."
+                                _("The clipboard contains sublayer data for %s layers. "

                                   "You must select a layer of this type to paste the clipboard data."),
                                 vik_layer_get_interface(vc->layer_type)->name );
   }
                                   "You must select a layer of this type to paste the clipboard data."),
                                 vik_layer_get_interface(vc->layer_type)->name );
   }


@@ -322,10 +321,10 @@ void a_clipboard_copy_selected ( VikLayersPanel *vlp )
     return;
 
   vik_treeview_get_selected_iter ( sel->vt, &iter );
     return;
 
   vik_treeview_get_selected_iter ( sel->vt, &iter );

+  layer_type = sel->type;

 
   if ( vik_treeview_item_get_type ( sel->vt, &iter ) == VIK_TREEVIEW_TYPE_SUBLAYER ) {
     type = VIK_CLIPBOARD_DATA_SUBLAYER;
 
   if ( vik_treeview_item_get_type ( sel->vt, &iter ) == VIK_TREEVIEW_TYPE_SUBLAYER ) {
     type = VIK_CLIPBOARD_DATA_SUBLAYER;

-    layer_type = sel->type;

     if ( vik_layer_get_interface(layer_type)->copy_item) {
       subtype = vik_treeview_item_get_data(sel->vt, &iter);
       vik_layer_get_interface(layer_type)->copy_item(sel, subtype, vik_treeview_item_get_pointer(sel->vt, &iter), &data, &len );
     if ( vik_layer_get_interface(layer_type)->copy_item) {
       subtype = vik_treeview_item_get_data(sel->vt, &iter);
       vik_layer_get_interface(layer_type)->copy_item(sel, subtype, vik_treeview_item_get_pointer(sel->vt, &iter), &data, &len );