diff --git a/src/app-utils/Makefile.am b/src/app-utils/Makefile.am index 10cbcfbbaa..19540d7cc1 100644 --- a/src/app-utils/Makefile.am +++ b/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 \ diff --git a/src/app-utils/gnc-err-popup.c b/src/app-utils/gnc-err-popup.c new file mode 100644 index 0000000000..413bb23c03 --- /dev/null +++ b/src/app-utils/gnc-err-popup.c @@ -0,0 +1,78 @@ +/********************************************************************\ + * gnc-err-popup.c -- GnuCash error GUI popups * + * * + * 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, contact: * + * * + * Free Software Foundation Voice: +1-617-542-5942 * + * 59 Temple Place - Suite 330 Fax: +1-617-542-2652 * + * Boston, MA 02111-1307, USA gnu@gnu.org * +\********************************************************************/ + +#include "config.h" + +#include +#include +#include + +#include "gnc-err-popup.h" + + +/********************************************************************\ + Callbacks so that app can display gui messages. +\********************************************************************/ + +static GNCGuiMessage gnc_gui_warning_func = NULL; +static GNCGuiMessage gnc_gui_error_func = NULL; + +void +gnc_set_warning_message (GNCGuiMessage func) +{ + gnc_gui_warning_func = func; +} + +void +gnc_set_error_message (GNCGuiMessage func) +{ + gnc_gui_error_func = func; +} + +gboolean +gnc_send_gui_warning(const gchar *format, ...) +{ + va_list args; + + if (!gnc_gui_warning_func) return FALSE; + + va_start (args, format); + gnc_gui_warning_func(format, args); + va_end(args); + return(TRUE); +} + +gboolean +gnc_send_gui_error(const gchar *format, ...) +{ + va_list args; + + if (!gnc_gui_error_func) return(FALSE); + + va_start (args, format); + gnc_gui_error_func(format, args); + va_end(args); + return(TRUE); +} + + +/************************* END OF FILE ******************************\ +\********************************************************************/ diff --git a/src/app-utils/gnc-err-popup.h b/src/app-utils/gnc-err-popup.h new file mode 100644 index 0000000000..ae4a07abb3 --- /dev/null +++ b/src/app-utils/gnc-err-popup.h @@ -0,0 +1,50 @@ +/********************************************************************\ + * gnc-err-popup.h -- GnuCash GUI Error Popup * + * * + * 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, contact: * + * * + * Free Software Foundation Voice: +1-617-542-5942 * + * 59 Temple Place - Suite 330 Fax: +1-617-542-2652 * + * Boston, MA 02111-1307, USA gnu@gnu.org * + * * + * Author: Linas Vepstas (linas@linas.org) * +\********************************************************************/ + +/** @file gnc-err-popup.h @brief GnuCash GUI error loging facility */ + +#ifndef GNC_ERR_POPUP_H +#define GNC_ERR_POPUP_H + +#include +#include +#include + +/* -------------------------------------------------------- */ +/* Infrastructure to send messages go to GUI popups, not to stderr! + * Incompletely implemented, needs work. + * XXX This probably duplicates some popup code elswwhere in the + * code and should be trashed at earliest convenience. + */ +typedef void (*GNCGuiMessage) (const char *format, va_list args); +void gnc_set_warning_message (GNCGuiMessage func); +void gnc_set_error_message (GNCGuiMessage func); + +gboolean gnc_send_gui_warning (const char *format, ...) G_GNUC_PRINTF(1,2); +gboolean gnc_send_gui_error (const char *format, ...) G_GNUC_PRINTF(1,2); + +#define PWARN_GUI(format, args...) { \ + gnc_send_gui_error(format, ## args); \ +} + +#endif /* GNC_ERR_POPUP_H */ diff --git a/src/app-utils/option-util.c b/src/app-utils/option-util.c index 26daf8d8b2..18bbe8cbcb 100644 --- a/src/app-utils/option-util.c +++ b/src/app-utils/option-util.c @@ -32,6 +32,7 @@ #include "glib-helpers.h" #include "guile-util.h" #include "gnc-engine-util.h" +#include "gnc-err-popup.h" #include "guile-mappings.h" #include