2008-10-04 [colin] 3.6.0cvs4
authorColin Leroy <colin@colino.net>
Sat, 4 Oct 2008 08:25:05 +0000 (08:25 +0000)
committerColin Leroy <colin@colino.net>
Sat, 4 Oct 2008 08:25:05 +0000 (08:25 +0000)
* src/addressbook.c
* src/compose.c
* src/mainwindow.c
* src/messageview.c
* src/summaryview.c
Maemo: Fix bug 1737, Crashes upon opening

ChangeLog
PATCHSETS
configure.ac
src/addressbook.c
src/compose.c
src/mainwindow.c
src/messageview.c
src/summaryview.c

index f0823c9bf489c2e93a3cd8bf8f826ab46c94bc50..fa4be7666f05525e4636d6ade2480fcaf3eb69b8 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2008-10-04 [colin]     3.6.0cvs4
+
+       * src/addressbook.c
+       * src/compose.c
+       * src/mainwindow.c
+       * src/messageview.c
+       * src/summaryview.c
+               Maemo: Fix bug 1737, Crashes upon opening
+
 2008-10-04 [paul]      3.6.0cvs3
 
        * po/pt_BR.po
index 65b537d71f54c72baf4e327711e19661dbb8b1cd..65d6db099cb032ecdd9a6af5fc9ccf8ded2caf68 100644 (file)
--- a/PATCHSETS
+++ b/PATCHSETS
 ( cvs diff -u -r 1.2.2.38 -r 1.2.2.39 src/gtk/filesel.c;  ) > 3.6.0cvs1.patchset
 ( cvs diff -u -r 1.42.2.41 -r 1.42.2.42 po/fr.po;  ) > 3.6.0cvs2.patchset
 ( cvs diff -u -r 1.50.2.32 -r 1.50.2.33 po/pt_BR.po;  ) > 3.6.0cvs3.patchset
+( cvs diff -u -r 1.60.2.124 -r 1.60.2.125 src/addressbook.c;  cvs diff -u -r 1.382.2.481 -r 1.382.2.482 src/compose.c;  cvs diff -u -r 1.274.2.275 -r 1.274.2.276 src/mainwindow.c;  cvs diff -u -r 1.94.2.188 -r 1.94.2.189 src/messageview.c;  cvs diff -u -r 1.395.2.393 -r 1.395.2.394 src/summaryview.c;  ) > 3.6.0cvs4.patchset
index 21214c05841edad6ca043f1aec85872e690b4e0a..cc3f597b77ffded4c1f4f0a6f8fe43dec2518ff3 100644 (file)
@@ -11,7 +11,7 @@ MINOR_VERSION=6
 MICRO_VERSION=0
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=3
+EXTRA_VERSION=4
 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 
index 9dfc90cdf9f2e6a0b2ba5086aaa0ce467d259d55..de4ab7c6b908f8805c09063becb298d5746547a9 100644 (file)
@@ -951,7 +951,7 @@ static void addressbook_create(void)
 #ifndef MAEMO
        MENUITEM_ADDUI_MANAGER(ui_manager, "/", "Menu", NULL, GTK_UI_MANAGER_MENUBAR)
 #else
-       MENUITEM_ADDUI_MANAGER(ui_manager, "/", "Menu", NULL, GTK_UI_MANAGER_MENU)
+       MENUITEM_ADDUI_MANAGER(ui_manager, "/", "Menu", NULL, GTK_UI_MANAGER_POPUP)
 #endif
 
        MENUITEM_ADDUI_MANAGER(ui_manager, "/Menu", "Book", "Book", GTK_UI_MANAGER_MENU)
