* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+ * License along with this library. If not, see <http://www.gnu.org/licenses/>.
*
* Author: Alexander Larsson <alexl@redhat.com>
*
* Based on nautilus-search-engine-simple.c
*/
-#define _XOPEN_SOURCE 500
-#define _GNU_SOURCE
+#include "config.h"
-#include <config.h>
-#include "gtksearchenginesimple.h"
+/* these must be defined even when HAVE_GNU_FTW is not defined
+ * because (really) old versions of GNU libc have ftw.h but do
+ * export ftw() and friends only if _XOPEN_SOURCE and _GNU_SOURCE
+ * are defined. see bug #444097.
+ */
+#define _XOPEN_SOURCE 600
+#define _GNU_SOURCE
-#define XDG_PREFIX _gtk_xdg
-#include "xdgmime/xdgmime.h"
+#ifdef HAVE_FTW_H
+#include <ftw.h>
+#endif
+
+#include <gdk/gdk.h>
+
+#include "gtksearchenginesimple.h"
+#include "gtkprivate.h"
#include <string.h>
-#include <ftw.h>
-#include <glib/gstrfuncs.h>
#define BATCH_SIZE 500
GtkSearchEngineSimple *engine;
gchar *path;
- GList *mime_types;
gchar **words;
GList *found_list;
G_DEFINE_TYPE (GtkSearchEngineSimple, _gtk_search_engine_simple, GTK_TYPE_SEARCH_ENGINE);
static void
-finalize (GObject *object)
+gtk_search_engine_simple_dispose (GObject *object)
{
GtkSearchEngineSimple *simple;
+ GtkSearchEngineSimplePrivate *priv;
simple = GTK_SEARCH_ENGINE_SIMPLE (object);
+ priv = simple->priv;
- if (simple->priv->query)
+ if (priv->query)
+ {
+ g_object_unref (priv->query);
+ priv->query = NULL;
+ }
+
+ if (priv->active_search)
{
- g_object_unref (simple->priv->query);
- simple->priv->query = NULL;
+ priv->active_search->cancelled = TRUE;
+ priv->active_search = NULL;
}
- G_OBJECT_CLASS (_gtk_search_engine_simple_parent_class)->finalize (object);
+ G_OBJECT_CLASS (_gtk_search_engine_simple_parent_class)->dispose (object);
}
static SearchThreadData *
data = g_new0 (SearchThreadData, 1);
- data->engine = engine;
+ data->engine = g_object_ref (engine);
uri = _gtk_query_get_location (query);
if (uri != NULL)
{
g_free (text);
g_free (lower);
- data->mime_types = _gtk_query_get_mime_types (query);
-
return data;
}
static void
search_thread_data_free (SearchThreadData *data)
{
+ g_object_unref (data->engine);
g_free (data->path);
g_strfreev (data->words);
- g_list_foreach (data->mime_types, (GFunc)g_free, NULL);
- g_list_free (data->mime_types);
g_free (data);
}
data = user_data;
- if (!data->cancelled)
- {
- _gtk_search_engine_finished (GTK_SEARCH_ENGINE (data->engine));
- data->engine->priv->active_search = NULL;
- }
-
+ if (!data->cancelled)
+ _gtk_search_engine_finished (GTK_SEARCH_ENGINE (data->engine));
+
+ data->engine->priv->active_search = NULL;
search_thread_data_free (data);
return FALSE;
hits->uris);
}
- g_list_foreach (hits->uris, (GFunc)g_free, NULL);
- g_list_free (hits->uris);
+ g_list_free_full (hits->uris, g_free);
g_free (hits);
return FALSE;
hits = g_new (SearchHits, 1);
hits->uris = data->uri_hits;
hits->thread_data = data;
- g_idle_add (search_thread_add_hits_idle, hits);
+
+ gdk_threads_add_idle (search_thread_add_hits_idle, hits);
}
+
data->uri_hits = NULL;
}
-static GStaticPrivate search_thread_data = G_STATIC_PRIVATE_INIT;
+static GPrivate search_thread_data;
+#ifdef HAVE_FTW_H
static int
search_visit_func (const char *fpath,
const struct stat *sb,
{
SearchThreadData *data;
gint i;
- const gchar *name;
- gchar *lower_name, *path, *mime_type;
+ const gchar *name;
+ gchar *lower_name;
gchar *uri;
gboolean hit;
- GList *l;
gboolean is_hidden;
-
- data = (SearchThreadData*)g_static_private_get (&search_thread_data);
-
+
+ data = (SearchThreadData*)g_private_get (&search_thread_data);
+
if (data->cancelled)
+#ifdef HAVE_GNU_FTW
return FTW_STOP;
+#else
+ return 1;
+#endif /* HAVE_GNU_FTW */
name = strrchr (fpath, '/');
if (name)
else
name = fpath;
- path = g_build_filename (data->path, fpath, NULL);
-
is_hidden = *name == '.';
hit = FALSE;
g_free (lower_name);
}
- if (hit && data->mime_types != NULL)
- {
- hit = FALSE;
- mime_type = xdg_mime_get_mime_type_for_file (path, (struct stat *)sb);
- for (l = data->mime_types; l != NULL; l = l->next)
- {
- if (strcmp (mime_type, l->data) == 0)
- {
- hit = TRUE;
- break;
- }
- }
-
- g_free (mime_type);
- }
-
if (hit)
{
- uri = g_filename_to_uri (path, NULL, NULL);
+ uri = g_filename_to_uri (fpath, NULL, NULL);
data->uri_hits = g_list_prepend (data->uri_hits, uri);
}
if (data->n_processed_files > BATCH_SIZE)
send_batch (data);
-
+
+#ifdef HAVE_GNU_FTW
if (is_hidden)
return FTW_SKIP_SUBTREE;
else
return FTW_CONTINUE;
+#else
+ return 0;
+#endif /* HAVE_GNU_FTW */
}
+#endif /* HAVE_FTW_H */
static gpointer
search_thread_func (gpointer user_data)
{
+#ifdef HAVE_FTW_H
SearchThreadData *data;
data = user_data;
- g_static_private_set (&search_thread_data, data, NULL);
+ g_private_set (&search_thread_data, data);
- nftw (data->path, search_visit_func, 20, FTW_ACTIONRETVAL | FTW_PHYS);
+ nftw (data->path, search_visit_func, 20,
+#ifdef HAVE_GNU_FTW
+ FTW_ACTIONRETVAL |
+#endif
+ FTW_PHYS);
send_batch (data);
- g_idle_add (search_thread_done_idle, data);
+ gdk_threads_add_idle (search_thread_done_idle, data);
+#endif /* HAVE_FTW_H */
return NULL;
}
data = search_thread_data_new (simple, simple->priv->query);
- g_thread_create (search_thread_func, data, FALSE, NULL);
+ g_thread_unref (g_thread_new ("file-search", search_thread_func, data));
simple->priv->active_search = data;
}
GtkSearchEngineClass *engine_class;
gobject_class = G_OBJECT_CLASS (class);
- gobject_class->finalize = finalize;
+ gobject_class->dispose = gtk_search_engine_simple_dispose;
engine_class = GTK_SEARCH_ENGINE_CLASS (class);
engine_class->set_query = gtk_search_engine_simple_set_query;
GtkSearchEngine *
_gtk_search_engine_simple_new (void)
{
- GtkSearchEngine *engine;
-
- engine = g_object_new (GTK_TYPE_SEARCH_ENGINE_SIMPLE, NULL);
-
- return engine;
+#ifdef HAVE_FTW_H
+ return g_object_new (GTK_TYPE_SEARCH_ENGINE_SIMPLE, NULL);
+#else
+ return NULL;
+#endif
}
projects / ~andy / gtk / blobdiff