* the message view is now a scrollwindow which is linked directly into the mail paned

pmo-trunk-r77

diff --git a/src/gtk-glade/modest-ui.c b/src/gtk-glade/modest-ui.c
index 92a8cd4..f7bbf14 100644 (file)
--- a/src/gtk-glade/modest-ui.c
+++ b/src/gtk-glade/modest-ui.c
@@ -226,7 +226,7 @@ modest_ui_show_main_window (ModestUI *modest_ui)
 
        GtkWidget  *folder_view_holder,
                *header_view_holder,
-               *message_view_holder;
+               *mail_paned;
 
        priv = MODEST_UI_GET_PRIVATE(modest_ui);
 
@@ -263,12 +263,12 @@ modest_ui_show_main_window (ModestUI *modest_ui)
                          G_CALLBACK(on_folder_clicked), modest_ui);
 
        message_view  = GTK_WIDGET(modest_tny_msg_view_new (NULL));
-       message_view_holder = glade_xml_get_widget (priv->glade_xml, "mail_view");
+       mail_paned = glade_xml_get_widget (priv->glade_xml, "mail_paned");
        if (!message_view) {
                g_warning ("failed to create message view");
                return FALSE;
        }
-       gtk_container_add (GTK_CONTAINER(message_view_holder), message_view);
+       gtk_paned_add2 (GTK_PANED(mail_paned), message_view);
 
        g_signal_connect (header_view, "message_selected",
                          G_CALLBACK(on_message_clicked),
@@ -418,7 +418,7 @@ static void on_message_clicked (ModestTnyFolderTreeView *folder_tree,
                                TnyMsgIface *message,
                                gpointer data)
 {
-       GtkWidget *scrollview;
+       GtkWidget *paned;
        ModestTnyMsgView *msg_view;
        ModestUIPrivate *priv;
 
@@ -426,10 +426,8 @@ static void on_message_clicked (ModestTnyFolderTreeView *folder_tree,
        g_return_if_fail (data);
 
        priv = MODEST_UI_GET_PRIVATE(data);
-       scrollview = glade_xml_get_widget (priv->glade_xml,"mail_view");
-
-       msg_view = MODEST_TNY_MSG_VIEW(
-               gtk_bin_get_child(GTK_BIN(scrollview)));
+       paned = glade_xml_get_widget (priv->glade_xml,"mail_paned");
+       msg_view = MODEST_TNY_MSG_VIEW(gtk_paned_get_child2 (GTK_PANED(paned)));
 
        modest_tny_msg_view_set_message (msg_view,
                                         message);

diff --git a/src/gtk-glade/modest.glade b/src/gtk-glade/modest.glade
index 93f4c74..74b76b2 100644 (file)
--- a/src/gtk-glade/modest.glade
+++ b/src/gtk-glade/modest.glade
@@ -752,7 +752,7 @@
          </child>
 
          <child>
-           <widget class="GtkVPaned" id="vpaned1">
+           <widget class="GtkVPaned" id="mail_paned">
              <property name="visible">True</property>
              <property name="can_focus">True</property>
              <property name="position">150</property>
@@ -777,21 +777,7 @@
              </child>
 
              <child>
-               <widget class="GtkFrame" id="mail_view">
-                 <property name="visible">True</property>
-                 <property name="can_focus">True</property>
-                 <property name="label_xalign">0</property>
-                 <property name="label_yalign">0.5</property>
-                 <property name="shadow_type">GTK_SHADOW_NONE</property>
-
-                 <child>
-                   <placeholder/>
-                 </child>
-               </widget>
-               <packing>
-                 <property name="shrink">True</property>
-                 <property name="resize">True</property>
-               </packing>
+               <placeholder/>
              </child>
            </widget>
            <packing>