index f3f83fcf72a6b162d0a1ac2b3b010f72f21d35fb..4ced668220cf1c64f4274e784f8c05204973ac20 100644 (file)
@@ -6748,7 +6748,7 @@ static Compose *compose_create(PrefsAccount *account,
 #ifndef MAEMO
        MENUITEM_ADDUI_MANAGER(compose->ui_manager, "/", "Menu", NULL, GTK_UI_MANAGER_MENUBAR)
 #else
-       MENUITEM_ADDUI_MANAGER(compose->ui_manager, "/", "Menu", NULL, GTK_UI_MANAGER_MENU)
+       MENUITEM_ADDUI_MANAGER(compose->ui_manager, "/", "Menu", NULL, GTK_UI_MANAGER_POPUP)
 #endif
 
        MENUITEM_ADDUI_MANAGER(compose->ui_manager, "/Menu", "Message", "Message", GTK_UI_MANAGER_MENU)
index ee3284ecbbc3b6acde0a2a469e67763c7b317c94..fabed5458069ededaa948d09320b7ea0bf7e95b1 100644 (file)
@@ -1543,7 +1543,7 @@ MainWindow *main_window_create()
 #ifndef MAEMO
        MENUITEM_ADDUI_MANAGER(mainwin->ui_manager, "/", "Menu", NULL, GTK_UI_MANAGER_MENUBAR)
 #else
-       MENUITEM_ADDUI_MANAGER(mainwin->ui_manager, "/", "Menu", NULL, GTK_UI_MANAGER_MENU)
+       MENUITEM_ADDUI_MANAGER(mainwin->ui_manager, "/", "Menu", NULL, GTK_UI_MANAGER_POPUP)
 #endif
        MENUITEM_ADDUI_MANAGER(mainwin->ui_manager, "/Menu", "File", "File", GTK_UI_MANAGER_MENU)
        MENUITEM_ADDUI_MANAGER(mainwin->ui_manager, "/Menu", "Edit", "Edit", GTK_UI_MANAGER_MENU)
index 2a8cedf2ed6362ea1c1e91361c658384c2bbc620..8fdd8243bb683e633130e9a14af2ea07d2bef92c 100644 (file)
@@ -442,7 +442,7 @@ static void messageview_add_toolbar(MessageView *msgview, GtkWidget *window)
 #ifndef MAEMO
        MENUITEM_ADDUI_MANAGER(msgview->ui_manager, "/", "Menu", NULL, GTK_UI_MANAGER_MENUBAR)
 #else
-       MENUITEM_ADDUI_MANAGER(msgview->ui_manager, "/", "Menu", NULL, GTK_UI_MANAGER_MENU)
+       MENUITEM_ADDUI_MANAGER(msgview->ui_manager, "/", "Menu", NULL, GTK_UI_MANAGER_POPUP)
 #endif
 
        MENUITEM_ADDUI_MANAGER(msgview->ui_manager, "/Menu", "File", "File", GTK_UI_MANAGER_MENU)
index ed1695c2beb5f41611735c80a1074c3767f7569b..54d541a3743ba0fc861cb313f8fed5399bc973f6 100644 (file)
@@ -811,8 +811,10 @@ SummaryView *summary_create(void)
 
        MENUITEM_ADDUI("/Menus", "SummaryViewPopup", "SummaryViewPopup", GTK_UI_MANAGER_MENU)
        MENUITEM_ADDUI("/Menus/SummaryViewPopup", "Reply", "SummaryViewPopup/Reply", GTK_UI_MANAGER_MENUITEM)
+#ifndef GENERIC_UMPC
        MENUITEM_ADDUI("/Menus/SummaryViewPopup", "ReplyTo", "SummaryViewPopup/ReplyTo", GTK_UI_MANAGER_MENU)
        MENUITEM_ADDUI("/Menus/SummaryViewPopup", "Separator1", "SummaryViewPopup/---", GTK_UI_MANAGER_SEPARATOR)
+#endif
        MENUITEM_ADDUI("/Menus/SummaryViewPopup", "Forward", "SummaryViewPopup/Forward", GTK_UI_MANAGER_MENUITEM)
 #ifndef GENERIC_UMPC
        MENUITEM_ADDUI("/Menus/SummaryViewPopup", "ForwardAsAtt", "SummaryViewPopup/ForwardAsAtt", GTK_UI_MANAGER_MENUITEM)