[grisbi-cvs] grisbi/src main.c, 1.147, 1.148 metatree.c, 1.141, 1.142 navigation.c, 1.127, 1.128 qif.c, 1.137, 1.138 utils.c, 1.52, 1.53 utils_editables.c, 1.31, 1.32

[Mickaël Remars]

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

Modified Files:
	main.c metatree.c navigation.c qif.c utils.c utils_editables.c 
Log Message:
msvc needs all variable declarations at the begining of the blocs (C99)

Index: qif.c
===================================================================
RCS file: /cvsroot/grisbi/grisbi/src/qif.c,v
retrieving revision 1.137
retrieving revision 1.138
diff -u -d -r1.137 -r1.138
--- qif.c	25 Oct 2008 13:47:22 -0000	1.137
+++ qif.c	24 Aug 2009 13:46:54 -0000	1.138
@@ -936,6 +936,7 @@
     GSList *list_tmp_transactions;
     gint beginning;
     gint floating_point;
+	gchar* tmpstr;
 
     if (!gsb_file_util_test_overwrite (filename))
 	return FALSE;
@@ -991,7 +992,7 @@
 			  g_date_year (gsb_data_transaction_get_date (transaction_number_tmp)));
 
 		/* met le solde initial */
-		gchar* tmpstr = gsb_real_get_string (gsb_data_account_get_init_balance (account_nb, -1));
+		tmpstr = gsb_real_get_string (gsb_data_account_get_init_balance (account_nb, -1));
 		fprintf ( fichier_qif,
 			  "T%s\n",
 			  tmpstr);
@@ -1046,7 +1047,7 @@
 
 
 		/* met le montant, transforme la devise si necessaire */
-		gchar* tmpstr = gsb_real_get_string (gsb_data_transaction_get_adjusted_amount ( transaction_number_tmp, floating_point));
+		tmpstr = gsb_real_get_string (gsb_data_transaction_get_adjusted_amount ( transaction_number_tmp, floating_point));
 		fprintf ( fichier_qif,
 			  "T%s\n",
 			  tmpstr);
@@ -1141,7 +1142,7 @@
 
 			    /* set the amount of the split child */
 
-			    gchar* tmpstr = gsb_real_get_string (gsb_data_transaction_get_adjusted_amount (transaction_number_tmp_2, floating_point));
+			    tmpstr = gsb_real_get_string (gsb_data_transaction_get_adjusted_amount (transaction_number_tmp_2, floating_point));
 			    fprintf ( fichier_qif,
 				      "$%s\n",
 				      tmpstr);

