[grisbi-cvs] [SCM] grisbi branch, master, updated. afd901835dfe3f5c88bb6bd56cf99581f038f8bb
Pierre Biava
nobody at users.sourceforge.net
Thu Jun 3 21:45:59 CEST 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 afd901835dfe3f5c88bb6bd56cf99581f038f8bb (commit)
via c0f48e8bea56d11bd613f597591837046b9119c2 (commit)
from 260553a50a86f27acaa5b8091f955967ba106e12 (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 afd901835dfe3f5c88bb6bd56cf99581f038f8bb
Author: Pierre Biava <pierre.biava at nerim.net>
Date: Thu Jun 3 21:45:11 2010 +0200
changes the sorting function of payees. Corrects a warning at compile
commit c0f48e8bea56d11bd613f597591837046b9119c2
Author: Pierre Biava <pierre.biava at nerim.net>
Date: Wed Jun 2 22:46:33 2010 +0200
Merge branches 'master' and 'master' of ssh://grisbi.git.sourceforge.net/gitroot/grisbi/grisbi
-----------------------------------------------------------------------
Changes:
diff --git a/intl/libgnuintl.h b/intl/libgnuintl.h
deleted file mode 100644
index f891deb..0000000
--- a/intl/libgnuintl.h
+++ /dev/null
@@ -1,128 +0,0 @@
-/* Message catalogs for internationalization.
- Copyright (C) 1995-1997, 2000, 2001 Free Software Foundation, Inc.
-
- This program is free software; you can redistribute it and/or modify it
- under the terms of the GNU Library General Public License as published
- by the Free Software Foundation; either version 2, or (at your option)
- any later version.
-
- This 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
- Library General Public License for more details.
-
- You should have received a copy of the GNU Library 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. */
-
-#ifndef _LIBINTL_H
-#define _LIBINTL_H 1
-
-#include <locale.h>
-
-/* The LC_MESSAGES locale category is the category used by the functions
- gettext() and dgettext(). It is specified in POSIX, but not in ANSI C.
- On systems that don't define it, use an arbitrary value instead.
- On Solaris, <locale.h> defines __LOCALE_H then includes <libintl.h> (i.e.
- this file!) and then only defines LC_MESSAGES. To avoid a redefinition
- warning, don't define LC_MESSAGES in this case. */
-#if !defined LC_MESSAGES && !defined __LOCALE_H
-# define LC_MESSAGES 1729
-#endif
-
-/* We define an additional symbol to signal that we use the GNU
- implementation of gettext. */
-#define __USE_GNU_GETTEXT 1
-
-/* Resolve a platform specific conflict on DJGPP. GNU gettext takes
- precedence over _conio_gettext. */
-#ifdef __DJGPP__
-# undef gettext
-# define gettext gettext
-#endif
-
-#ifndef PARAMS
-# if __STDC__ || defined __cplusplus
-# define PARAMS(args) args
-# else
-# define PARAMS(args) ()
-# endif
-#endif
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-/* Look up MSGID in the current default message catalog for the current
- LC_MESSAGES locale. If not found, returns MSGID itself (the default
- text). */
-extern char *gettext PARAMS ((const char *__msgid));
-
-/* Look up MSGID in the DOMAINNAME message catalog for the current
- LC_MESSAGES locale. */
-extern char *dgettext PARAMS ((const char *__domainname, const char *__msgid));
-
-/* Look up MSGID in the DOMAINNAME message catalog for the current CATEGORY
- locale. */
-extern char *dcgettext PARAMS ((const char *__domainname, const char *__msgid,
- int __category));
-
-
-/* Similar to `gettext' but select the plural form corresponding to the
- number N. */
-extern char *ngettext PARAMS ((const char *__msgid1, const char *__msgid2,
- unsigned long int __n));
-
-/* Similar to `dgettext' but select the plural form corresponding to the
- number N. */
-extern char *dngettext PARAMS ((const char *__domainname, const char *__msgid1,
- const char *__msgid2, unsigned long int __n));
-
-/* Similar to `dcgettext' but select the plural form corresponding to the
- number N. */
-extern char *dcngettext PARAMS ((const char *__domainname, const char *__msgid1,
- const char *__msgid2, unsigned long int __n,
- int __category));
-
-
-/* Set the current default message catalog to DOMAINNAME.
- If DOMAINNAME is null, return the current default.
- If DOMAINNAME is "", reset to the default of "messages". */
-extern char *textdomain PARAMS ((const char *__domainname));
-
-/* Specify that the DOMAINNAME message catalog will be found
- in DIRNAME rather than in the system locale data base. */
-extern char *bindtextdomain PARAMS ((const char *__domainname,
- const char *__dirname));
-
-/* Specify the character encoding in which the messages from the
- DOMAINNAME message catalog will be returned. */
-extern char *bind_textdomain_codeset PARAMS ((const char *__domainname,
- const char *__codeset));
-
-
-/* Optimized version of the functions above. */
-#if defined __OPTIMIZED
-/* These are macros, but could also be inline functions. */
-
-# define gettext(msgid) \
- dgettext (NULL, msgid)
-
-# define dgettext(domainname, msgid) \
- dcgettext (domainname, msgid, LC_MESSAGES)
-
-# define ngettext(msgid1, msgid2, n) \
- dngettext (NULL, msgid1, msgid2, n)
-
-# define dngettext(domainname, msgid1, msgid2, n) \
- dcngettext (domainname, msgid1, msgid2, n, LC_MESSAGES)
-
-#endif /* Optimizing. */
-
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* libintl.h */
diff --git a/src/erreur.c b/src/erreur.c
index 954505f..e92b5f8 100644
--- a/src/erreur.c
+++ b/src/erreur.c
@@ -280,12 +280,12 @@ G_MODULE_EXPORT extern void debug_message_string ( gchar *prefixe, gchar * file,
/* on affiche dans la console le message */
if (message)
- tmpstr = g_strdup_printf(_("%s, %d : %s - %s:%d:%s - %s\n"),
- get_debug_time (), clock(), prefixe,
+ tmpstr = g_strdup_printf(_("%s, %2f : %s - %s:%d:%s - %s\n"),
+ get_debug_time (), (double )clock()/ CLOCKS_PER_SEC, prefixe,
file, line, function, message);
else
- tmpstr = g_strdup_printf(_("%s, %d : %s - %s:%d:%s\n"),
- get_debug_time (), clock(), prefixe,
+ tmpstr = g_strdup_printf(_("%s, %2f : %s - %s:%d:%s\n"),
+ get_debug_time (), (double )clock()/ CLOCKS_PER_SEC, prefixe,
file, line, function);
if (etat.debug_mode)
@@ -322,8 +322,8 @@ extern void debug_message_int ( gchar *prefixe, gchar * file, gint line, const c
if ( ( debugging_grisbi && level <= debugging_grisbi) || force_debug_display || etat.debug_mode)
{
/* on affiche dans la console le message */
- gchar* tmpstr = g_strdup_printf(_("%s, %d : %s - %s:%d:%s - %d\n"),
- get_debug_time (), clock(), prefixe,
+ gchar* tmpstr = g_strdup_printf(_("%s, %2f : %s - %s:%d:%s - %d\n"),
+ get_debug_time (), (double )clock()/ CLOCKS_PER_SEC, prefixe,
file, line, function, message);
if (etat.debug_mode)
@@ -360,8 +360,8 @@ extern void debug_message_real ( gchar *prefixe, gchar * file, gint line, const
if ( ( debugging_grisbi && level <= debugging_grisbi) || force_debug_display || etat.debug_mode)
{
/* on affiche dans la console le message */
- gchar* tmpstr = g_strdup_printf(_("%s, %d : %s - %s:%d:%s - %ld E %d\n"),
- get_debug_time (), clock (), prefixe,
+ gchar* tmpstr = g_strdup_printf(_("%s, %2f : %s - %s:%d:%s - %ld E %d\n"),
+ get_debug_time (), (double )clock()/ CLOCKS_PER_SEC, prefixe,
file, line, function, message.mantissa, message.exponent);
if (etat.debug_mode)
diff --git a/src/gsb_data_payee.c b/src/gsb_data_payee.c
index 60ca54e..b3acc26 100644
--- a/src/gsb_data_payee.c
+++ b/src/gsb_data_payee.c
@@ -461,7 +461,7 @@ GSList *gsb_data_payee_get_name_list ( void )
if ( payee -> payee_name )
return_list = g_slist_insert_sorted ( return_list, payee -> payee_name,
- (GCompareFunc) g_utf8_collate );
+ (GCompareFunc) my_strcmp );
tmp_list = tmp_list -> next;
}
diff --git a/src/utils_str.c b/src/utils_str.c
index ef35717..967688e 100644
--- a/src/utils_str.c
+++ b/src/utils_str.c
@@ -369,10 +369,12 @@ gchar *my_strdelimit ( const gchar *string,
* */
gint my_strcmp ( gchar *string_1, gchar *string_2 )
{
- if ( string_1
- &&
- string_2 )
- {
+ if (!string_1 && string_2)
+ return 1;
+ if (string_1 && !string_2)
+ return -1;
+
+
if ( g_utf8_validate ( string_1, -1, NULL )
&&
g_utf8_validate ( string_2, -1, NULL ))
@@ -380,20 +382,16 @@ gint my_strcmp ( gchar *string_1, gchar *string_2 )
gint retour;
gchar *new_1, *new_2;
- new_1 = g_utf8_collate_key ( string_1,
- -1 );
- new_2 = g_utf8_collate_key ( string_2,
- -1 );
- retour = strcmp ( new_1,
- new_2 );
+ new_1 = g_utf8_collate_key ( string_1, -1 );
+ new_2 = g_utf8_collate_key ( string_2, -1 );
+ retour = strcmp ( new_1, new_2 );
+
g_free ( new_1 );
g_free ( new_2 );
return ( retour );
}
else
- return ( strcmp ( string_1,
- string_2 ));
- }
+ return ( strcmp ( string_1, string_2 ) );
return 0;
}
hooks/post-receive
--
grisbi
More information about the cvs
mailing list