Commit ae8e78ba authored by William Jon McCann's avatar William Jon McCann

Fix some compiler warnings

parent 8feb0228
......@@ -4380,7 +4380,6 @@ nautilus_file_get_date_as_string (NautilusFile *file, NautilusDateType date_type
time_t file_time_raw;
const char *format;
char *result = NULL;
int i;
GDateTime *date_time, *today;
int y, m, d;
int y_now, m_now, d_now;
......
......@@ -608,7 +608,7 @@ compute_text_rectangle (const NautilusIconCanvasItem *item,
{
EelIRect text_rectangle;
double pixels_per_unit;
double text_width, text_height, text_height_for_layout, text_height_for_entire_text, real_text_height, text_dx;
double text_width, text_height, text_height_for_layout, text_height_for_entire_text, real_text_height;
pixels_per_unit = EEL_CANVAS_ITEM (item)->canvas->pixels_per_unit;
if (canvas_coords) {
......@@ -616,13 +616,11 @@ compute_text_rectangle (const NautilusIconCanvasItem *item,
text_height = item->details->text_height;
text_height_for_layout = item->details->text_height_for_layout;
text_height_for_entire_text = item->details->text_height_for_entire_text;
text_dx = item->details->text_dx;
} else {
text_width = item->details->text_width / pixels_per_unit;
text_height = item->details->text_height / pixels_per_unit;
text_height_for_layout = item->details->text_height_for_layout / pixels_per_unit;
text_height_for_entire_text = item->details->text_height_for_entire_text / pixels_per_unit;
text_dx = item->details->text_dx / pixels_per_unit;
}
text_rectangle.x0 = (icon_rectangle.x0 + icon_rectangle.x1) / 2 - (int) text_width / 2;
......@@ -800,12 +798,7 @@ static void
prepare_pango_layout_for_measure_entire_text (NautilusIconCanvasItem *item,
PangoLayout *layout)
{
NautilusIconContainer *container;
prepare_pango_layout_width (item, layout);
container = NAUTILUS_ICON_CONTAINER (EEL_CANVAS_ITEM (item)->canvas);
pango_layout_set_height (layout, G_MININT);
}
......@@ -1983,10 +1976,8 @@ double
nautilus_icon_canvas_item_get_max_text_width (NautilusIconCanvasItem *item)
{
EelCanvasItem *canvas_item;
NautilusIconContainer *container;
canvas_item = EEL_CANVAS_ITEM (item);
container = NAUTILUS_ICON_CONTAINER (canvas_item->canvas);
return MAX_TEXT_WIDTH_STANDARD * canvas_item->canvas->pixels_per_unit;
}
......
......@@ -1244,12 +1244,10 @@ lay_down_icons_horizontal (NautilusIconContainer *container,
IconPositions *position;
EelDRect bounds;
EelDRect icon_bounds;
EelDRect text_bounds;
double max_height_above, max_height_below;
double height_above, height_below;
double line_width;
double grid_width;
double max_text_width, max_icon_width;
int icon_width;
int i;
GtkAllocation allocation;
......@@ -1265,7 +1263,6 @@ lay_down_icons_horizontal (NautilusIconContainer *container,
/* Lay out icons a line at a time. */
canvas_width = CANVAS_WIDTH(container, allocation);
max_icon_width = max_text_width = 0.0;
grid_width = STANDARD_ICON_GRID_WIDTH;
......@@ -8020,7 +8017,6 @@ nautilus_icon_container_start_renaming_selected_item (NautilusIconContainer *con
NautilusIconContainerDetails *details;
NautilusIcon *icon;
EelDRect icon_rect;
EelDRect text_rect;
PangoContext *context;
PangoFontDescription *desc;
const char *editable_text;
......@@ -8097,7 +8093,6 @@ nautilus_icon_container_start_renaming_selected_item (NautilusIconContainer *con
pango_font_description_free (desc);
icon_rect = nautilus_icon_canvas_item_get_icon_rectangle (icon->item);
text_rect = nautilus_icon_canvas_item_get_text_rectangle (icon->item, TRUE);
width = nautilus_icon_canvas_item_get_max_text_width (icon->item);
......
......@@ -136,8 +136,6 @@ static GList *nautilus_list_view_get_selection_for_file_transfer (NautilusView
static void nautilus_list_view_set_zoom_level (NautilusListView *view,
NautilusZoomLevel new_level,
gboolean always_set_level);
static void nautilus_list_view_scale_font_size (NautilusListView *view,
NautilusZoomLevel new_level);
static void nautilus_list_view_scroll_to_file (NautilusListView *view,
NautilusFile *file);
static void nautilus_list_view_rename_callback (NautilusFile *file,
......
......@@ -347,9 +347,7 @@ get_dir_name (ButtonData *button_data)
static void
set_label_size_request (ButtonData *button_data)
{
const gchar *dir_name = get_dir_name (button_data);
gint width, height;
gchar *markup;
GtkRequisition min_req, bold_req;
if (button_data->label == NULL) {
......
......@@ -3164,7 +3164,6 @@ static void
update_hostname_async (NautilusPlacesSidebar *sidebar)
{
GVariant *variant;
char *str;
gsize len;
if (sidebar->hostnamed_proxy == NULL)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment