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

Code cleanup

Browse Source
This commit is contained in:
Pierre Pronchery 2011-02-19 20:04:45 +00:00
parent 7860400316
commit 7db77088f6
2 changed files with 18 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
po/de.po
View File

@ -7,7 +7,7 @@ msgid ""
msgstr "" msgstr ""
"Project-Id-Version: Browser 0.1.4\n" "Project-Id-Version: Browser 0.1.4\n"
"Report-Msgid-Bugs-To: \n" "Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2011-02-19 20:57+0100\n" "POT-Creation-Date: 2011-02-19 21:04+0100\n"
"PO-Revision-Date: 2010-03-29 23:28+0200\n" "PO-Revision-Date: 2010-03-29 23:28+0200\n"
"Last-Translator: Pierre Pronchery <khorben@defora.org>\n" "Last-Translator: Pierre Pronchery <khorben@defora.org>\n"
"Language-Team: English\n" "Language-Team: English\n"
@ -187,7 +187,7 @@ msgstr ""
#: ../src/browser.c:592 ../src/browser.c:597 ../src/copy.c:668 #: ../src/browser.c:592 ../src/browser.c:597 ../src/copy.c:668
#: ../src/copy.c:672 ../src/delete.c:421 ../src/delete.c:426 #: ../src/copy.c:672 ../src/delete.c:421 ../src/delete.c:426
#: ../src/desktop.c:1442 ../src/desktop.c:1447 ../src/move.c:452 #: ../src/desktop.c:1440 ../src/desktop.c:1445 ../src/move.c:452
#: ../src/move.c:456 ../src/properties.c:118 ../src/properties.c:122 #: ../src/move.c:456 ../src/properties.c:118 ../src/properties.c:122
#: ../src/view.c:366 ../src/view.c:371 #: ../src/view.c:366 ../src/view.c:371
msgid "Error" msgid "Error"
@ -468,11 +468,11 @@ msgstr ""
msgid "Applications" msgid "Applications"
msgstr "" msgstr ""
#: ../src/desktop.c:1491 #: ../src/desktop.c:1489
msgid "Could not load preferences" msgid "Could not load preferences"
msgstr "" msgstr ""
#: ../src/desktop.c:1547 #: ../src/desktop.c:1545
msgid "" msgid ""
"Usage: desktop [-H|-V][-a|-c|-f|-h|-n][-m monitor]\n" "Usage: desktop [-H|-V][-a|-c|-f|-h|-n][-m monitor]\n"
" -H\tPlace icons horizontally\n" " -H\tPlace icons horizontally\n"

28
src/desktop.c
View File

@ -1016,6 +1016,8 @@ static int _current_loop_applications(Desktop * desktop)
char const * q; char const * q;
DesktopIcon * icon; DesktopIcon * icon;
if((config = config_new()) == NULL)
return -1;
while((de = readdir(desktop->refresh_dir)) != NULL) while((de = readdir(desktop->refresh_dir)) != NULL)
{ {
if(de->d_name[0] == '.') if(de->d_name[0] == '.')
@ -1038,29 +1040,25 @@ static int _current_loop_applications(Desktop * desktop)
#ifdef DEBUG #ifdef DEBUG
fprintf(stderr, "DEBUG: %s() \"%s\"\n", __func__, path); fprintf(stderr, "DEBUG: %s() \"%s\"\n", __func__, path);
#endif #endif
/* XXX not very elegant */ if(desktop->category == NULL)
if(desktop->category != NULL && (config = config_new()) != NULL) continue;
{ config_reset(config);
if(config_load(config, path) != 0 if(config_load(config, path) != 0)
|| (q = config_get(config, continue;
"Desktop Entry", if((q = config_get(config, "Desktop Entry", "Categories"))
"Categories")) == NULL == NULL)
|| string_find(q, continue;
desktop->category->name) if(string_find(q, desktop->category->name) == NULL)
== NULL)
{
config_delete(config);
continue; continue;
}
config_delete(config);
}
if((icon = desktopicon_new_application(desktop, path)) == NULL) if((icon = desktopicon_new_application(desktop, path)) == NULL)
continue; continue;
desktop_icon_add(desktop, icon); desktop_icon_add(desktop, icon);
free(path); free(path);
config_delete(config);
return 0; return 0;
} }
free(path); free(path);
config_delete(config);
return -1; return -1;
} }