Sync the g2 branch with the gnome2-merge-4 tag. (2003-10-24)

git-svn-id: svn+ssh://svn.gnucash.org/repo/gnucash/branches/gnucash-gnome2-dev@9637 57a11ea4-9604-0410-9ed3-97b8803252fd

src/AccWindow.h

@@ -1,70 +0,0 @@
-/********************************************************************\
- * AccWindow.h -- window for creating new accounts for GnuCash      *
- * Copyright (C) 1997 Robin D. Clark                                *
- * Copyright (C) 2000 Dave Peticolas                                *
- *                                                                  *
- * 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 the Free Software Foundation; either version 2 of   *
- * the License, or (at your option) any later version.              *
- *                                                                  *
- * 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.                     *
- *                                                                  *
- * 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., 675 Mass Ave, Cambridge, MA 02139, USA.        *
- *                                                                  *
- *   Author: Rob Clark                                              *
- * Internet: rclark@cs.hmc.edu                                      *
- *  Address: 609 8th Street                                         *
- *           Huntington Beach, CA 92648-4632                        *
-\********************************************************************/
-
-#ifndef ACC_WINDOW_H
-#define ACC_WINDOW_H
-
-#include "config.h"
-
-#include "Account.h"
-#include "Group.h"
-
-
-/** PROTOTYPES ******************************************************/
-typedef struct _AccountWindow  AccountWindow;
-
-AccountWindow * gnc_ui_new_account_window (AccountGroup *group);
-AccountWindow * gnc_ui_new_account_window_with_default(AccountGroup *group,
-                                                       Account * parent);
-AccountWindow * gnc_ui_edit_account_window (Account *account);
-
-/**
- * @param unused The AccountGroup to create in; this isn't used.
- * @param valid_types A GList of GNCAccountType gints [as pointers] which are
- * allowed to be created.  Unlike below, this function makes a copy of the
- * valid_types list.
- **/
-AccountWindow * gnc_ui_new_account_with_types( AccountGroup *unused,
-                                               GList *valid_types );
-
-Account * gnc_ui_new_accounts_from_name_window (const char *name);
-
-/* Note that the caller owns the valid_types list */
-Account * gnc_ui_new_accounts_from_name_window_with_types (const char *name,
-							   GList *valid_types);
-/* Notes:
-   -the caller owns the valid_types list
-   -the parent parameter has priority over the eventual account path in the name
-   -all parameters can be NULL
-*/
-Account * gnc_ui_new_accounts_from_name_with_defaults (const char *name,
-						       GList *valid_types,
-						       gnc_commodity * default_commodity,
-						       Account * parent);
-
-void gnc_ui_set_default_new_account_currency (const char *currency);
-
-
-#endif /* ACC_WINDOW_H */

src/Makefile.am

@@ -36,7 +36,6 @@ SUBDIRS = $(NONGUI_SUBDIRS) report
 endif
 
 noinst_HEADERS = \
-  AccWindow.h \
   RecnWindow.h \
   gnc-ui.h
 

src/app-utils/Makefile.am

@@ -18,6 +18,7 @@ libgncmod_app_utils_la_SOURCES = \
   gfec.c \
   global-options.c \
   gnc-component-manager.c \
+  gnc-err-popup.c \
   gnc-euro.c \
   gnc-exp-parser.c \
   gnc-gettext-util.c \
@@ -33,6 +34,7 @@ gncinclude_HEADERS = \
   gfec.h \
   global-options.h \
   gnc-component-manager.h \
+  gnc-err-popup.h \
   gnc-euro.h \
   gnc-exp-parser.h \
   gnc-gettext-util.h \