2002-08-05 Joshua Sled <jsled@asynchronous.org>

* src/import-export/gnc-generic-import.c: #if-def'd out the
	original version, and replaced with a version sans the printf.
	For some reason, with the printf, GCC 3.1 can't compile this file.

	* src/gnome/dialog-sxsincelast.c: Added support for the Back [and
	Next] button to behave correctly in the Druid.  Closes Bug#84688.
	Fixed a double-freeing bug [Bug#89475].  Correct use of
	gnc_{suspend,resume}_gui_refresh makes Transaction processing much
	faster, closing Bug#84686.


git-svn-id: svn+ssh://svn.gnucash.org/repo/gnucash/trunk@7137 57a11ea4-9604-0410-9ed3-97b8803252fd
This commit is contained in:
Joshua Sled
2002-08-05 14:51:08 +00:00
parent 9b9c83bc33
commit 25582ec9e4
4 changed files with 757 additions and 272 deletions
+12
View File
@@ -1,3 +1,15 @@
2002-08-05 Joshua Sled <jsled@asynchronous.org>
* src/import-export/gnc-generic-import.c: #if-def'd out the
original version, and replaced with a version sans the printf.
For some reason, with the printf, GCC 3.1 can't compile this file.
* src/gnome/dialog-sxsincelast.c: Added support for the Back [and
Next] button to behave correctly in the Druid. Closes Bug#84688.
Fixed a double-freeing bug [Bug#89475]. Correct use of
gnc_{suspend,resume}_gui_refresh makes Transaction processing much
faster, closing Bug#84686.
2002-08-02 Christian Stimming <stimming@tuhh.de>
* src/business/business-gnome/dialog-invoice.c,
File diff suppressed because it is too large Load Diff
+2 -14
View File
@@ -3781,7 +3781,7 @@ Select any which you would like to create now, and click
<name>reminders_list</name>
<can_focus>True</can_focus>
<columns>3</columns>
<column_widths>80,80,80</column_widths>
<column_widths>153,121,80</column_widths>
<selection_mode>GTK_SELECTION_EXTENDED</selection_mode>
<show_titles>True</show_titles>
<shadow_type>GTK_SHADOW_IN</shadow_type>
@@ -3908,7 +3908,7 @@ Select any which you would like to create now, and click
<name>to_create_list</name>
<can_focus>True</can_focus>
<columns>2</columns>
<column_widths>80,80</column_widths>
<column_widths>177,80</column_widths>
<selection_mode>GTK_SELECTION_SINGLE</selection_mode>
<show_titles>True</show_titles>
<shadow_type>GTK_SHADOW_IN</shadow_type>
@@ -4203,18 +4203,6 @@ Select those you wish to delete.</label>
</widget>
</widget>
</widget>
<widget>
<class>GnomeDruidPageFinish</class>
<name>finish_page</name>
<title>All Done</title>
<text>Thanks for playing our game...</text>
<background_color>25,25,112</background_color>
<logo_background_color>255,255,255</logo_background_color>
<textbox_color>255,255,255</textbox_color>
<text_color>0,0,0</text_color>
<title_color>255,255,255</title_color>
</widget>
</widget>
</widget>
+25 -2
View File
@@ -33,6 +33,7 @@
//#include <gtk/gtk.h>
#include <glade/glade.h>
#include <stdlib.h>
#include "gnc-generic-import.h"
#include "Account.h"
#include "Transaction.h"
@@ -179,6 +180,23 @@ gnc_ui_generic_account_picker_unselect_cb(GtkCTree * tree,
picker->selected_acct = NULL;
}
static int
gnc_ui_generic_account_picker_map_cb(GtkWidget * w, gpointer user_data)
{
/* update the tree display */
build_acct_tree((struct _accountpickerdialog *)user_data);
return 0;
}
#if 0 /* 0 -- With the printf here, as below, this causes a
* compilation problem with GCC 3.1:
*
* gnc-generic-import.c:414: output_operand: invalid expression as operand
* Please submit a full bug report,
* with preprocessed source if appropriate.
* See <URL:http://bugzilla.redhat.com/bugzilla/> for instructions.
* make[1]: *** [gnc-generic-import.lo] Error 1
*/
static int
gnc_ui_generic_account_picker_map_cb(GtkWidget * w, gpointer user_data) {
printf("gnc_ui_generic_account_picker_map_cb()\n");
@@ -186,11 +204,14 @@ gnc_ui_generic_account_picker_map_cb(GtkWidget * w, gpointer user_data) {
build_acct_tree(user_data);
return FALSE;
}
#endif /* 0 */
static gpointer test_acct_online_id_match(Account *acct, gpointer param_online_id)
{
gchar * current_online_id = gnc_import_get_acc_online_id(acct);
if((current_online_id!=NULL&&param_online_id!=NULL)&&strcmp(current_online_id, param_online_id)==0)
if( (current_online_id != NULL
&& param_online_id != NULL )
&& strcmp( current_online_id, param_online_id ) == 0 )
{
return (gpointer *) acct;
}
@@ -205,7 +226,7 @@ Account * gnc_import_select_account(char * account_online_id_value,
gnc_commodity * new_account_default_commodity,
GNCAccountType new_account_default_type)
{
struct _accountpickerdialog * picker = g_new0(struct _accountpickerdialog, 1);
struct _accountpickerdialog * picker;
const int ACCOUNT_DESCRIPTION_MAX_SIZE = 255;
gint ui_retval;
Account * retval = NULL;
@@ -213,6 +234,7 @@ Account * gnc_import_select_account(char * account_online_id_value,
GtkWidget * online_id_label;
gchar account_description_text[ACCOUNT_DESCRIPTION_MAX_SIZE];
picker = g_new0(struct _accountpickerdialog, 1);
picker->acct_group = gnc_get_current_group();
if(picker->acct_group == NULL)
{
@@ -394,3 +416,4 @@ void gnc_import_add_trans(Transaction *trans)
}
return;
}