summaryrefslogtreecommitdiff
path: root/libnautilus-extensions/nautilus-file-operations-progress.c
diff options
context:
space:
mode:
authorDarin Adler <darin@src.gnome.org>2000-01-31 01:30:16 +0000
committerDarin Adler <darin@src.gnome.org>2000-01-31 01:30:16 +0000
commit58a9b33c333ce9552b5ed1a9c93cf2695136439f (patch)
tree22b70019de0f335873caee33765b339cde5aab6a /libnautilus-extensions/nautilus-file-operations-progress.c
parente250cfd796fe1a2f21549934de911ca8cf7f3ced (diff)
downloadnautilus-58a9b33c333ce9552b5ed1a9c93cf2695136439f.tar.gz
Changed it to not attempt to create a GC just to measure the text. This
* nautilus-icons-view-icon-item.c: (nautilus_icons_view_draw_text_box): Changed it to not attempt to create a GC just to measure the text. This makes it work when the widget is not realized. * nautilus-icons-view-icon-item.h: nautilus-icons-view-icon-item.c: gnome-icon-container-dnd.c: (nautilus_icons_view_icon_item_center_offset): Changed the parameter type to NautilusIconsViewIconItem. * fm-directory-view.c: (stop_load): (fm_directory_view_load_uri): Fixed code so that if you stop loading more than once, or stop before you even start, it won't send extra progress requests to the Nautilus shell or call stop_monitoring extra times on the NautilusDirectory object. * nautilus-icons-view-icon-item.h: nautilus-icons-view-icon-item.c: gnome-icon-container-dnd.c: Quick cleanup of the new NautilusIconsViewIconItem class. * libnautilus/gdk-extensions.c: libnautilus/gnome-icon-container-dnd.c: libnautilus/gnome-icon-container.c: libnautilus/gtkflist.c: libnautilus/nautilus-background-canvas-group.c: libnautilus/nautilus-background.c: libnautilus/nautilus-debug.c: libnautilus/nautilus-default-file-icon.c: libnautilus/nautilus-directory.c: libnautilus/nautilus-icon-factory.c: libnautilus/nautilus-icons-controller.c: libnautilus/nautilus-icons-view-icon-item.c: libnautilus/nautilus-lib-self-check-functions.c: libnautilus/nautilus-self-checks.c: libnautilus/nautilus-string.c: src/explorer-location-bar.c: src/file-manager/dfos-corba.c: src/file-manager/dfos-xfer-progress-dialog.c: src/file-manager/dfos-xfer.c: src/file-manager/dfos.c: src/file-manager/fm-directory-view-icons.c: src/file-manager/fm-directory-view-list.c: src/file-manager/fm-directory-view.c: src/file-manager/fm-icons-controller.c: src/file-manager/fm-main.c: src/nautilus-self-check-functions.c: src/ntl-index-panel.c: Got rid of #ifdef HAVE_CONFIG_H. Elliot says that we must always include <config.h>, but there's no reason to include that ifdef since we don't plan on building without a <config.h> ever.
Diffstat (limited to 'libnautilus-extensions/nautilus-file-operations-progress.c')
-rw-r--r--libnautilus-extensions/nautilus-file-operations-progress.c5
1 files changed, 1 insertions, 4 deletions
diff --git a/libnautilus-extensions/nautilus-file-operations-progress.c b/libnautilus-extensions/nautilus-file-operations-progress.c
index 7e0013147..7e5ad7d1a 100644
--- a/libnautilus-extensions/nautilus-file-operations-progress.c
+++ b/libnautilus-extensions/nautilus-file-operations-progress.c
@@ -21,14 +21,11 @@
Author: Ettore Perazzoli <ettore@gnu.org> */
-#ifdef HAVE_CONFIG_H
#include <config.h>
-#endif
+#include "dfos-xfer-progress-dialog.h"
#include <gnome.h>
-#include "dfos-xfer-progress-dialog.h"
-
#define DIALOG_WIDTH 350 /* FIXME? */