2009-03-09 [paul] 3.7.1cvs8

[claws.git] / src / send_message.c

diff --git a/src/send_message.c b/src/send_message.c
index ea5ac42caf309ac69159c621277ab527fe4d6ad9..cc20fc6e5f6ba25b8942411e5bfb4543e4d24afe 100644 (file)
--- a/src/send_message.c
+++ b/src/send_message.c
@@ -1,6 +1,6 @@
 /*
  * Sylpheed -- a GTK+ based, lightweight, and fast e-mail client
- * Copyright (C) 1999-2007 Hiroyuki Yamamoto and the Claws Mail team
+ * Copyright (C) 1999-2009 Hiroyuki Yamamoto and the Claws Mail team
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -87,9 +87,9 @@ gint send_message(const gchar *file, PrefsAccount *ac_prefs, GSList *to_list)
        FILE *fp;
        gint val;
 
-       g_return_val_if_fail(file != NULL, -1);
-       g_return_val_if_fail(ac_prefs != NULL, -1);
-       g_return_val_if_fail(to_list != NULL, -1);
+       cm_return_val_if_fail(file != NULL, -1);
+       cm_return_val_if_fail(ac_prefs != NULL, -1);
+       cm_return_val_if_fail(to_list != NULL, -1);
 
        if ((fp = g_fopen(file, "rb")) == NULL) {
                FILE_OP_ERROR(file, "fopen");
@@ -129,8 +129,8 @@ gint send_message_local(const gchar *command, FILE *fp)
        gboolean err = FALSE;
        gint status;
 
-       g_return_val_if_fail(command != NULL, -1);
-       g_return_val_if_fail(fp != NULL, -1);
+       cm_return_val_if_fail(command != NULL, -1);
+       cm_return_val_if_fail(fp != NULL, -1);
 
        log_message(LOG_PROTOCOL, _("Sending message using command: %s\n"), command);
 
@@ -205,11 +205,11 @@ gint send_message_smtp_full(PrefsAccount *ac_prefs, GSList *to_list, FILE *fp, g
        long fp_pos = 0;
        gchar spec_from[BUFFSIZE];
 
-       g_return_val_if_fail(ac_prefs != NULL, -1);
-       g_return_val_if_fail(ac_prefs->address != NULL, -1);
-       g_return_val_if_fail(ac_prefs->smtp_server != NULL, -1);
-       g_return_val_if_fail(to_list != NULL, -1);
-       g_return_val_if_fail(fp != NULL, -1);
+       cm_return_val_if_fail(ac_prefs != NULL, -1);
+       cm_return_val_if_fail(ac_prefs->address != NULL, -1);
+       cm_return_val_if_fail(ac_prefs->smtp_server != NULL, -1);
+       cm_return_val_if_fail(to_list != NULL, -1);
+       cm_return_val_if_fail(fp != NULL, -1);
 
        /* get the From address used, not necessarily the ac_prefs',
         * because it's editable. */
@@ -278,7 +278,7 @@ gint send_message_smtp_full(PrefsAccount *ac_prefs, GSList *to_list, FILE *fp, g
                        smtp_session->pass = NULL;
                }
 
-#if (defined(USE_OPENSSL) || defined (USE_GNUTLS))
+#ifdef USE_GNUTLS
                port = ac_prefs->set_smtpport ? ac_prefs->smtpport :
                        ac_prefs->ssl_smtp == SSL_TUNNEL ? SSMTP_PORT : SMTP_PORT;
                session->ssl_type = ac_prefs->ssl_smtp;
@@ -439,7 +439,7 @@ static gint send_recv_message(Session *session, const gchar *msg, gpointer data)
        SendProgressDialog *dialog = (SendProgressDialog *)data;
        gchar *state_str = NULL;
 
-       g_return_val_if_fail(dialog != NULL, -1);
+       cm_return_val_if_fail(dialog != NULL, -1);
 
        switch (smtp_session->state) {
        case SMTP_READY:
@@ -496,7 +496,7 @@ static gint send_send_data_progressive(Session *session, guint cur_len,
        SendProgressDialog *dialog = (SendProgressDialog *)data;
        MainWindow *mainwin = mainwindow_get_mainwindow();
        
-       g_return_val_if_fail(dialog != NULL, -1);
+       cm_return_val_if_fail(dialog != NULL, -1);
 
        if (SMTP_SESSION(session)->state != SMTP_SEND_DATA &&
            SMTP_SESSION(session)->state != SMTP_EOM)
@@ -521,7 +521,7 @@ static gint send_send_data_finished(Session *session, guint len, gpointer data)
        SendProgressDialog *dialog = (SendProgressDialog *)data;
        MainWindow *mainwin = mainwindow_get_mainwindow();
 
-       g_return_val_if_fail(dialog != NULL, -1);
+       cm_return_val_if_fail(dialog != NULL, -1);
 
        send_send_data_progressive(session, len, len, dialog);
        if (mainwin)
@@ -534,7 +534,7 @@ static gint send_send_data_finished(Session *session, guint len, gpointer data)
 static void send_progress_dialog_size_allocate_cb(GtkWidget *widget,
                                         GtkAllocation *allocation)
 {
-       g_return_if_fail(allocation != NULL);
+       cm_return_if_fail(allocation != NULL);
 
        prefs_common.sendwin_width = allocation->width;
        prefs_common.sendwin_height = allocation->height;
@@ -583,7 +583,7 @@ static SendProgressDialog *send_progress_dialog_create(void)
 
 static void send_progress_dialog_destroy(SendProgressDialog *dialog)
 {
-       g_return_if_fail(dialog != NULL);
+       cm_return_if_fail(dialog != NULL);
        if (!prefs_common.send_dialog_invisible) {
                progress_dialog_destroy(dialog->dialog);
        }
@@ -638,7 +638,7 @@ static void send_put_error(Session *session)
                case SESSION_TIMEOUT:
                        log_msg = _("Session timed out. You may be able to "
                                    "recover by increasing the timeout value in "
-                                   "Preferences/Other.");
+                                   "Preferences/Other/Miscellaneous.");
                        err_msg = g_strdup(log_msg);
                        break;
                default: