talons

commit ac26648e71ec289628fef3a5227440b7fbe8d843
parent 91cbbe429a422dc25e3e131e5b1309ac2801a98f
Author: Colin Leroy <colin@colino.net>
Date:   Sat,  4 Oct 2008 08:25:05 +0000

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

Diffstat:
M
ChangeLog
 | 
9
+++++++++
M
PATCHSETS
 | 
1
+
M
configure.ac
 | 
2
+-
M
src/addressbook.c
 | 
2
+-
M
src/compose.c
 | 
2
+-
M
src/mainwindow.c
 | 
2
+-
M
src/messageview.c
 | 
2
+-
M
src/summaryview.c
 | 
2
++

8 files changed, 17 insertions(+), 5 deletions(-)
diff --git 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
diff --git a/PATCHSETS b/PATCHSETS
@@ -3560,3 +3560,4 @@
 ( 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
diff --git a/configure.ac b/configure.ac
@@ -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=
 
diff --git a/src/addressbook.c b/src/addressbook.c
@@ -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)
diff --git a/src/compose.c b/src/compose.c
@@ -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)
diff --git a/src/mainwindow.c b/src/mainwindow.c
@@ -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)
diff --git a/src/messageview.c b/src/messageview.c
@@ -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)
diff --git a/src/summaryview.c b/src/summaryview.c
@@ -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)