* src/mainwindow.c
authorLuke Plant <L.Plant.98@cantab.net>
Fri, 1 Aug 2003 08:00:32 +0000 (08:00 +0000)
committerLuke Plant <L.Plant.98@cantab.net>
Fri, 1 Aug 2003 08:00:32 +0000 (08:00 +0000)
o fixed visibility of icons/mimeview after toggling separate
  message/folder view (factored out some similar code too).

ChangeLog.claws
configure.ac
src/mainwindow.c

index 8533e92..65a90bd 100644 (file)
@@ -1,3 +1,9 @@
+2003-08-01 [luke]      0.9.3claws85
+       * src/mainwindow.c
+               o fixed visibility of icons/mimeview after toggling separate
+                 message/folder view (factored out some similar code too).
+
+
 2003-07-31 [alfons]    0.9.3claws84
 
        * src/mimeview.c
index e86b5a1..d8a1bd5 100644 (file)
@@ -11,7 +11,7 @@ MINOR_VERSION=9
 MICRO_VERSION=3
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=84
+EXTRA_VERSION=85
 if test $EXTRA_VERSION -eq 0; then
     VERSION=${MAJOR_VERSION}.${MINOR_VERSION}.${MICRO_VERSION}claws
 else
index bbc88bb..a6993ec 100644 (file)
@@ -1810,10 +1810,6 @@ static void main_window_set_widgets(MainWindow *mainwin, SeparateType type)
                                     prefs_common.mainwin_height);
                gtk_widget_show_all(vpaned);
 
-               /* CLAWS: previous "gtk_widget_show_all" makes noticeview
-                * lose track of its visibility state */
-               if (!noticeview_is_visible(mainwin->messageview->noticeview)) 
-                       gtk_widget_hide(GTK_WIDGET_PTR(mainwin->messageview->noticeview));
 
                mainwin->win.sep_none.hpaned = hpaned;
                mainwin->win.sep_none.vpaned = vpaned;
@@ -1855,11 +1851,6 @@ static void main_window_set_widgets(MainWindow *mainwin, SeparateType type)
 
                gtk_widget_show_all(folderwin);
                
-               /* CLAWS: previous "gtk_widget_show_all" makes noticeview
-                * lose track of its visibility state */
-               if (!noticeview_is_visible(mainwin->messageview->noticeview)) 
-                       gtk_widget_hide(GTK_WIDGET_PTR(mainwin->messageview->noticeview));
-               
                /* remove headerview if not in prefs */
                headerview_set_visibility(mainwin->messageview->headerview,
                                          prefs_common.display_header_pane);
@@ -1891,10 +1882,6 @@ static void main_window_set_widgets(MainWindow *mainwin, SeparateType type)
 
                gtk_widget_show_all(messagewin);
                
-               /* CLAWS: previous "gtk_widget_show_all" makes noticeview
-                * lose track of its visibility state */
-               if (!noticeview_is_visible(mainwin->messageview->noticeview)) 
-                       gtk_widget_hide(GTK_WIDGET_PTR(mainwin->messageview->noticeview));
                break;
        case SEPARATE_BOTH:
                gtk_box_pack_start(GTK_BOX(vbox_body),
@@ -1917,13 +1904,18 @@ static void main_window_set_widgets(MainWindow *mainwin, SeparateType type)
                gtk_widget_show_all(folderwin);
                gtk_widget_show_all(messagewin);
 
-               /* CLAWS: previous "gtk_widget_show_all" makes noticeview
-                * lose track of its visibility state */
-               if (!noticeview_is_visible(mainwin->messageview->noticeview)) 
-                       gtk_widget_hide(GTK_WIDGET_PTR(mainwin->messageview->noticeview));
                break;
        }
 
+       /* CLAWS: previous "gtk_widget_show_all" makes noticeview
+        * and mimeview icon list/ctree lose track of their visibility states */
+       if (!noticeview_is_visible(mainwin->messageview->noticeview)) 
+               gtk_widget_hide(GTK_WIDGET_PTR(mainwin->messageview->noticeview));
+       if (gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(mainwin->messageview->mimeview->mime_toggle)))
+               gtk_widget_hide(mainwin->messageview->mimeview->icon_mainbox);
+       else 
+               gtk_widget_hide(mainwin->messageview->mimeview->ctree_mainbox);
+
        /* rehide quick search if necessary */
        if (!prefs_common.show_searchbar)
                gtk_widget_hide(mainwin->summaryview->hbox_search);