diff options
| author | Darin Adler <darin@src.gnome.org> | 2000-10-25 23:16:44 +0000 |
|---|---|---|
| committer | Darin Adler <darin@src.gnome.org> | 2000-10-25 23:16:44 +0000 |
| commit | afb740a8ca92757654c6bfb53ee6dba26405a269 (patch) | |
| tree | 3fae6bc62394622e0333a0e13f026f998cae7259 /components/services/trilobite | |
| parent | 391dfdf4ad7e82a052fc41b51d845121622cbaa9 (diff) | |
| download | nautilus-afb740a8ca92757654c6bfb53ee6dba26405a269.tar.gz | |
New set of functions for manipulating a set of case-insensitive strings
* libnautilus-extensions/nautilus-directory-private.h:
* libnautilus-extensions/nautilus-directory.h:
* libnautilus-extensions/nautilus-file-private.h:
* libnautilus-extensions/nautilus-directory-async.c: (istr_equal),
(istr_hash), (istr_set_new), (istr_set_insert), (add_istr_to_list),
(istr_set_get_as_list), (istr_set_destroy): New set of functions
for manipulating a set of case-insensitive strings (private for
now).
(mime_list_cancel): Change to use the istr_set.
(get_filter_options_for_directory_count): Moved up so it can be
used by the directory load code.
(load_directory_done): Common function to use when a load is
completed or cancelled.
(dequeue_pending_idle_callback): Update file count and MIME list
as well as just loading the files.
(should_get_directory_count): New cover that takes into account
the fact that a directory load is already getting the count.
(should_get_mime_list): New cover that takes into account
the fact that a directory load is already getting the MIME list.
(start_monitoring_file_list): Set up more stuff since a load
does a lot more now.
(directory_count_start): Don't start a directory count if we are
already loading the directory's file list.
(mime_list_one), (mime_list_callback), (mime_list_load): Change to
use the istr_set. Also removed some code that set variables that
were never used.
(mime_list_start): Don't start a MIME list if we are already
loading the directory's file list.
* components/adapter/Makefile.am:
* components/hardware/Makefile.am:
* components/html/Makefile.am:
* components/loser/content/Makefile.am:
* components/loser/sidebar/Makefile.am:
* components/mozilla/Makefile.am:
* components/music/Makefile.am:
* components/rpmview/Makefile.am:
* components/sample/Makefile.am:
* components/services/install/command-line/Makefile.am:
* components/services/install/lib/Makefile.am:
* components/services/install/nautilus-view/Makefile.am:
* components/services/install/server/Makefile.am:
* components/services/inventory/lib/Makefile.am:
* components/services/inventory/nautilus-view/Makefile.am:
* components/services/login/nautilus-view/Makefile.am:
* components/services/nautilus-dependent-shared/Makefile.am:
* components/services/summary/lib/Makefile.am:
* components/services/summary/nautilus-view/Makefile.am:
* components/services/time/command-line/Makefile.am:
* components/services/time/nautilus-view/Makefile.am:
* components/services/time/service/Makefile.am:
* components/services/trilobite/libtrilobite/Makefile.am:
* components/services/trilobite/sample/command-line/Makefile.am:
* components/services/trilobite/sample/lib/Makefile.am:
* components/services/trilobite/sample/nautilus-view/Makefile.am:
* components/services/trilobite/sample/service/Makefile.am:
* components/services/vault/command-line/Makefile.am:
* components/tree/Makefile.am:
* helper-utilities/authenticate/Makefile.am:
* nautilus-installer/src/Makefile.am:
Changed all use of CPPFLAGS to use INCLUDES instead as it says in
the automake documentation.
* libnautilus-extensions/nautilus-glib-extensions.h: Reformatting.
* libnautilus-extensions/nautilus-glib-extensions.c:
(nautilus_g_hash_table_remove_deep_custom),
(nautilus_g_hash_table_remove_deep), (destroy_deep_helper),
(nautilus_g_hash_table_destroy_deep_custom): Reformatting.
Diffstat (limited to 'components/services/trilobite')
5 files changed, 11 insertions, 26 deletions
diff --git a/components/services/trilobite/libtrilobite/Makefile.am b/components/services/trilobite/libtrilobite/Makefile.am index 69501d3ed..a3e733036 100644 --- a/components/services/trilobite/libtrilobite/Makefile.am +++ b/components/services/trilobite/libtrilobite/Makefile.am @@ -2,14 +2,11 @@ NULL = lib_LTLIBRARIES = libtrilobite.la libtrilobite-service.la -CPPFLAGS = \ - -DPREFIX=\"$(prefix)\" \ - -DG_LOG_DOMAIN=\"libtrilobite\" \ - -DSTANDALONE \ - -DTRILOBITE_VERSION=\"0.1.0\" \ - $(NULL) - INCLUDES = \ + -DPREFIX=\"$(prefix)\" \ + -DG_LOG_DOMAIN=\"libtrilobite\" \ + -DSTANDALONE \ + -DTRILOBITE_VERSION=\"0.1.0\" \ -I$(srcdir) \ -I$(top_srcdir) \ -I$(top_builddir) \ diff --git a/components/services/trilobite/sample/command-line/Makefile.am b/components/services/trilobite/sample/command-line/Makefile.am index cf9dbba8e..acea4bccf 100644 --- a/components/services/trilobite/sample/command-line/Makefile.am +++ b/components/services/trilobite/sample/command-line/Makefile.am @@ -1,11 +1,8 @@ NULL = -CPPFLAGS = \ +INCLUDES = \ -DPREFIX=\"$(prefix)\" \ -DG_LOG_DOMAIN=\"trilobite-sample-client\" \ - $(NULL) - -INCLUDES = \ -I$(top_srcdir) \ -I$(top_builddir) \ -I$(top_srcdir)/components/services/trilobite \ diff --git a/components/services/trilobite/sample/lib/Makefile.am b/components/services/trilobite/sample/lib/Makefile.am index 0f6686bca..d31a77aaa 100644 --- a/components/services/trilobite/sample/lib/Makefile.am +++ b/components/services/trilobite/sample/lib/Makefile.am @@ -1,12 +1,9 @@ NULL = -CPPFLAGS = \ +INCLUDES = \ -DPREFIX=\"$(prefix)\" \ -DG_LOG_DOMAIN=\"trilobite-sample-service\" \ -DSTANDALONE \ - $(NULL) - -INCLUDES = \ -I$(top_srcdir) \ -I$(top_builddir) \ -I$(top_srcdir)/components/services/trilobite \ diff --git a/components/services/trilobite/sample/nautilus-view/Makefile.am b/components/services/trilobite/sample/nautilus-view/Makefile.am index 5f707d1ee..34c153d69 100644 --- a/components/services/trilobite/sample/nautilus-view/Makefile.am +++ b/components/services/trilobite/sample/nautilus-view/Makefile.am @@ -2,12 +2,9 @@ NULL = SUBDIRS = icons -CPPFLAGS = \ - -DPREFIX=\"$(prefix)\" \ - -DG_LOG_DOMAIN=\"trilobite-sample-service\" \ - $(NULL) - INCLUDES = \ + -DPREFIX=\"$(prefix)\" \ + -DG_LOG_DOMAIN=\"trilobite-sample-service\" \ -I$(top_srcdir) \ -I$(top_srcdir)/components/services/trilobite/libtrilobite \ -I$(top_srcdir)/components/services/trilobite/sample/lib \ diff --git a/components/services/trilobite/sample/service/Makefile.am b/components/services/trilobite/sample/service/Makefile.am index fe2e5a196..e21826898 100644 --- a/components/services/trilobite/sample/service/Makefile.am +++ b/components/services/trilobite/sample/service/Makefile.am @@ -1,12 +1,9 @@ NULL = -CPPFLAGS = \ - -DPREFIX=\"$(prefix)\" \ - -DG_LOG_DOMAIN=\"trilobite-sample-service\" \ - -DGNOMELOCALEDIR=\""$(datadir)/locale"\" \ - $(NULL) - INCLUDES = \ + -DPREFIX=\"$(prefix)\" \ + -DG_LOG_DOMAIN=\"trilobite-sample-service\" \ + -DGNOMELOCALEDIR=\""$(datadir)/locale"\" \ -I$(top_srcdir) \ -I$(top_builddir) \ -I$(top_srcdir)/components/services/trilobite \ |