Commit e70bc86e authored by Marek Kašík's avatar Marek Kašík

Port gnome-search-tool to GSettings

This commit migrates gnome-search-tool from GConf2 to GSettings.
It adds new key "search-history" which is a dictionary where values
are lists of strings and removes getting of nautilus key "date-format"
because it was removed from nautilus.
This commit also contains conversion file gnome-search-tool.convert for data
conversion (#632429).
parent 87471598
......@@ -38,15 +38,9 @@ LT_INIT([disable-static])
AC_CACHE_SAVE
GLIB_GSETTINGS
AM_GCONF_SOURCE_2
GNOME_DOC_INIT
AC_PATH_PROG(GCONFTOOL, [gconftool-2], [no])
AS_IF([test "x$GCONFTOOL" = "xno"],
[AC_MSG_ERROR([gconftool-2 executable not found in your path - should be installed with GConf])]
)
dnl strftime extension checks
msg_strftime=no
......@@ -89,13 +83,14 @@ AS_IF([test x$withval != x],
AC_SUBST(GREP_COMMAND)
GLIB_MIN_VERSION=2.30.0
GIO_MIN_VERSION=2.30.0
GTK_MIN_VERSION=3.0.0
PKG_CHECK_MODULES(GSEARCHTOOL,
gio-unix-2.0
gio-unix-2.0 >= $GIO_MIN_VERSION
gio-2.0 >= $GIO_MIN_VERSION
glib-2.0 >= $GLIB_MIN_VERSION
gtk+-3.0 >= $GTK_MIN_VERSION
gconf-2.0)
gtk+-3.0 >= $GTK_MIN_VERSION)
AC_CONFIG_FILES([
Makefile
......
......@@ -3,10 +3,14 @@ icon_DATA = thumbnail_frame.png
man_MANS = gnome-search-tool.1
schemadir = $(GCONF_SCHEMA_FILE_DIR)
schema_in_file = gnome-search-tool.schemas.in
schema_DATA = $(schema_in_file:.schemas.in=.schemas)
@INTLTOOL_SCHEMAS_RULE@
@INTLTOOL_XML_NOMERGE_RULE@
gsettings_SCHEMAS = org.gnome.gnome-search-tool.gschema.xml
@GSETTINGS_RULES@
gsettingsconvertdir = $(datadir)/GConf/gsettings
gsettingsconvert_DATA = gnome-search-tool.convert
Utilitiesdir = $(datadir)/applications
Utilities_in_files = gnome-search-tool.desktop.in
......@@ -16,22 +20,14 @@ Utilities_DATA = $(Utilities_in_files:.desktop.in=.desktop)
EXTRA_DIST = \
$(icon_DATA) \
$(man_MANS) \
$(schema_in_file) \
org.gnome.gnome-search-tool.gschema.xml.in \
$(Utilities_in_files) \
$(Utilities_DATA)
if GCONF_SCHEMAS_INSTALL
install-data-local:
if test -z "$(DESTDIR)" ; then \
GCONF_CONFIG_SOURCE=$(GCONF_SCHEMA_CONFIG_SOURCE) $(GCONFTOOL) --makefile-install-rule $(top_builddir)/data/$(schema_DATA) ; \
fi
else
install-data-local:
endif
$(Utilities_DATA) \
gnome-search-tool.convert
CLEANFILES = \
gnome-search-tool.desktop \
$(schema_DATA)
$(gsettings_SCHEMAS)
disthook:
cd $(distdir) ; rm -f $(CLEANFILES)
[org.gnome.gnome-search-tool]
show-additional-options=/apps/gnome-search-tool/show_additional_options
disable-quick-search=/apps/gnome-search-tool/disable_quick_search
quick-search-excluded-paths=/apps/gnome-search-tool/quick_search_excluded_paths
disable-quick-search-second-scan=/apps/gnome-search-tool/disable_quick_search_second-scan
quick-search-second-scan-excluded-paths=/apps/gnome-search-tool/quick_search_second_scan_excluded_paths
columns-order=/apps/gnome-search-tool/columns_order
default-window-width=/apps/gnome-search-tool/default_window_width
default-window-height=/apps/gnome-search-tool/default_window_height
default-window-maximized=/apps/gnome-search-tool/default_window_maximized
look-in-folder=/apps/gnome-search-tool/look_in_folder
[org.gnome.gnome-search-tool.select]
contains-the-text=/apps/gnome-search-tool/select/contains_the_text
date-modified-less-than=/apps/gnome-search-tool/select/date_modified_less_than
date-modified-more-than=/apps/gnome-search-tool/select/date_modified_more_than
size-at-least=/apps/gnome-search-tool/select/size_at_least
size-at-most=/apps/gnome-search-tool/select/size_at_most
file-is-empty=/apps/gnome-search-tool/select/file_is_empty
owned-by-user=/apps/gnome-search-tool/select/owned_by_user
owned-by-group=/apps/gnome-search-tool/select/owned_by_group
owner-is-unrecognized=/apps/gnome-search-tool/select/owner_is_unrecognized
name-does-not-contain=/apps/gnome-search-tool/select/name_does_not_contain
name-matches-regular-expression=/apps/gnome-search-tool/select/name_matches_regular_expression
show-hidden-files-and-folders=/apps/gnome-search-tool/select/show_hidden_files_and_folders
follow-symbolic-links=/apps/gnome-search-tool/select/follow_symbolic_links
exclude-other-filesystems=/apps/gnome-search-tool/select/exclude_other_filesystems
<gconfschemafile>
<!--
Note: all double hyphens in this comment have a space in the middle
because double hyphen isn't allowed in comments. So, remove the space
before use.
To install this file type:
gconftool - -install-schema-file gnome-search-tool.schemas
You probably want your "make install" to do this for real applications.
Also, you probably want a configure option so people can retarget where the
schema file gets installed. The option should be called - -gconf-config-source=blah
To change the gconftool target use the - -config-source=blah option to gconftool.
-->
<schemalist>
<schema>
<applyto>/apps/gnome-search-tool/show_additional_options</applyto>
<key>/schemas/apps/gnome-search-tool/show_additional_options</key>
<owner>gnome-search-tool</owner>
<type>bool</type>
<default>FALSE</default>
<locale name="C">
<short>Show Additional Options</short>
<long><!-- Translators: The quoted text is the label of the additional
options expander that is translated elsewhere. -->
This key determines if the "Select more options" section
is expanded when the search tool is started.
</long>
</locale>
</schema>
<schema>
<applyto>/apps/gnome-search-tool/select/contains_the_text</applyto>
<key>/schemas/apps/gnome-search-tool/select/contains_the_text</key>
<owner>gnome-search-tool</owner>
<type>bool</type>
<default>TRUE</default>
<locale name="C">
<short><!-- Translators: The quoted text is the label of an available
search option that is translated elsewhere. -->Select the search option
"Contains the text"</short>
<long>
This key determines if the "Contains the text" search option is
selected when the search tool is started.
</long>
</locale>
</schema>
<schema>
<applyto>/apps/gnome-search-tool/select/date_modified_less_than</applyto>
<key>/schemas/apps/gnome-search-tool/select/date_modified_less_than</key>
<owner>gnome-search-tool</owner>
<type>bool</type>
<default>FALSE</default>
<locale name="C">
<short><!-- Translators: The quoted text is the label of an available
search option that is translated elsewhere. -->Select the search option
"Date modified less than"</short>
<long>
This key determines if the "Date modified less than" search option
is selected when the search tool is started.
</long>
</locale>
</schema>
<schema>
<applyto>/apps/gnome-search-tool/select/date_modified_more_than</applyto>
<key>/schemas/apps/gnome-search-tool/select/date_modified_more_than</key>
<owner>gnome-search-tool</owner>
<type>bool</type>
<default>FALSE</default>
<locale name="C">
<short><!-- Translators: The quoted text is the label of an available
search option that is translated elsewhere. -->Select the search option
"Date modified more than"</short>
<long>
This key determines if the "Date modified more than" search option
is selected when the search tool is started.
</long>
</locale>
</schema>
<schema>
<applyto>/apps/gnome-search-tool/select/size_at_least</applyto>
<key>/schemas/apps/gnome-search-tool/select/size_at_least</key>
<owner>gnome-search-tool</owner>
<type>bool</type>
<default>FALSE</default>
<locale name="C">
<short><!-- Translators: The quoted text is the label of an available
search option that is translated elsewhere. -->Select the search option
"Size at least"</short>
<long>
This key determines if the "Size at least" search option is
selected when the search tool is started.
</long>
</locale>
</schema>
<schema>
<applyto>/apps/gnome-search-tool/select/size_at_most</applyto>
<key>/schemas/apps/gnome-search-tool/select/size_at_most</key>
<owner>gnome-search-tool</owner>
<type>bool</type>
<default>FALSE</default>
<locale name="C">
<short><!-- Translators: The quoted text is the label of an available
search option that is translated elsewhere. -->Select the search option
"Size at most"</short>
<long>
This key determines if the "Size at most" search option is
selected when the search tool is started.
</long>
</locale>
</schema>
<schema>
<applyto>/apps/gnome-search-tool/select/file_is_empty</applyto>
<key>/schemas/apps/gnome-search-tool/select/file_is_empty</key>
<owner>gnome-search-tool</owner>
<type>bool</type>
<default>FALSE</default>
<locale name="C">
<short><!-- Translators: The quoted text is the label of an available
search option that is translated elsewhere. -->Select the search option
"File is empty"</short>
<long>
This key determines if the "File is empty" search option is
selected when the search tool is started.
</long>
</locale>
</schema>
<schema>
<applyto>/apps/gnome-search-tool/select/owned_by_user</applyto>
<key>/schemas/apps/gnome-search-tool/select/owned_by_user</key>
<owner>gnome-search-tool</owner>
<type>bool</type>
<default>FALSE</default>
<locale name="C">
<short><!-- Translators: The quoted text is the label of an available
search option that is translated elsewhere. -->Select the search option
"Owned by user"</short>
<long>
This key determines if the "Owned by user" search option is
selected when the search tool is started.
</long>
</locale>
</schema>
<schema>
<applyto>/apps/gnome-search-tool/select/owned_by_group</applyto>
<key>/schemas/apps/gnome-search-tool/select/owned_by_group</key>
<owner>gnome-search-tool</owner>
<type>bool</type>
<default>FALSE</default>
<locale name="C">
<short><!-- Translators: The quoted text is the label of an available
search option that is translated elsewhere. -->Select the search option
"Owned by group"</short>
<long>
This key determines if the "Owned by group" search option is
selected when the search tool is started.
</long>
</locale>
</schema>
<schema>
<applyto>/apps/gnome-search-tool/select/owner_is_unrecognized</applyto>
<key>/schemas/apps/gnome-search-tool/select/owner_is_unrecognized</key>
<owner>gnome-search-tool</owner>
<type>bool</type>
<default>FALSE</default>
<locale name="C">
<short><!-- Translators: The quoted text is the label of an available
search option that is translated elsewhere. -->Select the search option
"Owner is unrecognized"</short>
<long>
This key determines if the "Owner is unrecognized" search option
is selected when the search tool is started.
</long>
</locale>
</schema>
<schema>
<applyto>/apps/gnome-search-tool/select/name_does_not_contain</applyto>
<key>/schemas/apps/gnome-search-tool/select/name_does_not_contain</key>
<owner>gnome-search-tool</owner>
<type>bool</type>
<default>FALSE</default>
<locale name="C">
<short><!-- Translators: The quoted text is the label of an available
search option that is translated elsewhere. -->Select the search option
"Name does not contain"</short>
<long>
This key determines if the "Name does not contain" search option
is selected when the search tool is started.
</long>
</locale>
</schema>
<schema>
<applyto>/apps/gnome-search-tool/select/name_matches_regular_expression</applyto>
<key>/schemas/apps/gnome-search-tool/select/name_matches_regular_expression</key>
<owner>gnome-search-tool</owner>
<type>bool</type>
<default>FALSE</default>
<locale name="C">
<short><!-- Translators: The quoted text is the label of an available
search option that is translated elsewhere. -->Select the search option
"Name matches regular expression"</short>
<long>
This key determines if the "Name matches regular expression" search
option is selected when the search tool is started.
</long>
</locale>
</schema>
<schema>
<applyto>/apps/gnome-search-tool/select/show_hidden_files_and_folders</applyto>
<key>/schemas/apps/gnome-search-tool/select/show_hidden_files_and_folders</key>
<owner>gnome-search-tool</owner>
<type>bool</type>
<default>FALSE</default>
<locale name="C">
<short><!-- Translators: The quoted text is the label of an available
search option that is translated elsewhere. -->Select the search option
"Show hidden files and folders"</short>
<long>
This key determines if the "Show hidden files and
folders" search option is selected when the search tool
is started.
</long>
</locale>
</schema>
<schema>
<applyto>/apps/gnome-search-tool/select/follow_symbolic_links</applyto>
<key>/schemas/apps/gnome-search-tool/select/follow_symbolic_links</key>
<owner>gnome-search-tool</owner>
<type>bool</type>
<default>FALSE</default>
<locale name="C">
<short><!-- Translators: The quoted text is the label of an available
search option that is translated elsewhere. -->Select the search option
"Follow symbolic links"</short>
<long>
This key determines if the "Follow symbolic links" search option
is selected when the search tool is started.
</long>
</locale>
</schema>
<schema>
<applyto>/apps/gnome-search-tool/select/exclude_other_filesystems</applyto>
<key>/schemas/apps/gnome-search-tool/select/exclude_other_filesystems</key>
<owner>gnome-search-tool</owner>
<type>bool</type>
<default>FALSE</default>
<locale name="C">
<short><!-- Translators: The quoted text is the label of an available
search option that is translated elsewhere. -->Select the search option
"Exclude other filesystems"</short>
<long>
This key determines if the "Exclude other filesystems" search option
is selected when the search tool is started.
</long>
</locale>
</schema>
<schema>
<applyto>/apps/gnome-search-tool/disable_quick_search</applyto>
<key>/schemas/apps/gnome-search-tool/disable_quick_search</key>
<owner>gnome-search-tool</owner>
<type>bool</type>
<default>FALSE</default>
<locale name="C">
<short>Disable Quick Search</short>
<long>
This key determines if the search tool disables the use of
the locate command when performing simple file name searches.
</long>
</locale>
</schema>
<schema>
<applyto>/apps/gnome-search-tool/quick_search_excluded_paths</applyto>
<key>/schemas/apps/gnome-search-tool/quick_search_excluded_paths</key>
<owner>gnome-search-tool</owner>
<type>list</type>
<list_type>string</list_type>
<default>[/mnt/*,/media/*,/dev/*,/tmp/*,/proc/*,/var/*]</default>
<locale name="C">
<short>Quick Search Excluded Paths</short>
<long>
This key defines the paths the search tool will exclude from a
quick search. The wildcards '*' and '?' are supported. The default
values are /mnt/*, /media/*, /dev/*, /tmp/*, /proc/*, and /var/*.
</long>
</locale>
</schema>
<schema>
<applyto>/apps/gnome-search-tool/disable_quick_search_second_scan</applyto>
<key>/schemas/apps/gnome-search-tool/disable_quick_search_second_scan</key>
<owner>gnome-search-tool</owner>
<type>bool</type>
<default>FALSE</default>
<locale name="C">
<short>Disable Quick Search Second Scan</short>
<long>
This key determines if the search tool disables the use of the
find command after performing a quick search.
</long>
</locale>
</schema>
<schema>
<applyto>/apps/gnome-search-tool/quick_search_second_scan_excluded_paths</applyto>
<key>/schemas/apps/gnome-search-tool/quick_search_second_scan_excluded_paths</key>
<owner>gnome-search-tool</owner>
<type>list</type>
<list_type>string</list_type>
<default>[/]</default>
<locale name="C">
<short>Quick Search Second Scan Excluded Paths</short>
<long>
This key defines the paths the search tool will exclude from a
second scan when performing a quick search. The second scan
uses the find command to search for files. The purpose of the
second scan is to find files that have not been indexed.
The wildcards '*' and '?' are supported. The default value is /.
</long>
</locale>
</schema>
<schema>
<applyto>/apps/gnome-search-tool/columns_order</applyto>
<key>/schemas/apps/gnome-search-tool/columns_order</key>
<owner>gnome-search-tool</owner>
<type>list</type>
<list_type>int</list_type>
<default>[0]</default>
<locale name="C">
<short>Search Result Columns Order</short>
<long>
This key defines the order of the columns in the search
results. This key should not be modified by the user.
</long>
</locale>
</schema>
<schema>
<applyto>/apps/gnome-search-tool/default_window_width</applyto>
<key>/schemas/apps/gnome-search-tool/default_window_width</key>
<owner>gnome-search-tool</owner>
<type>int</type>
<default>-1</default>
<locale name="C">
<short>Default Window Width</short>
<long>
This key defines the window width, and it's used to remember the
size of the search tool between sessions. Setting it to -1 will
make the search tool use the default width.
</long>
</locale>
</schema>
<schema>
<applyto>/apps/gnome-search-tool/default_window_height</applyto>
<key>/schemas/apps/gnome-search-tool/default_window_height</key>
<owner>gnome-search-tool</owner>
<type>int</type>
<default>-1</default>
<locale name="C">
<short>Default Window Height</short>
<long>
This key defines the window height, and it's used to remember the
size of the search tool between sessions. Setting it to -1 will
make the search tool use the default height.
</long>
</locale>
</schema>
<schema>
<applyto>/apps/gnome-search-tool/default_window_maximized</applyto>
<key>/schemas/apps/gnome-search-tool/default_window_maximized</key>
<owner>gnome-search-tool</owner>
<type>bool</type>
<default>FALSE</default>
<locale name="C">
<short>Default Window Maximized</short>
<long>
This key determines if the search tool window starts in a maximized
state.
</long>
</locale>
</schema>
<schema>
<applyto>/apps/gnome-search-tool/look_in_folder</applyto>
<key>/schemas/apps/gnome-search-tool/look_in_folder</key>
<owner>gnome-search-tool</owner>
<type>string</type>
<default></default>
<locale name="C">
<short>Look in Folder</short>
<long>
This key defines the default value of the "Look in Folder"
widget.
</long>
</locale>
</schema>
</schemalist>
</gconfschemafile>
<schemalist>
<schema id="org.gnome.gnome-search-tool" path="/org/gnome/gnome-search-tool/">
<key name="search-history" type="a{sas}">
<default>[ ]</default>
<summary>Search history</summary>
<description>This key defines the items which were searched for in the past.</description>
</key>
<key name="show-additional-options" type="b">
<default>false</default>
<summary>Show Additional Options</summary>
</key>
<key name="disable-quick-search" type="b">
<default>false</default>
<summary>Disable Quick Search</summary>
<description>This key determines if the search tool disables the use of the locate command when performing simple file name searches.</description>
</key>
<key name="quick-search-excluded-paths" type="as">
<default>[ '/mnt/*', '/media/*', '/dev/*', '/tmp/*', '/proc/*', '/var/*' ]</default>
<summary>Quick Search Excluded Paths</summary>
<description>This key defines the paths the search tool will exclude from a quick search. The wildcards '*' and '?' are supported. The default values are /mnt/*, /media/*, /dev/*, /tmp/*, /proc/*, and /var/*.</description>
</key>
<key name="disable-quick-search-second-scan" type="b">
<default>false</default>
<summary>Disable Quick Search Second Scan</summary>
<description>This key determines if the search tool disables the use of the find command after performing a quick search.</description>
</key>
<key name="quick-search-second-scan-excluded-paths" type="as">
<default>[ '/' ]</default>
<summary>Quick Search Second Scan Excluded Paths</summary>
<description>This key defines the paths the search tool will exclude from a second scan when performing a quick search. The second scan uses the find command to search for files. The purpose of the second scan is to find files that have not been indexed. The wildcards '*' and '?' are supported. The default value is /.</description>
</key>
<key name="columns-order" type="ai">
<default>[ 0 ]</default>
<summary>Search Result Columns Order</summary>
<description>This key defines the order of the columns in the search results. This key should not be modified by the user.</description>
</key>
<key name="default-window-width" type="i">
<default>-1</default>
<summary>Default Window Width</summary>
<description>This key defines the window width, and it's used to remember the size of the search tool between sessions. Setting it to -1 will make the search tool use the default width.</description>
</key>
<key name="default-window-height" type="i">
<default>-1</default>
<summary>Default Window Height</summary>
<description>This key defines the window height, and it's used to remember the size of the search tool between sessions. Setting it to -1 will make the search tool use the default height.</description>
</key>
<key name="default-window-maximized" type="b">
<default>false</default>
<summary>Default Window Maximized</summary>
<description>This key determines if the search tool window starts in a maximized state.</description>
</key>
<key name="look-in-folder" type="s">
<default>''</default>
<summary>Look in Folder</summary>
<description>This key defines the default value of the "Look in Folder" widget.</description>
</key>
<child name="select" schema="org.gnome.gnome-search-tool.select"/>
</schema>
<schema id="org.gnome.gnome-search-tool.select" path="/org/gnome/gnome-search-tool/select/">
<key name="contains-the-text" type="b">
<default>true</default>
<description>This key determines if the "Contains the text" search option is selected when the search tool is started.</description>
</key>
<key name="date-modified-less-than" type="b">
<default>false</default>
<description>This key determines if the "Date modified less than" search option is selected when the search tool is started.</description>
</key>
<key name="date-modified-more-than" type="b">
<default>false</default>
<description>This key determines if the "Date modified more than" search option is selected when the search tool is started.</description>
</key>
<key name="size-at-least" type="b">
<default>false</default>
<description>This key determines if the "Size at least" search option is selected when the search tool is started.</description>
</key>
<key name="size-at-most" type="b">
<default>false</default>
<description>This key determines if the "Size at most" search option is selected when the search tool is started.</description>
</key>
<key name="file-is-empty" type="b">
<default>false</default>
<description>This key determines if the "File is empty" search option is selected when the search tool is started.</description>
</key>
<key name="owned-by-user" type="b">
<default>false</default>
<description>This key determines if the "Owned by user" search option is selected when the search tool is started.</description>
</key>
<key name="owned-by-group" type="b">
<default>false</default>
<description>This key determines if the "Owned by group" search option is selected when the search tool is started.</description>
</key>
<key name="owner-is-unrecognized" type="b">
<default>false</default>
<description>This key determines if the "Owner is unrecognized" search option is selected when the search tool is started.</description>
</key>
<key name="name-does-not-contain" type="b">
<default>false</default>
<description>This key determines if the "Name does not contain" search option is selected when the search tool is started.</description>
</key>
<key name="name-matches-regular-expression" type="b">
<default>false</default>
<description>This key determines if the "Name matches regular expression" search option is selected when the search tool is started.</description>
</key>
<key name="show-hidden-files-and-folders" type="b">
<default>false</default>
<description>This key determines if the "Show hidden files and folders" search option is selected when the search tool is started.</description>
</key>
<key name="follow-symbolic-links" type="b">
<default>false</default>
<description>This key determines if the "Follow symbolic links" search option is selected when the search tool is started.</description>
</key>
<key name="exclude-other-filesystems" type="b">
<default>false</default>
<description>This key determines if the "Exclude other filesystems" search option is selected when the search tool is started.</description>
</key>
</schema>
</schemalist>
......@@ -476,57 +476,57 @@
<!-- ============= Settings ============================== -->
<sect1 id="gsearchtool-settings-gconf-keys">
<sect1 id="gsearchtool-settings-gsettings-keys">
<title>Settings</title>
<para><application>&app;</application> provides gconf keys to modify some of its behavior. The gconf values can be changed by starting the <application>Configuration Editor</application> in the following ways:
<para><application>&app;</application> provides gsettings keys to modify some of its behavior. The gsettings values can be changed by starting the <application>Configuration Editor</application> in the following ways:
</para>
<variablelist>
<varlistentry>
<term><guimenu>Applications</guimenu> menu</term>
<listitem>
<para>Choose <menuchoice><guisubmenu>System Tools</guisubmenu><guimenuitem>Configuration Editor</guimenuitem></menuchoice>. </para>
<para>Choose <menuchoice><guisubmenu>System Tools</guisubmenu><guimenuitem>dconf Editor</guimenuitem></menuchoice>. </para>
</listitem>
</varlistentry>
<varlistentry>
<term>Command line</term>
<listitem>
<para>Execute the following command: <command>gconf-editor</command></para>
<para>Execute the following command: <command>dconf-editor</command></para>
</listitem>
</varlistentry>
</variablelist>
<sect2 id="gsearchtool-disablequicksearch">
<title>Disable Quick Search</title>
<para>Key name: /apps/gnome-search-tool/disable_quick_search</para>
<para>Key name: org.gnome.gnome-search-tool.disable-quick-search</para>
<para>Default value: false</para>
<para><application>&app;</application> speeds up file name searches by using the <command>locate</command> command. <command>Locate</command> provides a secure way to index and quickly search for file names. Because <command>locate</command> relies on a file index, the <guilabel>Search results</guilabel> list may not always be up to date.</para>
</sect2>
<sect2 id="gsearchtool-disablesecondscan">
<title>Disable Quick Search Second Scan</title>
<para>Key name: /apps/gnome-search-tool/disable_quick_search_second_scan</para>
<para>Key name: org.gnome.gnome-search-tool.disable-quick-search-second-scan</para>
<para>Default value: false</para>
<para>After completing a quick search, <application>&app;</application> will perform a thorough search using the <command>find</command> command. The purpose of this second scan is to find files that have not been indexed. Files that match the search criteria are added to the <guilabel>Search results</guilabel> list keeping the list up to date.</para>
</sect2>
<sect2 id="gsearchtool-quicksearchexclude">
<title>Quick Search Excluded Paths</title>
<para>Key name: /apps/gnome-search-tool/quick_search_excluded_paths</para>
<para>Key name: org.gnome.gnome-search-tool.quick-search-excluded-paths</para>
<para>Default values: [/mnt/*,/media/*,/dev/*,/tmp/*,/proc/*,/var/*]</para>
<para><application>&app;</application> will not perform a quick search for paths defined by this key. File name searches in the defined paths will use the <command>find</command> command. The wildcards '*' and '?' are supported.</para>
</sect2>
<sect2 id="gsearchtool-secondscanexclude">
<title>Quick Search Second Scan Excluded Paths</title>
<para>Key name: /apps/gnome-search-tool/quick_search_second_scan_excluded_paths</para>
<para>Key name: org.gnome.gnome-search-tool.quick-search-second-scan-excluded-paths</para>
<para>Default values: [/]</para>
<para><application>&app;</application> will not perform a second scan after a quick search for the paths defined by this key. Quick searches in the defined paths will not be followed by a thorough search using the <command>find</command> command. The wildcards '*' and '?' are supported.</para>
</sect2>
<sect2 id="gsearchtool-showoptions">
<title>Show Additional Options</title>
<para>Key name: /apps/gnome-search-tool/show_additional_options</para>
<para>Key name: org.gnome.gnome-search-tool.show-additional-options</para>
<para>Default value: false</para>
<para>This key determines if the <guilabel>Select more options</guilabel> section is expanded when <application>&app;</application> is started.</para>
</sect2>
......
......@@ -34,7 +34,6 @@
#include <string.h>
#include <glib/gi18n.h>
#include <gtk/gtk.h>
#include <gconf/gconf-client.h>
#include "gsearchtool-entry.h"
......@@ -57,7 +56,7 @@ struct _GsearchHistoryEntryPrivate
GtkEntryCompletion *completion;
GConfClient *gconf_client;
GSettings *settings;
};
G_DEFINE_TYPE (GsearchHistoryEntry, gsearch_history_entry, GTK_TYPE_COMBO_BOX)
......@@ -129,10 +128,10 @@ gsearch_history_entry_finalize (GObject *object)
g_free (priv->history_id);
if (priv->gconf_client != NULL)
if (priv->settings != NULL)
{
g_object_unref (G_OBJECT (priv->gconf_client));
priv->gconf_client = NULL;
g_object_unref (G_OBJECT (priv->settings));
priv->settings = NULL;
}
G_OBJECT_CLASS (gsearch_history_entry_parent_class)->finalize (object);
......@@ -188,23 +187,7 @@ get_history_store (GsearchHistoryEntry *entry)
static char *
get_history_key (GsearchHistoryEntry *entry)
{
gchar *tmp;
gchar *key;
/*
* Store the data under /apps/gnome-settings/
* like the old GnomeEntry did
*/
tmp = gconf_escape_key (entry->priv->history_id, -1);
key = g_strconcat ("/apps/gnome-settings/",
"gnome-search-tool",
"/history-",
tmp,
NULL);
g_free (tmp);
return key;
return g_strdup (entry->priv->history_id);
}
static GSList *
......@@ -241,22 +224,52 @@ get_history_list (GsearchHistoryEntry *entry)
static void
gsearch_history_entry_save_history (GsearchHistoryEntry *entry)
{
GSList *gconf_items;
GVariant *history;
GSList *items;
gchar *key;
GVariantBuilder item_builder;
GVariantBuilder history_builder;
GVariantIter *iter;
GVariant *item;
GVariant *history_list;
GSList *list_iter;
gchar *history_key;