2008-04-02 [colin] 3.3.1cvs50

	* src/main.c
		Revert part of the previous patch: we do
		want to parse ~/.claws-mail/gtkrc-2.0 if it
		exists

diff --git a/ChangeLog b/ChangeLog
index 72ccc6bd3b12e4722f05bae26be7f197cedf3467..6e21f5707c15373113d3efc5eb6e2cd5341631da 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2008-04-02 [colin]     3.3.1cvs50
+
+       * src/main.c
+               Revert part of the previous patch: we do
+               want to parse ~/.claws-mail/gtkrc-2.0 if it
+               exists
+
 2008-04-02 [colin]     3.3.1cvs49
 
        * src/main.c

diff --git a/PATCHSETS b/PATCHSETS
index f066e15a2aa1227263c5edc313e86afe11561099..bcc62b7fe4c8ea76041293a351e08c68d0784c54 100644 (file)
--- a/PATCHSETS
+++ b/PATCHSETS
@@ -3284,3 +3284,4 @@
 ( cvs diff -u -r 1.213.2.179 -r 1.213.2.180 src/folder.c;  ) > 3.3.1cvs47.patchset
 ( cvs diff -u -r 1.1.2.55 -r 1.1.2.56 src/imap_gtk.c;  ) > 3.3.1cvs48.patchset
 ( cvs diff -u -r 1.115.2.191 -r 1.115.2.192 src/main.c;  ) > 3.3.1cvs49.patchset
+( cvs diff -u -r 1.115.2.192 -r 1.115.2.193 src/main.c;  ) > 3.3.1cvs50.patchset

diff --git a/configure.ac b/configure.ac
index 49b8b0dd84293a4dc9f927143fd3d4368354f84c..c6db1ab3e83defe20a2479560b0e27e2fdab43cd 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -11,7 +11,7 @@ MINOR_VERSION=3
 MICRO_VERSION=1
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=49
+EXTRA_VERSION=50
 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 

diff --git a/src/main.c b/src/main.c
index 596e0505b1468a2dd32b986e59b72a6fefe3a659..728678b217833de1b7fb954996061596e5d0d830 100644 (file)
--- a/src/main.c
+++ b/src/main.c
@@ -26,6 +26,7 @@
 #include <glib.h>
 #include <glib/gi18n.h>
 #include <gtk/gtkmain.h>
+#include <gtk/gtkrc.h>
 
 #include <stdio.h>
 #include <stdlib.h>
@@ -1118,6 +1119,10 @@ int main(int argc, char *argv[])
        if (!cmd.exit)
                plugin_load_all("Common");
 
+       userrc = g_strconcat(get_rc_dir(), G_DIR_SEPARATOR_S, "gtkrc-2.0", NULL);
+       gtk_rc_parse(userrc);
+       g_free(userrc);
+
        userrc = g_strconcat(get_rc_dir(), G_DIR_SEPARATOR_S, MENU_RC, NULL);
        gtk_accel_map_load (userrc);
        g_free(userrc);