[grisbi-cvs] [SCM] grisbi branch, master, updated. upstream_version_0_9_5-109-g021e839

Pierre Biava nobody at users.sourceforge.net
Sat Aug 18 08:29:02 CEST 2012


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, master has been updated
       via  021e83916548a3295687087cf011535cb46ccff5 (commit)
       via  3a64696fde798da9daad4274cac2d824b8776649 (commit)
       via  4673b25e63f33141f61114e037497e4d46055923 (commit)
       via  e54df36c3fbbf37f939b996609d01899e277a45b (commit)
      from  2e41895443cd744bc1d13389b107d11bc269c735 (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 021e83916548a3295687087cf011535cb46ccff5
Author: pbiava <pierre.biava at nerim.net>
Date:   Sat Aug 18 08:04:41 2012 +0200

    Adding the payment method for principal transaction in the module of management credit cards.

commit 3a64696fde798da9daad4274cac2d824b8776649
Author: pbiava <pierre.biava at nerim.net>
Date:   Sat Aug 11 12:23:34 2012 +0200

    deleting obsolete g_strncasecmp function ()

commit 4673b25e63f33141f61114e037497e4d46055923
Author: pbiava <pierre.biava at nerim.net>
Date:   Tue Jul 17 08:02:06 2012 +0200

    fixes some warnings with gcc-4.6

commit e54df36c3fbbf37f939b996609d01899e277a45b
Author: pbiava <pierre.biava at nerim.net>
Date:   Sun Jul 15 20:07:08 2012 +0200

    fixes bug 1504

-----------------------------------------------------------------------

Changes:
diff --git a/configure.in b/configure.in
index 4dc79ab..08c99d2 100644
--- a/configure.in
+++ b/configure.in
@@ -224,7 +224,7 @@ AC_ARG_ENABLE(werror,
  	enable_werror=no)
 if test "x$enable_werror" = xyes ; then
 	if test "x$GCC" = "xyes" ; then
-		CFLAGS="$CFLAGS -ansi -Wall -Wunused -Wno-unused-parameter -Wno-unused-function"
+		CFLAGS="$CFLAGS -ansi -Wall -Wno-unused-but-set-variable -Wno-unused-parameter -Wno-unused-function"
 		AC_MSG_WARN([Wall and Wunused flags are enabled])
 	else
 		AC_MSG_WARN([Wall and Wunused can be enabled only with gcc])
@@ -362,7 +362,7 @@ echo "
                 Build with libxml2:        $build_libxml2
                 Build with OpenSSL:        $build_openssl
                 Build with OFX plugin:     $build_ofx
-                Build with goffice:         $build_goffice
+                Build with goffice:        $build_goffice
                 Build plugins statically:  $enable_static
                 Build gtk_mac_integration: $os_osx
                 CUnit/unit tests support:  $build_cunit
diff --git a/src/accueil.c b/src/accueil.c
index 9904d8c..8baa563 100644
--- a/src/accueil.c
+++ b/src/accueil.c
@@ -413,7 +413,7 @@ void update_liste_comptes_accueil ( gboolean force )
         }
         list_tmp = list_tmp -> next;
     }
