* OSSO1.1 build fix

	* Rewritten the placeholders

pmo-trunk-r1763

diff --git a/src/maemo/modest-main-window.c b/src/maemo/modest-main-window.c
index 7f0b1aa..33437ed 100644 (file)
--- a/src/maemo/modest-main-window.c
+++ b/src/maemo/modest-main-window.c
@@ -53,9 +53,15 @@
 #include "modest-mail-operation.h"
 #include "modest-icon-names.h"
 #include "modest-progress-bar-widget.h"
-#include <hildon-widgets/hildon-program.h>
 #include "maemo/modest-osso-state-saving.h"
 
+#ifdef MODEST_HILDON_VERSION_0
+#include <hildon-widgets/hildon-program.h>
+#else
+#include <hildon/hildon-program.h>
+#endif /*MODEST_HILDON_VERSION_0*/
+
+
 /* 'private'/'protected' functions */
 static void modest_main_window_class_init    (ModestMainWindowClass *klass);
 static void modest_main_window_init          (ModestMainWindow *obj);

diff --git a/src/maemo/ui/modest-main-window-ui.xml b/src/maemo/ui/modest-main-window-ui.xml
index 3c23869..1d22654 100644 (file)
--- a/src/maemo/ui/modest-main-window-ui.xml
+++ b/src/maemo/ui/modest-main-window-ui.xml
@@ -76,6 +76,7 @@
         <menuitem name="ViewShowToolbarFullScreenMenu" action="ViewShowToolbarFullScreen"/>
       </menu>
       <separator/>
+      <placeholder name="ViewMenuAdditions" />
    </menu>
     
     <menu name="ToolsMenu" action="Tools">
@@ -108,8 +109,7 @@
     <toolitem action="ToolbarToggleView"/>
     <toolitem action="ToolbarSort"/>
     <toolitem action="ToolbarSendReceive"/>
-    <placeholder name="ProgressBarView">
-    </placeholder>
+    <placeholder name="ProgressBarView" />
     <toolitem action="ToolbarCancel"/>
   </toolbar>
 

diff --git a/src/maemo/ui/modest-msg-edit-window-ui.xml b/src/maemo/ui/modest-msg-edit-window-ui.xml
index 4d27342..6a8576d 100644 (file)
--- a/src/maemo/ui/modest-msg-edit-window-ui.xml
+++ b/src/maemo/ui/modest-msg-edit-window-ui.xml
@@ -112,12 +112,10 @@
     <!--<toolitem action="ActionFontFace"/>-->
     <!--<toolitem action="ActionFontSize"/>-->
     <separator/>
-    <placeholder name="FontAttributes">
-    </placeholder>
+    <placeholder name="FontAttributes" />
     <toolitem action="ActionsBold"/>
     <toolitem action="ActionsItalics"/>
-    <placeholder name="FontColor">
-    </placeholder>
+    <placeholder name="FontColor" />
   </toolbar>
 
   <accelerator name="AccelZoomMinus" action="ZoomMinus"/>