r18696 - gnucash/trunk - Bump glib2 minimum requirement to 2.12.
Geert Janssens
gjanssens at code.gnucash.org
Sat Feb 20 08:57:10 EST 2010
Author: gjanssens
Date: 2010-02-20 08:57:10 -0500 (Sat, 20 Feb 2010)
New Revision: 18696
Trac: http://svn.gnucash.org/trac/changeset/18696
Removed:
gnucash/trunk/lib/glib28/
gnucash/trunk/src/glib-compat.h
Modified:
gnucash/trunk/configure.in
gnucash/trunk/lib/Makefile.am
gnucash/trunk/po/POTFILES.ignore
gnucash/trunk/src/Makefile.am
gnucash/trunk/src/app-utils/file-utils.c
gnucash/trunk/src/app-utils/gnc-accounting-period.h
gnucash/trunk/src/app-utils/gnc-sx-instance-model.c
gnucash/trunk/src/app-utils/test/test-sx.c
gnucash/trunk/src/backend/xml/gnc-backend-xml.c
gnucash/trunk/src/core-utils/gnc-gkeyfile-utils.c
gnucash/trunk/src/core-utils/gnc-gkeyfile-utils.h
gnucash/trunk/src/engine/Recurrence.c
gnucash/trunk/src/engine/gnc-budget.c
gnucash/trunk/src/gnome-utils/dialog-utils.c
gnucash/trunk/src/gnome-utils/gnc-date-edit.c
gnucash/trunk/src/gnome-utils/gnc-dense-cal-store.c
gnucash/trunk/src/gnome-utils/gnc-dense-cal.c
gnucash/trunk/src/gnome-utils/gnc-frequency.c
gnucash/trunk/src/gnome-utils/gnc-period-select.c
gnucash/trunk/src/gnome-utils/gnc-recurrence.c
gnucash/trunk/src/gnome/dialog-print-check.c
gnucash/trunk/src/gnome/dialog-sx-editor.c
gnucash/trunk/src/gnome/dialog-sx-from-trans.c
gnucash/trunk/src/gnome/druid-acct-period.c
gnucash/trunk/src/gnome/druid-loan.c
gnucash/trunk/src/gnome/gnc-plugin-page-sx-list.c
gnucash/trunk/src/gnome/window-autoclear.c
gnucash/trunk/src/gnome/window-reconcile.c
gnucash/trunk/src/import-export/qif-import/druid-qif-import.c
Log:
Bump glib2 minimum requirement to 2.12.
At the same time, remove all the conditional code and workarounds
that were in the code to cater for glib < 2.12.
Note: this commit will require a rerun of autogen.sh and configure.
Modified: gnucash/trunk/configure.in
===================================================================
--- gnucash/trunk/configure.in 2010-02-20 13:26:19 UTC (rev 18695)
+++ gnucash/trunk/configure.in 2010-02-20 13:57:10 UTC (rev 18696)
@@ -20,7 +20,7 @@
# Autoconf initialization
AC_PREREQ(2.59)
-AC_INIT([gnucash], [2.3.10], [gnucash-devel at gnucash.org])
+AC_INIT([GnuCash], [2.3.10], [gnucash-devel at gnucash.org])
AC_CONFIG_HEADERS(config.h)
AC_CONFIG_SRCDIR(src/engine/Transaction.h)
@@ -233,8 +233,8 @@
### --------------------------------------------------------------------------
### Glib checks..
-AM_PATH_GLIB_2_0(2.6.0,,AC_MSG_ERROR([
-*** GLIB >= 2.6 is required to build Gnucash; please make sure you have the
+AM_PATH_GLIB_2_0(2.12.0,,AC_MSG_ERROR([
+*** GLIB >= 2.12 is required to build Gnucash; please make sure you have the
*** development headers installed. The latest version of GLIB is
*** always available at ftp://ftp.gnome.org/pub/gnome/sources/glib/.]),
gthread gobject gmodule)
@@ -244,35 +244,6 @@
AC_MSG_ERROR([Cannot find glib. Check config.log])
fi
-AC_MSG_CHECKING(for GLIB - version >= 2.8.0)
-if $PKG_CONFIG 'glib-2.0 >= 2.8.0'
-then
- AC_MSG_RESULT(yes)
- AC_DEFINE(HAVE_GLIB_2_8,1,[System has glib 2.8.0 or better])
- HAVE_GLIB_2_8=yes
-else
- AC_MSG_RESULT(no)
- if test "x${native_win32}" = "xyes"; then
- AC_MSG_ERROR([*** GLIB >= 2.8 is required to build Gnucash on Windows.])
- else
- GLIB26_LIBS="$GLIB_LIBS"
- GLIB_LIBS="\${top_builddir}/lib/glib28/libgnc-glib.la $GLIB_LIBS"
- GLIB_CFLAGS="-I\${top_srcdir}/lib/glib28 $GLIB_CFLAGS"
- AC_SUBST(GLIB26_LIBS)
- fi
-fi
-AM_CONDITIONAL(HAVE_GLIB_2_8, test "x$HAVE_GLIB_2_8" = "xyes")
-
-AC_MSG_CHECKING(for GLIB - version >= 2.9.0)
-if $PKG_CONFIG 'glib-2.0 >= 2.9.0'
-then
- AC_MSG_RESULT(yes)
- AC_DEFINE(HAVE_GLIB29,1,[System has glib 2.9.0 or better])
- HAVE_GLIB29=yes
-else
- AC_MSG_RESULT(no)
-fi
-
AC_MSG_CHECKING(for GLIB - version >= 2.12.0)
if $PKG_CONFIG 'glib-2.0 >= 2.12.0'
then
@@ -1524,7 +1495,6 @@
doc/examples/Makefile
intl-scm/Makefile
lib/Makefile
- lib/glib28/Makefile
lib/guile-www/Makefile
lib/srfi/Makefile
lib/libc/Makefile
Modified: gnucash/trunk/lib/Makefile.am
===================================================================
--- gnucash/trunk/lib/Makefile.am 2010-02-20 13:26:19 UTC (rev 18695)
+++ gnucash/trunk/lib/Makefile.am 2010-02-20 13:57:10 UTC (rev 18696)
@@ -1,5 +1,5 @@
-SUBDIRS = libc glib28 guile-www srfi stf
-DIST_SUBDIRS = libc glib28 guile-www srfi stf
+SUBDIRS = libc guile-www srfi stf
+DIST_SUBDIRS = libc guile-www srfi stf
EXTRA_DIST = README
Modified: gnucash/trunk/po/POTFILES.ignore
===================================================================
--- gnucash/trunk/po/POTFILES.ignore 2010-02-20 13:26:19 UTC (rev 18695)
+++ gnucash/trunk/po/POTFILES.ignore 2010-02-20 13:57:10 UTC (rev 18696)
@@ -1,6 +1,5 @@
# Work around the intltool-0.35.5 / automake-1.10 failures
# due to "missing" files. These files may be distributed.
-lib/glib28/gfileutils-2.8.c
src/gnome/gnucash.desktop.in.in
src/gnome/gnucash.desktop.in
src/engine/iso-4217-currencies.c
Modified: gnucash/trunk/src/Makefile.am
===================================================================
--- gnucash/trunk/src/Makefile.am 2010-02-20 13:26:19 UTC (rev 18695)
+++ gnucash/trunk/src/Makefile.am 2010-02-20 13:57:10 UTC (rev 18696)
@@ -52,5 +52,4 @@
base-typemaps.i \
README.modules \
gnc-test-env \
- guile-mappings.h \
- glib-compat.h
+ guile-mappings.h
Modified: gnucash/trunk/src/app-utils/file-utils.c
===================================================================
--- gnucash/trunk/src/app-utils/file-utils.c 2010-02-20 13:26:19 UTC (rev 18695)
+++ gnucash/trunk/src/app-utils/file-utils.c 2010-02-20 13:57:10 UTC (rev 18696)
@@ -23,9 +23,6 @@
#include <glib.h>
#include <glib/gstdio.h>
-#ifndef HAVE_GLIB_2_8
-#include <gfileutils-2.8.h>
-#endif
#include <libguile.h>
#include <errno.h>
#include <fcntl.h>
Modified: gnucash/trunk/src/app-utils/gnc-accounting-period.h
===================================================================
--- gnucash/trunk/src/app-utils/gnc-accounting-period.h 2010-02-20 13:26:19 UTC (rev 18695)
+++ gnucash/trunk/src/app-utils/gnc-accounting-period.h 2010-02-20 13:57:10 UTC (rev 18696)
@@ -45,7 +45,6 @@
#define GNC_ACCOUNTING_PERIOD_H
#include <glib.h>
-#include "glib-compat.h"
#include <time.h>
/**
Modified: gnucash/trunk/src/app-utils/gnc-sx-instance-model.c
===================================================================
--- gnucash/trunk/src/app-utils/gnc-sx-instance-model.c 2010-02-20 13:26:19 UTC (rev 18695)
+++ gnucash/trunk/src/app-utils/gnc-sx-instance-model.c 2010-02-20 13:57:10 UTC (rev 18696)
@@ -34,7 +34,6 @@
#include <glib.h>
#include <glib-object.h>
#include <stdlib.h>
-#include "glib-compat.h"
#include "Account.h"
#include "SX-book.h"
Modified: gnucash/trunk/src/app-utils/test/test-sx.c
===================================================================
--- gnucash/trunk/src/app-utils/test/test-sx.c 2010-02-20 13:26:19 UTC (rev 18695)
+++ gnucash/trunk/src/app-utils/test/test-sx.c 2010-02-20 13:57:10 UTC (rev 18696)
@@ -1,7 +1,6 @@
#include "config.h"
#include <stdlib.h>
#include <glib.h>
-#include "glib-compat.h"
#include "SX-book.h"
#include "gnc-sx-instance-model.h"
#include "gnc-ui-util.h"
Modified: gnucash/trunk/src/backend/xml/gnc-backend-xml.c
===================================================================
--- gnucash/trunk/src/backend/xml/gnc-backend-xml.c 2010-02-20 13:26:19 UTC (rev 18695)
+++ gnucash/trunk/src/backend/xml/gnc-backend-xml.c 2010-02-20 13:57:10 UTC (rev 18696)
@@ -33,9 +33,6 @@
#include <glib.h>
#include <glib/gi18n.h>
#include <glib/gstdio.h>
-#ifndef HAVE_GLIB_2_8
-#include <gstdio-2.8.h>
-#endif
#include <libintl.h>
#include <locale.h>
#include <fcntl.h>
Modified: gnucash/trunk/src/core-utils/gnc-gkeyfile-utils.c
===================================================================
--- gnucash/trunk/src/core-utils/gnc-gkeyfile-utils.c 2010-02-20 13:26:19 UTC (rev 18695)
+++ gnucash/trunk/src/core-utils/gnc-gkeyfile-utils.c 2010-02-20 13:57:10 UTC (rev 18696)
@@ -46,222 +46,7 @@
#include "gnc-gkeyfile-utils.h"
-#ifndef HAVE_GLIB_2_12
-/**********************************************************************
- *
- * The following functions are copied verbatim from the GLIB 2.12
- * source code. If more glib 2.12 functions are included into
- * gnucash,then they should all be consolidated in a lib/glib212
- * directory.
- *
- **********************************************************************/
-static gchar *
-_g_utf8_make_valid (const gchar *name)
-{
- GString *string;
- const gchar *remainder, *invalid;
- gint remaining_bytes, valid_bytes;
- string = NULL;
- remainder = name;
- remaining_bytes = strlen (name);
-
- while (remaining_bytes != 0)
- {
- if (g_utf8_validate (remainder, remaining_bytes, &invalid))
- break;
- valid_bytes = invalid - remainder;
-
- if (string == NULL)
- string = g_string_sized_new (remaining_bytes);
-
- g_string_append_len (string, remainder, valid_bytes);
- /* append U+FFFD REPLACEMENT CHARACTER */
- g_string_append (string, "\357\277\275");
-
- remaining_bytes -= valid_bytes + 1;
- remainder = invalid + 1;
- }
-
- if (string == NULL)
- return g_strdup (name);
-
- g_string_append (string, remainder);
-
- g_assert (g_utf8_validate (string->str, -1, NULL));
-
- return g_string_free (string, FALSE);
-}
-
-static gdouble
-g_key_file_parse_value_as_double (GKeyFile *key_file,
- const gchar *value,
- GError **error)
-{
- gchar *end_of_valid_d;
- gdouble double_value = 0;
-
- double_value = g_ascii_strtod (value, &end_of_valid_d);
-
- if (*end_of_valid_d != '\0' || end_of_valid_d == value)
- {
- gchar *value_utf8 = _g_utf8_make_valid (value);
- g_set_error (error, G_KEY_FILE_ERROR,
- G_KEY_FILE_ERROR_INVALID_VALUE,
- _("Value '%s' cannot be interpreted "
- "as a float number."),
- value_utf8);
- g_free (value_utf8);
- }
-
- return double_value;
-}
-
-gdouble
-g_key_file_get_double (GKeyFile *key_file, const gchar *group_name,
- const gchar *key, GError **error)
-{
- GError *key_file_error;
- gchar *value;
- gdouble double_value;
-
- g_return_val_if_fail (key_file != NULL, -1);
- g_return_val_if_fail (group_name != NULL, -1);
- g_return_val_if_fail (key != NULL, -1);
-
- key_file_error = NULL;
-
- value = g_key_file_get_value (key_file, group_name, key, &key_file_error);
-
- if (key_file_error)
- {
- g_propagate_error (error, key_file_error);
- return 0;
- }
-
- double_value = g_key_file_parse_value_as_double (key_file, value,
- &key_file_error);
- g_free (value);
-
- if (key_file_error)
- {
- if (g_error_matches (key_file_error,
- G_KEY_FILE_ERROR,
- G_KEY_FILE_ERROR_INVALID_VALUE))
- {
- g_set_error (error, G_KEY_FILE_ERROR,
- G_KEY_FILE_ERROR_INVALID_VALUE,
- _("Key file contains key '%s' in group '%s' "
- "which has a value that cannot be interpreted."), key,
- group_name);
- g_error_free (key_file_error);
- }
- else
- g_propagate_error (error, key_file_error);
- }
-
- return double_value;
-}
-
-void
-g_key_file_set_double (GKeyFile *key_file,
- const gchar *group_name,
- const gchar *key,
- gdouble value)
-{
- gchar result[G_ASCII_DTOSTR_BUF_SIZE];
-
- g_return_if_fail (key_file != NULL);
-
- g_ascii_dtostr (result, sizeof (result), value);
- g_key_file_set_value (key_file, group_name, key, result);
-}
-
-gdouble*
-g_key_file_get_double_list (GKeyFile *key_file,
- const gchar *group_name,
- const gchar *key,
- gsize *length,
- GError **error)
-{
- GError *key_file_error = NULL;
- gchar **values;
- gdouble *double_values;
- gsize i, num_doubles;
-
- g_return_val_if_fail (key_file != NULL, NULL);
- g_return_val_if_fail (group_name != NULL, NULL);
- g_return_val_if_fail (key != NULL, NULL);
-
- values = g_key_file_get_string_list (key_file, group_name, key,
- &num_doubles, &key_file_error);
-
- if (key_file_error)
- g_propagate_error (error, key_file_error);
-
- if (!values)
- return NULL;
-
- double_values = g_new0 (gdouble, num_doubles);
-
- for (i = 0; i < num_doubles; i++)
- {
- double_values[i] = g_key_file_parse_value_as_double (key_file,
- values[i],
- &key_file_error);
-
- if (key_file_error)
- {
- g_propagate_error (error, key_file_error);
- g_strfreev (values);
- g_free (double_values);
-
- return NULL;
- }
- }
- g_strfreev (values);
-
- if (length)
- *length = num_doubles;
-
- return double_values;
-}
-
-void
-g_key_file_set_double_list (GKeyFile *key_file,
- const gchar *group_name,
- const gchar *key,
- gdouble list[],
- gsize length)
-{
- GString *values;
- gsize i;
-
- g_return_if_fail (key_file != NULL);
- g_return_if_fail (list != NULL);
-
- values = g_string_sized_new (length * 16);
- for (i = 0; i < length; i++)
- {
- gchar result[G_ASCII_DTOSTR_BUF_SIZE];
-
- g_ascii_dtostr( result, sizeof (result), list[i] );
-
- g_string_append (values, result);
- g_string_append_c (values, ';');
- }
-
- g_key_file_set_value (key_file, group_name, key, values->str);
- g_string_free (values, TRUE);
-}
-/**********************************************************************
- *
- * End of copied functions.
- *
- **********************************************************************/
-#endif
-
-
GKeyFile *
gnc_key_file_load_from_file (const gchar *filename,
gboolean ignore_error,
Modified: gnucash/trunk/src/core-utils/gnc-gkeyfile-utils.h
===================================================================
--- gnucash/trunk/src/core-utils/gnc-gkeyfile-utils.h 2010-02-20 13:26:19 UTC (rev 18695)
+++ gnucash/trunk/src/core-utils/gnc-gkeyfile-utils.h 2010-02-20 13:57:10 UTC (rev 18696)
@@ -38,23 +38,6 @@
#define GNC_GKEYFILE_UTILS_H
-#ifndef HAVE_GLIB_2_12
-gdouble
-g_key_file_get_double (GKeyFile *key_file, const gchar *group_name,
- const gchar *key, GError **error);
-
-void
-g_key_file_set_double (GKeyFile *key_file, const gchar *group_name,
- const gchar *key, gdouble value);
-gdouble*
-g_key_file_get_double_list (GKeyFile *key_file, const gchar *group_name,
- const gchar *key, gsize *length, GError **error);
-void
-g_key_file_set_double_list (GKeyFile *key_file, const gchar *group_name,
- const gchar *key, gdouble list[], gsize length);
-#endif
-
-
/** Open and read a key/value file from disk into memory.
*
* @param file The name of the file to load. This should be a fully
Modified: gnucash/trunk/src/engine/Recurrence.c
===================================================================
--- gnucash/trunk/src/engine/Recurrence.c 2010-02-20 13:26:19 UTC (rev 18695)
+++ gnucash/trunk/src/engine/Recurrence.c 2010-02-20 13:57:10 UTC (rev 18696)
@@ -22,7 +22,6 @@
#include <time.h>
#include <glib.h>
#include <glib/gi18n.h>
-#include "glib-compat.h"
#include <string.h>
#include "Recurrence.h"
#include "gnc-date.h"
@@ -477,7 +476,7 @@
PeriodType first_period, second_period;
first_period = recurrenceGetPeriodType(first);
second_period = recurrenceGetPeriodType(second);
-
+
if (!((first_period == PERIOD_MONTH
|| first_period == PERIOD_END_OF_MONTH
|| first_period == PERIOD_LAST_WEEKDAY)
@@ -497,7 +496,7 @@
recurrenceListIsWeeklyMultiple(GList *recurrences)
{
GList *r_iter;
-
+
for (r_iter = recurrences; r_iter != NULL; r_iter = r_iter->next)
{
Recurrence *r = (Recurrence*)r_iter->data;
Modified: gnucash/trunk/src/engine/gnc-budget.c
===================================================================
--- gnucash/trunk/src/engine/gnc-budget.c 2010-02-20 13:26:19 UTC (rev 18695)
+++ gnucash/trunk/src/engine/gnc-budget.c 2010-02-20 13:57:10 UTC (rev 18696)
@@ -29,8 +29,6 @@
#include <time.h>
#include "qof.h"
-#include "glib-compat.h"
-
#include "Account.h"
#include "gnc-budget.h"
@@ -272,7 +270,7 @@
gnc_budget_commit_edit(GncBudget *bgt)
{
if (!qof_commit_edit(QOF_INSTANCE(bgt))) return;
- qof_commit_edit_part2(QOF_INSTANCE(bgt), commit_err,
+ qof_commit_edit_part2(QOF_INSTANCE(bgt), commit_err,
noop, gnc_budget_free);
}
@@ -560,7 +558,7 @@
{
// FIXME: maybe zero is not best error return val.
g_return_val_if_fail(GNC_IS_BUDGET(budget) && acc, gnc_numeric_zero());
- return recurrenceGetAccountPeriodValue(&GET_PRIVATE(budget)->recurrence,
+ return recurrenceGetAccountPeriodValue(&GET_PRIVATE(budget)->recurrence,
acc, period_num);
}
@@ -620,11 +618,11 @@
/* Static wrapper getters for the recurrence params */
-static PeriodType gnc_budget_get_rec_pt(const GncBudget *bgt)
+static PeriodType gnc_budget_get_rec_pt(const GncBudget *bgt)
{ return recurrenceGetPeriodType(&(GET_PRIVATE(bgt)->recurrence)); }
-static guint gnc_budget_get_rec_mult(const GncBudget *bgt)
+static guint gnc_budget_get_rec_mult(const GncBudget *bgt)
{ return recurrenceGetMultiplier(&(GET_PRIVATE(bgt)->recurrence)); }
-static GDate gnc_budget_get_rec_date(const GncBudget *bgt)
+static GDate gnc_budget_get_rec_date(const GncBudget *bgt)
{ return recurrenceGetDate(&(GET_PRIVATE(bgt)->recurrence)); }
/* Register ourselves with the engine. */
@@ -634,8 +632,8 @@
{ "name", QOF_TYPE_STRING,
(QofAccessFunc) gnc_budget_get_name,
(QofSetterFunc) gnc_budget_set_name },
- { "description", QOF_TYPE_STRING,
- (QofAccessFunc) gnc_budget_get_description,
+ { "description", QOF_TYPE_STRING,
+ (QofAccessFunc) gnc_budget_get_description,
(QofSetterFunc) gnc_budget_set_description },
{ "recurrence_period_type", QOF_TYPE_INT32,
(QofAccessFunc) gnc_budget_get_rec_pt, NULL },
@@ -648,12 +646,12 @@
{ "recurrence_date", QOF_TYPE_DATE,
(QofAccessFunc) gnc_budget_get_rec_date, NULL },
/* Signedness problem: Should be unsigned. */
- { "num_periods", QOF_TYPE_INT32,
+ { "num_periods", QOF_TYPE_INT32,
(QofAccessFunc) gnc_budget_get_num_periods,
- (QofSetterFunc) gnc_budget_set_num_periods },
- { QOF_PARAM_BOOK, QOF_ID_BOOK,
+ (QofSetterFunc) gnc_budget_set_num_periods },
+ { QOF_PARAM_BOOK, QOF_ID_BOOK,
(QofAccessFunc) qof_instance_get_book, NULL },
- { QOF_PARAM_GUID, QOF_TYPE_GUID,
+ { QOF_PARAM_GUID, QOF_TYPE_GUID,
(QofAccessFunc) qof_instance_get_guid, NULL },
{ NULL },
};
Deleted: gnucash/trunk/src/glib-compat.h
===================================================================
--- gnucash/trunk/src/glib-compat.h 2010-02-20 13:26:19 UTC (rev 18695)
+++ gnucash/trunk/src/glib-compat.h 2010-02-20 13:57:10 UTC (rev 18696)
@@ -1,23 +0,0 @@
-/*
- * glib-compat.h - GLib version compatability mappings
- * Copyright (C) 2005, David Hampton <hampton at employees.org>
- *
- * 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.
- *
- * 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 General Public License for more details.
- *
- * 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., 51 Franklin Street, Fifth Floor, Boston, MA
- * 02110-1301, USA.
- */
-
-#ifndef HAVE_GLIB29
-#define g_date_set_time_t g_date_set_time
-#endif
Modified: gnucash/trunk/src/gnome/dialog-print-check.c
===================================================================
--- gnucash/trunk/src/gnome/dialog-print-check.c 2010-02-20 13:26:19 UTC (rev 18695)
+++ gnucash/trunk/src/gnome/dialog-print-check.c 2010-02-20 13:57:10 UTC (rev 18696)
@@ -30,8 +30,6 @@
#include <locale.h>
#include <math.h>
-#include "glib-compat.h"
-
#include "qof.h"
#include "gnc-date.h"
#include "gnc-gconf-utils.h"
@@ -229,10 +227,10 @@
gchar *title; /**< Title of this check format. Displayed to
* user in the dialog box. */
- gboolean blocking; /**< Default for printing blocking characters for
+ gboolean blocking; /**< Default for printing blocking characters for
* this page of checks. */
- gboolean print_date_format; /**< Default for printing date format characters for
+ gboolean print_date_format; /**< Default for printing date format characters for
* this page of checks. */
gboolean show_grid; /**< Print a grid pattern on the page */
@@ -352,7 +350,7 @@
get_float_pair (const char *section, const char *key, double *a, double *b)
{
GSList *coord_list;
-
+
coord_list = gnc_gconf_get_list (section, key, GCONF_VALUE_FLOAT, NULL);
if (NULL == coord_list) {
*a = 0;
@@ -398,7 +396,7 @@
s_list = xaccTransGetSplitList(trans);
if ( !s_list ) return NULL;
- amount = g_strconcat("",NULL);
+ amount = g_strconcat("",NULL);
node = s_list;
cnt = 1;
while ( cnt < nSplits ) {
@@ -431,7 +429,7 @@
s_list = xaccTransGetSplitList(trans);
if ( !s_list ) return NULL;
- memo = g_strconcat("",NULL);
+ memo = g_strconcat("",NULL);
node = s_list;
cnt = 1;
while ( cnt < nSplits ) {
@@ -465,7 +463,7 @@
s_list = xaccTransGetSplitList(trans);
if ( !s_list ) return NULL;
- account = g_strconcat("",NULL);
+ account = g_strconcat("",NULL);
node = s_list;
cnt = 1;
while ( cnt < nSplits ) {
@@ -490,7 +488,7 @@
check_format_t *format = NULL;
if ( !pcd ) return FALSE;
- /* if format is NULL, then the custom format is being used
+ /* if format is NULL, then the custom format is being used
* which has an ADDRESS item by definition */
format = pcd->selected_format;
if ( !format ) return TRUE;
@@ -758,7 +756,7 @@
pcd->splits_account_x, pcd->splits_account_y);
filename = g_strconcat(title, CHECK_NAME_EXTENSION, NULL);
- pathname = g_build_filename(gnc_dotgnucash_dir(), CHECK_FMT_DIR,
+ pathname = g_build_filename(gnc_dotgnucash_dir(), CHECK_FMT_DIR,
filename, NULL);
if (gnc_key_file_save_to_file(pathname, key_file, &error)) {
@@ -772,7 +770,7 @@
dialog = gtk_message_dialog_new(GTK_WINDOW(pcd->dialog),
GTK_DIALOG_DESTROY_WITH_PARENT,
GTK_MESSAGE_ERROR,
- GTK_BUTTONS_CLOSE, "%s",
+ GTK_BUTTONS_CLOSE, "%s",
_("Cannot save check format file."));
gtk_message_dialog_format_secondary_text(GTK_MESSAGE_DIALOG(dialog),
"%s", error->message);
@@ -1382,7 +1380,7 @@
dialog = gtk_message_dialog_new
(GTK_WINDOW(pcd->dialog),
GTK_DIALOG_DESTROY_WITH_PARENT,
- GTK_MESSAGE_ERROR, GTK_BUTTONS_CLOSE, "%s",
+ GTK_MESSAGE_ERROR, GTK_BUTTONS_CLOSE, "%s",
_("There is a duplicate check format file."));
gtk_message_dialog_format_secondary_text
(GTK_MESSAGE_DIALOG(dialog),
@@ -1948,7 +1946,7 @@
text = g_string_free(cdn_fmt, FALSE);
draw_text(context, text, &date_item, date_desc);
- g_free(text);
+ g_free(text);
if (expanded)
g_free(expanded);
pango_font_description_free(date_desc);
@@ -2335,7 +2333,7 @@
/* Compute the number of pages required to complete this print operation.
- * Today, check printing only prints one check at a time. When its extended to
+ * Today, check printing only prints one check at a time. When its extended to
* print multiple checks, this will need to take into account the number of
* checks to print, the number of checks on a page, and the starting check
* position on the page. This function is called once by the GtkPrint code to
@@ -2453,7 +2451,7 @@
/* If there's only one thing in the position combobox, make it insensitive */
sensitive = (pcd->position_max > 0);
gtk_widget_set_sensitive(GTK_WIDGET(pcd->position_combobox), sensitive);
-
+
/* Update the custom page */
sensitive = (!separator && !format);
gtk_container_foreach(GTK_CONTAINER(pcd->custom_table),
Modified: gnucash/trunk/src/gnome/dialog-sx-editor.c
===================================================================
--- gnucash/trunk/src/gnome/dialog-sx-editor.c 2010-02-20 13:26:19 UTC (rev 18695)
+++ gnucash/trunk/src/gnome/dialog-sx-editor.c 2010-02-20 13:57:10 UTC (rev 18696)
@@ -34,7 +34,6 @@
#include <gtk/gtk.h>
#include <glib/gi18n.h>
-#include "glib-compat.h"
#include <locale.h>
#include <time.h>
@@ -249,7 +248,7 @@
QofBook *book;
SchedXactions *sxes;
- if ( !gnc_sxed_check_consistent( sxed ) )
+ if ( !gnc_sxed_check_consistent( sxed ) )
return;
gnc_sxed_save_sx( sxed );
@@ -287,7 +286,7 @@
name = gtk_editable_get_chars( GTK_EDITABLE(sxed->nameEntry), 0, -1 );
if ( strlen(name) == 0 ) {
return TRUE;
-
+
}
if ( (xaccSchedXactionGetName(sxed->sx) == NULL)
|| (strcmp( xaccSchedXactionGetName(sxed->sx),
@@ -350,10 +349,10 @@
/* SX options [autocreate, notify, reminder, advance] */
{
gboolean dlgEnabled,
- dlgAutoCreate,
- dlgNotify,
+ dlgAutoCreate,
+ dlgNotify,
sxEnabled,
- sxAutoCreate,
+ sxAutoCreate,
sxNotify;
gint dlgAdvance, sxAdvance;
gint dlgRemind, sxRemind;
@@ -566,7 +565,7 @@
/* balance with random variable bindings some number
* of times in an attempt to ferret out
* un-balanceable transactions.
- *
+ *
* NOTE: The Real Way to do this is with some
* symbolic math to eliminate the variables. This is
* hard, and we don't do it. This solution will
@@ -619,7 +618,7 @@
base_cmdty = split_cmdty;
}
multi_commodity |= !gnc_commodity_equal(split_cmdty, base_cmdty);
-
+
v = kvp_frame_get_slot_path( f,
GNC_SX_ID,
GNC_SX_CREDIT_FORMULA,
@@ -715,7 +714,7 @@
gnc_error_dialog( sxed->dialog, "%s", sx_has_no_name_msg );
g_free( name );
return FALSE;
-
+
}
nameExists = FALSE;
@@ -765,7 +764,7 @@
GTK_TOGGLE_BUTTON(sxed->notifyOpt) );
if (((ttVarCount > 0) || multi_commodity) && autocreateState) {
- gnc_warning_dialog(sxed->dialog, "%s",
+ gnc_warning_dialog(sxed->dialog, "%s",
_("Scheduled Transactions with variables "
"cannot be automatically created."));
return FALSE;
@@ -774,7 +773,7 @@
/* Fix for part of Bug#121740 -- auto-create transactions are
* only valid if there's actually a transaction to create. */
if ( autocreateState && splitCount == 0 ) {
- gnc_warning_dialog(sxed->dialog, "%s",
+ gnc_warning_dialog(sxed->dialog, "%s",
_("Scheduled Transactions without a template "
"transaction cannot be automatically created.") );
return FALSE;
@@ -973,7 +972,7 @@
enabled_toggled( GtkObject *o, GncSxEditorDialog *sxed )
{
return;
-}
+}
static void
autocreate_toggled( GtkObject *o, GncSxEditorDialog *sxed )
@@ -1205,7 +1204,7 @@
gtk_editable_set_editable( GTK_EDITABLE(sxed->advanceSpin), TRUE );
gtk_editable_set_editable( GTK_EDITABLE(sxed->remindSpin), TRUE );
-
+
/* Allow resize */
gtk_window_set_resizable (GTK_WINDOW(sxed->dialog), TRUE);
@@ -1423,7 +1422,7 @@
}
/* populate the ledger */
- {
+ {
/* create the split list */
GList *splitList;
@@ -1492,7 +1491,7 @@
_("The current template transaction "
"has been changed. "
"Would you like to record the changes?");
-
+
reg = gnc_ledger_display_get_split_register (sxed->ledger);
pending_changes = gnc_split_register_changed (reg);
if (!pending_changes) {
@@ -1504,7 +1503,7 @@
trans = gnc_split_register_get_current_trans( reg );
if ( !gnc_split_register_save( reg, TRUE ) )
return;
-
+
gnc_split_register_redraw( reg );
} else {
gnc_split_register_cancel_cursor_trans_changes (reg);
Modified: gnucash/trunk/src/gnome/dialog-sx-from-trans.c
===================================================================
--- gnucash/trunk/src/gnome/dialog-sx-from-trans.c 2010-02-20 13:26:19 UTC (rev 18695)
+++ gnucash/trunk/src/gnome/dialog-sx-from-trans.c 2010-02-20 13:57:10 UTC (rev 18696)
@@ -28,7 +28,6 @@
#include "dialog-sx-editor.h"
#include "dialog-sx-from-trans.h"
#include "dialog-utils.h"
-#include "glib-compat.h"
#include "gnc-component-manager.h"
#include "gnc-date-edit.h"
#include "gnc-dense-cal-store.h"
@@ -85,7 +84,7 @@
* the numeric equivalences explicitly here */
FREQ_WEEKLY,
FREQ_BIWEEKLY,
- FREQ_MONTHLY,
+ FREQ_MONTHLY,
FREQ_QUARTERLY,
FREQ_ANNUALLY
} SxftiFreqType;
@@ -138,25 +137,25 @@
{ SXFTD_N_OCCURRENCES_ENTRY, "changed", sxftd_update_excal_adapt },
{ NULL, NULL, NULL }
};
-
+
int i;
GtkWidget *w;
for(i = 0; callbacks[i].name != NULL; i++)
{
w = glade_xml_get_widget(sxfti->gxml, callbacks[i].name);
-
- g_signal_connect (GTK_OBJECT(w), callbacks[i].signal,
+
+ g_signal_connect (GTK_OBJECT(w), callbacks[i].signal,
G_CALLBACK(callbacks[i].handlerFn),
sxfti );
}
g_signal_connect (G_OBJECT(sxfti->dialog), "response",
- G_CALLBACK (gnc_sx_trans_window_response_cb),
+ G_CALLBACK (gnc_sx_trans_window_response_cb),
sxfti);
}
-
+
static getEndTuple
sxftd_get_end_info(SXFromTransInfo *sxfti)
{
@@ -172,7 +171,7 @@
retval.type = NEVER_END;
return retval;
}
-
+
w = glade_xml_get_widget(sxfti->gxml, SXFTD_END_ON_DATE_BUTTON);
if(gtk_toggle_button_get_active( GTK_TOGGLE_BUTTON(w))) {
time_t end_tt;
@@ -182,7 +181,7 @@
g_date_set_time_t( &(retval.end_date), end_tt);
return retval;
}
-
+
w = glade_xml_get_widget(sxfti->gxml, SXFTD_N_OCCURRENCES_BUTTON);
if(gtk_toggle_button_get_active( GTK_TOGGLE_BUTTON(w) )) {
gchar *text, *endptr;
@@ -214,12 +213,12 @@
return retval;
}
-
+
static guint
sxftd_add_template_trans(SXFromTransInfo *sxfti)
{
-
+
Transaction *tr = sxfti->trans;
GList *tt_list = NULL;
GList *splits, *template_splits = NULL;
@@ -353,7 +352,7 @@
if ( xaccTransIsOpen( sxfti->trans ) ) {
return SXFTD_ERRNO_OPEN_XACTION;
}
-
+
sxfti_attach_callbacks(sxfti);
/* Setup the example calendar and related data structures. */
@@ -441,7 +440,7 @@
sxfti );
sxftd_update_example_cal( sxfti );
-
+
return 0;
}
@@ -464,7 +463,7 @@
g_free(name);
g_date_set_time_t( &date, gnc_date_edit_get_date( sxfti->startDateGDE ) );
-
+
sxftd_update_schedule(sxfti, &date, &schedule);
if (sxftd_errno == 0) {
gnc_sx_set_schedule(sx, schedule);
@@ -485,7 +484,7 @@
case END_AFTER_N_OCCS:
xaccSchedXactionSetNumOccur(sx, end_info.n_occurrences);
break;
-
+
default:
sxftd_errno = 2;
break;
@@ -495,8 +494,8 @@
/* Set the autocreate, days-in-advance and remind-in-advance values from
* options. */
- {
- gboolean autoCreateState, notifyState;
+ {
+ gboolean autoCreateState, notifyState;
gint daysInAdvance;
autoCreateState =
@@ -506,7 +505,7 @@
xaccSchedXactionSetAutoCreate( sx,
autoCreateState,
(autoCreateState & notifyState) );
-
+
daysInAdvance =
gnc_gconf_get_float( SXED_GCONF_SECTION, KEY_CREATE_DAYS, NULL );
xaccSchedXactionSetAdvanceCreation( sx, daysInAdvance );
@@ -550,7 +549,7 @@
else
{
if ( sx_error == SXFTD_ERRNO_UNBALANCED_XACTION ) {
- gnc_error_dialog( gnc_ui_get_toplevel(), "%s",
+ gnc_error_dialog( gnc_ui_get_toplevel(), "%s",
_( "The Scheduled Transaction is unbalanced. "
"You are strongly encouraged to correct this situation." ) );
}
@@ -562,7 +561,7 @@
sxftd_close(sxfti, FALSE);
return;
}
-
+
/**
* Update start date... right now we always base this off the transaction
* start date, but ideally we want to respect what the user has in the field,
@@ -736,7 +735,7 @@
gnc_dense_cal_set_month( sxfti->example_cal, g_date_get_month( &startDate ) );
gnc_dense_cal_set_year( sxfti->example_cal, g_date_get_year( &startDate ) );
-
+
recurrenceListFree(&schedule);
}
@@ -758,18 +757,18 @@
sxfti->gxml = gnc_glade_xml_new(SX_GLADE_FILE,
SXFTD_DIALOG_GLADE_NAME);
-
+
sxfti->dialog = glade_xml_get_widget(sxfti->gxml,
SXFTD_DIALOG_GLADE_NAME);
sxfti->trans = trans;
-
+
sxfti->sx = xaccSchedXactionMalloc(gnc_get_current_book ());
if ( (errno = sxftd_init( sxfti )) < 0 ) {
if ( errno == SXFTD_ERRNO_OPEN_XACTION )
{
- gnc_error_dialog( gnc_ui_get_toplevel(), "%s",
+ gnc_error_dialog( gnc_ui_get_toplevel(), "%s",
_( "Cannot create a Scheduled Transaction "
"from a Transaction currently "
"being edited. Please Enter the "
Modified: gnucash/trunk/src/gnome/druid-acct-period.c
===================================================================
--- gnucash/trunk/src/gnome/druid-acct-period.c 2010-02-20 13:26:19 UTC (rev 18695)
+++ gnucash/trunk/src/gnome/druid-acct-period.c 2010-02-20 13:57:10 UTC (rev 18696)
@@ -26,7 +26,6 @@
#include <gnome.h>
#include <glib/gi18n.h>
-#include "glib-compat.h"
#include "Recurrence.h"
#include "Period.h"
@@ -121,8 +120,8 @@
}
/* =============================================================== */
-/* Find the number of transactions occuring before the indicated date.
- * Do this by making a query and counting the results.
+/* Find the number of transactions occuring before the indicated date.
+ * Do this by making a query and counting the results.
*/
static int
@@ -236,10 +235,10 @@
g_date_get_year(&period_end));
period_begin = period_end;
recurrenceListNextInstance(info->period, &period_begin, &period_end);
- }
+ }
/* Display the results */
- remarks_text =
+ remarks_text =
_("The earliest transaction date found in this book is %s. "
"Based on the selection made above, this book will be split "
"into %d books. Click on 'Forward' to start closing the "
@@ -274,7 +273,7 @@
recurrenceListFree(&info->period);
gnc_frequency_save_to_recurrence(info->period_menu, &info->period, &info->closing_date);
- qof_print_date_dmy_buff (close_date_str, MAX_DATE_LENGTH,
+ qof_print_date_dmy_buff (close_date_str, MAX_DATE_LENGTH,
g_date_get_day(&info->closing_date),
g_date_get_month(&info->closing_date),
g_date_get_year(&info->closing_date));
@@ -286,7 +285,7 @@
nacc = gnc_account_n_descendants (gnc_book_get_root_account (currbook));
/* Display the book info */
- period_text =
+ period_text =
_("You have asked for a book to be created. This book "
"will contain all transactions up to midnight %s "
"(for a total of %d transactions spread over %d accounts). "
@@ -300,7 +299,7 @@
gtk_widget_show (GTK_WIDGET (info->book_details));
/* Create default settings for the title, notes fields */
- qof_print_date_dmy_buff (prev_close_date_str, MAX_DATE_LENGTH,
+ qof_print_date_dmy_buff (prev_close_date_str, MAX_DATE_LENGTH,
g_date_get_day(&info->prev_closing_date),
g_date_get_month(&info->prev_closing_date),
g_date_get_year(&info->prev_closing_date));
@@ -333,10 +332,10 @@
ENTER("info=%p", info);
/* Find the date of the earliest transaction in the current book.
- * Note that this could have changed since last time, since
+ * Note that this could have changed since last time, since
* we may have closed books since last time. */
info->earliest = get_earliest_in_book (gnc_get_current_book());
- info->earliest_str = qof_print_date(info->earliest);
+ info->earliest_str = qof_print_date(info->earliest);
PINFO ("date of earliest is %ld %s", info->earliest, ctime (&info->earliest));
prepare_remarks (info);
@@ -450,7 +449,7 @@
/* We must save now; if we don't, and the user bails without saving,
* then opening account balances will be incorrect, and this can only
- * lead to unhappiness.
+ * lead to unhappiness.
*/
gnc_file_save ();
gnc_resume_gui_refresh ();
@@ -517,13 +516,13 @@
info->druid = GNOME_DRUID (glade_xml_get_widget (xml, "acct_period_druid"));
gnc_druid_set_colors (info->druid);
- info->start_page =
+ info->start_page =
GNOME_DRUID_PAGE(glade_xml_get_widget (xml, "start page"));
- info->menu_page =
+ info->menu_page =
GNOME_DRUID_PAGE(glade_xml_get_widget (xml, "menu page"));
- info->book_page =
+ info->book_page =
GNOME_DRUID_PAGE(glade_xml_get_widget (xml, "book page"));
- info->finish_page =
+ info->finish_page =
GNOME_DRUID_PAGE(glade_xml_get_widget (xml, "finish page"));
info->close_status = -1;
@@ -532,8 +531,8 @@
* Add a year minus a day as the first guess for book closing,
* and use that to set up the freq spec widget. */
info->earliest = get_earliest_in_book (gnc_get_current_book());
- info->earliest_str = qof_print_date(info->earliest);
- PINFO ("date of earliest transaction is %ld %s",
+ info->earliest_str = qof_print_date(info->earliest);
+ PINFO ("date of earliest transaction is %ld %s",
info->earliest, ctime (&info->earliest));
g_date_clear (&info->closing_date, 1);
@@ -562,19 +561,19 @@
TRUE, TRUE, 0);
/* Get handles to all of the other widgets we'll need */
- info->period_remarks =
+ info->period_remarks =
GTK_LABEL (glade_xml_get_widget (xml, "remarks label"));
- info->close_results =
+ info->close_results =
GTK_LABEL (glade_xml_get_widget (xml, "results label"));
- info->book_details =
+ info->book_details =
GTK_LABEL (glade_xml_get_widget (xml, "book label"));
- info->book_title =
+ info->book_title =
GTK_ENTRY (glade_xml_get_widget (xml, "book title entry"));
- info->book_notes =
+ info->book_notes =
GTK_TEXT_VIEW (glade_xml_get_widget (xml, "book notes text"));
/* generic finished/close/abort signals */
@@ -619,7 +618,7 @@
/********************************************************************\
* gnc_acct_period_dialog *
* opens up a druid to configure accounting periods *
- * *
+ * *
* Args: none *
* Return: nothing *
\********************************************************************/
Modified: gnucash/trunk/src/gnome/druid-loan.c
===================================================================
--- gnucash/trunk/src/gnome/druid-loan.c 2010-02-20 13:26:19 UTC (rev 18695)
+++ gnucash/trunk/src/gnome/druid-loan.c 2010-02-20 13:57:10 UTC (rev 18696)
@@ -26,7 +26,6 @@
#include <gnome.h>
#include <glib/gi18n.h>
-#include "glib-compat.h"
#include <string.h>
#include <glade/glade.h>
#include <math.h>
@@ -254,7 +253,7 @@
/* Current index of the payment opt for multiplexing the 'payment'
* page. */
int currentIdx;
-
+
/* widgets */
/* prm = params */
GtkTable *prmTable;
@@ -421,7 +420,7 @@
/* get pointers to the various widgets */
gnc_loan_druid_get_widgets( ldd );
-
+
/* non-gladeable widget setup */
{
int i;
@@ -596,7 +595,7 @@
12, 12 ));
gtk_spin_button_set_adjustment( ldd->prmRemainSpin, a );
}
-
+
g_signal_connect( ldd->optEscrowCb, "toggled",
G_CALLBACK(ld_escrow_toggle), ldd );
gtk_widget_set_sensitive( GTK_WIDGET(ldd->optEscrowHBox), FALSE );
@@ -864,7 +863,7 @@
GET_CASTED_WIDGET( GTK_COMBO_BOX, LENGTH_OPT );
ldd->prmRemainSpin =
GET_CASTED_WIDGET( GTK_SPIN_BUTTON, REMAIN_SPIN );
-
+
/* opt = options */
ldd->optVBox =
GET_CASTED_WIDGET( GTK_VBOX, OPT_CONTAINER );
@@ -999,9 +998,9 @@
for ( i=0; i<ldd->ld.repayOptCount; i++ ) {
RepayOptData *rod = ldd->ld.repayOpts[i];
- if ( rod->name )
+ if ( rod->name )
g_free( rod->name );
- if ( rod->txnMemo )
+ if ( rod->txnMemo )
g_free( rod->txnMemo );
if ( rod->startDate )
@@ -1159,10 +1158,10 @@
ldd->ld.primaryAcct = gnc_account_sel_get_account( ldd->prmAccountGAS );
if ( ldd->ld.primaryAcct == NULL ) {
- gnc_info_dialog( ldd->dialog, "%s",
+ gnc_info_dialog( ldd->dialog, "%s",
_("Please select a valid loan account.") );
return TRUE;
- }
+ }
if ( ! ldd->ld.repPriAcct ) {
ldd->ld.repPriAcct = ldd->ld.primaryAcct;
}
@@ -1246,12 +1245,12 @@
ldd->ld.escrowAcct =
gnc_account_sel_get_account( ldd->optEscrowGAS );
if ( ldd->ld.escrowAcct == NULL ) {
- gnc_info_dialog( ldd->dialog, "%s",
+ gnc_info_dialog( ldd->dialog, "%s",
_("Please select a valid "
"Escrow Account.") );
return TRUE;
}
-
+
} else {
ldd->ld.escrowAcct = NULL;
}
@@ -1312,21 +1311,21 @@
ldd->ld.repFromAcct =
gnc_account_sel_get_account( ldd->repAssetsFromGAS );
if ( ldd->ld.repFromAcct == NULL ) {
- gnc_info_dialog( ldd->dialog, "%s",
+ gnc_info_dialog( ldd->dialog, "%s",
_("Please select a valid \"from\" account."));
return TRUE;
}
ldd->ld.repPriAcct =
gnc_account_sel_get_account( ldd->repPrincToGAS );
if ( ldd->ld.repPriAcct == NULL ) {
- gnc_info_dialog( ldd->dialog, "%s",
+ gnc_info_dialog( ldd->dialog, "%s",
_("Please select a valid \"to\" account.") );
return TRUE;
}
ldd->ld.repIntAcct =
gnc_account_sel_get_account( ldd->repIntToGAS );
if ( ldd->ld.repIntAcct == NULL ) {
- gnc_info_dialog( ldd->dialog, "%s",
+ gnc_info_dialog( ldd->dialog, "%s",
_("Please select a valid "
"\"interest\" account.") );
return TRUE;
@@ -1531,7 +1530,7 @@
if ( rod->specSrcAcctP ) {
rod->from = gnc_account_sel_get_account( ldd->payAcctFromGAS );
if ( rod->from == NULL ) {
- gnc_info_dialog( ldd->dialog, "%s",
+ gnc_info_dialog( ldd->dialog, "%s",
_("Please select a valid "
"\"from\" account.") );
return TRUE;
@@ -1540,12 +1539,12 @@
rod->to = gnc_account_sel_get_account( ldd->payAcctToGAS );
if ( rod->to == NULL ) {
- gnc_info_dialog( ldd->dialog, "%s",
+ gnc_info_dialog( ldd->dialog, "%s",
_("Please select a valid "
"\"to\" account.") );
return TRUE;
}
-
+
/* if ( rb toggled )
* ensure schedule/startdate setup
* save
@@ -1651,7 +1650,7 @@
g_assert( ldd->currentIdx >= 0 );
g_assert( ldd->currentIdx <= ldd->ld.repayOptCount );
-
+
uniq = gtk_toggle_button_get_active(
GTK_TOGGLE_BUTTON(ldd->payTxnFreqUniqRb) );
gtk_widget_set_sensitive( GTK_WIDGET(ldd->payFreqAlign), uniq );
@@ -2039,12 +2038,12 @@
* c1: ( toTTI = tcSX.escrow )
* if ( rep->from ) {
* a1: (fromSplit = NULL) paymentSX.main.splits += split( rep->fromAcct, repAmt )
- * b:
+ * b:
* tcSX.escrow.split( rep->escrow ).debCred += repAmt
* c1:
* } else {
* a2: (fromSplit = paymentSX.main.split( ldd->ld.repFromAcct )) .debcred += -repAmt
- * b:
+ * b:
* tcSX.escrow.splits += split( rep->escrow, -repAmt )
* c1:
* }
@@ -2052,10 +2051,10 @@
* c2: ( toTTI = paymentSX.main )
* if ( rep->from ) {
* a1: (fromSplit = NULL) paymentSX.main.splits += split( rep->fromAcct, -repAmt )
- * c2:
+ * c2:
* } else {
* a2: (fromSplit = paymentSX.main.split( ldd->ld.payFromAcct )).debcred += -repAmt
- * c2:
+ * c2:
* }
* }
* if ( fromSplit ) {
@@ -2105,7 +2104,7 @@
gstr = NULL;
ttsi = NULL;
}
-
+
if ( rod->from != NULL ) {
gchar *str;
@@ -2206,7 +2205,7 @@
ttsi = NULL;
tti = NULL;
}
-
+
/* Add to-account split. */
{
ttsi = gnc_ttsplitinfo_malloc();
@@ -2275,7 +2274,7 @@
? _("Payment")
: _("Escrow Payment") )
);
-
+
gnc_ttinfo_set_description( paymentSX->mainTxn,
payMainTxnDesc->str );
g_string_free( payMainTxnDesc, TRUE );
@@ -2295,7 +2294,7 @@
* ttxn.splits += split( escrow, -pmt)
* ttxn.splits += split( liability, ppmt )
* ttxn.splits += split( expenses:interest, ipmt ) */
-
+
{
Account *srcAcct;
@@ -2443,7 +2442,7 @@
gnc_default_currency() );
gnc_ttinfo_set_description( tcSX->escrowTxn,
gstr->str );
-
+
g_string_free( gstr, TRUE );
gstr = NULL;
@@ -2583,7 +2582,7 @@
PERR( "Unknown review date range option %d", range );
break;
}
-
+
}
static
@@ -2643,7 +2642,7 @@
GString *pmtFormula, *ppmtFormula, *ipmtFormula;
int i;
GHashTable *ivar;
-
+
pmtFormula = g_string_sized_new( 64 );
ld_get_pmt_formula( ldd, pmtFormula );
ppmtFormula = g_string_sized_new( 64 );
@@ -2685,7 +2684,7 @@
(gpointer)dateKeyCopy,
(gpointer)rowNumData );
}
-
+
/* evaluate the expressions given the correct
* sequence number i */
ival = gnc_numeric_create( i, 1 );
@@ -2770,7 +2769,7 @@
(gpointer)dateKeyCopy,
(gpointer)rowNumData );
}
-
+
val = double_to_gnc_numeric( (double)ldd->ld
.repayOpts[i]
->amount,
Modified: gnucash/trunk/src/gnome/gnc-plugin-page-sx-list.c
===================================================================
--- gnucash/trunk/src/gnome/gnc-plugin-page-sx-list.c 2010-02-20 13:26:19 UTC (rev 18695)
+++ gnucash/trunk/src/gnome/gnc-plugin-page-sx-list.c 2010-02-20 13:57:10 UTC (rev 18696)
@@ -1,4 +1,4 @@
-/*
+/*
* gnc-plugin-page-sx-list.c
*
* Copyright (C) 2006 Josh Sled <jsled at asynchronous.org>
@@ -43,7 +43,6 @@
#include <gtk/gtk.h>
#include <glib.h>
#include <glib/gi18n.h>
-#include "glib-compat.h"
#include <glade/glade-xml.h>
#include "SX-book.h"
#include "Split.h"
@@ -144,7 +143,7 @@
0,
(GInstanceInitFunc) gnc_plugin_page_sx_list_init
};
-
+
gnc_plugin_page_sx_list_type = g_type_register_static (GNC_TYPE_PLUGIN_PAGE,
GNC_PLUGIN_PAGE_SX_LIST_NAME,
&our_info, 0);
@@ -223,12 +222,12 @@
g_return_if_fail(!priv->disposed);
priv->disposed = TRUE;
-
+
g_object_unref(G_OBJECT(priv->dense_cal_model));
priv->dense_cal_model = NULL;
gtk_widget_unref(GTK_WIDGET(priv->gdcal));
priv->gdcal = NULL;
- g_object_unref(G_OBJECT(priv->instances));
+ g_object_unref(G_OBJECT(priv->instances));
priv->instances = NULL;
G_OBJECT_CLASS (parent_class)->dispose(object);
@@ -373,7 +372,7 @@
gnc_plugin_page_sx_list_refresh_cb,
gnc_plugin_page_sx_list_close_cb,
page);
-
+
return priv->widget;
}
@@ -486,7 +485,7 @@
GDate now;
Recurrence *r = g_new0(Recurrence, 1);
GList *schedule;
-
+
g_date_clear(&now, 1);
g_date_set_time_t(&now, time(NULL));
recurrenceSet(r, 1, PERIOD_MONTH, &now, WEEKEND_ADJ_NONE);
Modified: gnucash/trunk/src/gnome/window-autoclear.c
===================================================================
--- gnucash/trunk/src/gnome/window-autoclear.c 2010-02-20 13:26:19 UTC (rev 18695)
+++ gnucash/trunk/src/gnome/window-autoclear.c 2010-02-20 13:57:10 UTC (rev 18696)
@@ -24,7 +24,6 @@
#include <gtk/gtk.h>
#include <glib/gi18n.h>
-#include "glib-compat.h"
#include "Scrub.h"
#include "Scrub3.h"
@@ -62,9 +61,9 @@
/********************************************************************\
* gnc_ui_autoclear_window_raise *
- * shows and raises an auto-clear window *
- * *
- * Args: autoClearData - the auto-clear window structure *
+ * shows and raises an auto-clear window *
+ * *
+ * Args: autoClearData - the auto-clear window structure *
\********************************************************************/
void
gnc_ui_autoclear_window_raise(AutoClearWindow * autoClearData)
@@ -114,9 +113,9 @@
GList *node, *nc_list = 0, *toclear_list = 0;
gnc_numeric toclear_value;
GHashTable *sack;
-
+
gtk_label_set_text(data->status_label, "Searching for splits to clear ...");
-
+
/* Value we have to reach */
toclear_value = gnc_amount_edit_get_amount(data->end_value);
toclear_value = gnc_numeric_convert(toclear_value, xaccAccountGetCommoditySCU(data->account), GNC_RND_NEVER);
@@ -136,7 +135,7 @@
else
toclear_value = gnc_numeric_sub_fixed(toclear_value, value);
}
-
+
/* Pretty print information */
printf("Amount to clear: %s\n", gnc_numeric_to_string(toclear_value));
printf("Available splits:\n");
@@ -215,10 +214,10 @@
/* Cast the gpointer to the kind of pointer we actually need */
Split *split = (Split *)psplit;
toclear_list = g_list_prepend(toclear_list, split);
- toclear_value = gnc_numeric_sub_fixed(toclear_value,
+ toclear_value = gnc_numeric_sub_fixed(toclear_value,
xaccSplitGetAmount(split));
- printf(" Cleared: %s -> %s\n",
- gnc_numeric_to_string(xaccSplitGetAmount(split)),
+ printf(" Cleared: %s -> %s\n",
+ gnc_numeric_to_string(xaccSplitGetAmount(split)),
gnc_numeric_to_string(toclear_value));
}
else
@@ -233,7 +232,7 @@
{
printf(" No solution found.\n");
gtk_label_set_text(data->status_label, "The selected amount cannot be cleared.");
- return;
+ return;
}
}
g_hash_table_destroy (sack);
@@ -245,7 +244,7 @@
Split *split = node->data;
char recn;
gnc_numeric value;
-
+
recn = xaccSplitGetReconcile (split);
value = xaccSplitGetAmount (split);
@@ -290,7 +289,7 @@
AutoClearWindow *data;
char *title;
- data = g_new0 (AutoClearWindow, 1);
+ data = g_new0 (AutoClearWindow, 1);
data->account = account;
/* Create the dialog box */
@@ -316,7 +315,7 @@
data->ok_button = glade_xml_get_widget(xml, "ok_button");
data->cancel_button = glade_xml_get_widget(xml, "cancel_button");
data->status_label = GTK_LABEL(glade_xml_get_widget(xml, "status_label"));
-
+
g_signal_connect(data->ok_button, "clicked",
G_CALLBACK(gnc_autoclear_window_ok_cb), data);
g_signal_connect(data->end_value, "activate",
Modified: gnucash/trunk/src/gnome/window-reconcile.c
===================================================================
--- gnucash/trunk/src/gnome/window-reconcile.c 2010-02-20 13:26:19 UTC (rev 18695)
+++ gnucash/trunk/src/gnome/window-reconcile.c 2010-02-20 13:57:10 UTC (rev 18696)
@@ -32,7 +32,6 @@
#include <gtk/gtk.h>
#include <glib/gi18n.h>
-#include "glib-compat.h"
#include "Scrub.h"
#include "Scrub3.h"
@@ -606,7 +605,7 @@
(12 * prev.tm_year + prev.tm_mon));
days = 0;
}
-
+
/*
* Remember for next time.
*/
@@ -758,7 +757,7 @@
/* Allow the user to enter an interest payment
* or charge prior to reconciling */
- if( account_type_has_auto_interest_xfer( data.account_type )
+ if( account_type_has_auto_interest_xfer( data.account_type )
&& auto_interest_xfer_option )
{
gnc_reconcile_interest_xfer_run( &data );
@@ -1136,12 +1135,12 @@
Account *account;
gnc_numeric balancing_amount;
time_t statement_date;
-
-
+
+
gsr = gnc_reconcile_window_open_register(recnData);
if (gsr == NULL)
return;
-
+
account = recn_get_account(recnData);
if (account == NULL)
return;
@@ -1153,7 +1152,7 @@
statement_date = recnData->statement_date;
if (statement_date == 0)
statement_date = time(NULL); // default to 'now'
-
+
gnc_split_reg_balancing_entry(gsr, account, statement_date, balancing_amount);
}
@@ -1233,7 +1232,7 @@
g_free (title);
}
-static void
+static void
gnc_recn_edit_account_cb(GtkAction *action, gpointer data)
{
RecnWindow *recnData = data;
@@ -1245,7 +1244,7 @@
gnc_ui_edit_account_window (account);
}
-static void
+static void
gnc_recn_xfer_cb(GtkAction *action, gpointer data)
{
RecnWindow *recnData = data;
@@ -1353,7 +1352,7 @@
g_date_add_months(&date, months);
- /* Track last day of the month, i.e. 1/31 -> 2/28 -> 3/31 */
+ /* Track last day of the month, i.e. 1/31 -> 2/28 -> 3/31 */
if (was_last_day_of_month)
{
g_date_set_day(&date, g_date_get_days_in_month(g_date_get_month(&date),
@@ -1383,7 +1382,7 @@
*/
*new_ending =
gnc_ui_account_get_balance_as_of_date
- (account, *statement_date,
+ (account, *statement_date,
xaccAccountGetReconcileChildrenStatus(account));
}
}
@@ -1419,7 +1418,7 @@
case NREC:
case CREC:
trans = xaccSplitGetParent (split);
-
+
gnc_gui_component_watch_entity (recnData->component_id,
xaccTransGetGUID (trans),
QOF_EVENT_MODIFY
@@ -1545,19 +1544,19 @@
}
/********************************************************************\
- * recnWindowWithBalance
+ * recnWindowWithBalance
*
* Opens up the window to reconcile an account, but with ending
* balance and statement date already given.
- *
+ *
* Args: parent - The parent widget of the new window
- * account - The account to reconcile
- * new_ending - The amount for ending balance
- * statement_date - The date of the statement
- * Return: recnData - the instance of this RecnWindow
+ * account - The account to reconcile
+ * new_ending - The amount for ending balance
+ * statement_date - The date of the statement
+ * Return: recnData - the instance of this RecnWindow
\********************************************************************/
RecnWindow *
-recnWindowWithBalance (GtkWidget *parent, Account *account,
+recnWindowWithBalance (GtkWidget *parent, Account *account,
gnc_numeric new_ending, time_t statement_date)
{
RecnWindow *recnData;
@@ -1820,9 +1819,9 @@
/********************************************************************\
* gnc_ui_reconile_window_raise *
- * shows and raises an account editing window *
- * *
- * Args: editAccData - the edit window structure *
+ * shows and raises an account editing window *
+ * *
+ * Args: editAccData - the edit window structure *
\********************************************************************/
void
gnc_ui_reconcile_window_raise(RecnWindow * recnData)
@@ -1846,7 +1845,7 @@
* data - the data struct for this window *
* Return: none *
\********************************************************************/
-static void
+static void
recn_destroy_cb (GtkWidget *w, gpointer data)
{
RecnWindow *recnData = data;
@@ -1979,7 +1978,7 @@
* data - the data struct for this window *
* Return: none *
\********************************************************************/
-static void
+static void
recnFinishCB (GtkAction *action, RecnWindow *recnData)
{
gboolean auto_payment;
@@ -2038,7 +2037,7 @@
* data - the data struct for this window *
* Return: none *
\********************************************************************/
-static void
+static void
recnPostponeCB (GtkAction *action, gpointer data)
{
RecnWindow *recnData = data;
@@ -2066,7 +2065,7 @@
gnc_close_gui_component_by_data (WINDOW_RECONCILE_CM_CLASS, recnData);
}
-static void
+static void
recnCancelCB (GtkAction *action, gpointer data)
{
RecnWindow *recnData = data;
@@ -2087,7 +2086,7 @@
{ "HelpMenuAction", NULL, N_("_Help"), NULL, NULL, NULL, },
/* Reconcile menu */
-
+
{ "RecnChangeInfoAction", NULL, N_("_Reconcile Information..."), NULL,
N_("Change the reconcile information "
"including statement date and ending balance."),
Modified: gnucash/trunk/src/gnome-utils/dialog-utils.c
===================================================================
--- gnucash/trunk/src/gnome-utils/dialog-utils.c 2010-02-20 13:26:19 UTC (rev 18695)
+++ gnucash/trunk/src/gnome-utils/dialog-utils.c 2010-02-20 13:57:10 UTC (rev 18696)
@@ -27,7 +27,6 @@
#include <gtk/gtk.h>
#include <gdk/gdkkeysyms.h>
-#include "glib-compat.h"
#include <glib/gi18n.h>
#include <glade/glade.h>
#include <gmodule.h>
@@ -249,7 +248,7 @@
if (!gnc_gconf_get_bool(GCONF_GENERAL, KEY_SAVE_GEOMETRY, NULL))
return;
-
+
coord_list = gnc_gconf_get_list(section, WINDOW_POSITION,
GCONF_VALUE_INT, NULL);
if (coord_list) {
@@ -326,7 +325,7 @@
{
gtk_option_menu_set_history(GTK_OPTION_MENU(w), i);
active = gtk_menu_get_active(GTK_MENU(menu));
- g_object_set_data(G_OBJECT(active),
+ g_object_set_data(G_OBJECT(active),
"option_index",
GINT_TO_POINTER(i));
}
@@ -345,7 +344,7 @@
{
GObject *item = G_OBJECT(loop_data);
menu_init_data *args = (menu_init_data *) user_data;
-
+
g_object_set_data(item, "option_index", GINT_TO_POINTER(args->i++));
g_signal_connect(item, "activate", args->f, args->cb_data);
}
@@ -438,12 +437,12 @@
if ((tm->tm_mday <= 0) || (tm->tm_mon == -1) || (tm->tm_year == -1))
return FALSE;
- g_date_set_dmy (&gdate,
+ g_date_set_dmy (&gdate,
tm->tm_mday,
tm->tm_mon + 1,
tm->tm_year + 1900);
- /*
+ /*
* Check those keys where the code does different things depending
* upon the modifiers.
*/
@@ -479,7 +478,7 @@
uc = g_utf8_get_char (c);
if (uc == '-')
count++;
- c = g_utf8_next_char (c);
+ c = g_utf8_next_char (c);
}
if (count < 2)
@@ -667,7 +666,7 @@
gdk_draw_line (check_info->on_pixmap, gc,
1, check_size / 2 + 1,
check_size / 3, check_size - 4);
-
+
gdk_draw_line (check_info->on_pixmap, gc,
check_size / 3, check_size - 5,
check_size - 3, 2);
@@ -845,7 +844,7 @@
xml = glade_get_widget_tree (widget);
if (!xml) return NULL;
-
+
wid = glade_xml_get_widget (xml, name);
if (!wid)
PWARN("I know nothing of this '%s' whom you seek.", name);
Modified: gnucash/trunk/src/gnome-utils/gnc-date-edit.c
===================================================================
--- gnucash/trunk/src/gnome-utils/gnc-date-edit.c 2010-02-20 13:26:19 UTC (rev 18695)
+++ gnucash/trunk/src/gnome-utils/gnc-date-edit.c 2010-02-20 13:57:10 UTC (rev 18696)
@@ -35,7 +35,7 @@
#include "config.h"
-#include <gnome.h>
+#include <gnome.h>
#include <glib/gi18n.h>
#include <string.h>
#include <stdlib.h> /* atoi */
@@ -50,7 +50,6 @@
#include "gnc-engine.h"
#include "dialog-utils.h"
#include "gnc-date-edit.h"
-#include "glib-compat.h"
enum {
DATE_CHANGED,
@@ -106,7 +105,7 @@
"GNCDateEdit",
&date_edit_info, 0);
}
-
+
return date_edit_type;
}
@@ -469,7 +468,7 @@
time (¤t_time);
tm_returned = localtime_r (¤t_time, &mtm);
g_return_if_fail(tm_returned != NULL);
-
+
for (i = gde->lower_hour; i <= gde->upper_hour; i++){
GtkWidget *item, *submenu;
hour_info_t *hit;
@@ -531,7 +530,7 @@
GObjectClass *object_class = (GObjectClass *) klass;
object_class = (GObjectClass*) klass;
-
+
parent_class = g_type_class_ref(GTK_TYPE_HBOX);
date_edit_signals [TIME_CHANGED] =
@@ -642,7 +641,7 @@
}
static void
-gnc_date_edit_set_time_tm (GNCDateEdit *gde, struct tm *mytm)
+gnc_date_edit_set_time_tm (GNCDateEdit *gde, struct tm *mytm)
{
char buffer [40];
@@ -709,8 +708,8 @@
{
struct tm mytm;
time_t t;
-
- g_return_if_fail(gde && GNC_IS_DATE_EDIT(gde) &&
+
+ g_return_if_fail(gde && GNC_IS_DATE_EDIT(gde) &&
date && g_date_valid(date));
g_date_to_struct_tm(date, &mytm);
t = mktime(&mytm);
@@ -914,7 +913,7 @@
*
* Creates a new GNCDateEdit widget which can be used to provide
* an easy to use way for entering dates and times.
- *
+ *
* Returns a GNCDateEdit widget.
*/
GtkWidget *
@@ -957,9 +956,9 @@
* gnc_date_edit_new_flags:
* @the_time: The initial time for the date editor.
* @flags: A bitmask of GNCDateEditFlags values.
- *
+ *
* Creates a new GNCDateEdit widget with the specified flags.
- *
+ *
* Return value: the newly-created date editor widget.
**/
GtkWidget *
@@ -1133,20 +1132,20 @@
* gnc_date_edit_set_flags:
* @gde: The date editor widget whose flags should be changed.
* @flags: The new bitmask of GNCDateEditFlags values.
- *
+ *
* Changes the display flags on an existing date editor widget.
**/
void
gnc_date_edit_set_flags (GNCDateEdit *gde, GNCDateEditFlags flags)
{
GNCDateEditFlags old_flags;
-
+
g_return_if_fail (gde != NULL);
g_return_if_fail (GNC_IS_DATE_EDIT (gde));
old_flags = gde->flags;
gde->flags = flags;
-
+
if ((flags & GNC_DATE_EDIT_SHOW_TIME) !=
(old_flags & GNC_DATE_EDIT_SHOW_TIME)) {
if (flags & GNC_DATE_EDIT_SHOW_TIME) {
@@ -1182,9 +1181,9 @@
/**
* gnc_date_edit_get_flags:
* @gde: The date editor whose flags should be queried.
- *
+ *
* Queries the display flags on a date editor widget.
- *
+ *
* Return value: The current display flags for the given date editor widget.
**/
int
@@ -1200,7 +1199,7 @@
* gnc_date_set_activates_default:
* @gde: The date editor to modify
* @state: The new state for this widget.
- *
+ *
* Extracts the editable field from a GNCDateEdit widget, and sets it
* up so that pressing the Enter key in this field as the same as
* clicking the button that has the default.
@@ -1218,7 +1217,7 @@
* gnc_date_grab_focus:
* @gde: The date editor to modify
* @state: The new state for this widget.
- *
+ *
* Sets the focus to the Editable field.
**/
void
Modified: gnucash/trunk/src/gnome-utils/gnc-dense-cal-store.c
===================================================================
--- gnucash/trunk/src/gnome-utils/gnc-dense-cal-store.c 2010-02-20 13:26:19 UTC (rev 18695)
+++ gnucash/trunk/src/gnome-utils/gnc-dense-cal-store.c 2010-02-20 13:57:10 UTC (rev 18696)
@@ -33,7 +33,6 @@
#include "config.h"
#include <glib.h>
#include <glib-object.h>
-#include "glib-compat.h"
#include "gnc-dense-cal.h"
#include "gnc-dense-cal-model.h"
#include "gnc-dense-cal-store.h"
@@ -42,7 +41,7 @@
struct _GncDenseCalStore
{
GObject parent;
-
+
GDate start_date;
gdcs_end_type end_type;
GDate end_date;
@@ -50,7 +49,7 @@
gchar *name;
gchar *info;
int num_marks;
- int num_real_marks;
+ int num_real_marks;
GDate **cal_marks;
};
@@ -76,7 +75,7 @@
{
GObjectClass *object_class = G_OBJECT_CLASS(klass);
parent_class = g_type_class_peek_parent(klass);
-
+
object_class->finalize = gnc_dense_cal_store_finalize;
}
@@ -90,7 +89,7 @@
iface->get_instance_count = gdcs_get_instance_count;
iface->get_instance = gdcs_get_instance;
}
-
+
GType
gnc_dense_cal_store_get_type(void)
{
Modified: gnucash/trunk/src/gnome-utils/gnc-dense-cal.c
===================================================================
--- gnucash/trunk/src/gnome-utils/gnc-dense-cal.c 2010-02-20 13:26:19 UTC (rev 18695)
+++ gnucash/trunk/src/gnome-utils/gnc-dense-cal.c 2010-02-20 13:57:10 UTC (rev 18696)
@@ -22,7 +22,6 @@
#include "config.h"
-#include "glib-compat.h"
#include "gnc-dense-cal.h"
#include "gnc-dense-cal-model.h"
#include "gnc-engine.h"
@@ -265,7 +264,7 @@
{
GtkTreeModel *options;
GtkCellRenderer *text_rend;
-
+
options = GTK_TREE_MODEL(_gdc_get_view_options());
dcal->view_options = GTK_COMBO_BOX(gtk_combo_box_new_with_model(options));
gtk_combo_box_set_active(GTK_COMBO_BOX(dcal->view_options), 0);
@@ -287,7 +286,7 @@
gtk_container_add(GTK_CONTAINER(label_align), GTK_WIDGET(label));
gtk_box_pack_start(GTK_BOX(hbox), GTK_WIDGET(label_align), TRUE, TRUE, 0);
gtk_box_pack_start(GTK_BOX(hbox), GTK_WIDGET(dcal->view_options), FALSE, FALSE, 0);
-
+
gtk_box_pack_start(GTK_BOX(dcal), GTK_WIDGET(hbox), FALSE, FALSE, 0);
}
dcal->cal_drawing_area = GTK_DRAWING_AREA(gtk_drawing_area_new());
@@ -309,7 +308,7 @@
dcal->lastMarkTag = 0;
dcal->showPopup = FALSE;
-
+
dcal->transPopup = GTK_WINDOW(gtk_window_new(GTK_WINDOW_POPUP));
{
GtkWidget *vbox, *hbox;
@@ -373,7 +372,7 @@
pango_font_description_set_size(font_desc, font_size);
gtk_widget_modify_font(GTK_WIDGET(dcal), font_desc);
pango_font_description_free(font_desc);
-
+
maxWidth = maxHeight = 0;
for (i=0; i<12; i++)
{
@@ -387,7 +386,7 @@
// these two were reversed, before...
dcal->label_width = maxWidth;
dcal->label_height = maxHeight;
-
+
g_object_unref(layout);
}
@@ -427,7 +426,7 @@
dcal->min_x_scale = dcal->x_scale = width_88 + 2;
dcal->min_y_scale = dcal->y_scale = MAX(floor((float)width_XXX / 3.), height_88 + 2);
-
+
dcal->dayLabelHeight = height_88;
g_object_unref(layout);
@@ -572,7 +571,7 @@
g_critical("no view options?");
return;
}
-
+
do
{
gint months_val, delta_months;
@@ -718,7 +717,7 @@
gnc_dense_cal_draw_to_buffer(dcal);
}
-static void
+static void
_gdc_compute_min_size(GncDenseCal *dcal, guint *min_width, guint *min_height)
{
if (min_width != NULL)
@@ -1000,7 +999,7 @@
{
gint x, y, w, h;
gint j;
-
+
pango_layout_set_text(layout, "S", -1);
pango_layout_get_pixel_size(layout, NULL, &dcal->dayLabelHeight);
@@ -1038,7 +1037,7 @@
/* draw the day labels */
pango_layout_set_text(layout, "88", -1);
pango_layout_get_pixel_size(layout, &maxWidth, NULL);
-
+
if (dcal->x_scale > maxWidth)
{
for (j=0; j<7; j++)
@@ -1124,7 +1123,7 @@
}
LOG_AND_RESET(timer, "dates");
- gtk_widget_queue_draw_area(GTK_WIDGET(dcal),
+ gtk_widget_queue_draw_area(GTK_WIDGET(dcal),
widget->allocation.x,
widget->allocation.y,
widget->allocation.width,
@@ -1252,7 +1251,7 @@
GtkTreeIter iter;
GtkTreeModel *model;
gint months_val;
-
+
model = GTK_TREE_MODEL(gtk_combo_box_get_model(widget));
if (!gtk_combo_box_get_active_iter(widget, &iter))
return;
@@ -1503,7 +1502,7 @@
rect = NULL;
}
}
-
+
/* Get the last week. */
{
gint end_week_of_year = g_date_get_sunday_week_of_year(endD);
@@ -1629,10 +1628,10 @@
{
return -1;
}
-
+
/* coords -> year-relative-values */
colNum = floor(x / (col_width(dcal)+COL_BORDER_SIZE));
-
+
x %= (col_width(dcal)+COL_BORDER_SIZE);
x -= dcal->label_width;
if (x < 0)
@@ -1783,7 +1782,7 @@
GncDenseCal *cal = GNC_DENSE_CAL(user_data);
g_debug("gdc_model_added_cb update\n");
gdc_add_tag_markings(cal, added_tag);
-}
+}
static void
gdc_model_update_cb(GncDenseCalModel *model, guint update_tag, gpointer user_data)
@@ -1792,7 +1791,7 @@
g_debug("gdc_model_update_cb update for tag [%d]\n", update_tag);
gdc_mark_remove(cal, update_tag, FALSE);
gdc_add_tag_markings(cal, update_tag);
-
+
}
static void
Modified: gnucash/trunk/src/gnome-utils/gnc-frequency.c
===================================================================
--- gnucash/trunk/src/gnome-utils/gnc-frequency.c 2010-02-20 13:26:19 UTC (rev 18695)
+++ gnucash/trunk/src/gnome-utils/gnc-frequency.c 2010-02-20 13:57:10 UTC (rev 18696)
@@ -27,7 +27,6 @@
#include <gtk/gtk.h>
#include <glib/gtypes.h>
-#include "glib-compat.h"
#include <math.h>
#include <time.h>
@@ -117,7 +116,7 @@
0,
(GInstanceInitFunc)gnc_frequency_init
};
-
+
gncfreq_type = g_type_register_static (GTK_TYPE_VBOX,
"GncFrequency",
&gncfreq_info, 0);
@@ -130,7 +129,7 @@
gnc_frequency_class_init( GncFrequencyClass *klass )
{
GObjectClass *object_class;
-
+
object_class = G_OBJECT_CLASS (klass);
gnc_frequency_signals[GNCFREQ_CHANGED] =
@@ -210,7 +209,7 @@
/* initialize the spin buttons */
for (i=0; spinVals[i].name != NULL; i++)
{
- if (spinVals[i].fn != NULL)
+ if (spinVals[i].fn != NULL)
{
o = glade_xml_get_widget(gf->gxml, spinVals[i].name);
adj = gtk_spin_button_get_adjustment(GTK_SPIN_BUTTON(o));
@@ -287,7 +286,7 @@
/* ================================================================= */
/* Relabel some of the labels */
-void
+void
gnc_frequency_set_frequency_label_text(GncFrequency *gf, const gchar *txt)
{
GtkLabel *lbl;
@@ -296,7 +295,7 @@
gtk_label_set_text (lbl, txt);
}
-void
+void
gnc_frequency_set_date_label_text(GncFrequency *gf, const gchar *txt)
{
GtkLabel *lbl;
@@ -469,7 +468,7 @@
case PERIOD_LAST_WEEKDAY: {
guint multiplier;
GtkWidget *multipler_spin, *day_of_month, *weekend_mode;
-
+
multipler_spin = glade_xml_get_widget(gf->gxml, "monthly_spin");
multiplier = recurrenceGetMultiplier(r);
if (recurrenceGetPeriodType(r) == PERIOD_YEAR)
@@ -483,7 +482,7 @@
gtk_notebook_set_current_page(gf->nb, PAGE_MONTHLY);
gtk_combo_box_set_active(gf->freqComboBox, PAGE_MONTHLY);
- } break;
+ } break;
case PERIOD_NTH_WEEKDAY:
g_critical("unhandled period type [%d]", recurrenceGetPeriodType(r));
break;
@@ -515,7 +514,7 @@
int day_of_month_index = gtk_combo_box_get_active(GTK_COMBO_BOX(day_of_month_combo));
GtkWidget *weekend_adjust_combo = glade_xml_get_widget(gf->gxml, combo_weekend_name);
int weekend_adjust = gtk_combo_box_get_active(GTK_COMBO_BOX(weekend_adjust_combo));
-
+
r = g_new0(Recurrence, 1);
if (day_of_month_index > LAST_DAY_OF_MONTH_OPTION_INDEX)
{
@@ -596,7 +595,7 @@
r = g_new0(Recurrence, 1);
recurrenceSet(r, multiplier, PERIOD_WEEK, day_of_week_aligned_date, WEEKEND_ADJ_NONE);
-
+
*recurrences = g_list_append(*recurrences, r);
}
} break;
Modified: gnucash/trunk/src/gnome-utils/gnc-period-select.c
===================================================================
--- gnucash/trunk/src/gnome-utils/gnc-period-select.c 2010-02-20 13:26:19 UTC (rev 18695)
+++ gnucash/trunk/src/gnome-utils/gnc-period-select.c 2010-02-20 13:57:10 UTC (rev 18696)
@@ -33,7 +33,6 @@
#include <gtk/gtk.h>
#include <glib/gi18n.h>
-#include "glib-compat.h"
#include "gnc-date.h"
#include "gnc-gconf-utils.h"
@@ -101,7 +100,7 @@
gboolean start;
GDate *fy_end;
-
+
GDate *date_base;
GtkWidget *date_label;
GtkWidget *date_align;
@@ -373,7 +372,7 @@
GParamSpec *pspec)
{
GncPeriodSelect *period = GNC_PERIOD_SELECT(object);
-
+
switch (prop_id)
{
case PROP_FY_END:
@@ -407,7 +406,7 @@
GParamSpec *pspec)
{
GncPeriodSelect *period = GNC_PERIOD_SELECT(object);
-
+
switch (prop_id)
{
case PROP_FY_END:
@@ -455,7 +454,7 @@
NULL
};
- period_select_type = g_type_register_static(GTK_TYPE_HBOX,
+ period_select_type = g_type_register_static(GTK_TYPE_HBOX,
"GncPeriodSelect",
&period_select_info, 0);
}
@@ -581,7 +580,7 @@
/* Create a new GncPeriodSelect widget which is used to select a
* accounting period like "previous month" or "this year".
- *
+ *
* @param starting_labels If set to TRUE then all the labels will
* refer to the "Start of...". If FALSE, labels will refer to "End
* of...".
Modified: gnucash/trunk/src/gnome-utils/gnc-recurrence.c
===================================================================
--- gnucash/trunk/src/gnome-utils/gnc-recurrence.c 2010-02-20 13:26:19 UTC (rev 18695)
+++ gnucash/trunk/src/gnome-utils/gnc-recurrence.c 2010-02-20 13:57:10 UTC (rev 18696)
@@ -25,7 +25,6 @@
#include "config.h"
#include <gnome.h>
-#include "glib-compat.h"
#include <glade/glade.h>
#include "dialog-utils.h"
Modified: gnucash/trunk/src/import-export/qif-import/druid-qif-import.c
===================================================================
--- gnucash/trunk/src/import-export/qif-import/druid-qif-import.c 2010-02-20 13:26:19 UTC (rev 18695)
+++ gnucash/trunk/src/import-export/qif-import/druid-qif-import.c 2010-02-20 13:57:10 UTC (rev 18696)
@@ -27,9 +27,6 @@
#include <gnome.h>
#include <glib/gi18n.h>
#include <glib/gstdio.h>
-#ifndef HAVE_GLIB_2_8
-#include <gstdio-2.8.h>
-#endif
#include <libguile.h>
#include <sys/time.h>
#include <unistd.h>
More information about the gnucash-changes
mailing list