Changeset 20

Show
Ignore:
Timestamp:
10/31/07 23:44:16
Author:
pvanhoof
Message:

Bugfix in TMutMsgView

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • trunk/src/tmut-msg-view.c

    r19 r20  
    3535        TnyMsgView *msg_view; 
    3636        GtkScrolledWindow *sw; 
    37         GtkButton *reply_button, *forward_button; 
    3837}; 
    3938 
    …… 
    7069{ 
    7170        TMutMsgViewPriv *priv = TMUT_MSG_VIEW_GET_PRIVATE (self); 
    72  
    73         GtkWidget *hbox; 
     71        GtkWidget *hbox, *reply_button, *forward_button; 
     72 
    7473        hbox = gtk_hbox_new (FALSE, 0); 
     74        reply_button = gtk_button_new_with_label ("Reply"); 
     75        forward_button = gtk_button_new_with_label ("Forward"); 
     76 
    7577        gtk_widget_show (hbox); 
     78        gtk_widget_show (reply_button); 
     79        gtk_widget_show (forward_button); 
    7680 
    7781        gtk_box_pack_start (GTK_BOX (self), hbox, FALSE, TRUE, 0); 
    78         gtk_box_pack_start (GTK_BOX (hbox), GTK_WIDGET (priv->reply_button),  
    79                 TRUE, TRUE, 0); 
    80         gtk_box_pack_start (GTK_BOX (hbox), GTK_WIDGET (priv->forward_button),  
    81                 TRUE, TRUE, 0); 
    82  
    83         g_signal_connect (G_OBJECT (priv->reply_button), "clicked", 
     82        gtk_box_pack_start (GTK_BOX (hbox), reply_button, TRUE, TRUE, 0); 
     83        gtk_box_pack_start (GTK_BOX (hbox), forward_button, TRUE, TRUE, 0); 
     84 
     85        g_signal_connect (G_OBJECT (reply_button), "clicked", 
    8486                G_CALLBACK (tmut_msg_view_on_reply_clicked), self); 
    85         g_signal_connect (G_OBJECT (priv->forward_button), "clicked", 
     87        g_signal_connect (G_OBJECT (forward_button), "clicked", 
    8688                G_CALLBACK (tmut_msg_view_on_forward_clicked), self); 
    8789 
    …… 
    115117} 
    116118 
    117  
    118  
    119  
    120119static void  
    121120tmut_msg_view_clear (TnyMsgView *self) 
    …… 
    147146} 
    148147 
    149  
    150  
    151148static void  
    152149tmut_msg_view_mp_clear (TnyMimePartView *self) 
    …… 
    157154} 
    158155 
    159  
    160156static void  
    161157tmut_msg_view_mp_set_part (TnyMimePartView *self, TnyMimePart *part) 
    …… 
    167163        return; 
    168164} 
    169  
    170165 
    171166static TnyMimePart*  
    …… 
    189184        TMutMsgViewPriv *priv = TMUT_MSG_VIEW_GET_PRIVATE (self); 
    190185 
    191  
    192         if (G_UNLIKELY (priv->msg_view)) 
     186        if (priv->msg_view) 
    193187                gtk_container_remove (GTK_CONTAINER (priv->sw), GTK_WIDGET (priv->msg_view)); 
    194  
    195188        priv->msg_view = view; 
    196  
    197189        gtk_scrolled_window_add_with_viewport (GTK_SCROLLED_WINDOW (priv->sw),  
    198190                        GTK_WIDGET (view)); 
    199  
    200191        gtk_widget_show (GTK_WIDGET (priv->msg_view)); 
    201192 
    …… 
    223214        TMutMsgViewPriv *priv = TMUT_MSG_VIEW_GET_PRIVATE (instance); 
    224215 
     216        priv->msg_view = NULL; 
    225217        priv->sw = GTK_SCROLLED_WINDOW (gtk_scrolled_window_new (NULL, NULL)); 
    226         priv->reply_button = GTK_BUTTON (gtk_button_new_with_label ("Reply")); 
    227         priv->forward_button = GTK_BUTTON (gtk_button_new_with_label ("Forward")); 
    228  
    229218        gtk_widget_show (GTK_WIDGET (priv->sw)); 
    230         gtk_widget_show (GTK_WIDGET (priv->reply_button)); 
    231         gtk_widget_show (GTK_WIDGET (priv->forward_button)); 
    232  
    233219        gtk_scrolled_window_set_shadow_type (GTK_SCROLLED_WINDOW (priv->sw),  
    234220                GTK_SHADOW_NONE); 
    235221        gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (priv->sw), 
    236222                GTK_POLICY_AUTOMATIC, GTK_POLICY_AUTOMATIC); 
    237  
    238223        gtk_box_pack_start (GTK_BOX (instance), GTK_WIDGET (priv->sw), TRUE, TRUE, 0); 
    239224