#ifdef HAVE_VALGRIND
#include <valgrind.h>
#endif
+#ifdef HAVE_SVG
+#include <librsvg/rsvg.h>
+#endif
#include "claws.h"
#include "main.h"
#include "prefs_fonts.h"
#include "prefs_image_viewer.h"
#include "prefs_message.h"
+#include "prefs_migration.h"
#include "prefs_receive.h"
#include "prefs_msg_colors.h"
#include "prefs_quote.h"
#include "prefs_summaries.h"
#include "prefs_themes.h"
#include "prefs_other.h"
+#include "prefs_proxy.h"
#include "prefs_logging.h"
#include "prefs_send.h"
#include "prefs_wrapping.h"
#include "quicksearch.h"
#include "advsearch.h"
#include "avatars.h"
+#include "passwordstore.h"
+#include "file-utils.h"
#ifdef HAVE_LIBETPAN
#include "imap-thread.h"
static gboolean went_offline_nm;
#endif
-#if !defined(NM_CHECK_VERSION)
-#define NM_CHECK_VERSION(x,y,z) 0
-#endif
#ifdef HAVE_DBUS_GLIB
static DBusGProxy *awn_proxy = NULL;
#endif
gchar *prog_version;
+#if (defined HAVE_LIBSM || defined CRASH_DIALOG)
gchar *argv0;
+#endif
#ifdef HAVE_STARTUP_NOTIFICATION
static SnLauncheeContext *sn_context = NULL;
static gint lock_socket = -1;
static gint lock_socket_tag = 0;
+#ifdef G_OS_UNIX
static gchar *x_display = NULL;
+#endif
typedef enum
{
ONLINE_MODE_DONT_CHANGE,
} \
}
+#define STRNCMP(S1, S2) (strncmp((S1), (S2), sizeof((S2)) - 1))
+
+#define FD_WRITE(S) fd_write(sock, (S), strlen((S)))
+#define FD_WRITE_ALL(S) fd_write(sock, (S), strlen((S)))
+
static MainWindow *static_mainwindow;
static gboolean emergency_exit = FALSE;
{
gboolean autochk = GPOINTER_TO_INT(data);
- inc_all_account_mail(static_mainwindow, autochk,
+ if (!sc_starting) {
+ inc_all_account_mail(static_mainwindow, autochk, FALSE,
prefs_common.newmail_notify_manu);
- if (sc_starting) {
+ } else {
+ inc_all_account_mail(static_mainwindow, FALSE,
+ prefs_common.chk_on_startup,
+ prefs_common.newmail_notify_manu);
sc_starting = FALSE;
main_window_set_menu_sensitive(static_mainwindow);
toolbar_main_set_sensitive(static_mainwindow);
G_CALLBACK(chk_update_val), &backup);
if (alertpanel_full(_("Migration of configuration"), message,
- GTK_STOCK_NO, "+" GTK_STOCK_YES, NULL, FALSE,
- keep_backup_chk, ALERT_QUESTION, G_ALERTDEFAULT) != G_ALERTALTERNATE) {
+ GTK_STOCK_NO, GTK_STOCK_YES, NULL, ALERTFOCUS_SECOND, FALSE,
+ keep_backup_chk, ALERT_QUESTION) != G_ALERTALTERNATE) {
return FALSE;
}
/* if g_rename failed, we'll try to copy */
if (r != 0) {
- FILE_OP_ERROR(new_cfg_dir, "g_rename failed, trying copy\n");
+ FILE_OP_ERROR(new_cfg_dir, "g_rename");
+ debug_print("rename failed, trying copy\n");
goto backup_mode;
}
}
gchar buf[BUFFSIZE];
gboolean err = FALSE;
- oldfp = g_fopen(old_rc, "r");
+ oldfp = claws_fopen(old_rc, "r");
if (!oldfp)
return -1;
- newfp = g_fopen(new_rc, "w");
+ newfp = claws_fopen(new_rc, "w");
if (!newfp) {
- fclose(oldfp);
+ claws_fclose(oldfp);
return -1;
}
old_plugin_path = g_strdup(new_plugin_path);
}
debug_print("replacing %s with %s\n", old_plugin_path, new_plugin_path);
- while (fgets(buf, sizeof(buf), oldfp)) {
- if (strncmp(buf, old_plugin_path, strlen(old_plugin_path))) {
- err |= (fputs(buf, newfp) == EOF);
+ while (claws_fgets(buf, sizeof(buf), oldfp)) {
+ if (STRNCMP(buf, old_plugin_path)) {
+ err |= (claws_fputs(buf, newfp) == EOF);
} else {
- debug_print("->replacing %s", buf);
- debug_print(" with %s%s", new_plugin_path, buf+strlen(old_plugin_path));
- err |= (fputs(new_plugin_path, newfp) == EOF);
- err |= (fputs(buf+strlen(old_plugin_path), newfp) == EOF);
+ debug_print("->replacing %s\n", buf);
+ debug_print(" with %s%s\n", new_plugin_path, buf+strlen(old_plugin_path));
+ err |= (claws_fputs(new_plugin_path, newfp) == EOF);
+ err |= (claws_fputs(buf+strlen(old_plugin_path), newfp) == EOF);
}
}
g_free(plugin_path);
g_free(new_plugin_path);
g_free(old_plugin_path);
- fclose(oldfp);
- if (fclose(newfp) == EOF)
+ claws_fclose(oldfp);
+ if (claws_safe_fclose(newfp) == EOF)
err = TRUE;
return (err ? -1:0);
NULL, &client_id,
256, error_string_ret);
+ /* From https://www.x.org/releases/X11R7.7/doc/libSM/SMlib.txt:
+ * If SmcOpenConnection succeeds, it returns an opaque connection
+ * pointer of type SmcConn and the client_id_ret argument contains
+ * the client ID to be used for this session. The client_id_ret
+ * should be freed with a call to free when no longer needed. On
+ * failure, SmcOpenConnection returns NULL, and the reason for
+ * failure is returned in error_string_ret. */
+ if (mainwin->smc_conn != NULL)
+ g_free(client_id);
+
if (error_string_ret[0] || mainwin->smc_conn == NULL)
g_warning ("While connecting to session manager: %s.",
error_string_ret);
vals[0].value = g_strdup(g_get_user_name()?g_get_user_name():"");
sc_client_set_value (mainwin, SmUserID, SmARRAY8, 1, vals);
+ g_free(vals[0].value);
g_free(vals);
}
}
static void win32_open_log(void)
{
- gchar *logfile = g_strconcat(g_get_tmp_dir(), G_DIR_SEPARATOR_S, "claws-win32.log", NULL);
- gchar *oldlogfile = g_strconcat(g_get_tmp_dir(), G_DIR_SEPARATOR_S, "claws-win32.log.bak", NULL);
+ gchar *logfile = win32_debug_log_path();
+ gchar *oldlogfile = g_strconcat(logfile, ".bak", NULL);
if (is_file_exist(logfile)) {
if (rename_force(logfile, oldlogfile) < 0)
FILE_OP_ERROR(logfile, "rename");
}
- win32_debug_fp = g_fopen(logfile, "w");
+ win32_debug_fp = claws_fopen(logfile, "w");
g_free(logfile);
g_free(oldlogfile);
if (win32_debug_fp)
g_log_remove_handler("", win32_log_handler_app_id);
g_log_remove_handler("GLib", win32_log_handler_glib_id);
g_log_remove_handler("Gtk", win32_log_handler_gtk_id);
- fclose(win32_debug_fp);
+ claws_fclose(win32_debug_fp);
win32_debug_fp=NULL;
}
}
else
g_print(" NetworkManager\n");
#endif
+#if HAVE_SVG
+ if (show_debug_only)
+ debug_print(" librSVG " LIBRSVG_VERSION "\n");
+ else
+ g_print(" librSVG " LIBRSVG_VERSION "\n");
+#endif
}
#ifdef HAVE_DBUS_GLIB
-static guint dbus_item_hook_id = -1;
-static guint dbus_folder_hook_id = -1;
+static gulong dbus_item_hook_id = HOOK_NONE;
+static gulong dbus_folder_hook_id = HOOK_NONE;
static void uninstall_dbus_status_handler(void)
{
if(awn_proxy)
g_object_unref(awn_proxy);
awn_proxy = NULL;
- if (dbus_item_hook_id != -1)
+ if (dbus_item_hook_id != HOOK_NONE)
hooks_unregister_hook(FOLDER_ITEM_UPDATE_HOOKLIST, dbus_item_hook_id);
- if (dbus_folder_hook_id != -1)
+ if (dbus_folder_hook_id != HOOK_NONE)
hooks_unregister_hook(FOLDER_UPDATE_HOOKLIST, dbus_folder_hook_id);
}
"/com/google/code/Awn",
"com.google.code.Awn");
dbus_item_hook_id = hooks_register_hook (FOLDER_ITEM_UPDATE_HOOKLIST, dbus_status_update_item_hook, NULL);
- if (dbus_item_hook_id == -1) {
+ if (dbus_item_hook_id == HOOK_NONE) {
g_warning("Failed to register folder item update hook");
uninstall_dbus_status_handler();
return;
}
dbus_folder_hook_id = hooks_register_hook (FOLDER_UPDATE_HOOKLIST, dbus_status_update_folder_hook, NULL);
- if (dbus_folder_hook_id == -1) {
+ if (dbus_folder_hook_id == HOOK_NONE) {
g_warning("Failed to register folder update hook");
uninstall_dbus_status_handler();
return;
FolderView *folderview;
GdkPixbuf *icon;
gboolean crash_file_present = FALSE;
- gint num_folder_class = 0;
+ guint num_folder_class = 0;
gboolean asked_for_migration = FALSE;
gboolean start_done = TRUE;
GSList *plug_list = NULL;
gboolean never_ran = FALSE;
gboolean mainwin_shown = FALSE;
+ gint ret;
START_TIMING("startup");
}
prog_version = PROG_VERSION;
+#if (defined HAVE_LIBSM || defined CRASH_DIALOG)
argv0 = g_strdup(argv[0]);
+#endif
parse_cmd_opt(argc, argv);
#ifdef CRASH_DIALOG
if (cmd.crash) {
-#if !GTK_CHECK_VERSION(3, 0, 0)
gtk_set_locale();
-#endif
gtk_init(&argc, &argv);
crash_main(cmd.crash_params);
#ifdef G_OS_WIN32
reset_statistics();
-#if !GTK_CHECK_VERSION(3, 0, 0)
gtk_set_locale();
-#endif
gtk_init(&argc, &argv);
#ifdef G_OS_WIN32
"gtk-auto-mnemonics",
TRUE,
"XProperty");
+ gtk_settings_set_long_property(gtk_settings_get_default(),
+ "gtk-button-images",
+ TRUE,
+ "XProperty");
#endif
#ifdef HAVE_NETWORKMANAGER_SUPPORT
"/org/freedesktop/NetworkManager",
"org.freedesktop.NetworkManager");
if (nm_proxy) {
-#if NM_CHECK_VERSION(0,8,992)
dbus_g_proxy_add_signal(nm_proxy, "StateChanged", G_TYPE_UINT, G_TYPE_INVALID);
dbus_g_proxy_connect_signal(nm_proxy, "StateChanged",
G_CALLBACK(networkmanager_state_change_cb),
NULL,NULL);
-#else
- dbus_g_proxy_add_signal(nm_proxy, "StateChange", G_TYPE_UINT, G_TYPE_INVALID);
- dbus_g_proxy_connect_signal(nm_proxy, "StateChange",
- G_CALLBACK(networkmanager_state_change_cb),
- NULL,NULL);
-#endif
}
#endif
install_dbus_status_handler();
}
#endif
-#if !GTK_CHECK_VERSION(3, 0, 0)
gtk_widget_set_default_colormap(
gdk_screen_get_system_colormap(
gdk_screen_get_default()));
-#endif
gtkut_create_ui_manager();
#endif
/* no config dir exists. See if we can migrate an old config. */
- if (!is_dir_exist(RC_DIR)) {
+ if (!is_dir_exist(get_rc_dir())) {
prefs_destroy_cache();
gboolean r = FALSE;
* and migration succeeded, and FALSE otherwise.
*/
if (is_dir_exist(OLD_GTK2_RC_DIR)) {
- r = migrate_old_config(OLD_GTK2_RC_DIR, RC_DIR,
+ r = migrate_old_config(OLD_GTK2_RC_DIR, get_rc_dir(),
g_strconcat("Sylpheed-Claws 2.6.0 ", _("(or older)"), NULL));
asked_for_migration = TRUE;
} else if (is_dir_exist(OLDER_GTK2_RC_DIR)) {
- r = migrate_old_config(OLDER_GTK2_RC_DIR, RC_DIR,
+ r = migrate_old_config(OLDER_GTK2_RC_DIR, get_rc_dir(),
g_strconcat("Sylpheed-Claws 1.9.15 ",_("(or older)"), NULL));
asked_for_migration = TRUE;
} else if (is_dir_exist(OLD_GTK1_RC_DIR)) {
- r = migrate_old_config(OLD_GTK1_RC_DIR, RC_DIR,
+ r = migrate_old_config(OLD_GTK1_RC_DIR, get_rc_dir(),
g_strconcat("Sylpheed-Claws 1.0.5 ",_("(or older)"), NULL));
asked_for_migration = TRUE;
} else if (is_dir_exist(SYLPHEED_RC_DIR)) {
- r = migrate_old_config(SYLPHEED_RC_DIR, RC_DIR, "Sylpheed");
+ r = migrate_old_config(SYLPHEED_RC_DIR, get_rc_dir(), "Sylpheed");
asked_for_migration = TRUE;
}
/* If migration failed or the user didn't want to do it,
* we create a new one (and we'll hit wizard later).
*/
- if (r == FALSE && !is_dir_exist(RC_DIR)) {
+ if (r == FALSE && !is_dir_exist(get_rc_dir())) {
#ifdef G_OS_UNIX
- if (copy_dir(SYSCONFDIR "/skel/.claws-mail", RC_DIR) < 0) {
+ if (copy_dir(SYSCONFDIR "/skel/.claws-mail", get_rc_dir()) < 0) {
#endif
- if (!is_dir_exist(RC_DIR) && make_dir(RC_DIR) < 0) {
+ if (!is_dir_exist(get_rc_dir()) && make_dir(get_rc_dir()) < 0) {
#ifdef G_OS_WIN32
win32_close_log();
#endif
folder_system_init();
prefs_common_read_config();
+ if (prefs_update_config_version_common() < 0) {
+ debug_print("Main configuration file version upgrade failed, exiting\n");
+#ifdef G_OS_WIN32
+ win32_close_log();
+#endif
+ exit(200);
+ }
+
prefs_themes_init();
prefs_fonts_init();
prefs_ext_prog_init();
prefs_summaries_init();
prefs_message_init();
prefs_other_init();
+ prefs_proxy_init();
prefs_logging_init();
prefs_receive_init();
prefs_send_init();
prefs_spelling_init();
#endif
+ codeconv_set_allow_jisx0201_kana(prefs_common.allow_jisx0201_kana);
+ codeconv_set_broken_are_utf8(prefs_common.broken_are_utf8);
+
#ifdef G_OS_WIN32
if(prefs_common.gtk_theme && strcmp(prefs_common.gtk_theme, DEFAULT_W32_GTK_THEME))
gtk_settings_set_string_property(gtk_settings_get_default(),
}
#endif
gtkut_widget_init();
- stock_pixbuf_gdk(NULL, STOCK_PIXMAP_CLAWS_MAIL_ICON, &icon);
+ stock_pixbuf_gdk(STOCK_PIXMAP_CLAWS_MAIL_ICON, &icon);
gtk_window_set_default_icon(icon);
folderview_initialize();
manage_window_focus_in(mainwin->window, NULL, NULL);
folderview = mainwin->folderview;
- gtk_cmclist_freeze(GTK_CMCLIST(mainwin->folderview->ctree));
+ folderview_freeze(mainwin->folderview);
folder_item_update_freeze();
+ if ((ret = passwd_store_read_config()) < 0) {
+ debug_print("Password store configuration file version upgrade failed (%d), exiting\n", ret);
+#ifdef G_OS_WIN32
+ win32_close_log();
+#endif
+ exit(202);
+ }
+
prefs_account_init();
account_read_config_all();
+ if (prefs_update_config_version_accounts() < 0) {
+ debug_print("Accounts configuration file version upgrade failed, exiting\n");
+#ifdef G_OS_WIN32
+ win32_close_log();
+#endif
+ exit(201);
+ }
+
#ifdef HAVE_LIBETPAN
imap_main_init(prefs_common.skip_ssl_cert_check);
imap_main_set_timeout(prefs_common.io_timeout_secs);
#endif
/* If we can't read a folder list or don't have accounts,
* it means the configuration's not done. Either this is
- * a brand new install, either a failed/refused migration.
- * So we'll start the wizard.
+ * a brand new install, a failed/refused migration,
+ * or a failed config_version upgrade.
*/
- if (folder_read_list() < 0) {
+ if ((ret = folder_read_list()) < 0) {
+ debug_print("Folderlist read failed (%d)\n", ret);
prefs_destroy_cache();
+ if (ret == -2) {
+ /* config_version update failed in folder_read_list(). We
+ * do not want to run the wizard, just exit. */
+ debug_print("Folderlist version upgrade failed, exiting\n");
+#ifdef G_OS_WIN32
+ win32_close_log();
+#endif
+ exit(203);
+ }
+
/* if run_wizard returns FALSE it's because it's
* been cancelled. We can't do much but exit.
* however, if the user was asked for a migration,
folder_item_update_freeze();
}
/* make the crash-indicator file */
- str_write_to_file("foo", get_crashfile_name());
+ if (str_write_to_file("foo", get_crashfile_name(), FALSE) < 0) {
+ g_warning("Can't create the crash-indicator file.");
+ }
inc_autocheck_timer_init(mainwin);
prefs_common_write_config();
plugin_load_standard_plugins ();
}
+
/* if not crashed, show window now */
if (!mainwin_shown) {
/* apart if something told not to show */
#endif
folder_item_update_thaw();
- gtk_cmclist_thaw(GTK_CMCLIST(mainwin->folderview->ctree));
+ folderview_thaw(mainwin->folderview);
main_window_cursor_normal(mainwin);
if (!cmd.target && prefs_common.goto_last_folder_on_startup &&
} else if (cmd.receive && !cmd.target) {
start_done = FALSE;
g_timeout_add(1000, defer_check, NULL);
- }
- gtk_widget_grab_focus(folderview->ctree);
+ }
+ folderview_grab_focus(folderview);
if (cmd.compose) {
open_compose_new(cmd.compose_mailto, cmd.attach_files);
}
if (cmd.attach_files) {
- list_free_strings(cmd.attach_files);
- g_list_free(cmd.attach_files);
+ list_free_strings_full(cmd.attach_files);
cmd.attach_files = NULL;
}
if (cmd.subscribe) {
{
gchar *filename;
gboolean have_connectivity;
+ FolderItem *item;
sc_exiting = TRUE;
#endif
/* save prefs for opened folder */
- if(mainwin->folderview->opened) {
- FolderItem *item;
-
- item = gtk_cmctree_node_get_row_data(
- GTK_CMCTREE(mainwin->folderview->ctree),
- mainwin->folderview->opened);
- if (item) {
- summary_save_prefs_to_folderitem(
- mainwin->folderview->summaryview, item);
- prefs_common.last_opened_folder =
- folder_item_get_identifier(item);
- }
+ if((item = folderview_get_opened_item(mainwin->folderview)) != NULL) {
+ summary_save_prefs_to_folderitem(
+ mainwin->summaryview, item);
+ if (prefs_common.last_opened_folder != NULL)
+ g_free(prefs_common.last_opened_folder);
+ prefs_common.last_opened_folder =
+ !prefs_common.goto_last_folder_on_startup ? NULL :
+ folder_item_get_identifier(item);
}
/* save all state before exiting */
prefs_common_write_config();
account_write_config_all();
+ passwd_store_write_config();
#ifndef USE_ALT_ADDRBOOK
addressbook_export_to_file();
#endif
prefs_summaries_done();
prefs_message_done();
prefs_other_done();
+ prefs_proxy_done();
prefs_receive_done();
prefs_logging_done();
prefs_send_done();
claws_done();
}
-#define G_STRING_APPEND_ENCODED_URI(gstring,source) \
- { \
- gchar tmpbuf[BUFFSIZE]; \
- encode_uri(tmpbuf, BUFFSIZE, (source)); \
- g_string_append((gstring), tmpbuf); \
- }
-
#define G_PRINT_EXIT(msg) \
{ \
g_print(msg); \
if (isstdin)
fp = stdin;
else {
- fp = g_fopen(fn, "r");
+ fp = claws_fopen(fn, "r");
if (!fp)
G_PRINT_EXIT(_("Cannot open filename for reading\n"));
}
- while (fgets(fb, sizeof(fb), fp)) {
+ while (claws_fgets(fb, sizeof(fb), fp)) {
gchar *tmp;
strretchomp(fb);
if (*fb == '\0')
g_string_append(body, to);
g_free(to);
g_string_append(body, "?body=");
- while (fgets(fb, sizeof(fb), fp)) {
+ while (claws_fgets(fb, sizeof(fb), fp)) {
g_string_append_uri_escaped(body, fb, NULL, TRUE);
}
if (!isstdin)
- fclose(fp);
+ claws_fclose(fp);
/* append the remaining headers */
g_string_append(body, headers->str);
g_string_free(headers, TRUE);
return body;
}
-#undef G_STRING_APPEND_ENCODED_URI
#undef G_PRINT_EXIT
+static void parse_cmd_opt_error(char *errstr, char* optstr)
+{
+ gchar tmp[BUFSIZ];
+
+ cm_return_if_fail(errstr != NULL);
+ cm_return_if_fail(optstr != NULL);
+
+ g_snprintf(tmp, sizeof(tmp), errstr, optstr);
+ g_print(_("%s. Try -h or --help for usage.\n"), tmp);
+ exit(1);
+}
+
static void parse_cmd_opt(int argc, char *argv[])
{
AttachInfo *ainfo;
gint i;
for (i = 1; i < argc; i++) {
- if (!strncmp(argv[i], "--receive-all", 13)) {
+ if (!strcmp(argv[i], "--receive-all")) {
cmd.receive_all = TRUE;
- } else if (!strncmp(argv[i], "--receive", 9)) {
+ } else if (!strcmp(argv[i], "--receive")) {
cmd.receive = TRUE;
- } else if (!strncmp(argv[i], "--cancel-receiving", 18)) {
+ } else if (!strcmp(argv[i], "--cancel-receiving")) {
cmd.cancel_receiving = TRUE;
- } else if (!strncmp(argv[i], "--cancel-sending", 16)) {
+ } else if (!strcmp(argv[i], "--cancel-sending")) {
cmd.cancel_sending = TRUE;
- } else if (!strncmp(argv[i], "--compose-from-file", 19)) {
- const gchar *p = (i+1 < argc)?argv[i+1]:NULL;
+ } else if (!strcmp(argv[i], "--compose-from-file")) {
+ if (i+1 < argc) {
+ const gchar *p = argv[i+1];
- GString *mailto = parse_cmd_compose_from_file(p);
- cmd.compose = TRUE;
- cmd.compose_mailto = mailto->str;
- i++;
- } else if (!strncmp(argv[i], "--compose", 9)) {
+ GString *mailto = parse_cmd_compose_from_file(p);
+ cmd.compose = TRUE;
+ cmd.compose_mailto = mailto->str;
+ i++;
+ } else {
+ parse_cmd_opt_error(_("Missing file argument for option %s"), argv[i]);
+ }
+ } else if (!strcmp(argv[i], "--compose")) {
const gchar *p = (i+1 < argc)?argv[i+1]:NULL;
cmd.compose = TRUE;
cmd.compose_mailto = NULL;
if (p && *p != '\0' && *p != '-') {
- if (!strncmp(p, "mailto:", 7)) {
+ if (!STRNCMP(p, "mailto:")) {
cmd.compose_mailto = p + 7;
} else {
cmd.compose_mailto = p;
}
i++;
}
- } else if (!strncmp(argv[i], "--subscribe", 11)) {
- const gchar *p = (i+1 < argc)?argv[i+1]:NULL;
- if (p && *p != '\0' && *p != '-') {
- cmd.subscribe = TRUE;
- cmd.subscribe_uri = p;
+ } else if (!strcmp(argv[i], "--subscribe")) {
+ if (i+1 < argc) {
+ const gchar *p = argv[i+1];
+ if (p && *p != '\0' && *p != '-') {
+ cmd.subscribe = TRUE;
+ cmd.subscribe_uri = p;
+ } else {
+ parse_cmd_opt_error(_("Missing or empty uri argument for option %s"), argv[i]);
+ }
+ } else {
+ parse_cmd_opt_error(_("Missing uri argument for option %s"), argv[i]);
}
- } else if (!strncmp(argv[i], "--attach", 8)) {
- const gchar *p = (i+1 < argc)?argv[i+1]:NULL;
- gchar *file = NULL;
-
- while (p && *p != '\0' && *p != '-') {
- if ((file = g_filename_from_uri(p, NULL, NULL)) != NULL) {
- if (!is_file_exist(file)) {
- g_free(file);
- file = NULL;
+ } else if (!strcmp(argv[i], "--attach") ||
+ !strcmp(argv[i], "--insert")) {
+ if (i+1 < argc) {
+ const gchar *p = argv[i+1];
+ gint ii = i;
+ gchar *file = NULL;
+ gboolean insert = !strcmp(argv[i], "--insert");
+
+ while (p && *p != '\0' && *p != '-') {
+ if ((file = g_filename_from_uri(p, NULL, NULL)) != NULL) {
+ if (!is_file_exist(file)) {
+ g_free(file);
+ file = NULL;
+ }
}
+ if (file == NULL && *p != G_DIR_SEPARATOR) {
+ file = g_strconcat(claws_get_startup_dir(),
+ G_DIR_SEPARATOR_S,
+ p, NULL);
+ } else if (file == NULL) {
+ file = g_strdup(p);
+ }
+
+ ainfo = g_new0(AttachInfo, 1);
+ ainfo->file = file;
+ ainfo->insert = insert;
+ cmd.attach_files = g_list_append(cmd.attach_files, ainfo);
+ ii++;
+ p = (ii+1 < argc)?argv[ii+1]:NULL;
}
- if (file == NULL && *p != G_DIR_SEPARATOR) {
- file = g_strconcat(claws_get_startup_dir(),
- G_DIR_SEPARATOR_S,
- p, NULL);
- } else if (file == NULL) {
- file = g_strdup(p);
- }
- ainfo = g_new0(AttachInfo, 1);
- ainfo->file = file;
- cmd.attach_files = g_list_append(cmd.attach_files, ainfo);
- i++;
- p = (i+1 < argc)?argv[i+1]:NULL;
+ if (ii==i) {
+ parse_cmd_opt_error(_("Missing at least one non-empty file argument for option %s"), argv[i]);
+ } else {
+ i=ii;
+ }
+ } else {
+ parse_cmd_opt_error(_("Missing file argument for option %s"), argv[i]);
}
- } else if (!strncmp(argv[i], "--send", 6)) {
+ } else if (!strcmp(argv[i], "--send")) {
cmd.send = TRUE;
- } else if (!strncmp(argv[i], "--version-full", 14) ||
- !strncmp(argv[i], "-V", 2)) {
- g_print("Claws Mail version " VERSION "\n");
+ } else if (!strcmp(argv[i], "--version-full") ||
+ !strcmp(argv[i], "-V")) {
+ g_print("Claws Mail version " VERSION_GIT_FULL "\n");
main_dump_features_list(FALSE);
exit(0);
- } else if (!strncmp(argv[i], "--version", 9) ||
- !strncmp(argv[i], "-v", 2)) {
+ } else if (!strcmp(argv[i], "--version") ||
+ !strcmp(argv[i], "-v")) {
g_print("Claws Mail version " VERSION "\n");
exit(0);
- } else if (!strncmp(argv[i], "--status-full", 13)) {
+ } else if (!strcmp(argv[i], "--status-full")) {
const gchar *p = (i+1 < argc)?argv[i+1]:NULL;
cmd.status_full = TRUE;
i++;
p = (i+1 < argc)?argv[i+1]:NULL;
}
- } else if (!strncmp(argv[i], "--status", 8)) {
+ } else if (!strcmp(argv[i], "--status")) {
const gchar *p = (i+1 < argc)?argv[i+1]:NULL;
cmd.status = TRUE;
i++;
p = (i+1 < argc)?argv[i+1]:NULL;
}
- } else if (!strncmp(argv[i], "--search", 8)) {
- cmd.search_folder = (i+1 < argc)?argv[i+1]:NULL;
- cmd.search_type = (i+2 < argc)?argv[i+2]:NULL;
- cmd.search_request = (i+3 < argc)?argv[i+3]:NULL;
- const char* rec = (i+4 < argc)?argv[i+4]:NULL;
- cmd.search_recursive = TRUE;
- if (rec && (tolower(*rec)=='n' || tolower(*rec)=='f' || *rec=='0'))
- cmd.search_recursive = FALSE;
- if (cmd.search_folder && cmd.search_type && cmd.search_request)
- cmd.search = TRUE;
- } else if (!strncmp(argv[i], "--online", 8)) {
+ } else if (!strcmp(argv[i], "--search")) {
+ if (i+3 < argc) { /* 3 first arguments are mandatory */
+ const char* p;
+ /* only set search parameters if they are valid */
+ p = argv[i+1];
+ cmd.search_folder = (p && *p != '\0' && *p != '-')?p:NULL;
+ p = argv[i+2];
+ cmd.search_type = (p && *p != '\0' && *p != '-')?p:NULL;
+ p = argv[i+3];
+ cmd.search_request = (p && *p != '\0' && *p != '-')?p:NULL;
+ p = (i+4 < argc)?argv[i+4]:NULL;
+ const char* rec = (p && *p != '\0' && *p != '-')?p:NULL;
+ cmd.search_recursive = TRUE;
+ if (rec) {
+ i++;
+ if (tolower(*rec)=='n' || tolower(*rec)=='f' || *rec=='0')
+ cmd.search_recursive = FALSE;
+ }
+ if (cmd.search_folder && cmd.search_type && cmd.search_request) {
+ cmd.search = TRUE;
+ i+=3;
+ }
+ } else {
+ switch (argc-i-1) {
+ case 0:
+ parse_cmd_opt_error(_("Missing folder, type and request arguments for option %s"), argv[i]);
+ break;
+ case 1:
+ parse_cmd_opt_error(_("Missing type and request arguments for option %s"), argv[i]);
+ break;
+ case 2:
+ parse_cmd_opt_error(_("Missing request argument for option %s"), argv[i]);
+ }
+ }
+ } else if (!strcmp(argv[i], "--online")) {
cmd.online_mode = ONLINE_MODE_ONLINE;
- } else if (!strncmp(argv[i], "--offline", 9)) {
+ } else if (!strcmp(argv[i], "--offline")) {
cmd.online_mode = ONLINE_MODE_OFFLINE;
- } else if (!strncmp(argv[i], "--toggle-debug", 14)) {
+ } else if (!strcmp(argv[i], "--toggle-debug")) {
cmd.debug = TRUE;
- } else if (!strncmp(argv[i], "--statistics", 12)) {
+ } else if (!strcmp(argv[i], "--statistics")) {
cmd.statistics = TRUE;
- } else if (!strncmp(argv[i], "--reset-statistics", 18)) {
+ } else if (!strcmp(argv[i], "--reset-statistics")) {
cmd.reset_statistics = TRUE;
- } else if (!strncmp(argv[i], "--help", 6) ||
- !strncmp(argv[i], "-h", 2)) {
+ } else if (!strcmp(argv[i], "--help") ||
+ !strcmp(argv[i], "-h")) {
gchar *base = g_path_get_basename(argv[0]);
g_print(_("Usage: %s [OPTION]...\n"), base);
" use - as file name for reading from standard input;\n"
" content format: headers first (To: required) until an\n"
" empty line, then mail body until end of file."));
- g_print("%s\n", _(" --subscribe [uri] subscribe to the given URI if possible"));
+ g_print("%s\n", _(" --subscribe uri subscribe to the given URI if possible"));
g_print("%s\n", _(" --attach file1 [file2]...\n"
" open composition window with specified files\n"
" attached"));
+ g_print("%s\n", _(" --insert file1 [file2]...\n"
+ " open composition window with specified files\n"
+ " inserted"));
g_print("%s\n", _(" --receive receive new messages"));
g_print("%s\n", _(" --receive-all receive new messages of all accounts"));
g_print("%s\n", _(" --cancel-receiving cancel receiving of messages"));
" show the status of each folder"));
g_print("%s\n", _(" --statistics show session statistics"));
g_print("%s\n", _(" --reset-statistics reset session statistics"));
- g_print("%s\n", _(" --select folder[/msg] jumps to the specified folder/message\n"
- " folder is a folder id like 'folder/sub_folder'"));
+ g_print("%s\n", _(" --select folder[/msg] jump to the specified folder/message\n"
+ " folder is a folder id like 'folder/sub_folder', a file:// uri or an absolute path"));
g_print("%s\n", _(" --online switch to online mode"));
g_print("%s\n", _(" --offline switch to offline mode"));
g_print("%s\n", _(" --exit --quit -q exit Claws Mail"));
- g_print("%s\n", _(" --debug debug mode"));
+ g_print("%s\n", _(" --debug -d debug mode"));
g_print("%s\n", _(" --toggle-debug toggle debug mode"));
- g_print("%s\n", _(" --help -h display this help and exit"));
- g_print("%s\n", _(" --version -v output version information and exit"));
- g_print("%s\n", _(" --version-full -V output version and built-in features information and exit"));
+ g_print("%s\n", _(" --help -h display this help"));
+ g_print("%s\n", _(" --version -v output version information"));
+ g_print("%s\n", _(" --version-full -V output version and built-in features information"));
g_print("%s\n", _(" --config-dir output configuration directory"));
- g_print("%s\n", _(" --alternate-config-dir [dir]\n"
+ g_print("%s\n", _(" --alternate-config-dir directory\n"
" use specified configuration directory"));
- g_print("%s\n", _(" --geometry -geometry WxH+X+Y\n"
+ g_print("%s\n", _(" --geometry -geometry [WxH][+X+Y]\n"
" set geometry for main window"));
g_free(base);
exit(1);
- } else if (!strncmp(argv[i], "--crash", 7)) {
+ } else if (!strcmp(argv[i], "--crash")) {
cmd.crash = TRUE;
cmd.crash_params = g_strdup((i+1 < argc)?argv[i+1]:NULL);
i++;
- } else if (!strncmp(argv[i], "--config-dir", sizeof "--config-dir" - 1)) {
+ } else if (!strcmp(argv[i], "--config-dir")) {
g_print(RC_DIR "\n");
exit(0);
- } else if (!strncmp(argv[i], "--alternate-config-dir", sizeof "--alternate-config-dir" - 1) && i+1 < argc) {
- set_rc_dir(argv[i+1]);
- } else if (!strncmp(argv[i], "--geometry", sizeof "--geometry" - 1)
- || !strncmp(argv[i], "-geometry", sizeof "-geometry" - 1)) {
- cmd.geometry = (i+1 < argc)? argv[i+1]: NULL;
- } else if (!strncmp(argv[i], "--exit", 6) ||
- !strncmp(argv[i], "--quit", 6) ||
- !strncmp(argv[i], "-q", 2)) {
+ } else if (!strcmp(argv[i], "--alternate-config-dir")) {
+ if (i+1 < argc) {
+ set_rc_dir(argv[i+1]);
+ i++;
+ } else {
+ parse_cmd_opt_error(_("Missing directory argument for option %s"), argv[i]);
+ }
+ } else if (!strcmp(argv[i], "--geometry") ||
+ !strcmp(argv[i], "-geometry")) {
+ if (i+1 < argc) {
+ cmd.geometry = argv[i+1];
+ i++;
+ } else {
+ parse_cmd_opt_error(_("Missing geometry argument for option %s"), argv[i]);
+ }
+ } else if (!strcmp(argv[i], "--exit") ||
+ !strcmp(argv[i], "--quit") ||
+ !strcmp(argv[i], "-q")) {
cmd.exit = TRUE;
- } else if (!strncmp(argv[i], "--select", 8) && i+1 < argc) {
- cmd.target = argv[i+1];
+ } else if (!strcmp(argv[i], "--select")) {
+ if (i+1 < argc) {
+ cmd.target = argv[i+1];
+ i++;
+ } else {
+ parse_cmd_opt_error(_("Missing folder argument for option %s"), argv[i]);
+ }
} else if (i == 1 && argc == 2) {
/* only one parameter. Do something intelligent about it */
- if ((strstr(argv[i], "@")||!strncmp(argv[i], "mailto:", 7)) && !strstr(argv[i], "://")) {
+ if ((strstr(argv[i], "@") || !STRNCMP(argv[i], "mailto:")) && !strstr(argv[i], "://")) {
const gchar *p = argv[i];
cmd.compose = TRUE;
cmd.compose_mailto = NULL;
if (p && *p != '\0' && *p != '-') {
- if (!strncmp(p, "mailto:", 7)) {
+ if (!STRNCMP(p, "mailto:")) {
cmd.compose_mailto = p + 7;
} else {
cmd.compose_mailto = p;
}
}
- } else if (!strncmp(argv[i], "file://", 7)) {
+ } else if (!STRNCMP(argv[i], "file://")) {
cmd.target = argv[i];
- } else if (!strncmp(argv[i], "?attach=file://", strlen("?attach=file://"))) {
+ } else if (!STRNCMP(argv[i], "?attach=file://")) {
+ /* Thunar support as per 3.3.0cvs19 */
cmd.compose = TRUE;
cmd.compose_mailto = argv[i];
} else if (strstr(argv[i], "://")) {
/* gtk debug */
} else if (is_dir_exist(argv[i]) || is_file_exist(argv[i])) {
cmd.target = argv[i];
- } else {
- g_print(_("Unknown option\n"));
- exit(1);
- }
- }
+ } else {
+ parse_cmd_opt_error(_("Unknown option %s"), argv[i]);
+ }
+ } else {
+ parse_cmd_opt_error(_("Unknown option %s"), argv[i]);
+ }
}
if (cmd.attach_files && cmd.compose == FALSE) {
: _("top level folder"));
g_free(buf);
-
- if (item->prefs->enable_processing) {
+ if (folder_item_parent(item) != NULL && item->prefs->enable_processing) {
item->processing_pending = TRUE;
folder_item_apply_processing(item);
item->processing_pending = FALSE;
if (prefs_common.warn_queued_on_exit && procmsg_have_queued_mails_fast()) {
if (alertpanel(_("Queued messages"),
_("Some unsent messages are queued. Exit now?"),
- GTK_STOCK_CANCEL, GTK_STOCK_OK, NULL)
+ GTK_STOCK_CANCEL, GTK_STOCK_OK, NULL, ALERTFOCUS_FIRST)
!= G_ALERTALTERNATE) {
main_window_popup(mainwin);
sc_exiting = FALSE;
static gint prohibit_duplicate_launch(void)
{
- gint uxsock;
+ gint sock;
GList *curr;
#ifdef G_OS_UNIX
gchar *path;
path = claws_get_socket_name();
/* Try to connect to the control socket */
- uxsock = fd_connect_unix(path);
+ sock = fd_connect_unix(path);
if (x_display == NULL)
x_display = g_strdup(g_getenv("DISPLAY"));
- if (uxsock < 0) {
+ if (sock < 0) {
gint ret;
#if HAVE_FLOCK
gchar *socket_lock;
return -1;
}
if (GetLastError() != ERROR_ALREADY_EXISTS) {
- uxsock = fd_open_inet(50216);
- if (uxsock < 0)
+ sock = fd_open_inet(50216);
+ if (sock < 0)
return 0;
- return uxsock;
+ return sock;
}
- uxsock = fd_connect_inet(50216);
- if (uxsock < 0)
+ sock = fd_connect_inet(50216);
+ if (sock < 0)
return -1;
#endif
/* remote command mode */
debug_print("another Claws Mail instance is already running.\n");
if (cmd.receive_all) {
- fd_write_all(uxsock, "receive_all\n", 12);
+ FD_WRITE_ALL("receive_all\n");
} else if (cmd.receive) {
- fd_write_all(uxsock, "receive\n", 8);
+ FD_WRITE_ALL("receive\n");
} else if (cmd.cancel_receiving) {
- fd_write_all(uxsock, "cancel_receiving\n", 17);
+ FD_WRITE_ALL("cancel_receiving\n");
} else if (cmd.cancel_sending) {
- fd_write_all(uxsock, "cancel_sending\n", 15);
+ FD_WRITE_ALL("cancel_sending\n");
} else if (cmd.compose && cmd.attach_files) {
gchar *str, *compose_str;
compose_str = g_strdup("compose_attach\n");
}
- fd_write_all(uxsock, compose_str, strlen(compose_str));
+ FD_WRITE_ALL(compose_str);
g_free(compose_str);
for (curr = cmd.attach_files; curr != NULL ; curr = curr->next) {
str = (gchar *) ((AttachInfo *)curr->data)->file;
- fd_write_all(uxsock, str, strlen(str));
- fd_write_all(uxsock, "\n", 1);
+ if (((AttachInfo *)curr->data)->insert)
+ FD_WRITE_ALL("insert ");
+ else
+ FD_WRITE_ALL("attach ");
+ FD_WRITE_ALL(str);
+ FD_WRITE_ALL("\n");
}
- fd_write_all(uxsock, ".\n", 2);
+ FD_WRITE_ALL(".\n");
} else if (cmd.compose) {
gchar *compose_str;
compose_str = g_strdup("compose\n");
}
- fd_write_all(uxsock, compose_str, strlen(compose_str));
+ FD_WRITE_ALL(compose_str);
g_free(compose_str);
} else if (cmd.subscribe) {
gchar *str = g_strdup_printf("subscribe %s\n", cmd.subscribe_uri);
- fd_write_all(uxsock, str, strlen(str));
+ FD_WRITE_ALL(str);
g_free(str);
} else if (cmd.send) {
- fd_write_all(uxsock, "send\n", 5);
+ FD_WRITE_ALL("send\n");
} else if (cmd.online_mode == ONLINE_MODE_ONLINE) {
- fd_write(uxsock, "online\n", 6);
+ FD_WRITE("online\n");
} else if (cmd.online_mode == ONLINE_MODE_OFFLINE) {
- fd_write(uxsock, "offline\n", 7);
+ FD_WRITE("offline\n");
} else if (cmd.debug) {
- fd_write(uxsock, "debug\n", 7);
+ FD_WRITE("debug\n");
} else if (cmd.status || cmd.status_full) {
gchar buf[BUFFSIZE];
gint i;
folders = cmd.status_full ? cmd.status_full_folders :
cmd.status_folders;
- fd_write_all(uxsock, command, strlen(command));
+ FD_WRITE_ALL(command);
for (i = 0; folders && i < folders->len; ++i) {
folder = g_ptr_array_index(folders, i);
- fd_write_all(uxsock, folder, strlen(folder));
- fd_write_all(uxsock, "\n", 1);
+ FD_WRITE_ALL(folder);
+ FD_WRITE_ALL("\n");
}
- fd_write_all(uxsock, ".\n", 2);
+ FD_WRITE_ALL(".\n");
for (;;) {
- fd_gets(uxsock, buf, sizeof(buf) - 1);
+ fd_gets(sock, buf, sizeof(buf) - 1);
buf[sizeof(buf) - 1] = '\0';
- if (!strncmp(buf, ".\n", 2)) break;
- fputs(buf, stdout);
+ if (!STRNCMP(buf, ".\n")) break;
+ if (claws_fputs(buf, stdout) == EOF) {
+ g_warning("writing to stdout failed.");
+ break;
+ }
}
} else if (cmd.exit) {
- fd_write_all(uxsock, "exit\n", 5);
+ FD_WRITE_ALL("exit\n");
} else if (cmd.statistics) {
gchar buf[BUFSIZ];
- fd_write(uxsock, "statistics\n", 11);
+ FD_WRITE("statistics\n");
for (;;) {
- fd_gets(uxsock, buf, sizeof(buf) - 1);
+ fd_gets(sock, buf, sizeof(buf) - 1);
buf[sizeof(buf) - 1] = '\0';
- if (!strncmp(buf, ".\n", 2)) break;
- fputs(buf, stdout);
+ if (!STRNCMP(buf, ".\n")) break;
+ if (claws_fputs(buf, stdout) == EOF) {
+ g_warning("writing to stdout failed.");
+ break;
+ }
}
} else if (cmd.reset_statistics) {
- fd_write(uxsock, "reset_statistics\n", 17);
+ FD_WRITE("reset_statistics\n");
} else if (cmd.target) {
gchar *str = g_strdup_printf("select %s\n", cmd.target);
- fd_write_all(uxsock, str, strlen(str));
+ FD_WRITE_ALL(str);
g_free(str);
} else if (cmd.search) {
gchar buf[BUFFSIZE];
g_strdup_printf("search %s\n%s\n%s\n%c\n",
cmd.search_folder, cmd.search_type, cmd.search_request,
(cmd.search_recursive==TRUE)?'1':'0');
- fd_write_all(uxsock, str, strlen(str));
+ FD_WRITE_ALL(str);
g_free(str);
for (;;) {
- fd_gets(uxsock, buf, sizeof(buf) - 1);
+ fd_gets(sock, buf, sizeof(buf) - 1);
buf[sizeof(buf) - 1] = '\0';
- if (!strncmp(buf, ".\n", 2)) break;
- fputs(buf, stdout);
+ if (!STRNCMP(buf, ".\n")) break;
+ if (claws_fputs(buf, stdout) == EOF) {
+ g_warning("writing to stdout failed.");
+ break;
+ }
}
} else {
-#ifndef G_OS_WIN32
+#ifdef G_OS_UNIX
gchar buf[BUFSIZ];
- fd_write_all(uxsock, "get_display\n", 12);
+ FD_WRITE_ALL("get_display\n");
memset(buf, 0, sizeof(buf));
- fd_gets(uxsock, buf, sizeof(buf) - 1);
+ fd_gets(sock, buf, sizeof(buf) - 1);
buf[sizeof(buf) - 1] = '\0';
- if (strcmp2(buf, x_display)) {
+ if (g_strcmp0(buf, x_display)) {
g_print("Claws Mail is already running on display %s.\n",
buf);
} else {
- fd_close(uxsock);
- uxsock = fd_connect_unix(path);
- fd_write_all(uxsock, "popup\n", 6);
+ fd_close(sock);
+ sock = fd_connect_unix(path);
+ FD_WRITE_ALL("popup\n");
}
#else
- fd_write_all(uxsock, "popup\n", 6);
+ FD_WRITE_ALL("popup\n");
#endif
}
- fd_close(uxsock);
+ fd_close(sock);
return -1;
}
for (;;) {
fd_gets(sock, buf, sizeof(buf) - 1);
buf[sizeof(buf) - 1] = '\0';
- if (!strncmp(buf, ".\n", 2)) {
+ if (!STRNCMP(buf, ".\n")) {
break;
}
strretchomp(buf);
fd_gets(sock, buf, sizeof(buf) - 1);
buf[sizeof(buf) - 1] = '\0';
- if (!strncmp(buf, "popup", 5)) {
+ if (!STRNCMP(buf, "popup")) {
main_window_popup(mainwin);
- } else if (!strncmp(buf, "get_display", 11)) {
- fd_write_all(sock, x_display, strlen(x_display));
- } else if (!strncmp(buf, "receive_all", 11)) {
- inc_all_account_mail(mainwin, FALSE,
+#ifdef G_OS_UNIX
+ } else if (!STRNCMP(buf, "get_display")) {
+ FD_WRITE_ALL(x_display);
+#endif
+ } else if (!STRNCMP(buf, "receive_all")) {
+ inc_all_account_mail(mainwin, FALSE, FALSE,
prefs_common.newmail_notify_manu);
- } else if (!strncmp(buf, "receive", 7)) {
+ } else if (!STRNCMP(buf, "receive")) {
inc_mail(mainwin, prefs_common.newmail_notify_manu);
- } else if (!strncmp(buf, "cancel_receiving", 16)) {
+ } else if (!STRNCMP(buf, "cancel_receiving")) {
inc_cancel_all();
imap_cancel_all();
- } else if (!strncmp(buf, "cancel_sending", 14)) {
+ } else if (!STRNCMP(buf, "cancel_sending")) {
send_cancel();
- } else if (!strncmp(buf, "compose_attach", 14)) {
+ } else if (!STRNCMP(buf, "compose_attach")) {
GList *files = NULL, *curr;
AttachInfo *ainfo;
gchar *mailto;
while (fd_gets(sock, buf, sizeof(buf) - 1) > 0) {
buf[sizeof(buf) - 1] = '\0';
strretchomp(buf);
- if (!strcmp2(buf, "."))
+ if (!g_strcmp0(buf, "."))
break;
-
+
ainfo = g_new0(AttachInfo, 1);
- ainfo->file = g_strdup(buf);
+ ainfo->file = g_strdup(strstr(buf, " ") + 1);
+ ainfo->insert = !STRNCMP(buf, "insert ");
files = g_list_append(files, ainfo);
}
open_compose_new(mailto, files);
}
g_list_free(files);
g_free(mailto);
- } else if (!strncmp(buf, "compose", 7)) {
+ } else if (!STRNCMP(buf, "compose")) {
open_compose_new(buf + strlen("compose") + 1, NULL);
- } else if (!strncmp(buf, "subscribe", 9)) {
+ } else if (!STRNCMP(buf, "subscribe")) {
main_window_popup(mainwin);
folder_subscribe(buf + strlen("subscribe") + 1);
- } else if (!strncmp(buf, "send", 4)) {
+ } else if (!STRNCMP(buf, "send")) {
send_queue();
- } else if (!strncmp(buf, "online", 6)) {
+ } else if (!STRNCMP(buf, "online")) {
main_window_toggle_work_offline(mainwin, FALSE, FALSE);
- } else if (!strncmp(buf, "offline", 7)) {
+ } else if (!STRNCMP(buf, "offline")) {
main_window_toggle_work_offline(mainwin, TRUE, FALSE);
- } else if (!strncmp(buf, "debug", 5)) {
+ } else if (!STRNCMP(buf, "debug")) {
debug_set_mode(debug_get_mode() ? FALSE : TRUE);
- } else if (!strncmp(buf, "status-full", 11) ||
- !strncmp(buf, "status", 6)) {
+ } else if (!STRNCMP(buf, "status-full") ||
+ !STRNCMP(buf, "status")) {
gchar *status;
GPtrArray *folders;
folders = get_folder_item_list(sock);
status = folder_get_status
- (folders, !strncmp(buf, "status-full", 11));
- fd_write_all(sock, status, strlen(status));
- fd_write_all(sock, ".\n", 2);
+ (folders, !STRNCMP(buf, "status-full"));
+ FD_WRITE_ALL(status);
+ FD_WRITE_ALL(".\n");
g_free(status);
if (folders) g_ptr_array_free(folders, TRUE);
- } else if (!strncmp(buf, "statistics", 10)) {
+ } else if (!STRNCMP(buf, "statistics")) {
gchar tmp[BUFSIZ];
g_snprintf(tmp, sizeof(tmp), _("Session statistics\n"));
- fd_write_all(sock, tmp, strlen(tmp));
+ FD_WRITE_ALL(tmp);
if (prefs_common.date_format) {
struct tm *lt;
} else
g_snprintf(tmp, sizeof(tmp), _("Started: %s\n"),
ctime(&session_stats.time_started));
- fd_write_all(sock, tmp, strlen(tmp));
+ FD_WRITE_ALL(tmp);
- fd_write_all(sock, "\n", 1);
+ FD_WRITE_ALL("\n");
g_snprintf(tmp, sizeof(tmp), _("Incoming traffic\n"));
- fd_write_all(sock, tmp, strlen(tmp));
+ FD_WRITE_ALL(tmp);
g_snprintf(tmp, sizeof(tmp), _("Received messages: %d\n"),
session_stats.received);
- fd_write_all(sock, tmp, strlen(tmp));
+ FD_WRITE_ALL(tmp);
- fd_write_all(sock, "\n", 1);
+ FD_WRITE_ALL("\n");
g_snprintf(tmp, sizeof(tmp), _("Outgoing traffic\n"));
- fd_write_all(sock, tmp, strlen(tmp));
+ FD_WRITE_ALL(tmp);
g_snprintf(tmp, sizeof(tmp), _("New/redirected messages: %d\n"),
session_stats.sent);
- fd_write_all(sock, tmp, strlen(tmp));
+ FD_WRITE_ALL(tmp);
g_snprintf(tmp, sizeof(tmp), _("Replied messages: %d\n"),
session_stats.replied);
- fd_write_all(sock, tmp, strlen(tmp));
+ FD_WRITE_ALL(tmp);
g_snprintf(tmp, sizeof(tmp), _("Forwarded messages: %d\n"),
session_stats.forwarded);
- fd_write_all(sock, tmp, strlen(tmp));
+ FD_WRITE_ALL(tmp);
g_snprintf(tmp, sizeof(tmp), _("Total outgoing messages: %d\n"),
(session_stats.sent + session_stats.replied +
session_stats.forwarded));
- fd_write_all(sock, tmp, strlen(tmp));
+ FD_WRITE_ALL(tmp);
- fd_write_all(sock, ".\n", 2);
- } else if (!strncmp(buf, "reset_statistics", 16)) {
+ FD_WRITE_ALL(".\n");
+ } else if (!STRNCMP(buf, "reset_statistics")) {
reset_statistics();
- } else if (!strncmp(buf, "select ", 7)) {
+ } else if (!STRNCMP(buf, "select ")) {
const gchar *target = buf+7;
mainwindow_jump_to(target, TRUE);
- } else if (!strncmp(buf, "search ", 7)) {
+ } else if (!STRNCMP(buf, "search ")) {
FolderItem* folderItem = NULL;
GSList *messages = NULL;
gchar *folder_name = NULL;
for (cur = messages; cur != NULL; cur = cur->next) {
MsgInfo* msg = (MsgInfo *)cur->data;
gchar *file = procmsg_get_message_file_path(msg);
- fd_write_all(sock, file, strlen(file));
- fd_write_all(sock, "\n", 1);
+ FD_WRITE_ALL(file);
+ FD_WRITE_ALL("\n");
g_free(file);
}
- fd_write_all(sock, ".\n", 2);
+ FD_WRITE_ALL(".\n");
search_exit:
g_free(folder_name);
advsearch_free(search);
if (messages != NULL)
procmsg_msg_list_free(messages);
- } else if (!strncmp(buf, "exit", 4)) {
+ } else if (!STRNCMP(buf, "exit")) {
if (prefs_common.clean_on_exit && !prefs_common.ask_on_clean) {
procmsg_empty_all_trash();
}
g_propagate_error(error, tmp_error);
return TRUE;
}
-#if NM_CHECK_VERSION(0,8,992)
return (state == NM_STATE_CONNECTED_LOCAL ||
state == NM_STATE_CONNECTED_SITE ||
state == NM_STATE_CONNECTED_GLOBAL ||
state == NM_STATE_UNKNOWN);
-#else
- return (state == NM_STATE_CONNECTED ||
- state == NM_STATE_UNKNOWN);
-#endif
}
#endif
projects / claws.git / blobdiff