[grisbi-cvs] [SCM] grisbi branch, master, updated. upstream_version_0_7_4-84-g9259f47
Pierre Biava
nobody at users.sourceforge.net
Thu Nov 18 17:46:59 CET 2010
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 9259f47f8d043d38438a7c53ab7a9eab70e464d6 (commit)
via 3d9837d811d814cca18e452bad6453bc9a9a87c6 (commit)
via 12c4e23fa1915a34eee7b7b1f8dca7e22cb16b0a (commit)
from 5283f8c863b089a293f9691538dda49ae31f59bc (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 9259f47f8d043d38438a7c53ab7a9eab70e464d6
Author: pbiava <pierre.biava at nerim.net>
Date: Thu Nov 18 17:44:56 2010 +0100
fixes a bug of updating of the list of associations for the import of transactions
commit 3d9837d811d814cca18e452bad6453bc9a9a87c6
Author: pbiava <pierre.biava at nerim.net>
Date: Wed Nov 17 20:01:12 2010 +0100
Updated contributors and adding sending mail to these contributors
commit 12c4e23fa1915a34eee7b7b1f8dca7e22cb16b0a
Author: pbiava <pierre.biava at nerim.net>
Date: Sun Nov 14 07:12:33 2010 +0100
change logo of Grisbi
-----------------------------------------------------------------------
Changes:
diff --git a/src/gsb_assistant.c b/src/gsb_assistant.c
index 0a1d8f7..8c9e624 100644
--- a/src/gsb_assistant.c
+++ b/src/gsb_assistant.c
@@ -108,7 +108,7 @@ GtkWidget * gsb_assistant_new ( const gchar * title, const gchar * explanation,
gtk_box_pack_start ( GTK_BOX(hbox), label, TRUE, TRUE, 0 );
if (!image_filename)
- image_filename = "grisbi-logo.png";
+ image_filename = "grisbi.png";
tmpstr = g_build_filename ( GRISBI_PIXMAPS_DIR, image_filename, NULL);
image = gtk_image_new_from_file ( tmpstr );
diff --git a/src/gsb_assistant_file.c b/src/gsb_assistant_file.c
index ff25806..a21aad4 100644
--- a/src/gsb_assistant_file.c
+++ b/src/gsb_assistant_file.c
@@ -147,7 +147,7 @@ GtkResponseType gsb_assistant_file_run ( gboolean first_opening,
}
assistant = gsb_assistant_new (text_1, text_2,
- "grisbi-logo.png", NULL);
+ "grisbi.png", NULL);
gsb_assistant_add_page ( assistant,
gsb_assistant_file_page_2 (assistant),
diff --git a/src/gsb_assistant_first.c b/src/gsb_assistant_first.c
index bc5e323..330f25d 100644
--- a/src/gsb_assistant_first.c
+++ b/src/gsb_assistant_first.c
@@ -84,7 +84,7 @@ GtkResponseType gsb_assistant_first_run ( void )
"You can change any option later in the configuration window, "
"where many other options are available.\n\n"
"Thanks for using Grisbi, enjoy!" ),
- "grisbi-logo.png",
+ "grisbi.png",
NULL );
gsb_assistant_add_page ( assistant,
gsb_assistant_first_page_2 (assistant),
@@ -149,7 +149,7 @@ GtkResponseType gsb_assistant_first_come_to_0_6 ( void )
"If you want to make backups of your Grisbi file in case you want to revert "
"to old version of Grisbi, we would advise you to do that right now.\n\n"
"You can find out other improvements on http://www.grisbi.org/."),
- "grisbi-logo.png",
+ "grisbi.png",
NULL );
gsb_assistant_add_page ( assistant,
gsb_assistant_first_page_2 (assistant),
diff --git a/src/help.c b/src/help.c
index c973254..d14b819 100644
--- a/src/help.c
+++ b/src/help.c
@@ -2,7 +2,7 @@
/* */
/* copyright (c) 2000-2003 Cédric Auger (cedric at grisbi.org) */
/* 2008 Benjamin Drieu (bdrieu at april.org) */
-/* 2008-2009 Pierre Biava (grisbi at pierre.biava.name) */
+/* 2008-2010 Pierre Biava (grisbi at pierre.biava.name) */
/* http://www.grisbi.org */
/* */
/* This program is free software; you can redistribute it and/or modify */
@@ -45,8 +45,6 @@ extern GtkWidget *window;
/*END_EXTERN*/
-
-
/**
* Handler used to pop up a web browser when user clicked on a link in
* the GtkAboutDialog.
@@ -61,6 +59,19 @@ void launch_url (GtkAboutDialog *about, const gchar * link, gpointer data)
}
+/**
+ * Handler used to pop up a mailer when user clicked on a link in
+ * the GtkAboutDialog.
+ *
+ * \param about Dialog that triggered the event.
+ * \param link URL to display.
+ * \param data Not used.
+ */
+void launch_mailto (GtkAboutDialog *about, const gchar * link, gpointer data)
+{
+ lance_mailer ( link );
+}
+
/**
* Create and run an About dialog.
@@ -77,61 +88,75 @@ void a_propos ( GtkWidget *bouton, gint data )
const gchar *auteurs[] = {
_("Programming"),
-"Benjamin Drieu (bdrieu at april.org)",
-"Cedric Auger (cedric at grisbi.org)",
-"Francois Terrot (grisbi at terrot.net)",
-"Pierre Biava (pierre.biava at nerim.net)",
-"Mickaël Remars (grisbi at remars.com)",
-"",
+"Benjamin Drieu (<bdrieu at april.org>)",
+"Cedric Auger (<cedric at grisbi.org>)",
+"Francois Terrot (<grisbi at terrot.net>)",
+"Pierre Biava (<pierre.biava at nerim.net>)",
+"Mickaël Remars (<grisbi at remars.com>)",
+"William Ollivier (<guneeyoufix at gmail.com>)"
+"\n",
_("Packaging"),
-"Alain Pichon (aph at grisbi.org)",
-"Baluchiterium (baluchiterium at users.sf.net)",
-"Francois Terrot (grisbi at terrot.net)",
-"Gerald Niel (gerald.niel at grisbi.org)",
-"Gilles Morel (g.morel at gmail.com)",
-"PMF (ugly.duck at gmx.de)",
-"Pascal Bleser (guru at linuxbe.org)",
-"Sylvain Glaize (mokona at puupuu.org)",
-"Thierry Thomas (thierry at pompo.net)",
-"Vincent Marqueton (vincent at marqueton.com)",
+"Alain Pichon (<aph at grisbi.org>)",
+"Baluchiterium (<baluchiterium at users.sf.net>)",
+"Francois Terrot (<grisbi at terrot.net>)",
+"Gerald Niel (<gerald.niel at grisbi.org>)",
+"Gilles Morel (<g.morel at gmail.com>)",
+"PMF (<ugly.duck at gmx.de>)",
+"Pascal Bleser (<guru at linuxbe.org>)",
+"Sylvain Glaize (<mokona at puupuu.org>)",
+"Thierry Thomas (<thierry at pompo.net>)",
+"Vincent Marqueton (<vincent at marqueton.com>)",
+"William Ollivier (<guneeyoufix at gmail.com>)"
"\n",
_("Other"),
-"Axel Rousseau (axel584 at axel584.org) ",
-"Dominique Parisot (parisot at villey-le-sec.com) ",
-"Gerald Niel (gerald.niel at grisbi.org) ",
+"Axel Rousseau (<axel584 at axel584.org>) ",
+"Dominique Parisot (<parisot at villey-le-sec.com>) ",
+"Gerald Niel (<gerald.niel at grisbi.org>) ",
NULL };
gchar * translators = g_strconcat(
-"Alain Portal (dionysos at grisbi.org): ", _("English"), CSUFFIX,
-"Benjamin Drieu (bdrieu at april.org): ", _("English"), CSUFFIX,
-"Carlos M. Cámara Mora (carcam_moceu at yahoo.es): ", _("Spanish"), CSUFFIX,
-"Daniel Cartron (cartron at grisbi.org): ", _("English"), CSUFFIX,
-"Edwin Huijsing (e.huijsing at fiberworld.nl): ", _("Dutch"), CSUFFIX,
-"Fabio Erculiani (fabio.erculiani at tiscali.it): ", _("Italian"), CSUFFIX,
-"Flavio Henrique Somensi (flavio at opens.com.br): ", _("Brazilian Portuguese"), CSUFFIX,
-"Giorgio Mandolfo (giorgio at pollycoke.org): ", _("Italian"), CSUFFIX,
-"Martin Stromberger (Fabiolla at aon.at): ", _("German"), CSUFFIX,
-"Ryszard Jeziorski (rjeziorski at eagle): ", _("Polish"), CSUFFIX,
-"Achilleas Kaskamanidis (alterna55 at users.sourceforge.net): ", _("Greek"), CSUFFIX,
+"Alain Portal (<dionysos at grisbi.org>): ", _("English"), CSUFFIX,
+"Benjamin Drieu (<bdrieu at april.org>): ", _("English"), CSUFFIX,
+"Carlos M. Cámara Mora (<carcam_moceu at yahoo.es>): ", _("Spanish"), CSUFFIX,
+"Daniel Cartron (<cartron at grisbi.org>): ", _("English"), CSUFFIX,
+"Edwin Huijsing (<e.huijsing at fiberworld.nl>): ", _("Dutch"), CSUFFIX,
+"Fabio Erculiani (<fabio.erculiani at tiscali.it>): ", _("Italian"), CSUFFIX,
+"Flavio Henrique Somensi (<flavio at opens.com.br>): ", _("Brazilian Portuguese"), CSUFFIX,
+"Giorgio Mandolfo (<giorgio at pollycoke.org>): ", _("Italian"), CSUFFIX,
+"Martin Stromberger (<Fabiolla at aon.at>): ", _("German"), CSUFFIX,
+"Ryszard Jeziorski (<rjeziorski at eagleW): ", _("Polish"), CSUFFIX,
+"Achilleas Kaskamanidis (<alterna55 at users.sourceforge.net>): ", _("Greek"), CSUFFIX,
NULL);
const gchar *documenters [] = {
-"Alain Portal (aportal at univ-monpt2.fr)",
-"Daniel Cartron (doc at grisbi.org)",
+"Alain Portal (<aportal at univ-monpt2.fr>)",
+"Daniel Cartron (<doc at grisbi.org>)",
NULL};
const gchar *artists [] = {
-"Andre Pascual (andre at linuxgraphic.org)",
+"Andre Pascual (<andre at linuxgraphic.org>)",
NULL};
- const gchar *license = "This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2 of the License, or (at your option) any later version.\n\nThis program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.\n\nYou should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA\n\n"
- "This product includes software developed by the OpenSSL Project for use in the OpenSSL Toolkit. (http://www.openssl.org/)";
+ const gchar *license = "This program is free software; you can redistribute "
+ "it and/or modify it under the terms of the GNU General "
+ "Public License as published by the Free Software Foundation; "
+ "either version 2 of the License, or (at your option) any later "
+ "version.\n\nThis program is distributed in the hope that it "
+ "will be useful, but WITHOUT ANY WARRANTY; without even the "
+ "implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR "
+ "PURPOSE. See the GNU General Public License for more details.\n\n"
+ "You should have received a copy of the GNU General Public License "
+ "along with this program; if not, write to the Free Software "
+ "Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA\n\n"
+ "This product includes software developed by the OpenSSL Project "
+ "for use in the OpenSSL Toolkit.\n(http://www.openssl.org/)";
#if ! GTK_CHECK_VERSION(2,10,0)
- // Warn about obsolete dependencies
- gchar * warn_print = _("\n\nThis version of Grisbi does not support print feature.\nVersion of GTK+ it was built with is obsolete.");
+ /* Warn about obsolete dependencies */
+ gchar * warn_print = _("\n\nThis version of Grisbi does not support print feature.\n"
+ "Version of GTK+ it was built with is obsolete.");
#else
gchar * warn_print = NULL;
#endif
@@ -143,12 +168,12 @@ NULL};
get_gtk_run_version ( ),
"\n",
_("This instance of Grisbi was compiled on\n"),
- gsb_date_get_compiled_time ( ) ,
+ gsb_date_get_compiled_time ( ) ,
" ",
- _("at"),
+ _("at"),
" ",
- __TIME__,
- "\n",
+ __TIME__,
+ "\n",
warn_print,
NULL );
@@ -163,7 +188,8 @@ NULL};
}
about = gtk_about_dialog_new ( );
gtk_about_dialog_set_url_hook (launch_url, NULL, NULL);
- gtk_about_dialog_set_name ( GTK_ABOUT_DIALOG (about), "Grisbi" );
+ gtk_about_dialog_set_email_hook (launch_mailto, NULL, NULL);
+ gtk_about_dialog_set_program_name ( GTK_ABOUT_DIALOG (about), "Grisbi" );
gtk_about_dialog_set_logo ( GTK_ABOUT_DIALOG (about), logo );
gtk_about_dialog_set_comments ( GTK_ABOUT_DIALOG (about), comments );
gtk_about_dialog_set_website ( GTK_ABOUT_DIALOG (about), "http://www.grisbi.org/");
diff --git a/src/import.c b/src/import.c
index 8ffbff7..162e873 100644
--- a/src/import.c
+++ b/src/import.c
@@ -2516,7 +2516,7 @@ gint gsb_import_create_transaction ( struct struct_ope_importation *imported_tra
imported_transaction -> tiers, TRUE );
else
{
- if ( g_utf8_collate ( (gchar *) gsb_data_payee_get_name (
+ if ( g_utf8_collate ( gsb_data_payee_get_name (
payee_number, FALSE ),
imported_transaction -> tiers ) != 0 )
gsb_data_transaction_set_notes ( transaction_number,
diff --git a/src/tiers_onglet.c b/src/tiers_onglet.c
index 943bdbd..321742c 100644
--- a/src/tiers_onglet.c
+++ b/src/tiers_onglet.c
@@ -872,21 +872,21 @@ void appui_sur_manage_tiers ( void )
"check_option_2" ) ) );
/* on ajoute la nouvelle association à la liste des assoc */
- if ( nb_removed > 1 )
+ assoc = g_malloc ( sizeof ( struct struct_payee_asso ) );
+ assoc -> payee_number = new_payee_number;
+ assoc -> search_str = g_strdup ( str_cherche );
+ if ( !g_slist_find_custom ( liste_associations_tiers,
+ assoc,
+ (GCompareFunc) gsb_import_associations_cmp_assoc ) )
{
- assoc = g_malloc ( sizeof ( struct struct_payee_asso ) );
- assoc -> payee_number = new_payee_number;
- assoc -> search_str = g_strdup ( str_cherche );
- if ( !g_slist_find_custom ( liste_associations_tiers,
- assoc,
- (GCompareFunc) gsb_import_associations_cmp_assoc ) )
- {
- liste_associations_tiers = g_slist_insert_sorted (
- liste_associations_tiers,
- assoc,
- (GCompareFunc) gsb_import_associations_cmp_assoc );
- }
+ liste_associations_tiers = g_slist_insert_sorted (
+ liste_associations_tiers,
+ assoc,
+ (GCompareFunc) gsb_import_associations_cmp_assoc );
+ }
+ if ( nb_removed > 1 )
+ {
tmp_list = gsb_data_transaction_get_complete_transactions_list ( );
while ( tmp_list )
{
diff --git a/src/utils.c b/src/utils.c
index baf1dac..0554344 100644
--- a/src/utils.c
+++ b/src/utils.c
@@ -225,7 +225,7 @@ gboolean lance_navigateur_web ( const gchar *url )
else
{
win32_shell_execute_open ( url );
- }
+ }
#endif /* _WIN32 */
g_free(chaine);
@@ -520,6 +520,33 @@ gchar *utils_get_plugins_dir ( void )
#endif
}
+
+/**
+ *
+ *
+ *
+ *
+ * */
+void lance_mailer ( const gchar *uri )
+{
+ gchar *chaine;
+ GError *error = NULL;
+
+ chaine = g_strconcat ( "mailto:", uri, NULL );
+
+ if ( gtk_show_uri ( NULL, chaine, GDK_CURRENT_TIME, &error ) == FALSE )
+ {
+ gchar *tmp_str;
+
+ tmp_str = g_strdup_printf ( _("Grisbi was unable to execute a mailer to write at <tt>%s</tt>.\n"
+ "The error was: %s."),
+ uri, error -> message );
+ dialogue_error_hint ( tmp_str, _("Cannot execute mailer") );
+ g_free(tmp_str);
+ }
+ g_free ( chaine );
+}
+
/* Local Variables: */
/* c-basic-offset: 4 */
/* End: */
diff --git a/src/utils.h b/src/utils.h
index 0103d1e..09d8b4d 100644
--- a/src/utils.h
+++ b/src/utils.h
@@ -8,6 +8,7 @@
gboolean assert_account_loaded ();
gboolean desensitive_widget ( gpointer object, GtkWidget *widget );
gchar *get_gtk_run_version ( void );
+void lance_mailer ( const gchar *uri );
gboolean lance_navigateur_web ( const gchar *url );
gboolean met_en_normal ( GtkWidget *event_box,
GdkEventMotion *event,
hooks/post-receive
--
grisbi
More information about the cvs
mailing list