Commit 33a7797c authored by Darin Adler's avatar Darin Adler

Use GnomeCanvasRect instead of EelCanvasRect. We can redo the

	* libnautilus-private/nautilus-icon-container.c:
	(start_rubberbanding):
	Use GnomeCanvasRect instead of EelCanvasRect. We can redo the
	EelCanvasRect optimization if we want to, but it should really
	be put into libgnomecanvas.

	* components/music/common.c:
	* components/music/nautilus-music-view.c:
	* libnautilus-private/nautilus-customization-data.c:
	* libnautilus-private/nautilus-desktop-file-loader.c:
	* libnautilus-private/nautilus-directory-async.c:
	* libnautilus-private/nautilus-directory.c:
	* libnautilus-private/nautilus-file.c:
	* src/file-manager/fm-desktop-icon-view.c:
	* src/file-manager/fm-icon-view.c:
	* src/nautilus-property-browser.c:
	* src/nautilus-sidebar-title.c:
	* src/nautilus-window.c:
	Remove lots of unneeded includes, including all cases of
	including the locale-sensitive <ctype.h>.
parent 3ae61117
2002-01-03 Darin Adler <darin@bentspoon.com>
* libnautilus-private/nautilus-icon-container.c:
(start_rubberbanding):
Use GnomeCanvasRect instead of EelCanvasRect. We can redo the
EelCanvasRect optimization if we want to, but it should really
be put into libgnomecanvas.
* components/music/common.c:
* components/music/nautilus-music-view.c:
* libnautilus-private/nautilus-customization-data.c:
* libnautilus-private/nautilus-desktop-file-loader.c:
* libnautilus-private/nautilus-directory-async.c:
* libnautilus-private/nautilus-directory.c:
* libnautilus-private/nautilus-file.c:
* src/file-manager/fm-desktop-icon-view.c:
* src/file-manager/fm-icon-view.c:
* src/nautilus-property-browser.c:
* src/nautilus-sidebar-title.c:
* src/nautilus-window.c:
Remove lots of unneeded includes, including all cases of
including the locale-sensitive <ctype.h>.
2002-01-03 Darin Adler <darin@bentspoon.com>
* libnautilus-private/nautilus-global-preferences.c:
......
#include <ctype.h>
#include "config.h"
#include <stdlib.h>
#include <signal.h>
......@@ -6,8 +7,6 @@
#include <sys/stat.h>
#include <fcntl.h>
#include "config.h"
/* #ifdef HAVE_MMAP */
#if 0
#include <sys/mman.h>
......
......@@ -30,13 +30,7 @@
#include "mp3head.h"
#include "mpg123.h"
#include "pixmaps.h"
#include <eel/eel-background.h>
#include <libnautilus-private/nautilus-directory-background.h>
#include <libnautilus-private/nautilus-directory-notify.h>
#include <libnautilus-private/nautilus-file-attributes.h>
#include <libnautilus-private/nautilus-file-utilities.h>
#include <libnautilus-private/nautilus-file.h>
#include <eel/eel-gdk-extensions.h>
#include <eel/eel-gdk-font-extensions.h>
#include <eel/eel-gdk-pixbuf-extensions.h>
......@@ -46,29 +40,27 @@
#include <eel/eel-image.h>
#include <eel/eel-list.h>
#include <eel/eel-preferences.h>
#include <libnautilus-private/nautilus-global-preferences.h>
#include <libnautilus-private/nautilus-font-factory.h>
#include <libnautilus-private/nautilus-metadata.h>
#include <libnautilus-private/nautilus-sound.h>
#include <eel/eel-stock-dialogs.h>
#include <eel/eel-string.h>
#include <eel/eel-string.h>
#include <libnautilus/libnautilus.h>
#include <gnome.h>
#include <libgnomevfs/gnome-vfs.h>
#include <esd.h>
#include <fcntl.h>
#include <gdk-pixbuf/gdk-pixbuf.h>
#include <gtk/gtkadjustment.h>
#include <gtk/gtksignal.h>
#include <gtk/gtkeventbox.h>
#include <esd.h>
#include <gtk/gtksignal.h>
#include <libnautilus-private/nautilus-directory-background.h>
#include <libnautilus-private/nautilus-directory-notify.h>
#include <libnautilus-private/nautilus-file-attributes.h>
#include <libnautilus-private/nautilus-file-utilities.h>
#include <libnautilus-private/nautilus-file.h>
#include <libnautilus-private/nautilus-font-factory.h>
#include <libnautilus-private/nautilus-global-preferences.h>
#include <libnautilus-private/nautilus-metadata.h>
#include <libnautilus-private/nautilus-sound.h>
#include <limits.h>
#include <sys/stat.h>
#include <sys/types.h>
#include <ctype.h>
#include <fcntl.h>
#include <limits.h>
#define SCALED_IMAGE_WIDTH 108
#define SCALED_IMAGE_HEIGHT 108
......
......@@ -26,22 +26,8 @@
names and imges */
#include <config.h>
#include <ctype.h>
#include <libgnome/gnome-util.h>
#include <libgnome/gnome-i18n.h>
#include <libxml/parser.h>
#include <libxml/xmlmemory.h>
#include <glib.h>
#include <gdk-pixbuf/gdk-pixbuf.h>
#include <gtk/gtk.h>
#include <libgnomevfs/gnome-vfs.h>
#include <string.h>
#include <stdlib.h>
#include "nautilus-customization-data.h"
#include "nautilus-file-utilities.h"
#include <eel/eel-gdk-extensions.h>
#include <eel/eel-gdk-extensions.h>
......@@ -50,6 +36,17 @@
#include <eel/eel-gtk-extensions.h>
#include <eel/eel-string.h>
#include <eel/eel-xml-extensions.h>
#include <gdk-pixbuf/gdk-pixbuf.h>
#include <glib.h>
#include <gtk/gtk.h>
#include <libgnome/gnome-i18n.h>
#include <libgnome/gnome-util.h>
#include <libgnomevfs/gnome-vfs-directory.h>
#include <libgnomevfs/gnome-vfs-utils.h>
#include <libxml/parser.h>
#include <libxml/xmlmemory.h>
#include <stdlib.h>
#include <string.h>
typedef enum {
READ_PUBLIC_CUSTOMIZATIONS,
......
......@@ -36,7 +36,6 @@
#include <stdlib.h>
#include <stdio.h>
#include <errno.h>
#include <ctype.h>
#include <locale.h>
#include <iconv.h>
#include <langinfo.h>
......
......@@ -35,7 +35,6 @@
#include "nautilus-link.h"
#include "nautilus-search-uri.h"
#include <eel/eel-string.h>
#include <ctype.h>
#include <libxml/parser.h>
#include <libxml/xmlmemory.h>
#include <gtk/gtkmain.h>
......
......@@ -36,7 +36,6 @@
#include "nautilus-metafile.h"
#include "nautilus-trash-directory.h"
#include "nautilus-vfs-directory.h"
#include <ctype.h>
#include <eel/eel-glib-extensions.h>
#include <eel/eel-gtk-macros.h>
#include <eel/eel-string.h>
......
......@@ -38,7 +38,6 @@
#include "nautilus-trash-directory.h"
#include "nautilus-trash-file.h"
#include "nautilus-vfs-file.h"
#include <ctype.h>
#include <eel/eel-glib-extensions.h>
#include <eel/eel-gtk-extensions.h>
#include <eel/eel-gtk-macros.h>
......
......@@ -34,9 +34,7 @@
#include "nautilus-lib-self-check-functions.h"
#include "nautilus-marshal.h"
#include "nautilus-theme.h"
#include <ctype.h>
#include <eel/eel-background.h>
#include <eel/eel-canvas-rect.h>
#include <eel/eel-gdk-pixbuf-extensions.h>
#include <eel/eel-glib-extensions.h>
#include <eel/eel-gnome-extensions.h>
......@@ -45,6 +43,7 @@
#include <eel/eel-marshal.h>
#include <eel/eel-string.h>
#include <libgnomecanvas/gnome-canvas-pixbuf.h>
#include <libgnomecanvas/gnome-canvas-rect-ellipse.h>
#include <gdk/gdkkeysyms.h>
#include <gtk/gtklayout.h>
#include <gtk/gtkmain.h>
......@@ -1567,7 +1566,7 @@ start_rubberbanding (NautilusIconContainer *container,
band_info->selection_rectangle = gnome_canvas_item_new
(gnome_canvas_root
(GNOME_CANVAS (container)),
eel_canvas_rect_get_type (),
GNOME_TYPE_CANVAS_RECT,
"x1", band_info->start_x,
"y1", band_info->start_y,
"x2", band_info->start_x,
......@@ -1586,7 +1585,7 @@ start_rubberbanding (NautilusIconContainer *container,
band_info->selection_rectangle = gnome_canvas_item_new
(gnome_canvas_root
(GNOME_CANVAS (container)),
eel_canvas_rect_get_type (),
GNOME_TYPE_CANVAS_RECT,
"x1", band_info->start_x,
"y1", band_info->start_y,
"x2", band_info->start_x,
......
......@@ -30,7 +30,6 @@
#include <X11/Xatom.h>
#include <bonobo/bonobo-ui-util.h>
#include <gtk/gtkmain.h>
#include <ctype.h>
#include <dirent.h>
#include <eel/eel-glib-extensions.h>
#include <eel/eel-gnome-extensions.h>
......
......@@ -28,7 +28,6 @@
#include "fm-desktop-icon-view.h"
#include "fm-error-reporting.h"
#include <bonobo/bonobo-ui-util.h>
#include <ctype.h>
#include <eel/eel-background.h>
#include <eel/eel-glib-extensions.h>
#include <eel/eel-gtk-extensions.h>
......
......@@ -42,7 +42,6 @@
#include <bonobo/bonobo-exception.h>
#include <bonobo/bonobo-property-bag-client.h>
#include <bonobo/bonobo-ui-util.h>
#include <ctype.h>
#include <eel/eel-gdk-extensions.h>
#include <eel/eel-gdk-pixbuf-extensions.h>
#include <eel/eel-generous-bin.h>
......
......@@ -42,7 +42,6 @@
#include <bonobo/bonobo-exception.h>
#include <bonobo/bonobo-property-bag-client.h>
#include <bonobo/bonobo-ui-util.h>
#include <ctype.h>
#include <eel/eel-gdk-extensions.h>
#include <eel/eel-gdk-pixbuf-extensions.h>
#include <eel/eel-generous-bin.h>
......
......@@ -32,7 +32,6 @@
#include "nautilus-property-browser.h"
#include "nautilus-signaller.h"
#include <ctype.h>
#include <eel/eel-background.h>
#include <eel/eel-gdk-extensions.h>
#include <eel/eel-gdk-pixbuf-extensions.h>
......
......@@ -32,7 +32,6 @@
#include <bonobo/bonobo-exception.h>
#include <bonobo/bonobo-property-bag-client.h>
#include <ctype.h>
#include <eel/eel-background.h>
#include <eel/eel-gdk-extensions.h>
#include <eel/eel-gdk-font-extensions.h>
......
......@@ -42,7 +42,6 @@
#include <bonobo/bonobo-exception.h>
#include <bonobo/bonobo-property-bag-client.h>
#include <bonobo/bonobo-ui-util.h>
#include <ctype.h>
#include <eel/eel-gdk-extensions.h>
#include <eel/eel-gdk-pixbuf-extensions.h>
#include <eel/eel-generous-bin.h>
......
......@@ -42,7 +42,6 @@
#include <bonobo/bonobo-exception.h>
#include <bonobo/bonobo-property-bag-client.h>
#include <bonobo/bonobo-ui-util.h>
#include <ctype.h>
#include <eel/eel-gdk-extensions.h>
#include <eel/eel-gdk-pixbuf-extensions.h>
#include <eel/eel-generous-bin.h>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment