tracker r1225 - in trunk: . src/libtracker-common src/libtracker-gtk src/qdbm src/text-filters/ooo_converter src/tracker-applet src/tracker-search-tool src/trackerd
- From: mr svn gnome org
- To: svn-commits-list gnome org
- Subject: tracker r1225 - in trunk: . src/libtracker-common src/libtracker-gtk src/qdbm src/text-filters/ooo_converter src/tracker-applet src/tracker-search-tool src/trackerd
- Date: Mon, 10 Mar 2008 15:43:39 +0000 (GMT)
Author: mr
Date: Mon Mar 10 15:43:39 2008
New Revision: 1225
URL: http://svn.gnome.org/viewvc/tracker?rev=1225&view=rev
Log:
* src/libtracker-common/tracker-configuration.c: (string_replace):
* src/libtracker-gtk/tracker-keyword-store.c:
(tracker_keyword_store_drag_data_get):
* src/libtracker-gtk/tracker-metadata-tile.c: (_int_to_label):
* src/qdbm/myconf.c: (_qdbm_mmap):
* src/text-filters/ooo_converter/ChangeLog:
* src/text-filters/ooo_converter/o3read.c:
* src/tracker-applet/tracker-applet.c: (reindex):
* src/tracker-search-tool/tracker-search-tool.c:
* src/trackerd/tracker-email-thunderbird.c:
* src/trackerd/tracker-indexer.c:
* src/trackerd/trackerd.c: (get_update_count): Fixed all warnings
generated when building the tracker project with the exception of
xdgmime which is imported. This fixes bug #520789.
Modified:
trunk/ChangeLog
trunk/src/libtracker-common/tracker-configuration.c
trunk/src/libtracker-gtk/tracker-keyword-store.c
trunk/src/libtracker-gtk/tracker-metadata-tile.c
trunk/src/qdbm/myconf.c
trunk/src/text-filters/ooo_converter/ChangeLog
trunk/src/text-filters/ooo_converter/o3read.c
trunk/src/tracker-applet/tracker-applet.c
trunk/src/tracker-search-tool/tracker-search-tool.c
trunk/src/trackerd/tracker-email-thunderbird.c
trunk/src/trackerd/tracker-indexer.c
trunk/src/trackerd/trackerd.c
Modified: trunk/src/libtracker-common/tracker-configuration.c
==============================================================================
--- trunk/src/libtracker-common/tracker-configuration.c (original)
+++ trunk/src/libtracker-common/tracker-configuration.c Mon Mar 10 15:43:39 2008
@@ -185,7 +185,7 @@
str = g_string_new ("");
needle_len = g_utf8_strlen(needle, -1);
- while (end_pos = strstr (start_pos, needle)) {
+ while ((end_pos = strstr (start_pos, needle)) != NULL) {
str = g_string_append_len (str, start_pos, start_pos - end_pos);
if (replacement) {
str = g_string_append (str, replacement);
Modified: trunk/src/libtracker-gtk/tracker-keyword-store.c
==============================================================================
--- trunk/src/libtracker-gtk/tracker-keyword-store.c (original)
+++ trunk/src/libtracker-gtk/tracker-keyword-store.c Mon Mar 10 15:43:39 2008
@@ -86,7 +86,7 @@
GtkTreePath *path,
GtkSelectionData *data)
{
- guchar *keyword;
+ gchar *keyword;
GtkTreeIter iter;
TrackerKeywordStore *store;
@@ -98,9 +98,7 @@
gtk_tree_model_get (GTK_TREE_MODEL(store), &iter, TRACKER_KEYWORD_STORE_KEYWORD, &keyword, -1);
- gtk_selection_data_set (data, data->target, 8,
- keyword,
- strlen (keyword));
+ gtk_selection_data_set_text (data, keyword, strlen (keyword));
g_free (keyword);
return TRUE;
}
Modified: trunk/src/libtracker-gtk/tracker-metadata-tile.c
==============================================================================
--- trunk/src/libtracker-gtk/tracker-metadata-tile.c (original)
+++ trunk/src/libtracker-gtk/tracker-metadata-tile.c Mon Mar 10 15:43:39 2008
@@ -970,33 +970,6 @@
g_free (format);
}
-
-static char *
-date_to_str (gint32 date_time)
-{
- char buffer[30];
- time_t time_stamp;
- struct tm loctime;
- size_t count;
-
- memset (buffer, '\0', sizeof (buffer));
- memset (&loctime, 0, sizeof (struct tm));
-
- time_stamp = (time_t) date_time;
-
- localtime_r (&time_stamp, &loctime);
-
- /* output is ISO 8160 format : "YYYY-MM-DDThh:mm:ss+zz:zz" */
- count = strftime (buffer, sizeof (buffer), "%FT%T%z", &loctime);
-
- if (count > 0) {
- return g_strdup (buffer);
- } else {
- return NULL;
- }
-}
-
-
/* Converts ISO date to something human readable */
static gboolean
get_time_from_iso (const char *iso, GDate *val)
Modified: trunk/src/qdbm/myconf.c
==============================================================================
--- trunk/src/qdbm/myconf.c (original)
+++ trunk/src/qdbm/myconf.c Mon Mar 10 15:43:39 2008
@@ -250,7 +250,7 @@
while((rv = read(fd, wp + rlen, length - rlen)) > 0){
rlen += rv;
}
- if(rv == -1 || rlen != length){
+ if(rv == -1 || rlen != (int) length){
free(buf);
return MAP_FAILED;
}
Modified: trunk/src/text-filters/ooo_converter/o3read.c
==============================================================================
--- trunk/src/text-filters/ooo_converter/o3read.c (original)
+++ trunk/src/text-filters/ooo_converter/o3read.c Mon Mar 10 15:43:39 2008
@@ -64,7 +64,7 @@
{NULL, 0}
};
-/* convert Auml to Äand #33 to ! */
+/* convert Auml to à and #33 to ! */
static int from_cchar(char *from)
{
int i;
@@ -350,7 +350,7 @@
error = 1;
state = END;
} else {
- if (m+1 < sizeof t) t[m++] = c;
+ if (m+1 < (int) sizeof t) t[m++] = c;
}
break;
default:
Modified: trunk/src/tracker-applet/tracker-applet.c
==============================================================================
--- trunk/src/tracker-applet/tracker-applet.c (original)
+++ trunk/src/tracker-applet/tracker-applet.c Mon Mar 10 15:43:39 2008
@@ -736,8 +736,6 @@
gchar *primary;
gchar *secondary;
- TrayIconPrivate *priv = TRAY_ICON_GET_PRIVATE (icon);
-
primary = g_strdup (_("Re-index your system?"));
secondary = g_strdup (_("Indexing can take a long time. Are you sure you want to re-index?"));
Modified: trunk/src/tracker-search-tool/tracker-search-tool.c
==============================================================================
--- trunk/src/tracker-search-tool/tracker-search-tool.c (original)
+++ trunk/src/tracker-search-tool/tracker-search-tool.c Mon Mar 10 15:43:39 2008
@@ -222,22 +222,6 @@
" </popup>"
"</ui>";
-static const char * MenuDesc =
-"<ui>"
-" <menubar>"
-" <menu name='FileMenu' action='FileMenuAction'>"
-" <menuitem action='SaveResultsAs' />"
-" </menu>"
-" <menu name='EditMenu' action='FileMenuAction'>"
-" <menuitem action='SaveResultsAs' />"
-" </menu>"
-" <menu name='HelpMenu' action='HelpMenuAction'>"
-" <menuitem action='AboutAction' />"
-" </menu>"
-" </menubar>"
-"</ui>";
-
-
static void set_snippet (gchar * snippet, GError *error, gpointer user_data);
static void
@@ -2187,30 +2171,6 @@
g_free (click_to_activate_pref);
}
-static gboolean
-tracker_search_select_service_type_by_string (GtkComboBox * combo,
- gchar * service)
-{
- GtkTreeIter iter;
- GtkTreeModel *model;
- gchar *current_value;
-
- model = gtk_combo_box_get_model (combo);
- if (!gtk_tree_model_get_iter_first (model, &iter)) {
- return FALSE;
- }
-
- do {
- gtk_tree_model_get (model, &iter, 1, ¤t_value, -1);
- if (!strcmp (service, current_value)) {
- gtk_combo_box_set_active_iter (combo, &iter);
- return TRUE;
- }
- } while (gtk_tree_model_iter_next (model, &iter));
-
- return FALSE;
-}
-
gchar *
tracker_search_pixmap_file (const gchar * partial_path)
{
Modified: trunk/src/trackerd/tracker-email-thunderbird.c
==============================================================================
--- trunk/src/trackerd/tracker-email-thunderbird.c (original)
+++ trunk/src/trackerd/tracker-email-thunderbird.c Mon Mar 10 15:43:39 2008
@@ -82,7 +82,6 @@
static void end_element_handler (GMarkupParseContext *context, const gchar *element_name,
gpointer user_data, GError **error);
static glong get_date_from_string (const gchar *date_string);
-static gboolean get_boolean_from_string (const gchar *boolean_string);
static void free_parser_data (gpointer user_data);
Modified: trunk/src/trackerd/tracker-indexer.c
==============================================================================
--- trunk/src/trackerd/tracker-indexer.c (original)
+++ trunk/src/trackerd/tracker-indexer.c Mon Mar 10 15:43:39 2008
@@ -17,11 +17,23 @@
* Boston, MA 02110-1301, USA.
*/
+
+/* Needed before including math.h for lrintf() */
+#define _ISOC9X_SOURCE 1
+#define _ISOC99_SOURCE 1
+
+#define __USE_ISOC9X 1
+#define __USE_ISOC99 1
+
+/* Size of free block pool of inverted index */
+#define INDEXFBP 32
#define SCORE_MULTIPLIER 100000
-#define INDEXFBP 32 /* size of free block pool of inverted index */
-#define CREATE_INDEX "CREATE TABLE HitIndex (Word Text not null unique, HitCount Integer, HitArraySize Integer, HitArray Blob);"
#define MAX_HIT_BUFFER 480000
+#define CREATE_INDEX \
+ "CREATE TABLE HitIndex (Word Text not null " \
+ "unique, HitCount Integer, HitArraySize Integer, HitArray Blob);"
+
#include <stdlib.h>
#include <stdio.h>
#include <sys/types.h>
Modified: trunk/src/trackerd/trackerd.c
==============================================================================
--- trunk/src/trackerd/trackerd.c (original)
+++ trunk/src/trackerd/trackerd.c Mon Mar 10 15:43:39 2008
@@ -190,16 +190,6 @@
return count;
}
-
-static void
-set_update_count (DBConnection *db_con, gint count)
-{
- gchar *str_count = tracker_int_to_str (count);
- tracker_exec_proc (db_con, "SetUpdateCount", 1, str_count);
- g_free (str_count);
-}
-
-
#ifdef HAVE_HAL
static void
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]