[grisbi-cvs] grisbi/src gsb_payment_method.c, 1.18, 1.19 gsb_reconcile.c, 1.40, 1.41 gsb_scheduler.c, 1.26, 1.27 gsb_scheduler_list.c, 1.72, 1.73 gsb_select_icon.c, 1.14, 1.15 gtk_combofix.c, 1.61, 1.62 import.c, 1.284, 1.285 import_csv.c, 1.53, 1.54 imputation_budgetaire.c, 1.157, 1.158
Mickaël Remars
mykeul at users.sourceforge.net
Mon Aug 24 15:57:01 CEST 2009
- Previous message: [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
- Next message: [grisbi-cvs] grisbi/src gsb_file_others.c, 1.26, 1.27 gsb_file_util.c, 1.40, 1.41 gsb_form.c, 1.129, 1.130 gsb_form_config.c, 1.32, 1.33
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Update of /cvsroot/grisbi/grisbi/src
In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv27548
Modified Files:
gsb_payment_method.c gsb_reconcile.c gsb_scheduler.c
gsb_scheduler_list.c gsb_select_icon.c gtk_combofix.c import.c
import_csv.c imputation_budgetaire.c
Log Message:
msvc needs all variable declarations at the begining of the blocs (C99)
Index: gtk_combofix.c
===================================================================
RCS file: /cvsroot/grisbi/grisbi/src/gtk_combofix.c,v
retrieving revision 1.61
retrieving revision 1.62
diff -u -d -r1.61 -r1.62
--- gtk_combofix.c 27 Apr 2009 19:41:03 -0000 1.61
+++ gtk_combofix.c 24 Aug 2009 13:56:59 -0000 1.62
@@ -712,6 +712,7 @@
while (tmp_list)
{
gchar *string;
+ gchar* tmpstr;
string = tmp_list -> data;
@@ -724,7 +725,7 @@
gtk_tree_store_append ( combofix -> store,
&iter_child,
&iter_parent );
- gchar* tmpstr = g_strconcat ( last_parent, " : ", string + 1, NULL );
+ tmpstr = g_strconcat ( last_parent, " : ", string + 1, NULL );
gtk_tree_store_set ( combofix -> store,
&iter_child,
COMBOFIX_COL_VISIBLE_STRING, string + 1,
Index: gsb_scheduler_list.c
===================================================================
RCS file: /cvsroot/grisbi/grisbi/src/gsb_scheduler_list.c,v
retrieving revision 1.72
retrieving revision 1.73
diff -u -d -r1.72 -r1.73
--- gsb_scheduler_list.c 17 Aug 2009 19:27:53 -0000 1.72
+++ gsb_scheduler_list.c 24 Aug 2009 13:56:59 -0000 1.73
@@ -158,6 +158,7 @@
{
GtkWidget *vbox, *scrolled_window;
GtkWidget *tree_view;
+ GtkTreeModel *tree_model;
devel_debug (NULL);
@@ -198,7 +199,7 @@
gsb_scheduler_list_show_notes ();
/* create the store and set it in the tree_view */
- GtkTreeModel *tree_model = gsb_scheduler_list_create_model ();
+ tree_model = gsb_scheduler_list_create_model ();
gtk_tree_view_set_model ( GTK_TREE_VIEW (tree_view), tree_model);
g_object_unref (G_OBJECT(tree_model));
@@ -1757,6 +1758,7 @@
gchar * names[] = { _("Unique view"), _("Week view"), _("Month view"),
_("Two months view"), _("Quarter view"),
_("Year view"), _("Custom view"), NULL };
+ gchar* tmpstr;
if ( periodicity == SCHEDULER_PERIODICITY_CUSTOM_VIEW )
{
@@ -1764,7 +1766,7 @@
return FALSE;
}
- gchar* tmpstr = g_strconcat ( _("Scheduled transactions"), " : ",
+ tmpstr = g_strconcat ( _("Scheduled transactions"), " : ",
names[periodicity], NULL);
gsb_gui_headings_update_title ( tmpstr );
gsb_gui_headings_update_suffix ( "" );
Index: imputation_budgetaire.c
===================================================================
RCS file: /cvsroot/grisbi/grisbi/src/imputation_budgetaire.c,v
retrieving revision 1.157
retrieving revision 1.158
diff -u -d -r1.157 -r1.158
--- imputation_budgetaire.c 22 Jul 2009 19:45:43 -0000 1.157
+++ imputation_budgetaire.c 24 Aug 2009 13:56:59 -0000 1.158
@@ -859,6 +859,7 @@
GtkTreeSelection * selection;
GtkTreeIter parent;
GtkTreeIter iter;
+ GtkTreePath * path;
gchar * name;
gint budget_number = -1, sub_budget_number = -1;
gint i = 0,j = 0;
@@ -895,7 +896,7 @@
if ( numero == sub_budget_number )
break;
}
- GtkTreePath * path = gtk_tree_model_get_path ( model, &iter );
+ path = gtk_tree_model_get_path ( model, &iter );
gtk_tree_view_expand_to_path ( GTK_TREE_VIEW (budgetary_line_tree), path );
selection = gtk_tree_view_get_selection ( GTK_TREE_VIEW (budgetary_line_tree) );
gtk_tree_selection_select_path ( selection, path );
Index: gsb_select_icon.c
===================================================================
RCS file: /cvsroot/grisbi/grisbi/src/gsb_select_icon.c,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -d -r1.14 -r1.15
--- gsb_select_icon.c 17 May 2009 15:53:25 -0000 1.14
+++ gsb_select_icon.c 24 Aug 2009 13:56:59 -0000 1.15
@@ -83,6 +83,7 @@
GtkWidget *chooser_button;
GtkWidget *scroll;
GtkWidget *icon_view;
+ gint result;
devel_debug ( name_icon );
path_icon = g_path_get_dirname ( name_icon );
@@ -142,7 +143,7 @@
gtk_widget_show_all ( dialog );
- gint result = gtk_dialog_run (GTK_DIALOG (dialog));
+ result = gtk_dialog_run (GTK_DIALOG (dialog));
switch (result)
{
case GTK_RESPONSE_ACCEPT:
Index: gsb_reconcile.c
===================================================================
RCS file: /cvsroot/grisbi/grisbi/src/gsb_reconcile.c,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -d -r1.40 -r1.41
--- gsb_reconcile.c 17 Jun 2009 19:39:51 -0000 1.40
+++ gsb_reconcile.c 24 Aug 2009 13:56:59 -0000 1.41
@@ -275,6 +275,7 @@
gint reconcile_number;
gchar *last_name;
gchar *string;
+ gchar* tmpstr;
account_number = gsb_gui_navigation_get_current_account ();
@@ -305,6 +306,7 @@
gint new_digit_size;
gchar *new_string;
gchar *digit_string;
+ gchar* oldstr;
/* tmp_pointer is on the first non digit from the end of the last_name,
* so go to the first digit */
@@ -315,7 +317,7 @@
/* increase the number */
digit_size = strlen ( digit_string );
- gchar* oldstr = digit_string;
+ oldstr = digit_string;
digit_string = utils_str_itoa ( utils_str_atoi ( digit_string ) + 1 );
g_free ( oldstr );
new_digit_size = strlen ( digit_string );
@@ -380,7 +382,7 @@
g_date_free (today);
/* it's not the first reconciliation, set the old balance and unsensitive the old balance entry */
- gchar* tmpstr = gsb_real_get_string (gsb_data_reconcile_get_final_balance (reconcile_number));
+ tmpstr = gsb_real_get_string (gsb_data_reconcile_get_final_balance (reconcile_number));
gtk_entry_set_text ( GTK_ENTRY ( reconcile_initial_balance_entry ), tmpstr);
g_free ( tmpstr );
gtk_widget_set_sensitive ( GTK_WIDGET ( reconcile_initial_balance_entry ),
@@ -394,7 +396,7 @@
/* it's the first reconciliation, set the initial balance and make sensitive the old balance to change
* it if necessary */
- gchar* tmpstr = gsb_real_get_string ( gsb_data_account_get_init_balance (account_number, -1));
+ tmpstr = gsb_real_get_string ( gsb_data_account_get_init_balance (account_number, -1));
gtk_entry_set_text ( GTK_ENTRY ( reconcile_initial_balance_entry ), tmpstr);
g_free ( tmpstr );
gtk_widget_set_sensitive ( GTK_WIDGET ( reconcile_initial_balance_entry ),
@@ -409,7 +411,7 @@
gtk_entry_set_text ( GTK_ENTRY ( reconcile_final_balance_entry ), "" );
/* set the title */
- gchar* tmpstr = g_strdup_printf ( _(" <b>%s reconciliation</b> "),
+ tmpstr = g_strdup_printf ( _(" <b>%s reconciliation</b> "),
gsb_data_account_get_name (account_number));
gtk_label_set_markup ( GTK_LABEL (gtk_frame_get_label_widget (GTK_FRAME (reconcile_panel))),
tmpstr );
@@ -474,6 +476,7 @@
gint account_number;
gint reconcile_number;
gsb_real real;
+ gchar* tmpstr;
account_number = gsb_gui_navigation_get_current_account ();
@@ -523,7 +526,7 @@
gsb_reconcile_list_button_clicked (reconcile_sort_list_button, NULL);
}
- gchar* tmpstr = g_strdup_printf ( _("Last statement: %s"), gsb_format_gdate (date));
+ tmpstr = g_strdup_printf ( _("Last statement: %s"), gsb_format_gdate (date));
gtk_label_set_text ( GTK_LABEL ( label_last_statement ),
tmpstr);
g_free ( tmpstr );
@@ -681,6 +684,7 @@
const gchar *initial_balance;
const gchar *final_balance;
gchar *tmp_string;
+ gchar* tmpstr;
/* first get the current account number */
account_number = gsb_gui_navigation_get_current_account ();
@@ -704,7 +708,7 @@
amount = gsb_real_sub ( gsb_real_add ( gsb_real_get_from_string (gtk_entry_get_text ( GTK_ENTRY ( reconcile_initial_balance_entry ))),
gsb_data_account_calculate_waiting_marked_balance (account_number)),
gsb_real_get_from_string (gtk_entry_get_text ( GTK_ENTRY ( reconcile_final_balance_entry ))));
- gchar* tmpstr = gsb_real_get_string (amount);
+ tmpstr = gsb_real_get_string (amount);
gtk_label_set_text ( GTK_LABEL ( reconcile_variation_balance_label ), tmpstr);
g_free ( tmpstr );
if ( amount.mantissa )
Index: import.c
===================================================================
RCS file: /cvsroot/grisbi/grisbi/src/import.c,v
retrieving revision 1.284
retrieving revision 1.285
diff -u -d -r1.284 -r1.285
--- import.c 24 Aug 2009 11:54:22 -0000 1.284
+++ import.c 24 Aug 2009 13:56:59 -0000 1.285
@@ -258,6 +258,7 @@
GSList * tmp = import_formats;
gchar * formats = g_strdup("");
GtkWidget * assistant;
+ gchar* tmpstr;
/* if nothing opened, we need to create a new file to set up all the variables */
if (!gsb_data_currency_get_currency_list ())
@@ -284,7 +285,7 @@
tmp = tmp -> next;
}
- gchar* tmpstr = g_strconcat ( _("This assistant will help you import one or several "
+ tmpstr = g_strconcat ( _("This assistant will help you import one or several "
"files into Grisbi."
"\n\n"
"Grisbi will try to do its best to guess which format are imported, "
@@ -337,6 +338,7 @@
GtkCellRenderer *renderer;
GtkTreeModel * model, * list_acc;
GSList * tmp;
+ gchar* tmpstr;
vbox = gtk_vbox_new ( FALSE, 6 );
gtk_container_set_border_width ( GTK_CONTAINER(vbox), 12 );
@@ -344,7 +346,7 @@
paddingbox = new_paddingbox_with_title ( vbox, TRUE, _("Choose file to import"));
chooser = gtk_button_new_with_label ( _("Add file to import..." ));
- gchar* tmpstr = g_build_filename ( PIXMAPS_DIR, "import.png", NULL );
+ tmpstr = g_build_filename ( PIXMAPS_DIR, "import.png", NULL );
gtk_button_set_image ( GTK_BUTTON(chooser),
gtk_image_new_from_file ( tmpstr ) );
g_free ( tmpstr );
@@ -660,6 +662,8 @@
GSList * tmp;
struct import_format * format;
GSList *filenames = NULL;
+ gchar* old_str;
+ gchar* tmpstr;
dialog = gtk_file_chooser_dialog_new ( _("Choose files to import."),
GTK_WINDOW ( window ),
@@ -680,14 +684,14 @@
while ( tmp )
{
format = (struct import_format *) tmp -> data;
- gchar* old_str = files;
+ old_str = files;
files = g_strconcat ( files, ", *.", format -> extension, NULL );
g_free ( old_str );
tmp = tmp -> next;
}
default_filter = gtk_file_filter_new ();
- gchar* tmpstr = g_strdup_printf ( _("Known files (%s)"), files );
+ tmpstr = g_strdup_printf ( _("Known files (%s)"), files );
gtk_file_filter_set_name ( default_filter, tmpstr );
g_free ( tmpstr );
@@ -699,7 +703,7 @@
format = (struct import_format *) tmp -> data;
format_filter = gtk_file_filter_new ();
- gchar* tmpstr = g_strdup_printf ( _("%s files (*.%s)"),
+ tmpstr = g_strdup_printf ( _("%s files (*.%s)"),
format -> name,
format -> extension );
gtk_file_filter_set_name ( format_filter, tmpstr );
@@ -791,6 +795,7 @@
GtkTextBuffer * buffer;
GtkTextIter iter;
gchar * error_message = "";
+ gchar* tmpstr;
liste_comptes_importes_error = NULL;
liste_comptes_importes = NULL;
@@ -847,7 +852,7 @@
compte -> nom_de_compte = _("Unnamed Imported account");
}
- gchar* tmpstr = g_strconcat ( "⢠", compte -> nom_de_compte,
+ tmpstr = g_strconcat ( "⢠", compte -> nom_de_compte,
" (",
compte -> origine,
")\n\n",
@@ -898,7 +903,7 @@
struct struct_compte_importation * compte;
compte = list -> data;
- gchar* tmpstr = g_strconcat ( "⢠", compte -> nom_de_compte,
+ tmpstr = g_strconcat ( "⢠", compte -> nom_de_compte,
" (",
compte -> origine,
")\n\n",
@@ -1056,6 +1061,7 @@
gint size = 0, spacing = 0;
gint account_number;
GtkWidget *button;
+ gchar* tmpstr;
vbox = gtk_vbox_new ( FALSE, 6 );
gtk_container_set_border_width ( GTK_CONTAINER(vbox), 12 );
@@ -1073,7 +1079,7 @@
label = gtk_label_new ( NULL );
gtk_misc_set_alignment ( GTK_MISC ( label ), 0, 0.5);
gtk_label_set_justify ( GTK_LABEL ( label ), GTK_JUSTIFY_LEFT );
- gchar* tmpstr = g_strdup_printf ( _("<span size=\"x-large\">%s</span>\n\n"
+ tmpstr = g_strdup_printf ( _("<span size=\"x-large\">%s</span>\n\n"
"What do you want to do with contents from <span "
"foreground=\"blue\">%s</span> ?\n"),
compte -> nom_de_compte, short_filename );
@@ -1750,6 +1756,7 @@
const GDate *last_date_import;
gint demande_confirmation;
GSList *list_tmp_transactions;
+ gchar* tmpstr;
/* check the imported account id, and set it in the grisbi account if it doesn't exist or if it's wrong */
if ( imported_account -> id_compte )
@@ -1848,7 +1855,7 @@
imported_transaction -> action = IMPORT_TRANSACTION_LEAVE_TRANSACTION;
/* if no id, check the cheque */
- gchar* tmpstr = utils_str_itoa (imported_transaction -> cheque);
+ tmpstr = utils_str_itoa (imported_transaction -> cheque);
if ( imported_transaction -> action != IMPORT_TRANSACTION_LEAVE_TRANSACTION
&&
imported_transaction -> cheque
@@ -2237,6 +2244,7 @@
gint fyear = 0;
gint last_transaction_number;
gint div_number;
+ gchar* tmpstr;
/* we create the new transaction */
transaction_number = gsb_data_transaction_new_transaction ( account_number );
@@ -2528,7 +2536,7 @@
gsb_data_transaction_set_method_of_payment_number ( transaction_number,
payment_number );
- gchar* tmpstr = utils_str_itoa ( imported_transaction -> cheque );
+ tmpstr = utils_str_itoa ( imported_transaction -> cheque );
if ( gsb_data_payment_get_automatic_numbering (payment_number))
/* we are on the default payment_number, save just the cheque number */
gsb_data_transaction_set_method_of_payment_content ( transaction_number,
@@ -3836,7 +3844,7 @@
{
struct import_format * format = (struct import_format *) tmp -> data;
- if ( !strcasecmp ( extension + 1, format -> extension ) )
+ if ( !g_strcasecmp ( extension + 1, format -> extension ) )
{
return format -> name;
}
Index: gsb_payment_method.c
===================================================================
RCS file: /cvsroot/grisbi/grisbi/src/gsb_payment_method.c,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -d -r1.18 -r1.19
--- gsb_payment_method.c 25 May 2009 19:42:27 -0000 1.18
+++ gsb_payment_method.c 24 Aug 2009 13:56:59 -0000 1.19
@@ -363,9 +363,10 @@
/* pbiava the 03/15/09 fix the bug 493 */
if ( gsb_form_widget_check_empty (cheque_entry) )
{
+ gchar* tmpstr;
gsb_form_entry_get_focus (cheque_entry);
/* pbiava the 03/15/09 incremente le futur n° de Cheque */
- gchar* tmpstr = utils_str_itoa (gsb_data_payment_get_last_number (
+ tmpstr = utils_str_itoa (gsb_data_payment_get_last_number (
payment_number) + 1);
gtk_entry_set_text ( GTK_ENTRY (cheque_entry), tmpstr);
g_free ( tmpstr );
Index: import_csv.c
===================================================================
RCS file: /cvsroot/grisbi/grisbi/src/import_csv.c,v
retrieving revision 1.53
retrieving revision 1.54
diff -u -d -r1.53 -r1.54
--- import_csv.c 9 Jan 2009 14:49:00 -0000 1.53
+++ import_csv.c 24 Aug 2009 13:56:59 -0000 1.54
@@ -294,11 +294,11 @@
void skip_line_toggled ( GtkCellRendererToggle * cell, gchar * path_str,
GtkTreeView * tree_preview )
{
- GtkTreePath * path = gtk_tree_path_new_from_string (path_str);
- GtkTreeModel * tree_model = gtk_tree_view_get_model ( tree_preview );;
GtkTreeIter iter;
gboolean toggle_item;
gint * indices;
+ GtkTreePath * path = gtk_tree_path_new_from_string (path_str);
+ GtkTreeModel * tree_model = gtk_tree_view_get_model ( tree_preview );;
/* Get toggled iter */
gtk_tree_model_get_iter ( GTK_TREE_MODEL ( tree_model ), &iter, path );
Index: gsb_scheduler.c
===================================================================
RCS file: /cvsroot/grisbi/grisbi/src/gsb_scheduler.c,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -d -r1.26 -r1.27
--- gsb_scheduler.c 9 Aug 2009 18:31:42 -0000 1.26
+++ gsb_scheduler.c 24 Aug 2009 13:56:59 -0000 1.27
@@ -299,9 +299,10 @@
if (gsb_data_payment_get_automatic_numbering (payment_number))
{
gint number;
+ gchar* tmpstr;
number = gsb_data_payment_get_last_number (payment_number) + 1;
- gchar* tmpstr = utils_str_itoa (number);
+ tmpstr = utils_str_itoa (number);
gsb_data_transaction_set_method_of_payment_content ( transaction_number,
tmpstr);
g_free ( tmpstr );
- Previous message: [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
- Next message: [grisbi-cvs] grisbi/src gsb_file_others.c, 1.26, 1.27 gsb_file_util.c, 1.40, 1.41 gsb_form.c, 1.129, 1.130 gsb_form_config.c, 1.32, 1.33
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the cvs
mailing list