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

Improved error handling

Browse Source
This commit is contained in:
Pierre Pronchery 2013-12-04 06:25:58 +01:00
parent bc4f45494d
commit eee8343c20
1 changed files with 33 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

43
src/desktop.c
View File

@ -791,7 +791,7 @@ static void _icons_delete(Desktop * desktop);
static int _icons_applications(Desktop * desktop); static int _icons_applications(Desktop * desktop);
static int _icons_categories(Desktop * desktop); static int _icons_categories(Desktop * desktop);
static int _icons_files(Desktop * desktop); static int _icons_files(Desktop * desktop);
static void _icons_files_add_home(Desktop * desktop); static int _icons_files_add_home(Desktop * desktop);
static int _icons_homescreen(Desktop * desktop); static int _icons_homescreen(Desktop * desktop);
static void _icons_set_categories(Desktop * desktop, gpointer data); static void _icons_set_categories(Desktop * desktop, gpointer data);
static void _icons_set_homescreen(Desktop * desktop, gpointer data); static void _icons_set_homescreen(Desktop * desktop, gpointer data);
@ -844,18 +844,21 @@ static int _icons_applications(Desktop * desktop)
GdkPixbuf * icon; GdkPixbuf * icon;
/* FIXME list all applications otherwise? */ /* FIXME list all applications otherwise? */
if(desktop->category != NULL) if(desktop->category == NULL)
{ return 0;
desktopicon = desktopicon_new(desktop, _("Back"), NULL); if((desktopicon = desktopicon_new(desktop, _("Back"), NULL)) == NULL)
desktopicon_set_callback(desktopicon, _icons_set_categories, return -_desktop_serror(desktop, "Back", 1);
NULL); desktopicon_set_callback(desktopicon, _icons_set_categories, NULL);
desktopicon_set_first(desktopicon, TRUE); desktopicon_set_first(desktopicon, TRUE);
desktopicon_set_immutable(desktopicon, TRUE); desktopicon_set_immutable(desktopicon, TRUE);
icon = gtk_icon_theme_load_icon(desktop->theme, "back", icon = gtk_icon_theme_load_icon(desktop->theme, "back",
DESKTOPICON_ICON_SIZE, 0, NULL); DESKTOPICON_ICON_SIZE, 0, NULL);
if(icon != NULL) if(icon != NULL)
desktopicon_set_icon(desktopicon, icon); desktopicon_set_icon(desktopicon, icon);
_desktop_icon_add(desktop, desktopicon); if(_desktop_icon_add(desktop, desktopicon) != 0)
{
desktopicon_delete(desktopicon);
return -1;
} }
return 0; return 0;
} }
@ -867,7 +870,8 @@ static int _icons_categories(Desktop * desktop)
desktop->category = NULL; desktop->category = NULL;
_icons_applications(desktop); /* XXX hack */ _icons_applications(desktop); /* XXX hack */
desktopicon = desktopicon_new(desktop, _("Back"), NULL); if((desktopicon = desktopicon_new(desktop, _("Back"), NULL)) == NULL)
return -_desktop_serror(desktop, "Back", 1);
desktopicon_set_callback(desktopicon, _icons_set_homescreen, NULL); desktopicon_set_callback(desktopicon, _icons_set_homescreen, NULL);
desktopicon_set_first(desktopicon, TRUE); desktopicon_set_first(desktopicon, TRUE);
desktopicon_set_immutable(desktopicon, TRUE); desktopicon_set_immutable(desktopicon, TRUE);
@ -875,7 +879,11 @@ static int _icons_categories(Desktop * desktop)
DESKTOPICON_ICON_SIZE, 0, NULL); DESKTOPICON_ICON_SIZE, 0, NULL);
if(icon != NULL) if(icon != NULL)
desktopicon_set_icon(desktopicon, icon); desktopicon_set_icon(desktopicon, icon);
_desktop_icon_add(desktop, desktopicon); if(_desktop_icon_add(desktop, desktopicon) != 0)
{
desktopicon_delete(desktopicon);
return -1;
}
return 0; return 0;
} }
@ -903,17 +911,16 @@ static int _icons_files(Desktop * desktop)
return 0; return 0;
} }
static void _icons_files_add_home(Desktop * desktop) static int _icons_files_add_home(Desktop * desktop)
{ {
DesktopIcon * desktopicon; DesktopIcon * desktopicon;
GdkPixbuf * icon; GdkPixbuf * icon;
if((desktopicon = desktopicon_new(desktop, _("Home"), desktop->home)) if((desktopicon = desktopicon_new(desktop, _("Home"), desktop->home))
== NULL) == NULL)
return; return -_desktop_serror(desktop, "Home", 1);
desktopicon_set_first(desktopicon, TRUE); desktopicon_set_first(desktopicon, TRUE);
desktopicon_set_immutable(desktopicon, TRUE); desktopicon_set_immutable(desktopicon, TRUE);
desktop_icon_add(desktop, desktopicon);
icon = gtk_icon_theme_load_icon(desktop->theme, "gnome-home", icon = gtk_icon_theme_load_icon(desktop->theme, "gnome-home",
DESKTOPICON_ICON_SIZE, 0, NULL); DESKTOPICON_ICON_SIZE, 0, NULL);
if(icon == NULL) if(icon == NULL)
@ -921,6 +928,12 @@ static void _icons_files_add_home(Desktop * desktop)
DESKTOPICON_ICON_SIZE, 0, NULL); DESKTOPICON_ICON_SIZE, 0, NULL);
if(icon != NULL) if(icon != NULL)
desktopicon_set_icon(desktopicon, icon); desktopicon_set_icon(desktopicon, icon);
if(_desktop_icon_add(desktop, desktopicon) != 0)
{
desktopicon_delete(desktopicon);
return -1;
}
return 0;
} }
static int _icons_homescreen(Desktop * desktop) static int _icons_homescreen(Desktop * desktop)
@ -940,7 +953,7 @@ static int _icons_homescreen(Desktop * desktop)
if((desktopicon = desktopicon_new(desktop, _("Applications"), NULL)) if((desktopicon = desktopicon_new(desktop, _("Applications"), NULL))
== NULL) == NULL)
return _desktop_serror(NULL, "Applications", 1); return _desktop_serror(desktop, "Applications", 1);
desktopicon_set_callback(desktopicon, _icons_set_categories, NULL); desktopicon_set_callback(desktopicon, _icons_set_categories, NULL);
desktopicon_set_immutable(desktopicon, TRUE); desktopicon_set_immutable(desktopicon, TRUE);
icon = gtk_icon_theme_load_icon(desktop->theme, "gnome-applications", icon = gtk_icon_theme_load_icon(desktop->theme, "gnome-applications",
@ -1135,7 +1148,7 @@ static int _current_loop_applications_do(Desktop * desktop)
if(desktop->category == NULL) if(desktop->category == NULL)
return -1; return -1;
if((config = config_new()) == NULL) if((config = config_new()) == NULL)
return -_desktop_serror(NULL, NULL, 1); return -_desktop_serror(desktop, NULL, 1);
while((de = vfs_readdir(desktop->refresh_dir)) != NULL) while((de = vfs_readdir(desktop->refresh_dir)) != NULL)
{ {
if(de->d_name[0] == '.') if(de->d_name[0] == '.')
@ -1284,7 +1297,7 @@ static int _current_loop_files(Desktop * desktop)
return -1; return -1;
if((p = string_new_append(desktop->path, "/", de->d_name, NULL)) if((p = string_new_append(desktop->path, "/", de->d_name, NULL))
== NULL) == NULL)
return -_desktop_serror(NULL, de->d_name, 1); return -_desktop_serror(desktop, de->d_name, 1);
if((desktopicon = desktopicon_new(desktop, de->d_name, p)) != NULL) if((desktopicon = desktopicon_new(desktop, de->d_name, p)) != NULL)
desktop_icon_add(desktop, desktopicon); desktop_icon_add(desktop, desktopicon);
string_delete(p); string_delete(p);