remove duplicated

pmo-trunk-r1495

diff --git a/configure.ac b/configure.ac
index 8046a4b..f4a01a3 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -185,7 +185,6 @@ docs/reference/Makefile
 tests/Makefile
 src/maemo/modest.desktop
 src/maemo/modest.service
-src/maemo/easysetup/Makefile
 ])
 
 

diff --git a/src/maemo/modest-main-window.c b/src/maemo/modest-main-window.c
index 510157d..12b20ca 100644 (file)
--- a/src/maemo/modest-main-window.c
+++ b/src/maemo/modest-main-window.c
@@ -285,7 +285,7 @@ get_toolbar (ModestMainWindow *self)
        GtkToolItem *progress_item;
        ModestWindowPrivate *parent_priv;
        ModestMainWindowPrivate *priv;
-       GtkWidget   *stop_icon;
+/*     GtkWidget   *stop_icon; */
        
        parent_priv = MODEST_WINDOW_GET_PRIVATE(self);
        priv = MODEST_MAIN_WINDOW_GET_PRIVATE(self);
@@ -306,9 +306,9 @@ get_toolbar (ModestMainWindow *self)
        gtk_toolbar_insert (GTK_TOOLBAR(toolbar), progress_item,
                            gtk_toolbar_get_n_items(GTK_TOOLBAR(toolbar)));
 
-       stop_icon = gtk_image_new_from_icon_name("qgn_toolb_gene_stop", GTK_ICON_SIZE_BUTTON);
-       gtk_toolbar_insert (GTK_TOOLBAR(toolbar), gtk_tool_button_new(stop_icon, NULL),
-                           gtk_toolbar_get_n_items(GTK_TOOLBAR(toolbar)));
+/*     stop_icon = gtk_image_new_from_icon_name("qgn_toolb_gene_stop", GTK_ICON_SIZE_BUTTON); */
+/*     gtk_toolbar_insert (GTK_TOOLBAR(toolbar), gtk_tool_button_new(stop_icon, NULL), */
+/*                         gtk_toolbar_get_n_items(GTK_TOOLBAR(toolbar))); */
 
        gtk_widget_show_all (toolbar);
        return toolbar;

diff --git a/src/maemo/ui/modest-main-window-ui.xml b/src/maemo/ui/modest-main-window-ui.xml
index 745ea3d..0d0492c 100644 (file)
--- a/src/maemo/ui/modest-main-window-ui.xml
+++ b/src/maemo/ui/modest-main-window-ui.xml
@@ -113,16 +113,13 @@
 
   <toolbar name="ToolBar">
     <toolitem action="ToolbarMessageNew"/> 
-    <separator/>
     <toolitem action="ToolbarMessageReply"/> 
-    <toolitem action="ToolbarMessageReplyAll"/>
-    <toolitem action="ToolbarMessageForward"/> 
-    <separator/>
-    <toolitem action="ToolbarSendReceive"/>
-    <!--    <toolitem  action="ToolbarToggleView"/> -->
-    <separator/>
+<!--    <toolitem action="ToolbarMessageReplyAll"/>
+    <toolitem action="ToolbarMessageForward"/> -->
     <toolitem action="ToolbarDeleteMessage"/>
-    <separator/>
+    <toolitem  action="ToolbarToggleView"/>
+<!--    <toolitem action="ToolbarSort"/> -->
+    <toolitem action="ToolbarSendReceive"/>
   </toolbar>
 
   <popup name="HeaderViewContextMenu">