talons

commit 0e68e093d105342c742938d4acb02e1de719f1b4
parent c83263be4602962cbd96a702039f0fa0572dac09
Author: Colin Leroy <colin@colino.net>
Date:   Wed,  2 Apr 2008 19:19:55 +0000

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

Diffstat:
M
ChangeLog
 | 
7
+++++++
M
PATCHSETS
 | 
1
+
M
configure.ac
 | 
2
+-
M
src/main.c
 | 
5
+++++

4 files changed, 14 insertions(+), 1 deletion(-)
diff --git 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
@@ -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
@@ -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
@@ -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);