summaryrefslogtreecommitdiff
path: root/src/nautilus-location-bar.c
diff options
context:
space:
mode:
authorDarin Adler <darin@src.gnome.org>2000-09-20 17:33:41 +0000
committerDarin Adler <darin@src.gnome.org>2000-09-20 17:33:41 +0000
commit934761a713f49861fe7e74d15263066197f39b36 (patch)
tree7ac45a4568911f5df33d44499a1fae8a9c7e0ef0 /src/nautilus-location-bar.c
parent34347bcea4310e626629df2feada8ae04209e0a6 (diff)
downloadnautilus-934761a713f49861fe7e74d15263066197f39b36.tar.gz
Fixed bug that happens when you drag the "Location:" part of the location
* src/nautilus-location-bar.c: (drag_data_received_callback), (drag_data_get_callback): Fixed bug that happens when you drag the "Location:" part of the location bar. I still think the feature is of questionable value, but it was easy to fix it to keep it working. The bug resulted from making assumptions about the widget hierarchy.
Diffstat (limited to 'src/nautilus-location-bar.c')
-rw-r--r--src/nautilus-location-bar.c11
1 files changed, 8 insertions, 3 deletions
diff --git a/src/nautilus-location-bar.c b/src/nautilus-location-bar.c
index 8ed760a06..373bf5fd1 100644
--- a/src/nautilus-location-bar.c
+++ b/src/nautilus-location-bar.c
@@ -102,7 +102,8 @@ drag_data_received_callback (GtkWidget *widget,
int y,
GtkSelectionData *data,
guint info,
- guint32 time)
+ guint32 time,
+ gpointer callback_data)
{
GList *names, *node;
NautilusApplication *application;
@@ -113,6 +114,7 @@ drag_data_received_callback (GtkWidget *widget,
g_assert (NAUTILUS_IS_LOCATION_BAR (widget));
g_assert (data != NULL);
+ g_assert (callback_data == NULL);
names = gnome_uri_list_extract_uris (data->data);
@@ -170,13 +172,16 @@ drag_data_get_callback (GtkWidget *widget,
GdkDragContext *context,
GtkSelectionData *selection_data,
guint info,
- guint32 time)
+ guint32 time,
+ gpointer callback_data)
{
+ NautilusNavigationBar *bar;
char *entry_text;
g_assert (selection_data != NULL);
+ bar = NAUTILUS_NAVIGATION_BAR (callback_data);
- entry_text = nautilus_navigation_bar_get_location (NAUTILUS_NAVIGATION_BAR (widget->parent));
+ entry_text = nautilus_navigation_bar_get_location (bar);
switch (info) {
case NAUTILUS_DND_URI_LIST: