[grisbi-cvs] grisbi/src gsb_account.c, 1.46, 1.47 gsb_account_property.c, 1.43, 1.44 gsb_archive_config.c, 1.25, 1.26 gsb_assistant.c, 1.46, 1.47 gsb_assistant_account.c, 1.25, 1.26 gsb_assistant_archive.c, 1.36, 1.37 gsb_assistant_reconcile_config.c, 1.25, 1.26 gsb_autofunc.c, 1.23, 1.24 gsb_currency.c, 1.40, 1.41 gsb_currency_config.c, 1.54, 1.55 gsb_currency_link_config.c, 1.13, 1.14 gsb_data_account.c, 1.87, 1.88
Mickaël Remars
mykeul at users.sourceforge.net
Mon Aug 24 15:11:50 CEST 2009
- Previous message: [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
- Next message: [grisbi-cvs] grisbi/src gsb_category.c,1.21,1.22
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Update of /cvsroot/grisbi/grisbi/src
In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv23099
Modified Files:
gsb_account.c gsb_account_property.c gsb_archive_config.c
gsb_assistant.c gsb_assistant_account.c
gsb_assistant_archive.c gsb_assistant_reconcile_config.c
gsb_autofunc.c gsb_currency.c gsb_currency_config.c
gsb_currency_link_config.c gsb_data_account.c
Log Message:
msvc needs all variable declarations at the begining of the blocs (C99)
Index: gsb_account.c
===================================================================
RCS file: /cvsroot/grisbi/grisbi/src/gsb_account.c,v
retrieving revision 1.46
retrieving revision 1.47
diff -u -d -r1.46 -r1.47
--- gsb_account.c 10 May 2009 13:06:56 -0000 1.46
+++ gsb_account.c 24 Aug 2009 13:11:48 -0000 1.47
@@ -161,10 +161,11 @@
gint deleted_account;
gint page_number;
GSList *list_tmp;
+ gchar* tmpstr;
deleted_account = gsb_gui_navigation_get_current_account ();
- gchar* tmpstr = g_strdup_printf (_("Delete account \"%s\"?"),
+ tmpstr = g_strdup_printf (_("Delete account \"%s\"?"),
gsb_data_account_get_name (deleted_account)) ;
if ( !question_yes_no_hint ( tmpstr,
_("This will irreversibly remove this account and all operations that were previously contained. There is no undo for this. Usually it's a better way to close an account."),
Index: gsb_currency_link_config.c
===================================================================
RCS file: /cvsroot/grisbi/grisbi/src/gsb_currency_link_config.c,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -d -r1.13 -r1.14
--- gsb_currency_link_config.c 23 Aug 2009 16:45:05 -0000 1.13
+++ gsb_currency_link_config.c 24 Aug 2009 13:11:48 -0000 1.14
@@ -334,6 +334,7 @@
gchar *invalid;
GtkTreeIter local_iter;
GtkTreeIter *iter_ptr;
+ gchar* tmpstr;
if (iter_to_fill)
iter_ptr = iter_to_fill;
@@ -345,7 +346,7 @@
else
invalid = NULL;
- gchar* tmpstr = gsb_real_get_string (gsb_data_currency_link_get_change_rate (link_number));
+ tmpstr = gsb_real_get_string (gsb_data_currency_link_get_change_rate (link_number));
gtk_list_store_append ( GTK_LIST_STORE (model),
iter_ptr );
gtk_list_store_set ( GTK_LIST_STORE (model),
@@ -381,7 +382,7 @@
GtkWidget *exchange_entry;
GtkWidget *tree_view;
GtkWidget *label;
-
+ gchar* tmpstr;
if (!gtk_tree_selection_get_selected ( GTK_TREE_SELECTION (tree_selection),
&model,
@@ -430,7 +431,7 @@
g_signal_handlers_block_by_func ( G_OBJECT (exchange_entry),
G_CALLBACK (gsb_currency_link_config_modify_link),
tree_view );
- gchar* tmpstr = gsb_real_get_string (gsb_data_currency_link_get_change_rate (link_number));
+ tmpstr = gsb_real_get_string (gsb_data_currency_link_get_change_rate (link_number));
gtk_entry_set_text ( GTK_ENTRY (exchange_entry), tmpstr);
g_free ( tmpstr );
g_signal_handlers_unblock_by_func ( G_OBJECT (exchange_entry),
@@ -470,6 +471,7 @@
gint link_number;
gchar *invalid;
GtkWidget *label;
+ gchar* tmpstr;
if ( !gtk_tree_selection_get_selected ( gtk_tree_view_get_selection ( GTK_TREE_VIEW (tree_view)),
&model,
@@ -504,7 +506,7 @@
else
invalid = NULL;
- gchar* tmpstr = gsb_real_get_string (gsb_data_currency_link_get_change_rate (link_number));
+ tmpstr = gsb_real_get_string (gsb_data_currency_link_get_change_rate (link_number));
gtk_list_store_set ( GTK_LIST_STORE (model),
&iter,
LINK_CURRENCY1_COLUMN, gsb_data_currency_get_name (gsb_data_currency_link_get_first_currency(link_number)),
Index: gsb_assistant_reconcile_config.c
===================================================================
RCS file: /cvsroot/grisbi/grisbi/src/gsb_assistant_reconcile_config.c,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -d -r1.25 -r1.26
--- gsb_assistant_reconcile_config.c 26 Dec 2008 15:34:04 -0000 1.25
+++ gsb_assistant_reconcile_config.c 24 Aug 2009 13:11:48 -0000 1.26
@@ -146,6 +146,7 @@
GSList *tmp_list;
gint transaction_number;
GtkWidget *assistant;
+ gchar* tmpstr;
tmp_list = gsb_data_transaction_get_transactions_list ();
while (tmp_list)
@@ -186,7 +187,7 @@
* at the first update to grisbi 0.6.0 )*/
/* first, create the assistant */
- gchar* tmpstr = g_strdup_printf (_("Grisbi found %d marked transactions not associated with a reconciliation number, "
+ tmpstr = g_strdup_printf (_("Grisbi found %d marked transactions not associated with a reconciliation number, "
"this can happen for old users of grisbi or from a misuse of the Ctrl-R shortcut.\n\n"
"This assistant will help you make the link between such transactions and a reconciliation.\n\n"
"Before continuing, you should first check if all the dates of the existing reconciliations are good "
@@ -254,11 +255,12 @@
GtkWidget *separator;
GtkWidget *label;
GtkWidget *button;
+ gchar* tmpstr;
page = gtk_vbox_new (FALSE, 5);
gtk_container_set_border_width ( GTK_CONTAINER(page), 12 );
- gchar* tmpstr = g_strdup_printf (_("Still %d transactions to link with a reconciliation."),
+ tmpstr = g_strdup_printf (_("Still %d transactions to link with a reconciliation."),
transactions_to_link);
label_transactions_to_link_1 = gtk_label_new (tmpstr );
g_signal_connect ( G_OBJECT (label_transactions_to_link_1 ), "destroy",
Index: gsb_assistant_account.c
===================================================================
RCS file: /cvsroot/grisbi/grisbi/src/gsb_assistant_account.c,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -d -r1.25 -r1.26
--- gsb_assistant_account.c 21 Jan 2009 20:12:40 -0000 1.25
+++ gsb_assistant_account.c 24 Aug 2009 13:11:48 -0000 1.26
@@ -88,6 +88,7 @@
*/
GtkResponseType gsb_assistant_account_run ( void )
{
+ gboolean result = FALSE;
GtkResponseType return_value;
GtkWidget *assistant;
@@ -119,7 +120,6 @@
return_value = gsb_assistant_run (assistant);
- gboolean result = FALSE;
if (return_value == GTK_RESPONSE_APPLY)
{
/* Ok, we create the new account */
Index: gsb_archive_config.c
===================================================================
RCS file: /cvsroot/grisbi/grisbi/src/gsb_archive_config.c,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -d -r1.25 -r1.26
--- gsb_archive_config.c 23 Aug 2009 16:45:05 -0000 1.25
+++ gsb_archive_config.c 24 Aug 2009 13:11:48 -0000 1.26
@@ -105,7 +105,7 @@
GtkWidget *check_paddingbox;
GtkWidget *button;
GtkWidget *entry;
-
+ gchar* tmpstr;
/* create the page */
vbox_pref = new_vbox_with_title_and_icon ( _("Archives"),
@@ -209,7 +209,7 @@
"clicked",
G_CALLBACK (gsb_archive_config_delete_archive),
archive_treeview );
- 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(button),
gtk_image_new_from_file ( tmpstr ) );
g_free ( tmpstr );
@@ -440,6 +440,7 @@
GtkTreeSelection *selection;
GtkTreeIter iter;
gboolean good;
+ gchar* tmpstr;
selection = gtk_tree_view_get_selection (GTK_TREE_VIEW (tree_view));
good = gtk_tree_selection_get_selected (selection, NULL, &iter);
@@ -457,7 +458,7 @@
if (!archive_number)
return FALSE;
- gchar* tmpstr = g_strdup_printf (
+ tmpstr = g_strdup_printf (
_("Warning, you are about the delete the archive \"%s\".\n\n"
"If you continue, all the transactions linked to that archive "
"will loose the link and will begin again not archived.\n"
@@ -512,6 +513,7 @@
gint archive_number;
GSList *tmp_list;
gint account_number;
+ gchar* tmpstr;
model = gtk_tree_view_get_model ( GTK_TREE_VIEW (tree_view));
gtk_tree_model_get ( GTK_TREE_MODEL(model), &iter,
@@ -521,7 +523,7 @@
if (!archive_number)
return FALSE;
- gchar* tmpstr = g_strdup_printf (
+ tmpstr = g_strdup_printf (
_("Warning, you are about the delete the archive \"%s\" and its "
"associated transactions.\n\nIf you continue, all the transactions "
"linked to that archive will be deleted and the initials amounts "
Index: gsb_assistant.c
===================================================================
RCS file: /cvsroot/grisbi/grisbi/src/gsb_assistant.c,v
retrieving revision 1.46
retrieving revision 1.47
diff -u -d -r1.46 -r1.47
--- gsb_assistant.c 27 Apr 2009 19:41:03 -0000 1.46
+++ gsb_assistant.c 24 Aug 2009 13:11:48 -0000 1.47
@@ -67,6 +67,7 @@
GtkWidget * button_cancel, * button_prev, * button_next;
GtkStyle * style;
GtkTextBuffer * buffer;
+ gchar* tmpstr;
assistant = gtk_dialog_new_with_buttons ( title,
GTK_WINDOW ( window ),
@@ -99,7 +100,7 @@
gtk_container_set_border_width ( GTK_CONTAINER(hbox), 12 );
label = gtk_label_new ( NULL );
- gchar* tmpstr = g_strconcat ( "<b><span size=\"x-large\">", title, "</span></b>", NULL );
+ tmpstr = g_strconcat ( "<b><span size=\"x-large\">", title, "</span></b>", NULL );
gtk_label_set_markup ( GTK_LABEL(label), tmpstr );
g_free ( tmpstr );
gtk_box_pack_start ( GTK_BOX(hbox), label, TRUE, TRUE, 0 );
Index: gsb_account_property.c
===================================================================
RCS file: /cvsroot/grisbi/grisbi/src/gsb_account_property.c,v
retrieving revision 1.43
retrieving revision 1.44
diff -u -d -r1.43 -r1.44
--- gsb_account_property.c 21 May 2009 21:58:55 -0000 1.43
+++ gsb_account_property.c 24 Aug 2009 13:11:48 -0000 1.44
@@ -858,6 +858,7 @@
gint account_currency_number;
gint result;
GSList *list_tmp;
+ gchar* tmpstr;
account_number = gsb_gui_navigation_get_current_account ();
@@ -873,7 +874,7 @@
new_currency_number );
/* ask for the currency of the transactions */
- gchar* tmpstr = g_strdup_printf ( _("You are changing the currency of the account, do you want to change the currency of the transactions too ?\n(yes will change all the transactions currency from %s to %s, all the transactions with another currency will stay the same).\n\nArchived and reconcilied transactions will be left unmodified."),
+ tmpstr = g_strdup_printf ( _("You are changing the currency of the account, do you want to change the currency of the transactions too ?\n(yes will change all the transactions currency from %s to %s, all the transactions with another currency will stay the same).\n\nArchived and reconcilied transactions will be left unmodified."),
gsb_data_currency_get_name (account_currency_number),
gsb_data_currency_get_name (new_currency_number));
result = question_yes_no_hint ( _("Change the transactions currency"),
Index: gsb_data_account.c
===================================================================
RCS file: /cvsroot/grisbi/grisbi/src/gsb_data_account.c,v
retrieving revision 1.87
retrieving revision 1.88
diff -u -d -r1.87 -r1.88
--- gsb_data_account.c 9 Aug 2009 18:31:42 -0000 1.87
+++ gsb_data_account.c 24 Aug 2009 13:11:48 -0000 1.88
@@ -963,7 +963,9 @@
GDate *date_jour = g_date_new ( );
GSList *tmp_list;
gsb_real current_balance;
+ gsb_real current_balance_later = null_real;
gsb_real marked_balance;
+ gsb_real marked_balance_later = null_real;
gint floating_point;
//~ devel_debug_int ( account_number );
@@ -978,8 +980,6 @@
floating_point );
marked_balance = gsb_real_adjust_exponent ( account -> init_balance,
floating_point );
- gsb_real current_balance_later = null_real;
- gsb_real marked_balance_later = null_real;
g_date_set_time_t (date_jour, time (NULL));
Index: gsb_assistant_archive.c
===================================================================
RCS file: /cvsroot/grisbi/grisbi/src/gsb_assistant_archive.c,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -d -r1.36 -r1.37
--- gsb_assistant_archive.c 23 Aug 2009 16:45:05 -0000 1.36
+++ gsb_assistant_archive.c 24 Aug 2009 13:11:48 -0000 1.37
@@ -827,6 +827,7 @@
gchar *string;
GSList *tmp_list;
GtkWidget * notebook;
+ GSList *report_transactions_list;
notebook = g_object_get_data ( G_OBJECT(assistant), "notebook" );
@@ -961,7 +962,6 @@
{
gint report_number;
string = NULL;
- GSList *report_transactions_list;
report_number = gsb_report_get_report_from_combobox (report_button);
Index: gsb_currency_config.c
===================================================================
RCS file: /cvsroot/grisbi/grisbi/src/gsb_currency_config.c,v
retrieving revision 1.54
retrieving revision 1.55
diff -u -d -r1.54 -r1.55
--- gsb_currency_config.c 9 Aug 2009 18:31:42 -0000 1.54
+++ gsb_currency_config.c 24 Aug 2009 13:11:48 -0000 1.55
@@ -1318,6 +1318,7 @@
gint currency_floating;
GtkWidget * entry_name, * entry_iso_code, * entry_code, * entry_floating_point;
GtkTreeIter iter;
+ gchar* tmpstr;
if (! gtk_tree_selection_get_selected (selection, NULL, &iter))
return(FALSE);
@@ -1345,7 +1346,7 @@
gtk_entry_set_text ( GTK_ENTRY ( entry_name ), currency_name );
gtk_entry_set_text ( GTK_ENTRY ( entry_iso_code ), currency_iso_code );
gtk_entry_set_text ( GTK_ENTRY ( entry_code ), currency_nickname );
- gchar* tmpstr = utils_str_itoa (currency_floating);
+ tmpstr = utils_str_itoa (currency_floating);
gtk_entry_set_text ( GTK_ENTRY ( entry_floating_point ), tmpstr);
g_free ( tmpstr );
return ( FALSE );
Index: gsb_currency.c
===================================================================
RCS file: /cvsroot/grisbi/grisbi/src/gsb_currency.c,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -d -r1.40 -r1.41
--- gsb_currency.c 27 Apr 2009 19:41:03 -0000 1.40
+++ gsb_currency.c 24 Aug 2009 13:11:48 -0000 1.41
@@ -276,6 +276,7 @@
{
GSList *list_tmp;
gint old_currency_number = -1;
+ gchar* tmpstr;
devel_debug (NULL);
if (!combobox_currency_store
@@ -326,7 +327,7 @@
gtk_list_store_append ( GTK_LIST_STORE (combobox_currency_store), &iter );
- gchar* tmpstr = g_strconcat ( gsb_data_currency_get_name (currency_number),
+ tmpstr = g_strconcat ( gsb_data_currency_get_name (currency_number),
" (",
gsb_data_currency_get_code_or_isocode (currency_number),
")",
@@ -449,7 +450,7 @@
gint result;
GtkWidget *combobox_1;
GtkWidget *combobox_2;
-
+ gchar* tmpstr;
if ( !force
&&
@@ -470,7 +471,7 @@
gtk_window_set_resizable ( GTK_WINDOW ( dialog ), FALSE );
/* text for paddingbox */
- gchar* tmpstr = g_strdup_printf( _("Please enter exchange rate for %s"),
+ tmpstr = g_strdup_printf( _("Please enter exchange rate for %s"),
gsb_data_currency_get_name (transaction_currency_number));
/* Ugly dance to avoid side effects on dialog's vbox. */
@@ -570,7 +571,7 @@
gtk_combo_box_set_active ( GTK_COMBO_BOX (combobox_2),
link_currency );
}
- gchar* tmpstr = gsb_real_get_string (exchange_rate);
+ tmpstr = gsb_real_get_string (exchange_rate);
gtk_entry_set_text ( GTK_ENTRY ( entry ), tmpstr);
g_free ( tmpstr );
Index: gsb_autofunc.c
===================================================================
RCS file: /cvsroot/grisbi/grisbi/src/gsb_autofunc.c,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -d -r1.23 -r1.24
--- gsb_autofunc.c 10 May 2009 13:06:56 -0000 1.23
+++ gsb_autofunc.c 24 Aug 2009 13:11:48 -0000 1.24
@@ -376,11 +376,12 @@
gint number_for_func )
{
GtkWidget * entry;
+ gchar* tmpstr;
/* first, create and fill the entry */
entry = gtk_entry_new ();
- gchar* tmpstr = utils_str_itoa (value);
+ tmpstr = utils_str_itoa (value);
gtk_entry_set_text ( GTK_ENTRY(entry), tmpstr);
g_free ( tmpstr );
@@ -417,6 +418,8 @@
gint value,
gint number_for_func )
{
+ gchar* tmpstr;
+
/* Block everything */
if ( g_object_get_data (G_OBJECT (entry), "changed") > 0 )
g_signal_handler_block ( G_OBJECT(entry),
@@ -428,7 +431,7 @@
"changed-hook"));
/* Fill in value */
- gchar* tmpstr = utils_str_itoa (value);
+ tmpstr = utils_str_itoa (value);
gtk_entry_set_text ( GTK_ENTRY(entry), tmpstr);
g_free ( tmpstr );
- Previous message: [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
- Next message: [grisbi-cvs] grisbi/src gsb_category.c,1.21,1.22
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the cvs
mailing list