diff options
40 files changed, 6 insertions, 1227 deletions
diff --git a/libnautilus-private/nautilus-bookmark.c b/libnautilus-private/nautilus-bookmark.c index e374fc67d..f7bcda800 100644 --- a/libnautilus-private/nautilus-bookmark.c +++ b/libnautilus-private/nautilus-bookmark.c @@ -642,28 +642,6 @@ nautilus_bookmark_get_has_custom_name (NautilusBookmark *bookmark) } /** - * nautilus_bookmark_set_custom_name: - * - * Change the user-displayed name of a bookmark. - * @new_name: The new user-displayed name for this bookmark, mustn't be NULL. - * - **/ -void -nautilus_bookmark_set_custom_name (NautilusBookmark *bookmark, - const char *new_name) -{ - g_return_if_fail (new_name != NULL); - g_return_if_fail (NAUTILUS_IS_BOOKMARK (bookmark)); - - g_object_set (bookmark, - "custom-name", TRUE, - "name", new_name, - NULL); - - g_signal_emit (bookmark, signals[CONTENTS_CHANGED], 0); -} - -/** * nautilus_bookmark_compare_with: * * Check whether two bookmarks are considered identical. @@ -806,9 +784,3 @@ nautilus_bookmark_get_scroll_pos (NautilusBookmark *bookmark) { return g_strdup (bookmark->details->scroll_file); } - -gboolean -nautilus_bookmark_get_exists (NautilusBookmark *bookmark) -{ - return bookmark->details->exists; -} diff --git a/libnautilus-private/nautilus-bookmark.h b/libnautilus-private/nautilus-bookmark.h index c67dd538c..135c3eb80 100644 --- a/libnautilus-private/nautilus-bookmark.h +++ b/libnautilus-private/nautilus-bookmark.h @@ -70,13 +70,10 @@ GFile * nautilus_bookmark_get_location (NautilusBookmark char * nautilus_bookmark_get_uri (NautilusBookmark *bookmark); GIcon * nautilus_bookmark_get_icon (NautilusBookmark *bookmark); GIcon * nautilus_bookmark_get_symbolic_icon (NautilusBookmark *bookmark); -gboolean nautilus_bookmark_get_exists (NautilusBookmark *bookmark); gboolean nautilus_bookmark_get_xdg_type (NautilusBookmark *bookmark, GUserDirectory *directory); gboolean nautilus_bookmark_get_is_builtin (NautilusBookmark *bookmark); gboolean nautilus_bookmark_get_has_custom_name (NautilusBookmark *bookmark); -void nautilus_bookmark_set_custom_name (NautilusBookmark *bookmark, - const char *new_name); int nautilus_bookmark_compare_with (gconstpointer a, gconstpointer b); diff --git a/libnautilus-private/nautilus-canvas-container.c b/libnautilus-private/nautilus-canvas-container.c index 9f341028b..67a8cb8da 100644 --- a/libnautilus-private/nautilus-canvas-container.c +++ b/libnautilus-private/nautilus-canvas-container.c @@ -5765,15 +5765,14 @@ static NautilusIconInfo * nautilus_canvas_container_get_icon_images (NautilusCanvasContainer *container, NautilusCanvasIconData *data, int size, - gboolean for_drag_accept, - gboolean *has_open_window) + gboolean for_drag_accept) { NautilusCanvasContainerClass *klass; klass = NAUTILUS_CANVAS_CONTAINER_GET_CLASS (container); g_assert (klass->get_icon_images != NULL); - return klass->get_icon_images (container, data, size, for_drag_accept, has_open_window); + return klass->get_icon_images (container, data, size, for_drag_accept); } static void @@ -5880,7 +5879,6 @@ nautilus_canvas_container_update_icon (NautilusCanvasContainer *container, NautilusIconInfo *icon_info; GdkPixbuf *pixbuf; char *editable_text, *additional_text; - gboolean has_open_window; if (icon == NULL) { return; @@ -5902,8 +5900,7 @@ nautilus_canvas_container_update_icon (NautilusCanvasContainer *container, /* Get the icons. */ icon_info = nautilus_canvas_container_get_icon_images (container, icon->data, icon_size, - icon == details->drop_target, - &has_open_window); + icon == details->drop_target); pixbuf = nautilus_icon_info_get_pixbuf (icon_info); g_object_unref (icon_info); @@ -6946,21 +6943,6 @@ nautilus_canvas_container_set_keep_aligned (NautilusCanvasContainer *container, } } -void -nautilus_canvas_container_set_label_position (NautilusCanvasContainer *container, - NautilusCanvasLabelPosition position) -{ - g_return_if_fail (NAUTILUS_IS_CANVAS_CONTAINER (container)); - - if (container->details->label_position != position) { - container->details->label_position = position; - - nautilus_canvas_container_request_update_all_internal (container, TRUE); - - schedule_redo_layout (container); - } -} - /* Switch from automatic to manual layout, freezing all the icons in their * current positions instead of restoring canvas positions from the last manual * layout as set_auto_layout does. @@ -7017,30 +6999,6 @@ nautilus_canvas_container_is_auto_layout (NautilusCanvasContainer *container) return container->details->auto_layout; } -gboolean -nautilus_canvas_container_has_stored_icon_positions (NautilusCanvasContainer *container) -{ - GList *p; - NautilusCanvasIcon *icon; - gboolean have_stored_position; - NautilusCanvasPosition position; - - for (p = container->details->icons; p != NULL; p = p->next) { - icon = p->data; - - have_stored_position = FALSE; - g_signal_emit (container, - signals[GET_STORED_ICON_POSITION], 0, - icon->data, - &position, - &have_stored_position); - if (have_stored_position) { - return TRUE; - } - } - return FALSE; -} - void nautilus_canvas_container_set_single_click_mode (NautilusCanvasContainer *container, gboolean single_click_mode) diff --git a/libnautilus-private/nautilus-canvas-container.h b/libnautilus-private/nautilus-canvas-container.h index 60a72f056..9519b4abe 100644 --- a/libnautilus-private/nautilus-canvas-container.h +++ b/libnautilus-private/nautilus-canvas-container.h @@ -55,10 +55,6 @@ typedef struct { double scale; } NautilusCanvasPosition; -typedef enum { - NAUTILUS_CANVAS_LABEL_POSITION_UNDER, -} NautilusCanvasLabelPosition; - #define NAUTILUS_CANVAS_CONTAINER_TYPESELECT_FLUSH_DELAY 1000000 typedef struct NautilusCanvasContainerDetails NautilusCanvasContainerDetails; @@ -137,8 +133,7 @@ typedef struct { NautilusIconInfo *(* get_icon_images) (NautilusCanvasContainer *container, NautilusCanvasIconData *data, int canvas_size, - gboolean for_drag_accept, - gboolean *has_window_open); + gboolean for_drag_accept); void (* get_icon_text) (NautilusCanvasContainer *container, NautilusCanvasIconData *data, char **editable_text, @@ -252,8 +247,6 @@ void nautilus_canvas_container_set_auto_layout (Nauti gboolean nautilus_canvas_container_is_keep_aligned (NautilusCanvasContainer *container); void nautilus_canvas_container_set_keep_aligned (NautilusCanvasContainer *container, gboolean keep_aligned); -void nautilus_canvas_container_set_label_position (NautilusCanvasContainer *container, - NautilusCanvasLabelPosition pos); void nautilus_canvas_container_sort (NautilusCanvasContainer *container); void nautilus_canvas_container_freeze_icon_positions (NautilusCanvasContainer *container); diff --git a/libnautilus-private/nautilus-canvas-item.c b/libnautilus-private/nautilus-canvas-item.c index b9e399069..318eb5329 100644 --- a/libnautilus-private/nautilus-canvas-item.c +++ b/libnautilus-private/nautilus-canvas-item.c @@ -1662,47 +1662,6 @@ nautilus_canvas_item_get_icon_rectangle (const NautilusCanvasItem *item) return rectangle; } -EelDRect -nautilus_canvas_item_get_text_rectangle (NautilusCanvasItem *item, - gboolean for_layout) -{ - /* FIXME */ - EelIRect icon_rectangle; - EelIRect text_rectangle; - EelDRect ret; - double pixels_per_unit; - gint width, height; - - g_return_val_if_fail (NAUTILUS_IS_CANVAS_ITEM (item), eel_drect_empty); - - icon_rectangle.x0 = item->details->x; - icon_rectangle.y0 = item->details->y; - - pixels_per_unit = EEL_CANVAS_ITEM (item)->canvas->pixels_per_unit; - get_scaled_icon_size (item, &width, &height); - icon_rectangle.x1 = icon_rectangle.x0 + width / pixels_per_unit; - icon_rectangle.y1 = icon_rectangle.y0 + height / pixels_per_unit; - - measure_label_text (item); - - text_rectangle = compute_text_rectangle (item, icon_rectangle, FALSE, - for_layout ? BOUNDS_USAGE_FOR_LAYOUT : BOUNDS_USAGE_FOR_DISPLAY); - - ret.x0 = text_rectangle.x0; - ret.y0 = text_rectangle.y0; - ret.x1 = text_rectangle.x1; - ret.y1 = text_rectangle.y1; - - eel_canvas_item_i2w (EEL_CANVAS_ITEM (item), - &ret.x0, - &ret.y0); - eel_canvas_item_i2w (EEL_CANVAS_ITEM (item), - &ret.x1, - &ret.y1); - - return ret; -} - /* Get the rectangle of the icon only, in canvas coordinates. */ static void get_icon_rectangle (NautilusCanvasItem *item, diff --git a/libnautilus-private/nautilus-canvas-item.h b/libnautilus-private/nautilus-canvas-item.h index a42f3fa12..998a60143 100644 --- a/libnautilus-private/nautilus-canvas-item.h +++ b/libnautilus-private/nautilus-canvas-item.h @@ -84,8 +84,6 @@ gboolean nautilus_canvas_item_hit_test_stretch_handles (NautilusCanvasItem void nautilus_canvas_item_invalidate_label (NautilusCanvasItem *item); void nautilus_canvas_item_invalidate_label_size (NautilusCanvasItem *item); EelDRect nautilus_canvas_item_get_icon_rectangle (const NautilusCanvasItem *item); -EelDRect nautilus_canvas_item_get_text_rectangle (NautilusCanvasItem *item, - gboolean for_layout); void nautilus_canvas_item_get_bounds_for_layout (NautilusCanvasItem *item, double *x1, double *y1, double *x2, double *y2); void nautilus_canvas_item_get_bounds_for_entire_item (NautilusCanvasItem *item, diff --git a/libnautilus-private/nautilus-canvas-private.h b/libnautilus-private/nautilus-canvas-private.h index 0195caff6..6cdd7a6de 100644 --- a/libnautilus-private/nautilus-canvas-private.h +++ b/libnautilus-private/nautilus-canvas-private.h @@ -199,9 +199,6 @@ struct NautilusCanvasContainerDetails { gboolean single_click_mode; gboolean auto_layout; - /* Label position */ - NautilusCanvasLabelPosition label_position; - /* Should the container keep icons aligned to a grid */ gboolean keep_aligned; @@ -264,7 +261,6 @@ char * nautilus_canvas_container_get_icon_drop_target_uri (NautilusCan NautilusCanvasIcon *canvas); void nautilus_canvas_container_update_icon (NautilusCanvasContainer *container, NautilusCanvasIcon *canvas); -gboolean nautilus_canvas_container_has_stored_icon_positions (NautilusCanvasContainer *container); gboolean nautilus_canvas_container_scroll (NautilusCanvasContainer *container, int delta_x, int delta_y); diff --git a/libnautilus-private/nautilus-desktop-link-monitor.c b/libnautilus-private/nautilus-desktop-link-monitor.c index 20e20f2e2..1684ec055 100644 --- a/libnautilus-private/nautilus-desktop-link-monitor.c +++ b/libnautilus-private/nautilus-desktop-link-monitor.c @@ -68,64 +68,6 @@ nautilus_desktop_link_monitor_get (void) return the_link_monitor; } -static void -volume_delete_dialog (GtkWidget *parent_view, - NautilusDesktopLink *link) -{ - GMount *mount; - char *dialog_str; - char *display_name; - - mount = nautilus_desktop_link_get_mount (link); - - if (mount != NULL) { - display_name = nautilus_desktop_link_get_display_name (link); - dialog_str = g_strdup_printf (_("You cannot move the volume “%s” to the trash."), - display_name); - g_free (display_name); - - if (g_mount_can_eject (mount)) { - eel_run_simple_dialog - (parent_view, - FALSE, - GTK_MESSAGE_ERROR, - dialog_str, - _("If you want to eject the volume, please use Eject in the " - "popup menu of the volume."), - _("_OK"), NULL); - } else { - eel_run_simple_dialog - (parent_view, - FALSE, - GTK_MESSAGE_ERROR, - dialog_str, - _("If you want to unmount the volume, please use Unmount Volume in the " - "popup menu of the volume."), - _("_OK"), NULL); - } - - g_object_unref (mount); - g_free (dialog_str); - } -} - -void -nautilus_desktop_link_monitor_delete_link (NautilusDesktopLinkMonitor *monitor, - NautilusDesktopLink *link, - GtkWidget *parent_view) -{ - switch (nautilus_desktop_link_get_link_type (link)) { - case NAUTILUS_DESKTOP_LINK_HOME: - case NAUTILUS_DESKTOP_LINK_TRASH: - case NAUTILUS_DESKTOP_LINK_NETWORK: - /* just ignore. We don't allow you to delete these */ - break; - default: - volume_delete_dialog (parent_view, link); - break; - } -} - static gboolean volume_file_name_used (NautilusDesktopLinkMonitor *monitor, const char *name) diff --git a/libnautilus-private/nautilus-desktop-link-monitor.h b/libnautilus-private/nautilus-desktop-link-monitor.h index ef3493df5..4172f8b6d 100644 --- a/libnautilus-private/nautilus-desktop-link-monitor.h +++ b/libnautilus-private/nautilus-desktop-link-monitor.h @@ -54,10 +54,6 @@ GType nautilus_desktop_link_monitor_get_type (void); NautilusDesktopLinkMonitor * nautilus_desktop_link_monitor_get (void); void nautilus_desktop_link_monitor_shutdown (void); -void nautilus_desktop_link_monitor_delete_link (NautilusDesktopLinkMonitor *monitor, - NautilusDesktopLink *link, - GtkWidget *parent_view); - /* Used by nautilus-desktop-link.c */ char * nautilus_desktop_link_monitor_make_filename_unique (NautilusDesktopLinkMonitor *monitor, const char *filename); diff --git a/libnautilus-private/nautilus-directory-notify.h b/libnautilus-private/nautilus-directory-notify.h index 624d8552e..01f1efc92 100644 --- a/libnautilus-private/nautilus-directory-notify.h +++ b/libnautilus-private/nautilus-directory-notify.h @@ -50,12 +50,6 @@ void nautilus_directory_schedule_metadata_copy (GList *file_pairs); void nautilus_directory_schedule_metadata_move (GList *file_pairs); void nautilus_directory_schedule_metadata_remove (GList *files); -/* Deprecated URI versions: to be converted */ -void nautilus_directory_notify_files_added_by_uri (GList *uris); -void nautilus_directory_notify_files_changed_by_uri (GList *uris); -void nautilus_directory_notify_files_moved_by_uri (GList *uri_pairs); -void nautilus_directory_notify_files_removed_by_uri (GList *uris); - void nautilus_directory_schedule_metadata_copy_by_uri (GList *uri_pairs); void nautilus_directory_schedule_metadata_move_by_uri (GList *uri_pairs); void nautilus_directory_schedule_metadata_remove_by_uri (GList *uris); diff --git a/libnautilus-private/nautilus-directory-private.h b/libnautilus-private/nautilus-directory-private.h index c1cbaf08f..08fc6dc02 100644 --- a/libnautilus-private/nautilus-directory-private.h +++ b/libnautilus-private/nautilus-directory-private.h @@ -199,8 +199,6 @@ Request nautilus_directory_set_up_request (NautilusF /* Interface to the file list. */ NautilusFile * nautilus_directory_find_file_by_name (NautilusDirectory *directory, const char *filename); -NautilusFile * nautilus_directory_find_file_by_internal_filename (NautilusDirectory *directory, - const char *internal_filename); void nautilus_directory_add_file (NautilusDirectory *directory, NautilusFile *file); diff --git a/libnautilus-private/nautilus-directory.c b/libnautilus-private/nautilus-directory.c index 1ab1e51c4..4f408080a 100644 --- a/libnautilus-private/nautilus-directory.c +++ b/libnautilus-private/nautilus-directory.c @@ -753,25 +753,6 @@ nautilus_directory_find_file_by_name (NautilusDirectory *directory, return node == NULL ? NULL : NAUTILUS_FILE (node->data); } -/* "." for the directory-as-file, otherwise the filename */ -NautilusFile * -nautilus_directory_find_file_by_internal_filename (NautilusDirectory *directory, - const char *internal_filename) -{ - NautilusFile *result; - - if (g_strcmp0 (internal_filename, ".") == 0) { - result = nautilus_directory_get_existing_corresponding_file (directory); - if (result != NULL) { - nautilus_file_unref (result); - } - } else { - result = nautilus_directory_find_file_by_name (directory, internal_filename); - } - - return result; -} - void nautilus_directory_emit_files_added (NautilusDirectory *directory, GList *added_files) @@ -1048,44 +1029,6 @@ nautilus_directory_notify_files_added (GList *files) nautilus_profile_end (NULL); } -static void -g_file_pair_free (GFilePair *pair) -{ - g_object_unref (pair->to); - g_object_unref (pair->from); - g_free (pair); -} - -static GList * -uri_pairs_to_file_pairs (GList *uri_pairs) -{ - GList *l, *file_pair_list; - GFilePair *file_pair; - URIPair *uri_pair; - - file_pair_list = NULL; - - for (l = uri_pairs; l != NULL; l = l->next) { - uri_pair = l->data; - file_pair = g_new (GFilePair, 1); - file_pair->from = g_file_new_for_uri (uri_pair->from_uri); - file_pair->to = g_file_new_for_uri (uri_pair->to_uri); - - file_pair_list = g_list_prepend (file_pair_list, file_pair); - } - return g_list_reverse (file_pair_list); -} - -void -nautilus_directory_notify_files_added_by_uri (GList *uris) -{ - GList *files; - - files = nautilus_file_list_from_uris (uris); - nautilus_directory_notify_files_added (files); - g_list_free_full (files, g_object_unref); -} - void nautilus_directory_notify_files_changed (GList *files) { @@ -1123,16 +1066,6 @@ nautilus_directory_notify_files_changed (GList *files) } void -nautilus_directory_notify_files_changed_by_uri (GList *uris) -{ - GList *files; - - files = nautilus_file_list_from_uris (uris); - nautilus_directory_notify_files_changed (files); - g_list_free_full (files, g_object_unref); -} - -void nautilus_directory_notify_files_removed (GList *files) { GHashTable *changed_lists; @@ -1180,16 +1113,6 @@ nautilus_directory_notify_files_removed (GList *files) g_hash_table_destroy (parent_directories); } -void -nautilus_directory_notify_files_removed_by_uri (GList *uris) -{ - GList *files; - - files = nautilus_file_list_from_uris (uris); - nautilus_directory_notify_files_changed (files); - g_list_free_full (files, g_object_unref); -} - static void set_directory_location (NautilusDirectory *directory, GFile *location) @@ -1457,17 +1380,6 @@ nautilus_directory_notify_files_moved (GList *file_pairs) } void -nautilus_directory_notify_files_moved_by_uri (GList *uri_pairs) -{ - GList *file_pairs; - - file_pairs = uri_pairs_to_file_pairs (uri_pairs); - nautilus_directory_notify_files_moved (file_pairs); - g_list_foreach (file_pairs, (GFunc)g_file_pair_free, NULL); - g_list_free (file_pairs); -} - -void nautilus_directory_schedule_position_set (GList *position_setting_list) { GList *p; @@ -1535,25 +1447,6 @@ nautilus_directory_contains_file (NautilusDirectory *directory, return NAUTILUS_DIRECTORY_CLASS (G_OBJECT_GET_CLASS (directory))->contains_file (directory, file); } -char * -nautilus_directory_get_file_uri (NautilusDirectory *directory, - const char *file_name) -{ - GFile *child; - char *result; - - g_return_val_if_fail (NAUTILUS_IS_DIRECTORY (directory), NULL); - g_return_val_if_fail (file_name != NULL, NULL); - - result = NULL; - - child = g_file_get_child (directory->details->location, file_name); - result = g_file_get_uri (child); - g_object_unref (child); - - return result; -} - void nautilus_directory_call_when_ready (NautilusDirectory *directory, NautilusFileAttributes file_attributes, @@ -1789,16 +1682,6 @@ nautilus_directory_list_sort_by_uri (GList *list) return g_list_sort (list, compare_by_uri_cover); } -gboolean -nautilus_directory_is_desktop_directory (NautilusDirectory *directory) -{ - if (directory->details->location == NULL) { - return FALSE; - } - - return nautilus_is_desktop_directory (directory->details->location); -} - #if !defined (NAUTILUS_OMIT_SELF_CHECK) #include <eel/eel-debug.h> diff --git a/libnautilus-private/nautilus-directory.h b/libnautilus-private/nautilus-directory.h index 400c74b36..46040d7d1 100644 --- a/libnautilus-private/nautilus-directory.h +++ b/libnautilus-private/nautilus-directory.h @@ -167,10 +167,6 @@ GFile * nautilus_directory_get_location (NautilusDirector gboolean nautilus_directory_contains_file (NautilusDirectory *directory, NautilusFile *file); -/* Get the uri of the file in the directory, NULL if not found */ -char * nautilus_directory_get_file_uri (NautilusDirectory *directory, - const char *file_name); - /* Get (and ref) a NautilusFile object for this directory. */ NautilusFile * nautilus_directory_get_corresponding_file (NautilusDirectory *directory); @@ -231,9 +227,6 @@ void nautilus_directory_list_free (GList GList * nautilus_directory_list_copy (GList *directory_list); GList * nautilus_directory_list_sort_by_uri (GList *directory_list); -/* Fast way to check if a directory is the desktop directory */ -gboolean nautilus_directory_is_desktop_directory (NautilusDirectory *directory); - gboolean nautilus_directory_is_editable (NautilusDirectory *directory); diff --git a/libnautilus-private/nautilus-dnd.c b/libnautilus-private/nautilus-dnd.c index 9ad7c8c0d..694f295da 100644 --- a/libnautilus-private/nautilus-dnd.c +++ b/libnautilus-private/nautilus-dnd.c @@ -116,19 +116,6 @@ nautilus_drag_destroy_selection_list (GList *list) g_list_free (list); } -char ** -nautilus_drag_uri_array_from_selection_list (const GList *selection_list) -{ - GList *uri_list; - char **uris; - - uri_list = nautilus_drag_uri_list_from_selection_list (selection_list); - uris = nautilus_drag_uri_array_from_list (uri_list); - g_list_free_full (uri_list, g_free); - - return uris; -} - GList * nautilus_drag_uri_list_from_selection_list (const GList *selection_list) { @@ -147,26 +134,6 @@ nautilus_drag_uri_list_from_selection_list (const GList *selection_list) return g_list_reverse (uri_list); } -char ** -nautilus_drag_uri_array_from_list (const GList *uri_list) -{ - const GList *l; - char **uris; - int i; - - if (uri_list == NULL) { - return NULL; - } - - uris = g_new0 (char *, g_list_length ((GList *) uri_list)); - for (i = 0, l = uri_list; l != NULL; l = l->next) { - uris[i++] = g_strdup ((char *) l->data); - } - uris[i] = NULL; - - return uris; -} - GList * nautilus_drag_uri_list_from_array (const char **uris) { @@ -322,17 +289,6 @@ nautilus_drag_items_local (const char *target_uri_string, } gboolean -nautilus_drag_items_in_trash (const GList *selection_list) -{ - /* check if the first item on the list is in trash. - * FIXME: - * we should really test each item but that would be slow for large selections - * and currently dropped items can only be from the same container - */ - return eel_uri_is_trash (((NautilusDragSelectionItem *)selection_list->data)->uri); -} - -gboolean nautilus_drag_items_on_desktop (const GList *selection_list) { char *uri; @@ -663,41 +619,6 @@ nautilus_drag_drag_data_get_from_cache (GList *cache, return TRUE; } -gboolean -nautilus_drag_drag_data_get (GtkWidget *widget, - GdkDragContext *context, - GtkSelectionData *selection_data, - guint info, - guint32 time, - gpointer container_context, - NautilusDragEachSelectedItemIterator each_selected_item_iterator) -{ - GString *result; - - switch (info) { - case NAUTILUS_ICON_DND_GNOME_ICON_LIST: - result = g_string_new (NULL); - (* each_selected_item_iterator) (add_one_gnome_icon, container_context, result); - break; - - case NAUTILUS_ICON_DND_URI_LIST: - case NAUTILUS_ICON_DND_TEXT: - result = g_string_new (NULL); - (* each_selected_item_iterator) (add_one_uri, container_context, result); - break; - - default: - return FALSE; - } - - gtk_selection_data_set (selection_data, - gtk_selection_data_get_target (selection_data), - 8, (guchar *) result->str, result->len); - g_string_free (result, TRUE); - - return TRUE; -} - typedef struct { GMainLoop *loop; diff --git a/libnautilus-private/nautilus-dnd.h b/libnautilus-private/nautilus-dnd.h index 0657aa18c..2b343ce44 100644 --- a/libnautilus-private/nautilus-dnd.h +++ b/libnautilus-private/nautilus-dnd.h @@ -108,17 +108,14 @@ NautilusDragSelectionItem *nautilus_drag_selection_item_new (void); void nautilus_drag_destroy_selection_list (GList *selection_list); GList *nautilus_drag_build_selection_list (GtkSelectionData *data); -char ** nautilus_drag_uri_array_from_selection_list (const GList *selection_list); GList * nautilus_drag_uri_list_from_selection_list (const GList *selection_list); -char ** nautilus_drag_uri_array_from_list (const GList *uri_list); GList * nautilus_drag_uri_list_from_array (const char **uris); gboolean nautilus_drag_items_local (const char *target_uri, const GList *selection_list); gboolean nautilus_drag_uris_local (const char *target_uri, const GList *source_uri_list); -gboolean nautilus_drag_items_in_trash (const GList *selection_list); gboolean nautilus_drag_items_on_desktop (const GList *selection_list); void nautilus_drag_default_drop_action_for_icons (GdkDragContext *context, const char *target_uri, @@ -127,13 +124,6 @@ void nautilus_drag_default_drop_action_for_icons (GdkDragContext * GdkDragAction nautilus_drag_default_drop_action_for_netscape_url (GdkDragContext *context); GdkDragAction nautilus_drag_default_drop_action_for_uri_list (GdkDragContext *context, const char *target_uri_string); -gboolean nautilus_drag_drag_data_get (GtkWidget *widget, - GdkDragContext *context, - GtkSelectionData *selection_data, - guint info, - guint32 time, - gpointer container_context, - NautilusDragEachSelectedItemIterator each_selected_item_iterator); GList *nautilus_drag_create_selection_cache (gpointer container_context, NautilusDragEachSelectedItemIterator each_selected_item_iterator); gboolean nautilus_drag_drag_data_get_from_cache (GList *cache, diff --git a/libnautilus-private/nautilus-entry.c b/libnautilus-private/nautilus-entry.c index 9c470b542..f7405e926 100644 --- a/libnautilus-private/nautilus-entry.c +++ b/libnautilus-private/nautilus-entry.c @@ -63,17 +63,6 @@ nautilus_entry_new (void) return gtk_widget_new (NAUTILUS_TYPE_ENTRY, NULL); } -GtkWidget * -nautilus_entry_new_with_max_length (guint16 max) -{ - GtkWidget *widget; - - widget = gtk_widget_new (NAUTILUS_TYPE_ENTRY, NULL); - gtk_entry_set_max_length (GTK_ENTRY (widget), max); - - return widget; -} - static void nautilus_entry_finalize (GObject *object) { diff --git a/libnautilus-private/nautilus-entry.h b/libnautilus-private/nautilus-entry.h index 4c39d1d80..00149bc46 100644 --- a/libnautilus-private/nautilus-entry.h +++ b/libnautilus-private/nautilus-entry.h @@ -56,7 +56,6 @@ typedef struct { GType nautilus_entry_get_type (void); GtkWidget *nautilus_entry_new (void); -GtkWidget *nautilus_entry_new_with_max_length (guint16 max); void nautilus_entry_set_text (NautilusEntry *entry, const char *text); void nautilus_entry_select_all (NautilusEntry *entry); diff --git a/libnautilus-private/nautilus-file-private.h b/libnautilus-private/nautilus-file-private.h index 47c25dffb..97f6070a3 100644 --- a/libnautilus-private/nautilus-file-private.h +++ b/libnautilus-private/nautilus-file-private.h @@ -175,9 +175,6 @@ struct NautilusFileDetails eel_boolean_bit is_thumbnailing : 1; - /* TRUE if the file is open in a spatial window */ - eel_boolean_bit has_open_window : 1; - eel_boolean_bit is_launcher : 1; eel_boolean_bit is_trusted_link : 1; eel_boolean_bit is_foreign_link : 1; diff --git a/libnautilus-private/nautilus-file-utilities.c b/libnautilus-private/nautilus-file-utilities.c index d669abd13..30d9305fb 100644 --- a/libnautilus-private/nautilus-file-utilities.c +++ b/libnautilus-private/nautilus-file-utilities.c @@ -418,18 +418,6 @@ nautilus_get_templates_directory (void) return g_strdup (g_get_user_special_dir (G_USER_DIRECTORY_TEMPLATES)); } -void -nautilus_create_templates_directory (void) -{ - char *dir; - - dir = nautilus_get_templates_directory (); - if (!g_file_test (dir, G_FILE_TEST_EXISTS)) { - g_mkdir (dir, DEFAULT_NAUTILUS_DIRECTORY_MODE); - } - g_free (dir); -} - char * nautilus_get_templates_directory_uri (void) { @@ -441,22 +429,6 @@ nautilus_get_templates_directory_uri (void) return uri; } -char * -nautilus_get_searches_directory (void) -{ - char *user_dir; - char *searches_dir; - - user_dir = nautilus_get_user_directory (); - searches_dir = g_build_filename (user_dir, "searches", NULL); - g_free (user_dir); - - if (!g_file_test (searches_dir, G_FILE_TEST_EXISTS)) - g_mkdir (searches_dir, DEFAULT_NAUTILUS_DIRECTORY_MODE); - - return searches_dir; -} - /* These need to be reset to NULL when desktop_is_home_dir changes */ static GFile *desktop_dir = NULL; static GFile *desktop_dir_dir = NULL; diff --git a/libnautilus-private/nautilus-file-utilities.h b/libnautilus-private/nautilus-file-utilities.h index de73ff130..23afde9fb 100644 --- a/libnautilus-private/nautilus-file-utilities.h +++ b/libnautilus-private/nautilus-file-utilities.h @@ -51,9 +51,6 @@ GMount * nautilus_get_mounted_mount_for_root (GFile *location); gboolean nautilus_should_use_templates_directory (void); char * nautilus_get_templates_directory (void); char * nautilus_get_templates_directory_uri (void); -void nautilus_create_templates_directory (void); - -char * nautilus_get_searches_directory (void); char * nautilus_compute_title_for_location (GFile *file); diff --git a/libnautilus-private/nautilus-file.c b/libnautilus-private/nautilus-file.c index 8a58529d4..e12e03f80 100644 --- a/libnautilus-private/nautilus-file.c +++ b/libnautilus-private/nautilus-file.c @@ -3374,15 +3374,6 @@ nautilus_file_is_home (NautilusFile *file) } gboolean -nautilus_file_is_in_desktop (NautilusFile *file) -{ - if (file->details->directory->details->location) { - return nautilus_is_desktop_directory (file->details->directory->details->location); - } - return FALSE; -} - -gboolean nautilus_file_is_in_search (NautilusFile *file) { char *uri; @@ -4356,9 +4347,7 @@ nautilus_file_get_gicon (NautilusFile *file, if (((flags & NAUTILUS_FILE_ICON_FLAGS_FOR_DRAG_ACCEPT) || (flags & NAUTILUS_FILE_ICON_FLAGS_FOR_OPEN_FOLDER) || (flags & NAUTILUS_FILE_ICON_FLAGS_USE_MOUNT_ICON) || - (flags & NAUTILUS_FILE_ICON_FLAGS_USE_EMBLEMS) || - ((flags & NAUTILUS_FILE_ICON_FLAGS_IGNORE_VISITING) == 0 && - nautilus_file_has_open_window (file))) && + (flags & NAUTILUS_FILE_ICON_FLAGS_USE_EMBLEMS)) && G_IS_THEMED_ICON (file->details->icon)) { names = g_themed_icon_get_names (G_THEMED_ICON (file->details->icon)); prepend_array = g_ptr_array_new (); @@ -4385,11 +4374,6 @@ nautilus_file_get_gicon (NautilusFile *file, g_ptr_array_add (prepend_array, "folder-open"); } if (is_folder && - (flags & NAUTILUS_FILE_ICON_FLAGS_IGNORE_VISITING) == 0 && - nautilus_file_has_open_window (file)) { - g_ptr_array_add (prepend_array, "folder-visiting"); - } - if (is_folder && (flags & NAUTILUS_FILE_ICON_FLAGS_FOR_DRAG_ACCEPT)) { g_ptr_array_add (prepend_array, "folder-drag-accept"); } @@ -4875,23 +4859,6 @@ nautilus_file_should_show_directory_item_count (NautilusFile *file) return get_speed_tradeoff_preference_for_file (file, show_directory_item_count); } -gboolean -nautilus_file_should_show_type (NautilusFile *file) -{ - char *uri; - gboolean ret; - - g_return_val_if_fail (NAUTILUS_IS_FILE (file), FALSE); - - uri = nautilus_file_get_uri (file); - ret = ((strcmp (uri, "computer:///") != 0) && - (strcmp (uri, "network:///") != 0) && - (strcmp (uri, "smb:///") != 0)); - g_free (uri); - - return ret; -} - /** * nautilus_file_get_directory_item_count * @@ -4995,35 +4962,6 @@ nautilus_file_recompute_deep_counts (NautilusFile *file) } } - -/** - * nautilus_file_get_directory_item_mime_types - * - * Get the list of mime-types present in a directory. - * @file: NautilusFile representing a directory. It is an error to - * call this function on a file that is not a directory. - * @mime_list: Place to put the list of mime-types. - * - * Returns: TRUE if mime-type list is available. - * - **/ -gboolean -nautilus_file_get_directory_item_mime_types (NautilusFile *file, - GList **mime_list) -{ - g_return_val_if_fail (NAUTILUS_IS_FILE (file), FALSE); - g_return_val_if_fail (mime_list != NULL, FALSE); - - if (!nautilus_file_is_directory (file) - || !file->details->got_mime_list) { - *mime_list = NULL; - return FALSE; - } - - *mime_list = g_list_copy_deep (file->details->mime_list, (GCopyFunc) g_strdup, NULL); - return TRUE; -} - gboolean nautilus_file_can_get_size (NautilusFile *file) { @@ -6708,12 +6646,6 @@ nautilus_file_is_symbolic_link (NautilusFile *file) return file->details->is_symlink; } -gboolean -nautilus_file_is_mountpoint (NautilusFile *file) -{ - return file->details->is_mountpoint; -} - GMount * nautilus_file_get_mount (NautilusFile *file) { @@ -7468,25 +7400,6 @@ nautilus_file_invalidate_attributes_internal (NautilusFile *file, } gboolean -nautilus_file_has_open_window (NautilusFile *file) -{ - return file->details->has_open_window; -} - -void -nautilus_file_set_has_open_window (NautilusFile *file, - gboolean has_open_window) -{ - has_open_window = (has_open_window != FALSE); - - if (file->details->has_open_window != has_open_window) { - file->details->has_open_window = has_open_window; - nautilus_file_changed (file); - } -} - - -gboolean nautilus_file_is_thumbnailing (NautilusFile *file) { g_return_val_if_fail (NAUTILUS_IS_FILE (file), FALSE); @@ -7654,23 +7567,6 @@ nautilus_file_list_copy (GList *list) return g_list_copy (nautilus_file_list_ref (list)); } -GList * -nautilus_file_list_from_uris (GList *uri_list) -{ - GList *l, *file_list; - const char *uri; - GFile *file; - - file_list = NULL; - - for (l = uri_list; l != NULL; l = l->next) { - uri = l->data; - file = g_file_new_for_uri (uri); - file_list = g_list_prepend (file_list, file); - } - return g_list_reverse (file_list); -} - static gboolean get_attributes_for_default_sort_type (NautilusFile *file, gboolean *is_recent, diff --git a/libnautilus-private/nautilus-file.h b/libnautilus-private/nautilus-file.h index c5f4546ef..52e10d03c 100644 --- a/libnautilus-private/nautilus-file.h +++ b/libnautilus-private/nautilus-file.h @@ -175,7 +175,6 @@ gboolean nautilus_file_is_mime_type (Nautilu const char *mime_type); gboolean nautilus_file_is_launchable (NautilusFile *file); gboolean nautilus_file_is_symbolic_link (NautilusFile *file); -gboolean nautilus_file_is_mountpoint (NautilusFile *file); GMount * nautilus_file_get_mount (NautilusFile *file); char * nautilus_file_get_volume_free_space (NautilusFile *file); char * nautilus_file_get_volume_name (NautilusFile *file); @@ -191,7 +190,6 @@ gboolean nautilus_file_is_archive (NautilusFile *file); gboolean nautilus_file_is_in_search (NautilusFile *file); gboolean nautilus_file_is_in_trash (NautilusFile *file); gboolean nautilus_file_is_in_recent (NautilusFile *file); -gboolean nautilus_file_is_in_desktop (NautilusFile *file); gboolean nautilus_file_is_in_network (NautilusFile *file); gboolean nautilus_file_is_home (NautilusFile *file); gboolean nautilus_file_is_desktop_directory (NautilusFile *file); @@ -208,9 +206,6 @@ NautilusRequestStatus nautilus_file_get_deep_counts (Nautilu gboolean force); gboolean nautilus_file_should_show_thumbnail (NautilusFile *file); gboolean nautilus_file_should_show_directory_item_count (NautilusFile *file); -gboolean nautilus_file_should_show_type (NautilusFile *file); -gboolean nautilus_file_get_directory_item_mime_types (NautilusFile *file, - GList **mime_list); void nautilus_file_set_search_relevance (NautilusFile *file, gdouble relevance); @@ -436,10 +431,6 @@ GdkPixbuf * nautilus_file_get_icon_pixbuf (Nautilu int scale, NautilusFileIconFlags flags); -gboolean nautilus_file_has_open_window (NautilusFile *file); -void nautilus_file_set_has_open_window (NautilusFile *file, - gboolean has_open_window); - /* Thumbnailing handling */ gboolean nautilus_file_is_thumbnailing (NautilusFile *file); @@ -450,7 +441,6 @@ GList * nautilus_file_list_ref (GList void nautilus_file_list_unref (GList *file_list); void nautilus_file_list_free (GList *file_list); GList * nautilus_file_list_copy (GList *file_list); -GList * nautilus_file_list_from_uris (GList *uri_list); GList * nautilus_file_list_sort_by_display_name (GList *file_list); void nautilus_file_list_call_when_ready (GList *file_list, NautilusFileAttributes attributes, diff --git a/libnautilus-private/nautilus-icon-info.c b/libnautilus-private/nautilus-icon-info.c index 0cafe6343..3566c7c26 100644 --- a/libnautilus-private/nautilus-icon-info.c +++ b/libnautilus-private/nautilus-icon-info.c @@ -578,41 +578,3 @@ nautilus_get_icon_size_for_stock_size (GtkIconSize size) } return NAUTILUS_CANVAS_ICON_SIZE_SMALL; } - - -guint -nautilus_icon_get_emblem_size_for_icon_size (guint size) -{ - if (size >= 96) - return 48; - if (size >= 64) - return 32; - if (size >= 48) - return 24; - if (size >= 24) - return 16; - if (size >= 16) - return 12; - - return 0; /* no emblems for smaller sizes */ -} - -gboolean -nautilus_icon_theme_can_render (GThemedIcon *icon) -{ - GtkIconTheme *icon_theme; - const gchar * const *names; - gint idx; - - names = g_themed_icon_get_names (icon); - - icon_theme = gtk_icon_theme_get_default (); - - for (idx = 0; names[idx] != NULL; idx++) { - if (gtk_icon_theme_has_icon (icon_theme, names[idx])) { - return TRUE; - } - } - - return FALSE; -} diff --git a/libnautilus-private/nautilus-icon-info.h b/libnautilus-private/nautilus-icon-info.h index 4b8cf2cc2..437d352b3 100644 --- a/libnautilus-private/nautilus-icon-info.h +++ b/libnautilus-private/nautilus-icon-info.h @@ -83,9 +83,6 @@ guint nautilus_get_list_icon_size_for_zoom_level (NautilusListZoomLevel guint nautilus_get_canvas_icon_size_for_zoom_level (NautilusCanvasZoomLevel zoom_level); gint nautilus_get_icon_size_for_stock_size (GtkIconSize size); -guint nautilus_icon_get_emblem_size_for_icon_size (guint size); - -gboolean nautilus_icon_theme_can_render (GThemedIcon *icon); G_END_DECLS diff --git a/libnautilus-private/nautilus-query.c b/libnautilus-private/nautilus-query.c index 453fe0a3d..fb7bd487d 100644 --- a/libnautilus-private/nautilus-query.c +++ b/libnautilus-private/nautilus-query.c @@ -209,252 +209,3 @@ nautilus_query_to_readable_string (NautilusQuery *query) return g_strdup_printf (_("Search for “%s”"), query->details->text); } - -static char * -encode_home_uri (const char *uri) -{ - char *home_uri; - const char *encoded_uri; - - home_uri = nautilus_get_home_directory_uri (); - - if (g_str_has_prefix (uri, home_uri)) { - encoded_uri = uri + strlen (home_uri); - if (*encoded_uri == '/') { - encoded_uri++; - } - } else { - encoded_uri = uri; - } - - g_free (home_uri); - - return g_markup_escape_text (encoded_uri, -1); -} - -static char * -decode_home_uri (const char *uri) -{ - char *home_uri; - char *decoded_uri; - - if (g_str_has_prefix (uri, "file:")) { - decoded_uri = g_strdup (uri); - } else { - home_uri = nautilus_get_home_directory_uri (); - - decoded_uri = g_strconcat (home_uri, "/", uri, NULL); - - g_free (home_uri); - } - - return decoded_uri; -} - - -typedef struct { - NautilusQuery *query; - gboolean in_text; - gboolean in_location; - gboolean in_mimetypes; - gboolean in_mimetype; - gboolean error; -} ParserInfo; - -static void -start_element_cb (GMarkupParseContext *ctx, - const char *element_name, - const char **attribute_names, - const char **attribute_values, - gpointer user_data, - GError **err) -{ - ParserInfo *info; - - info = (ParserInfo *) user_data; - - if (strcmp (element_name, "text") == 0) - info->in_text = TRUE; - else if (strcmp (element_name, "location") == 0) - info->in_location = TRUE; - else if (strcmp (element_name, "mimetypes") == 0) - info->in_mimetypes = TRUE; - else if (strcmp (element_name, "mimetype") == 0) - info->in_mimetype = TRUE; -} - -static void -end_element_cb (GMarkupParseContext *ctx, - const char *element_name, - gpointer user_data, - GError **err) -{ - ParserInfo *info; - - info = (ParserInfo *) user_data; - - if (strcmp (element_name, "text") == 0) - info->in_text = FALSE; - else if (strcmp (element_name, "location") == 0) - info->in_location = FALSE; - else if (strcmp (element_name, "mimetypes") == 0) - info->in_mimetypes = FALSE; - else if (strcmp (element_name, "mimetype") == 0) - info->in_mimetype = FALSE; -} - -static void -text_cb (GMarkupParseContext *ctx, - const char *text, - gsize text_len, - gpointer user_data, - GError **err) -{ - ParserInfo *info; - char *t, *uri; - - info = (ParserInfo *) user_data; - - t = g_strndup (text, text_len); - - if (info->in_text) { - nautilus_query_set_text (info->query, t); - } else if (info->in_location) { - uri = decode_home_uri (t); - nautilus_query_set_location (info->query, uri); - g_free (uri); - } else if (info->in_mimetypes && info->in_mimetype) { - nautilus_query_add_mime_type (info->query, t); - } - - g_free (t); - -} - -static void -error_cb (GMarkupParseContext *ctx, - GError *err, - gpointer user_data) -{ - ParserInfo *info; - - info = (ParserInfo *) user_data; - - info->error = TRUE; -} - -static GMarkupParser parser = { - start_element_cb, - end_element_cb, - text_cb, - NULL, - error_cb -}; - - -static NautilusQuery * -nautilus_query_parse_xml (char *xml, gsize xml_len) -{ - ParserInfo info = { NULL }; - GMarkupParseContext *ctx; - - if (xml_len == -1) { - xml_len = strlen (xml); - } - - info.query = nautilus_query_new (); - info.in_text = FALSE; - info.error = FALSE; - - ctx = g_markup_parse_context_new (&parser, 0, &info, NULL); - g_markup_parse_context_parse (ctx, xml, xml_len, NULL); - - if (info.error) { - g_object_unref (info.query); - return NULL; - } - - return info.query; -} - - -NautilusQuery * -nautilus_query_load (char *file) -{ - NautilusQuery *query; - char *xml; - gsize xml_len; - - if (!g_file_test (file, G_FILE_TEST_EXISTS)) { - return NULL; - } - - - g_file_get_contents (file, &xml, &xml_len, NULL); - - if (xml_len == 0) { - return NULL; - } - - query = nautilus_query_parse_xml (xml, xml_len); - g_free (xml); - - return query; -} - -static char * -nautilus_query_to_xml (NautilusQuery *query) -{ - GString *xml; - char *text; - char *uri; - char *mimetype; - GList *l; - - xml = g_string_new (""); - g_string_append (xml, - "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n" - "<query version=\"1.0\">\n"); - - text = g_markup_escape_text (query->details->text, -1); - g_string_append_printf (xml, " <text>%s</text>\n", text); - g_free (text); - - uri = encode_home_uri (query->details->location_uri); - g_string_append_printf (xml, " <location>%s</location>\n", uri); - g_free (uri); - - if (query->details->mime_types) { - g_string_append (xml, " <mimetypes>\n"); - for (l = query->details->mime_types; l != NULL; l = l->next) { - mimetype = g_markup_escape_text (l->data, -1); - g_string_append_printf (xml, " <mimetype>%s</mimetype>\n", mimetype); - g_free (mimetype); - } - g_string_append (xml, " </mimetypes>\n"); - } - - g_string_append (xml, "</query>\n"); - - return g_string_free (xml, FALSE); -} - -gboolean -nautilus_query_save (NautilusQuery *query, char *file) -{ - char *xml; - GError *err = NULL; - gboolean res; - - - res = TRUE; - xml = nautilus_query_to_xml (query); - g_file_set_contents (file, xml, strlen (xml), &err); - g_free (xml); - - if (err != NULL) { - res = FALSE; - g_error_free (err); - } - return res; -} diff --git a/libnautilus-private/nautilus-query.h b/libnautilus-private/nautilus-query.h index 8601ddefc..9ceffe839 100644 --- a/libnautilus-private/nautilus-query.h +++ b/libnautilus-private/nautilus-query.h @@ -63,7 +63,5 @@ void nautilus_query_add_mime_type (NautilusQuery *query, const ch gdouble nautilus_query_matches_string (NautilusQuery *query, const gchar *string); char * nautilus_query_to_readable_string (NautilusQuery *query); -NautilusQuery *nautilus_query_load (char *file); -gboolean nautilus_query_save (NautilusQuery *query, char *file); #endif /* NAUTILUS_QUERY_H */ diff --git a/libnautilus-private/nautilus-trash-monitor.c b/libnautilus-private/nautilus-trash-monitor.c index 7cf15de97..41745b96d 100644 --- a/libnautilus-private/nautilus-trash-monitor.c +++ b/libnautilus-private/nautilus-trash-monitor.c @@ -27,14 +27,12 @@ #include "nautilus-directory-notify.h" #include "nautilus-directory.h" #include "nautilus-file-attributes.h" -#include "nautilus-icon-names.h" #include <eel/eel-debug.h> #include <gio/gio.h> #include <string.h> struct NautilusTrashMonitorDetails { gboolean empty; - GIcon *icon; GFileMonitor *file_monitor; }; @@ -55,9 +53,6 @@ nautilus_trash_monitor_finalize (GObject *object) trash_monitor = NAUTILUS_TRASH_MONITOR (object); - if (trash_monitor->details->icon) { - g_object_unref (trash_monitor->details->icon); - } if (trash_monitor->details->file_monitor) { g_object_unref (trash_monitor->details->file_monitor); } @@ -88,18 +83,6 @@ nautilus_trash_monitor_class_init (NautilusTrashMonitorClass *klass) } static void -update_icon (NautilusTrashMonitor *trash_monitor) -{ - g_clear_object (&trash_monitor->details->icon); - - if (trash_monitor->details->empty) { - trash_monitor->details->icon = g_themed_icon_new (NAUTILUS_ICON_TRASH); - } else { - trash_monitor->details->icon = g_themed_icon_new (NAUTILUS_ICON_TRASH_FULL); - } -} - -static void update_empty_info (NautilusTrashMonitor *trash_monitor, gboolean is_empty) { @@ -108,7 +91,6 @@ update_empty_info (NautilusTrashMonitor *trash_monitor, } trash_monitor->details->empty = is_empty; - update_icon (trash_monitor); /* trash got empty or full, notify everyone who cares */ g_signal_emit (trash_monitor, @@ -195,7 +177,6 @@ nautilus_trash_monitor_init (NautilusTrashMonitor *trash_monitor) NautilusTrashMonitorDetails); trash_monitor->details->empty = TRUE; - update_icon (trash_monitor); location = g_file_new_for_uri ("trash:///"); @@ -237,15 +218,3 @@ nautilus_trash_monitor_is_empty (void) monitor = nautilus_trash_monitor_get (); return monitor->details->empty; } - -GIcon * -nautilus_trash_monitor_get_icon (void) -{ - NautilusTrashMonitor *monitor; - - monitor = nautilus_trash_monitor_get (); - if (monitor->details->icon) { - return g_object_ref (monitor->details->icon); - } - return NULL; -} diff --git a/libnautilus-private/nautilus-ui-utilities.c b/libnautilus-private/nautilus-ui-utilities.c index 71619b325..54eb65dab 100644 --- a/libnautilus-private/nautilus-ui-utilities.c +++ b/libnautilus-private/nautilus-ui-utilities.c @@ -206,29 +206,6 @@ nautilus_pop_up_context_menu (GtkWidget *parent, g_object_unref (gtk_menu); } -GdkPixbuf * -nautilus_ui_get_menu_icon (const char *icon_name, - GtkWidget *parent_widget) -{ - NautilusIconInfo *info; - GdkPixbuf *pixbuf; - int size; - int scale; - - size = nautilus_get_icon_size_for_stock_size (GTK_ICON_SIZE_MENU); - scale = gtk_widget_get_scale_factor (parent_widget); - - if (g_path_is_absolute (icon_name)) { - info = nautilus_icon_info_lookup_from_path (icon_name, size, scale); - } else { - info = nautilus_icon_info_lookup_from_name (icon_name, size, scale); - } - pixbuf = nautilus_icon_info_get_pixbuf_nodefault_at_size (info, size); - g_object_unref (info); - - return pixbuf; -} - char * nautilus_escape_action_name (const char *action_name, const char *prefix) diff --git a/libnautilus-private/nautilus-ui-utilities.h b/libnautilus-private/nautilus-ui-utilities.h index f85dacd26..8b061a4d3 100644 --- a/libnautilus-private/nautilus-ui-utilities.h +++ b/libnautilus-private/nautilus-ui-utilities.h @@ -42,9 +42,6 @@ void nautilus_pop_up_context_menu (GtkWidget *parent, GMenu *menu, GdkEventButton *event); -GdkPixbuf * nautilus_ui_get_menu_icon (const char *icon_name, - GtkWidget *parent_widget); - char * nautilus_escape_action_name (const char *action_name, const char *prefix); void nautilus_ui_frame_image (GdkPixbuf **pixbuf); diff --git a/src/nautilus-canvas-view-container.c b/src/nautilus-canvas-view-container.c index b1c03e016..141daef21 100644 --- a/src/nautilus-canvas-view-container.c +++ b/src/nautilus-canvas-view-container.c @@ -48,8 +48,7 @@ static NautilusIconInfo * nautilus_canvas_view_container_get_icon_images (NautilusCanvasContainer *container, NautilusCanvasIconData *data, int size, - gboolean for_drag_accept, - gboolean *has_window_open) + gboolean for_drag_accept) { NautilusCanvasView *canvas_view; NautilusFile *file; @@ -63,8 +62,6 @@ nautilus_canvas_view_container_get_icon_images (NautilusCanvasContainer *contain canvas_view = get_canvas_view (container); g_return_val_if_fail (canvas_view != NULL, NULL); - *has_window_open = nautilus_file_has_open_window (file); - flags = NAUTILUS_FILE_ICON_FLAGS_USE_EMBLEMS | NAUTILUS_FILE_ICON_FLAGS_USE_THUMBNAILS; diff --git a/src/nautilus-list-model.c b/src/nautilus-list-model.c index 4f4abc38e..c7eb2c1fe 100644 --- a/src/nautilus-list-model.c +++ b/src/nautilus-list-model.c @@ -962,12 +962,6 @@ nautilus_list_model_is_empty (NautilusListModel *model) return (g_sequence_get_length (model->details->files) == 0); } -guint -nautilus_list_model_get_length (NautilusListModel *model) -{ - return g_sequence_get_length (model->details->files); -} - static void nautilus_list_model_remove (NautilusListModel *model, GtkTreeIter *iter) { @@ -1334,30 +1328,6 @@ nautilus_list_model_add_column (NautilusListModel *model, return NAUTILUS_LIST_MODEL_NUM_COLUMNS + (model->details->columns->len - 1); } -int -nautilus_list_model_get_column_number (NautilusListModel *model, - const char *column_name) -{ - int i; - - for (i = 0; i < model->details->columns->len; i++) { - NautilusColumn *column; - char *name; - - column = model->details->columns->pdata[i]; - - g_object_get (G_OBJECT (column), "name", &name, NULL); - - if (!strcmp (name, column_name)) { - g_free (name); - return NAUTILUS_LIST_MODEL_NUM_COLUMNS + i; - } - g_free (name); - } - - return -1; -} - static void nautilus_list_model_dispose (GObject *object) { diff --git a/src/nautilus-list-model.h b/src/nautilus-list-model.h index 266c9bb36..1e2a9b359 100644 --- a/src/nautilus-list-model.h +++ b/src/nautilus-list-model.h @@ -74,7 +74,6 @@ void nautilus_list_model_file_changed (NautilusListMode NautilusFile *file, NautilusDirectory *directory); gboolean nautilus_list_model_is_empty (NautilusListModel *model); -guint nautilus_list_model_get_length (NautilusListModel *model); void nautilus_list_model_remove_file (NautilusListModel *model, NautilusFile *file, NautilusDirectory *directory); @@ -123,8 +122,6 @@ int nautilus_list_model_compare_func (NautilusListModel *model, int nautilus_list_model_add_column (NautilusListModel *model, NautilusColumn *column); -int nautilus_list_model_get_column_number (NautilusListModel *model, - const char *column_name); void nautilus_list_model_subdirectory_done_loading (NautilusListModel *model, NautilusDirectory *directory); diff --git a/src/nautilus-list-view.c b/src/nautilus-list-view.c index 3c8e8a744..1b4b36d93 100644 --- a/src/nautilus-list-view.c +++ b/src/nautilus-list-view.c @@ -3327,9 +3327,3 @@ nautilus_list_view_new (NautilusWindowSlot *slot) "window-slot", slot, NULL); } - -GtkTreeView* -nautilus_list_view_get_tree_view (NautilusListView *list_view) -{ - return list_view->details->tree_view; -} diff --git a/src/nautilus-list-view.h b/src/nautilus-list-view.h index 0edddda77..caeee0830 100644 --- a/src/nautilus-list-view.h +++ b/src/nautilus-list-view.h @@ -53,6 +53,5 @@ typedef struct { GType nautilus_list_view_get_type (void); NautilusView * nautilus_list_view_new (NautilusWindowSlot *slot); -GtkTreeView* nautilus_list_view_get_tree_view (NautilusListView *list_view); #endif /* NAUTILUS_LIST_VIEW_H */ diff --git a/src/nautilus-mime-actions.c b/src/nautilus-mime-actions.c index 0b363b4c8..225138308 100644 --- a/src/nautilus-mime-actions.c +++ b/src/nautilus-mime-actions.c @@ -228,56 +228,6 @@ application_launch_parameters_free (ApplicationLaunchParameters *parameters) g_list_free_full (parameters->uris, g_free); g_free (parameters); -} - -static GList* -filter_nautilus_handler (GList *apps) -{ - GList *l, *next; - GAppInfo *application; - const char *id; - - l = apps; - while (l != NULL) { - application = (GAppInfo *) l->data; - next = l->next; - - id = g_app_info_get_id (application); - if (id != NULL && - strcmp (id, - "nautilus.desktop") == 0) { - g_object_unref (application); - apps = g_list_delete_link (apps, l); - } - - l = next; - } - - return apps; -} - -static GList* -filter_non_uri_apps (GList *apps, - gboolean accept_files) -{ - GList *l, *next; - GAppInfo *app; - - for (l = apps; l != NULL; l = next) { - gboolean support; - - app = l->data; - next = l->next; - support = g_app_info_supports_uris (app); - if (accept_files) { - support |= g_app_info_supports_files (app); - } - if (!support) { - apps = g_list_delete_link (apps, l); - g_object_unref (app); - } - } - return apps; } static gboolean @@ -385,77 +335,6 @@ file_compare_by_parent_uri (NautilusFile *file_a, return ret; } -static int -application_compare_by_name (const GAppInfo *app_a, - const GAppInfo *app_b) -{ - return g_utf8_collate (g_app_info_get_name ((GAppInfo *)app_a), - g_app_info_get_name ((GAppInfo *)app_b)); -} - -static int -application_compare_by_id (const GAppInfo *app_a, - const GAppInfo *app_b) -{ - const char *id_a, *id_b; - - id_a = g_app_info_get_id ((GAppInfo *)app_a); - id_b = g_app_info_get_id ((GAppInfo *)app_b); - - if (id_a == NULL && id_b == NULL) { - if (g_app_info_equal ((GAppInfo *)app_a, (GAppInfo *)app_b)) { - return 0; - } - if ((gsize)app_a < (gsize) app_b) { - return -1; - } - return 1; - } - - if (id_a == NULL) { - return -1; - } - - if (id_b == NULL) { - return 1; - } - - - return strcmp (id_a, id_b); -} - -GList * -nautilus_mime_get_applications_for_file (NautilusFile *file) -{ - char *mime_type; - char *uri_scheme; - GList *result; - GAppInfo *uri_handler; - - if (!nautilus_mime_actions_check_if_required_attributes_ready (file)) { - return NULL; - } - mime_type = nautilus_file_get_mime_type (file); - result = g_app_info_get_all_for_type (mime_type); - - uri_scheme = nautilus_file_get_uri_scheme (file); - if (uri_scheme != NULL) { - uri_handler = g_app_info_get_default_for_uri_scheme (uri_scheme); - if (uri_handler) { - result = g_list_prepend (result, uri_handler); - } - g_free (uri_scheme); - } - - /* Filter out non-uri supporting apps */ - result = filter_non_uri_apps (result, file_has_local_path (file)); - - result = g_list_sort (result, (GCompareFunc) application_compare_by_name); - g_free (mime_type); - - return filter_nautilus_handler (result); -} - GAppInfo * nautilus_mime_get_default_application_for_files (GList *files) { @@ -501,93 +380,6 @@ nautilus_mime_get_default_application_for_files (GList *files) return app; } -/* returns an intersection of two mime application lists, - * and returns a new list, freeing a, b and all applications - * that are not in the intersection set. - * The lists are assumed to be pre-sorted by their IDs */ -static GList * -intersect_application_lists (GList *a, - GList *b) -{ - GList *l, *m; - GList *ret; - GAppInfo *a_app, *b_app; - int cmp; - - ret = NULL; - - l = a; - m = b; - - while (l != NULL && m != NULL) { - a_app = (GAppInfo *) l->data; - b_app = (GAppInfo *) m->data; - - cmp = application_compare_by_id (a_app, b_app); - if (cmp > 0) { - g_object_unref (b_app); - m = m->next; - } else if (cmp < 0) { - g_object_unref (a_app); - l = l->next; - } else { - g_object_unref (b_app); - ret = g_list_prepend (ret, a_app); - l = l->next; - m = m->next; - } - } - - g_list_foreach (l, (GFunc) g_object_unref, NULL); - g_list_foreach (m, (GFunc) g_object_unref, NULL); - - g_list_free (a); - g_list_free (b); - - return g_list_reverse (ret); -} - -GList * -nautilus_mime_get_applications_for_files (GList *files) -{ - GList *l, *sorted_files; - NautilusFile *file; - GList *one_ret, *ret; - - g_assert (files != NULL); - - sorted_files = g_list_sort (g_list_copy (files), (GCompareFunc) file_compare_by_mime_type); - - ret = NULL; - for (l = sorted_files; l != NULL; l = l->next) { - file = l->data; - - if (l->prev && - file_compare_by_mime_type (file, l->prev->data) == 0 && - file_compare_by_parent_uri (file, l->prev->data) == 0) { - continue; - } - - one_ret = nautilus_mime_get_applications_for_file (file); - one_ret = g_list_sort (one_ret, (GCompareFunc) application_compare_by_id); - if (ret != NULL) { - ret = intersect_application_lists (ret, one_ret); - } else { - ret = one_ret; - } - - if (ret == NULL) { - break; - } - } - - g_list_free (sorted_files); - - ret = g_list_sort (ret, (GCompareFunc) application_compare_by_name); - - return ret; -} - static void trash_or_delete_files (GtkWindow *parent_window, const GList *files, diff --git a/src/nautilus-mime-actions.h b/src/nautilus-mime-actions.h index 91ea7bea2..c4e21ea31 100644 --- a/src/nautilus-mime-actions.h +++ b/src/nautilus-mime-actions.h @@ -36,7 +36,6 @@ GAppInfo * nautilus_mime_get_default_application_for_file (Nauti GList * nautilus_mime_get_applications_for_file (NautilusFile *file); GAppInfo * nautilus_mime_get_default_application_for_files (GList *files); -GList * nautilus_mime_get_applications_for_files (GList *file); gboolean nautilus_mime_file_opens_in_view (NautilusFile *file); gboolean nautilus_mime_file_opens_in_external_app (NautilusFile *file); diff --git a/src/nautilus-view.c b/src/nautilus-view.c index e9a7feed9..6c95b9ec4 100644 --- a/src/nautilus-view.c +++ b/src/nautilus-view.c @@ -5721,12 +5721,6 @@ action_detect_media (GSimpleAction *action, nautilus_file_list_free (selection); } -gboolean -nautilus_view_get_show_hidden_files (NautilusView *view) -{ - return view->details->show_hidden_files; -} - const GActionEntry view_entries[] = { /* Toolbar menu */ { "zoom-in", action_zoom_in }, @@ -7355,13 +7349,6 @@ nautilus_view_stop_batching_selection_changes (NautilusView *view) } } -gboolean -nautilus_view_get_active (NautilusView *view) -{ - g_assert (NAUTILUS_IS_VIEW (view)); - return view->details->active; -} - static GArray * real_get_selected_icon_locations (NautilusView *view) { diff --git a/src/nautilus-view.h b/src/nautilus-view.h index effa56988..49cc511ce 100644 --- a/src/nautilus-view.h +++ b/src/nautilus-view.h @@ -291,7 +291,6 @@ char * nautilus_view_get_uri (NautilusView void nautilus_view_display_selection_info (NautilusView *view); GdkAtom nautilus_view_get_copied_files_atom (NautilusView *view); -gboolean nautilus_view_get_active (NautilusView *view); /* Wrappers for signal emitters. These are normally called * only by NautilusView itself. They have corresponding signals @@ -391,7 +390,6 @@ void nautilus_view_update_context_menus (NautilusView *v void nautilus_view_update_toolbar_menus (NautilusView *view); void nautilus_view_update_actions_state (NautilusView *view); -gboolean nautilus_view_get_show_hidden_files (NautilusView *view); void nautilus_view_action_show_hidden_files (NautilusView *view, gboolean show_hidden); diff --git a/src/nautilus-window.c b/src/nautilus-window.c index 15d24b009..ce4c93ff4 100644 --- a/src/nautilus-window.c +++ b/src/nautilus-window.c @@ -603,18 +603,6 @@ nautilus_window_go_to (NautilusWindow *window, GFile *location) location, 0); } -void -nautilus_window_go_to_full (NautilusWindow *window, - GFile *location, - NautilusWindowGoToCallback callback, - gpointer user_data) -{ - g_return_if_fail (NAUTILUS_IS_WINDOW (window)); - - nautilus_window_slot_open_location_full (nautilus_window_get_active_slot (window), - location, 0, NULL, callback, user_data); -} - static int bookmark_list_get_uri_index (GList *list, GFile *location) { @@ -1382,20 +1370,6 @@ nautilus_window_show_sidebar (NautilusWindow *window) setup_side_pane_width (window); } -gboolean -nautilus_window_disable_chrome_mapping (GValue *value, - GVariant *variant, - gpointer user_data) -{ - NautilusWindow *window = user_data; - - g_value_set_boolean (value, - g_variant_get_boolean (variant) && - !window->priv->disable_chrome); - - return TRUE; -} - static inline NautilusWindowSlot * get_first_inactive_slot (NautilusWindow *window) { diff --git a/src/nautilus-window.h b/src/nautilus-window.h index 8dc08eb1f..1612145d1 100644 --- a/src/nautilus-window.h +++ b/src/nautilus-window.h @@ -108,10 +108,6 @@ void nautilus_window_close (NautilusWindow *window void nautilus_window_go_to (NautilusWindow *window, GFile *location); -void nautilus_window_go_to_full (NautilusWindow *window, - GFile *location, - NautilusWindowGoToCallback callback, - gpointer user_data); void nautilus_window_new_tab (NautilusWindow *window); void nautilus_window_view_visible (NautilusWindow *window, @@ -138,11 +134,6 @@ void nautilus_window_reset_menus (NautilusWindow *window); GtkWidget * nautilus_window_get_notebook (NautilusWindow *window); - -gboolean nautilus_window_disable_chrome_mapping (GValue *value, - GVariant *variant, - gpointer user_data); - NautilusWindowOpenFlags nautilus_event_get_window_open_flags (void); void nautilus_window_show_about_dialog (NautilusWindow *window); |