talons

commit c83263be4602962cbd96a702039f0fa0572dac09
parent 1e28fdf3a4a416b33a7482f596d808a13740bfbd
Author: Colin Leroy <colin@colino.net>
Date:   Wed,  2 Apr 2008 19:12:19 +0000

2008-04-02 [colin]	3.3.1cvs49

	* src/main.c
		Fix bug 1562, 'Claws-Mail does not completely
		respect settings in GTK2_RC_FILES environment'
		Remove manual parsing of .gtkrc-2.0 and
		.gtk/gtkrc-2.0. GTK does it itself these days.

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

4 files changed, 10 insertions(+), 15 deletions(-)
diff --git a/ChangeLog b/ChangeLog
@@ -1,3 +1,11 @@
+2008-04-02 [colin]	3.3.1cvs49
+
+	* src/main.c
+		Fix bug 1562, 'Claws-Mail does not completely 
+		respect settings in GTK2_RC_FILES environment'
+		Remove manual parsing of .gtkrc-2.0 and 
+		.gtk/gtkrc-2.0. GTK does it itself these days.
+
 2008-04-01 [colin]	3.3.1cvs48
 
 	* src/imap_gtk.c
diff --git a/PATCHSETS b/PATCHSETS
@@ -3283,3 +3283,4 @@
 ( cvs diff -u -r 1.274.2.238 -r 1.274.2.239 src/mainwindow.c;  ) > 3.3.1cvs46.patchset
 ( 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
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=48
+EXTRA_VERSION=49
 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 
diff --git a/src/main.c b/src/main.c
@@ -26,7 +26,6 @@
 #include <glib.h>
 #include <glib/gi18n.h>
 #include <gtk/gtkmain.h>
-#include <gtk/gtkrc.h>
 
 #include <stdio.h>
 #include <stdlib.h>
@@ -1067,15 +1066,6 @@ int main(int argc, char *argv[])
 		exit(1);
 	}
 #endif	
-	/* parse gtkrc files */
-	userrc = g_strconcat(get_home_dir(), G_DIR_SEPARATOR_S, ".gtkrc-2.0",
-			     NULL);
-	gtk_rc_parse(userrc);
-	g_free(userrc);
-	userrc = g_strconcat(get_home_dir(), G_DIR_SEPARATOR_S, ".gtk",
-			     G_DIR_SEPARATOR_S, "gtkrc-2.0", NULL);
-	gtk_rc_parse(userrc);
-	g_free(userrc);
 
 #ifdef G_OS_WIN32
 	CHDIR_EXEC_CODE_RETURN_VAL_IF_FAIL(get_home_dir(), 1, win32_close_log(););
@@ -1128,10 +1118,6 @@ 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);