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

recent-manager: Fix "format not a string literal" error

Browse Source 
https://bugzilla.gnome.org/show_bug.cgi?id=764585
This commit is contained in:
Bastien Nocera
2016-04-04 15:03:12 +02:00
parent 6a5224ffcb
commit becc0d45b6
1 changed files with 25 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

50
gtk/gtkrecentmanager.c
View File

@ -230,16 +230,6 @@ static GtkRecentManager *recent_manager_singleton = NULL;
G_DEFINE_TYPE_WITH_PRIVATE (GtkRecentManager, gtk_recent_manager, G_TYPE_OBJECT) G_DEFINE_TYPE_WITH_PRIVATE (GtkRecentManager, gtk_recent_manager, G_TYPE_OBJECT)
static void
filename_warning (const gchar *format,
const gchar *filename,
const gchar *message)
{
gchar *utf8 = g_filename_to_utf8 (filename, -1, NULL, NULL, NULL);
g_warning (format, utf8 ? utf8 : "(invalid filename)", message);
g_free (utf8);
}
/* Test of haystack has the needle prefix, comparing case /* Test of haystack has the needle prefix, comparing case
* insensitive. haystack may be UTF-8, but needle must * insensitive. haystack may be UTF-8, but needle must
* contain only lowercase ascii. * contain only lowercase ascii.
@ -501,17 +491,21 @@ gtk_recent_manager_real_changed (GtkRecentManager *manager)
g_bookmark_file_to_file (priv->recent_items, priv->filename, &write_error); g_bookmark_file_to_file (priv->recent_items, priv->filename, &write_error);
if (write_error) if (write_error)
{ {
filename_warning ("Attempting to store changes into '%s', but failed: %s", gchar *utf8 = g_filename_to_utf8 (priv->filename, -1, NULL, NULL, NULL);
priv->filename, g_warning ("Attempting to store changes into '%s', but failed: %s",
write_error->message); utf8 ? utf8 : "(invalid filename)",
write_error->message);
g_free (utf8);
g_error_free (write_error); g_error_free (write_error);
} }
if (g_chmod (priv->filename, 0600) < 0) if (g_chmod (priv->filename, 0600) < 0)
{ {
filename_warning ("Attempting to set the permissions of '%s', but failed: %s", gchar *utf8 = g_filename_to_utf8 (priv->filename, -1, NULL, NULL, NULL);
priv->filename, g_warning ("Attempting to set the permissions of '%s', but failed: %s",
g_strerror (errno)); utf8 ? utf8 : "(invalid filename)",
g_strerror (errno));
g_free (utf8);
} }
} }
@ -629,11 +623,13 @@ gtk_recent_manager_set_filename (GtkRecentManager *manager,
priv->monitor = g_file_monitor_file (file, G_FILE_MONITOR_NONE, NULL, &error); priv->monitor = g_file_monitor_file (file, G_FILE_MONITOR_NONE, NULL, &error);
if (error) if (error)
{ {
filename_warning ("Unable to monitor '%s': %s\n" gchar *utf8 = g_filename_to_utf8 (priv->filename, -1, NULL, NULL, NULL);
"The GtkRecentManager will not update its contents " g_warning ("Unable to monitor '%s': %s\n"
"if the file is changed from other instances", "The GtkRecentManager will not update its contents "
priv->filename, "if the file is changed from other instances",
error->message); utf8 ? utf8 : "(invalid filename)",
error->message);
g_free (utf8);
g_error_free (error); g_error_free (error);
} }
else else
@ -682,10 +678,14 @@ build_recent_items_list (GtkRecentManager *manager)
*/ */
if (read_error->domain == G_FILE_ERROR && if (read_error->domain == G_FILE_ERROR &&
read_error->code != G_FILE_ERROR_NOENT) read_error->code != G_FILE_ERROR_NOENT)
filename_warning ("Attempting to read the recently used resources " {
"file at '%s', but the parser failed: %s.", gchar *utf8 = g_filename_to_utf8 (priv->filename, -1, NULL, NULL, NULL);
priv->filename, g_warning ("Attempting to read the recently used resources "
read_error->message); "file at '%s', but the parser failed: %s.",
utf8 ? utf8 : "(invalid filename)",
read_error->message);
g_free (utf8);
}
g_bookmark_file_free (priv->recent_items); g_bookmark_file_free (priv->recent_items);
priv->recent_items = NULL; priv->recent_items = NULL;