2010-07-09 [iwkse] 3.7.6cvs15
authorSalvatore De Paolis <iwkse@claws-mail.org>
Fri, 9 Jul 2010 21:33:28 +0000 (21:33 +0000)
committerSalvatore De Paolis <iwkse@claws-mail.org>
Fri, 9 Jul 2010 21:33:28 +0000 (21:33 +0000)
* src/mainwindow.h
* src/mainwindow.c
Better fix for Bug #2224

ChangeLog
PATCHSETS
configure.ac
src/mainwindow.c
src/mainwindow.h

index 9460903aa6573e243b902f701c314ca6a5c12b0d..a4cc6c12255a2e5ee30a9bc28fb7dca8b1ebf29f 100644 (file)
--- 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
index a911266f08149cbf2d65201367a05925c602c2fc..9c4a1da43137b07e06c856966f12fb146ddc4275 100644 (file)
--- a/PATCHSETS
+++ b/PATCHSETS
 ( 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
index fc0334ceca8685736fdacfdff3eabbb5bfc9400b..8445d613f8afa060a43f9e41f4e3af48101e5230 100644 (file)
@@ -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=
 
index 89b8a375d29c035d83d3538edb99df91fe31e929..8c57ebe457a6d6f23b72e3aa3a4cf1a79984c3e8 100644 (file)
@@ -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:
index 22639cdbd836485e6817c49ae9c3309a06fa8bfd..08858b50274b798220facd0eee19a149dbdd3ed9 100644 (file)
@@ -138,6 +138,7 @@ struct _MainWindow
        GtkWidget       *tags_menu;
        
        gboolean         in_folder;
+       gboolean         button_images;
        GtkActionGroup  *action_group;
        GtkUIManager    *ui_manager;