diff options
| author | Darin Adler <darin@src.gnome.org> | 2000-09-20 17:33:41 +0000 |
|---|---|---|
| committer | Darin Adler <darin@src.gnome.org> | 2000-09-20 17:33:41 +0000 |
| commit | 934761a713f49861fe7e74d15263066197f39b36 (patch) | |
| tree | 7ac45a4568911f5df33d44499a1fae8a9c7e0ef0 | |
| parent | 34347bcea4310e626629df2feada8ae04209e0a6 (diff) | |
| download | nautilus-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.
| -rw-r--r-- | ChangeLog | 9 | ||||
| -rw-r--r-- | src/nautilus-location-bar.c | 11 |
2 files changed, 17 insertions, 3 deletions
@@ -1,5 +1,14 @@ 2000-09-20 Darin Adler <darin@eazel.com> + * 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. + +2000-09-20 Darin Adler <darin@eazel.com> + Fixed bug that was preventing Show Properties from working. * libnautilus-extensions/nautilus-icon-factory.c: (cache_icon_new): 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: |