No longer need to trace child processes (and also translating main.c)
This commit is contained in:
parent
85204ad123
commit
cf500dab08
|
@ -12,5 +12,6 @@
|
||||||
../src/applets/memory.c
|
../src/applets/memory.c
|
||||||
../src/applets/swap.c
|
../src/applets/swap.c
|
||||||
../src/applets/tasks.c
|
../src/applets/tasks.c
|
||||||
|
../src/main.c
|
||||||
../src/panel.c
|
../src/panel.c
|
||||||
../src/run.c
|
../src/run.c
|
||||||
|
|
14
po/fr.po
14
po/fr.po
|
@ -7,7 +7,7 @@ msgid ""
|
||||||
msgstr ""
|
msgstr ""
|
||||||
"Project-Id-Version: Panel 0.0.5\n"
|
"Project-Id-Version: Panel 0.0.5\n"
|
||||||
"Report-Msgid-Bugs-To: \n"
|
"Report-Msgid-Bugs-To: \n"
|
||||||
"POT-Creation-Date: 2011-02-05 00:15+0100\n"
|
"POT-Creation-Date: 2011-02-05 00:25+0100\n"
|
||||||
"PO-Revision-Date: 2010-04-22 12:45+0200\n"
|
"PO-Revision-Date: 2010-04-22 12:45+0200\n"
|
||||||
"Last-Translator: Pierre Pronchery <khorben@defora.org>\n"
|
"Last-Translator: Pierre Pronchery <khorben@defora.org>\n"
|
||||||
"Language-Team: French\n"
|
"Language-Team: French\n"
|
||||||
|
@ -156,6 +156,18 @@ msgstr "Déplacer vers le bureau"
|
||||||
msgid "Maximize"
|
msgid "Maximize"
|
||||||
msgstr "Maximiser"
|
msgstr "Maximiser"
|
||||||
|
|
||||||
|
#: ../src/main.c:46
|
||||||
|
msgid ""
|
||||||
|
"Usage: panel [-m monitor][-bBsStx]\n"
|
||||||
|
" -B\tPlace the panel at both top and bottom of the screen\n"
|
||||||
|
" -b\tPlace the panel only at the bottom of the screen\n"
|
||||||
|
" -m\tMonitor to use (default: 0)\n"
|
||||||
|
" -s\tUse icons the size of a small toolbar\n"
|
||||||
|
" -S\tUse icons the size of a large toolbar (default)\n"
|
||||||
|
" -t\tPlace the panel only at the top of the screen\n"
|
||||||
|
" -x\tUse icons the size of menus\n"
|
||||||
|
msgstr ""
|
||||||
|
|
||||||
#: ../src/panel.c:78
|
#: ../src/panel.c:78
|
||||||
msgid "large"
|
msgid "large"
|
||||||
msgstr "grande"
|
msgstr "grande"
|
||||||
|
|
16
src/main.c
16
src/main.c
|
@ -1,5 +1,5 @@
|
||||||
/* $Id$ */
|
/* $Id$ */
|
||||||
/* Copyright (c) 2010 Pierre Pronchery <khorben@defora.org> */
|
/* Copyright (c) 2011 Pierre Pronchery <khorben@defora.org> */
|
||||||
/* This file is part of DeforaOS Desktop Panel */
|
/* This file is part of DeforaOS Desktop Panel */
|
||||||
/* This program is free software: you can redistribute it and/or modify
|
/* This program is free software: you can redistribute it and/or modify
|
||||||
* it under the terms of the GNU General Public License as published by
|
* it under the terms of the GNU General Public License as published by
|
||||||
|
@ -20,7 +20,6 @@
|
||||||
#include <stdlib.h>
|
#include <stdlib.h>
|
||||||
#include <stdio.h>
|
#include <stdio.h>
|
||||||
#include <string.h>
|
#include <string.h>
|
||||||
#include <signal.h>
|
|
||||||
#include <locale.h>
|
#include <locale.h>
|
||||||
#include <libintl.h>
|
#include <libintl.h>
|
||||||
#include <gtk/gtk.h>
|
#include <gtk/gtk.h>
|
||||||
|
@ -57,8 +56,6 @@ static int _usage(void)
|
||||||
|
|
||||||
|
|
||||||
/* main */
|
/* main */
|
||||||
static void _main_sigchld(int signum);
|
|
||||||
|
|
||||||
int main(int argc, char * argv[])
|
int main(int argc, char * argv[])
|
||||||
{
|
{
|
||||||
int o;
|
int o;
|
||||||
|
@ -66,7 +63,6 @@ int main(int argc, char * argv[])
|
||||||
Panel * panel2 = NULL;
|
Panel * panel2 = NULL;
|
||||||
PanelPrefs prefs;
|
PanelPrefs prefs;
|
||||||
char * p;
|
char * p;
|
||||||
struct sigaction sa;
|
|
||||||
|
|
||||||
setlocale(LC_ALL, "");
|
setlocale(LC_ALL, "");
|
||||||
bindtextdomain(PACKAGE, LOCALEDIR);
|
bindtextdomain(PACKAGE, LOCALEDIR);
|
||||||
|
@ -115,11 +111,6 @@ int main(int argc, char * argv[])
|
||||||
}
|
}
|
||||||
if((panel2 = panel_new(&prefs)) == NULL)
|
if((panel2 = panel_new(&prefs)) == NULL)
|
||||||
return 2;
|
return 2;
|
||||||
sa.sa_handler = _main_sigchld;
|
|
||||||
sigemptyset(&sa.sa_mask);
|
|
||||||
sa.sa_flags = 0;
|
|
||||||
if(sigaction(SIGCHLD, &sa, NULL) == -1)
|
|
||||||
panel_error(NULL, "sigaction", 0);
|
|
||||||
gtk_main();
|
gtk_main();
|
||||||
if(panel1 != NULL)
|
if(panel1 != NULL)
|
||||||
panel_delete(panel1);
|
panel_delete(panel1);
|
||||||
|
@ -127,8 +118,3 @@ int main(int argc, char * argv[])
|
||||||
panel_delete(panel2);
|
panel_delete(panel2);
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
static void _main_sigchld(int signum)
|
|
||||||
{
|
|
||||||
wait(NULL);
|
|
||||||
}
|
|
||||||
|
|
Loading…
Reference in New Issue
Block a user