2007-10-08 [paul] 3.0.2cvs32

	* src/prefs_themes.c
	* src/stock_pixmap.c
		replace 2 direct uses of RC_DIR

diff --git a/ChangeLog b/ChangeLog
index 747f96ecf1c05fb320d0b015d5c72b77468fbdcb..e605b0e7089030b59f5b89dff55cd7c3a0595dd0 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2007-10-08 [paul]      3.0.2cvs32
+
+       * src/prefs_themes.c
+       * src/stock_pixmap.c
+               replace 2 direct uses of RC_DIR
+

 2007-10-07 [colin]     3.0.2cvs31
 
        * src/addrduplicates.c
 2007-10-07 [colin]     3.0.2cvs31
 
        * src/addrduplicates.c

diff --git a/PATCHSETS b/PATCHSETS
index 68ecc7509c10d4471116a5a3d7438d73572c3e1a..32ff3e832a7c94a6f197eac280fab9d8c0698e7a 100644 (file)
--- a/PATCHSETS
+++ b/PATCHSETS
@@ -2944,3 +2944,4 @@
 ( cvs diff -u -r 1.100.2.55 -r 1.100.2.56 AUTHORS;  cvs diff -u -r 1.1.2.41 -r 1.1.2.42 src/gtk/authors.h;  ) > 3.0.2cvs29.patchset
 ( cvs diff -u -r 1.5.2.25 -r 1.5.2.26 src/exporthtml.c;  cvs diff -u -r 1.28.2.40 -r 1.28.2.41 src/mbox.c;  cvs diff -u -r 1.36.2.116 -r 1.36.2.117 src/common/utils.c;  ) > 3.0.2cvs30.patchset
 ( cvs diff -u -r 1.1.2.1 -r 1.1.2.2 src/addrduplicates.c;  cvs diff -u -r 1.1.2.1 -r 1.1.2.2 src/addrduplicates.h;  cvs diff -u -r 1.60.2.99 -r 1.60.2.100 src/addressbook.c;  cvs diff -u -r 1.18.2.9 -r 1.18.2.10 src/addressbook.h;  cvs diff -u -r 1.28.2.32 -r 1.28.2.33 src/addrindex.c;  cvs diff -u -r 1.9.2.12 -r 1.9.2.13 src/addrindex.h;  ) > 3.0.2cvs31.patchset
 ( cvs diff -u -r 1.100.2.55 -r 1.100.2.56 AUTHORS;  cvs diff -u -r 1.1.2.41 -r 1.1.2.42 src/gtk/authors.h;  ) > 3.0.2cvs29.patchset
 ( cvs diff -u -r 1.5.2.25 -r 1.5.2.26 src/exporthtml.c;  cvs diff -u -r 1.28.2.40 -r 1.28.2.41 src/mbox.c;  cvs diff -u -r 1.36.2.116 -r 1.36.2.117 src/common/utils.c;  ) > 3.0.2cvs30.patchset
 ( cvs diff -u -r 1.1.2.1 -r 1.1.2.2 src/addrduplicates.c;  cvs diff -u -r 1.1.2.1 -r 1.1.2.2 src/addrduplicates.h;  cvs diff -u -r 1.60.2.99 -r 1.60.2.100 src/addressbook.c;  cvs diff -u -r 1.18.2.9 -r 1.18.2.10 src/addressbook.h;  cvs diff -u -r 1.28.2.32 -r 1.28.2.33 src/addrindex.c;  cvs diff -u -r 1.9.2.12 -r 1.9.2.13 src/addrindex.h;  ) > 3.0.2cvs31.patchset

+( cvs diff -u -r 1.3.2.50 -r 1.3.2.51 src/prefs_themes.c;  cvs diff -u -r 1.25.2.47 -r 1.25.2.48 src/stock_pixmap.c;  ) > 3.0.2cvs32.patchset

diff --git a/configure.ac b/configure.ac
index 0cd5a822a44630980c3358859d8ae519e2b84403..e22959818d6eaaefffe40e4c08fb0bfd607fa9ff 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -11,7 +11,7 @@ MINOR_VERSION=0
 MICRO_VERSION=2
 INTERFACE_AGE=0
 BINARY_AGE=0
 MICRO_VERSION=2
 INTERFACE_AGE=0
 BINARY_AGE=0

-EXTRA_VERSION=31
+EXTRA_VERSION=32

 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 
 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 

diff --git a/src/prefs_themes.c b/src/prefs_themes.c
index c66da508f173c3423dfdac7516187d1c166e0787..9b80474a7fa18f4bd1c2984422cdbae3bf1ff71a 100644 (file)
--- a/src/prefs_themes.c
+++ b/src/prefs_themes.c
@@ -536,7 +536,7 @@ static void prefs_themes_btn_install_clicked_cb(GtkWidget *widget, gpointer data
        }
        g_free(alert_title);
        if (cinfo->dest == NULL) {
        }
        g_free(alert_title);
        if (cinfo->dest == NULL) {

-               cinfo->dest = g_strconcat(get_home_dir(), G_DIR_SEPARATOR_S, RC_DIR,
+               cinfo->dest = g_strconcat(get_home_dir(), G_DIR_SEPARATOR_S, get_rc_dir(),

                                          G_DIR_SEPARATOR_S, PIXMAP_THEME_DIR, G_DIR_SEPARATOR_S,
                                          themename, NULL);
        }
                                          G_DIR_SEPARATOR_S, PIXMAP_THEME_DIR, G_DIR_SEPARATOR_S,
                                          themename, NULL);
        }

diff --git a/src/stock_pixmap.c b/src/stock_pixmap.c
index e4f492b22315bf47307a9b5f12ef9b8debb42487..33addfe21383685a49dd7f06b3405b69b87037cf 100644 (file)
--- a/src/stock_pixmap.c
+++ b/src/stock_pixmap.c
@@ -544,7 +544,7 @@ GList *stock_pixmap_themes_list_new(void)
        
        defaulttheme = g_strdup(DEFAULT_PIXMAP_THEME);
        userthemes   = g_strconcat(get_home_dir(), G_DIR_SEPARATOR_S,
        
        defaulttheme = g_strdup(DEFAULT_PIXMAP_THEME);
        userthemes   = g_strconcat(get_home_dir(), G_DIR_SEPARATOR_S,

-                                  RC_DIR, G_DIR_SEPARATOR_S, 
+                                  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);
                                   PIXMAP_THEME_DIR, NULL);
        systemthemes = g_strconcat(PACKAGE_DATA_DIR, G_DIR_SEPARATOR_S,
                                   PIXMAP_THEME_DIR, NULL);