[balsa] Do not define an unused path
- From: Peter Bloomfield <peterb src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [balsa] Do not define an unused path
- Date: Thu, 27 Apr 2017 11:06:31 +0000 (UTC)
commit fb527d9bdec51fd0db4116f45653729ed61567fb
Author: Peter Bloomfield <PeterBloomfield bellsouth net>
Date: Wed Apr 26 22:07:31 2017 -0400
Do not define an unused path
* configure.ac: do not define BALSA_STD_PREFIX, it is not used.
* libbalsa/files.c: do not put it in a search path.
* src/balsa-icons.c (balsa_register_pixmaps),
(balsa_register_pixbufs): do not append it to the
icon-theme-search-path.
ChangeLog | 10 ++++++++++
configure.ac | 3 +--
libbalsa/files.c | 1 -
src/balsa-icons.c | 7 +------
4 files changed, 12 insertions(+), 9 deletions(-)
---
diff --git a/ChangeLog b/ChangeLog
index 26cdc5a..2e9d812 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+2017-04-26 Peter Bloomfield <pbloomfield bellsouth net>
+
+ Do not define an unused path
+
+ * configure.ac: do not define BALSA_STD_PREFIX, it is not used.
+ * libbalsa/files.c: do not put it in a search path.
+ * src/balsa-icons.c (balsa_register_pixmaps),
+ (balsa_register_pixbufs): do not append it to the
+ icon-theme-search-path.
+
2017-04-24 Peter Bloomfield <pbloomfield bellsouth net>
* libbalsa/files.c (libbalsa_icon_finder): more carefully check
diff --git a/configure.ac b/configure.ac
index ea50351..5b5385f 100644
--- a/configure.ac
+++ b/configure.ac
@@ -795,10 +795,9 @@ dnl ###########################################################################
if test "x$prefix" = "xNONE"; then
prefix=$ac_default_prefix
fi
-CPPFLAGS="$CPPFLAGS -DBALSA_STD_PREFIX=\\\"${prefix}\\\""
-CPPFLAGS="$CPPFLAGS -DBALSA_DATA_PREFIX=\\\"${datadir}/balsa\\\""
BALSA_DATA_PREFIX="${datadir}/balsa"
AC_SUBST(BALSA_DATA_PREFIX)
+CPPFLAGS="$CPPFLAGS -DBALSA_DATA_PREFIX=\\\"${BALSA_DATA_PREFIX}\\\""
dnl Documentation and Testing requirements for libnetclient
diff --git a/libbalsa/files.c b/libbalsa/files.c
index 6e104eb..dbb800a 100644
--- a/libbalsa/files.c
+++ b/libbalsa/files.c
@@ -34,7 +34,6 @@
static const gchar *permanent_prefixes[] = {
BALSA_DATA_PREFIX,
- BALSA_STD_PREFIX,
"src",
".",
NULL
diff --git a/src/balsa-icons.c b/src/balsa-icons.c
index a1ce7cb..9f8b069 100644
--- a/src/balsa-icons.c
+++ b/src/balsa-icons.c
@@ -29,7 +29,7 @@
#include "address-view.h"
/* comment out the next line to suppress info about loading images */
-#if 0
+#if 1
#define BICONS_VERBOSE
#endif
@@ -177,7 +177,6 @@ balsa_register_pixmaps(void)
balsa_icon_table =
g_hash_table_new_full(g_str_hash, g_str_equal, g_free, g_free);
- gtk_icon_theme_append_search_path(icon_theme, BALSA_STD_PREFIX "/share/icons");
gtk_icon_theme_append_search_path(icon_theme, BALSA_DATA_PREFIX);
for (i = 0; i < G_N_ELEMENTS(balsa_icons); i++)
@@ -222,10 +221,6 @@ balsa_register_pixbufs(GtkWidget * widget)
guint i;
GtkIconTheme *icon_theme = gtk_icon_theme_get_default();
- gtk_icon_theme_append_search_path(icon_theme,
- BALSA_STD_PREFIX "/share/icons");
- gtk_icon_theme_append_search_path(icon_theme, BALSA_DATA_PREFIX);
-
for (i = 0; i < G_N_ELEMENTS(icons); i++) {
GdkPixbuf *pixbuf;
GError *err = NULL;
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]