DeforaOS/Browser
DeforaOS/Browser
2
0
Fork 0
Code Issues 2 Pull Requests Packages Projects Releases Wiki Activity

Handle error path upon filename encoding conversion errors

Browse Source
This commit is contained in:
Pierre Pronchery 2012-07-07 14:14:22 +00:00
parent e132e19ced
commit fd3d1e450a
1 changed files with 28 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
src/browser.c
View File

@ -1217,9 +1217,15 @@ static void _insert_all(Browser * browser, struct stat * lst, struct stat * st,
) )
{ {
char const * p; char const * p;
GError * error = NULL;
if((p = g_filename_to_utf8(*display, -1, NULL, NULL, NULL)) != NULL) if((p = g_filename_to_utf8(*display, -1, NULL, NULL, &error)) == NULL)
*display = p; /* XXX should display be free'd? */ {
browser_error(NULL, error->message, 1);
g_error_free(error);
}
else
*display = p; /* XXX memory leak */
*inode = lst->st_ino; *inode = lst->st_ino;
*size = lst->st_size; *size = lst->st_size;
*dsize = _insert_size(lst->st_size); *dsize = _insert_size(lst->st_size);
@ -2680,12 +2686,19 @@ static void _browser_refresh_do(Browser * browser, DIR * dir, struct stat * st)
static void _refresh_title(Browser * browser) static void _refresh_title(Browser * browser)
{ {
char buf[256]; char const * title = browser->current->data;
char * p; char * p;
GError * error = NULL;
char buf[256];
p = g_filename_to_utf8(browser->current->data, -1, NULL, NULL, NULL); if((p = g_filename_to_utf8(title, -1, NULL, NULL, &error)) == NULL)
snprintf(buf, sizeof(buf), "%s%s%s", _("File manager"), " - ", {
(p != NULL) ? p : (char *)browser->current->data); browser_error(NULL, error->message, 1);
g_error_free(error);
}
else
title = p;
snprintf(buf, sizeof(buf), "%s%s%s", _("File manager"), " - ", title);
free(p); free(p);
gtk_window_set_title(GTK_WINDOW(browser->window), buf); gtk_window_set_title(GTK_WINDOW(browser->window), buf);
} }
@ -2694,13 +2707,19 @@ static void _refresh_path(Browser * browser)
{ {
static unsigned int cnt = 0; static unsigned int cnt = 0;
GtkWidget * widget; GtkWidget * widget;
unsigned int i;
char * p; char * p;
GError * error = NULL;
unsigned int i;
char * q; char * q;
widget = gtk_bin_get_child(GTK_BIN(browser->tb_path)); widget = gtk_bin_get_child(GTK_BIN(browser->tb_path));
p = g_filename_to_utf8(browser->current->data, -1, NULL, NULL, NULL); if((p = g_filename_to_utf8(browser->current->data, -1, NULL, NULL,
gtk_entry_set_text(GTK_ENTRY(widget), p != NULL ? p &error)) == NULL)
{
browser_error(NULL, error->message, 1);
g_error_free(error);
}
gtk_entry_set_text(GTK_ENTRY(widget), (p != NULL) ? p
: browser->current->data); : browser->current->data);
free(p); free(p);
for(i = 0; i < cnt; i++) for(i = 0; i < cnt; i++)