2004-12-10 [colin] 0.9.13cvs12.1

	* src/prefs_themes.c
	* src/mainwindow.c
	* src/messageview.c
		Sync with HEAD

diff --git a/ChangeLog-gtk2.claws b/ChangeLog-gtk2.claws
index da30fe50d372205fee0fc3d558af865911780a68..45c197777117caec6671b36204a9759cd298cdab 100644 (file)
--- a/ChangeLog-gtk2.claws
+++ b/ChangeLog-gtk2.claws
@@ -1,3 +1,10 @@
+2004-12-10 [colin]     0.9.13cvs12.1
+
+       * src/prefs_themes.c
+       * src/mainwindow.c
+       * src/messageview.c
+               Sync with HEAD
+

 2004-12-09 [colin]     0.9.13cvs10.1
 
        * src/procmime.c
 2004-12-09 [colin]     0.9.13cvs10.1
 
        * src/procmime.c

diff --git a/PATCHSETS b/PATCHSETS
index 55a6ec4dd2b70cfd84d0309712b8fc0033238944..4ce37bf7937a43e673161d35802f6f8d15cc53cb 100644 (file)
--- a/PATCHSETS
+++ b/PATCHSETS
@@ -285,3 +285,4 @@
 ( cvs diff -u -r 1.5.2.8 -r 1.5.2.9 src/gtk/pluginwindow.c; ) > 0.9.13cvs8.2.patchset
 ( cvs diff -u -r 1.2.2.3 -r 1.2.2.4 src/gtk/colorlabel.c; ) > 0.9.13cvs9.1.patchset
 ( cvs diff -u -r 1.49.2.27 -r 1.49.2.28 src/procmime.c; ) > 0.9.13cvs10.1.patchset
 ( cvs diff -u -r 1.5.2.8 -r 1.5.2.9 src/gtk/pluginwindow.c; ) > 0.9.13cvs8.2.patchset
 ( cvs diff -u -r 1.2.2.3 -r 1.2.2.4 src/gtk/colorlabel.c; ) > 0.9.13cvs9.1.patchset
 ( cvs diff -u -r 1.49.2.27 -r 1.49.2.28 src/procmime.c; ) > 0.9.13cvs10.1.patchset

+( cvs diff -u -r 1.3.2.14 -r 1.3.2.15 src/prefs_themes.c; cvs diff -u -r 1.274.2.25 -r 1.274.2.26 src/mainwindow.c; cvs diff -u -r 1.94.2.36 -r 1.94.2.37 src/messageview.c; ) > 0.9.13cvs12.1.patchset

diff --git a/configure.ac b/configure.ac
index 13cea03142b96876bf5db439f46a3a6fad272b3e..c2281b7c8211cb3a4b983ebcaa1b412a71d11445 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -11,7 +11,7 @@ MINOR_VERSION=9
 MICRO_VERSION=13
 INTERFACE_AGE=0
 BINARY_AGE=0
 MICRO_VERSION=13
 INTERFACE_AGE=0
 BINARY_AGE=0

-EXTRA_VERSION=10
+EXTRA_VERSION=12

 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=.1
 
 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=.1
 

diff --git a/src/mainwindow.c b/src/mainwindow.c
index 7fda8ebc3b84a0df49265990a131249322feffce..c7efcaa3cc807661dda7b1d040a6f49a53a72a05 100644 (file)
--- a/src/mainwindow.c
+++ b/src/mainwindow.c
@@ -2014,6 +2014,9 @@ static void main_window_set_widgets(MainWindow *mainwin, SeparateType type)
                                 mainwin);
                if (messageview_is_visible(mainwin->messageview))
                        gtk_widget_show(messagewin);
                                 mainwin);
                if (messageview_is_visible(mainwin->messageview))
                        gtk_widget_show(messagewin);

+       } else {
+               mainwin->messageview->statusbar = mainwin->statusbar;
+               mainwin->messageview->statusbar_cid = mainwin->messageview_cid;

        }
 
        gtk_widget_set_size_request(GTK_WIDGET_PTR(mainwin->folderview),
        }
 
        gtk_widget_set_size_request(GTK_WIDGET_PTR(mainwin->folderview),


@@ -2304,6 +2307,9 @@ static gint message_window_close_cb(GtkWidget *widget, GdkEventAny *event,
                (mainwin->menu_factory, "/View/Show or hide/Message view");
        gtk_check_menu_item_set_active(GTK_CHECK_MENU_ITEM(menuitem), FALSE);
 
                (mainwin->menu_factory, "/View/Show or hide/Message view");
        gtk_check_menu_item_set_active(GTK_CHECK_MENU_ITEM(menuitem), FALSE);
 

+       mainwin->messageview->statusbar = mainwin->statusbar;
+       mainwin->messageview->statusbar_cid = mainwin->messageview_cid;
+

        return TRUE;
 }
 
        return TRUE;
 }
 

diff --git a/src/messageview.c b/src/messageview.c
index 05b9fc913ca6b8e46d7adaa505610e2903e72c10..2d7b3c9ea4ef4cd48706eec1829ed6c4a8342527 100644 (file)
--- a/src/messageview.c
+++ b/src/messageview.c
@@ -1553,7 +1553,7 @@ void messageview_set_menu_sensitive(MessageView *messageview)
        GtkItemFactory *ifactory;
        GtkWidget *menuitem;
 
        GtkItemFactory *ifactory;
        GtkWidget *menuitem;
 

-       if (!messageview && !messageview->new_window) 
+       if (!messageview || !messageview->new_window) 

                return;
        /* do some smart things */
        if (!messageview->menubar) return;
                return;
        /* do some smart things */
        if (!messageview->menubar) return;

diff --git a/src/prefs_themes.c b/src/prefs_themes.c
index 904e2bc15cc07201900a800e398c009748f9df2d..5620e5ee98f18c5571988eafc840dc17438ec62e 100644 (file)
--- a/src/prefs_themes.c
+++ b/src/prefs_themes.c
@@ -117,13 +117,13 @@ typedef struct _CopyInfo {
 static ThemesData *prefs_themes_data;
 
 StockPixmap prefs_themes_icons[PREVIEW_ICONS] = { 
 static ThemesData *prefs_themes_data;
 
 StockPixmap prefs_themes_icons[PREVIEW_ICONS] = { 

-       STOCK_PIXMAP_MAIL,
+       STOCK_PIXMAP_DIR_CLOSE,
+       STOCK_PIXMAP_MAIL_SEND,

        STOCK_PIXMAP_MAIL_RECEIVE, 
        STOCK_PIXMAP_MAIL_RECEIVE, 

-       STOCK_PIXMAP_DOWN_ARROW, 
-       STOCK_PIXMAP_MAIL_SEND_QUEUE, 
+       STOCK_PIXMAP_MAIL_ATTACH,

        STOCK_PIXMAP_BOOK, 
        STOCK_PIXMAP_BOOK, 

-       STOCK_PIXMAP_MIME_TEXT_HTML, 
-       STOCK_PIXMAP_PRIVACY_PASSED
+       STOCK_PIXMAP_MIME_TEXT_PLAIN, 
+       STOCK_PIXMAP_REPLIED

 };
 
 
 };