From 4bba151bdacd27a193c100cf771144b7d2501548 Mon Sep 17 00:00:00 2001 From: Cosimo Cecchi Date: Fri, 11 Jun 2010 13:21:31 +0200 Subject: [PATCH 058/249] [src] GSEAL nautilus-location-bar. --- src/nautilus-location-bar.c | 14 +++++++++----- 1 files changed, 9 insertions(+), 5 deletions(-) diff --git a/src/nautilus-location-bar.c b/src/nautilus-location-bar.c index ca57e3d..6478018 100644 --- a/src/nautilus-location-bar.c +++ b/src/nautilus-location-bar.c @@ -126,7 +126,7 @@ drag_data_received_callback (GtkWidget *widget, g_assert (data != NULL); g_assert (callback_data == NULL); - names = g_uri_list_extract_uris (data->data); + names = g_uri_list_extract_uris (gtk_selection_data_get_data (data)); if (names == NULL || *names == NULL) { g_warning ("No D&D URI's"); @@ -213,7 +213,7 @@ drag_data_get_callback (GtkWidget *widget, case NAUTILUS_DND_URI_LIST: case NAUTILUS_DND_TEXT_PLAIN: gtk_selection_data_set (selection_data, - selection_data->target, + gtk_selection_data_get_target (selection_data), 8, (guchar *) entry_text, eel_strlen (entry_text)); break; @@ -234,6 +234,7 @@ style_set_handler (GtkWidget *widget, GtkStyle *previous_style) { PangoLayout *layout; int width, width2; + int xpad; layout = gtk_label_get_layout (GTK_LABEL(widget)); @@ -246,7 +247,10 @@ style_set_handler (GtkWidget *widget, GtkStyle *previous_style) pango_layout_get_pixel_size (layout, &width2, NULL); width = MAX (width, width2); - width += 2 * GTK_MISC (widget)->xpad; + gtk_misc_get_padding (GTK_MISC (widget), + &xpad, NULL); + + width += 2 * xpad; gtk_widget_set_size_request (widget, width, -1); @@ -266,10 +270,10 @@ label_button_pressed_callback (GtkWidget *widget, return FALSE; } - window = nautilus_location_bar_get_window (widget->parent); + window = nautilus_location_bar_get_window (gtk_widget_get_parent (widget)); slot = NAUTILUS_WINDOW (window)->details->active_pane->active_slot; view = slot->content_view; - label = GTK_BIN (widget)->child; + label = gtk_bin_get_child (GTK_BIN (widget)); /* only pop-up if the URI in the entry matches the displayed location */ if (view == NULL || strcmp (gtk_label_get_text (GTK_LABEL (label)), LOCATION_LABEL)) { -- 1.7.2