tracker r2504 - in trunk: . src/libinotify src/libtracker-common src/libtracker-data src/libtracker-db src/tracker-applet src/tracker-extract src/tracker-indexer src/tracker-preferences src/tracker-search-tool src/tracker-utils src/trackerd utils/qdbm
- From: mr svn gnome org
- To: svn-commits-list gnome org
- Subject: tracker r2504 - in trunk: . src/libinotify src/libtracker-common src/libtracker-data src/libtracker-db src/tracker-applet src/tracker-extract src/tracker-indexer src/tracker-preferences src/tracker-search-tool src/tracker-utils src/trackerd utils/qdbm
- Date: Mon, 17 Nov 2008 12:52:15 +0000 (UTC)
Author: mr
Date: Mon Nov 17 12:52:15 2008
New Revision: 2504
URL: http://svn.gnome.org/viewvc/tracker?rev=2504&view=rev
Log:
* configure.ac: Removed Enable warnings|debug statement when
configure is finished, they are no longer used. Fixed the checks
for HAL and libxml2 to actually error if the user specifically
asked to enable them. Also make the HAL error more obvious since
it is usually likely the hal-storage package is the one missing.
* src/libinotify/inotify-listhash.c:
* src/libtracker-common/tracker-config.c:
* src/libtracker-common/tracker-dbus.c:
* src/libtracker-common/tracker-nfs-lock.c:
* src/libtracker-data/tracker-data-query.c:
* src/libtracker-data/tracker-data-search.c:
* src/libtracker-data/tracker-xesam-query.c:
* src/libtracker-db/tracker-db-interface-sqlite.c:
* src/libtracker-db/tracker-db-interface.c:
* src/libtracker-db/tracker-db-manager.c:
* src/tracker-applet/tracker-applet.c:
* src/tracker-extract/tracker-albumart.c:
* src/tracker-indexer/tracker-metadata-utils.c:
* src/tracker-preferences/tracker-preferences.c:
* src/tracker-search-tool/tracker-search-tool-callbacks.c:
* src/tracker-search-tool/tracker-search-tool.c:
* src/tracker-utils/tracker-files.c:
* src/tracker-utils/tracker-info.c:
* src/tracker-utils/tracker-meta-folder.c:
* src/tracker-utils/tracker-query.c:
* src/tracker-utils/tracker-search.c:
* src/tracker-utils/tracker-services.c:
* src/tracker-utils/tracker-tag.c:
* src/tracker-utils/tracker-unique.c:
* src/trackerd/tracker-search.c:
* src/trackerd/tracker-xesam-live-search.c:
* utils/qdbm/print-words.c:
* utils/qdbm/search-word.c: Fixed all 64bit compilation warnings.
Modified:
trunk/ChangeLog
trunk/configure.ac
trunk/src/libinotify/inotify-listhash.c
trunk/src/libtracker-common/tracker-config.c
trunk/src/libtracker-common/tracker-dbus.c
trunk/src/libtracker-common/tracker-nfs-lock.c
trunk/src/libtracker-data/tracker-data-query.c
trunk/src/libtracker-data/tracker-data-search.c
trunk/src/libtracker-data/tracker-xesam-query.c
trunk/src/libtracker-db/tracker-db-interface-sqlite.c
trunk/src/libtracker-db/tracker-db-interface.c
trunk/src/libtracker-db/tracker-db-manager.c
trunk/src/tracker-applet/tracker-applet.c
trunk/src/tracker-extract/tracker-albumart.c
trunk/src/tracker-indexer/tracker-metadata-utils.c
trunk/src/tracker-preferences/tracker-preferences.c
trunk/src/tracker-search-tool/tracker-search-tool-callbacks.c
trunk/src/tracker-search-tool/tracker-search-tool.c
trunk/src/tracker-utils/tracker-files.c
trunk/src/tracker-utils/tracker-info.c
trunk/src/tracker-utils/tracker-meta-folder.c
trunk/src/tracker-utils/tracker-query.c
trunk/src/tracker-utils/tracker-search.c
trunk/src/tracker-utils/tracker-services.c
trunk/src/tracker-utils/tracker-tag.c
trunk/src/tracker-utils/tracker-unique.c
trunk/src/trackerd/tracker-search.c
trunk/src/trackerd/tracker-xesam-live-search.c
trunk/utils/qdbm/print-words.c
trunk/utils/qdbm/search-word.c
Modified: trunk/configure.ac
==============================================================================
--- trunk/configure.ac (original)
+++ trunk/configure.ac Mon Nov 17 12:52:15 2008
@@ -92,6 +92,7 @@
PANGO_REQUIRED=1.0.0
GMIME_REQUIRED=2.1.0
LIBXML2_REQUIRED=0.6
+HAL_REQUIRED=0.5
GDKPIXBUF_REQUIRED=2.12.0
UNAC_REQUIRED=1.0.0
POPPLER_GLIB_REQUIRED=0.4.5
@@ -338,12 +339,18 @@
[have_libxml2=no])
AC_SUBST(LIBXML2_CFLAGS)
AC_SUBST(LIBXML2_LIBS)
+
+ if test "x$have_libxml2" = "xyes"; then
+ AC_DEFINE(HAVE_LIBXML2, [], [Define if we have libxml2])
+ fi
else
have_libxml2="no (disabled)"
fi
-if test "x$have_libxml2" = "xyes"; then
- AC_DEFINE(HAVE_LIBXML2, [], [Define if we have libxml2])
+if test "x$enable_libxml2" = "xyes"; then
+ if test "x$have_libxml2" != "xyes"; then
+ AC_MSG_ERROR([Couldn't find libxml2 >= $LIBXML2_REQUIRED.])
+ fi
fi
AM_CONDITIONAL(HAVE_LIBXML2, test "x$have_libxml2" = "xyes")
@@ -359,17 +366,23 @@
if test "x$enable_hal" = "xyes"; then
PKG_CHECK_MODULES(HAL,
- [hal >= 0.5 hal-storage],
+ [hal >= $HAL_REQUIRED hal-storage],
[have_hal=yes] ,
[have_hal=no])
AC_SUBST(HAL_CFLAGS)
AC_SUBST(HAL_LIBS)
+
+ if test "x$have_hal" = "xyes"; then
+ AC_DEFINE(HAVE_HAL, [], [Define if we have HAL])
+ fi
else
have_hal="no (disabled)"
fi
-if test "x$have_hal" = "xyes"; then
- AC_DEFINE(HAVE_HAL, [], [Define if we have HAL])
+if test "x$enable_hal" = "xyes"; then
+ if test "x$have_hal" != "xyes"; then
+ AC_MSG_ERROR([Couldn't find HAL >= $HAL_REQUIRED and HAL storage.])
+ fi
fi
AM_CONDITIONAL(HAVE_HAL, test "x$have_hal" = "xyes")
@@ -1251,8 +1264,6 @@
Win32: $native_win32
- Enable warnings: $enable_warnings
- Enable debug symbols: $enable_debug_code
Enable unit tests: $have_unit_tests
Enable unac accent stripper: $enable_unac
Modified: trunk/src/libinotify/inotify-listhash.c
==============================================================================
--- trunk/src/libinotify/inotify-listhash.c (original)
+++ trunk/src/libinotify/inotify-listhash.c Mon Nov 17 12:52:15 2008
@@ -27,107 +27,107 @@
static GHashTable *inotify_wd_table;
GSList *
-inotify_listhash_get( gint32 wd )
+inotify_listhash_get (gint32 wd)
{
- GSList *list;
+ GSList *list;
- list = g_hash_table_lookup( inotify_wd_table, (gpointer) wd );
+ list = g_hash_table_lookup (inotify_wd_table, GINT_TO_POINTER (wd));
- return list;
+ return list;
}
int
-inotify_listhash_remove( INotifyHandle *inh )
+inotify_listhash_remove (INotifyHandle *inh)
{
- GSList *list;
- gint32 wd;
+ GSList *list;
+ gint32 wd;
- wd = inotify_handle_get_wd( inh );
+ wd = inotify_handle_get_wd (inh);
- list = g_hash_table_lookup( inotify_wd_table, (gpointer) wd );
+ list = g_hash_table_lookup (inotify_wd_table, GINT_TO_POINTER (wd));
- if( list == NULL )
- return -1;
+ if (list == NULL)
+ return -1;
- list = g_slist_remove( list, inh );
- inotify_handle_unref( inh );
+ list = g_slist_remove (list, inh);
+ inotify_handle_unref (inh);
- if( list != NULL )
- g_hash_table_replace( inotify_wd_table, (gpointer) wd, list );
- else
- g_hash_table_remove( inotify_wd_table, (gpointer) wd );
+ if (list != NULL)
+ g_hash_table_replace (inotify_wd_table, GINT_TO_POINTER (wd), list);
+ else
+ g_hash_table_remove (inotify_wd_table, GINT_TO_POINTER (wd));
- return g_slist_length( list );
+ return g_slist_length (list);
}
void
-inotify_listhash_append( INotifyHandle *inh, gint32 wd )
+inotify_listhash_append (INotifyHandle *inh, gint32 wd)
{
- GSList *list;
+ GSList *list;
- inotify_handle_ref( inh );
- inotify_handle_set_wd( inh, wd );
+ inotify_handle_ref (inh);
+ inotify_handle_set_wd (inh, wd);
- list = g_hash_table_lookup( inotify_wd_table, (gpointer) wd );
- list = g_slist_append( list, inh );
- g_hash_table_replace( inotify_wd_table, (gpointer) wd, list );
+ list = g_hash_table_lookup (inotify_wd_table, GINT_TO_POINTER (wd));
+ list = g_slist_append (list, inh);
+ g_hash_table_replace (inotify_wd_table, GINT_TO_POINTER (wd), list);
}
int
-inotify_listhash_ignore( gint32 wd )
+inotify_listhash_ignore (gint32 wd)
{
- GSList *link, *next;
+ GSList *link, *next;
- link = g_hash_table_lookup( inotify_wd_table, (gpointer) wd );
- g_hash_table_remove( inotify_wd_table, (gpointer) wd );
+ link = g_hash_table_lookup (inotify_wd_table, GINT_TO_POINTER (wd));
+ g_hash_table_remove (inotify_wd_table, GINT_TO_POINTER (wd));
- if( link == NULL )
- return -1;
+ if (link == NULL)
+ return -1;
- for( ; link; link = next )
- {
- next = link->next;
+ for (; link; link = next)
+ {
+ next = link->next;
- inotify_handle_unref( link->data );
- g_slist_free_1( link );
- }
+ inotify_handle_unref (link->data);
+ g_slist_free_1 (link);
+ }
- return 0;
+ return 0;
}
int
-inotify_listhash_length( gint32 wd )
+inotify_listhash_length (gint32 wd)
{
- GSList *list;
+ GSList *list;
- list = g_hash_table_lookup( inotify_wd_table, (gpointer) wd );
+ list = g_hash_table_lookup (inotify_wd_table, GINT_TO_POINTER (wd));
- return g_slist_length( list );
+ return g_slist_length (list);
}
guint32
-inotify_listhash_get_mask( gint32 wd )
+inotify_listhash_get_mask (gint32 wd)
{
- GSList *list;
- guint32 mask;
+ GSList *list;
+ guint32 mask;
- list = g_hash_table_lookup( inotify_wd_table, (gpointer) wd );
+ list = g_hash_table_lookup (inotify_wd_table, GINT_TO_POINTER (wd));
- for( mask = 0; list; list = list->next )
- mask |= inotify_handle_get_mask( list->data );
+ for (mask = 0; list; list = list->next)
+ mask |= inotify_handle_get_mask (list->data);
- return mask;
+ return mask;
}
void
-inotify_listhash_initialise( void )
+inotify_listhash_initialise (void)
{
- inotify_wd_table = g_hash_table_new( NULL, NULL );
+ inotify_wd_table = g_hash_table_new (NULL, NULL);
}
void
-inotify_listhash_destroy( void )
+inotify_listhash_destroy (void)
{
- g_hash_table_destroy( inotify_wd_table );
+ g_hash_table_destroy (inotify_wd_table);
}
Modified: trunk/src/libtracker-common/tracker-config.c
==============================================================================
--- trunk/src/libtracker-common/tracker-config.c (original)
+++ trunk/src/libtracker-common/tracker-config.c Mon Nov 17 12:52:15 2008
@@ -1431,9 +1431,10 @@
g_free (data);
if (error) {
- g_warning ("Could not write %d bytes to file '%s', %s",
+ g_warning ("Could not write %" G_GSIZE_FORMAT " bytes to file '%s', %s",
size,
filename,
+ "%s",
error->message);
g_free (filename);
g_error_free (error);
@@ -1441,7 +1442,7 @@
return FALSE;
}
- g_message ("Wrote config to '%s' (%d bytes)",
+ g_message ("Wrote config to '%s' (%" G_GSIZE_FORMAT " bytes)",
filename,
size);
Modified: trunk/src/libtracker-common/tracker-dbus.c
==============================================================================
--- trunk/src/libtracker-common/tracker-dbus.c (original)
+++ trunk/src/libtracker-common/tracker-dbus.c Mon Nov 17 12:52:15 2008
@@ -299,7 +299,7 @@
str = g_strdup_vprintf (format, args);
va_end (args);
- g_set_error (error, TRACKER_DBUS_ERROR, 0, str);
+ g_set_error (error, TRACKER_DBUS_ERROR, 0, "%s", str);
} else if (*error != NULL) {
str = g_strdup ((*error)->message);
} else {
Modified: trunk/src/libtracker-common/tracker-nfs-lock.c
==============================================================================
--- trunk/src/libtracker-common/tracker-nfs-lock.c (original)
+++ trunk/src/libtracker-common/tracker-nfs-lock.c Mon Nov 17 12:52:15 2008
@@ -46,7 +46,7 @@
}
}
-static gint
+static time_t
get_mtime (const gchar *filename)
{
struct stat st;
Modified: trunk/src/libtracker-data/tracker-data-query.c
==============================================================================
--- trunk/src/libtracker-data/tracker-data-query.c (original)
+++ trunk/src/libtracker-data/tracker-data-query.c Mon Nov 17 12:52:15 2008
@@ -209,9 +209,9 @@
query = g_string_free (sql, FALSE);
- g_debug (query);
+ g_debug ("%s", query);
- result_set = tracker_db_interface_execute_query (iface, NULL, query);
+ result_set = tracker_db_interface_execute_query (iface, NULL, "%s", query);
g_free (query);
@@ -511,7 +511,7 @@
service_id);
}
- result_set = tracker_db_interface_execute_query (iface, NULL, query);
+ result_set = tracker_db_interface_execute_query (iface, NULL, "%s", query);
g_free (query);
if (result_set) {
Modified: trunk/src/libtracker-data/tracker-data-search.c
==============================================================================
--- trunk/src/libtracker-data/tracker-data-search.c (original)
+++ trunk/src/libtracker-data/tracker-data-search.c Mon Nov 17 12:52:15 2008
@@ -609,7 +609,7 @@
limit);
query = g_string_free (str, FALSE);
- result_set = tracker_db_interface_execute_query (iface, NULL, query);
+ result_set = tracker_db_interface_execute_query (iface, NULL, "%s", query);
g_free (query);
return result_set;
@@ -810,7 +810,7 @@
g_message ("Unique values query executed:\n%s", sql);
- result_set = tracker_db_interface_execute_query (iface, NULL, sql);
+ result_set = tracker_db_interface_execute_query (iface, NULL, "%s", sql);
g_free (sql);
@@ -964,7 +964,7 @@
g_message ("Unique values query executed:\n%s", sql);
- result_set = tracker_db_interface_execute_query (iface, NULL, sql);
+ result_set = tracker_db_interface_execute_query (iface, NULL, "%s", sql);
g_free (sql);
@@ -1155,7 +1155,7 @@
g_message ("Unique values query executed:\n%s", sql);
- result_set = tracker_db_interface_execute_query (iface, NULL, sql);
+ result_set = tracker_db_interface_execute_query (iface, NULL, "%s", sql);
g_free (sql);
@@ -1258,7 +1258,7 @@
g_debug ("Sum query executed:\n%s", sql);
- result_set = tracker_db_interface_execute_query (iface, NULL, sql);
+ result_set = tracker_db_interface_execute_query (iface, NULL, "%s", sql);
g_free (sql);
@@ -1355,7 +1355,7 @@
g_message ("Count query executed:\n%s", sql);
- result_set = tracker_db_interface_execute_query (iface, NULL, sql);
+ result_set = tracker_db_interface_execute_query (iface, NULL, "%s", sql);
g_free (sql);
@@ -1477,7 +1477,7 @@
g_free (uri_filtered);
query = g_string_free (sql, FALSE);
- result_set = tracker_db_interface_execute_query (iface, NULL, query);
+ result_set = tracker_db_interface_execute_query (iface, NULL, "%s", query);
g_free (query);
@@ -1557,9 +1557,9 @@
g_string_free (select, TRUE);
g_string_free (where, TRUE);
- g_debug (query);
+ g_debug ("%s", query);
- result_set = tracker_db_interface_execute_query (iface, NULL, query);
+ result_set = tracker_db_interface_execute_query (iface, NULL, "%s", query);
g_free (query);
Modified: trunk/src/libtracker-data/tracker-xesam-query.c
==============================================================================
--- trunk/src/libtracker-data/tracker-xesam-query.c (original)
+++ trunk/src/libtracker-data/tracker-xesam-query.c Mon Nov 17 12:52:15 2008
@@ -1007,7 +1007,7 @@
gint cvalue;
bvalue = tracker_date_format (avalue);
- g_debug (bvalue);
+ g_debug ("%s", bvalue);
cvalue = tracker_string_to_date (bvalue);
g_debug ("%d", cvalue);
value = tracker_gint_to_string (cvalue);
Modified: trunk/src/libtracker-db/tracker-db-interface-sqlite.c
==============================================================================
--- trunk/src/libtracker-db/tracker-db-interface-sqlite.c (original)
+++ trunk/src/libtracker-db/tracker-db-interface-sqlite.c Mon Nov 17 12:52:15 2008
@@ -431,12 +431,13 @@
}
if (!error) {
- g_warning (sqlite3_errmsg (priv->db));
+ g_warning ("%s", sqlite3_errmsg (priv->db));
} else {
g_set_error (error,
TRACKER_DB_INTERFACE_ERROR,
TRACKER_DB_QUERY_ERROR,
- sqlite3_errmsg (priv->db));
+ "%s",
+ sqlite3_errmsg (priv->db));
}
/* If there was an error, result set may be invalid or incomplete */
@@ -560,7 +561,8 @@
g_set_error (error,
TRACKER_DB_INTERFACE_ERROR,
TRACKER_DB_QUERY_ERROR,
- sqlite3_errmsg (priv->db));
+ "%s",
+ sqlite3_errmsg (priv->db));
return NULL;
} else if (stmt == NULL) {
g_set_error (error,
Modified: trunk/src/libtracker-db/tracker-db-interface.c
==============================================================================
--- trunk/src/libtracker-db/tracker-db-interface.c (original)
+++ trunk/src/libtracker-db/tracker-db-interface.c Mon Nov 17 12:52:15 2008
@@ -402,7 +402,7 @@
"BEGIN TRANSACTION");
if (error) {
- g_warning (error->message);
+ g_warning ("%s", error->message);
g_error_free (error);
return FALSE;
}
@@ -428,7 +428,7 @@
tracker_db_interface_execute_query (interface, &error, "COMMIT");
if (error) {
- g_warning (error->message);
+ g_warning ("%s", error->message);
g_error_free (error);
tracker_db_interface_execute_query (interface, NULL, "ROLLBACK");
@@ -617,7 +617,7 @@
}
if (error) {
- g_warning (error);
+ g_warning ("%s", error);
g_free (error);
}
}
Modified: trunk/src/libtracker-db/tracker-db-manager.c
==============================================================================
--- trunk/src/libtracker-db/tracker-db-manager.c (original)
+++ trunk/src/libtracker-db/tracker-db-manager.c Mon Nov 17 12:52:15 2008
@@ -225,7 +225,7 @@
continue;
}
- tracker_db_interface_execute_query (iface, &error, sql);
+ tracker_db_interface_execute_query (iface, &error, "%s", sql);
if (error) {
g_warning ("Error loading query:'%s' #%d, %s", file, i, error->message);
Modified: trunk/src/tracker-applet/tracker-applet.c
==============================================================================
--- trunk/src/tracker-applet/tracker-applet.c (original)
+++ trunk/src/tracker-applet/tracker-applet.c Mon Nov 17 12:52:15 2008
@@ -800,7 +800,7 @@
{
TrayIconPrivate *priv;
GError *error = NULL;
- guint length;
+ gsize size;
gchar *contents;
priv = TRAY_ICON_GET_PRIVATE (icon);
@@ -814,7 +814,7 @@
g_key_file_set_integer (priv->keyfile, "Applet", "SmartPause",
priv->auto_pause_setting);
- contents = g_key_file_to_data (priv->keyfile, &length, &error);
+ contents = g_key_file_to_data (priv->keyfile, &size, &error);
if (error) {
g_error ("failed: g_key_file_to_data(): %s\n",
@@ -1040,9 +1040,12 @@
dialog = gtk_message_dialog_new (NULL,
GTK_DIALOG_MODAL,
GTK_MESSAGE_WARNING,
- GTK_BUTTONS_YES_NO, primary);
+ GTK_BUTTONS_YES_NO,
+ "%s",
+ primary);
gtk_message_dialog_format_secondary_text (GTK_MESSAGE_DIALOG (dialog),
+ "%s",
secondary);
g_free (primary);
@@ -1289,6 +1292,7 @@
GTK_DIALOG_DESTROY_WITH_PARENT,
GTK_MESSAGE_ERROR,
GTK_BUTTONS_CLOSE,
+ "%s",
error->message);
gtk_dialog_run (GTK_DIALOG (dialog));
gtk_widget_destroy (dialog);
Modified: trunk/src/tracker-extract/tracker-albumart.c
==============================================================================
--- trunk/src/tracker-extract/tracker-albumart.c (original)
+++ trunk/src/tracker-extract/tracker-albumart.c Mon Nov 17 12:52:15 2008
@@ -509,7 +509,7 @@
G_TYPE_INVALID);
if (error) {
- g_warning (error->message);
+ g_warning ("%s", error->message);
g_error_free (error);
}
}
Modified: trunk/src/tracker-indexer/tracker-metadata-utils.c
==============================================================================
--- trunk/src/tracker-indexer/tracker-metadata-utils.c (original)
+++ trunk/src/tracker-indexer/tracker-metadata-utils.c Mon Nov 17 12:52:15 2008
@@ -403,7 +403,7 @@
g_string_append (text, line);
g_free (line);
} else if (error) {
- g_warning (error->message);
+ g_warning ("%s", error->message);
g_error_free (error);
}
} while (status == G_IO_STATUS_NORMAL);
@@ -542,8 +542,7 @@
bytes_read += bytes;
bytes_remaining -= bytes;
- g_debug (" Read %d bytes",
- bytes);
+ g_debug (" Read %" G_GSSIZE_FORMAT " bytes", bytes);
}
/* Set the NULL termination after the last byte read */
@@ -562,7 +561,7 @@
if (bytes_read_total == 0) {
if (bytes_read == buf_size &&
strchr (buf, '\n') == NULL) {
- g_debug (" No '\\n' in the first %d bytes, not indexing file",
+ g_debug (" No '\\n' in the first %" G_GSSIZE_FORMAT " bytes, not indexing file",
buf_size);
break;
} else if (bytes_read <= 2) {
@@ -586,7 +585,10 @@
has_reached_max = TRUE;
}
- g_debug (" Read %d bytes total, %d bytes this time, more data:%s, reached max:%s",
+ g_debug (" Read "
+ "%" G_GSSIZE_FORMAT " bytes total, "
+ "%" G_GSSIZE_FORMAT " bytes this time, "
+ "more data:%s, reached max:%s",
bytes_read_total,
bytes_read,
has_more_data ? "yes" : "no",
@@ -632,7 +634,7 @@
s = g_string_truncate (s, bytes_valid);
}
#else /* TRY_LOCALE_TO_UTF8_CONVERSION */
- g_debug (" Truncating to last valid UTF-8 character (%d/%d bytes)",
+ g_debug (" Truncating to last valid UTF-8 character (%" G_GSSIZE_FORMAT "/%" G_GSSIZE_FORMAT " bytes)",
bytes_valid,
s->len);
s = g_string_truncate (s, bytes_valid);
@@ -666,7 +668,7 @@
G_TYPE_INVALID);
if (error) {
- g_warning (error->message);
+ g_warning ("%s", error->message);
g_error_free (error);
}
}
Modified: trunk/src/tracker-preferences/tracker-preferences.c
==============================================================================
--- trunk/src/tracker-preferences/tracker-preferences.c (original)
+++ trunk/src/tracker-preferences/tracker-preferences.c Mon Nov 17 12:52:15 2008
@@ -669,9 +669,11 @@
GTK_DIALOG_MODAL,
GTK_MESSAGE_WARNING,
GTK_BUTTONS_NONE,
+ "%s",
primary);
gtk_message_dialog_format_secondary_text (GTK_MESSAGE_DIALOG (dialog),
+ "%s",
secondary);
gtk_dialog_add_buttons (GTK_DIALOG (dialog),
Modified: trunk/src/tracker-search-tool/tracker-search-tool-callbacks.c
==============================================================================
--- trunk/src/tracker-search-tool/tracker-search-tool-callbacks.c (original)
+++ trunk/src/tracker-search-tool/tracker-search-tool-callbacks.c Mon Nov 17 12:52:15 2008
@@ -128,6 +128,7 @@
GTK_BUTTONS_OK,
_("Could not open help document."));
gtk_message_dialog_format_secondary_text (GTK_MESSAGE_DIALOG (dialog),
+ "%s",
error->message);
gtk_window_set_title (GTK_WINDOW (dialog), "");
@@ -335,8 +336,10 @@
GTK_DIALOG_DESTROY_WITH_PARENT,
GTK_MESSAGE_QUESTION,
GTK_BUTTONS_CANCEL,
+ "%s",
primary);
gtk_message_dialog_format_secondary_text (GTK_MESSAGE_DIALOG (dialog),
+ "%s",
secondary);
gtk_window_set_title (GTK_WINDOW (dialog), "");
@@ -372,8 +375,10 @@
GTK_DIALOG_DESTROY_WITH_PARENT,
GTK_MESSAGE_ERROR,
GTK_BUTTONS_OK,
+ "%s",
primary);
gtk_message_dialog_format_secondary_text (GTK_MESSAGE_DIALOG (dialog),
+ "%s",
message);
gtk_window_set_title (GTK_WINDOW (dialog), "");
@@ -401,6 +406,7 @@
GTK_DIALOG_DESTROY_WITH_PARENT,
GTK_MESSAGE_ERROR,
GTK_BUTTONS_OK,
+ "%s",
primary);
gtk_message_dialog_format_secondary_text (GTK_MESSAGE_DIALOG (dialog),
_("The nautilus file manager is not running."));
@@ -684,8 +690,10 @@
GTK_DIALOG_DESTROY_WITH_PARENT,
GTK_MESSAGE_QUESTION,
GTK_BUTTONS_CANCEL,
+ "%s",
primary);
gtk_message_dialog_format_secondary_text (GTK_MESSAGE_DIALOG (dialog),
+ "%s",
secondary);
gtk_window_set_title (GTK_WINDOW (dialog), "");
@@ -778,8 +786,10 @@
GTK_DIALOG_DESTROY_WITH_PARENT,
GTK_MESSAGE_ERROR,
GTK_BUTTONS_OK,
+ "%s",
primary);
gtk_message_dialog_format_secondary_text (GTK_MESSAGE_DIALOG (dialog),
+ "%s",
message);
gtk_window_set_title (GTK_WINDOW (dialog), "");
@@ -1331,8 +1341,10 @@
GTK_DIALOG_DESTROY_WITH_PARENT,
GTK_MESSAGE_ERROR,
GTK_BUTTONS_OK,
+ "%s",
primary);
gtk_message_dialog_format_secondary_text (GTK_MESSAGE_DIALOG (dialog),
+ "%s",
secondary);
gtk_window_set_title (GTK_WINDOW (dialog), "");
@@ -1363,8 +1375,10 @@
GTK_DIALOG_DESTROY_WITH_PARENT,
GTK_MESSAGE_ERROR,
GTK_BUTTONS_OK,
+ "%s",
primary);
gtk_message_dialog_format_secondary_text (GTK_MESSAGE_DIALOG (dialog),
+ "%s",
message);
gtk_window_set_title (GTK_WINDOW (dialog), "");
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 Nov 17 12:52:15 2008
@@ -245,7 +245,8 @@
string);
gtk_message_dialog_format_secondary_text (GTK_MESSAGE_DIALOG (dialog),
- (error == NULL) ? " " : error->message);
+ "%s",
+ error == NULL ? " " : error->message);
gtk_window_set_title (GTK_WINDOW (dialog), "");
gtk_container_set_border_width (GTK_CONTAINER (dialog), 5);
@@ -265,12 +266,15 @@
GtkWidget * dialog;
dialog = gtk_message_dialog_new (GTK_WINDOW (window),
- GTK_DIALOG_DESTROY_WITH_PARENT,
- GTK_MESSAGE_ERROR,
- GTK_BUTTONS_OK,
- _("The following error has occurred :"));
-
- gtk_message_dialog_format_secondary_text (GTK_MESSAGE_DIALOG (dialog), error);
+ GTK_DIALOG_DESTROY_WITH_PARENT,
+ GTK_MESSAGE_ERROR,
+ GTK_BUTTONS_OK,
+ "%s",
+ _("The following error has occurred :"));
+
+ gtk_message_dialog_format_secondary_text (GTK_MESSAGE_DIALOG (dialog),
+ "%s",
+ error);
gtk_window_set_title (GTK_WINDOW (dialog), _("Error"));
gtk_container_set_border_width (GTK_CONTAINER (dialog), 5);
Modified: trunk/src/tracker-utils/tracker-files.c
==============================================================================
--- trunk/src/tracker-utils/tracker-files.c (original)
+++ trunk/src/tracker-utils/tracker-files.c Mon Nov 17 12:52:15 2008
@@ -80,7 +80,7 @@
help = g_option_context_get_help (context, TRUE, NULL);
g_option_context_free (context);
- g_printerr (help);
+ g_printerr ("%s", help);
g_free (help);
return EXIT_FAILURE;
Modified: trunk/src/tracker-utils/tracker-info.c
==============================================================================
--- trunk/src/tracker-utils/tracker-info.c (original)
+++ trunk/src/tracker-utils/tracker-info.c Mon Nov 17 12:52:15 2008
@@ -88,7 +88,7 @@
help = g_option_context_get_help (context, TRUE, NULL);
g_option_context_free (context);
- g_printerr (help);
+ g_printerr ("%s", help);
g_free (help);
return EXIT_FAILURE;
Modified: trunk/src/tracker-utils/tracker-meta-folder.c
==============================================================================
--- trunk/src/tracker-utils/tracker-meta-folder.c (original)
+++ trunk/src/tracker-utils/tracker-meta-folder.c Mon Nov 17 12:52:15 2008
@@ -183,7 +183,7 @@
help = g_option_context_get_help (context, TRUE, NULL);
g_option_context_free (context);
- g_printerr (help);
+ g_printerr ("%s", help);
g_free (help);
return EXIT_FAILURE;
Modified: trunk/src/tracker-utils/tracker-query.c
==============================================================================
--- trunk/src/tracker-utils/tracker-query.c (original)
+++ trunk/src/tracker-utils/tracker-query.c Mon Nov 17 12:52:15 2008
@@ -129,7 +129,7 @@
help = g_option_context_get_help (context, TRUE, NULL);
g_option_context_free (context);
- g_printerr (help);
+ g_printerr ("%s", help);
g_free (help);
return EXIT_FAILURE;
Modified: trunk/src/tracker-utils/tracker-search.c
==============================================================================
--- trunk/src/tracker-utils/tracker-search.c (original)
+++ trunk/src/tracker-utils/tracker-search.c Mon Nov 17 12:52:15 2008
@@ -155,7 +155,7 @@
help = g_option_context_get_help (context, TRUE, NULL);
g_option_context_free (context);
- g_printerr (help);
+ g_printerr ("%s", help);
g_free (help);
return EXIT_FAILURE;
Modified: trunk/src/tracker-utils/tracker-services.c
==============================================================================
--- trunk/src/tracker-utils/tracker-services.c (original)
+++ trunk/src/tracker-utils/tracker-services.c Mon Nov 17 12:52:15 2008
@@ -84,7 +84,7 @@
help = g_option_context_get_help (context, TRUE, NULL);
g_option_context_free (context);
- g_printerr (help);
+ g_printerr ("%s", help);
g_free (help);
return EXIT_FAILURE;
Modified: trunk/src/tracker-utils/tracker-tag.c
==============================================================================
--- trunk/src/tracker-utils/tracker-tag.c (original)
+++ trunk/src/tracker-utils/tracker-tag.c Mon Nov 17 12:52:15 2008
@@ -159,7 +159,7 @@
help = g_option_context_get_help (context, TRUE, NULL);
g_option_context_free (context);
- g_printerr (help);
+ g_printerr ("%s", help);
g_free (help);
return EXIT_FAILURE;
Modified: trunk/src/tracker-utils/tracker-unique.c
==============================================================================
--- trunk/src/tracker-utils/tracker-unique.c (original)
+++ trunk/src/tracker-utils/tracker-unique.c Mon Nov 17 12:52:15 2008
@@ -117,7 +117,7 @@
help = g_option_context_get_help (context, TRUE, NULL);
g_option_context_free (context);
- g_printerr (help);
+ g_printerr ("%s", help);
g_free (help);
return EXIT_FAILURE;
Modified: trunk/src/trackerd/tracker-search.c
==============================================================================
--- trunk/src/trackerd/tracker-search.c (original)
+++ trunk/src/trackerd/tracker-search.c Mon Nov 17 12:52:15 2008
@@ -496,6 +496,7 @@
result_set = tracker_db_interface_execute_query (iface,
NULL,
+ "%s",
query_translated);
g_free (query_translated);
}
@@ -1345,6 +1346,7 @@
result_set = tracker_db_interface_execute_query (priv->sql_query_iface,
&actual_error,
+ "%s",
query);
if (!result_set) {
Modified: trunk/src/trackerd/tracker-xesam-live-search.c
==============================================================================
--- trunk/src/trackerd/tracker-xesam-live-search.c (original)
+++ trunk/src/trackerd/tracker-xesam-live-search.c Mon Nov 17 12:52:15 2008
@@ -1263,6 +1263,7 @@
g_set_error (error,
TRACKER_XESAM_ERROR_DOMAIN,
TRACKER_XESAM_ERROR_PARSING_FAILED,
+ "%s",
str);
g_free (str);
g_error_free (parse_error);
Modified: trunk/utils/qdbm/print-words.c
==============================================================================
--- trunk/utils/qdbm/print-words.c (original)
+++ trunk/utils/qdbm/print-words.c Mon Nov 17 12:52:15 2008
@@ -132,7 +132,7 @@
g_printerr ("Invalid arguments, %s\n", error->message);
help = g_option_context_get_help (context, TRUE, NULL);
- g_printerr (help);
+ g_printerr ("%s", help);
g_free (help);
g_clear_error (&error);
@@ -145,7 +145,7 @@
gchar *help;
help = g_option_context_get_help (context, TRUE, NULL);
- g_printerr (help);
+ g_printerr ("%s", help);
g_free (help);
g_option_context_free (context);
Modified: trunk/utils/qdbm/search-word.c
==============================================================================
--- trunk/utils/qdbm/search-word.c (original)
+++ trunk/utils/qdbm/search-word.c Mon Nov 17 12:52:15 2008
@@ -127,7 +127,7 @@
g_printerr ("Invalid arguments, %s\n", error->message);
help = g_option_context_get_help (context, TRUE, NULL);
- g_printerr (help);
+ g_printerr ("%s", help);
g_free (help);
g_clear_error (&error);
@@ -140,7 +140,7 @@
gchar *help;
help = g_option_context_get_help (context, TRUE, NULL);
- g_printerr (help);
+ g_printerr ("%s", help);
g_free (help);
g_option_context_free (context);
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
