Changeset 74

Show
Ignore:
Timestamp:
03/26/08 16:49:39
Author:
pvanhoof
Message:

2008-03-26 Philip Van Hoof <pvanhoof@gnome.org>

        • Adapted TMut to the latest Tinymail API changes in trunk.
Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved
  • trunk/ChangeLog

    r73 r74  
     12008-03-26  Philip Van Hoof  <pvanhoof@gnome.org> 
     2 
     3        * Adapted TMut to the latest Tinymail API changes in trunk. 
     4 
    152008-01-28  Philip Van Hoof  <pvanhoof@gnome.org> 
    26 
  • trunk/src/tmut-folder-view.c

    r73 r74  
    233233                if (header)  
    234234                { 
     235                        gchar *hstr = tny_header_dup_subject (header); 
    235236                        GtkWidget *dialog = gtk_message_dialog_new (GTK_WINDOW (priv->shell),  
    236237                                GTK_DIALOG_MODAL, GTK_MESSAGE_WARNING, GTK_BUTTONS_YES_NO,  
    237238                                _("This will remove the message with subject \"%s\""), 
    238                                 tny_header_get_subject (header)); 
     239                                hstr); 
     240                        g_free (hstr); 
    239241                        if (gtk_dialog_run (GTK_DIALOG (dialog)) == GTK_RESPONSE_YES) { 
    240242                                TnyFolder *folder = tny_header_get_folder (header); 
  • trunk/src/tmut-header-view.c

    r73 r74  
    4949{ 
    5050        TMutHeaderViewPriv *priv = TMUT_HEADER_VIEW_GET_PRIVATE (self); 
    51         if (header) 
    52                 gtk_label_set_text (GTK_LABEL (priv->subject), tny_header_get_subject (header)); 
    53         else 
     51        if (header) { 
     52                gchar *str = tny_header_dup_subject (header); 
     53                gtk_label_set_text (GTK_LABEL (priv->subject), str); 
     54                g_free (str); 
     55        } else 
    5456                gtk_label_set_text (GTK_LABEL (priv->subject), ""); 
    5557        tny_header_view_set_header (priv->header_view, header); 
  • trunk/src/tmut-msg-creator.c

    r73 r74  
    102102        if (header) 
    103103        { 
     104                gchar *sub = tny_header_dup_subject (header); 
    104105                gchar *str = g_strdup_printf (_("%s.\nDo you want to remove the message (%s)?"), 
    105                         err->message, tny_header_get_subject (header)); 
     106                        err->message, sub); 
     107 
     108                g_free (sub); 
    106109 
    107110                if (!rem_dialog) 
     
    381384        /* Translator: this Fwd-text is the default subject field when creating 
    382385         * a forward of a message */ 
    383         gchar *osubject = (gchar *) tny_header_get_subject (header), 
     386        gchar *osubject = (gchar *) tny_header_dup_subject (header), 
    384387              *str = g_strdup_printf (_("[Fwd: %s]"), osubject?osubject:_("No subject")); 
     388 
     389        g_free (osubject); 
    385390 
    386391        gtk_entry_set_text (priv->subject_entry, (const gchar*) str); 
     
    405410        /* Translator: this Re-text is the default subject field when creating 
    406411         * a reply of a message */ 
    407         gchar *osubject = (gchar *) tny_header_get_subject (header), 
     412        gchar *osubject = (gchar *) tny_header_dup_subject (header), 
    408413              *str = g_strdup_printf (_("[Re: %s]"), osubject?osubject:_("No subject")); 
    409414 
     415        g_free (osubject); 
     416 
    410417        gtk_entry_set_text (priv->subject_entry, (const gchar*) str); 
    411418 
    412419        g_free (str); 
     420 
     421        str = tny_header_dup_from (header); 
    413422 
    414423        g_string_printf (gstr, _("On %s, %s wrote:\n"),  
    415424                _get_readable_date (tny_header_get_date_sent (header)), 
    416                 tny_header_get_from (header)); 
     425                str); 
     426 
     427        g_free (str); 
    417428 
    418429        set_reply_msg (self, msg, gstr);