diff options
| author | Alexander Larsson <alexl@redhat.com> | 2003-04-23 09:50:03 +0000 |
|---|---|---|
| committer | Alexander Larsson <alexl@src.gnome.org> | 2003-04-23 09:50:03 +0000 |
| commit | 3e0d21df239dc66b680fc440f4205cac73c68ae9 (patch) | |
| tree | 2025cfd2a59dabce4effb672fc6f2ac4009c2acf /components | |
| parent | 83901c8cd9ca17215e667ee15902fd10192ce811 (diff) | |
| download | nautilus-3e0d21df239dc66b680fc440f4205cac73c68ae9.tar.gz | |
AIX port from Laurent.Vivier@bull.net (Laurent Vivier)
2003-04-23 Alexander Larsson <alexl@redhat.com>
AIX port from Laurent.Vivier@bull.net (Laurent Vivier)
* configure.in:
Look for popt and some aix headers
* components/hardware/Nautilus_View_hardware.server.in.in:
Fix up LIBEXECDIR reference
* components/history/nautilus-history-view.c:
* components/notes/nautilus-notes.c:
* components/throbber/nautilus-throbber.c:
* libnautilus-private/nautilus-icon-canvas-item.c:
* libnautilus-private/nautilus-icon-container.c:
* libnautilus-private/nautilus-icon-dnd.c:
* libnautilus-private/nautilus-program-chooser.c:
* libnautilus-private/nautilus-volume-monitor.h:
* src/nautilus-applicable-views.h:
* src/nautilus-property-browser.c:
* src/nautilus-sidebar-title.c:
* src/file-manager/fm-directory-view.c:
* test/test-nautilus-preferences-change.c: (main):
* test/test.c: (test_quit):
Fix c++ comments and commas at end of enums.
Move math.h includes to top.
* data/Makefile.am:
Remove duplicate definitions
* libnautilus-adapter/Makefile.am:
* libnautilus-private/Makefile.am:
* libnautilus/Makefile.am:
Add correct libs
* libnautilus-private/nautilus-file-private.h:
Bitfields can't be enums.
* libnautilus-private/nautilus-volume-monitor.c:
Implement AIX support.
* src/Makefile.am:
Add POPT_FLAGS
Diffstat (limited to 'components')
| -rw-r--r-- | components/hardware/Nautilus_View_hardware.server.in.in | 2 | ||||
| -rw-r--r-- | components/history/nautilus-history-view.c | 2 | ||||
| -rw-r--r-- | components/notes/nautilus-notes.c | 2 | ||||
| -rw-r--r-- | components/throbber/nautilus-throbber.c | 3 |
4 files changed, 5 insertions, 4 deletions
diff --git a/components/hardware/Nautilus_View_hardware.server.in.in b/components/hardware/Nautilus_View_hardware.server.in.in index 813aceca3..db3ad89c3 100644 --- a/components/hardware/Nautilus_View_hardware.server.in.in +++ b/components/hardware/Nautilus_View_hardware.server.in.in @@ -1,7 +1,7 @@ <oaf_info> <oaf_server iid="OAFIID:Nautilus_Hardware_View_Factory" - type="exe" location="@LIBEXEC@/nautilus-hardware-view"> + type="exe" location="@LIBEXECDIR@/nautilus-hardware-view"> <oaf_attribute name="repo_ids" type="stringv"> <item value="IDL:GNOME/ObjectFactory:1.0"/> </oaf_attribute> diff --git a/components/history/nautilus-history-view.c b/components/history/nautilus-history-view.c index a103f083b..2823c00c7 100644 --- a/components/history/nautilus-history-view.c +++ b/components/history/nautilus-history-view.c @@ -57,7 +57,7 @@ enum { HISTORY_VIEW_COLUMN_ICON, HISTORY_VIEW_COLUMN_NAME, HISTORY_VIEW_COLUMN_BOOKMARK, - HISTORY_VIEW_COLUMN_COUNT, + HISTORY_VIEW_COLUMN_COUNT }; BONOBO_CLASS_BOILERPLATE (NautilusHistoryView, nautilus_history_view, diff --git a/components/notes/nautilus-notes.c b/components/notes/nautilus-notes.c index 30a619301..beaafeeb3 100644 --- a/components/notes/nautilus-notes.c +++ b/components/notes/nautilus-notes.c @@ -59,7 +59,7 @@ /* property bag getting and setting routines */ enum { TAB_IMAGE, - NOTES_URI, + NOTES_URI }; typedef struct { diff --git a/components/throbber/nautilus-throbber.c b/components/throbber/nautilus-throbber.c index cd963e504..8560e3800 100644 --- a/components/throbber/nautilus-throbber.c +++ b/components/throbber/nautilus-throbber.c @@ -26,6 +26,8 @@ */ #include <config.h> +#include <math.h> + #include "nautilus-throbber.h" #include <bonobo/bonobo-ui-toolbar-item.h> @@ -45,7 +47,6 @@ #include <libnautilus-private/nautilus-global-preferences.h> #include <libnautilus-private/nautilus-icon-factory.h> #include <libnautilus-private/nautilus-theme.h> -#include <math.h> #define THROBBER_DEFAULT_TIMEOUT 100 /* Milliseconds Per Frame */ |