diff options
34 files changed, 30 insertions, 246 deletions
diff --git a/eel/eel-canvas-rect-ellipse.c b/eel/eel-canvas-rect-ellipse.c index dec73d3b3..65e43c945 100644 --- a/eel/eel-canvas-rect-ellipse.c +++ b/eel/eel-canvas-rect-ellipse.c @@ -408,46 +408,26 @@ eel_canvas_re_get_property (GObject *object, static void eel_canvas_re_update_shared (EelCanvasItem *item, double i2w_dx, double i2w_dy, int flags) { - EelCanvasRE *re; - #ifdef VERBOSE g_print ("eel_canvas_re_update_shared\n"); #endif - re = EEL_CANVAS_RE (item); - if (re_parent_class->update) (* re_parent_class->update) (item, i2w_dx, i2w_dy, flags); - -#ifdef OLD_XFORM - recalc_bounds (re); -#endif } static void eel_canvas_re_realize (EelCanvasItem *item) { - EelCanvasRE *re; - #ifdef VERBOSE g_print ("eel_canvas_re_realize\n"); #endif - re = EEL_CANVAS_RE (item); - if (re_parent_class->realize) (* re_parent_class->realize) (item); - -#ifdef OLD_XFORM - (* EEL_CANVAS_ITEM_CLASS (item->object.klass)->update) (item, NULL, NULL, 0); -#endif } static void eel_canvas_re_unrealize (EelCanvasItem *item) { - EelCanvasRE *re; - - re = EEL_CANVAS_RE (item); - if (re_parent_class->unrealize) (* re_parent_class->unrealize) (item); } diff --git a/eel/eel-canvas.c b/eel/eel-canvas.c index a63badae8..c54988f5f 100644 --- a/eel/eel-canvas.c +++ b/eel/eel-canvas.c @@ -1325,12 +1325,10 @@ static void eel_canvas_group_get_property (GObject *gobject, guint param_id, GValue *value, GParamSpec *pspec) { - EelCanvasItem *item; EelCanvasGroup *group; g_return_if_fail (EEL_IS_CANVAS_GROUP (gobject)); - item = EEL_CANVAS_ITEM (gobject); group = EEL_CANVAS_GROUP (gobject); switch (param_id) { @@ -2662,9 +2660,6 @@ pick_current_item (EelCanvas *canvas, GdkEvent *event) && (canvas->current_item != NULL) && !canvas->left_grabbed_item) { GdkEvent new_event; - EelCanvasItem *item; - - item = canvas->current_item; new_event = canvas->pick_event; new_event.type = GDK_LEAVE_NOTIFY; diff --git a/libnautilus-private/nautilus-clipboard.c b/libnautilus-private/nautilus-clipboard.c index 2e12d493a..6291f51af 100644 --- a/libnautilus-private/nautilus-clipboard.c +++ b/libnautilus-private/nautilus-clipboard.c @@ -413,10 +413,7 @@ static void target_destroy_callback (GtkWidget *object, gpointer callback_data) { - TargetCallbackData *target_data; - g_assert (callback_data != NULL); - target_data = callback_data; if (clipboard_items_are_merged_in (object)) { merge_out_clipboard_menu_items (G_OBJECT (object), callback_data); diff --git a/libnautilus-private/nautilus-desktop-icon-file.c b/libnautilus-private/nautilus-desktop-icon-file.c index 115e10376..9af342ac3 100644 --- a/libnautilus-private/nautilus-desktop-icon-file.c +++ b/libnautilus-private/nautilus-desktop-icon-file.c @@ -349,9 +349,6 @@ nautilus_desktop_icon_file_set_metadata (NautilusFile *file, const char *key, const char *value) { - NautilusDesktopIconFile *desktop_file; - - desktop_file = NAUTILUS_DESKTOP_ICON_FILE (file); nautilus_desktop_set_metadata_string (file, file->details->name, key, value); } @@ -360,9 +357,6 @@ nautilus_desktop_icon_file_set_metadata_as_list (NautilusFile *file, const char *key, char **value) { - NautilusDesktopIconFile *desktop_file; - - desktop_file = NAUTILUS_DESKTOP_ICON_FILE (file); nautilus_desktop_set_metadata_stringv (file, file->details->name, key, value); } diff --git a/libnautilus-private/nautilus-directory-async.c b/libnautilus-private/nautilus-directory-async.c index 4783b6fa4..43a51b28f 100644 --- a/libnautilus-private/nautilus-directory-async.c +++ b/libnautilus-private/nautilus-directory-async.c @@ -2854,9 +2854,6 @@ deep_count_callback (GObject *source_object, static void deep_count_load (DeepCountState *state, GFile *location) { - NautilusDirectory *directory; - - directory = state->directory; state->deep_count_location = g_object_ref (location); #ifdef DEBUG_LOAD_DIRECTORY diff --git a/libnautilus-private/nautilus-directory.c b/libnautilus-private/nautilus-directory.c index 1c82ba6e0..34f92bf78 100644 --- a/libnautilus-private/nautilus-directory.c +++ b/libnautilus-private/nautilus-directory.c @@ -254,9 +254,7 @@ collect_all_directories (gpointer key, gpointer value, gpointer callback_data) { NautilusDirectory *directory; GList **dirs; - GFile *location; - location = (GFile *) key; directory = NAUTILUS_DIRECTORY (value); dirs = callback_data; diff --git a/libnautilus-private/nautilus-entry.c b/libnautilus-private/nautilus-entry.c index 80fe4c8f3..489967190 100644 --- a/libnautilus-private/nautilus-entry.c +++ b/libnautilus-private/nautilus-entry.c @@ -61,9 +61,6 @@ static GtkEditableInterface *parent_editable_interface = NULL; static void nautilus_entry_init (NautilusEntry *entry) { - GtkWidget *widget; - - widget = GTK_WIDGET (entry); entry->details = g_new0 (NautilusEntryDetails, 1); entry->details->user_edit = TRUE; @@ -163,10 +160,8 @@ nautilus_entry_motion_notify (GtkWidget *widget, GdkEventMotion *event) int result; gboolean old_had, new_had; int old_start, old_end, new_start, new_end; - NautilusEntry *entry; GtkEditable *editable; - entry = NAUTILUS_ENTRY (widget); editable = GTK_EDITABLE (widget); old_had = gtk_editable_get_selection_bounds (editable, &old_start, &old_end); diff --git a/libnautilus-private/nautilus-file-conflict-dialog.c b/libnautilus-private/nautilus-file-conflict-dialog.c index 2c1b3639c..ff8dafedd 100644 --- a/libnautilus-private/nautilus-file-conflict-dialog.c +++ b/libnautilus-private/nautilus-file-conflict-dialog.c @@ -99,12 +99,11 @@ file_list_ready_cb (GList *files, NautilusFileConflictDialog *fcd = user_data; NautilusFile *src, *dest, *dest_dir; time_t src_mtime, dest_mtime; - GtkDialog *dialog; gboolean source_is_dir, dest_is_dir, should_show_type; NautilusFileConflictDialogDetails *details; char *primary_text, *message, *secondary_text; const gchar *message_extra; - char *src_name, *dest_name, *dest_dir_name, *edit_name; + char *dest_name, *dest_dir_name, *edit_name; char *label_text; char *size, *date, *type = NULL; GdkPixbuf *pixbuf; @@ -112,7 +111,6 @@ file_list_ready_cb (GList *files, GString *str; PangoAttrList *attr_list; - dialog = GTK_DIALOG (fcd); details = fcd->details; details->handle = NULL; @@ -124,7 +122,6 @@ file_list_ready_cb (GList *files, src_mtime = nautilus_file_get_mtime (src); dest_mtime = nautilus_file_get_mtime (dest); - src_name = nautilus_file_get_display_name (src); dest_name = nautilus_file_get_display_name (dest); dest_dir_name = nautilus_file_get_display_name (dest_dir); diff --git a/libnautilus-private/nautilus-file-operations.c b/libnautilus-private/nautilus-file-operations.c index 901ebdf28..074ef75ba 100644 --- a/libnautilus-private/nautilus-file-operations.c +++ b/libnautilus-private/nautilus-file-operations.c @@ -4668,7 +4668,7 @@ move_file_prepare (CopyMoveJob *move_job, GFile *dest, *new_dest; GError *error; CommonJob *job; - gboolean overwrite, renamed; + gboolean overwrite; char *primary, *secondary, *details; int response; GFileCopyFlags flags; @@ -4676,7 +4676,6 @@ move_file_prepare (CopyMoveJob *move_job, gboolean handled_invalid_filename; overwrite = FALSE; - renamed = FALSE; handled_invalid_filename = *dest_fs_type != NULL; job = (CommonJob *)move_job; @@ -4814,7 +4813,6 @@ move_file_prepare (CopyMoveJob *move_job, g_object_unref (dest); dest = get_target_file_for_display_name (dest_dir, response->new_name); - renamed = TRUE; conflict_response_data_free (response); goto retry; } else { @@ -5321,8 +5319,6 @@ link_job (GIOSchedulerJob *io_job, { CopyMoveJob *job; CommonJob *common; - GList *copy_files; - GArray *copy_positions; GFile *src; GdkPoint *point; char *dest_fs_type; @@ -5334,9 +5330,6 @@ link_job (GIOSchedulerJob *io_job, common = &job->common; common->io_job = io_job; - copy_files = NULL; - copy_positions = NULL; - dest_fs_type = NULL; nautilus_progress_info_start (job->common.progress); diff --git a/libnautilus-private/nautilus-icon-canvas-item.c b/libnautilus-private/nautilus-icon-canvas-item.c index d38ebb0dc..02b7cdc4e 100644 --- a/libnautilus-private/nautilus-icon-canvas-item.c +++ b/libnautilus-private/nautilus-icon-canvas-item.c @@ -808,12 +808,8 @@ draw_frame (NautilusIconCanvasItem *item, int width, int height) { - NautilusIconContainer *container; - - container = NAUTILUS_ICON_CONTAINER (EEL_CANVAS_ITEM (item)->canvas); + cairo_save (cr); - cairo_save (cr); - /* Set the rounded rect clip region. Magic rounding value taken * from old code. */ @@ -821,7 +817,7 @@ draw_frame (NautilusIconCanvasItem *item, gdk_cairo_set_source_rgba (cr, color); cairo_fill (cr); - cairo_restore (cr); + cairo_restore (cr); } /* Keep these for a bit while we work on performance of draw_or_measure_label_text. */ @@ -970,11 +966,9 @@ measure_label_text (NautilusIconCanvasItem *item) NautilusIconContainer *container; gint editable_height, editable_height_for_layout, editable_height_for_entire_text, editable_width, editable_dx; gint additional_height, additional_width, additional_dx; - EelCanvasItem *canvas_item; PangoLayout *editable_layout; PangoLayout *additional_layout; - gboolean have_editable, have_additional, needs_highlight; - int max_text_width; + gboolean have_editable, have_additional; /* check to see if the cached values are still valid; if so, there's * no work necessary @@ -985,7 +979,6 @@ measure_label_text (NautilusIconCanvasItem *item) } details = item->details; - needs_highlight = details->is_highlighted_for_selection || details->is_highlighted_for_drop; have_editable = details->editable_text != NULL && details->editable_text[0] != '\0'; have_additional = details->additional_text != NULL && details->additional_text[0] != '\0'; @@ -1008,8 +1001,6 @@ measure_label_text (NautilusIconCanvasItem *item) return; #endif - canvas_item = EEL_CANVAS_ITEM (item); - editable_width = 0; editable_height = 0; editable_height_for_layout = 0; @@ -1019,8 +1010,6 @@ measure_label_text (NautilusIconCanvasItem *item) additional_height = 0; additional_dx = 0; - max_text_width = floor (nautilus_icon_canvas_item_get_max_text_width (item)); - container = NAUTILUS_ICON_CONTAINER (EEL_CANVAS_ITEM (item)->canvas); editable_layout = NULL; additional_layout = NULL; @@ -1363,13 +1352,11 @@ real_map_pixbuf (NautilusIconCanvasItem *icon_item) { EelCanvas *canvas; char *audio_filename; - NautilusIconContainer *container; GdkPixbuf *temp_pixbuf, *old_pixbuf, *audio_pixbuf; int emblem_size; temp_pixbuf = icon_item->details->pixbuf; canvas = EEL_CANVAS_ITEM(icon_item)->canvas; - container = NAUTILUS_ICON_CONTAINER (canvas); g_object_ref (temp_pixbuf); @@ -1933,7 +1920,6 @@ nautilus_icon_canvas_item_ensure_bounds_up_to_date (NautilusIconCanvasItem *icon EelIRect total_rect, total_rect_for_layout, total_rect_for_entire_text; EelCanvasItem *item; double pixels_per_unit; - gboolean is_rtl; details = icon_item->details; item = EEL_CANVAS_ITEM (icon_item); @@ -1964,8 +1950,6 @@ nautilus_icon_canvas_item_ensure_bounds_up_to_date (NautilusIconCanvasItem *icon text_rect = compute_text_rectangle (icon_item, icon_rect, FALSE, BOUNDS_USAGE_FOR_DISPLAY); text_rect_for_layout = compute_text_rectangle (icon_item, icon_rect, FALSE, BOUNDS_USAGE_FOR_LAYOUT); text_rect_for_entire_text = compute_text_rectangle (icon_item, icon_rect, FALSE, BOUNDS_USAGE_FOR_ENTIRE_ITEM); - - is_rtl = nautilus_icon_container_is_layout_rtl (NAUTILUS_ICON_CONTAINER (item->canvas)); /* Compute total rectangle */ eel_irect_union (&total_rect, &icon_rect, &text_rect); @@ -2417,7 +2401,6 @@ nautilus_icon_canvas_item_accessible_do_action (AtkAction *accessible, { NautilusIconCanvasItem *item; NautilusIconCanvasItemAccessibleActionContext *ctx; - NautilusIcon *icon; NautilusIconContainer *container; g_assert (i < LAST_ACTION); @@ -2426,7 +2409,7 @@ nautilus_icon_canvas_item_accessible_do_action (AtkAction *accessible, if (!item) { return FALSE; } - icon = item->user_data; + container = NAUTILUS_ICON_CONTAINER (EEL_CANVAS_ITEM (item)->canvas); switch (i) { case ACTION_OPEN: diff --git a/libnautilus-private/nautilus-icon-container.c b/libnautilus-private/nautilus-icon-container.c index d715dd80e..0bc057718 100644 --- a/libnautilus-private/nautilus-icon-container.c +++ b/libnautilus-private/nautilus-icon-container.c @@ -304,7 +304,7 @@ icon_set_position (NautilusIcon *icon, int container_x, container_y, container_width, container_height; EelDRect icon_bounds; int item_width, item_height; - int height_above, height_below, width_left, width_right; + int height_above, width_left; int min_x, max_x, min_y, max_y; if (icon->x == x && icon->y == y) { @@ -355,9 +355,7 @@ icon_set_position (NautilusIcon *icon, /* determine icon rectangle relative to item rectangle */ height_above = icon_bounds.y0 - y1; - height_below = y2 - icon_bounds.y1; width_left = icon_bounds.x0 - x1; - width_right = x2 - icon_bounds.x1; min_x = container_left + DESKTOP_PAD_HORIZONTAL + width_left; max_x = container_right - DESKTOP_PAD_HORIZONTAL - item_width + width_left; @@ -689,7 +687,6 @@ static void reveal_icon (NautilusIconContainer *container, NautilusIcon *icon) { - NautilusIconContainerDetails *details; GtkAllocation allocation; GtkAdjustment *hadj, *vadj; EelIRect bounds; @@ -701,7 +698,6 @@ reveal_icon (NautilusIconContainer *container, set_pending_icon_to_reveal (container, NULL); - details = container->details; gtk_widget_get_allocation (GTK_WIDGET (container), &allocation); hadj = gtk_scrollable_get_hadjustment (GTK_SCROLLABLE (container)); @@ -1259,7 +1255,7 @@ lay_down_icons_horizontal (NautilusIconContainer *container, { GList *p, *line_start; NautilusIcon *icon; - double canvas_width, y, canvas_height; + double canvas_width, y; GArray *positions; IconPositions *position; EelDRect bounds; @@ -1286,8 +1282,6 @@ lay_down_icons_horizontal (NautilusIconContainer *container, /* Lay out icons a line at a time. */ canvas_width = CANVAS_WIDTH(container, allocation); - canvas_height = CANVAS_HEIGHT(container, allocation); - max_icon_width = max_text_width = 0.0; if (container->details->label_position == NAUTILUS_ICON_LABEL_POSITION_BESIDE) { @@ -1457,12 +1451,11 @@ lay_down_icons_vertical (NautilusIconContainer *container, { GList *p, *line_start; NautilusIcon *icon; - double canvas_width, x, canvas_height; + double x, canvas_height; GArray *positions; IconPositions *position; EelDRect icon_bounds; EelDRect text_bounds; - EelCanvasItem *item; GtkAllocation allocation; double line_height; @@ -1491,7 +1484,6 @@ lay_down_icons_vertical (NautilusIconContainer *container, gtk_widget_get_allocation (GTK_WIDGET (container), &allocation); /* Lay out icons a column at a time. */ - canvas_width = CANVAS_WIDTH(container, allocation); canvas_height = CANVAS_HEIGHT(container, allocation); max_icon_width = max_text_width = 0.0; @@ -1518,7 +1510,6 @@ lay_down_icons_vertical (NautilusIconContainer *container, for (p = icons; p != NULL; p = p->next) { icon = p->data; - item = EEL_CANVAS_ITEM (icon->item); /* If this icon doesn't fit, it's time to lay out the column that's queued up. */ @@ -1956,14 +1947,13 @@ lay_down_icons_vertical_desktop (NautilusIconContainer *container, GList *icons) GList *p, *placed_icons, *unplaced_icons; int total, new_length, placed; NautilusIcon *icon; - int width, height, max_width, column_width, icon_width, icon_height; + int height, max_width, column_width, icon_width, icon_height; int x, y, x1, x2, y1, y2; EelDRect icon_rect; GtkAllocation allocation; /* Get container dimensions */ gtk_widget_get_allocation (GTK_WIDGET (container), &allocation); - width = CANVAS_WIDTH(container, allocation); height = CANVAS_HEIGHT(container, allocation); /* Determine which icons have and have not been placed */ @@ -5048,7 +5038,6 @@ nautilus_icon_container_search_move (GtkWidget *window, { gboolean ret; gint len; - gint count = 0; const gchar *text; text = gtk_entry_get_text (GTK_ENTRY (container->details->search_entry)); @@ -5080,7 +5069,6 @@ nautilus_icon_container_search_move (GtkWidget *window, container->details->selected_iter += up?(-1):(1); } else { /* return to old iter */ - count = 0; nautilus_icon_container_search_iter (container, text, container->details->selected_iter); } @@ -5213,9 +5201,7 @@ nautilus_icon_container_search_init (GtkWidget *entry, static void nautilus_icon_container_ensure_interactive_directory (NautilusIconContainer *container) { - GtkWidget *frame, *vbox, *toplevel; - - toplevel = gtk_widget_get_toplevel (GTK_WIDGET (container)); + GtkWidget *frame, *vbox; if (container->details->search_window != NULL) { return; @@ -6363,11 +6349,9 @@ item_event_callback (EelCanvasItem *item, gpointer data) { NautilusIconContainer *container; - NautilusIconContainerDetails *details; NautilusIcon *icon; container = NAUTILUS_ICON_CONTAINER (data); - details = container->details; icon = NAUTILUS_ICON_CANVAS_ITEM (item)->user_data; g_assert (icon != NULL); @@ -6526,7 +6510,6 @@ nautilus_icon_container_scroll_to_icon (NautilusIconContainer *container, GList *l; NautilusIcon *icon; GtkAdjustment *hadj, *vadj; - EelCanvasItem *item; EelIRect bounds; GtkAllocation allocation; @@ -6545,8 +6528,6 @@ nautilus_icon_container_scroll_to_icon (NautilusIconContainer *container, if (icon->data == data && icon_is_positioned (icon)) { - item = EEL_CANVAS_ITEM (icon->item); - if (nautilus_icon_container_is_auto_layout (container)) { /* ensure that we reveal the entire row/column */ icon_get_row_and_column_bounds (container, icon, &bounds, TRUE); diff --git a/libnautilus-private/nautilus-icon-dnd.c b/libnautilus-private/nautilus-icon-dnd.c index 15369940b..ee01a1237 100644 --- a/libnautilus-private/nautilus-icon-dnd.c +++ b/libnautilus-private/nautilus-icon-dnd.c @@ -1123,7 +1123,6 @@ nautilus_icon_container_get_drop_action (NautilusIconContainer *container, { char *drop_target; gboolean icon_hit; - NautilusIcon *icon; double world_x, world_y; icon_hit = FALSE; @@ -1134,9 +1133,6 @@ nautilus_icon_container_get_drop_action (NautilusIconContainer *container, /* find out if we're over an icon */ canvas_widget_to_world (EEL_CANVAS (container), x, y, &world_x, &world_y); - - icon = nautilus_icon_container_item_at (container, world_x, world_y); - *action = 0; /* case out on the type of object being dragged */ @@ -1328,7 +1324,6 @@ nautilus_icon_dnd_begin_drag (NautilusIconContainer *container, int start_y) { NautilusIconDndInfo *dnd_info; - GdkDragContext *context; g_return_if_fail (NAUTILUS_IS_ICON_CONTAINER (container)); g_return_if_fail (event != NULL); @@ -1345,11 +1340,11 @@ nautilus_icon_dnd_begin_drag (NautilusIconContainer *container, gtk_adjustment_get_value (gtk_scrollable_get_vadjustment (GTK_SCROLLABLE (container))); /* start the drag */ - context = gtk_drag_begin (GTK_WIDGET (container), - dnd_info->drag_info.target_list, - actions, - button, - (GdkEvent *) event); + gtk_drag_begin (GTK_WIDGET (container), + dnd_info->drag_info.target_list, + actions, + button, + (GdkEvent *) event); } static gboolean diff --git a/libnautilus-private/nautilus-saved-search-file.c b/libnautilus-private/nautilus-saved-search-file.c index 3bbbc0857..b5e5afcbc 100644 --- a/libnautilus-private/nautilus-saved-search-file.c +++ b/libnautilus-private/nautilus-saved-search-file.c @@ -32,9 +32,6 @@ G_DEFINE_TYPE(NautilusSavedSearchFile, nautilus_saved_search_file, NAUTILUS_TYPE static void nautilus_saved_search_file_init (NautilusSavedSearchFile *search_file) { - NautilusFile *file; - - file = NAUTILUS_FILE (search_file); } static void diff --git a/libnautilus-private/nautilus-search-directory-file.c b/libnautilus-private/nautilus-search-directory-file.c index 151241825..ae9228d9f 100644 --- a/libnautilus-private/nautilus-search-directory-file.c +++ b/libnautilus-private/nautilus-search-directory-file.c @@ -97,12 +97,9 @@ search_directory_file_get_item_count (NautilusFile *file, guint *count, gboolean *count_unreadable) { - NautilusSearchDirectory *search_dir; GList *file_list; if (count) { - search_dir = NAUTILUS_SEARCH_DIRECTORY (file->details->directory); - file_list = nautilus_directory_get_file_list (file->details->directory); *count = g_list_length (file_list); @@ -120,14 +117,11 @@ search_directory_file_get_deep_counts (NautilusFile *file, guint *unreadable_directory_count, goffset *total_size) { - NautilusSearchDirectory *search_dir; NautilusFile *dir_file; GList *file_list, *l; guint dirs, files; GFileType type; - search_dir = NAUTILUS_SEARCH_DIRECTORY (file->details->directory); - file_list = nautilus_directory_get_file_list (file->details->directory); dirs = files = 0; @@ -227,10 +221,8 @@ nautilus_search_directory_file_init (NautilusSearchDirectoryFile *search_file) static void nautilus_search_directory_file_class_init (NautilusSearchDirectoryFileClass *klass) { - GObjectClass *object_class; NautilusFileClass *file_class; - object_class = G_OBJECT_CLASS (klass); file_class = NAUTILUS_FILE_CLASS (klass); file_class->default_file_type = G_FILE_TYPE_DIRECTORY; diff --git a/libnautilus-private/nautilus-vfs-directory.c b/libnautilus-private/nautilus-vfs-directory.c index 0d4f0aa29..7b74246bd 100644 --- a/libnautilus-private/nautilus-vfs-directory.c +++ b/libnautilus-private/nautilus-vfs-directory.c @@ -41,9 +41,6 @@ EEL_CLASS_BOILERPLATE (NautilusVFSDirectory, static void nautilus_vfs_directory_init (gpointer object, gpointer klass) { - NautilusVFSDirectory *directory; - - directory = NAUTILUS_VFS_DIRECTORY (object); } static gboolean @@ -151,10 +148,8 @@ vfs_is_not_empty (NautilusDirectory *directory) static void nautilus_vfs_directory_class_init (gpointer klass) { - GObjectClass *object_class; NautilusDirectoryClass *directory_class; - object_class = G_OBJECT_CLASS (klass); directory_class = NAUTILUS_DIRECTORY_CLASS (klass); directory_class->contains_file = vfs_contains_file; diff --git a/libnautilus-private/nautilus-vfs-file.c b/libnautilus-private/nautilus-vfs-file.c index 0a07f66f4..38c064b1e 100644 --- a/libnautilus-private/nautilus-vfs-file.c +++ b/libnautilus-private/nautilus-vfs-file.c @@ -690,10 +690,6 @@ vfs_file_poll_for_media (NautilusFile *file) static void nautilus_vfs_file_init (gpointer object, gpointer klass) { - NautilusVFSFile *file; - - file = NAUTILUS_VFS_FILE (object); - } static void diff --git a/nautilus-sendto-extension/nautilus-nste.c b/nautilus-sendto-extension/nautilus-nste.c index 59e042bbb..beedd7324 100644 --- a/nautilus-sendto-extension/nautilus-nste.c +++ b/nautilus-sendto-extension/nautilus-nste.c @@ -37,13 +37,10 @@ sendto_callback (NautilusMenuItem *item, gpointer user_data) { GList *files, *scan; - NautilusFileInfo *file; gchar *uri; GString *cmd; files = g_object_get_data (G_OBJECT (item), "files"); - file = files->data; - cmd = g_string_new ("nautilus-sendto"); for (scan = files; scan; scan = scan->next) { diff --git a/src/nautilus-application.c b/src/nautilus-application.c index 78ca48d2e..c2b97e48b 100644 --- a/src/nautilus-application.c +++ b/src/nautilus-application.c @@ -192,12 +192,10 @@ menu_provider_items_updated_handler (NautilusMenuProvider *provider, GtkWidget* static void menu_provider_init_callback (void) { - GList *items; GList *providers; GList *l; providers = nautilus_module_get_extensions_for_type (NAUTILUS_TYPE_MENU_PROVIDER); - items = NULL; for (l = providers; l != NULL; l = l->next) { NautilusMenuProvider *provider = NAUTILUS_MENU_PROVIDER (l->data); @@ -505,7 +503,7 @@ open_window (NautilusApplication *application, { GFile *location; NautilusWindow *window; - gboolean existing, open_in_browser; + gboolean open_in_browser; if (uri == NULL) { location = g_file_new_for_path (g_get_home_dir ()); @@ -518,8 +516,6 @@ open_window (NautilusApplication *application, DEBUG ("Opening new window at uri %s, browser %d", uri, open_in_browser); - existing = FALSE; - if (open_in_browser) { window = nautilus_application_create_navigation_window (application, startup_id, diff --git a/src/nautilus-connect-server-dialog-nonmain.c b/src/nautilus-connect-server-dialog-nonmain.c index 0b7374a31..77dbf02b9 100644 --- a/src/nautilus-connect-server-dialog-nonmain.c +++ b/src/nautilus-connect-server-dialog-nonmain.c @@ -38,10 +38,6 @@ window_go_to_cb (NautilusWindow *window, GError *error, gpointer user_data) { - NautilusConnectServerDialog *self; - - self = user_data; - if (error != NULL) { g_simple_async_result_set_from_error (display_location_res, error); } diff --git a/src/nautilus-connect-server-dialog.c b/src/nautilus-connect-server-dialog.c index 95b1c6995..ea4e61b04 100644 --- a/src/nautilus-connect-server-dialog.c +++ b/src/nautilus-connect-server-dialog.c @@ -377,14 +377,13 @@ connect_dialog_request_additional_details (NautilusConnectServerDialog *self, const gchar *default_user, const gchar *default_domain) { - GtkWidget *content_area, *label, *entry, *hbox, *icon; + GtkWidget *content_area, *label, *hbox, *icon; self->details->fill_details_flags = flags; connect_dialog_restore_info_bar (self, GTK_MESSAGE_WARNING); content_area = gtk_info_bar_get_content_area (GTK_INFO_BAR (self->details->info_bar)); - entry = NULL; hbox = gtk_hbox_new (FALSE, 6); gtk_box_pack_start (GTK_BOX (content_area), hbox, FALSE, FALSE, 6); @@ -1159,11 +1158,9 @@ nautilus_connect_server_dialog_class_init (NautilusConnectServerDialogClass *cla GtkWidget * nautilus_connect_server_dialog_new (NautilusWindow *window) { - NautilusConnectServerDialog *conndlg; GtkWidget *dialog; dialog = gtk_widget_new (NAUTILUS_TYPE_CONNECT_SERVER_DIALOG, NULL); - conndlg = NAUTILUS_CONNECT_SERVER_DIALOG (dialog); if (window) { gtk_window_set_screen (GTK_WINDOW (dialog), diff --git a/src/nautilus-icon-view.c b/src/nautilus-icon-view.c index 28a11761c..254166cd0 100644 --- a/src/nautilus-icon-view.c +++ b/src/nautilus-icon-view.c @@ -1312,12 +1312,10 @@ nautilus_icon_view_set_zoom_level (NautilusIconView *view, static void nautilus_icon_view_bump_zoom_level (NautilusView *view, int zoom_increment) { - NautilusIconView *icon_view; NautilusZoomLevel new_level; g_return_if_fail (NAUTILUS_IS_ICON_VIEW (view)); - icon_view = NAUTILUS_ICON_VIEW (view); new_level = nautilus_icon_view_get_zoom_level (view) + zoom_increment; if (new_level >= NAUTILUS_ZOOM_LEVEL_SMALLEST && diff --git a/src/nautilus-list-view.c b/src/nautilus-list-view.c index 95d7ece1f..568db6f53 100644 --- a/src/nautilus-list-view.c +++ b/src/nautilus-list-view.c @@ -495,10 +495,9 @@ motion_notify_callback (GtkWidget *widget, gpointer callback_data) { NautilusListView *view; - GdkDragContext *context; view = NAUTILUS_LIST_VIEW (callback_data); - + if (event->window != gtk_tree_view_get_bin_window (GTK_TREE_VIEW (widget))) { return FALSE; } @@ -535,7 +534,7 @@ motion_notify_callback (GtkWidget *widget, view->details->drag_y, event->x, event->y)) { - context = gtk_drag_begin + gtk_drag_begin (widget, source_target_list, GDK_ACTION_MOVE | GDK_ACTION_COPY | GDK_ACTION_LINK | GDK_ACTION_ASK, @@ -610,7 +609,6 @@ button_press_callback (GtkWidget *widget, GdkEventButton *event, gpointer callba GtkTreeView *tree_view; GtkTreePath *path; gboolean call_parent; - gboolean allow_drag; GtkTreeSelection *selection; GtkWidgetClass *tree_view_class; gint64 current_time; @@ -657,7 +655,6 @@ button_press_callback (GtkWidget *widget, GdkEventButton *event, gpointer callba view->details->ignore_button_release = FALSE; call_parent = TRUE; - allow_drag = FALSE; if (gtk_tree_view_get_path_at_pos (tree_view, event->x, event->y, &path, NULL, NULL, NULL)) { gtk_widget_style_get (widget, @@ -1097,11 +1094,8 @@ sort_criterion_changes_due_to_user (GtkTreeView *tree_view) GList *columns, *p; GtkTreeViewColumn *column; GSignalInvocationHint *ihint; - unsigned int sort_signal_id; gboolean ret; - sort_signal_id = g_signal_lookup ("clicked", gtk_tree_view_column_get_type ()); - ret = FALSE; columns = gtk_tree_view_get_columns (tree_view); diff --git a/src/nautilus-main.c b/src/nautilus-main.c index d11f29f88..43e44cb67 100644 --- a/src/nautilus-main.c +++ b/src/nautilus-main.c @@ -106,5 +106,5 @@ main (int argc, char *argv[]) eel_debug_shut_down (); - return EXIT_SUCCESS; + return retval; } diff --git a/src/nautilus-navigation-window-slot.c b/src/nautilus-navigation-window-slot.c index f7dbcb2cb..4eb132dfd 100644 --- a/src/nautilus-navigation-window-slot.c +++ b/src/nautilus-navigation-window-slot.c @@ -126,11 +126,9 @@ nautilus_navigation_window_slot_update_query_editor (NautilusWindowSlot *slot) NautilusDirectory *directory; NautilusSearchDirectory *search_directory; NautilusQuery *query; - NautilusNavigationWindow *navigation_window; GtkWidget *query_editor; g_assert (slot->pane->window != NULL); - navigation_window = NAUTILUS_NAVIGATION_WINDOW (slot->pane->window); query_editor = NULL; @@ -177,11 +175,9 @@ static void nautilus_navigation_window_slot_active (NautilusWindowSlot *slot) { NautilusNavigationWindow *window; - NautilusNavigationWindowSlot *navigation_slot; NautilusNavigationWindowPane *pane; int page_num; - navigation_slot = NAUTILUS_NAVIGATION_WINDOW_SLOT (slot); pane = NAUTILUS_NAVIGATION_WINDOW_PANE (slot->pane); window = NAUTILUS_NAVIGATION_WINDOW (slot->pane->window); diff --git a/src/nautilus-navigation-window.c b/src/nautilus-navigation-window.c index 869d6a8da..f3119d2a7 100644 --- a/src/nautilus-navigation-window.c +++ b/src/nautilus-navigation-window.c @@ -244,16 +244,6 @@ nautilus_navigation_window_restore_focus_widget (NautilusNavigationWindow *windo } } -static void -nautilus_navigation_window_unrealize (GtkWidget *widget) -{ - NautilusNavigationWindow *window; - - window = NAUTILUS_NAVIGATION_WINDOW (widget); - - GTK_WIDGET_CLASS (parent_class)->unrealize (widget); -} - static gboolean nautilus_navigation_window_state_event (GtkWidget *widget, GdkEventWindowState *event) @@ -401,14 +391,11 @@ static void real_sync_title (NautilusWindow *window, NautilusWindowSlot *slot) { - NautilusNavigationWindow *navigation_window; NautilusNavigationWindowPane *pane; NautilusNotebook *notebook; char *full_title; char *window_title; - navigation_window = NAUTILUS_NAVIGATION_WINDOW (window); - if (slot == window->details->active_pane->active_slot) { /* if spatial mode is default, we keep "File Browser" in the window title * to recognize browser windows. Otherwise, we default to the directory name. @@ -1007,7 +994,6 @@ nautilus_navigation_window_class_init (NautilusNavigationWindowClass *class) G_OBJECT_CLASS (class)->finalize = nautilus_navigation_window_finalize; GTK_WIDGET_CLASS (class)->destroy = nautilus_navigation_window_destroy; GTK_WIDGET_CLASS (class)->show = nautilus_navigation_window_show; - GTK_WIDGET_CLASS (class)->unrealize = nautilus_navigation_window_unrealize; GTK_WIDGET_CLASS (class)->window_state_event = nautilus_navigation_window_state_event; GTK_WIDGET_CLASS (class)->key_press_event = nautilus_navigation_window_key_press_event; GTK_WIDGET_CLASS (class)->button_press_event = nautilus_navigation_window_button_press_event; diff --git a/src/nautilus-pathbar.c b/src/nautilus-pathbar.c index cdec43851..9b4b31423 100644 --- a/src/nautilus-pathbar.c +++ b/src/nautilus-pathbar.c @@ -1170,7 +1170,6 @@ button_clicked_cb (GtkWidget *button, ButtonData *button_data; NautilusPathBar *path_bar; GList *button_list; - gboolean child_is_hidden; button_data = BUTTON_DATA (data); if (button_data->ignore_changes) { @@ -1184,14 +1183,6 @@ button_clicked_cb (GtkWidget *button, gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (button), TRUE); - if (button_list->prev) { - ButtonData *child_data; - - child_data = BUTTON_DATA (button_list->prev->data); - child_is_hidden = child_data->file_is_hidden; - } else { - child_is_hidden = FALSE; - } g_signal_emit (path_bar, path_bar_signals [PATH_CLICKED], 0, button_data->path); } diff --git a/src/nautilus-places-sidebar.c b/src/nautilus-places-sidebar.c index 8c1d09ab8..e63e8f44f 100644 --- a/src/nautilus-places-sidebar.c +++ b/src/nautilus-places-sidebar.c @@ -2693,9 +2693,7 @@ bookmarks_motion_event_cb (GtkWidget *widget, NautilusPlacesSidebar *sidebar) { GtkTreePath *path; - GtkTreeModel *model; - model = GTK_TREE_MODEL (sidebar->filter_model); path = NULL; if (over_eject_button (sidebar, event->x, event->y, &path)) { @@ -2831,11 +2829,8 @@ icon_cell_renderer_func (GtkTreeViewColumn *column, GtkTreeIter *iter, gpointer user_data) { - NautilusPlacesSidebar *sidebar; PlaceType type; - sidebar = user_data; - gtk_tree_model_get (model, iter, PLACES_SIDEBAR_COLUMN_ROW_TYPE, &type, -1); diff --git a/src/nautilus-properties-window.c b/src/nautilus-properties-window.c index 2b5356f20..13e58512a 100644 --- a/src/nautilus-properties-window.c +++ b/src/nautilus-properties-window.c @@ -741,13 +741,11 @@ static void rename_callback (NautilusFile *file, GFile *res_loc, GError *error, gpointer callback_data) { NautilusPropertiesWindow *window; - char *new_name; window = NAUTILUS_PROPERTIES_WINDOW (callback_data); /* Complain to user if rename failed. */ if (error != NULL) { - new_name = window->details->pending_name; nautilus_report_error_renaming_file (file, window->details->pending_name, error, @@ -4868,7 +4866,7 @@ create_properties_window (StartupData *startup_data) NAUTILUS_FILE_ATTRIBUTE_INFO | NAUTILUS_FILE_ATTRIBUTE_LINK_INFO; - nautilus_file_monitor_add (NAUTILUS_FILE (l->data), + nautilus_file_monitor_add (file, &window->details->original_files, attributes); } diff --git a/src/nautilus-query-editor.c b/src/nautilus-query-editor.c index dc04dbc5a..6691be54a 100644 --- a/src/nautilus-query-editor.c +++ b/src/nautilus-query-editor.c @@ -729,12 +729,9 @@ remove_group_types_from_list (char **group_types, GList *mime_types) GList *l, *next; char **group_type; char *mime_type; - gboolean found; group_type = group_types; while (*group_type != NULL) { - found = FALSE; - for (l = mime_types; l != NULL; l = next) { mime_type = l->data; next = l->next; diff --git a/src/nautilus-tree-sidebar-model.c b/src/nautilus-tree-sidebar-model.c index fb5eea017..16fcb40c7 100644 --- a/src/nautilus-tree-sidebar-model.c +++ b/src/nautilus-tree-sidebar-model.c @@ -714,16 +714,12 @@ report_dummy_row_contents_changed (FMTreeModel *model, TreeNode *parent) static void stop_monitoring_directory (FMTreeModel *model, TreeNode *node) { - NautilusDirectory *directory; - if (node->done_loading_id == 0) { g_assert (node->files_added_id == 0); g_assert (node->files_changed_id == 0); return; } - directory = node->directory; - g_signal_handler_disconnect (node->directory, node->done_loading_id); g_signal_handler_disconnect (node->directory, node->files_added_id); g_signal_handler_disconnect (node->directory, node->files_changed_id); @@ -1241,12 +1237,10 @@ static void fm_tree_model_get_value (GtkTreeModel *model, GtkTreeIter *iter, int column, GValue *value) { TreeNode *node, *parent; - FMTreeModel *fm_model; g_return_if_fail (FM_IS_TREE_MODEL (model)); g_return_if_fail (iter_is_valid (FM_TREE_MODEL (model), iter)); - - fm_model = FM_TREE_MODEL (model); + node = iter->user_data; switch (column) { @@ -1363,15 +1357,12 @@ fm_tree_model_iter_has_child (GtkTreeModel *model, GtkTreeIter *iter) static int fm_tree_model_iter_n_children (GtkTreeModel *model, GtkTreeIter *iter) { - FMTreeModel *tree_model; TreeNode *parent, *node; int n; g_return_val_if_fail (FM_IS_TREE_MODEL (model), FALSE); g_return_val_if_fail (iter == NULL || iter_is_valid (FM_TREE_MODEL (model), iter), FALSE); - tree_model = FM_TREE_MODEL (model); - if (iter == NULL) { return 1; } diff --git a/src/nautilus-tree-sidebar.c b/src/nautilus-tree-sidebar.c index 6045d846b..987f416d7 100644 --- a/src/nautilus-tree-sidebar.c +++ b/src/nautilus-tree-sidebar.c @@ -543,10 +543,6 @@ static char * get_root_uri_callback (NautilusTreeViewDragDest *dest, gpointer user_data) { - FMTreeView *view; - - view = FM_TREE_VIEW (user_data); - /* Don't allow drops on background */ return NULL; } diff --git a/src/nautilus-view.c b/src/nautilus-view.c index 1b081c1ad..f6b9719f8 100644 --- a/src/nautilus-view.c +++ b/src/nautilus-view.c @@ -1544,10 +1544,8 @@ select_pattern (NautilusView *view) GtkWidget *example; GtkWidget *table; GtkWidget *entry; - GList *ret; char *example_pattern; - ret = NULL; dialog = gtk_dialog_new_with_buttons (_("Select Items Matching"), nautilus_view_get_containing_window (view), GTK_DIALOG_DESTROY_WITH_PARENT, @@ -1673,7 +1671,6 @@ action_save_search_as_callback (GtkAction *action, { NautilusView *directory_view; NautilusSearchDirectory *search; - NautilusQuery *query; GtkWidget *dialog, *table, *label, *entry, *chooser, *save_button; const char *entry_text; char *filename, *filename_utf8, *dirname, *path, *uri; @@ -1684,8 +1681,6 @@ action_save_search_as_callback (GtkAction *action, if (directory_view->details->model && NAUTILUS_IS_SEARCH_DIRECTORY (directory_view->details->model)) { search = NAUTILUS_SEARCH_DIRECTORY (directory_view->details->model); - - query = nautilus_search_directory_get_query (search); dialog = gtk_dialog_new_with_buttons (_("Save Search as"), nautilus_view_get_containing_window (directory_view), @@ -5121,7 +5116,6 @@ run_script_callback (GtkAction *action, gpointer callback_data) char *quoted_path; char *old_working_dir; char **parameters; - GtkWindow *window; launch_parameters = (ScriptLaunchParameters *) callback_data; @@ -5143,9 +5137,6 @@ run_script_callback (GtkAction *action, gpointer callback_data) screen = gtk_widget_get_screen (GTK_WIDGET (launch_parameters->directory_view)); - /* FIXME: handle errors with dialog? Or leave up to each script? */ - window = nautilus_view_get_containing_window (launch_parameters->directory_view); - DEBUG ("run_script_callback, script_path=\"%s\" (omitting script parameters)", local_file_path); @@ -6644,6 +6635,7 @@ connect_to_server_response_callback (GtkDialog *dialog, int response_id, gpointer data) { +#ifdef GIO_CONVERSION_DONE GtkEntry *entry; char *uri; const char *name; @@ -6656,9 +6648,7 @@ connect_to_server_response_callback (GtkDialog *dialog, uri = g_object_get_data (G_OBJECT (dialog), "link-uri"); icon = g_object_get_data (G_OBJECT (dialog), "link-icon"); name = gtk_entry_get_text (entry); -#ifdef GIO_CONVERSION_DONE gnome_vfs_connect_to_server (uri, (char *)name, icon); -#endif gtk_widget_destroy (GTK_WIDGET (dialog)); break; case GTK_RESPONSE_NONE: @@ -6669,6 +6659,9 @@ connect_to_server_response_callback (GtkDialog *dialog, default : g_assert_not_reached (); } +#endif + /* FIXME: the above code should make a server connection permanent */ + gtk_widget_destroy (GTK_WIDGET (dialog)); } static void diff --git a/src/nautilus-window-manage-views.c b/src/nautilus-window-manage-views.c index b456d6a3d..87304eb80 100644 --- a/src/nautilus-window-manage-views.c +++ b/src/nautilus-window-manage-views.c @@ -110,12 +110,9 @@ static void update_for_new_location (NautilusWindowSlot static void set_displayed_location (NautilusWindowSlot *slot, GFile *location) { - NautilusWindow *window; GFile *bookmark_location; gboolean recreate; - window = slot->pane->window; - if (slot->current_location_bookmark == NULL || location == NULL) { recreate = TRUE; } else { @@ -476,7 +473,7 @@ nautilus_window_slot_open_location_full (NautilusWindowSlot *slot, char *old_uri, *new_uri; int new_slot_position; GList *l; - gboolean target_spatial, target_navigation, target_same; + gboolean target_navigation, target_same; gboolean is_desktop; NautilusApplication *app; @@ -484,7 +481,6 @@ nautilus_window_slot_open_location_full (NautilusWindowSlot *slot, target_window = NULL; target_slot = NULL; - target_spatial = target_navigation = target_same = FALSE; old_uri = nautilus_window_slot_get_location_uri (slot); if (old_uri == NULL) { @@ -517,9 +513,6 @@ nautilus_window_slot_open_location_full (NautilusWindowSlot *slot, } else { target_same = TRUE; } - } else if (NAUTILUS_IS_SPATIAL_WINDOW (window)) { - /* don't always use browser: if source is spatial, target is spatial */ - target_spatial = TRUE; } else if (flags & NAUTILUS_WINDOW_OPEN_FLAG_NEW_WINDOW) { /* if it's specified to open a new window, and we're not using spatial, * the target is a navigation. @@ -527,9 +520,6 @@ nautilus_window_slot_open_location_full (NautilusWindowSlot *slot, target_navigation = TRUE; } break; - case NAUTILUS_WINDOW_OPEN_IN_SPATIAL : - target_spatial = TRUE; - break; case NAUTILUS_WINDOW_OPEN_IN_NAVIGATION : target_navigation = TRUE; break; @@ -943,14 +933,12 @@ mount_not_mounted_callback (GObject *source_object, gpointer user_data) { MountNotMountedData *data; - NautilusWindow *window; NautilusWindowSlot *slot; GError *error; GCancellable *cancellable; data = user_data; slot = data->slot; - window = slot->pane->window; cancellable = data->cancellable; g_free (data); @@ -1487,14 +1475,11 @@ found_mount_cb (GObject *source_object, { FindMountData *data = user_data; GMount *mount; - NautilusWindowSlot *slot; if (g_cancellable_is_cancelled (data->cancellable)) { goto out; } - slot = data->slot; - mount = g_file_find_enclosing_mount_finish (G_FILE (source_object), res, NULL); @@ -1652,11 +1637,8 @@ nautilus_window_report_load_complete (NautilusWindow *window, static void end_location_change (NautilusWindowSlot *slot) { - NautilusWindow *window; char *uri; - window = slot->pane->window; - uri = nautilus_window_slot_get_location_uri (slot); if (uri) { DEBUG ("Finished loading window for uri %s", uri); @@ -1803,7 +1785,6 @@ display_view_selection_failure (NautilusWindow *window, NautilusFile *file, char *error_message; char *detail_message; char *scheme_string; - GtkDialog *dialog; /* Some sort of failure occurred. How 'bout we tell the user? */ full_uri_for_display = g_file_get_parse_name (location); @@ -1891,8 +1872,8 @@ display_view_selection_failure (NautilusWindow *window, NautilusFile *file, detail_message = g_strdup_printf (_("Error: %s\nPlease select another viewer and try again."), error->message); } - dialog = eel_show_error_dialog (error_message, detail_message, NULL); - + eel_show_error_dialog (error_message, detail_message, NULL); + g_free (uri_for_display); g_free (error_message); g_free (detail_message); diff --git a/src/nautilus-window.c b/src/nautilus-window.c index da6e7546f..eb0e27fee 100644 --- a/src/nautilus-window.c +++ b/src/nautilus-window.c @@ -1157,13 +1157,10 @@ refresh_stored_viewers (NautilusWindow *window) static void load_view_as_menu (NautilusWindow *window) { - NautilusWindowSlot *slot; GList *node; int index; guint merge_id; - slot = window->details->active_pane->active_slot; - if (window->details->short_list_merge_id != 0) { gtk_ui_manager_remove_ui (window->details->ui_manager, window->details->short_list_merge_id); |