diff options
| author | Darin Adler <darin@src.gnome.org> | 2000-03-08 21:16:21 +0000 |
|---|---|---|
| committer | Darin Adler <darin@src.gnome.org> | 2000-03-08 21:16:21 +0000 |
| commit | 6ba4e1e5e3adce6604d0d09563c99923bc9cc97a (patch) | |
| tree | 2f253460141e3b059b81134004e932a410d6c23b /libnautilus-private/nautilus-icon-factory.h | |
| parent | 886358c4f74f0843ee5d235218e0745c3ea2a64a (diff) | |
| download | nautilus-6ba4e1e5e3adce6604d0d09563c99923bc9cc97a.tar.gz | |
Broke the file part of nautilus-directory.[ch] into nautilus-file.[ch].
* components/music/nautilus-music-view.c,
components/notes/ntl-notes.c, libnautilus/Makefile.am,
libnautilus/nautilus-directory-private.h,
libnautilus/nautilus-directory.h,
libnautilus/nautilus-directory.c,
libnautilus/nautilus-file-private.h, libnautilus/nautilus-file.h,
libnautilus/nautilus-file.c, libnautilus/nautilus-icon-factory.h,
src/ntl-index-panel.c, src/file-manager/fm-directory-view.h:
Broke the file part of nautilus-directory.[ch] into
nautilus-file.[ch].
* libnautilus/nautilus-string.c (nautilus_strstrip): Added more
tests. Changed algorithm on strstrip so it's linear instead of
n^2.
* libnautilus/gnome-icon-container.c
(gnome_icon_container_initialize): Fixed font for "larger" zoom
level. Also made it assert if the font can't be loaded.
* components/help/hyperbola-nav-index.c (despace):
Fixed warning.
* libnautilus/gnome-icon-container-dnd.c,
libnautilus/nautilus-string.h: Whitespace.
* src/file-manager/Makefile.am,
src/file-manager/fm-directory-view.c,
src/file-manager/fm-properties-window.h,
src/file-manager/fm-properties-window.c: Added properties window
hook, but no window yet. The menu item still needs to be added to
the main menus as well as the context menus.
* src/file-manager/fm-directory-view.c,
src/file-manager/fm-directory-view-icons.c,
src/file-manager/fm-icon-text-window.h,
src/file-manager/fm-icon-text-window.c: A little cleanup. Shorter
names.
Diffstat (limited to 'libnautilus-private/nautilus-icon-factory.h')
| -rw-r--r-- | libnautilus-private/nautilus-icon-factory.h | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/libnautilus-private/nautilus-icon-factory.h b/libnautilus-private/nautilus-icon-factory.h index 545211440..3e7bfa903 100644 --- a/libnautilus-private/nautilus-icon-factory.h +++ b/libnautilus-private/nautilus-icon-factory.h @@ -2,7 +2,7 @@ nautilus-icon-factory.h: Class for obtaining icons for files and other objects. - * Copyright (C) 1999, 2000 Red Hat Inc. + Copyright (C) 1999, 2000 Red Hat Inc. Copyright (C) 1999, 2000 Eazel, Inc. This program is free software; you can redistribute it and/or @@ -27,7 +27,8 @@ #define NAUTILUS_ICON_FACTORY_H #include <gdk-pixbuf/gdk-pixbuf.h> -#include <libnautilus/nautilus-directory.h> +#include <libnautilus/nautilus-file.h> +#include <gtk/gtkobject.h> /* NautilusIconFactory is a class that knows how to hand out icons to be * used for representing files and some other objects. It was designed @@ -97,8 +98,8 @@ char * nautilus_icon_factory_get_theme (void); void nautilus_icon_factory_set_theme (const char *theme_name); /* Choose the appropriate icon, but don't render it yet. */ -NautilusScalableIcon *nautilus_icon_factory_get_icon_for_file (NautilusFile *file, - void *controller); +NautilusScalableIcon *nautilus_icon_factory_get_icon_for_file (NautilusFile *file, + void *controller); NautilusScalableIcon *nautilus_icon_factory_get_icon_by_name (const char *icon_name); GList * nautilus_icon_factory_get_emblem_icons_for_file (NautilusFile *file); |