[grisbi-cvs] grisbi/src gsb_payment_method_config.c, 1.37, 1.38 gsb_transactions_list.c, 1.179, 1.180 gsb_transactions_list.h, 1.36, 1.37 gsb_transactions_list_sort.c, 1.15, 1.16 import.c, 1.283, 1.284 traitement_variables.c, 1.175, 1.176

[Mickaël Remars]

Update of /cvsroot/grisbi/grisbi/src
In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv15290

Modified Files:
	gsb_payment_method_config.c gsb_transactions_list.c 
	gsb_transactions_list.h gsb_transactions_list_sort.c import.c 
	traitement_variables.c 
Log Message:
Renamed enum value ELEMENT_TYPE to ELEMENT_PAYMENT_TYPE to avoid conflicts with the typedef declared in winioctl.h

Index: gsb_transactions_list.h
===================================================================
RCS file: /cvsroot/grisbi/grisbi/src/gsb_transactions_list.h,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -d -r1.36 -r1.37
--- gsb_transactions_list.h	17 Jun 2009 19:39:51 -0000	1.36
+++ gsb_transactions_list.h	24 Aug 2009 11:54:22 -0000	1.37
@@ -14,7 +14,7 @@
     ELEMENT_CREDIT ,
     ELEMENT_BALANCE ,
     ELEMENT_AMOUNT ,
-    ELEMENT_TYPE ,
+    ELEMENT_PAYMENT_TYPE ,
     ELEMENT_RECONCILE_NB ,
     ELEMENT_EXERCICE ,
     ELEMENT_CATEGORY ,

Index: traitement_variables.c
===================================================================
RCS file: /cvsroot/grisbi/grisbi/src/traitement_variables.c,v
retrieving revision 1.175
retrieving revision 1.176
diff -u -d -r1.175 -r1.176
--- traitement_variables.c	22 Jul 2009 19:45:43 -0000	1.175
+++ traitement_variables.c	24 Aug 2009 11:54:22 -0000	1.176
@@ -544,7 +544,7 @@
 {
     gint tab[TRANSACTION_LIST_ROWS_NB][CUSTOM_MODEL_VISIBLE_COLUMNS] = {
     { ELEMENT_CHQ, ELEMENT_DATE, ELEMENT_PARTY, ELEMENT_MARK, ELEMENT_DEBIT, ELEMENT_CREDIT, ELEMENT_BALANCE },
-    {0, 0, ELEMENT_CATEGORY, 0, ELEMENT_TYPE, ELEMENT_AMOUNT, 0 },
+    {0, 0, ELEMENT_CATEGORY, 0, ELEMENT_PAYMENT_TYPE, ELEMENT_AMOUNT, 0 },
     {0, 0, ELEMENT_NOTES, 0, 0, 0, 0 },
     {0, 0, 0, 0, 0, 0, 0 }
     };

Index: gsb_transactions_list.c
===================================================================
RCS file: /cvsroot/grisbi/grisbi/src/gsb_transactions_list.c,v
retrieving revision 1.179
retrieving revision 1.180
diff -u -d -r1.179 -r1.180
--- gsb_transactions_list.c	13 Aug 2009 19:24:49 -0000	1.179
+++ gsb_transactions_list.c	24 Aug 2009 11:54:22 -0000	1.180
@@ -741,7 +741,7 @@
 
 	    /* mise en forme du moyen de paiement */
 
-	case ELEMENT_TYPE:
+	case ELEMENT_PAYMENT_TYPE:
 	    return ( my_strdup (gsb_data_payment_get_name ( gsb_data_transaction_get_method_of_payment_number ( transaction_number))));
 
 	    /* mise en forme du no de rapprochement */

Index: gsb_payment_method_config.c
===================================================================
RCS file: /cvsroot/grisbi/grisbi/src/gsb_payment_method_config.c,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -d -r1.37 -r1.38
--- gsb_payment_method_config.c	23 Aug 2009 16:45:05 -0000	1.37
+++ gsb_payment_method_config.c	24 Aug 2009 11:54:22 -0000	1.38
@@ -743,7 +743,7 @@
 		}
 	    }
 	    /* update the transactions list */
-	    transaction_list_update_element (ELEMENT_TYPE);
+	    transaction_list_update_element (ELEMENT_PAYMENT_TYPE);
 	}
     }
     return FALSE;
@@ -1353,7 +1353,7 @@
     }
 
     /* change for the transactions tree_view */
-    transaction_list_update_element (ELEMENT_TYPE);
+    transaction_list_update_element (ELEMENT_PAYMENT_TYPE);
 
     gtk_widget_destroy ( GTK_WIDGET(dialog) );
     return TRUE;

Index: import.c
===================================================================
RCS file: /cvsroot/grisbi/grisbi/src/import.c,v
retrieving revision 1.283
retrieving revision 1.284
diff -u -d -r1.283 -r1.284
--- import.c	23 Aug 2009 16:45:05 -0000	1.283
+++ import.c	24 Aug 2009 11:54:22 -0000	1.284
@@ -1567,7 +1567,7 @@
      * and the transfer was not written, we need to update the categories values
      * in the lists */
     transaction_list_update_element (ELEMENT_CATEGORY);
-    transaction_list_update_element (ELEMENT_TYPE);
+    transaction_list_update_element (ELEMENT_PAYMENT_TYPE);
 }
 
 

Index: gsb_transactions_list_sort.c
===================================================================
RCS file: /cvsroot/grisbi/grisbi/src/gsb_transactions_list_sort.c,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -d -r1.15 -r1.16
--- gsb_transactions_list_sort.c	22 Aug 2009 15:34:51 -0000	1.15
+++ gsb_transactions_list_sort.c	24 Aug 2009 11:54:22 -0000	1.16
@@ -306,7 +306,7 @@
 	    return ( gsb_transactions_list_sort_by_amount ( transaction_number_1,
 							    transaction_number_2));
 	    break;
-	case ELEMENT_TYPE:
+	case ELEMENT_PAYMENT_TYPE:
 	    return ( gsb_transactions_list_sort_by_type ( transaction_number_1,
 							  transaction_number_2));
 	    break;