Commit b6ebffd5 authored by Carlos Soriano Sánchez's avatar Carlos Soriano Sánchez

general: Run uncrustify

parent 27b039b3
Pipeline #3358 passed with stage
in 7 minutes and 57 seconds
......@@ -95,4 +95,3 @@ eel_gtk_menu_insert_separator (GtkMenu *menu,
return GTK_MENU_ITEM (menu_item);
}
......@@ -24,7 +24,7 @@
G_DEFINE_INTERFACE (NautilusFileInfo, nautilus_file_info, G_TYPE_OBJECT)
NautilusFileInfo *(*nautilus_file_info_getter)(GFile * location, gboolean create);
NautilusFileInfo * (*nautilus_file_info_getter)(GFile * location, gboolean create);
/**
* SECTION:nautilus-file-info
......
......@@ -936,7 +936,7 @@ const GOptionEntry options[] =
/* dummy, only for compatibility reasons */
{ "browser", '\0', G_OPTION_FLAG_HIDDEN, G_OPTION_ARG_NONE, NULL,
NULL, NULL },
/* ditto */
/* ditto */
{ "geometry", 'g', G_OPTION_FLAG_HIDDEN, G_OPTION_ARG_STRING, NULL,
N_("Create the initial window with the given geometry."), N_("GEOMETRY") },
{ "version", '\0', 0, G_OPTION_ARG_NONE, NULL,
......
......@@ -355,7 +355,7 @@ batch_rename_format (NautilusFile *file,
gchar *metadata;
file_name = nautilus_file_get_display_name (file);
if (!nautilus_file_is_directory(file))
if (!nautilus_file_is_directory (file))
{
extension = nautilus_file_get_extension (file);
}
......@@ -435,7 +435,7 @@ batch_rename_format (NautilusFile *file,
{
case ORIGINAL_FILE_NAME:
{
if (nautilus_file_is_directory(file))
if (nautilus_file_is_directory (file))
{
new_name = g_string_append (new_name, file_name);
}
......
......@@ -1485,7 +1485,7 @@ create_label_layout (NautilusCanvasItem *item,
{
str = g_string_append_c (str, *p);
if (*p == '_' || *p == '-' || (*p == '.' && !g_ascii_isdigit(*(p+1))))
if (*p == '_' || *p == '-' || (*p == '.' && !g_ascii_isdigit (*(p + 1))))
{
/* Ensure that we allow to break after '_' or '.' characters,
* if they are not followed by a number */
......
......@@ -1366,7 +1366,7 @@ canvas_container_longpress_gesture_pressed_callback (GtkGestureLongPress *gestur
else
{
nautilus_files_view_pop_up_background_context_menu (NAUTILUS_FILES_VIEW (view),
event);
event);
}
}
......
......@@ -132,7 +132,6 @@ nautilus_column_chooser_class_init (NautilusColumnChooserClass *chooser_class)
NAUTILUS_TYPE_FILE,
G_PARAM_CONSTRUCT_ONLY |
G_PARAM_WRITABLE));
}
static void
......
......@@ -3547,7 +3547,7 @@ is_link_trusted (NautilusFile *file,
{
GFile *location;
gboolean res;
g_autofree gchar* trusted = NULL;
g_autofree gchar *trusted = NULL;
if (!is_launcher)
{
......
......@@ -1203,10 +1203,10 @@ do_run_simple_dialog (gpointer _data)
button = gtk_dialog_add_button (GTK_DIALOG (dialog), button_title, response_id);
gtk_dialog_set_default_response (GTK_DIALOG (dialog), response_id);
if (g_strcmp0(button_title, DELETE) == 0)
if (g_strcmp0 (button_title, DELETE) == 0)
{
gtk_style_context_add_class(gtk_widget_get_style_context(button),
"destructive-action");
gtk_style_context_add_class (gtk_widget_get_style_context (button),
"destructive-action");
}
}
......@@ -2262,9 +2262,9 @@ skip:
}
static void
source_info_remove_file_from_count (GFile *file,
CommonJob *job,
SourceInfo *source_info)
source_info_remove_file_from_count (GFile *file,
CommonJob *job,
SourceInfo *source_info)
{
g_autoptr (GFileInfo) file_info = NULL;
......@@ -7949,10 +7949,10 @@ extract_job_on_progress (AutoarExtractor *extractor,
details = g_strdup_printf (ngettext ("%s / %s \xE2\x80\x94 %s left (%s/sec)",
"%s / %s \xE2\x80\x94 %s left (%s/sec)",
seconds_count_format_time_units (remaining_time)),
formatted_size_job_completed_size,
formatted_size_total_compressed_size,
formatted_time,
formatted_size_transfer_rate);
formatted_size_job_completed_size,
formatted_size_total_compressed_size,
formatted_time,
formatted_size_transfer_rate);
}
nautilus_progress_info_take_details (common->progress, details);
......@@ -8049,20 +8049,20 @@ extract_job_on_scanned (AutoarExtractor *extractor,
/* FIXME: G_MAXUINT64 is the value used by autoar when the file size cannot
* be determined. Ideally an API should be used instead.
*/
if (total_size != G_MAXUINT64 && total_size > free_size )
if (total_size != G_MAXUINT64 && total_size > free_size)
{
nautilus_progress_info_take_status (extract_job->common.progress,
g_strdup_printf (_("Error extracting “%s”"),
basename));
run_error (&extract_job->common,
g_strdup_printf (_("Not enough free space to extract %s"),basename),
NULL,
NULL,
FALSE,
CANCEL,
NULL);
nautilus_progress_info_take_status (extract_job->common.progress,
g_strdup_printf (_("Error extracting “%s”"),
basename));
run_error (&extract_job->common,
g_strdup_printf (_("Not enough free space to extract %s"), basename),
NULL,
NULL,
FALSE,
CANCEL,
NULL);
abort_job ((CommonJob *) extract_job);
abort_job ((CommonJob *) extract_job);
}
}
......@@ -8081,7 +8081,7 @@ report_extract_final_progress (ExtractJob *extract_job,
if (total_files == 1)
{
GFile *source_file;
g_autofree gchar * basename = NULL;
g_autofree gchar *basename = NULL;
source_file = G_FILE (extract_job->source_files->data);
basename = get_basename (source_file);
......
......@@ -1319,10 +1319,10 @@ enum
static void
starred_strings_func (NautilusFileUndoInfo *info,
gchar **undo_label,
gchar **undo_description,
gchar **redo_label,
gchar **redo_description)
gchar **undo_label,
gchar **undo_description,
gchar **redo_label,
gchar **redo_description)
{
NautilusFileUndoInfoFavorites *self = NAUTILUS_FILE_UNDO_INFO_STARRED (info);
......@@ -1356,8 +1356,8 @@ starred_strings_func (NautilusFileUndoInfo *info,
static void
on_undo_starred_tags_updated (GObject *object,
GAsyncResult *res,
gpointer user_data)
GAsyncResult *res,
gpointer user_data)
{
GTask *task;
NautilusFileUndoInfo *undo_info;
......@@ -1372,7 +1372,7 @@ on_undo_starred_tags_updated (GObject *object,
static void
starred_redo_func (NautilusFileUndoInfo *info,
GtkWindow *parent_window)
GtkWindow *parent_window)
{
NautilusFileUndoInfoFavorites *self = NAUTILUS_FILE_UNDO_INFO_STARRED (info);
NautilusTagManager *tag_manager;
......@@ -1389,7 +1389,6 @@ starred_redo_func (NautilusFileUndoInfo *info,
}
else
{
nautilus_tag_manager_unstar_files (tag_manager,
G_OBJECT (info),
self->priv->files,
......@@ -1400,7 +1399,7 @@ starred_redo_func (NautilusFileUndoInfo *info,
static void
starred_undo_func (NautilusFileUndoInfo *info,
GtkWindow *parent_window)
GtkWindow *parent_window)
{
NautilusFileUndoInfoFavorites *self = NAUTILUS_FILE_UNDO_INFO_STARRED (info);
NautilusTagManager *tag_manager;
......@@ -1427,9 +1426,9 @@ starred_undo_func (NautilusFileUndoInfo *info,
static void
nautilus_file_undo_info_starred_set_property (GObject *object,
guint prop_id,
const GValue *value,
GParamSpec *pspec)
guint prop_id,
const GValue *value,
GParamSpec *pspec)
{
NautilusFileUndoInfoFavorites *self = NAUTILUS_FILE_UNDO_INFO_STARRED (object);
......@@ -1501,7 +1500,6 @@ nautilus_file_undo_info_starred_class_init (NautilusFileUndoInfoFavoritesClass *
FALSE,
G_PARAM_WRITABLE |
G_PARAM_CONSTRUCT_ONLY));
}
GList *
......@@ -1517,8 +1515,8 @@ nautilus_file_undo_info_starred_is_starred (NautilusFileUndoInfoFavorites *self)
}
NautilusFileUndoInfo *
nautilus_file_undo_info_starred_new (GList *files,
gboolean starred)
nautilus_file_undo_info_starred_new (GList *files,
gboolean starred)
{
NautilusFileUndoInfoFavorites *self;
......
......@@ -557,7 +557,9 @@ nautilus_is_starred_directory (GFile *dir)
uri = g_file_get_uri (dir);
if (eel_uri_is_starred (uri))
{
return TRUE;
}
return FALSE;
}
......@@ -1436,4 +1438,3 @@ nautilus_uri_to_native_uri (const gchar *uri)
return NULL;
}
......@@ -3572,7 +3572,7 @@ compare_by_type (NautilusFile *file_1,
static int
compare_by_starred (NautilusFile *file_1,
NautilusFile *file_2)
NautilusFile *file_2)
{
NautilusTagManager *tag_manager;
g_autofree gchar *uri_1 = NULL;
......@@ -3586,9 +3586,9 @@ compare_by_starred (NautilusFile *file_1,
uri_2 = nautilus_file_get_uri (file_2);
file_1_is_starred = nautilus_tag_manager_file_is_starred (tag_manager,
uri_1);
uri_1);
file_2_is_starred = nautilus_tag_manager_file_is_starred (tag_manager,
uri_2);
uri_2);
if (!!file_1_is_starred == !!file_2_is_starred)
{
return 0;
......@@ -4529,9 +4529,13 @@ char *
nautilus_file_get_display_name (NautilusFile *file)
{
if (nautilus_file_is_other_locations (file))
{
return g_strdup (_("Other Locations"));
}
if (nautilus_file_is_starred_location (file))
{
return g_strdup (_("Starred"));
}
return g_strdup (nautilus_file_peek_display_name (file));
}
......@@ -6115,7 +6119,7 @@ nautilus_file_set_search_fts_snippet (NautilusFile *file,
file->details->fts_snippet = g_strdup (fts_snippet);
}
const gchar*
const gchar *
nautilus_file_get_search_fts_snippet (NautilusFile *file)
{
return file->details->fts_snippet;
......@@ -7770,7 +7774,8 @@ nautilus_file_get_file_type (NautilusFile *file)
{
g_return_val_if_fail (NAUTILUS_IS_FILE (file), G_FILE_TYPE_UNKNOWN);
return nautilus_file_info_get_file_type (NAUTILUS_FILE_INFO (file));;
return nautilus_file_info_get_file_type (NAUTILUS_FILE_INFO (file));
;
  • Oh, uncrustify doesn't handle double semicolons correctly. New line for empty statement. (By the way, did anyone receive an email for this comment?)

  • 0f411dc4 should make uncrustify remove those.

Please register or sign in to reply
}
/**
......@@ -9210,8 +9215,9 @@ thumbnail_limit_changed_callback (gpointer user_data)
cached_thumbnail_limit = g_settings_get_uint64 (nautilus_preferences,
NAUTILUS_PREFERENCES_FILE_THUMBNAIL_LIMIT);
//Converts the obtained limit in MB to bytes
cached_thumbnail_limit *= MEGA_TO_BASE_RATE;;
/*Converts the obtained limit in MB to bytes */
cached_thumbnail_limit *= MEGA_TO_BASE_RATE;
;
/* Tell the world that icons might have changed. We could invent a narrower-scope
* signal to mean only "thumbnails might have changed" if this ends up being slow
......
......@@ -2003,7 +2003,7 @@ new_folder_dialog_controller_on_name_accepted (NautilusFileNameWidgetController
new_folder_done, data);
g_clear_object (&priv->new_folder_controller);
/* After the dialog is destroyed the focus, is probably in the menu item
* that created the dialog, but we want the focus to be in the newly created
* folder.
......@@ -3632,7 +3632,6 @@ debuting_files_add_files_callback (NautilusFilesView *view,
{
nautilus_file_ref (NAUTILUS_FILE (l->data));
data->added_files = g_list_prepend (data->added_files, NAUTILUS_FILE (l->data));
}
g_object_unref (location);
}
......@@ -3672,8 +3671,8 @@ copy_move_done_data_free (CopyMoveDoneData *data)
static void
pre_copy_move_add_files_callback (NautilusFilesView *view,
GList *new_files,
CopyMoveDoneData *data)
GList *new_files,
CopyMoveDoneData *data)
{
GList *l;
......@@ -8411,8 +8410,8 @@ load_directory (NautilusFilesView *view,
attributes);
priv->file_changed_handler_id = g_signal_connect
(priv->directory_as_file, "changed",
G_CALLBACK (file_changed_callback), view);
(priv->directory_as_file, "changed",
G_CALLBACK (file_changed_callback), view);
nautilus_profile_end (NULL);
}
......@@ -8449,12 +8448,10 @@ finish_loading (NautilusFilesView *view)
/* Start loading. */
/* Connect handlers to learn about loading progress. */
priv->done_loading_handler_id = g_signal_connect
(priv->model, "done-loading",
G_CALLBACK (done_loading_callback), view);
priv->load_error_handler_id = g_signal_connect
(priv->model, "load-error",
G_CALLBACK (load_error_callback), view);
priv->done_loading_handler_id = g_signal_connect (priv->model, "done-loading",
G_CALLBACK (done_loading_callback), view);
priv->load_error_handler_id = g_signal_connect (priv->model, "load-error",
G_CALLBACK (load_error_callback), view);
/* Monitor the things needed to get the right icon. Also
* monitor a directory's item count because the "size"
......@@ -8470,11 +8467,11 @@ finish_loading (NautilusFilesView *view)
NAUTILUS_FILE_ATTRIBUTE_EXTENSION_INFO;
priv->files_added_handler_id = g_signal_connect
(priv->model, "files-added",
G_CALLBACK (files_added_callback), view);
(priv->model, "files-added",
G_CALLBACK (files_added_callback), view);
priv->files_changed_handler_id = g_signal_connect
(priv->model, "files-changed",
G_CALLBACK (files_changed_callback), view);
(priv->model, "files-changed",
G_CALLBACK (files_changed_callback), view);
nautilus_directory_file_monitor_add (priv->model,
&priv->model,
......@@ -9468,13 +9465,13 @@ nautilus_files_view_init (NautilusFilesView *view)
"<control>plus",
NULL
};
const gchar *move_to_trash_accels[] =
const gchar *move_to_trash_accels[] =
{
"Delete",
"KP_Delete",
NULL
};
const gchar *delete_permanently_accels[] =
const gchar *delete_permanently_accels[] =
{
"<shift>Delete",
"<shift>KP_Delete",
......
......@@ -184,13 +184,13 @@ slurp_key_string (const char *uri,
}
gboolean
nautilus_link_local_create (const char *directory_uri,
const char *base_name,
const char *display_name,
const char *image,
const char *target_uri,
int screen,
gboolean unique_filename)
nautilus_link_local_create (const char *directory_uri,
const char *base_name,
const char *display_name,
const char *image,
const char *target_uri,
int screen,
gboolean unique_filename)
{
char *real_directory_uri;
char *contents;
......
......@@ -443,8 +443,8 @@ check_starred_status (GtkTreeModel *model,
static void
on_starred_files_changed (NautilusTagManager *tag_manager,
GList *changed_files,
gpointer user_data)
GList *changed_files,
gpointer user_data)
{
NautilusListView *list_view;
......@@ -1591,10 +1591,10 @@ apply_columns_settings (NautilusListView *list_view,
static void
starred_cell_data_func (GtkTreeViewColumn *column,
GtkCellRenderer *renderer,
GtkTreeModel *model,
GtkTreeIter *iter,
NautilusListView *view)
GtkCellRenderer *renderer,
GtkTreeModel *model,
GtkTreeIter *iter,
NautilusListView *view)
{
g_autofree gchar *text = NULL;
g_autofree gchar *uri = NULL;
......@@ -1632,7 +1632,6 @@ starred_cell_data_func (GtkTreeViewColumn *column,
g_object_set (renderer,
"icon-name", "non-starred-symbolic",
NULL);
}
nautilus_file_unref (file);
......@@ -1663,7 +1662,7 @@ filename_cell_data_func (GtkTreeViewColumn *column,
-1);
escaped_name = g_markup_escape_text (text, -1);
display_text = g_string_new(escaped_name);
display_text = g_string_new (escaped_name);
directory = nautilus_files_view_get_model (NAUTILUS_FILES_VIEW (view));
......@@ -2326,8 +2325,8 @@ get_default_visible_columns (NautilusListView *list_view)
NAUTILUS_PREFERENCES_LIST_VIEW_DEFAULT_VISIBLE_COLUMNS);
}
static GList*
default_column_array_as_list (gchar** array)
static GList *
default_column_array_as_list (gchar **array)
{
GList *res = NULL;
gint i = 0;
......@@ -2348,7 +2347,7 @@ get_visible_columns (NautilusListView *list_view)
g_autoptr (GList) visible_columns = NULL;
GPtrArray *res;
GList *l;
g_autofree gchar* uri = NULL;
g_autofree gchar *uri = NULL;
gboolean in_xdg_dirs;
gboolean is_starred;
......@@ -3802,7 +3801,7 @@ nautilus_list_view_reveal_for_selection_context_menu (NautilusFilesView *view)
list = gtk_tree_selection_get_selected_rows (tree_selection, NULL);
list = g_list_last (list);
path = g_steal_pointer(&list->data);
path = g_steal_pointer (&list->data);
g_list_free_full (list, (GDestroyNotify) gtk_tree_path_free);
}
......
......@@ -717,7 +717,7 @@ get_activation_action (NautilusFile *file)
char *activation_uri;
gboolean handles_extract = FALSE;
g_autoptr (GAppInfo) app_info = NULL;
const gchar* app_id;
const gchar *app_id;
app_info = nautilus_mime_get_default_application_for_file (file);
if (app_info != NULL)
......
......@@ -142,7 +142,7 @@ set_copy_move_dialog_text (FileConflictDialogData *data)
{
primary_text = g_strdup_printf (_("You are trying to replace the destination folder “%s” with a symbolic link."),
destination_name);
message = g_strdup_printf(_("This is not allowed in order to avoid the deletion of the destination folder’s contents."));
message = g_strdup_printf (_("This is not allowed in order to avoid the deletion of the destination folder’s contents."));
message_extra = _("Please rename the symbolic link or press the skip button.");
}
else if (source_is_directory)
......
......@@ -1014,7 +1014,7 @@ nautilus_path_bar_realize (GtkWidget *widget)
attributes_mask = GDK_WA_X | GDK_WA_Y;
priv->event_window = gdk_window_new (gtk_widget_get_parent_window (widget),
&attributes, attributes_mask);
&attributes, attributes_mask);
gdk_window_set_user_data (priv->event_window, widget);
}
......@@ -1954,7 +1954,7 @@ button_data_file_changed (NautilusFile *file,
gboolean renamed, child;
self = (NautilusPathBar *) gtk_widget_get_ancestor (button_data->button,
NAUTILUS_TYPE_PATH_BAR);
NAUTILUS_TYPE_PATH_BAR);
priv = nautilus_path_bar_get_instance_private (self);
if (self == NULL)
......
......@@ -355,15 +355,15 @@ nautilus_preferences_window_setup_list_column_page (GtkBuilder *builder)
}
static gboolean format_spin_button(GtkSpinButton *spin_button,
gpointer user_data)
gpointer user_data)
{
GtkAdjustment *adjustment;
int value;
gchar *text;
adjustment = gtk_spin_button_get_adjustment (spin_button);
value = (int)gtk_adjustment_get_value (adjustment);
text = g_strdup_printf ("%d MB",value);
value = (int) gtk_adjustment_get_value (adjustment);
text = g_strdup_printf ("%d MB", value);
gtk_entry_set_text (GTK_ENTRY (spin_button), text);
return TRUE;
......@@ -377,7 +377,6 @@ static void nautilus_preferences_window_setup_thumbnail_limit_formatting (GtkBui
g_signal_connect (spin, "output", G_CALLBACK (format_spin_button),
spin);
}
static void bind_builder_bool(GtkBuilder *builder,
......@@ -393,7 +392,7 @@ static void bind_builder_uint_spin(GtkBuilder *builder,
GSettings *settings,
const char *widget_name,
const char *prefs)
{
{
g_settings_bind (settings, prefs, gtk_builder_get_object (builder, widget_name),
"value", G_SETTINGS_BIND_DEFAULT);
}
......
......@@ -457,9 +457,9 @@ nautilus_launch_desktop_file (GdkScreen *screen,
#include <gdk/gdkwayland.h>
#endif
typedef void (*GtkWindowHandleExported) (GtkWindow *window,
const char *handle,
gpointer user_data);
typedef void (*GtkWindowHandleExported) (GtkWindow *window,
const char *handle,
gpointer user_data);
#ifdef GDK_WINDOWING_WAYLAND
typedef struct
......@@ -488,7 +488,6 @@ window_export_handle (GtkWindow *window,
GtkWindowHandleExported callback,
gpointer user_data)
{
#ifdef GDK_WINDOWING_X11
if (GDK_IS_X11_DISPLAY (gtk_widget_get_display (GTK_WIDGET (window))))
{
......@@ -625,11 +624,11 @@ launch_default_for_uri_thread_func (GTask *task,
}
void
nautilus_launch_default_for_uri_async (const char *uri,
GtkWindow *parent_window,
GCancellable *cancellable,
GAsyncReadyCallback callback,
gpointer callback_data)
nautilus_launch_default_for_uri_async (const char *uri,
GtkWindow *parent_window,
GCancellable *cancellable,
GAsyncReadyCallback callback,
gpointer callback_data)
{
g_autoptr (GdkAppLaunchContext) launch_context = NULL;
g_autoptr (GTask) task = NULL;
......
......@@ -93,7 +93,6 @@ nautilus_progress_info_manager_constructor (GType type,
static void
nautilus_progress_info_manager_init (NautilusProgressInfoManager *self)
{
}
static void
......
......@@ -583,9 +583,9 @@ search_popover_time_type_changed_cb (NautilusSearchPopover *popover,
}
static void
search_popover_fts_changed_cb (GObject *popover,
GParamSpec *pspec,
gpointer user_data)
search_popover_fts_changed_cb (GObject *popover,
GParamSpec *pspec,
gpointer user_data)
{
NautilusQueryEditorPrivate *priv;
NautilusQueryEditor *editor;
......
......@@ -562,7 +562,7 @@ nautilus_query_get_search_starred (NautilusQuery *query)
void
nautilus_query_set_search_starred (NautilusQuery *query,
gboolean search_starred)
gboolean search_starred)
{
g_return_if_fail (NAUTILUS_IS_QUERY (query));
......
......@@ -588,7 +588,7 @@ search_directory_add_pending_files_callbacks (NautilusSearchDirectory *self)
g_list_foreach (self->pending_callback_list,
(GFunc) search_callback_add_pending_file_callbacks, NULL);
self->callback_list = g_list_concat (self->callback_list,
self->pending_callback_list);
self->pending_callback_list);
g_list_free (self->pending_callback_list);
self->pending_callback_list = NULL;
......@@ -1051,8 +1051,8 @@ nautilus_search_directory_set_query (NautilusSearchDirectory *self,
if (query)
{
self->binding = g_object_bind_property (self->engine, "running",
query, "searching",
G_BINDING_DEFAULT | G_BINDING_SYNC_CREATE);
query, "searching",
G_BINDING_DEFAULT | G_BINDING_SYNC_CREATE);
}
g_object_notify_by_pspec (G_OBJECT (self), properties[PROP_QUERY]);
......
......@@ -38,7 +38,7 @@
struct _NautilusSearchEngineModel
{
GObject parent;
NautilusQuery *query;
GList *hits;
......@@ -344,7 +344,6 @@ nautilus_search_engine_model_class_init (NautilusSearchEngineModelClass *class)
* Whether the search engine is running a search.
*/
g_object_class_override_property (gobject_class, PROP_RUNNING, "running");
}
static void
......
......@@ -341,12 +341,13 @@ nautilus_search_engine_tracker_start (NautilusSearchProvider *provider)
g_string_append (sparql, " fts:snippet(?urn)");
}
g_string_append (sparql, "\nWHERE {"
" ?urn a nfo:FileDataObject;"
" nfo:fileLastModified ?mtime;"
" nfo:fileLastAccessed ?atime;"
" tracker:available true;"
" nie:url ?url");
g_string_append (sparql,
"\nWHERE {"
" ?urn a nfo:FileDataObject;"
" nfo:fileLastModified ?mtime;"
" nfo:fileLastAccessed ?atime;"
" tracker:available true;"
" nie:url ?url");
if (*search_text)
{
......@@ -376,7 +377,7 @@ nautilus_search_engine_tracker_start (NautilusSearchProvider *provider)
if (!tracker->fts_enabled)
{
g_string_append_printf (sparql, " && fn:contains(fn:lower-case(nfo:fileName(?urn)), '%s')", search_text);
g_string_append_printf (sparql, " && fn:contains(fn:lower-case(nfo:fileName(?urn)), '%s')", search_text);
}
date_range = nautilus_query_get_date_range (tracker->query);
......@@ -537,7 +538,6 @@ nautilus_search_engine_tracker_class_init (NautilusSearchEngineTrackerClass *cla
* Whether the search engine is running a search.
*/
g_object_class_override_property (gobject_class, PROP_RUNNING, "running");
}
static void
......
......@@ -367,14 +367,14 @@ search_fts_mode_changed (GtkToggleButton *button,
popover->fts_enabled == FALSE)
{
popover->fts_enabled = TRUE;
g_settings_set_boolean(nautilus_preferences, NAUTILUS_PREFERENCES_FTS_ENABLED, TRUE);
g_settings_set_boolean (