From c0a255eb90769638d57ae4122932f75c46e4e531 Mon Sep 17 00:00:00 2001 From: Matthew Barnes Date: Thu, 11 Sep 2008 15:34:29 +0000 Subject: Merge revisions 36016:36303 from trunk. svn path=/branches/kill-bonobo/; revision=36307 --- widgets/misc/test-error.c | 27 +++++++++++++-------------- 1 file changed, 13 insertions(+), 14 deletions(-) (limited to 'widgets/misc/test-error.c') diff --git a/widgets/misc/test-error.c b/widgets/misc/test-error.c index 5ebdb6a93e..84abd76ce3 100644 --- a/widgets/misc/test-error.c +++ b/widgets/misc/test-error.c @@ -1,24 +1,23 @@ -/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- - * - * test-error.c - * - * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com) - * - * Author: Michael Zucchi +/* * * This program is free software; you can redistribute it and/or - * modify it under the terms of version 2 of the GNU General Public - * License as published by the Free Software Foundation. + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2 of the License, or (at your option) version 3. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * General Public License for more details. + * Lesser General Public License for more details. * - * You should have received a copy of the GNU General Public - * License along with this program; if not, write to the - * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - * Boston, MA 02110-1301, USA. + * You should have received a copy of the GNU Lesser General Public + * License along with the program; if not, see + * + * + * Authors: + * Michael Zucchi + * + * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com) * */ -- cgit v1.2.3 From 5f55aba5b052fb7284973f50009f8b369334d084 Mon Sep 17 00:00:00 2001 From: Matthew Barnes Date: Fri, 1 May 2009 06:44:36 -0400 Subject: Merge in changes from master. --- widgets/misc/test-error.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) (limited to 'widgets/misc/test-error.c') diff --git a/widgets/misc/test-error.c b/widgets/misc/test-error.c index 84abd76ce3..c8b442b23a 100644 --- a/widgets/misc/test-error.c +++ b/widgets/misc/test-error.c @@ -25,14 +25,12 @@ #include #endif -#include -#include #include "e-error.h" int main (int argc, char **argv) { - gnome_init ("test-error", "0.0", argc, argv); + gtk_init (&argc, &argv); argc--; switch (argc) { -- cgit v1.2.3 From fa28940b0106ae2121fdccb78008c31f2cd99df3 Mon Sep 17 00:00:00 2001 From: Matthew Barnes Date: Thu, 30 Apr 2009 23:30:00 -0400 Subject: Only #include specific libgnome[ui] headers; easier to track. Stop including top-level libgnome[ui] headers -- , and . Instead, include specific header files so we can track them easier. Also, remove several unshipped test programs. Mostly ETable stuff. --- widgets/misc/test-error.c | 61 ----------------------------------------------- 1 file changed, 61 deletions(-) delete mode 100644 widgets/misc/test-error.c (limited to 'widgets/misc/test-error.c') diff --git a/widgets/misc/test-error.c b/widgets/misc/test-error.c deleted file mode 100644 index c8b442b23a..0000000000 --- a/widgets/misc/test-error.c +++ /dev/null @@ -1,61 +0,0 @@ -/* - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2 of the License, or (at your option) version 3. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see - * - * - * Authors: - * Michael Zucchi - * - * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com) - * - */ - -#ifdef HAVE_CONFIG_H -#include -#endif - -#include "e-error.h" - -int -main (int argc, char **argv) -{ - gtk_init (&argc, &argv); - - argc--; - switch (argc) { - case 1: - e_error_run(NULL, argv[1], NULL); - break; - case 2: - e_error_run(NULL, argv[1], argv[2], NULL); - break; - case 3: - e_error_run(NULL, argv[1], argv[2], argv[3], NULL); - break; - case 4: - e_error_run(NULL, argv[1], argv[2], argv[3], argv[4], NULL); - break; - case 5: - e_error_run(NULL, argv[1], argv[2], argv[3], argv[4], argv[5], NULL); - break; - case 6: - e_error_run(NULL, argv[1], argv[2], argv[3], argv[4], argv[5], argv[6], NULL); - break; - default: - printf("Error: too many or too few arguments\n"); - printf("Usage:\n %s domain:error-id [ args ... ]\n", argv[0]); - } - - return 0; -} -- cgit v1.2.3