From cf500dab08f25e2393cc1232273d96c3369888b8 Mon Sep 17 00:00:00 2001 From: Pierre Pronchery Date: Fri, 4 Feb 2011 23:26:23 +0000 Subject: [PATCH] No longer need to trace child processes (and also translating main.c) --- po/POTFILES | 1 + po/fr.po | 14 +++++++++++++- src/main.c | 16 +--------------- 3 files changed, 15 insertions(+), 16 deletions(-) diff --git a/po/POTFILES b/po/POTFILES index db72a70..5c7925b 100644 --- a/po/POTFILES +++ b/po/POTFILES @@ -12,5 +12,6 @@ ../src/applets/memory.c ../src/applets/swap.c ../src/applets/tasks.c +../src/main.c ../src/panel.c ../src/run.c diff --git a/po/fr.po b/po/fr.po index 08a29b1..bf174bc 100644 --- a/po/fr.po +++ b/po/fr.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: Panel 0.0.5\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" "Last-Translator: Pierre Pronchery \n" "Language-Team: French\n" @@ -156,6 +156,18 @@ msgstr "Déplacer vers le bureau" msgid "Maximize" 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 msgid "large" msgstr "grande" diff --git a/src/main.c b/src/main.c index 2989dde..7276c8b 100644 --- a/src/main.c +++ b/src/main.c @@ -1,5 +1,5 @@ /* $Id$ */ -/* Copyright (c) 2010 Pierre Pronchery */ +/* Copyright (c) 2011 Pierre Pronchery */ /* This file is part of DeforaOS Desktop Panel */ /* 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 @@ -20,7 +20,6 @@ #include #include #include -#include #include #include #include @@ -57,8 +56,6 @@ static int _usage(void) /* main */ -static void _main_sigchld(int signum); - int main(int argc, char * argv[]) { int o; @@ -66,7 +63,6 @@ int main(int argc, char * argv[]) Panel * panel2 = NULL; PanelPrefs prefs; char * p; - struct sigaction sa; setlocale(LC_ALL, ""); bindtextdomain(PACKAGE, LOCALEDIR); @@ -115,11 +111,6 @@ int main(int argc, char * argv[]) } if((panel2 = panel_new(&prefs)) == NULL) 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(); if(panel1 != NULL) panel_delete(panel1); @@ -127,8 +118,3 @@ int main(int argc, char * argv[]) panel_delete(panel2); return 0; } - -static void _main_sigchld(int signum) -{ - wait(NULL); -}