AuroraMiddleware/gtk
1
0
Fork 1
mirror of https://gitlab.gnome.org/GNOME/gtk.git synced 2025-01-12 13:30:19 +00:00
Code Issues Projects Releases Wiki Activity

Convert filenames to UTF-8 before printing them out in warning messages.

Browse Source 
2006-03-31  Behdad Esfahbod  <behdad@gnome.org>

        * gtk/gtkrecentmanager.c: Convert filenames to UTF-8 before printing
        them out in warning messages. (#336770, Morten Welinder)
This commit is contained in:
Behdad Esfahbod 2006-04-01 04:48:31 +00:00 committed by Behdad Esfahbod
parent 5e3fbe78cc
commit 103c3781a3
3 changed files with 38 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ChangeLog
View File

@ -1,3 +1,8 @@
2006-03-31 Behdad Esfahbod <behdad@gnome.org>
* gtk/gtkrecentmanager.c: Convert filenames to UTF-8 before printing
them out in warning messages. (#336770, Morten Welinder)
2006-03-31 Behdad Esfahbod <behdad@gnome.org>
* gtk/gtkrecentmanager.c (gtk_recent_info_last_application): Update

5
ChangeLog.pre-2-10
View File

@ -1,3 +1,8 @@
2006-03-31 Behdad Esfahbod <behdad@gnome.org>
* gtk/gtkrecentmanager.c: Convert filenames to UTF-8 before printing
them out in warning messages. (#336770, Morten Welinder)
2006-03-31 Behdad Esfahbod <behdad@gnome.org>
* gtk/gtkrecentmanager.c (gtk_recent_info_last_application): Update

48
gtk/gtkrecentmanager.c
View File

@ -152,6 +152,14 @@ static guint signal_changed = 0;
G_DEFINE_TYPE (GtkRecentManager, gtk_recent_manager, G_TYPE_OBJECT);
void
filename_warning (const char *format, const char *filename, const char *message)
{
char *utf8 = g_filename_to_utf8 (filename, -1, NULL, NULL, NULL);
g_warning (format, utf8 ? utf8 : "(invalid filename)", message);
g_free (utf8);
}
GQuark
gtk_recent_manager_error_quark (void)
{
@ -370,10 +378,10 @@ gtk_recent_manager_real_changed (GtkRecentManager *manager)
&write_error);
if (write_error)
{
g_warning ("Attempting to store changes into `%s', "
"but failed: %s",
priv->filename,
write_error->message);
filename_warning ("Attempting to store changes into `%s', "
"but failed: %s",
priv->filename,
write_error->message);
g_error_free (write_error);
}
@ -383,10 +391,10 @@ gtk_recent_manager_real_changed (GtkRecentManager *manager)
*/
if (g_stat (priv->filename, &stat_buf) < 0)
{
g_warning ("Unable to stat() the recently used resources file "
"at `%s': %s.",
priv->filename,
g_strerror (errno));
filename_warning ("Unable to stat() the recently used resources file "
"at `%s': %s.",
priv->filename,
g_strerror (errno));
priv->write_in_progress = FALSE;
@ -434,10 +442,10 @@ gtk_recent_manager_poll_timeout (gpointer data)
if (errno == ENOENT)
return TRUE;
g_warning ("Unable to stat() the recently used resources file "
"at `%s': %s.",
priv->filename,
g_strerror (errno));
filename_warning ("Unable to stat() the recently used resources file "
"at `%s': %s.",
priv->filename,
g_strerror (errno));
return TRUE;
}
@ -516,10 +524,10 @@ build_recent_items_list (GtkRecentManager *manager)
return;
else
{
g_warning ("Attempting to read the recently used resources file "
"at `%s', but an error occurred: %s. Aborting.",
priv->filename,
g_strerror (errno));
filename_warning ("Attempting to read the recently used resources file "
"at `%s', but an error occurred: %s. Aborting.",
priv->filename,
g_strerror (errno));
return;
}
@ -539,10 +547,10 @@ build_recent_items_list (GtkRecentManager *manager)
&read_error);
if (read_error)
{
g_warning ("Attempting to read the recently used resources file "
"at `%s', but the parser failed: %s.",
priv->filename,
read_error->message);
filename_warning ("Attempting to read the recently used resources file "
"at `%s', but the parser failed: %s.",
priv->filename,
read_error->message);
g_bookmark_file_free (priv->recent_items);
priv->recent_items = NULL;