talons

commit cfdfdcda283590d16dfa5577b1b2aab0614c4e88
parent ccc8dbb2e906621c6e154bd549dad0a9ff8b0868
Author: Salvatore De Paolis <iwkse@claws-mail.org>
Date:   Fri,  9 Jul 2010 21:33:28 +0000

2010-07-09 [iwkse]	3.7.6cvs15

	* src/mainwindow.h
	* src/mainwindow.c
			Better fix for Bug #2224

Diffstat:
M
ChangeLog
 | 
6
++++++
M
PATCHSETS
 | 
1
+
M
configure.ac
 | 
2
+-
M
src/mainwindow.c
 | 
23
+++++++++++++++++++++--
M
src/mainwindow.h
 | 
1
+

5 files changed, 30 insertions(+), 3 deletions(-)
diff --git a/ChangeLog b/ChangeLog
@@ -1,3 +1,9 @@
+2010-07-09 [iwkse]	3.7.6cvs15
+
+	* src/mainwindow.h
+	* src/mainwindow.c
+			Better fix for Bug #2224
+
 2010-07-09 [iwkse]	3.7.6cvs14
 
 	* src/mainwindow.c
diff --git a/PATCHSETS b/PATCHSETS
@@ -4010,3 +4010,4 @@
 ( cvs diff -u -r 1.382.2.552 -r 1.382.2.553 src/compose.c;  ) > 3.7.6cvs12.patchset
 ( cvs diff -u -r 1.2.2.40 -r 1.2.2.41 src/gtk/filesel.c;  ) > 3.7.6cvs13.patchset
 ( cvs diff -u -r 1.274.2.310 -r 1.274.2.311 src/mainwindow.c;  ) > 3.7.6cvs14.patchset
+( cvs diff -u -r 1.39.2.57 -r 1.39.2.58 src/mainwindow.h;  cvs diff -u -r 1.274.2.311 -r 1.274.2.312 src/mainwindow.c;  ) > 3.7.6cvs15.patchset
diff --git a/configure.ac b/configure.ac
@@ -12,7 +12,7 @@ MINOR_VERSION=7
 MICRO_VERSION=6
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=14
+EXTRA_VERSION=15
 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 
diff --git a/src/mainwindow.c b/src/mainwindow.c
@@ -1540,7 +1540,9 @@ MainWindow *main_window_create()
 	debug_print("Creating main window...\n");
 	mainwin = g_new0(MainWindow, 1);
 
-	g_object_set(gtk_settings_get_default(), "gtk-button-images", TRUE, NULL);
+	g_object_get(gtk_settings_get_default(), 
+				 "gtk-button-images", &mainwin->button_images, 
+				 NULL);
 
 	/* main window */
 	window = GTK_WIDGET(gtkut_window_new(GTK_WINDOW_TOPLEVEL, "mainwindow"));
@@ -2812,7 +2814,7 @@ void main_window_toggle_message_view(MainWindow *mainwin)
 	SummaryView *summaryview = mainwin->summaryview;
 	GtkWidget *ppaned = NULL;
 	GtkWidget *container = NULL;
-	
+
 	switch (prefs_common.layout_mode) {
 	case NORMAL_LAYOUT:
 	case VERTICAL_LAYOUT:
@@ -3659,6 +3661,23 @@ static void main_window_set_widgets(MainWindow *mainwin, LayoutType layout_mode)
 
 	cm_menu_set_sensitive_full(mainwin->ui_manager, "Menu/View/ShowHide/MessageView", 
 		(layout_mode != WIDE_MSGLIST_LAYOUT && layout_mode != SMALL_LAYOUT));
+	if (!mainwin->button_images) {
+		gboolean button_images = FALSE;
+		g_object_get(gtk_settings_get_default(), 
+					 "gtk-button-images", &button_images, 
+					 NULL);
+		if ((layout_mode == VERTICAL_LAYOUT || layout_mode == SMALL_LAYOUT) &&
+			!button_images) {
+			button_images = TRUE;
+			g_object_set(gtk_settings_get_default(), "gtk-button-images",
+						 TRUE, NULL);
+		}
+		else if(button_images) {
+			button_images = FALSE;
+			g_object_set(gtk_settings_get_default(), "gtk-button-images",
+						 FALSE, NULL);
+		}
+	}
 	switch (layout_mode) {
 	case VERTICAL_LAYOUT:
 	case NORMAL_LAYOUT:
diff --git a/src/mainwindow.h b/src/mainwindow.h
@@ -138,6 +138,7 @@ struct _MainWindow
 	GtkWidget 	*tags_menu;
 	
 	gboolean	 in_folder;
+	gboolean	 button_images;
 	GtkActionGroup	*action_group;
 	GtkUIManager	*ui_manager;