-    
+
     list_tmp = gsb_data_partial_balance_get_list ( );
     if ( list_tmp )
     {
@@ -451,7 +451,7 @@ void update_liste_comptes_accueil ( gboolean force )
         currency_number = gsb_data_currency_get_no_currency (devise -> data);
 
         if ( !gsb_main_page_get_devise_is_used ( currency_number, GSB_TYPE_BANK )
-            && 
+            &&
             !gsb_main_page_get_devise_is_used ( currency_number, GSB_TYPE_CASH ) )
             continue;
 
@@ -517,7 +517,7 @@ void update_liste_comptes_accueil ( gboolean force )
 
         /* Création et remplissage de la (nb_comptes + 3)ième ligne du tableau :
            elle contient la somme des soldes de chaque compte */
-        affiche_solde_des_comptes ( pTable, i, nb_comptes_bancaires, currency_number, 
+        affiche_solde_des_comptes ( pTable, i, nb_comptes_bancaires, currency_number,
                             solde_global_courant, solde_global_pointe );
 
         gtk_widget_show_all ( paddingbox );
@@ -597,7 +597,7 @@ void update_liste_comptes_accueil ( gboolean force )
 
         /* Création et remplissage de la (nb_comptes + 3)ième ligne du tableau :
            elle contient la somme des soldes de chaque compte */
-        affiche_solde_des_comptes ( pTable, i, nb_comptes_passif, currency_number, 
+        affiche_solde_des_comptes ( pTable, i, nb_comptes_passif, currency_number,
                             solde_global_courant, solde_global_pointe );
 
         gtk_widget_show_all ( paddingbox );
@@ -679,7 +679,7 @@ void update_liste_comptes_accueil ( gboolean force )
 
         /* Création et remplissage de la (nb_comptes + 3)ième ligne du tableau :
            elle contient la somme des soldes de chaque compte */
-        affiche_solde_des_comptes ( pTable, i, nb_comptes_actif, currency_number, 
+        affiche_solde_des_comptes ( pTable, i, nb_comptes_actif, currency_number,
                             solde_global_courant, solde_global_pointe );
         gtk_widget_show_all ( paddingbox );
         gtk_widget_show_all ( pTable );
@@ -721,7 +721,7 @@ void update_liste_comptes_accueil ( gboolean force )
  * teste si au moins 1 compte utilise la devise passée en paramètre.
  *
  * \param currency_number
- * 
+ *
  * \return TRUE si un compte utilise la devise FALSE sinon;
  * */
 gboolean gsb_main_page_get_devise_is_used ( gint currency_number, gint type_compte )
@@ -738,7 +738,7 @@ gboolean gsb_main_page_get_devise_is_used ( gint currency_number, gint type_comp
 
         if ( gsb_data_account_get_currency ( i ) == currency_number
          &&
-         !gsb_data_account_get_closed_account ( i ) 
+         !gsb_data_account_get_closed_account ( i )
          &&
          gsb_data_account_get_kind ( i ) == type_compte )
         return TRUE;
@@ -751,8 +751,8 @@ gboolean gsb_main_page_get_devise_is_used ( gint currency_number, gint type_comp
 
 
 /**
- * 
- * 
+ *
+ *
  * \return style_label
  * */
 GtkStyle *gsb_main_page_get_default_label_style ( )
@@ -775,7 +775,7 @@ GtkStyle *gsb_main_page_get_default_label_style ( )
 
 /**
  * Crée la table et sa première ligne
- * 
+ *
  * \return table
  * */
 GtkWidget *gsb_main_page_get_table_for_accounts ( gint nb_lignes, gint nb_col )
@@ -804,7 +804,7 @@ GtkWidget *gsb_main_page_get_table_for_accounts ( gint nb_lignes, gint nb_col )
 }
 /**
  * Affiche une ligne pour le compte donné en paramètre
- * 
+ *
  * \param table
  * \param account number
  * \param ligne dans la table
@@ -974,7 +974,7 @@ void gsb_main_page_affiche_ligne_du_compte ( GtkWidget *pTable,
 
 
 /**
- * Création de ou des lignes de solde partiels 
+ * Création de ou des lignes de solde partiels
  *
  * */
 gint affiche_soldes_partiels ( GtkWidget *table,
@@ -985,7 +985,7 @@ gint affiche_soldes_partiels ( GtkWidget *table,
                         gint type_compte )
 {
     GtkWidget *label;
-    gchar *tmpstr;
+    gchar *tmp_str;
     gint nbre_lignes = 0;
     gboolean concerne = FALSE;
 
@@ -1014,15 +1014,18 @@ gint affiche_soldes_partiels ( GtkWidget *table,
                 nbre_lignes ++;
 
                 /* On met les titres du sous ensemble solde(s) partiel(s) */
+				label = gtk_label_new ( NULL );
                 if ( nb_comptes == 1 )
-                    label = gtk_label_new ( _("Partial balance: ") );
+                    tmp_str = g_strconcat ("<span weight=\"bold\">", _("Partial balance: "), "</span>", NULL );
                 else
-                    label = gtk_label_new ( _("Partial balances: ") );
-                gtk_misc_set_alignment ( GTK_MISC ( label ), MISC_LEFT, MISC_VERT_CENTER );
+				    tmp_str = g_strconcat ("<span weight=\"bold\">", _("Partial balances: "), "</span>", NULL );
+				gtk_label_set_markup ( GTK_LABEL ( label ), tmp_str );
+				g_free ( tmp_str );
+				gtk_misc_set_alignment ( GTK_MISC ( label ), MISC_LEFT, MISC_VERT_CENTER );
                 gtk_size_group_add_widget ( GTK_SIZE_GROUP ( size_group_accueil ), label );
                 gtk_table_attach_defaults ( GTK_TABLE ( table ), label, 0, 1, i, i+1 );
                 gtk_widget_show ( label );
-                    label = gtk_label_new (_("Reconciled balance"));
+                label = gtk_label_new (_("Reconciled balance"));
                 gtk_misc_set_alignment ( GTK_MISC ( label ), MISC_RIGHT, MISC_VERT_CENTER );
                 gtk_table_attach_defaults ( GTK_TABLE ( table ), label, 1, 2, i, i+1 );
                 gtk_widget_show ( label );
@@ -1035,29 +1038,29 @@ gint affiche_soldes_partiels ( GtkWidget *table,
                 concerne = TRUE;
             }
             /* Première colonne : elle contient le nom du solde partiel */
-            tmpstr = g_strconcat ( gsb_data_partial_balance_get_name ( partial_number ),
+            tmp_str = g_strconcat ( gsb_data_partial_balance_get_name ( partial_number ),
                             " : ", NULL );
-            label = gtk_label_new ( tmpstr );
-            g_free ( tmpstr );
+            label = gtk_label_new ( tmp_str );
+            g_free ( tmp_str );
             gtk_misc_set_alignment ( GTK_MISC ( label ), MISC_LEFT, MISC_VERT_CENTER );
             gtk_size_group_add_widget ( GTK_SIZE_GROUP ( size_group_accueil ), label );
             gtk_table_attach_defaults ( GTK_TABLE ( table ), label, 0, 1, i, i+1 );
             gtk_widget_show ( label );
 
             /* Deuxième colonne : elle contient le solde pointé du solde partiel */
-            tmpstr = gsb_data_partial_balance_get_marked_balance ( partial_number );
-            label = gtk_label_new ( tmpstr );
-            gtk_label_set_markup ( GTK_LABEL ( label ), tmpstr );
-            g_free ( tmpstr );
+            tmp_str = gsb_data_partial_balance_get_marked_balance ( partial_number );
+            label = gtk_label_new ( tmp_str );
+            gtk_label_set_markup ( GTK_LABEL ( label ), tmp_str );
+            g_free ( tmp_str );
             gtk_misc_set_alignment ( GTK_MISC ( label ), MISC_RIGHT, MISC_VERT_CENTER );
             gtk_table_attach_defaults ( GTK_TABLE ( table ), label, 1, 2, i, i+1 );
             gtk_widget_show ( label );
 
             /* Troisième colonne : elle contient le solde courant du solde partiel */
-            tmpstr = gsb_data_partial_balance_get_current_balance ( partial_number );
+            tmp_str = gsb_data_partial_balance_get_current_balance ( partial_number );
             label = gtk_label_new ( NULL );
-            gtk_label_set_markup ( GTK_LABEL ( label ), tmpstr );
-            g_free ( tmpstr );
+            gtk_label_set_markup ( GTK_LABEL ( label ), tmp_str );
+            g_free ( tmp_str );
             gtk_misc_set_alignment ( GTK_MISC ( label ), MISC_RIGHT, MISC_VERT_CENTER );
             gtk_table_attach_defaults ( GTK_TABLE ( table ), label, 2, 3, i, i+1 );
             gtk_widget_show ( label );
@@ -1073,7 +1076,7 @@ gint affiche_soldes_partiels ( GtkWidget *table,
 
 
 /**
- * Création de la ligne de solde des comptes 
+ * Création de la ligne de solde des comptes
  *
  * */
 void affiche_solde_des_comptes ( GtkWidget *table,
@@ -1216,7 +1219,7 @@ gboolean gsb_main_page_click_on_account ( gint *account_number )
 
 
 /**
- * 
+ *
  *
  *
  *
@@ -1486,7 +1489,7 @@ void update_liste_echeances_auto_accueil ( gboolean force )
 /**
  * Fonction update_soldes_minimaux
  * vérifie les soldes de tous les comptes, affiche un message d'alerte si nécessaire
- * 
+ *
  *
  *
  *
@@ -2000,7 +2003,7 @@ GtkWidget *onglet_accueil (void)
     gtk_box_pack_start ( GTK_BOX ( hbox ), button, FALSE, FALSE, 0 );
 
     /* Data partial balance settings */
-    paddingbox = new_paddingbox_with_title (vbox, FALSE, 
+    paddingbox = new_paddingbox_with_title (vbox, FALSE,
                         _("Balances partials of the list of accounts") );
 
     hbox = gtk_hbox_new ( FALSE, 5 );
diff --git a/src/bet_data.c b/src/bet_data.c
index 886dd60..9d19f01 100644
--- a/src/bet_data.c
+++ b/src/bet_data.c
@@ -915,7 +915,7 @@ GPtrArray *bet_data_get_strings_to_save ( void )
 
         tmp_str = g_markup_printf_escaped ( "\t<Bet_transfert Nb=\"%d\" Dt=\"%s\" Ac=\"%d\" "
                         "Ty=\"%d\" Ra=\"%d\" Rt=\"%d\" Dd=\"%d\" Dtb=\"%s\" "
-                        "Pa=\"%d\" Ca=\"%d\" Sca=\"%d\" Bu=\"%d\" Sbu=\"%d\" "
+                        "Pa=\"%d\" Pn=\"%d\" Ca=\"%d\" Sca=\"%d\" Bu=\"%d\" Sbu=\"%d\" "
                         "CPa=\"%d\" CCa=\"%d\" CSca=\"%d\" CBu=\"%d\" CSbu=\"%d\" />\n",
                         ++index,
                         my_safe_null_str ( date ),
@@ -926,6 +926,7 @@ GPtrArray *bet_data_get_strings_to_save ( void )
                         transfert->direct_debit,
                         my_safe_null_str ( date_bascule ),
                         transfert->main_payee_number,
+                        transfert->main_payment_number,
                         transfert->main_category_number,
                         transfert->main_sub_category_number,
                         transfert->main_budgetary_number,
diff --git a/src/bet_data.h b/src/bet_data.h
index 5ff4fe9..1f6f2fa 100644
--- a/src/bet_data.h
+++ b/src/bet_data.h
@@ -82,7 +82,8 @@ struct _transfert_data
     gint direct_debit;              /* si = 1 création de la transaction dans le compte principal */
     GDate *date;                    /* dare de l'opération du compte principal */
     GDate *date_bascule;            /* date de début de nouveau de mois dans le compte à débit différé */
-    gint main_payee_number;              /* tiers de l'opération du compte principal */
+    gint main_payee_number;         /* tiers de l'opération du compte principal */
+    gint main_payment_number;       /* moyen de payement de l'opération du compte principal */
     gint main_category_number;      /* catégorie de l'opération du compte principal */
     gint main_sub_category_number;  /* sous-catégorie de l'opération du compte principal */
     gint main_budgetary_number;     /* IB de l'opération du compte principal */
diff --git a/src/bet_future.c b/src/bet_future.c
index 76f7651..a9fb972 100644
--- a/src/bet_future.c
+++ b/src/bet_future.c
@@ -1333,6 +1333,32 @@ static gboolean bet_future_get_payee_data ( GtkWidget *widget,
 
 
 /**
+ * récupère le moyen de payement
+ *
+ *
+ * \return FALSE
+ * */
+static gboolean bet_future_get_payment_data ( GtkWidget *widget,
+                        gpointer *value )
+{
+    gint payment_number;
+    struct_transfert_data *sd = (struct_transfert_data *) value;
+
+    payment_number = gsb_payment_method_get_selected_number ( widget );
+    if ( payment_number > 0 )
+    {
+        sd->main_payment_number = payment_number;
+    }
+    else
+    {
+        sd->main_payee_number = gsb_data_account_get_default_debit ( sd->account_number );
+    }
+
+    return FALSE;
+}
+
+
+/**
  * récupère la catégorie et la sous catégorie
  *
  *
@@ -2180,7 +2206,7 @@ static GtkWidget *bet_transfert_create_dialog ( gint account_number )
     gtk_box_pack_start ( GTK_BOX ( hbox ), date_entry, FALSE, FALSE, 0 );
 
     /* boite verticale pour rendre actif ou non les champs ci-dessous */
-    vbox = gtk_vbox_new ( FALSE, 0 );
+    vbox = gtk_vbox_new ( FALSE, 5 );
     g_object_set_data ( G_OBJECT ( dialog ), "bet_transfert_main_vbox_data", vbox );
 
     /* check button Automatic creation of the direct debit transaction */
@@ -2242,6 +2268,18 @@ static GtkWidget *bet_transfert_create_dialog ( gint account_number )
                         G_CALLBACK ( bet_transfert_entry_lose_focus ),
                         GINT_TO_POINTER ( TRANSACTION_FORM_PARTY ) );
 
+    /* Création du mode de payement */
+    combo = gtk_combo_box_new ();
+    gsb_payment_method_create_combo_list ( combo,
+                        GSB_PAYMENT_DEBIT,
+                        account_number, 0, FALSE );
+    gtk_combo_box_set_active ( GTK_COMBO_BOX ( combo ), 0 );
+    gtk_widget_set_tooltip_text ( GTK_WIDGET ( combo ),
+                        _("Choose the method of payment") );
+    g_object_set_data ( G_OBJECT ( dialog ), "bet_transfert_main_payment_combo", combo );
+
+    gtk_box_pack_start ( GTK_BOX ( hbox ), combo, FALSE, FALSE, 0 );
+    
     /* saisie des (sous)catégories et (sous)IB */
     hbox = gtk_hbox_new ( FALSE, 5 );
     gtk_box_pack_start ( GTK_BOX ( vbox ), hbox, FALSE, TRUE, 0 );
@@ -2409,6 +2447,9 @@ static gboolean bet_transfert_take_data (  struct_transfert_data *transfert,
                 empty = FALSE;
         }
 
+        widget = g_object_get_data ( G_OBJECT ( dialog ), "bet_transfert_main_payment_combo" );
+        bet_future_get_payment_data ( widget, ( gpointer ) transfert );
+
         widget = g_object_get_data ( G_OBJECT ( dialog ), "bet_transfert_main_category_combo" );
         if ( gsb_form_widget_check_empty( widget ) == FALSE )
         {
@@ -2587,6 +2628,9 @@ static gboolean bet_transfert_set_form_data_from_line ( gint account_number,
         gsb_form_widget_set_empty ( GTK_COMBOFIX ( widget ) -> entry, TRUE );
     }
 
+    widget = g_object_get_data ( G_OBJECT ( bet_transfert_dialog ), "bet_transfert_main_payment_combo" );
+    gsb_payment_method_set_payment_position ( widget, transfert->main_payment_number );
+
     widget = g_object_get_data ( G_OBJECT ( bet_transfert_dialog ), "bet_transfert_main_category_combo" );
     if ( transfert->main_category_number > 0 )
     {
diff --git a/src/bet_graph.c b/src/bet_graph.c
index 5560896..2269f1a 100644
--- a/src/bet_graph.c
+++ b/src/bet_graph.c
@@ -708,7 +708,7 @@ gboolean bet_graph_populate_lines_by_forecast_data ( struct_bet_graph_data *self
 {
     GtkTreeModel *model = NULL;
     GtkTreeIter iter;
-    gdouble prev_montant;
+    gdouble prev_montant = 0.0;
 
     model = gtk_tree_view_get_model ( GTK_TREE_VIEW ( self -> tree_view ) );
     if ( model == NULL )
@@ -722,10 +722,10 @@ gboolean bet_graph_populate_lines_by_forecast_data ( struct_bet_graph_data *self
         gdouble montant = 0.;
         GDate *first_date;
         GDate *last_date;
-        GDate *date_courante;
-        GDateDay day_courant;
-        GDateMonth month_courant;
-        gint nbre_iterations;
+        GDate *date_courante = NULL;
+        GDateDay day_courant = G_DATE_BAD_DAY;
+        GDateMonth month_courant = G_DATE_BAD_MONTH;
+        gint nbre_iterations = 0;
 
         tab_libelle_axe_x = &libelle_axe_x;
 
@@ -1068,7 +1068,7 @@ gboolean bet_graph_popup_choix_graph_menu ( GtkWidget *button,
     menu = gtk_menu_new ();
 
     tmp_list = liste;
-    
+
     while (tmp_list)
     {
         struct_bet_graph_button *self;
@@ -1116,7 +1116,7 @@ void bet_graph_popup_choix_graph_activate ( GtkMenuItem *menuitem,
 
     parent = gtk_widget_get_parent ( self->box );
     tmp_list = g_object_get_data ( G_OBJECT ( parent ), "button_list" );
-    
+
     while ( tmp_list )
     {
         struct_bet_graph_button *self;
diff --git a/src/gsb_file_load.c b/src/gsb_file_load.c
index bdce5d2..367d57e 100644
--- a/src/gsb_file_load.c
+++ b/src/gsb_file_load.c
@@ -4266,6 +4266,13 @@ void gsb_file_load_bet_transfert_part ( const gchar **attribute_names,
         continue;
     }
 
+    if ( !strcmp ( attribute_names[i], "Pn" ) )
+    {
+        transfert->main_payment_number = utils_str_atoi ( attribute_values[i] );
+        i++;
+        continue;
+    }
+
     if ( !strcmp ( attribute_names[i], "Ca" ) )
     {
         transfert->main_category_number = utils_str_atoi ( attribute_values[i] );
diff --git a/src/gtk_combofix.c b/src/gtk_combofix.c
index 8c36111..cda0c5b 100644
--- a/src/gtk_combofix.c
+++ b/src/gtk_combofix.c
@@ -35,7 +35,7 @@
 #include "gtk_combofix.h"
 /*END_INCLUDE*/
 
- 
+
 G_DEFINE_TYPE ( GtkComboFix, gtk_combofix, GTK_TYPE_HBOX );
 
 #define GTK_COMBOFIX_GET_PRIVATE(obj) (G_TYPE_INSTANCE_GET_PRIVATE ((obj), GTK_TYPE_COMBOFIX, GtkComboFixPrivate))
@@ -186,7 +186,7 @@ enum combofix_key_direction {
 GtkWidget *gtk_combofix_new ( GSList *list )
 {
     GtkComboFix *combofix = g_object_new ( GTK_TYPE_COMBOFIX, NULL );
- 
+
     gtk_combofix_set_list (combofix, list);
 
     return ( GTK_WIDGET ( combofix ) );
@@ -543,14 +543,14 @@ void gtk_combofix_remove_text ( GtkComboFix *combofix, const gchar *text )
 
         valid = gtk_tree_model_iter_next ( GTK_TREE_MODEL ( priv -> store ), &iter );
     }
-    
+
     if ( valid )
         gtk_tree_store_remove ( priv -> store, &iter );
 }
 
 
 /**
-* 
+*
 *
 * \param combofix text
 *
@@ -1145,9 +1145,19 @@ static gchar *gtk_combofix_update_visible_rows ( GtkComboFix *combofix,
                             MIN ( length, model_string_length ) );
             }
             else
-                show_row = !g_strncasecmp ( model_string,
-                            string,
-                            MIN ( length, model_string_length ) );
+			{
+				gchar *tmp_str1;
+				gchar *tmp_str2;
+				gint len;
+
+				len = MIN ( length, model_string_length );
+				tmp_str1 = g_utf8_casefold ( model_string, len );
+				tmp_str2 = g_utf8_casefold ( string, len );
+                show_row = !g_utf8_collate ( tmp_str1,tmp_str2 );
+
+				g_free ( tmp_str1 );
+				g_free ( tmp_str2 );
+			}
 
             if ( show_row )
             {
@@ -1169,7 +1179,7 @@ static gchar *gtk_combofix_update_visible_rows ( GtkComboFix *combofix,
 
         /* increment the path :
          * 	go to see the children only if the mother is showed */
-        
+
         if ( gtk_tree_model_iter_has_child ( model, &iter )
              &&
              show_row )
@@ -1406,7 +1416,7 @@ static gboolean gtk_combofix_focus_out ( GtkWidget *entry,
 
 /**
  * called when the entry receive a focus in event
- * 
+ *
  *
  * \param entry
  * \param ev
@@ -1767,14 +1777,14 @@ static gboolean gtk_combofix_select_item ( GtkComboFix *combofix,
         tmp_item = g_strndup ( item, ( ptr - item ) -1 );
     else
         tmp_item = g_strdup ( item );
-        
+
     model = GTK_TREE_MODEL ( priv -> model_sort );
     result = gtk_tree_model_get_iter_first ( model, &iter );
 
     while ( result )
     {
         gchar *tmp_str;
-        
+
         gtk_tree_model_get ( model, &iter, COMBOFIX_COL_REAL_STRING, &tmp_str, -1 );
 
         if ( tmp_str
@@ -2074,7 +2084,7 @@ void gtk_combofix_dialog ( gchar *text, gchar *hint )
                         "<span size=\"larger\" weight=\"bold\">%s</span>\n\n", hint ),
                         text, NULL );
 
-    dialog = gtk_message_dialog_new ( NULL, 
+    dialog = gtk_message_dialog_new ( NULL,
                         GTK_DIALOG_DESTROY_WITH_PARENT,
                         GTK_MESSAGE_WARNING, GTK_BUTTONS_CLOSE,
                         "%s", tmp_str );
@@ -2135,7 +2145,7 @@ gboolean gtk_combofix_search_for_text (GtkTreeModel *model,
  * \param sort_model
  * \param iter
  *
- * \return 
+ * \return
  */
 gchar *gtk_combofix_get_first_string_from_sort_model ( GtkTreeModel *sort_model,
                         const gchar *string )


hooks/post-receive
-- 
grisbi


More information about the cvs mailing list