X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=gtk-gui.c;h=c78d7e6677feeadabf850c738f2450dfc5132884;hb=b5abdd46f0dfedacc248c1d96737f96e65bb9ed1;hp=676c0d063a4d1356d60e32c48d125c7aa79bb18a;hpb=e4bfb6597279ca3d9aa3678a617f5f0aef298278;p=ext%2Fsubsurface.git

diff --git a/gtk-gui.c b/gtk-gui.c
index 676c0d0..c78d7e6 100644
--- a/gtk-gui.c
+++ b/gtk-gui.c
@@ -694,23 +694,21 @@ static GtkNotebook *create_new_notebook_window(GtkNotebook *source,
 	return GTK_NOTEBOOK(notebook);
 }
 
-static void drag_cb(GtkWidget *widget, GdkDragContext *context,
+static gboolean drag_cb(GtkWidget *widget, GdkDragContext *context,
 	gint x, gint y, guint time,
 	gpointer user_data)
 {
 	GtkWidget *source;
 	notebook_data_t *nbdp;
 
+	gtk_drag_finish(context, TRUE, TRUE, time);
 	source = gtk_drag_get_source_widget(context);
 	if (nbd[0].name && ! strcmp(nbd[0].name,gtk_widget_get_name(source)))
 		nbdp = nbd;
 	else if (nbd[1].name && ! strcmp(nbd[1].name,gtk_widget_get_name(source)))
 		nbdp = nbd + 1;
-	else
-		/* HU? */
-		return;
-
-	gtk_drag_finish(context, TRUE, TRUE, time);
+	else /* just on ourselves */
+		return TRUE;
 
 	/* we no longer need the widget - but getting rid of this is hard;
 	 * remove the signal handler, remove the notebook from the box
@@ -722,6 +720,8 @@ static void drag_cb(GtkWidget *widget, GdkDragContext *context,
 	nbdp->widget = NULL;
 	free(nbdp->name);
 	nbdp->name = NULL;
+
+	return TRUE;
 }
 
 #ifdef WIN32
@@ -746,6 +746,7 @@ void init_ui(int *argcp, char ***argvp)
 	GtkWidget *dive_info;
 	GtkWidget *dive_list;
 	GtkWidget *equipment;
+	GtkWidget *stats;
 	GtkWidget *menubar;
 	GtkWidget *vbox;
 	GdkScreen *screen;
@@ -875,6 +876,10 @@ void init_ui(int *argcp, char ***argvp)
 	equipment = equipment_widget();
 	gtk_notebook_append_page(GTK_NOTEBOOK(notebook), equipment, gtk_label_new("Equipment"));
 
+	/* Frame for dive statistics */
+	stats = stats_widget();
+	gtk_notebook_append_page(GTK_NOTEBOOK(notebook), stats, gtk_label_new("Info & Stats"));
+
 	gtk_widget_set_app_paintable(win, TRUE);
 	gtk_widget_show_all(win);