mifr/subsurface
1
0
Fork 0
mirror of https://github.com/subsurface/subsurface.git synced 2025-02-19 22:16:15 +00:00
Code Issues Projects Releases Packages Wiki Activity

Use the correct signal to avoid Gtk-CRITICAL error message

Browse source 
We used the wrong signal - "data-drag-received" is intended to check
whether the target will accept the drop. What we want is the "drag-drop"
signal which tells the widget that something was dropped on it.

Also fix an embarrassing lack of NULL pointer checks in my string
comparisons...

Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
This commit is contained in:
Dirk Hohndel 2011-09-27 17:03:15 -07:00
parent f4d50ffa3b
commit fda230235c
1 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
gtk-gui.c
View file

@ -524,9 +524,9 @@ static void drag_cb(GtkWidget *widget, GdkDragContext *context,
* this all to figure out which window we're talking about.
*/
source = gtk_drag_get_source_widget(context);
if (! strcmp(nbd[0].name,gtk_widget_get_name(source)))
if (nbd[0].name && ! strcmp(nbd[0].name,gtk_widget_get_name(source)))
nbdp = nbd;
else if (! strcmp(nbd[1].name,gtk_widget_get_name(source)))
else if (nbd[1].name && ! strcmp(nbd[1].name,gtk_widget_get_name(source)))
nbdp = nbd + 1;
else
/* HU? */
@ -601,7 +601,7 @@ void init_ui(int argc, char **argv)
gtk_notebook_set_group_name(GTK_NOTEBOOK(notebook), notebook_name);
g_signal_connect(notebook, "create-window", G_CALLBACK(create_new_notebook_window), NULL);
gtk_drag_dest_set(notebook, GTK_DEST_DEFAULT_ALL, &notebook_target, 1, GDK_ACTION_MOVE);
g_signal_connect(notebook, "drag-data-received", G_CALLBACK(drag_cb), notebook);
g_signal_connect(notebook, "drag-drop", G_CALLBACK(drag_cb), notebook);
g_signal_connect(notebook, "switch-page", G_CALLBACK(switch_page), NULL);
/* Create the actual divelist */