[grisbi-cvs] [SCM] grisbi branch, master, updated. upstream_version_0_9.0-37-ga6f9811
Rémi Cardona
nobody at users.sourceforge.net
Thu Mar 3 09:46:06 CET 2011
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "grisbi".
The branch, master has been updated
via a6f9811633c5dcad502c193c050a017475245eac (commit)
via d954f9dd8f2f1a066acb9629f15d2f90c88aa151 (commit)
via 774b17fa4235e3f666698672564acacc1a87c5fd (commit)
via 8e5064a92628ebd6280f731c8dad201305e2c11d (commit)
via 16b10b86ceab1d5e78ff40eb851142119c58cdd3 (commit)
from 13ac11fc22e981a432dd476f4d9c36e9c4ea70d0 (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 a6f9811633c5dcad502c193c050a017475245eac
Author: Rémi Cardona <remi at gentoo.org>
Date: Thu Mar 3 09:05:17 2011 +0100
Delete leaky code made useless by gsb_dirs_*()
commit d954f9dd8f2f1a066acb9629f15d2f90c88aa151
Author: Rémi Cardona <remi at gentoo.org>
Date: Thu Mar 3 09:01:05 2011 +0100
Use gsb_dirs_get_*_dir() wherever possible
commit 774b17fa4235e3f666698672564acacc1a87c5fd
Author: Rémi Cardona <remi at gentoo.org>
Date: Thu Mar 3 08:54:13 2011 +0100
Add gsb_dirs.[ch], hook them up in main()
commit 8e5064a92628ebd6280f731c8dad201305e2c11d
Author: Rémi Cardona <remi at gentoo.org>
Date: Sat Feb 26 20:03:01 2011 +0100
Move color defines to the .c files where they are used
commit 16b10b86ceab1d5e78ff40eb851142119c58cdd3
Author: Rémi Cardona <remi at gentoo.org>
Date: Sat Feb 26 17:59:22 2011 +0100
Remove useless gtk version warning and associated code
-----------------------------------------------------------------------
Changes:
diff --git a/src/Makefile.am b/src/Makefile.am
index 659a143..43e2432 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -88,6 +88,7 @@ libgrisbi_la_SOURCES = \
gsb_data_scheduled.c \
gsb_data_transaction.c \
gsb_debug.c \
+ gsb_dirs.c \
gsb_file.c \
gsb_file_config.c \
gsb_file_load.c \
@@ -224,6 +225,7 @@ libgrisbi_la_SOURCES = \
gsb_data_scheduled.h \
gsb_data_transaction.h \
gsb_debug.h \
+ gsb_dirs.h \
gsb_file.h \
gsb_file_config.h \
gsb_file_load.h \
diff --git a/src/affichage.c b/src/affichage.c
index 6ef0a5d..35348f4 100644
--- a/src/affichage.c
+++ b/src/affichage.c
@@ -51,6 +51,7 @@
#include "custom_list.h"
#include "utils_buttons.h"
#include "erreur.h"
+#include "gsb_dirs.h"
/*END_INCLUDE*/
/*START_STATIC*/
@@ -514,7 +515,7 @@ void change_logo_accueil ( GtkWidget * file_selector )
}
else
{
- if ( g_strcmp0 ( g_path_get_dirname ( chemin_logo ), GRISBI_PIXMAPS_DIR ) == 0 )
+ if ( g_strcmp0 ( g_path_get_dirname ( chemin_logo ), gsb_dirs_get_pixmaps_dir ( ) ) == 0 )
{
gchar *name_logo;
@@ -578,7 +579,7 @@ gboolean modification_logo_accueil ( )
if ( etat.is_pixmaps_dir )
gtk_file_chooser_set_current_folder ( GTK_FILE_CHOOSER (
- file_selector ), GRISBI_PIXMAPS_DIR );
+ file_selector ), gsb_dirs_get_pixmaps_dir ( ) );
else
gtk_file_chooser_set_current_folder ( GTK_FILE_CHOOSER (
file_selector ), gsb_file_get_last_path () );
diff --git a/src/bet_finance_ui.c b/src/bet_finance_ui.c
index add0488..69e4e38 100644
--- a/src/bet_finance_ui.c
+++ b/src/bet_finance_ui.c
@@ -51,6 +51,7 @@
#include "utils_file_selection.h"
#include "utils_str.h"
#include "erreur.h"
+#include "gsb_dirs.h"
/*END_INCLUDE*/
/*START_STATIC*/
@@ -1015,7 +1016,7 @@ void bet_finance_data_list_context_menu ( GtkWidget *tree_view, gint page_num )
origin = GPOINTER_TO_INT ( g_object_get_data ( G_OBJECT ( tree_view ), "origin" ) );
- tmp_str = g_build_filename ( GRISBI_PIXMAPS_DIR, "ac_liability_16.png", NULL);
+ tmp_str = g_build_filename ( gsb_dirs_get_pixmaps_dir ( ), "ac_liability_16.png", NULL);
image = gtk_image_new_from_file ( tmp_str );
gtk_image_set_pixel_size ( GTK_IMAGE ( image ), GTK_ICON_SIZE_MENU );
g_free ( tmp_str );
diff --git a/src/bet_tab.c b/src/bet_tab.c
index ff3a8ba..f256c96 100644
--- a/src/bet_tab.c
+++ b/src/bet_tab.c
@@ -64,6 +64,7 @@
#include "utils_file_selection.h"
#include "utils_str.h"
#include "erreur.h"
+#include "gsb_dirs.h"
/*END_INCLUDE*/
@@ -1478,7 +1479,7 @@ void bet_array_list_context_menu ( GtkWidget *tree_view )
/* Insert an account balance */
if ( gsb_data_account_get_kind ( gsb_gui_navigation_get_current_account ( ) ) != GSB_TYPE_CASH )
{
- tmp_str = g_build_filename ( GRISBI_PIXMAPS_DIR, "ac_bank_16.png", NULL);
+ tmp_str = g_build_filename ( gsb_dirs_get_pixmaps_dir ( ), "ac_bank_16.png", NULL);
image = gtk_image_new_from_file ( tmp_str );
g_free ( tmp_str );
menu_item = gtk_image_menu_item_new_with_label (
diff --git a/src/dialog.c b/src/dialog.c
index 61144f9..a9ce0fa 100644
--- a/src/dialog.c
+++ b/src/dialog.c
@@ -112,12 +112,6 @@ struct conditional_message messages[] =
"Make a copy now."),
FALSE, FALSE },
- { "gtk_obsolete", N_("You are running Grisbi with GTK version %s"),
- N_("Warning, please be aware that the version you run is a DEVELOPMENT version. "
- "In any case do not work with this version on your original accounting files. "
- "(File format may change and render files incompatible with previous versions)."),
- FALSE, FALSE },
-
/*
{ "", N_(),
N_(),
diff --git a/src/grisbi_osx.c b/src/grisbi_osx.c
index 095089b..16bef69 100644
--- a/src/grisbi_osx.c
+++ b/src/grisbi_osx.c
@@ -294,63 +294,6 @@ void grisbi_osx_app_update_menus_cb ( void )
}
-/**
- *
- *
- *
- *
- * */
-gchar *grisbi_osx_get_locale_dir ( void )
-{
- gchar *dir;
-
- if ( gtk_osxapplication_get_bundle_id ( ) )
- dir = g_strconcat (gtk_osxapplication_get_resource_path (), "/share/locale", NULL );
- else
- dir = g_strdup ( LOCALEDIR );
-
- return dir;
-}
-
-
-/**
- *
- *
- *
- *
- * */
-gchar *grisbi_osx_get_pixmaps_dir ( void )
-{
- gchar *dir;
-
- if ( gtk_osxapplication_get_bundle_id ( ) )
- dir = g_strconcat (gtk_osxapplication_get_resource_path (), "/share/pixmaps/grisbi", NULL );
- else
- dir = g_strdup ( PIXMAPS_DIR );
-
- return dir;
-}
-
-
-/**
- *
- *
- *
- *
- * */
-gchar *grisbi_osx_get_plugins_dir ( void )
-{
- gchar *dir;
-
- if ( gtk_osxapplication_get_bundle_id ( ) )
- dir = g_strconcat (gtk_osxapplication_get_resource_path (), "/lib/grisbi", NULL );
- else
- dir = g_strdup ( PLUGINS_DIR );
-
- return dir;
-}
-
-
#endif /* GTKOSXAPPLICATION */
/**
*
diff --git a/src/grisbi_osx.h b/src/grisbi_osx.h
index ca2da6a..d5e27de 100644
--- a/src/grisbi_osx.h
+++ b/src/grisbi_osx.h
@@ -12,10 +12,6 @@
/* START_DECLARATION */
void grisbi_osx_app_active_cb ( GtkOSXApplication* app, gboolean* data );
void grisbi_osx_app_update_menus_cb ( void );
-gchar *grisbi_osx_get_locale_dir ( void );
-gchar *grisbi_osx_get_pixmaps_dir ( void );
-gchar *grisbi_osx_get_plugins_dir ( void );
-
GtkWidget *grisbi_osx_init_menus ( GtkWidget *window, GtkWidget *vbox );
/* END_DECLARATION */
diff --git a/src/gsb_archive_config.c b/src/gsb_archive_config.c
index c6cd3d0..2ecec8a 100644
--- a/src/gsb_archive_config.c
+++ b/src/gsb_archive_config.c
@@ -52,6 +52,7 @@
#include "dialog.h"
#include "transaction_list.h"
#include "structures.h"
+#include "gsb_dirs.h"
/*END_INCLUDE*/
/** Columns for payment methods tree */
@@ -210,7 +211,7 @@ GtkWidget *gsb_archive_config_create ( void )
"clicked",
G_CALLBACK (gsb_archive_config_delete_archive),
archive_treeview );
- tmpstr = g_build_filename ( GRISBI_PIXMAPS_DIR, "import.png", NULL );
+ tmpstr = g_build_filename ( gsb_dirs_get_pixmaps_dir ( ), "import.png", NULL );
gtk_button_set_image ( GTK_BUTTON(button),
gtk_image_new_from_file ( tmpstr ) );
g_free ( tmpstr );
@@ -227,7 +228,7 @@ GtkWidget *gsb_archive_config_create ( void )
"clicked",
G_CALLBACK (gsb_archive_config_destroy_archive),
archive_treeview );
- tmpstr = g_build_filename ( GRISBI_PIXMAPS_DIR, "import.png", NULL );
+ tmpstr = g_build_filename ( gsb_dirs_get_pixmaps_dir ( ), "import.png", NULL );
gtk_button_set_image ( GTK_BUTTON(button),
gtk_image_new_from_file ( tmpstr ) );
g_free ( tmpstr );
diff --git a/src/gsb_assistant.c b/src/gsb_assistant.c
index 6840c4c..b1932f3 100644
--- a/src/gsb_assistant.c
+++ b/src/gsb_assistant.c
@@ -38,6 +38,7 @@
#include "structures.h"
#include "utils.h"
#include "utils_str.h"
+#include "gsb_dirs.h"
/*END_INCLUDE*/
/*START_STATIC*/
@@ -116,7 +117,7 @@ GtkWidget * gsb_assistant_new ( const gchar * title, const gchar * explanation,
if (!image_filename)
image_filename = "grisbi.png";
- tmpstr = g_build_filename ( GRISBI_PIXMAPS_DIR, image_filename, NULL);
+ tmpstr = g_build_filename ( gsb_dirs_get_pixmaps_dir ( ), image_filename, NULL);
image = gtk_image_new_from_file ( tmpstr );
g_free ( tmpstr );
gtk_box_pack_start ( GTK_BOX(hbox), image, FALSE, FALSE, 0 );
diff --git a/src/gsb_currency.c b/src/gsb_currency.c
index ce60dc2..3ae2d15 100644
--- a/src/gsb_currency.c
+++ b/src/gsb_currency.c
@@ -50,6 +50,7 @@
#include "gsb_data_form.h"
#include "gsb_currency_config.h"
#include "erreur.h"
+#include "gsb_dirs.h"
/*END_INCLUDE*/
/*START_STATIC*/
@@ -324,7 +325,7 @@ gboolean gsb_currency_update_combobox_currency_list ( void )
gint currency_number;
currency_number = gsb_data_currency_get_no_currency (list_tmp -> data);
- string = g_strconcat( GRISBI_PIXMAPS_DIR, C_DIRECTORY_SEPARATOR,
+ string = g_strconcat( gsb_dirs_get_pixmaps_dir ( ), C_DIRECTORY_SEPARATOR,
"flags", C_DIRECTORY_SEPARATOR,
gsb_data_currency_get_code_iso4217 (currency_number),
".png", NULL );
@@ -1054,7 +1055,7 @@ GtkWidget *gsb_currency_make_combobox_exchange_dialog ( gint transaction_currenc
combobox_store = gtk_list_store_new ( 3, G_TYPE_INT, GDK_TYPE_PIXBUF,
G_TYPE_STRING);
- string = g_strconcat( GRISBI_PIXMAPS_DIR, C_DIRECTORY_SEPARATOR,
+ string = g_strconcat( gsb_dirs_get_pixmaps_dir ( ), C_DIRECTORY_SEPARATOR,
"flags", C_DIRECTORY_SEPARATOR,
gsb_data_currency_get_code_iso4217 (
transaction_currency_number ),
@@ -1069,7 +1070,7 @@ GtkWidget *gsb_currency_make_combobox_exchange_dialog ( gint transaction_currenc
2, gsb_data_currency_get_name ( transaction_currency_number ),
-1 );
- string = g_strconcat( GRISBI_PIXMAPS_DIR, C_DIRECTORY_SEPARATOR,
+ string = g_strconcat( gsb_dirs_get_pixmaps_dir ( ), C_DIRECTORY_SEPARATOR,
"flags", C_DIRECTORY_SEPARATOR,
gsb_data_currency_get_code_iso4217 (
account_currency_number ),
diff --git a/src/gsb_currency_config.c b/src/gsb_currency_config.c
index c77944e..9f18163 100644
--- a/src/gsb_currency_config.c
+++ b/src/gsb_currency_config.c
@@ -53,6 +53,7 @@
#include "structures.h"
#include "utils_files.h"
#include "erreur.h"
+#include "gsb_dirs.h"
/*END_INCLUDE*/
/*START_STATIC*/
@@ -563,7 +564,7 @@ void gsb_currency_append_currency_to_list ( GtkListStore *model,
GtkTreeIter iter;
gchar *string;
- string = g_strconcat( GRISBI_PIXMAPS_DIR, C_DIRECTORY_SEPARATOR,
+ string = g_strconcat( gsb_dirs_get_pixmaps_dir ( ), C_DIRECTORY_SEPARATOR,
"flags", C_DIRECTORY_SEPARATOR,
gsb_data_currency_get_code_iso4217 (currency_number),
".png", NULL );
@@ -1249,7 +1250,7 @@ void gsb_currency_config_fill_popup_list ( GtkTreeView * tree_view,
GdkPixbuf * pixbuf;
gchar *string;
- string = g_build_filename ( GRISBI_PIXMAPS_DIR,
+ string = g_build_filename ( gsb_dirs_get_pixmaps_dir ( ),
"flags",
currency -> flag_filename,
NULL );
diff --git a/src/gsb_data_account.c b/src/gsb_data_account.c
index d2e5cdf..501f1a4 100644
--- a/src/gsb_data_account.c
+++ b/src/gsb_data_account.c
@@ -51,6 +51,7 @@
#include "utils_dates.h"
#include "utils_str.h"
#include "erreur.h"
+#include "gsb_dirs.h"
/*END_INCLUDE*/
/** \struct
@@ -2700,7 +2701,7 @@ gchar *gsb_data_account_get_account_standard_pixbuf_filename ( kind_account acco
break;
}
- filename = g_build_filename ( GRISBI_PIXMAPS_DIR, account_icon, NULL );
+ filename = g_build_filename ( gsb_dirs_get_pixmaps_dir ( ), account_icon, NULL );
return filename;
}
diff --git a/src/gsb_dirs.c b/src/gsb_dirs.c
new file mode 100644
index 0000000..3a478e8
--- /dev/null
+++ b/src/gsb_dirs.c
@@ -0,0 +1,82 @@
+/* ************************************************************************** */
+/* */
+/* Copyright (C) 2011 Grisbi Development Team */
+/* http://www.grisbi.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 G NTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the */ ); d_account acco 0 ) Àýýÿ "¹ª+ òºª+ @þÿ °þÿ ó¹ª+ È»ª+ è¤Úª+ Öª+ °þÿ øª+ Àýýÿ üýÿ 빪+ 6 è è! è! @þÿ °þÿ xDÖª+ Àþýÿ "¹ª+ ®¹ª+ @þÿ ð¹ª+ þÿ À?:ª+ ó¹ª+ 0:ª+ Ø4:ª+ ¨9:ª+ È»ª+ xDÖª+ Àþýÿ ýýÿ 빪+ à! à! @þÿ °þÿ È
¶ª+ ÿýÿ "¹ª+ ®¹ª+ @þÿ ð¹ª+ þÿ pþÿ hþÿ «Úª+ p °þÿ ó¹ª+ È»ª+ ÿýÿ pþýÿ 빪+ G H I J K M N O P @þÿ °þÿ HŪ+ @þÿ "¹ª+ ®¹ª+ @þÿ 0?:ª+ ó¹ª+ PÖª+ ùiª+ 0:ª+ Ø4:ª+ ¨9:ª+ È»ª+ HŪ+ @þÿ ÿýÿ 빪+ 8Ū+ @þÿ °ÿýÿ 빪+ (Ū+ @þÿ àÿýÿ 빪+ Ū+ @þÿ þÿ 빪+ ¨>:ª+ ó¹ª+ ¨9:ª+ úýÿ Hjª+ 湪+ Ø4:ª+ ° þÿ yHjª+ 湪+ 0:ª+ à þÿ ZHjª+ 湪+ Øôiª+ PÖª+ ùiª+ 0:ª+ ØTÖª+ Ø4:ª+ ¨9:ª+ È»ª+ à=hª+ `þÿ 0þÿ 빪+ # % ' ) * - . 0 3 5 6 7 8 : < = @þÿ °þÿ
p{4ª+ þÿ "¹ª+ 8_Öª+ ó¹ª+ ØTÖª+ YÖª+ È»ª+ c f ½ ª+ °þÿ p{4ª+ þÿ Pþÿ 빪+ Ó%°æ§ìwqÒ-øÒ êÓïs¨Ó,~9×u]ÞÓ 4Q ÷U^Qʧ ¶uª¹ñìò*Äv´Rª+ ð þÿ F`ª+ F`ª+ ?¥ª+ ° þÿ þÿ Ðþÿ ½ ª+ 湪+ è¤Úª+ 0þÿ B`ª+
þÿ þÿ õ<Ûª+ °þÿ ÿÿÿÿÿÿÿÿB`ª+ ¸þÿ ë¹ eneral 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */
+/* */
+/* ************************************************************************** */
+
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
+#ifdef GTKOSXAPPLICATION
+#include <gtkosxapplication.h>
+#endif
+
+#include "include.h"
+#include "gsb_dirs.h"
+
+static gchar *locale_dir;
+static gchar *pixmaps_dir;
+static gchar *plugins_dir;
+
+
+void gsb_dirs_init ( void )
+{
+#ifdef GTKOSXAPPLICATION
+ if ( gtk_osxapplication_get_bundle_id ( ) )
+ {
+ gchar *res_path = gtk_osxapplication_get_resource_path ();
+ locale_dir = g_strconcat (res_path, "/share/locale", NULL );
+ pixmaps_dir = g_strconcat (res_path, "/share/pixmaps/grisbi", NULL );
+ plugins_dir = g_strconcat (res_path, "/lib/grisbi", NULL );
+ g_free ( res_path );
+ }
+ else
+#endif
+ {
+ locale_dir = g_strdup ( LOCALEDIR );
+ pixmaps_dir = g_strdup ( PIXMAPS_DIR );
+ plugins_dir = g_strdup ( PLUGINS_DIR );
+ }
+}
+
+
+void gsb_dirs_shutdown ( void )
+{
+ g_free ( locale_dir );
+ g_free ( pixmaps_dir );
+ g_free ( plugins_dir );
+}
+
+
+const gchar *gsb_dirs_get_locale_dir ( void )
+{
+ return locale_dir;
+}
+
+
+const gchar *gsb_dirs_get_pixmaps_dir ( void )
+{
+ return pixmaps_dir;
+}
+
+
+const gchar *gsb_dirs_get_plugins_dir ( void )
+{
+ return plugins_dir;
+}
diff --git a/src/gsb_dirs.h b/src/gsb_dirs.h
new file mode 100644
index 0000000..5b1e255
--- /dev/null
+++ b/src/gsb_dirs.h
@@ -0,0 +1,12 @@
+#ifndef _GSB_DIRS_H
+#define _GSB_DIRS_H
+
+#include <glib.h>
+
+void gsb_dirs_init ( void );
+void gsb_dirs_shutdown ( void );
+const gchar *gsb_dirs_get_locale_dir ( void );
+const gchar *gsb_dirs_get_pixmaps_dir ( void );
+const gchar *gsb_dirs_get_plugins_dir ( void );
+
+#endif
diff --git a/src/gsb_file_load.c b/src/gsb_file_load.c
index 9d82b83..87cda7b 100644
--- a/src/gsb_file_load.c
+++ b/src/gsb_file_load.c
@@ -77,6 +77,7 @@
#include "utils_files.h"
#include "utils_str.h"
#include "erreur.h"
+#include "gsb_dirs.h"
/*END_INCLUDE*/
/*START_STATIC*/
@@ -895,9 +896,9 @@ void gsb_file_load_general_part ( const gchar **attribute_names,
gchar *chemin_logo = NULL;
if ( etat.name_logo )
- chemin_logo = g_build_filename ( GRISBI_PIXMAPS_DIR, etat.name_logo, NULL );
+ chemin_logo = g_build_filename ( gsb_dirs_get_pixmaps_dir ( ), etat.name_logo, NULL );
else
- chemin_logo = g_build_filename ( GRISBI_PIXMAPS_DIR, "grisbi-logo.png", NULL );
+ chemin_logo = g_build_filename ( gsb_dirs_get_pixmaps_dir ( ), "grisbi-logo.png", NULL );
if ( chemin_logo )
pixbuf = gdk_pixbuf_new_from_file ( chemin_logo, NULL );
if ( chemin_logo && strlen ( chemin_logo ) > 0 )
diff --git a/src/gsb_form_widget.c b/src/gsb_form_widget.c
index dd5287a..025baef 100644
--- a/src/gsb_form_widget.c
+++ b/src/gsb_form_widget.c
@@ -48,7 +48,6 @@
#include "gsb_fyear.h"
#include "gsb_payment_method.h"
#include "gtk_combofix.h"
-#include "traitement_variables.h"
#include "gsb_data_payment.h"
#include "structures.h"
#include "erreur.h"
@@ -79,6 +78,12 @@ static gint old_debit_payment_number = 0;
static gchar *old_credit_payment_content = NULL;
static gchar *old_debit_payment_content = NULL;
+/* empty entry in form color */
+#define EMPTY_ENTRY_COLOR_RED 50000
+#define EMPTY_ENTRY_COLOR_GREEN 50000
+#define EMPTY_ENTRY_COLOR_BLUE 50000
+
+
/**
* return the list wich contains the widgets of the form
*
diff --git a/src/gsb_scheduler_list.c b/src/gsb_scheduler_list.c
index c45ec26..1afe13f 100644
--- a/src/gsb_scheduler_list.c
+++ b/src/gsb_scheduler_list.c
@@ -61,6 +61,7 @@
#include "gsb_transactions_list.h"
#include "mouse.h"
#include "erreur.h"
+#include "gsb_dirs.h"
/*END_INCLUDE*/
/*START_STATIC*/
@@ -2168,7 +2169,7 @@ void popup_scheduled_context_menu ( void )
/* Display/hide comments */
menu_item = gtk_image_menu_item_new_with_label ( _("Displays/Cache comments") );
gtk_image_menu_item_set_image ( GTK_IMAGE_MENU_ITEM ( menu_item ),
- gtk_image_new_from_file ( g_build_filename ( GRISBI_PIXMAPS_DIR,
+ gtk_image_new_from_file ( g_build_filename ( gsb_dirs_get_pixmaps_dir ( ),
"comments.png", NULL ) ) );
g_signal_connect_swapped ( G_OBJECT ( menu_item ),
"activate",
diff --git a/src/gsb_select_icon.c b/src/gsb_select_icon.c
index e4ad345..3881f6a 100644
--- a/src/gsb_select_icon.c
+++ b/src/gsb_select_icon.c
@@ -36,6 +36,7 @@
#include "structures.h"
#include "utils.h"
#include "erreur.h"
+#include "gsb_dirs.h"
/*END_INCLUDE*/
/*START_STATIC*/
@@ -256,9 +257,9 @@ GtkWidget * gsb_select_icon_create_entry_text ( gchar * name_icon )
devel_debug ( "combo n'existe pas" );
store = gtk_list_store_new ( 2, G_TYPE_STRING, G_TYPE_INT );
gtk_list_store_append (store, &iter);
- if ( g_strcmp0 ( GRISBI_PIXMAPS_DIR, path_icon ) != 0 )
+ if ( g_strcmp0 ( gsb_dirs_get_pixmaps_dir ( ), path_icon ) != 0 )
{
- gtk_list_store_set (store, &iter, 0, GRISBI_PIXMAPS_DIR, -1);
+ gtk_list_store_set (store, &iter, 0, gsb_dirs_get_pixmaps_dir ( ), -1);
gtk_list_store_prepend (store, &iter);
}
gtk_list_store_set (store, &iter, 0, path_icon, -1);
@@ -659,7 +660,7 @@ GdkPixbuf *gsb_select_icon_get_default_logo_pixbuf ( void )
GError *error = NULL;
pixbuf = gdk_pixbuf_new_from_file ( g_build_filename
- (GRISBI_PIXMAPS_DIR, "grisbi-logo.png", NULL), &error );
+ (gsb_dirs_get_pixmaps_dir ( ), "grisbi-logo.png", NULL), &error );
if ( ! pixbuf )
{
diff --git a/src/import.c b/src/import.c
index 524eddb..16d4167 100644
--- a/src/import.c
+++ b/src/import.c
@@ -79,6 +79,7 @@
#include "utils_files.h"
#include "structures.h"
#include "erreur.h"
+#include "gsb_dirs.h"
/*END_INCLUDE*/
/*START_STATIC*/
@@ -409,7 +410,7 @@ GtkWidget *import_create_file_selection_page ( GtkWidget * assistant )
paddingbox = new_paddingbox_with_title ( vbox, TRUE, _("Choose file to import"));
chooser = gtk_button_new_with_label ( _("Add file to import..." ));
- tmpstr = g_build_filename ( GRISBI_PIXMAPS_DIR, "import.png", NULL );
+ tmpstr = g_build_filename ( gsb_dirs_get_pixmaps_dir ( ), "import.png", NULL );
gtk_button_set_image ( GTK_BUTTON(chooser),
gtk_image_new_from_file ( tmpstr ) );
g_free ( tmpstr );
diff --git a/src/main.c b/src/main.c
index 838aba9..b0cef7f 100644
--- a/src/main.c
+++ b/src/main.c
@@ -52,6 +52,7 @@
#include "traitement_variables.h"
#include "utils.h"
#include "erreur.h"
+#include "gsb_dirs.h"
/*END_INCLUDE*/
#ifdef GTKOSXAPPLICATION
@@ -133,6 +134,7 @@ int main ( int argc, char **argv )
g_mem_set_vtable(glib_mem_profiler_table);
#endif
+ gsb_dirs_init ( );
#ifdef _WIN32
main_win_32 ( argc, argv );
#else
@@ -142,6 +144,7 @@ int main ( int argc, char **argv )
main_linux ( argc, argv );
#endif /* GTKOSXAPPLICATION || linux */
#endif /* _WIN32 */
+ gsb_dirs_shutdown ( );
#if GSB_GMEMPROFILE
g_mem_profile();
@@ -164,7 +167,7 @@ void main_linux ( int argc, char **argv )
cmdline_options opt;
gint status = CMDLINE_SYNTAX_OK;
- bindtextdomain ( PACKAGE, LOCALEDIR );
+ bindtextdomain ( PACKAGE, gsb_dirs_get_locale_dir ( ) );
bind_textdomain_codeset ( PACKAGE, "UTF-8" );
textdomain ( PACKAGE );
@@ -225,7 +228,6 @@ void main_mac_osx ( int argc, char **argv )
GtkWidget *menubar;
GdkPixbuf *pixbuf;
cmdline_options opt;
- gchar *locale_dir;
gboolean first_use = FALSE;
gint status = CMDLINE_SYNTAX_OK;
GtkOSXApplication *theApp;
@@ -241,8 +243,7 @@ void main_mac_osx ( int argc, char **argv )
/* init the app */
theApp = g_object_new ( GTK_TYPE_OSX_APPLICATION, NULL );
- locale_dir = grisbi_osx_get_locale_dir ( );
- bindtextdomain ( PACKAGE, locale_dir );
+ bindtextdomain ( PACKAGE, gsb_dirs_get_locale_dir ( ) );
bind_textdomain_codeset ( PACKAGE, "UTF-8" );
textdomain ( PACKAGE );
@@ -301,7 +302,7 @@ void main_mac_osx ( int argc, char **argv )
if ( quartz_application_get_bundle_id ( ) == NULL )
{
pixbuf = gdk_pixbuf_new_from_file ( g_build_filename
- (GRISBI_PIXMAPS_DIR, "grisbi-logo.png", NULL), NULL );
+ (gsb_dirs_get_pixmaps_dir ( ), "grisbi-logo.png", NULL), NULL );
if ( pixbuf )
gtk_osxapplication_set_dock_icon_pixbuf ( theApp, pixbuf );
}
@@ -345,7 +346,7 @@ void main_win_32 ( int argc, char **argv )
/* needed to be able to use the "common" installation of GTK libraries */
win32_make_sure_the_gtk2_dlls_path_is_in_PATH();
- bindtextdomain ( PACKAGE, LOCALEDIR );
+ bindtextdomain ( PACKAGE, gsb_dirs_get_locale_dir ( ) );
bind_textdomain_codeset ( PACKAGE, "UTF-8" );
textdomain ( PACKAGE );
@@ -434,11 +435,11 @@ gboolean gsb_grisbi_init_app ( void )
gchar *string;
#ifdef HAVE_PLUGINS
- gsb_plugins_scan_dir ( GRISBI_PLUGINS_DIR );
+ gsb_plugins_scan_dir ( gsb_dirs_get_plugins_dir ( ) );
#endif
/* create the icon of grisbi (set in the panel of gnome or other) */
- string = g_build_filename ( GRISBI_PIXMAPS_DIR, "grisbi-logo.png", NULL );
+ string = g_build_filename ( gsb_dirs_get_pixmaps_dir ( ), "grisbi-logo.png", NULL );
if ( g_file_test ( string, G_FILE_TEST_EXISTS ) )
gtk_window_set_default_icon_from_file ( string, NULL );
g_free (string);
@@ -452,20 +453,6 @@ gboolean gsb_grisbi_init_app ( void )
if ( ! gsb_file_config_load_config () )
first_use = TRUE;
- /* test version of GTK */
- if ( gtk_check_version ( VERSION_GTK_MAJOR, VERSION_GTK_MINOR, VERSION_GTK_MICRO ) )
- {
- string = g_strdup_printf ( _("You are running Grisbi with GTK version %s"),
- get_gtk_run_version ( ) );
- dialogue_conditional_hint ( string,
- _("The version of GTK you are using do not benefit from its "
- "latest features.\n"
- "\n"
- "You should upgrade GTK."),
- "gtk_obsolete" );
- g_free ( string );
- }
-
return first_use;
}
@@ -835,13 +822,6 @@ gchar *gsb_main_get_print_locale_var ( void )
gchar *gsb_main_get_print_dir_var ( void )
{
gchar *path_str = NULL;
- gchar *tmp_str = NULL;
-
-#ifdef GTKOSXAPPLICATION
- tmp_str = grisbi_osx_get_locale_dir ( );
-#else
- tmp_str = g_strdup ( LOCALEDIR );
-#endif
path_str = g_strdup_printf ( "Paths\n"
"\tXDG_DATA_HOME = %s\n"
@@ -850,20 +830,18 @@ gchar *gsb_main_get_print_dir_var ( void )
"\tC_PATH_CONFIG = %s\n"
"\tC_PATH_CONFIG_ACCELS = %s\n"
"\tC_PATH_DATA_FILES = %s\n\n"
- "\tGRISBI_LOCALEDIR = %s\n"
- "\tGRISBI_PLUGINS_DIR = %s\n"
- "\tGRISBI_PIXMAPS_DIR = %s\n\n",
+ "\tgsb_dirs_get_locale_dir ( ) = %s\n"
+ "\tgsb_dirs_get_plugins_dir ( ) = %s\n"
+ "\tgsb_dirs_get_pixmaps_dir ( ) = %s\n\n",
g_get_user_data_dir ( ),
g_get_user_config_dir ( ),
C_GRISBIRC,
C_PATH_CONFIG,
C_PATH_CONFIG_ACCELS,
C_PATH_DATA_FILES,
- tmp_str,
- GRISBI_PLUGINS_DIR,
- GRISBI_PIXMAPS_DIR );
-
- g_free ( tmp_str );
+ gsb_dirs_get_locale_dir ( ),
+ gsb_dirs_get_plugins_dir ( ),
+ gsb_dirs_get_pixmaps_dir ( ) );
return path_str;
}
diff --git a/src/navigation.c b/src/navigation.c
index 13fbd3c..5b52b73 100644
--- a/src/navigation.c
+++ b/src/navigation.c
@@ -62,6 +62,7 @@
#include "erreur.h"
#include "structures.h"
#include "utils.h"
+#include "gsb_dirs.h"
/*END_INCLUDE*/
/*START_STATIC*/
@@ -244,7 +245,7 @@ GtkWidget * create_navigation_pane ( void )
gtk_tree_view_append_column ( GTK_TREE_VIEW ( navigation_tree_view ),
GTK_TREE_VIEW_COLUMN ( column ) );
/* Account list */
- tmpstr = g_build_filename ( GRISBI_PIXMAPS_DIR, "ac_home.png", NULL );
+ tmpstr = g_build_filename ( gsb_dirs_get_pixmaps_dir ( ), "ac_home.png", NULL );
pixbuf = gdk_pixbuf_new_from_file ( tmpstr , NULL );
g_free ( tmpstr );
gtk_tree_store_append(GTK_TREE_STORE(navigation_model), &account_iter, NULL);
@@ -261,7 +262,7 @@ GtkWidget * create_navigation_pane ( void )
create_account_list ( GTK_TREE_MODEL(navigation_model) );
/* Scheduler */
- tmpstr = g_build_filename( GRISBI_PIXMAPS_DIR, "scheduler.png", NULL );
+ tmpstr = g_build_filename( gsb_dirs_get_pixmaps_dir ( ), "scheduler.png", NULL );
pixbuf = gdk_pixbuf_new_from_file ( tmpstr , NULL );
g_free ( tmpstr );
gtk_tree_store_append(GTK_TREE_STORE(navigation_model), &iter, NULL);
@@ -277,7 +278,7 @@ GtkWidget * create_navigation_pane ( void )
-1 );
/* Payees */
- tmpstr = g_build_filename( GRISBI_PIXMAPS_DIR, "payees.png", NULL );
+ tmpstr = g_build_filename( gsb_dirs_get_pixmaps_dir ( ), "payees.png", NULL );
pixbuf = gdk_pixbuf_new_from_file ( tmpstr , NULL );
g_free ( tmpstr );
gtk_tree_store_append(GTK_TREE_STORE(navigation_model), &iter, NULL);
@@ -293,7 +294,7 @@ GtkWidget * create_navigation_pane ( void )
-1 );
/* Credits simulator */
- tmpstr = g_build_filename( GRISBI_PIXMAPS_DIR, "ac_liability.png", NULL );
+ tmpstr = g_build_filename( gsb_dirs_get_pixmaps_dir ( ), "ac_liability.png", NULL );
pixbuf = gdk_pixbuf_new_from_file ( tmpstr , NULL );
g_free ( tmpstr );
gtk_tree_store_append(GTK_TREE_STORE(navigation_model), &iter, NULL);
@@ -309,7 +310,7 @@ GtkWidget * create_navigation_pane ( void )
-1 );
/* Categories */
- tmpstr = g_build_filename( GRISBI_PIXMAPS_DIR, "categories.png", NULL );
+ tmpstr = g_build_filename( gsb_dirs_get_pixmaps_dir ( ), "categories.png", NULL );
pixbuf = gdk_pixbuf_new_from_file ( tmpstr , NULL );
g_free ( tmpstr );
gtk_tree_store_append(GTK_TREE_STORE(navigation_model), &iter, NULL);
@@ -325,7 +326,7 @@ GtkWidget * create_navigation_pane ( void )
-1 );
/* Budgetary lines */
- tmpstr = g_build_filename( GRISBI_PIXMAPS_DIR, "budgetary_lines.png", NULL );
+ tmpstr = g_build_filename( gsb_dirs_get_pixmaps_dir ( ), "budgetary_lines.png", NULL );
pixbuf = gdk_pixbuf_new_from_file ( tmpstr , NULL );
g_free ( tmpstr );
gtk_tree_store_append(GTK_TREE_STORE(navigation_model), &iter, NULL);
@@ -341,7 +342,7 @@ GtkWidget * create_navigation_pane ( void )
-1 );
/* Reports */
- tmpstr = g_build_filename( GRISBI_PIXMAPS_DIR, "reports.png", NULL );
+ tmpstr = g_build_filename( gsb_dirs_get_pixmaps_dir ( ), "reports.png", NULL );
pixbuf = gdk_pixbuf_new_from_file ( tmpstr , NULL );
g_free ( tmpstr );
gtk_tree_store_append(GTK_TREE_STORE(navigation_model), &reports_iter, NULL);
diff --git a/src/parametres.c b/src/parametres.c
index d2a8ee3..0e68e78 100644
--- a/src/parametres.c
+++ b/src/parametres.c
@@ -695,8 +695,6 @@ GtkWidget *onglet_messages_and_warnings ( void )
g_path_get_basename ( nom_fichier_comptes ) );
else if ( g_utf8_collate ( messages[i].name, "development-version" ) == 0 )
tmpstr = g_strdup_printf ( _(messages[i] . hint), VERSION );
- else if ( g_utf8_collate ( messages[i].name, "gtk_obsolete" ) == 0 )
- tmpstr = g_strdup_printf ( _(messages[i] . hint), get_gtk_run_version ( ) );
else
tmpstr = g_strdup ( _(messages[i] . hint) );
diff --git a/src/parse_cmdline.c b/src/parse_cmdline.c
index cf52064..1427b51 100644
--- a/src/parse_cmdline.c
+++ b/src/parse_cmdline.c
@@ -31,6 +31,7 @@
#include "utils_str.h"
#include "structures.h"
#include "utils.h"
+#include "gsb_dirs.h"
/*END_INCLUDE*/
/*START_STATIC*/
@@ -171,7 +172,7 @@ gboolean parse_options(int argc, char **argv, cmdline_options *pOpt, gint* pErr
void show_version(void)
{
#ifdef HAVE_PLUGINS
- gsb_plugins_scan_dir ( GRISBI_PLUGINS_DIR );
+ gsb_plugins_scan_dir ( gsb_dirs_get_plugins_dir ( ) );
#endif
g_print(N_("Grisbi version %s, %s\n"), VERSION, gsb_plugin_get_list());
diff --git a/src/structures.h b/src/structures.h
index fe1a983..8e03daf 100644
--- a/src/structures.h
+++ b/src/structures.h
@@ -18,17 +18,9 @@
#define VERSION_FICHIER_ETAT "0.6.0"
#define VERSION_FICHIER_CATEG "0.6.0"
#define VERSION_FICHIER_IB "0.6.0"
-#define VERSION_GTK_MAJOR 2
-#define VERSION_GTK_MINOR 16
-#define VERSION_GTK_MICRO 0
#define CSV_MAX_TOP_LINES 10 /** How many lines to show in CSV preview. */
-/* definition des variables PIXMAPS_DIR PLUGINS_DIR */
-#define GRISBI_PIXMAPS_DIR (utils_get_pixmaps_dir ( ) )
-#define GRISBI_PLUGINS_DIR (utils_get_plugins_dir ( ) )
-
-
/** structure etat
* variables contenant juste 0 ou 1
* FIXME : scinder cette structure en 3 parties :
@@ -65,7 +57,7 @@ struct gsb_etat_t
/* Fonts & logo */
gint utilise_logo;
- gboolean is_pixmaps_dir; /* TRUE if path_icon == GRISBI_PIXMAPS_DIR */
+ gboolean is_pixmaps_dir; /* TRUE if path_icon == gsb_dirs_get_pixmaps_dir ( ) */
gchar *name_logo;
gint display_toolbar; /** Display mode of toolbar. */
diff --git a/src/traitement_variables.c b/src/traitement_variables.c
index 73b3c27..2974cc7 100644
--- a/src/traitement_variables.c
+++ b/src/traitement_variables.c
@@ -107,6 +107,53 @@ gchar *labels_titres_colonnes_liste_ope[] = {
N_("Number"),
NULL };
+/* background color */
+#define BG_COLOR_1_RED 55000
+#define BG_COLOR_1_GREEN 55000
+#define BG_COLOR_1_BLUE 65535
+
+#define BG_COLOR_2_RED 65535
+#define BG_COLOR_2_GREEN 65535
+#define BG_COLOR_2_BLUE 65535
+
+/* couleur du jour */
+#define BG_COLOR_TODAY_RED 55512
+#define BG_COLOR_TODAY_GREEN 55512
+#define BG_COLOR_TODAY_BLUE 55512
+
+/* text color */
+#define TEXT_COLOR_1_RED 0
+#define TEXT_COLOR_1_GREEN 0
+#define TEXT_COLOR_1_BLUE 0
+
+#define TEXT_COLOR_2_RED 65535
+#define TEXT_COLOR_2_GREEN 0
+#define TEXT_COLOR_2_BLUE 0
+
+/* selection color */
+#define SELECTION_COLOR_RED 63000
+#define SELECTION_COLOR_GREEN 40000
+#define SELECTION_COLOR_BLUE 40000
+
+/* scheduler color */
+#define UNSENSITIVE_SCHEDULED_COLOR_RED 50000
+#define UNSENSITIVE_SCHEDULED_COLOR_GREEN 50000
+#define UNSENSITIVE_SCHEDULED_COLOR_BLUE 50000
+
+/* archive background color */
+#define COLOR_ARCHIVE_BG_RED 15000
+#define COLOR_ARCHIVE_BG_GREEN 30000
+#define COLOR_ARCHIVE_BG_BLUE 10000
+
+/* children of splitted transaction color */
+#define BREAKDOWN_BACKGROUND_COLOR_RED 61423
+#define BREAKDOWN_BACKGROUND_COLOR_GREEN 50629
+#define BREAKDOWN_BACKGROUND_COLOR_BLUE 50629
+
+/* calendar entry color (when wrong date) */
+#define CALENDAR_ENTRY_COLOR_RED 65535
+#define CALENDAR_ENTRY_COLOR_GREEN 0
+#define CALENDAR_ENTRY_COLOR_BLUE 0
/** defaults colors in the transactions list */
diff --git a/src/traitement_variables.h b/src/traitement_variables.h
index f76fbdf..90debaf 100644
--- a/src/traitement_variables.h
+++ b/src/traitement_variables.h
@@ -3,60 +3,6 @@
#include <glib.h>
-/* background color */
-#define BG_COLOR_1_RED 55000
-#define BG_COLOR_1_GREEN 55000
-#define BG_COLOR_1_BLUE 65535
-
-#define BG_COLOR_2_RED 65535
-#define BG_COLOR_2_GREEN 65535
-#define BG_COLOR_2_BLUE 65535
-
-/* couleur du jour */
-#define BG_COLOR_TODAY_RED 55512
-#define BG_COLOR_TODAY_GREEN 55512
-#define BG_COLOR_TODAY_BLUE 55512
-
-/* text color */
-#define TEXT_COLOR_1_RED 0
-#define TEXT_COLOR_1_GREEN 0
-#define TEXT_COLOR_1_BLUE 0
-
-#define TEXT_COLOR_2_RED 65535
-#define TEXT_COLOR_2_GREEN 0
-#define TEXT_COLOR_2_BLUE 0
-
-/* selection color */
-#define SELECTION_COLOR_RED 63000
-#define SELECTION_COLOR_GREEN 40000
-#define SELECTION_COLOR_BLUE 40000
-
-/* scheduler color */
-#define UNSENSITIVE_SCHEDULED_COLOR_RED 50000
-#define UNSENSITIVE_SCHEDULED_COLOR_GREEN 50000
-#define UNSENSITIVE_SCHEDULED_COLOR_BLUE 50000
-
-/* empty entry in form color */
-#define EMPTY_ENTRY_COLOR_RED 50000
-#define EMPTY_ENTRY_COLOR_GREEN 50000
-#define EMPTY_ENTRY_COLOR_BLUE 50000
-
-/* archive background color */
-#define COLOR_ARCHIVE_BG_RED 15000
-#define COLOR_ARCHIVE_BG_GREEN 30000
-#define COLOR_ARCHIVE_BG_BLUE 10000
-
-/* children of splitted transaction color */
-#define BREAKDOWN_BACKGROUND_COLOR_RED 61423
-#define BREAKDOWN_BACKGROUND_COLOR_GREEN 50629
-#define BREAKDOWN_BACKGROUND_COLOR_BLUE 50629
-
-/* calendar entry color (when wrong date) */
-#define CALENDAR_ENTRY_COLOR_RED 65535
-#define CALENDAR_ENTRY_COLOR_GREEN 0
-#define CALENDAR_ENTRY_COLOR_BLUE 0
-
-
/* START_INCLUDE_H */
/* END_INCLUDE_H */
diff --git a/src/utils.c b/src/utils.c
index 700dbe4..bee7d0a 100644
--- a/src/utils.c
+++ b/src/utils.c
@@ -38,6 +38,7 @@
#include "structures.h"
#include "utils_str.h"
#include "erreur.h"
+#include "gsb_dirs.h"
/*END_INCLUDE*/
#ifdef GTKOSXAPPLICATION
@@ -345,7 +346,7 @@ GtkWidget *new_vbox_with_title_and_icon ( gchar * title,
/* Icon */
if ( image_filename )
{
- gchar* tmpstr = g_build_filename ( GRISBI_PIXMAPS_DIR,
+ gchar* tmpstr = g_build_filename ( gsb_dirs_get_pixmaps_dir ( ),
image_filename, NULL);
image = gtk_image_new_from_file (tmpstr);
g_free(tmpstr);
@@ -510,38 +511,6 @@ gchar *get_gtk_run_version ( void )
*
*
* */
-gchar *utils_get_pixmaps_dir ( void )
-{
-#ifdef GTKOSXAPPLICATION
- return grisbi_osx_get_pixmaps_dir ( );
-#else
- return PIXMAPS_DIR;
-#endif
-}
-
-
-/**
- *
- *
- *
- *
- * */
-gchar *utils_get_plugins_dir ( void )
-{
-#ifdef GTKOSXAPPLICATION
- return grisbi_osx_get_plugins_dir ( );
-#else
- return PLUGINS_DIR;
-#endif
-}
-
-
-/**
- *
- *
- *
- *
- * */
void lance_mailer ( const gchar *uri )
{
gchar *chaine;
diff --git a/src/utils.h b/src/utils.h
index 3c9b9e6..416a4bf 100644
--- a/src/utils.h
+++ b/src/utils.h
@@ -29,8 +29,6 @@ gboolean sens_desensitive_pointeur ( GtkWidget *bouton,
gboolean sensitive_widget ( gpointer object,
GtkWidget *widget );
void update_ecran ( void );
-gchar *utils_get_pixmaps_dir ( void );
-gchar *utils_get_plugins_dir ( void );
/* END_DECLARATION */
#endif
diff --git a/src/utils_buttons.c b/src/utils_buttons.c
index 7b44f9a..30d090c 100644
--- a/src/utils_buttons.c
+++ b/src/utils_buttons.c
@@ -32,6 +32,7 @@
#include "gsb_automem.h"
#include "structures.h"
#include "utils.h"
+#include "gsb_dirs.h"
/*END_INCLUDE*/
/*START_STATIC*/
@@ -100,13 +101,13 @@ GtkWidget * new_image_label ( GsbButtonStyle style, const gchar * image_name, co
/* Define image */
if ( style == GSB_BUTTON_ICON || style == GSB_BUTTON_BOTH )
{
- image = gtk_image_new_from_file (g_build_filename ( GRISBI_PIXMAPS_DIR,
+ image = gtk_image_new_from_file (g_build_filename ( gsb_dirs_get_pixmaps_dir ( ),
image_name, NULL));
gtk_box_pack_start ( GTK_BOX(vbox), image, TRUE, TRUE, 0 );
}
else if (style == GSB_BUTTON_BOTH_HORIZ )
{
- image = gtk_image_new_from_file (g_build_filename ( GRISBI_PIXMAPS_DIR,
+ image = gtk_image_new_from_file (g_build_filename ( gsb_dirs_get_pixmaps_dir ( ),
image_name, NULL));
gtk_box_pack_start ( GTK_BOX(hbox), image, TRUE, TRUE, 0 );
}
hooks/post-receive
--
grisbi
More information about the cvs
mailing list