talons

commit 63e8e48b7efafe6f8562cd3e50e26d8cea99d62f
parent 25663fc8814f6b0c0bcfdd045ed393b99be103f1
Author: Colin Leroy <colin@colino.net>
Date:   Wed, 20 Feb 2013 17:31:20 +0000

2013-02-20 [colin]	3.9.0cvs98

	* src/main.c
		Fix seg on w32

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

4 files changed, 8 insertions(+), 2 deletions(-)
diff --git a/ChangeLog b/ChangeLog
@@ -1,3 +1,8 @@
+2013-02-20 [colin]	3.9.0cvs98
+
+	* src/main.c
+		Fix seg on w32
+
 2013-02-20 [colin]	3.9.0cvs97
 
 	* src/plugins/att_remover/claws.def
diff --git a/PATCHSETS b/PATCHSETS
@@ -4595,3 +4595,4 @@
 ( cvs diff -u -r 1.103.2.144 -r 1.103.2.145 src/prefs_common.h;  cvs diff -u -r 1.1.2.1 -r 1.1.2.2 src/plugins/address_keeper/claws.def;  cvs diff -u -r 1.1.2.2 -r 1.1.2.3 src/plugins/att_remover/Makefile.am;  diff -u /dev/null src/plugins/att_remover/claws.def;  diff -u /dev/null src/plugins/att_remover/plugin.def;  diff -u /dev/null src/plugins/att_remover/version.rc;  cvs diff -u -r 1.1.2.1 -r 1.1.2.2 src/plugins/clamd/libclamd/Makefile.am;  cvs diff -u -r 1.1.2.4 -r 1.1.2.5 src/plugins/fetchinfo/Makefile.am;  diff -u /dev/null src/plugins/fetchinfo/claws.def;  diff -u /dev/null src/plugins/fetchinfo/plugin.def;  diff -u /dev/null src/plugins/fetchinfo/version.rc;  cvs diff -u -r 1.1.2.3 -r 1.1.2.4 src/plugins/mailmbox/Makefile.am;  diff -u /dev/null src/plugins/mailmbox/claws.def;  diff -u /dev/null src/plugins/mailmbox/plugin.def;  diff -u /dev/null src/plugins/mailmbox/version.rc;  cvs diff -u -r 1.1.2.1 -r 1.1.2.2 src/plugins/notification/gtkhotkey/Makefile.am;  cvs diff -u -r 1.1.2.3 -r 1.1.2.4 src/plugins/spam_report/Makefile.am;  diff -u /dev/null src/plugins/spam_report/claws.def;  diff -u /dev/null src/plugins/spam_report/plugin.def;  cvs diff -u -r 1.1.2.2 -r 1.1.2.3 src/plugins/spam_report/spam_report.c;  diff -u /dev/null src/plugins/spam_report/version.rc;  ) > 3.9.0cvs95.patchset
 ( cvs diff -u -r 1.1.2.3 -r 1.1.2.4 src/plugins/att_remover/Makefile.am;  cvs diff -u -r 1.1.2.5 -r 1.1.2.6 src/plugins/fetchinfo/Makefile.am;  cvs diff -u -r 1.1.2.4 -r 1.1.2.5 src/plugins/spam_report/Makefile.am;  ) > 3.9.0cvs96.patchset
 ( cvs diff -u -r 1.1.2.1 -r 1.1.2.2 src/plugins/att_remover/claws.def;  cvs diff -u -r 1.1.2.1 -r 1.1.2.2 src/plugins/fetchinfo/claws.def;  cvs diff -u -r 1.1.2.1 -r 1.1.2.2 src/plugins/spam_report/claws.def;  ) > 3.9.0cvs97.patchset
+( cvs diff -u -r 1.115.2.268 -r 1.115.2.269 src/main.c;  ) > 3.9.0cvs98.patchset
diff --git a/configure.ac b/configure.ac
@@ -12,7 +12,7 @@ MINOR_VERSION=9
 MICRO_VERSION=0
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=97
+EXTRA_VERSION=98
 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 
diff --git a/src/main.c b/src/main.c
@@ -1356,7 +1356,7 @@ int main(int argc, char *argv[])
 #endif
 
 #ifdef G_OS_WIN32
-	if(strcmp(prefs_common.gtk_theme, DEFAULT_W32_GTK_THEME))
+	if(prefs_common.gtk_theme && strcmp(prefs_common.gtk_theme, DEFAULT_W32_GTK_THEME))
 		gtk_settings_set_string_property(gtk_settings_get_default(),
 			"gtk-theme-name",
 			prefs_common.gtk_theme,