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 21:33:38 +00:00
parent 5ae8615883
commit c080c763c7
5 changed files with 19 additions and 31 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 ""
"Project-Id-Version: Browser 0.1.4\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2011-02-19 22:24+0100\n"
"POT-Creation-Date: 2011-02-19 22:33+0100\n"
"PO-Revision-Date: 2010-03-29 23:28+0200\n"
"Last-Translator: Pierre Pronchery <khorben@defora.org>\n"
"Language-Team: English\n"
@ -187,7 +187,7 @@ msgstr ""
#: ../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/desktop.c:1428 ../src/desktop.c:1433 ../src/move.c:452
#: ../src/desktop.c:1416 ../src/desktop.c:1421 ../src/move.c:452
#: ../src/move.c:456 ../src/properties.c:118 ../src/properties.c:122
#: ../src/view.c:366 ../src/view.c:371
msgid "Error"
@ -468,11 +468,11 @@ msgstr ""
msgid "Applications"
msgstr ""
#: ../src/desktop.c:1477
#: ../src/desktop.c:1465
msgid "Could not load preferences"
msgstr ""
#: ../src/desktop.c:1556
#: ../src/desktop.c:1545
msgid ""
"Usage: desktop [-H|-V][-a|-c|-f|-h|-n][-m monitor]\n"
" -H\tPlace icons horizontally\n"

8
po/es.po
View File

@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: Browser 0.1.4\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2011-02-19 22:24+0100\n"
"POT-Creation-Date: 2011-02-19 22:33+0100\n"
"PO-Revision-Date: 2010-03-30 01:04+0200\n"
"Last-Translator: Pierre Pronchery <khorben@defora.org>\n"
"Language-Team: Spanish\n"
@ -187,7 +187,7 @@ msgstr ""
#: ../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/desktop.c:1428 ../src/desktop.c:1433 ../src/move.c:452
#: ../src/desktop.c:1416 ../src/desktop.c:1421 ../src/move.c:452
#: ../src/move.c:456 ../src/properties.c:118 ../src/properties.c:122
#: ../src/view.c:366 ../src/view.c:371
msgid "Error"
@ -468,11 +468,11 @@ msgstr ""
msgid "Applications"
msgstr ""
#: ../src/desktop.c:1477
#: ../src/desktop.c:1465
msgid "Could not load preferences"
msgstr ""
#: ../src/desktop.c:1556
#: ../src/desktop.c:1545
msgid ""
"Usage: desktop [-H|-V][-a|-c|-f|-h|-n][-m monitor]\n"
" -H\tPlace icons horizontally\n"

8
po/fr.po
View File

@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: Browser 0.1.4\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2011-02-19 22:24+0100\n"
"POT-Creation-Date: 2011-02-19 22:33+0100\n"
"PO-Revision-Date: 2010-03-29 23:28+0200\n"
"Last-Translator: Pierre Pronchery <khorben@defora.org>\n"
"Language-Team: French\n"
@ -187,7 +187,7 @@ msgstr " Chemin: "
#: ../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/desktop.c:1428 ../src/desktop.c:1433 ../src/move.c:452
#: ../src/desktop.c:1416 ../src/desktop.c:1421 ../src/move.c:452
#: ../src/move.c:456 ../src/properties.c:118 ../src/properties.c:122
#: ../src/view.c:366 ../src/view.c:371
msgid "Error"
@ -488,11 +488,11 @@ msgstr "Apparence"
msgid "Applications"
msgstr "Applications"
#: ../src/desktop.c:1477
#: ../src/desktop.c:1465
msgid "Could not load preferences"
msgstr "Impossible de charger les préférences"
#: ../src/desktop.c:1556
#: ../src/desktop.c:1545
msgid ""
"Usage: desktop [-H|-V][-a|-c|-f|-h|-n][-m monitor]\n"
" -H\tPlace icons horizontally\n"

8
po/it.po
View File

@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: Browser 0.1.4\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2011-02-19 22:24+0100\n"
"POT-Creation-Date: 2011-02-19 22:33+0100\n"
"PO-Revision-Date: 2010-04-07 23:18+0200\n"
"Last-Translator: Pierre Pronchery <khorben@defora.org>\n"
"Language-Team: Italian\n"
@ -187,7 +187,7 @@ msgstr ""
#: ../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/desktop.c:1428 ../src/desktop.c:1433 ../src/move.c:452
#: ../src/desktop.c:1416 ../src/desktop.c:1421 ../src/move.c:452
#: ../src/move.c:456 ../src/properties.c:118 ../src/properties.c:122
#: ../src/view.c:366 ../src/view.c:371
msgid "Error"
@ -468,11 +468,11 @@ msgstr ""
msgid "Applications"
msgstr ""
#: ../src/desktop.c:1477
#: ../src/desktop.c:1465
msgid "Could not load preferences"
msgstr ""
#: ../src/desktop.c:1556
#: ../src/desktop.c:1545
msgid ""
"Usage: desktop [-H|-V][-a|-c|-f|-h|-n][-m monitor]\n"
" -H\tPlace icons horizontally\n"

18
src/desktop.c
View File

@ -920,7 +920,6 @@ int desktop_error(Desktop * desktop, char const * message, int ret)
/* desktop_refresh */
static void _refresh_current(Desktop * desktop);
static int _current_loop(Desktop * desktop);
static int _current_loop_applications(Desktop * desktop);
static gint _categories_apps_compare(gconstpointer a, gconstpointer b);
@ -945,12 +944,12 @@ void desktop_refresh(Desktop * desktop)
#endif
if(desktop->refresh_source != 0)
g_source_remove(desktop->refresh_source);
desktop->refresh_source = 0;
if(desktop->path == NULL)
{
_refresh_current(desktop);
desktop->refresh_source = g_idle_add(_current_idle, desktop);
return;
}
desktop->refresh_source = 0;
#ifdef __sun__
if((fd = open(desktop->path, O_RDONLY)) < 0
|| fstat(fd, &st) != 0
@ -976,18 +975,7 @@ void desktop_refresh(Desktop * desktop)
}
#endif
desktop->refresh_mti = st.st_mtime;
_refresh_current(desktop);
}
static void _refresh_current(Desktop * desktop)
{
unsigned int i;
for(i = 0; i < 16 && _current_loop(desktop) == 0; i++);
if(i == 16)
desktop->refresh_source = g_idle_add(_current_idle, desktop);
else
_current_done(desktop);
desktop->refresh_source = g_idle_add(_current_idle, desktop);
}
static int _current_loop(Desktop * desktop)