callisto-debian/gtk3
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

And don't use beagle_query_add_hit_type

Browse Source 
svn path=/trunk/; revision=19649
This commit is contained in:
Matthias Clasen
2008-02-25 15:59:28 +00:00
parent 9f19c492a6
commit 36c4dff3da
2 changed files with 9 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
ChangeLog
View File

@ -1,6 +1,7 @@
2008-02-25 Matthias Clasen <mclasen@redhat.com> 2008-02-25 Matthias Clasen <mclasen@redhat.com>
* gtk/gtksearchenginebeagle.c: Look for libbeagle.so.1 * gtk/gtksearchenginebeagle.c: Look for libbeagle.so.1 and
don't use beagle_query_add_hit_type.
2008-02-25 Richard Hult <richard@imendio.com> 2008-02-25 Richard Hult <richard@imendio.com>

13
gtk/gtksearchenginebeagle.c
View File

@ -69,8 +69,6 @@ static GSList *(*beagle_hits_subtracted_response_get_uris) (BeagleHitsSubtracted
static BeagleQuery *(*beagle_query_new) (void) = NULL; static BeagleQuery *(*beagle_query_new) (void) = NULL;
static void (*beagle_query_add_text) (BeagleQuery *query, static void (*beagle_query_add_text) (BeagleQuery *query,
const char *str) = NULL; const char *str) = NULL;
static void (*beagle_query_add_hit_type) (BeagleQuery *query,
const char *hit_type) = NULL;
static void (*beagle_query_set_max_hits) (BeagleQuery *query, static void (*beagle_query_set_max_hits) (BeagleQuery *query,
gint max_hits) = NULL; gint max_hits) = NULL;
static BeagleQueryPartProperty *(*beagle_query_part_property_new) (void) = NULL; static BeagleQueryPartProperty *(*beagle_query_part_property_new) (void) = NULL;
@ -102,7 +100,6 @@ static struct BeagleDlMapping
MAP (beagle_hits_subtracted_response_get_uris), MAP (beagle_hits_subtracted_response_get_uris),
MAP (beagle_query_new), MAP (beagle_query_new),
MAP (beagle_query_add_text), MAP (beagle_query_add_text),
MAP (beagle_query_add_hit_type),
MAP (beagle_query_set_max_hits), MAP (beagle_query_set_max_hits),
MAP (beagle_query_part_property_new), MAP (beagle_query_part_property_new),
MAP (beagle_query_part_set_logic), MAP (beagle_query_part_set_logic),
@ -277,6 +274,7 @@ gtk_search_engine_beagle_start (GtkSearchEngine *engine)
GtkSearchEngineBeagle *beagle; GtkSearchEngineBeagle *beagle;
GError *error; GError *error;
gchar *text; gchar *text;
gchar *query;
error = NULL; error = NULL;
beagle = GTK_SEARCH_ENGINE_BEAGLE (engine); beagle = GTK_SEARCH_ENGINE_BEAGLE (engine);
@ -298,11 +296,13 @@ gtk_search_engine_beagle_start (GtkSearchEngine *engine)
"error", G_CALLBACK (beagle_error), engine); "error", G_CALLBACK (beagle_error), engine);
/* We only want files */ /* We only want files */
beagle_query_add_hit_type (beagle->priv->current_query, "File");
beagle_query_set_max_hits (beagle->priv->current_query, 1000);
text = _gtk_query_get_text (beagle->priv->query); text = _gtk_query_get_text (beagle->priv->query);
beagle_query_add_text (beagle->priv->current_query, text); query = g_strconcat (text, " type:File", NULL);
beagle_query_set_max_hits (beagle->priv->current_query, 1000);
beagle_query_add_text (beagle->priv->current_query, query);
beagle->priv->current_query_uri_prefix = _gtk_query_get_location (beagle->priv->query); beagle->priv->current_query_uri_prefix = _gtk_query_get_location (beagle->priv->query);
@ -315,6 +315,7 @@ gtk_search_engine_beagle_start (GtkSearchEngine *engine)
/* These must live during the lifetime of the query */ /* These must live during the lifetime of the query */
g_free (text); g_free (text);
g_free (query);
} }
static void static void