Index: metatree.c
===================================================================
RCS file: /cvsroot/grisbi/grisbi/src/metatree.c,v
retrieving revision 1.141
retrieving revision 1.142
diff -u -d -r1.141 -r1.142
--- metatree.c	22 Jul 2009 19:45:43 -0000	1.141
+++ metatree.c	24 Aug 2009 13:46:54 -0000	1.142
@@ -603,12 +603,13 @@
 {
     GtkTreeIter iter, * parent_iter;
     GtkTreeView * tree_view;
+	gchar* strtmp;
 
     g_return_if_fail ( iface );
     if ( ! metatree_model_is_displayed ( model ) )
 	return;
 
-    gchar* strtmp = g_strdup_printf ("div : %d - sub-div : %d", div_id, sub_div_id);
+    strtmp = g_strdup_printf ("div : %d - sub-div : %d", div_id, sub_div_id);
     devel_debug ( strtmp  );
     g_free ( strtmp );
 
@@ -893,11 +894,11 @@
                         MetatreeInterface * iface, 
                         gint sub_division, gint division )
 {
-    devel_debug (NULL);
-
     GtkTreeIter iter, *parent_iter, * it;
     GtkTreePath *path;
 
+    devel_debug (NULL);
+
     if ( find_associated_transactions ( iface, division, 
                         sub_division ) )
     {
@@ -2404,7 +2405,7 @@
  *
  * \return		Same as a > b
  */
-inline gboolean metatree_sort_column  ( GtkTreeModel * model,
+gboolean metatree_sort_column  ( GtkTreeModel * model,
                         GtkTreeIter * a, GtkTreeIter * b,
                         gpointer user_data )
 {

Index: utils_editables.c
===================================================================
RCS file: /cvsroot/grisbi/grisbi/src/utils_editables.c,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -d -r1.31 -r1.32
--- utils_editables.c	27 Apr 2009 19:41:03 -0000	1.31
+++ utils_editables.c	24 Aug 2009 13:46:54 -0000	1.32
@@ -126,11 +126,12 @@
 void increment_decrement_champ ( GtkWidget *entry, gint increment )
 {
     gdouble number;
+	gchar* tmpstr;
 
     number = utils_str_atoi (gtk_entry_get_text ( GTK_ENTRY ( entry )));
     number += increment;
 
-    gchar* tmpstr = utils_str_itoa ( number );
+    tmpstr = utils_str_itoa ( number );
     gtk_entry_set_text ( GTK_ENTRY ( entry ), tmpstr );
     g_free ( tmpstr );
 }

Index: navigation.c
===================================================================
RCS file: /cvsroot/grisbi/grisbi/src/navigation.c,v
retrieving revision 1.127
retrieving revision 1.128
diff -u -d -r1.127 -r1.128
--- navigation.c	16 Aug 2009 21:00:05 -0000	1.127
+++ navigation.c	24 Aug 2009 13:46:54 -0000	1.128
@@ -142,6 +142,7 @@
     GtkTreeDragDestIface * navigation_dst_iface;
     GtkTreeDragSourceIface * navigation_src_iface;
     GtkTreeViewColumn * column;
+	gchar* tmpstr;
     static GtkTargetEntry row_targets[] = {
 	{ "GTK_TREE_MODEL_ROW", GTK_TARGET_SAME_WIDGET, 0 }
     };
@@ -241,7 +242,7 @@
     gtk_tree_view_append_column ( GTK_TREE_VIEW ( navigation_tree_view ), 
 				  GTK_TREE_VIEW_COLUMN ( column ) );
     /* Account list */
-    gchar* tmpstr = g_build_filename ( PIXMAPS_DIR,
+    tmpstr = g_build_filename ( PIXMAPS_DIR,
 				       "ac_home.png", NULL );
     pixbuf = gdk_pixbuf_new_from_file ( tmpstr , NULL );
     g_free ( tmpstr );

Index: utils.c
===================================================================
RCS file: /cvsroot/grisbi/grisbi/src/utils.c,v
retrieving revision 1.52
retrieving revision 1.53
diff -u -d -r1.52 -r1.53
--- utils.c	27 Apr 2009 19:41:03 -0000	1.52
+++ utils.c	24 Aug 2009 13:46:54 -0000	1.53
@@ -219,6 +219,7 @@
 GtkWidget *new_paddingbox_with_title (GtkWidget * parent, gboolean fill, gchar * title)
 {
     GtkWidget *vbox, *hbox, *paddingbox, *label;
+	gchar* tmp_str;
 
     vbox = gtk_vbox_new ( FALSE, 0 );
     if ( GTK_IS_BOX(parent) )
@@ -230,7 +231,7 @@
     /* Creating label */
     label = gtk_label_new ( NULL );
     gtk_misc_set_alignment ( GTK_MISC ( label ), 0, 1 );
-    gchar* tmp_str = g_strconcat ("<span weight=\"bold\">",
+    tmp_str = g_strconcat ("<span weight=\"bold\">",
 					title, "</span>", NULL );
     gtk_label_set_markup ( GTK_LABEL ( label ), tmp_str );
     g_free(tmp_str);
@@ -283,6 +284,8 @@
 {
     GtkWidget *vbox_pref, *hbox, *label, *image, *eb;
     GtkStyle * style;
+	gchar* tmpstr1;
+	gchar* tmpstr2;
 
     vbox_pref = gtk_vbox_new ( FALSE, 6 );
     gtk_widget_show ( vbox_pref );
@@ -312,8 +315,8 @@
 
     /* Nice huge title */
     label = gtk_label_new ( title );
-    gchar* tmpstr1 = g_markup_escape_text (title, strlen(title));
-    gchar* tmpstr2 = g_strconcat ("<span size=\"x-large\" weight=\"bold\">",
+    tmpstr1 = g_markup_escape_text (title, strlen(title));
+    tmpstr2 = g_strconcat ("<span size=\"x-large\" weight=\"bold\">",
 					tmpstr1,
 					"</span>",
 					NULL );

Index: main.c
===================================================================
RCS file: /cvsroot/grisbi/grisbi/src/main.c,v
retrieving revision 1.147
retrieving revision 1.148
diff -u -d -r1.147 -r1.148
--- main.c	23 May 2009 19:25:10 -0000	1.147
+++ main.c	24 Aug 2009 13:46:54 -0000	1.148
@@ -93,24 +93,24 @@
  */
 int main (int argc, char **argv)
 {
-    gsb_cunit_run_tests();
-
     GtkWidget * statusbar;
     gboolean first_use = FALSE;
     gchar *string;
     gchar *path;
 
+#ifndef _WIN32
+    struct sigaction sig_sev;
+#endif
+    cmdline_options  opt;
+
+    gsb_cunit_run_tests();
+
 #if GSB_GMEMPROFILE
     g_mem_set_vtable(glib_mem_profiler_table);
 #endif
 
     initialize_debugging();
 
-#ifndef _WIN32
-    struct sigaction sig_sev;
-#endif
-    cmdline_options  opt;
-
 
 #ifdef _WIN32
     /* Retrieve exception information and store them under grisbi.rpt file!