2007-11-22 [wwp] 3.1.0cvs18

	* src/stock_pixmap.c
		Fix a misuse of get_rc_dir(), user themes dir was
		not set properly and some themes might have disappeared
		from themes list in prefs.

diff --git a/ChangeLog b/ChangeLog
index 5c1ca837cebdc5b171ba6f64e07a420d854d3418..9961c561e8bde00815fe5dd458545e5a1be7b142 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2007-11-22 [wwp]       3.1.0cvs18
+
+       * src/stock_pixmap.c
+               Fix a misuse of get_rc_dir(), user themes dir was
+               not set properly and some themes might have disappeared
+               from themes list in prefs.
+
 2007-11-22 [wwp]       3.1.0cvs17
 
        * src/edittags.c

diff --git a/PATCHSETS b/PATCHSETS
index 7e725012029c62643e444cc7fdd411e3b598de6b..fd129f079c5ac80c3a23474435366eebb2ac5dbc 100644 (file)
--- a/PATCHSETS
+++ b/PATCHSETS
@@ -3075,3 +3075,4 @@
 ( cvs diff -u -r 1.204.2.153 -r 1.204.2.154 src/prefs_common.c;  cvs diff -u -r 1.395.2.337 -r 1.395.2.338 src/summaryview.c;  ) > 3.1.0cvs15.patchset
 ( cvs diff -u -r 1.382.2.426 -r 1.382.2.427 src/compose.c;  ) > 3.1.0cvs16.patchset
 ( cvs diff -u -r 1.1.2.12 -r 1.1.2.13 src/edittags.c;  cvs diff -u -r 1.1.2.5 -r 1.1.2.6 src/edittags.h;  cvs diff -u -r 1.1.2.5 -r 1.1.2.6 src/common/tags.c;  cvs diff -u -r 1.1.2.2 -r 1.1.2.3 src/common/tags.h;  ) > 3.1.0cvs17.patchset
+( cvs diff -u -r 1.25.2.49 -r 1.25.2.50 src/stock_pixmap.c;  ) > 3.1.0cvs18.patchset

diff --git a/configure.ac b/configure.ac
index e0cb7cbd1a266f8fbeaa1ad40620e5561311f076..620c6acf95b21cda7e9214f2d06acfaf34a476e1 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -11,7 +11,7 @@ MINOR_VERSION=1
 MICRO_VERSION=0
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=17
+EXTRA_VERSION=18
 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 

diff --git a/src/stock_pixmap.c b/src/stock_pixmap.c
index a0c84fd3439ed26a37de1156601541eac8237d4f..605d5ba045f82ee8e4bf7ba7397d049e223b8466 100644 (file)
--- a/src/stock_pixmap.c
+++ b/src/stock_pixmap.c
@@ -545,8 +545,7 @@ GList *stock_pixmap_themes_list_new(void)
        GList *list = NULL;
        
        defaulttheme = g_strdup(DEFAULT_PIXMAP_THEME);
-       userthemes   = g_strconcat(get_home_dir(), G_DIR_SEPARATOR_S,
-                                  get_rc_dir(), G_DIR_SEPARATOR_S, 
+       userthemes   = g_strconcat(get_rc_dir(), G_DIR_SEPARATOR_S, 
                                   PIXMAP_THEME_DIR, NULL);
        systemthemes = g_strconcat(PACKAGE_DATA_DIR, G_DIR_SEPARATOR_S,
                                   PIXMAP_THEME_DIR, NULL);