[grisbi-cvs] [SCM] grisbi branch, grisbi-gtk3, updated. upstream_version_0_9_4-125-g386090a
Pierre Biava
nobody at users.sourceforge.net
Wed Dec 21 22:01:08 CET 2011
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "grisbi".
The branch, grisbi-gtk3 has been updated
via 386090a135f6383380e41daa494d71dabf6e9ff6 (commit)
via 0413fb271b6938b8d43e11175faab6776c6c56d3 (commit)
via fcb3bea19452b59e9d09cfeaff555d5b6a714a9c (commit)
via f0d70651e78ae707d54a79927f650111ab3c0c94 (commit)
via 8ff34b23889e3e9bd908d12b260c9b3ea3abdcae (commit)
via 1294fa78a9ffda4785926cef4938f72301407935 (commit)
via 07a8eaf17874f4eb64d4f4ba0ed98cb36e0198a9 (commit)
via 43e6c729ad7d86f5c0fa08e11dd4f351299c2879 (commit)
from 0b82a64ec5edec7aa36fc4fb143b99a20d3475ee (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit 386090a135f6383380e41daa494d71dabf6e9ff6
Author: pbiava <pierre.biava at nerim.net>
Date: Wed Dec 21 21:59:26 2011 +0100
replaced GTK_WIDGET_SENSITIVE by gtk_widget_get_sensitive ()
commit 0413fb271b6938b8d43e11175faab6776c6c56d3
Author: pbiava <pierre.biava at nerim.net>
Date: Wed Dec 21 21:54:41 2011 +0100
replaced GTK_WIDGET_VISIBLE by gtk_widget_get_visible ()
commit fcb3bea19452b59e9d09cfeaff555d5b6a714a9c
Author: pbiava <pierre.biava at nerim.net>
Date: Wed Dec 21 21:44:58 2011 +0100
replaced GTK_WIDGET_IS_SENSITIVE by gtk_widget_is_sensitive ()
commit f0d70651e78ae707d54a79927f650111ab3c0c94
Author: pbiava <pierre.biava at nerim.net>
Date: Wed Dec 21 21:38:51 2011 +0100
replaced GTK_WIDGET_TOPLEVEL () by gtk_widget_is_toplevel ()
commit 8ff34b23889e3e9bd908d12b260c9b3ea3abdcae
Author: pbiava <pierre.biava at nerim.net>
Date: Wed Dec 21 21:35:07 2011 +0100
deleted GtkNotebookPage
commit 1294fa78a9ffda4785926cef4938f72301407935
Author: pbiava <pierre.biava at nerim.net>
Date: Wed Dec 21 20:20:47 2011 +0100
replaced gdk_set_locale () by g_getenv ( "LANG")
commit 07a8eaf17874f4eb64d4f4ba0ed98cb36e0198a9
Author: pbiava <pierre.biava at nerim.net>
Date: Wed Dec 21 20:01:25 2011 +0100
replaced gtk_widget_hide_all () by gtk_widget_hide ()
commit 43e6c729ad7d86f5c0fa08e11dd4f351299c2879
Author: pbiava <pierre.biava at nerim.net>
Date: Wed Dec 21 06:28:41 2011 +0100
Adding a comment in gsb_main_create_main_window (void)
-----------------------------------------------------------------------
Changes:
diff --git a/src/accueil.c b/src/accueil.c
index ee927e9..a175ebf 100644
--- a/src/accueil.c
+++ b/src/accueil.c
@@ -111,7 +111,7 @@ static GtkSizeGroup * size_group_accueil;
static gchar *chaine_espace = " ";
#define show_paddingbox(child) gtk_widget_show_all (gtk_widget_get_parent(gtk_widget_get_parent(gtk_widget_get_parent(GTK_WIDGET(child)))))
-#define hide_paddingbox(child) gtk_widget_hide_all (gtk_widget_get_parent(gtk_widget_get_parent(gtk_widget_get_parent(GTK_WIDGET(child)))))
+#define hide_paddingbox(child) gtk_widget_hide (gtk_widget_get_parent(gtk_widget_get_parent(gtk_widget_get_parent(GTK_WIDGET(child)))))
/* ces 5 variables sont mises à 1 lorsqu'il est nécessaire de rafraichir cette */
@@ -1973,7 +1973,7 @@ GtkWidget *onglet_accueil (void)
gtk_container_set_border_width ( GTK_CONTAINER ( vbox ), 12 );
/* pour les francophones ;-) */
- if ( g_strstr_len ( ( g_ascii_strup ( gdk_set_locale ( ), -1 ) ), -1, "FR" ) )
+ if ( g_strstr_len ( ( g_ascii_strup ( g_getenv ( "LANG"), -1 ) ), -1, "FR" ) )
{
paddingbox = new_paddingbox_with_title (vbox, FALSE, "Pluriel de final" );
diff --git a/src/bet_config.c b/src/bet_config.c
index a7b5e09..a9a2c4b 100644
--- a/src/bet_config.c
+++ b/src/bet_config.c
@@ -1135,40 +1135,40 @@ void bet_config_sensitive_account_parameters ( gint account_number, gboolean sen
widget = g_object_get_data ( G_OBJECT ( account_page ), "Data_for_historical" );
gtk_widget_show_all ( widget );
widget = g_object_get_data ( G_OBJECT ( account_page ), "Data_for_credit" );
- gtk_widget_hide_all ( widget );
+ gtk_widget_hide ( widget );
break;
case GSB_TYPE_CASH:
widget = g_object_get_data ( G_OBJECT ( account_page ), "Data_for_forecast" );
- gtk_widget_hide_all ( widget );
+ gtk_widget_hide ( widget );
widget = g_object_get_data ( G_OBJECT ( account_page ), "Data_for_historical" );
gtk_widget_show_all ( widget );
widget = g_object_get_data ( G_OBJECT ( account_page ), "Data_for_credit" );
- gtk_widget_hide_all ( widget );
+ gtk_widget_hide ( widget );
break;
case GSB_TYPE_LIABILITIES:
widget = g_object_get_data ( G_OBJECT ( account_page ), "Data_for_forecast" );
- gtk_widget_hide_all ( widget );
+ gtk_widget_hide ( widget );
widget = g_object_get_data ( G_OBJECT ( account_page ), "Data_for_historical" );
- gtk_widget_hide_all ( widget );
+ gtk_widget_hide ( widget );
widget = g_object_get_data ( G_OBJECT ( account_page ), "Data_for_credit" );
gtk_widget_show_all ( widget );
break;
case GSB_TYPE_ASSET:
widget = g_object_get_data ( G_OBJECT ( account_page ), "Data_for_forecast" );
- gtk_widget_hide_all ( widget );
+ gtk_widget_hide ( widget );
widget = g_object_get_data ( G_OBJECT ( account_page ), "Data_for_historical" );
- gtk_widget_hide_all ( widget );
+ gtk_widget_hide ( widget );
widget = g_object_get_data ( G_OBJECT ( account_page ), "Data_for_credit" );
- gtk_widget_hide_all ( widget );
+ gtk_widget_hide ( widget );
break;
}
}
else
{
widget = g_object_get_data ( G_OBJECT ( account_page ), "Data_for_forecast" );
- gtk_widget_hide_all ( widget );
+ gtk_widget_hide ( widget );
widget = g_object_get_data ( G_OBJECT ( account_page ), "Data_for_historical" );
- gtk_widget_hide_all ( widget );
+ gtk_widget_hide ( widget );
}
}
@@ -1198,11 +1198,11 @@ void bet_config_use_budget_toggle ( GtkToggleButton *button, GtkWidget *combo )
bet_data_remove_all_bet_data ( account_number );
gsb_data_account_set_bet_use_budget ( account_number, 0 );
widget = g_object_get_data ( G_OBJECT ( account_page ), "Data_for_forecast" );
- gtk_widget_hide_all ( widget );
+ gtk_widget_hide ( widget );
widget = g_object_get_data ( G_OBJECT ( account_page ), "Data_for_historical" );
- gtk_widget_hide_all ( widget );
+ gtk_widget_hide ( widget );
widget = g_object_get_data ( G_OBJECT ( account_page ), "Data_for_credit" );
- gtk_widget_hide_all ( widget );
+ gtk_widget_hide ( widget );
}
if ( gsb_gui_navigation_get_current_account ( ) == account_number )
diff --git a/src/bet_future.c b/src/bet_future.c
index b243100..ccc03b6 100644
--- a/src/bet_future.c
+++ b/src/bet_future.c
@@ -1000,7 +1000,7 @@ gboolean bet_form_entry_lose_focus ( GtkWidget *entry,
* (if grey, it's a child of split so do nothing) */
if ( widget
&&
- GTK_WIDGET_SENSITIVE ( widget ) )
+ gtk_widget_get_sensitive ( widget ) )
{
/* change the signe of the method of payment and the contra */
if ( gsb_payment_method_get_combo_sign ( widget ) == GSB_PAYMENT_CREDIT )
@@ -1028,7 +1028,7 @@ gboolean bet_form_entry_lose_focus ( GtkWidget *entry,
widget = bet_form_widget_get_widget ( TRANSACTION_FORM_TYPE );
if ( widget
&&
- GTK_WIDGET_SENSITIVE ( widget ) )
+ gtk_widget_get_sensitive ( widget ) )
{
/* change the signe of the method of payment and the contra */
if ( gsb_payment_method_get_combo_sign ( widget ) == GSB_PAYMENT_DEBIT )
@@ -1061,7 +1061,7 @@ gboolean bet_form_entry_lose_focus ( GtkWidget *entry,
* (if grey, it's a child of split so do nothing) */
if ( widget
&&
- GTK_WIDGET_SENSITIVE (widget))
+ gtk_widget_get_sensitive (widget))
{
/* change the signe of the method of payment and the contra */
if ( gsb_payment_method_get_combo_sign ( widget ) == GSB_PAYMENT_DEBIT )
@@ -1089,7 +1089,7 @@ gboolean bet_form_entry_lose_focus ( GtkWidget *entry,
widget = bet_form_widget_get_widget ( TRANSACTION_FORM_TYPE );
if ( widget
&&
- GTK_WIDGET_SENSITIVE ( widget ) )
+ gtk_widget_get_sensitive ( widget ) )
{
/* change the signe of the method of payment and the contra */
if ( gsb_payment_method_get_combo_sign ( widget ) == GSB_PAYMENT_CREDIT )
diff --git a/src/bet_graph.c b/src/bet_graph.c
index 378c984..bad97d1 100644
--- a/src/bet_graph.c
+++ b/src/bet_graph.c
@@ -135,7 +135,7 @@ static gboolean bet_graph_initialise_builder ( void );
static void bet_graph_map_type_changed ( GtkComboBox *combo,
struct_bet_graph_data *self );
static gboolean bet_graph_notebook_change_page ( GtkNotebook *notebook,
- GtkNotebookPage *npage,
+ gpointer npage,
gint page,
struct_bet_graph_data *self );
static gboolean bet_graph_populate_lines_by_forecast_data ( struct_bet_graph_data *self );
@@ -1518,7 +1518,7 @@ void bet_graph_show_grid_button_configure ( struct_bet_graph_data *self,
*
* */
gboolean bet_graph_notebook_change_page ( GtkNotebook *notebook,
- GtkNotebookPage *npage,
+ gpointer npage,
gint page,
struct_bet_graph_data *self )
{
diff --git a/src/fenetre_principale.c b/src/fenetre_principale.c
index abd375e..660cd18 100644
--- a/src/fenetre_principale.c
+++ b/src/fenetre_principale.c
@@ -324,7 +324,7 @@ gboolean gsb_gui_fill_general_notebook ( GtkWidget *notebook )
* \return FALSE
*/
gboolean gsb_gui_on_account_switch_page ( GtkNotebook *notebook,
- GtkNotebookPage *page,
+ gpointer page,
guint page_number,
gpointer null )
{
@@ -433,7 +433,7 @@ gboolean gsb_gui_update_show_headings ( void )
}
else
{
- gtk_widget_hide_all ( headings_eb );
+ gtk_widget_hide ( headings_eb );
}
return FALSE;
}
diff --git a/src/fenetre_principale.h b/src/fenetre_principale.h
index 6226163..e779aee 100644
--- a/src/fenetre_principale.h
+++ b/src/fenetre_principale.h
@@ -40,7 +40,7 @@ gboolean gsb_gui_is_hpaned_general ( void );
void gsb_gui_notebook_change_page ( GsbGeneralNotebookPages page );
void gsb_gui_on_account_change_page ( GsbaccountNotebookPages page );
gboolean gsb_gui_on_account_switch_page ( GtkNotebook *notebook,
- GtkNotebookPage *page,
+ gpointer page,
guint page_number,
gpointer null );
void gsb_gui_sensitive_headings ( gboolean sensitive );
diff --git a/src/gsb_account_property.c b/src/gsb_account_property.c
index 6d20234..c13e870 100644
--- a/src/gsb_account_property.c
+++ b/src/gsb_account_property.c
@@ -932,7 +932,7 @@ void gsb_account_property_iban_insert_text ( GtkEditable *entry,
/* on autorise ou pas la saisie des données banquaires */
if ( g_utf8_strlen (iban, -1) == 0 )
gsb_account_property_iban_switch_bank_data ( TRUE );
- else if ( GTK_WIDGET_IS_SENSITIVE ( bank_list_combobox ) )
+ else if ( gtk_widget_is_sensitive ( bank_list_combobox ) )
gsb_account_property_iban_switch_bank_data ( FALSE );
/* on contrôle l'existence d'un modèle pour le numéro IBAN */
@@ -972,7 +972,7 @@ void gsb_account_property_iban_delete_text ( GtkEditable *entry,
/* on autorise ou pas la saisie des données banquaires */
if ( start_pos == 0 )
gsb_account_property_iban_switch_bank_data ( TRUE );
- else if ( GTK_WIDGET_IS_SENSITIVE ( bank_list_combobox ) )
+ else if ( gtk_widget_is_sensitive ( bank_list_combobox ) )
gsb_account_property_iban_switch_bank_data ( FALSE );
}
diff --git a/src/gsb_assistant.c b/src/gsb_assistant.c
index 06e0bee..938068d 100644
--- a/src/gsb_assistant.c
+++ b/src/gsb_assistant.c
@@ -43,8 +43,10 @@
/*END_INCLUDE*/
/*START_STATIC*/
-static gboolean gsb_assistant_change_page ( GtkNotebook * notebook, GtkNotebookPage * npage,
- gint page, gpointer assistant );
+static gboolean gsb_assistant_change_page ( GtkNotebook *notebook,
+ gpointer npage,
+ gint page,
+ gpointer assistant );
/*END_STATIC*/
/*START_EXTERN*/
@@ -316,8 +318,10 @@ GtkResponseType gsb_assistant_run ( GtkWidget * assistant )
* \return Result from user-defined callback or FALSE if
* no callback defined.
*/
-gboolean gsb_assistant_change_page ( GtkNotebook * notebook, GtkNotebookPage * npage,
- gint page, gpointer assistant )
+gboolean gsb_assistant_change_page ( GtkNotebook *notebook,
+ gpointer npage,
+ gint page,
+ gpointer assistant )
{
typedef gboolean ( * gsb_assistant_callback ) ( GtkWidget *, gint );
gsb_assistant_callback callback;
diff --git a/src/gsb_assistant_archive.c b/src/gsb_assistant_archive.c
index 6f107be..6626325 100644
--- a/src/gsb_assistant_archive.c
+++ b/src/gsb_assistant_archive.c
@@ -580,7 +580,7 @@ static gboolean gsb_assistant_archive_switch_to_archive_name ( GtkWidget *assist
gsb_assistant_change_button_next ( assistant,
GTK_STOCK_APPLY, GTK_RESPONSE_YES );
- if ( GTK_WIDGET_IS_SENSITIVE (initial_date) )
+ if ( gtk_widget_is_sensitive (initial_date) )
{
gchar * sdate, * fdate;
@@ -590,7 +590,7 @@ static gboolean gsb_assistant_archive_switch_to_archive_name ( GtkWidget *assist
g_free ( sdate );
g_free ( fdate );
}
- else if ( GTK_WIDGET_IS_SENSITIVE (financial_year_button) )
+ else if ( gtk_widget_is_sensitive (financial_year_button) )
{
gint fyear;
@@ -598,7 +598,7 @@ static gboolean gsb_assistant_archive_switch_to_archive_name ( GtkWidget *assist
string = g_strdup_printf ( _("Archive of financial year %s"),
gsb_data_fyear_get_name ( fyear ) );
}
- else if ( GTK_WIDGET_IS_SENSITIVE (report_button) )
+ else if ( gtk_widget_is_sensitive (report_button) )
{
gint report_number;
report_number = gsb_report_get_report_from_combobox (report_button);
@@ -666,7 +666,7 @@ static gboolean gsb_assistant_archive_switch_to_success ( GtkWidget *assistant,
GTK_STOCK_CLOSE, GTK_RESPONSE_APPLY );
/* fill the archive */
- if (GTK_WIDGET_IS_SENSITIVE (initial_date))
+ if (gtk_widget_is_sensitive (initial_date))
{
GDate *init_gdate;
GDate *final_gdate;
@@ -679,10 +679,10 @@ static gboolean gsb_assistant_archive_switch_to_success ( GtkWidget *assistant,
g_date_free (init_gdate);
g_date_free (final_gdate);
}
- else if (GTK_WIDGET_IS_SENSITIVE (financial_year_button))
+ else if (gtk_widget_is_sensitive (financial_year_button))
gsb_data_archive_set_fyear ( archive_number,
gsb_fyear_get_fyear_from_combobox ( financial_year_button,NULL ) );
- else if (GTK_WIDGET_IS_SENSITIVE (report_button) )
+ else if (gtk_widget_is_sensitive (report_button) )
{
gint report_number;
@@ -804,7 +804,7 @@ static gboolean gsb_assistant_archive_update_labels ( GtkWidget *assistant )
/* ok for now the choice is on initial/final date */
if ( gtk_notebook_get_current_page (GTK_NOTEBOOK(notebook)) == ARCHIVE_ASSISTANT_MENU )
{
- if ( GTK_WIDGET_IS_SENSITIVE (initial_date) )
+ if ( gtk_widget_is_sensitive (initial_date) )
{
GDate *init_gdate;
GDate *final_gdate;
@@ -878,7 +878,7 @@ static gboolean gsb_assistant_archive_update_labels ( GtkWidget *assistant )
}
/* ok for now the choice is on fyear */
- else if ( GTK_WIDGET_IS_SENSITIVE ( financial_year_button ) )
+ else if ( gtk_widget_is_sensitive ( financial_year_button ) )
{
gint fyear_number;
string = NULL;
@@ -919,7 +919,7 @@ static gboolean gsb_assistant_archive_update_labels ( GtkWidget *assistant )
}
}
/* ok for now the choice is on report */
- else if ( GTK_WIDGET_IS_SENSITIVE (report_button))
+ else if ( gtk_widget_is_sensitive (report_button))
{
gint report_number;
string = NULL;
diff --git a/src/gsb_calendar_entry.c b/src/gsb_calendar_entry.c
index 215e686..f81de12 100644
--- a/src/gsb_calendar_entry.c
+++ b/src/gsb_calendar_entry.c
@@ -565,7 +565,7 @@ gboolean gsb_calendar_entry_select_date ( GtkCalendar *pCalendar,
gtk_entry_set_text ( GTK_ENTRY ( entry ),
gsb_format_date ( day, month + 1, year ));
gsb_form_widget_set_empty ( entry, FALSE );
- if ( GTK_WIDGET_TOPLEVEL ( pTopLevelWidget ) )
+ if ( gtk_widget_is_toplevel ( pTopLevelWidget ) )
gtk_widget_destroy ( pTopLevelWidget );
return FALSE;
@@ -602,7 +602,7 @@ gboolean gsb_calendar_entry_calendar_key_press ( GtkCalendar *pCalendar,
{
case GDK_Escape :
/* just close the calendar if it's a popup */
- if ( GTK_WIDGET_TOPLEVEL ( pTopLevelWidget ) )
+ if ( gtk_widget_is_toplevel ( pTopLevelWidget ) )
gtk_widget_destroy ( pTopLevelWidget );
g_date_free (date);
return TRUE;
@@ -613,7 +613,7 @@ gboolean gsb_calendar_entry_calendar_key_press ( GtkCalendar *pCalendar,
/* get the date an close the calendar */
gtk_entry_set_text ( GTK_ENTRY ( entry ),
gsb_format_date ( day, month, year ));
- if ( GTK_WIDGET_TOPLEVEL ( pTopLevelWidget ) )
+ if ( gtk_widget_is_toplevel ( pTopLevelWidget ) )
gtk_widget_destroy ( pTopLevelWidget );
g_date_free (date);
return TRUE;
diff --git a/src/gsb_currency_link_config.c b/src/gsb_currency_link_config.c
index 8c35c7a..a1f9990 100644
--- a/src/gsb_currency_link_config.c
+++ b/src/gsb_currency_link_config.c
@@ -669,7 +669,7 @@ gboolean gsb_currency_link_config_remove_link ( GtkWidget *tree_view )
/* hide the warning label */
label = g_object_get_data (G_OBJECT (model),
"warning_label");
- if ( GTK_WIDGET_VISIBLE ( label ) )
+ if ( gtk_widget_get_visible ( label ) )
gtk_widget_hide (label);
gsb_file_set_modified ( TRUE );
diff --git a/src/gsb_form.c b/src/gsb_form.c
index a3f62f7..d8416a0 100644
--- a/src/gsb_form.c
+++ b/src/gsb_form.c
@@ -832,7 +832,7 @@ void gsb_form_fill_element ( gint element_number,
/* don't show the cheque entry for a child of split */
tmp_widget = gsb_form_widget_get_widget ( TRANSACTION_FORM_CHEQUE );
- if ( GTK_WIDGET_VISIBLE ( widget ) )
+ if ( gtk_widget_get_visible ( widget ) )
{
gboolean check_entry = FALSE;
@@ -913,7 +913,7 @@ void gsb_form_fill_element ( gint element_number,
GSB_PAYMENT_DEBIT,
number, 0, TRUE );
- if (GTK_WIDGET_VISIBLE (widget))
+ if (gtk_widget_get_visible (widget))
{
gint method;
@@ -1127,7 +1127,7 @@ gint gsb_form_get_account_number ( void )
case ORIGIN_VALUE_HOME:
/* we are on the home page, we need to check if the form is showed,
* if yes, we get the account number of the scheduled showed in that form */
- if ( transaction_form && GTK_WIDGET_VISIBLE (transaction_form))
+ if ( transaction_form && gtk_widget_get_visible (transaction_form))
{
gint scheduled_number;
@@ -1556,7 +1556,7 @@ gboolean gsb_form_entry_lose_focus ( GtkWidget *entry,
* (if grey, it's a child of split so do nothing) */
if ( widget
&&
- GTK_WIDGET_SENSITIVE (widget))
+ gtk_widget_get_sensitive (widget))
{
/* change the signe of the method of payment and the contra */
if ( gsb_payment_method_get_combo_sign ( widget ) == GSB_PAYMENT_CREDIT)
@@ -1566,11 +1566,11 @@ gboolean gsb_form_entry_lose_focus ( GtkWidget *entry,
account_number, 0, FALSE );
/* if there is no payment method, the last function hide it, but we have
* to hide the cheque element too */
- if ( !GTK_WIDGET_VISIBLE ( widget ) )
+ if ( !gtk_widget_get_visible ( widget ) )
gtk_widget_hide ( gsb_form_widget_get_widget ( TRANSACTION_FORM_CHEQUE ) );
widget = gsb_form_widget_get_widget ( TRANSACTION_FORM_CONTRA );
- if ( widget && GTK_WIDGET_VISIBLE ( widget ) )
+ if ( widget && gtk_widget_get_visible ( widget ) )
gsb_payment_method_create_combo_list ( gsb_form_widget_get_widget (
TRANSACTION_FORM_CONTRA ),
GSB_PAYMENT_CREDIT,
@@ -1593,7 +1593,7 @@ gboolean gsb_form_entry_lose_focus ( GtkWidget *entry,
widget = gsb_form_widget_get_widget ( TRANSACTION_FORM_TYPE );
if ( widget
&&
- GTK_WIDGET_SENSITIVE ( widget ) )
+ gtk_widget_get_sensitive ( widget ) )
{
/* change the signe of the method of payment and the contra */
if ( gsb_payment_method_get_combo_sign ( widget ) == GSB_PAYMENT_DEBIT )
@@ -1610,7 +1610,7 @@ gboolean gsb_form_entry_lose_focus ( GtkWidget *entry,
gsb_payment_method_set_payment_position ( widget, payment_number );
widget = gsb_form_widget_get_widget ( TRANSACTION_FORM_CHEQUE );
- if ( widget && GTK_WIDGET_VISIBLE ( widget ) )
+ if ( widget && gtk_widget_get_visible ( widget ) )
{
if ( gsb_form_widget_get_old_credit_payment_content ( ) )
{
@@ -1621,7 +1621,7 @@ gboolean gsb_form_entry_lose_focus ( GtkWidget *entry,
}
widget = gsb_form_widget_get_widget (TRANSACTION_FORM_CONTRA);
- if ( widget && GTK_WIDGET_VISIBLE ( widget ) )
+ if ( widget && gtk_widget_get_visible ( widget ) )
gsb_payment_method_create_combo_list ( gsb_form_widget_get_widget (
TRANSACTION_FORM_CONTRA ),
GSB_PAYMENT_DEBIT,
@@ -1653,7 +1653,7 @@ gboolean gsb_form_entry_lose_focus ( GtkWidget *entry,
* (if grey, it's a child of split so do nothing) */
if ( widget
&&
- GTK_WIDGET_SENSITIVE (widget))
+ gtk_widget_get_sensitive (widget))
{
/* change the signe of the method of payment and the contra */
if ( gsb_payment_method_get_combo_sign (widget) == GSB_PAYMENT_DEBIT)
@@ -1663,11 +1663,11 @@ gboolean gsb_form_entry_lose_focus ( GtkWidget *entry,
account_number, 0, FALSE );
/* if there is no payment method, the last function hide it, but we have
* to hide the cheque element too */
- if ( !GTK_WIDGET_VISIBLE (widget))
+ if ( !gtk_widget_get_visible (widget))
gtk_widget_hide (gsb_form_widget_get_widget (TRANSACTION_FORM_CHEQUE));
widget = gsb_form_widget_get_widget ( TRANSACTION_FORM_CONTRA);
- if ( widget && GTK_WIDGET_VISIBLE ( widget ) )
+ if ( widget && gtk_widget_get_visible ( widget ) )
gsb_payment_method_create_combo_list ( widget,
GSB_PAYMENT_DEBIT,
account_number, 0, TRUE );
@@ -1689,7 +1689,7 @@ gboolean gsb_form_entry_lose_focus ( GtkWidget *entry,
widget = gsb_form_widget_get_widget ( TRANSACTION_FORM_TYPE );
if ( widget
&&
- GTK_WIDGET_SENSITIVE ( widget ) )
+ gtk_widget_get_sensitive ( widget ) )
{
/* change the signe of the method of payment and the contra */
if ( gsb_payment_method_get_combo_sign ( widget ) == GSB_PAYMENT_CREDIT )
@@ -1706,7 +1706,7 @@ gboolean gsb_form_entry_lose_focus ( GtkWidget *entry,
gsb_payment_method_set_payment_position ( widget, payment_number );
widget = gsb_form_widget_get_widget ( TRANSACTION_FORM_CHEQUE );
- if ( widget && GTK_WIDGET_VISIBLE ( widget ) )
+ if ( widget && gtk_widget_get_visible ( widget ) )
{
if ( gsb_form_widget_get_old_debit_payment_content ( ) )
{
@@ -1717,7 +1717,7 @@ gboolean gsb_form_entry_lose_focus ( GtkWidget *entry,
}
widget = gsb_form_widget_get_widget (TRANSACTION_FORM_CONTRA);
- if ( widget && GTK_WIDGET_VISIBLE ( widget ) )
+ if ( widget && gtk_widget_get_visible ( widget ) )
gsb_payment_method_create_combo_list ( gsb_form_widget_get_widget (
TRANSACTION_FORM_CONTRA ),
GSB_PAYMENT_CREDIT,
@@ -1979,7 +1979,7 @@ gboolean gsb_form_button_press_event ( GtkWidget *entry,
if ( widget
&&
- GTK_WIDGET_VISIBLE (widget))
+ gtk_widget_get_visible (widget))
{
gint payment_number;
gint account_number;
@@ -2985,7 +2985,7 @@ gboolean gsb_form_validate_form_transaction ( gint transaction_number,
if ( widget
&&
- GTK_WIDGET_VISIBLE (widget))
+ gtk_widget_get_visible (widget))
{
GtkWidget *combo_box;
gint payment;
@@ -3201,7 +3201,7 @@ void gsb_form_take_datas_from_form ( gint transaction_number,
case TRANSACTION_FORM_TYPE:
/* set the type only if visible */
- if ( GTK_WIDGET_VISIBLE (element -> element_widget))
+ if ( gtk_widget_get_visible (element -> element_widget))
{
GtkWidget *widget_tmp;
gint payment_number;
@@ -3212,7 +3212,7 @@ void gsb_form_take_datas_from_form ( gint transaction_number,
/* set the number of cheque only if visible */
widget_tmp = gsb_form_widget_get_widget (TRANSACTION_FORM_CHEQUE);
- if ( GTK_WIDGET_VISIBLE (widget_tmp)
+ if ( gtk_widget_get_visible (widget_tmp)
&&
!gsb_form_widget_check_empty (widget_tmp))
{
@@ -3237,7 +3237,7 @@ void gsb_form_take_datas_from_form ( gint transaction_number,
case TRANSACTION_FORM_CONTRA:
/* here only for scheduled transaction */
- if (!is_transaction && GTK_WIDGET_VISIBLE (element -> element_widget))
+ if (!is_transaction && gtk_widget_get_visible (element -> element_widget))
gsb_data_scheduled_set_contra_method_of_payment_number ( transaction_number,
gsb_payment_method_get_selected_number (element -> element_widget));
break;
diff --git a/src/gsb_form_scheduler.c b/src/gsb_form_scheduler.c
index 5a18f9b..8d34a97 100644
--- a/src/gsb_form_scheduler.c
+++ b/src/gsb_form_scheduler.c
@@ -381,7 +381,7 @@ GSList *gsb_form_scheduler_get_content_list ( void )
element = tmp_list -> data;
- if (GTK_WIDGET_VISIBLE (element -> element_widget))
+ if (gtk_widget_get_visible (element -> element_widget))
{
content_element *element_save;
@@ -496,7 +496,7 @@ void gsb_form_scheduler_set_content_list ( GSList *content_list )
form_element = form_list -> data;
- if (!GTK_WIDGET_VISIBLE (form_element -> element_widget)
+ if (!gtk_widget_get_visible (form_element -> element_widget)
||
form_element -> element_number != element -> element_number)
{
@@ -1067,7 +1067,7 @@ GDate *gsb_form_scheduler_get_limit_date ( void )
||
gsb_form_widget_check_empty (entry)
||
- !GTK_WIDGET_VISIBLE (entry))
+ !gtk_widget_get_visible (entry))
return NULL;
date = gsb_calendar_entry_get_date (entry);
@@ -1089,7 +1089,7 @@ gboolean gsb_form_scheduler_set_limit_date ( GDate *date )
entry = gsb_form_scheduler_get_element_widget ( SCHEDULED_FORM_LIMIT_DATE );
/* if no entry, go away... */
- if (!entry || !GTK_WIDGET_VISIBLE ( entry ) )
+ if (!entry || !gtk_widget_get_visible ( entry ) )
return FALSE;
if ( !date )
@@ -1145,7 +1145,7 @@ gboolean gsb_form_scheduler_set_frequency_user ( gint user_freq )
/* if no entry, go away... */
if (!entry
||
- !GTK_WIDGET_VISIBLE (entry))
+ !gtk_widget_get_visible (entry))
return FALSE;
string = utils_str_itoa (user_freq);
@@ -1195,7 +1195,7 @@ gboolean gsb_form_scheduler_set_frequency_user_button ( gboolean automatic )
/* if no automatic button, go away... */
if (!button
||
- !GTK_WIDGET_VISIBLE (button))
+ !gtk_widget_get_visible (button))
return FALSE;
return gsb_combo_box_set_index ( button,
diff --git a/src/gsb_form_transaction.c b/src/gsb_form_transaction.c
index a6df3ab..05dc034 100644
--- a/src/gsb_form_transaction.c
+++ b/src/gsb_form_transaction.c
@@ -209,7 +209,7 @@ gboolean gsb_form_transaction_complete_form_by_payee ( const gchar *payee_name )
gsb_payment_method_create_combo_list ( widget, GSB_PAYMENT_CREDIT,
account_number, 0, FALSE );
- if ( GTK_WIDGET_VISIBLE (widget))
+ if ( gtk_widget_get_visible (widget))
{
gint tmp_account;
@@ -558,7 +558,7 @@ gint gsb_form_transaction_validate_transfer ( gint transaction_number,
contra_payment_button = gsb_form_widget_get_widget (TRANSACTION_FORM_CONTRA);
if (contra_payment_button
&&
- GTK_WIDGET_VISIBLE (contra_payment_button))
+ gtk_widget_get_visible (contra_payment_button))
gsb_data_transaction_set_method_of_payment_number ( contra_transaction_number,
gsb_payment_method_get_selected_number (contra_payment_button));
diff --git a/src/gsb_form_widget.c b/src/gsb_form_widget.c
index f257cbf..d9f323e 100644
--- a/src/gsb_form_widget.c
+++ b/src/gsb_form_widget.c
@@ -626,10 +626,10 @@ gboolean gsb_form_widget_can_focus ( gint element_number )
if ( !widget )
return FALSE;
- if ( !GTK_WIDGET_VISIBLE (widget))
+ if ( !gtk_widget_get_visible (widget))
return FALSE;
- if ( !GTK_WIDGET_SENSITIVE (widget))
+ if ( !gtk_widget_get_sensitive (widget))
return FALSE;
if ( !(GTK_IS_COMBOFIX (widget)
@@ -806,7 +806,7 @@ gboolean gsb_form_widget_entry_get_focus ( GtkWidget *entry,
* (if grey, it's a child of split so do nothing) */
if ( widget
&&
- GTK_WIDGET_SENSITIVE ( widget ) )
+ gtk_widget_get_sensitive ( widget ) )
{
/* change the signe of the method of payment and the contra */
if ( gsb_payment_method_get_combo_sign ( widget ) == GSB_PAYMENT_CREDIT )
@@ -814,7 +814,7 @@ gboolean gsb_form_widget_entry_get_focus ( GtkWidget *entry,
old_credit_payment_number = gsb_payment_method_get_selected_number ( widget );
tmp_widget = gsb_form_widget_get_widget ( TRANSACTION_FORM_CHEQUE );
- if ( tmp_widget && GTK_WIDGET_VISIBLE ( tmp_widget ) )
+ if ( tmp_widget && gtk_widget_get_visible ( tmp_widget ) )
{
if ( old_credit_payment_content )
g_free ( old_credit_payment_content );
@@ -830,7 +830,7 @@ gboolean gsb_form_widget_entry_get_focus ( GtkWidget *entry,
account_number, 0, FALSE );
widget = gsb_form_widget_get_widget ( TRANSACTION_FORM_CONTRA );
- if ( widget && GTK_WIDGET_VISIBLE ( widget ) )
+ if ( widget && gtk_widget_get_visible ( widget ) )
gsb_payment_method_create_combo_list ( gsb_form_widget_get_widget (
TRANSACTION_FORM_CONTRA ),
GSB_PAYMENT_CREDIT,
@@ -856,7 +856,7 @@ gboolean gsb_form_widget_entry_get_focus ( GtkWidget *entry,
* (if grey, it's a child of split so do nothing) */
if ( widget
&&
- GTK_WIDGET_SENSITIVE (widget))
+ gtk_widget_get_sensitive (widget))
{
/* change the signe of the method of payment and the contra */
if ( gsb_payment_method_get_combo_sign (widget) == GSB_PAYMENT_DEBIT)
@@ -864,7 +864,7 @@ gboolean gsb_form_widget_entry_get_focus ( GtkWidget *entry,
old_debit_payment_number = gsb_payment_method_get_selected_number ( widget );
tmp_widget = gsb_form_widget_get_widget ( TRANSACTION_FORM_CHEQUE );
- if ( tmp_widget && GTK_WIDGET_VISIBLE ( tmp_widget ) )
+ if ( tmp_widget && gtk_widget_get_visible ( tmp_widget ) )
{
if ( old_debit_payment_content )
g_free ( old_debit_payment_content );
@@ -880,7 +880,7 @@ gboolean gsb_form_widget_entry_get_focus ( GtkWidget *entry,
account_number, 0, FALSE );
widget = gsb_form_widget_get_widget ( TRANSACTION_FORM_CONTRA);
- if ( widget && GTK_WIDGET_VISIBLE ( widget ) )
+ if ( widget && gtk_widget_get_visible ( widget ) )
gsb_payment_method_create_combo_list ( widget,
GSB_PAYMENT_DEBIT,
account_number, 0, TRUE );
@@ -1104,7 +1104,7 @@ gboolean gsb_form_combo_selection_changed ( GtkTreeSelection *tree_selection,
widget = gsb_form_widget_get_widget ( TRANSACTION_FORM_DEVISE );
if ( widget != NULL
&&
- GTK_WIDGET_VISIBLE (
+ gtk_widget_get_visible (
gsb_form_widget_get_widget ( TRANSACTION_FORM_DEVISE) ) )
{
if ( g_str_has_prefix ( tmp_str, _("Transfer : ") ) )
diff --git a/src/gsb_payment_method.c b/src/gsb_payment_method.c
index 79e8c65..4099d95 100644
--- a/src/gsb_payment_method.c
+++ b/src/gsb_payment_method.c
@@ -207,7 +207,7 @@ gint gsb_payment_method_get_selected_number ( GtkWidget *combo_box )
if ( !combo_box
||
- !GTK_WIDGET_VISIBLE (combo_box))
+ !gtk_widget_get_visible (combo_box))
return 0;
model = gtk_combo_box_get_model (GTK_COMBO_BOX (combo_box));
diff --git a/src/gsb_payment_method_config.c b/src/gsb_payment_method_config.c
index 3cc73e0..5bd55ac 100644
--- a/src/gsb_payment_method_config.c
+++ b/src/gsb_payment_method_config.c
@@ -733,7 +733,7 @@ gboolean gsb_payment_method_config_name_changed ( GtkWidget *entry,
GSB_PAYMENT_DEBIT,
account_number, 0, FALSE );
- if (GTK_WIDGET_VISIBLE (widget))
+ if (gtk_widget_get_visible (widget))
{
gsb_payment_method_set_combobox_history ( widget,
gsb_data_account_get_default_debit (account_number), TRUE );
@@ -1298,7 +1298,7 @@ gboolean gsb_payment_method_config_switch_payment ( gint payment_number )
return FALSE;
}
- if (GTK_WIDGET_VISIBLE (combo_box))
+ if (gtk_widget_get_visible (combo_box))
label = gtk_label_new ( _("Some transactions still use that payment method. As deletion of this method is irreversible, these transactions are to be associated with another payment method."));
else
label = gtk_label_new (_("No target method of payment to switch the transactions to another method of payment. If you continue, the transactions with this method of payment will have no new one."));
@@ -1318,7 +1318,7 @@ gboolean gsb_payment_method_config_switch_payment ( gint payment_number )
/* the combo_box was created before */
gtk_box_pack_start ( GTK_BOX ( hbox ), combo_box, TRUE, TRUE, 0 );
- if (GTK_WIDGET_VISIBLE (combo_box))
+ if (gtk_widget_get_visible (combo_box))
gtk_widget_show_all ( hbox );
resultat = gtk_dialog_run ( GTK_DIALOG ( dialog ));
diff --git a/src/gtk_combofix.c b/src/gtk_combofix.c
index 8c36111..b06016e 100644
--- a/src/gtk_combofix.c
+++ b/src/gtk_combofix.c
@@ -297,7 +297,7 @@ gboolean gtk_combofix_hide_popup ( GtkComboFix *combofix )
g_return_val_if_fail ( combofix != NULL, FALSE );
g_return_val_if_fail ( GTK_IS_COMBOFIX ( combofix ), FALSE );
- if ( GTK_WIDGET_VISIBLE ( priv -> popup ))
+ if ( gtk_widget_get_visible ( priv -> popup ))
{
gtk_grab_remove ( priv -> popup );
gdk_pointer_ungrab ( GDK_CURRENT_TIME );
@@ -318,7 +318,7 @@ gboolean gtk_combofix_show_popup ( GtkComboFix *combofix )
{
GtkComboFixPrivate *priv = combofix -> priv;
- if ( GTK_WIDGET_VISIBLE ( priv -> popup ) )
+ if ( gtk_widget_get_visible ( priv -> popup ) )
return FALSE;
g_signal_handlers_block_by_func ( G_OBJECT ( combofix -> entry ),
@@ -1481,7 +1481,7 @@ static gboolean gtk_combofix_key_press_event ( GtkWidget *entry,
case GDK_KP_Enter :
case GDK_Return :
/* we get the current selection */
- if ( GTK_WIDGET_VISIBLE ( priv -> popup )
+ if ( gtk_widget_get_visible ( priv -> popup )
&&
strlen ( gtk_entry_get_text ( GTK_ENTRY ( combofix -> entry ) ) ) == 0 )
{
@@ -1498,7 +1498,7 @@ static gboolean gtk_combofix_key_press_event ( GtkWidget *entry,
break;
case GDK_Escape:
- if ( GTK_WIDGET_VISIBLE ( priv -> popup ))
+ if ( gtk_widget_get_visible ( priv -> popup ))
{
gtk_combofix_hide_popup ( combofix );
gtk_combofix_set_text ( combofix, priv -> old_entry );
@@ -1510,7 +1510,7 @@ static gboolean gtk_combofix_key_press_event ( GtkWidget *entry,
case GDK_Down :
case GDK_KP_Down :
/* show the popup if necessary */
- if ( !GTK_WIDGET_VISIBLE ( priv -> popup ) )
+ if ( !gtk_widget_get_visible ( priv -> popup ) )
gtk_combofix_show_popup ( combofix );
gtk_combofix_move_selection ( combofix, COMBOFIX_DOWN );
@@ -1522,7 +1522,7 @@ static gboolean gtk_combofix_key_press_event ( GtkWidget *entry,
case GDK_KP_Up :
/* move the selection up in the combofix only if the popup is showed,
* else let the program works with the upper key */
- if (GTK_WIDGET_VISIBLE ( priv -> popup))
+ if (gtk_widget_get_visible ( priv -> popup))
{
gtk_combofix_move_selection ( combofix, COMBOFIX_UP );
gtk_combofix_choose_selection ( combofix );
@@ -1533,7 +1533,7 @@ static gboolean gtk_combofix_key_press_event ( GtkWidget *entry,
case GDK_Page_Up :
case GDK_KP_Page_Up :
/* show the popup if necessary */
- if ( !GTK_WIDGET_VISIBLE ( priv -> popup ) )
+ if ( !gtk_widget_get_visible ( priv -> popup ) )
gtk_combofix_show_popup ( combofix );
gtk_combofix_move_selection ( combofix, COMBOFIX_PAGE_UP );
@@ -1544,7 +1544,7 @@ static gboolean gtk_combofix_key_press_event ( GtkWidget *entry,
case GDK_Page_Down :
case GDK_KP_Page_Down :
/* show the popup if necessary */
- if ( !GTK_WIDGET_VISIBLE ( priv -> popup ) )
+ if ( !gtk_widget_get_visible ( priv -> popup ) )
gtk_combofix_show_popup ( combofix );
gtk_combofix_move_selection ( combofix, COMBOFIX_PAGE_DOWN );
diff --git a/src/import.c b/src/import.c
index 4256aeb..510303b 100644
--- a/src/import.c
+++ b/src/import.c
@@ -1276,7 +1276,7 @@ GtkWidget *cree_ligne_recapitulatif ( struct struct_compte_importation * compte
radio_add_account = gtk_radio_button_new_with_label_from_widget ( GTK_RADIO_BUTTON ( radiogroup ),
_("Add transactions to an account") );
gtk_box_pack_start ( GTK_BOX ( vbox ), radio_add_account, FALSE, FALSE, 0 );
- if (radio_add_account && GTK_WIDGET_VISIBLE (radio_add_account))
+ if (radio_add_account && gtk_widget_get_visible (radio_add_account))
gtk_widget_set_sensitive ( radio_add_account, assert_account_loaded ( ) );
compte -> hbox2 = gtk_hbox_new ( FALSE, 6 );
@@ -1469,17 +1469,17 @@ gboolean import_account_action_activated ( GtkWidget * radio, gint action )
account = g_object_get_data ( G_OBJECT ( radio ), "account" );
- if (account -> hbox1 && GTK_WIDGET_VISIBLE (account -> hbox1))
+ if (account -> hbox1 && gtk_widget_get_visible (account -> hbox1))
gtk_widget_set_sensitive ( account -> hbox1, FALSE );
- if (account -> hbox2 && GTK_WIDGET_VISIBLE (account -> hbox2))
+ if (account -> hbox2 && gtk_widget_get_visible (account -> hbox2))
gtk_widget_set_sensitive ( account -> hbox2, FALSE );
- if (account -> hbox3 && GTK_WIDGET_VISIBLE (account -> hbox3))
+ if (account -> hbox3 && gtk_widget_get_visible (account -> hbox3))
gtk_widget_set_sensitive ( account -> hbox3, FALSE );
gtk_widget_set_sensitive ( g_object_get_data ( G_OBJECT ( radio ), "associated" ), TRUE );
account -> action = action;
- if ( account -> hbox_rule && GTK_WIDGET_VISIBLE (account -> hbox_rule) )
+ if ( account -> hbox_rule && gtk_widget_get_visible (account -> hbox_rule) )
gtk_widget_set_sensitive ( account -> hbox_rule, action != IMPORT_CREATE_ACCOUNT );
return FALSE;
}
diff --git a/src/main.c b/src/main.c
index 151ee35..8662653 100644
--- a/src/main.c
+++ b/src/main.c
@@ -512,6 +512,7 @@ GtkWidget *gsb_main_create_main_window ( void )
G_CALLBACK (gsb_grisbi_change_state_window),
NULL );
gtk_window_set_policy ( GTK_WINDOW ( main_window ), TRUE, TRUE, FALSE );
+/* gtk_window_set_resizable ( GTK_WINDOW ( main_window ), TRUE ); */
/* create the main window : a vbox */
vbox = gtk_vbox_new ( FALSE, 0 );
diff --git a/src/navigation.c b/src/navigation.c
index f4ec76c..054366c 100644
--- a/src/navigation.c
+++ b/src/navigation.c
@@ -357,8 +357,8 @@ GtkWidget *gsb_gui_navigation_create_navigation_pane ( void )
GINT_TO_POINTER ( 1 ) );
gtk_widget_show_all ( vbox );
- gtk_widget_hide_all ( scheduler_calendar );
- gtk_widget_hide_all ( reconcile_panel );
+ gtk_widget_hide ( scheduler_calendar );
+ gtk_widget_hide ( reconcile_panel );
return vbox;
}
@@ -1126,7 +1126,7 @@ gboolean gsb_gui_navigation_select_line ( GtkTreeSelection *selection,
if ( page_number != GSB_SCHEDULER_PAGE )
{
- gtk_widget_hide_all ( scheduler_calendar );
+ gtk_widget_hide ( scheduler_calendar );
}
switch ( page_number )
hooks/post-receive
--
grisbi
More information about the cvs
mailing list