/*
- * Sylpheed -- a GTK+ based, lightweight, and fast e-mail client
- * Copyright (C) 1999-2012 Hiroyuki Yamamoto and the Claws Mail team
+ * Claws Mail -- a GTK+ based, lightweight, and fast e-mail client
+ * Copyright (C) 1999-2016 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
*
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
- *
*/
#ifdef HAVE_CONFIG_H
#include <X11/SM/SMlib.h>
#endif
+#if HAVE_FLOCK
+#include <sys/file.h>
+#endif
+
+#include "file_checker.h"
#include "wizard.h"
#ifdef HAVE_STARTUP_NOTIFICATION
# define SN_API_NOT_YET_FROZEN
#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 "account.h"
#include "procmsg.h"
#include "inc.h"
+#include "imap.h"
+#include "send_message.h"
+#include "md5.h"
#include "import.h"
#include "manage_window.h"
#include "alertpanel.h"
#include "statusbar.h"
-#ifndef USE_NEW_ADDRBOOK
+#ifndef USE_ALT_ADDRBOOK
#include "addressbook.h"
#else
#include "addressbook-dbus.h"
#include "hooks.h"
#include "menu.h"
#include "quicksearch.h"
+#include "advsearch.h"
+#include "avatars.h"
+#include "passwordstore.h"
+#include "file-utils.h"
#ifdef HAVE_LIBETPAN
#include "imap-thread.h"
#include "timing.h"
-#ifdef MAEMO
-#ifdef CHINOOK
-#include <hildon/hildon-banner.h>
-#include <hildon/hildon-program.h>
-#else
-#include <hildon-widgets/hildon-banner.h>
-#include <hildon-widgets/hildon-program.h>
-#endif
-#include <libosso.h>
-#include <libgnomevfs/gnome-vfs-volume.h>
-#include <libgnomevfs/gnome-vfs-volume-monitor.h>
-#include <libgnomevfs/gnome-vfs-utils.h>
-
-#define OSSO_NAME "claws_mail"
-#define OSSO_SERVICE "com.nokia."OSSO_NAME
-#define OSSO_OBJECT "/com/nokia/"OSSO_NAME
-#define OSSO_IFACE "com.nokia."OSSO_NAME
-
-typedef struct _AppData AppData;
-struct _AppData {
- HildonProgram *program;
- HildonWindow *window;
- osso_context_t *osso_context;
-};
-
-static GnomeVFSVolumeMonitor *volmon;
-#endif
-
#ifdef HAVE_NETWORKMANAGER_SUPPORT
/* Went offline due to NetworkManager */
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;
-
-#ifdef MAEMO
-HildonProgram *hildon_program;
#endif
#ifdef HAVE_STARTUP_NOTIFICATION
static struct RemoteCmd {
gboolean receive;
gboolean receive_all;
+ gboolean cancel_receiving;
+ gboolean cancel_sending;
gboolean compose;
const gchar *compose_mailto;
GList *attach_files;
gboolean subscribe;
const gchar *subscribe_uri;
const gchar *target;
+ gboolean debug;
+ const gchar *geometry;
} cmd;
SessionStats session_stats;
static MainWindow *static_mainwindow;
-#ifdef MAEMO
-static osso_context_t *static_osso_context;
-
-void exit_event_handler(gboolean die_now, gpointer data)
-{
- AppData *appdata;
- appdata = (AppData *) data;
- /* Do whatever application needs to do before exiting */
- exit_claws(static_mainwindow);
- hildon_banner_show_information(GTK_WIDGET(appdata->window), NULL,
- _("Exiting..."));
-
-}
-
-/* Callback for hardware D-BUS events */
-void hw_event_handler(osso_hw_state_t *state, gpointer data)
-{
- AppData *appdata;
- appdata = (AppData *) data;
-
- if (state->shutdown_ind) {
- exit_claws(static_mainwindow);
- hildon_banner_show_information(GTK_WIDGET(appdata->window), NULL,
- _("Exiting..."));
- }
-}
-
-/* Callback for normal D-BUS messages */
-gint dbus_req_handler(const gchar * interface, const gchar * method,
- GArray * arguments, gpointer data,
- osso_rpc_t * retval)
-{
- AppData *appdata;
- appdata = (AppData *) data;
-
- if (!strcmp(method, "top_application")) {
- osso_rpc_free_val(retval);
- return OSSO_OK;
- }
- osso_system_note_infoprint(appdata->osso_context, method, retval);
- osso_rpc_free_val(retval);
-
- return OSSO_OK;
-}
-#endif
static gboolean emergency_exit = FALSE;
#ifdef HAVE_STARTUP_NOTIFICATION
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)) {
+ while (claws_fgets(buf, sizeof(buf), oldfp)) {
if (strncmp(buf, old_plugin_path, strlen(old_plugin_path))) {
- err |= (fputs(buf, newfp) == EOF);
+ 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);
if (status == IceProcessMessagesIOError) {
IcePointer context = IceGetConnectionContext (connection);
- if (context && GTK_IS_OBJECT (context)) {
+ if (context && G_IS_OBJECT(context)) {
guint disconnect_id = g_signal_lookup ("disconnect", G_OBJECT_TYPE (context));
if (disconnect_id > 0)
256, error_string_ret);
if (error_string_ret[0] || mainwin->smc_conn == NULL)
- g_warning ("While connecting to session manager:\n%s.",
+ g_warning ("While connecting to session manager: %s.",
error_string_ret);
else {
SmPropValue *vals;
vals[0].length = strlen(g_get_user_name()?g_get_user_name():"");
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);
}
}
}
show_at_startup = show;
}
-#ifdef MAEMO
-static void main_vol_mount_cb(GnomeVFSVolumeMonitor *vfs, GnomeVFSVolume *vol, MainWindow *mainwin)
-{
- gchar *uri = gnome_vfs_volume_get_activation_uri (vol);
- gchar *mount_path = uri?gnome_vfs_get_local_path_from_uri (uri):NULL;
- g_free (uri);
- if (mount_path) {
- if(!strcmp(mount_path, prefs_common.data_root)) {
- gtk_widget_set_sensitive(mainwin->window, TRUE);
- inc_unlock();
- }
- }
- g_free(mount_path);
-}
-static void main_vol_unmount_cb(GnomeVFSVolumeMonitor *vfs, GnomeVFSVolume *vol, MainWindow *mainwin)
-{
- gchar *uri = gnome_vfs_volume_get_activation_uri (vol);
- gchar *mount_path = uri?gnome_vfs_get_local_path_from_uri (uri):NULL;
- g_free (uri);
- if (mount_path) {
- if(!strcmp(mount_path, prefs_common.data_root)) {
- gtk_widget_set_sensitive(mainwin->window, FALSE);
- inc_lock();
- }
- }
- g_free(mount_path);
-}
-#endif
-
#ifdef G_OS_WIN32
static FILE* win32_debug_fp=NULL;
static guint win32_log_handler_app_id;
static void win32_print_stdout(const gchar *string)
{
if (win32_debug_fp) {
- fprintf(win32_debug_fp, string);
+ fprintf(win32_debug_fp, "%s", string);
fflush(win32_debug_fp);
}
}
static void win32_print_stderr(const gchar *string)
{
if (win32_debug_fp) {
- fprintf(win32_debug_fp, string);
+ fprintf(win32_debug_fp, "%s", string);
fflush(win32_debug_fp);
}
}
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;
}
}
#endif
#if USE_ENCHANT
if (show_debug_only)
- debug_print(" aspell\n");
+ debug_print(" Enchant\n");
else
- g_print(" aspell\n");
+ g_print(" Enchant\n");
#endif
#if USE_GNUTLS
if (show_debug_only)
- debug_print(" gnutls\n");
+ debug_print(" GnuTLS\n");
else
- g_print(" gnutls\n");
+ g_print(" GnuTLS\n");
#endif
#if INET6
if (show_debug_only)
- debug_print(" ipv6\n");
+ debug_print(" IPv6\n");
else
- g_print(" ipv6\n");
+ g_print(" IPv6\n");
#endif
#if HAVE_ICONV
if (show_debug_only)
#endif
#if USE_JPILOT
if (show_debug_only)
- debug_print(" jpilot\n");
+ debug_print(" JPilot\n");
else
- g_print(" jpilot\n");
+ g_print(" JPilot\n");
#endif
#if USE_LDAP
if (show_debug_only)
- debug_print(" ldap\n");
+ debug_print(" LDAP\n");
else
- g_print(" ldap\n");
+ g_print(" LDAP\n");
#endif
#if HAVE_LIBETPAN
if (show_debug_only)
#endif
#if HAVE_LIBSM
if (show_debug_only)
- debug_print(" libsm\n");
+ debug_print(" libSM\n");
else
- g_print(" libsm\n");
+ g_print(" libSM\n");
#endif
#if HAVE_NETWORKMANAGER_SUPPORT
if (show_debug_only)
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) {
- g_warning(_("Failed to register folder item update hook"));
+ 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) {
- g_warning(_("Failed to register folder update hook"));
+ if (dbus_folder_hook_id == HOOK_NONE) {
+ g_warning("Failed to register folder update hook");
uninstall_dbus_status_handler();
return;
}
session_stats.forwarded = 0;
session_stats.time_started = time(NULL);
}
-
+
int main(int argc, char *argv[])
{
-#ifdef MAEMO
- osso_context_t *osso_context;
- osso_return_t result;
-#endif
#ifdef HAVE_DBUS_GLIB
DBusGConnection *connection;
GError *error;
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);
#endif
if (cmd.status || cmd.status_full || cmd.search ||
- cmd.statistics || cmd.reset_statistics) {
+ cmd.statistics || cmd.reset_statistics ||
+ cmd.cancel_receiving || cmd.cancel_sending ||
+ cmd.debug) {
puts("0 Claws Mail not running.");
lock_socket_remove();
return 0;
if (cmd.exit)
return 0;
+#if !GLIB_CHECK_VERSION(2,32,0)
if (!g_thread_supported())
g_thread_init(NULL);
+#endif
reset_statistics();
"gtk-theme-name",
"MS-Windows",
"XProperty");
+ gtk_settings_set_long_property(gtk_settings_get_default(),
+ "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
-
-#ifdef MAEMO
- osso_context = osso_initialize(OSSO_SERVICE, "2.8.1", TRUE, NULL);
- if (osso_context == NULL) {
- return OSSO_ERROR;
- }
- hildon_program = HILDON_PROGRAM(hildon_program_get_instance());
- static_osso_context = osso_context;
-#endif
gtk_widget_set_default_colormap(
gdk_screen_get_system_colormap(
gdk_screen_get_default()));
#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, _("Sylpheed-Claws 2.6.0 (or older)"));
+ 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, _("Sylpheed-Claws 1.9.15 (or older)"));
+ 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, _("Sylpheed-Claws 1.0.5 (or older)"));
+ 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();
tags_read_tags();
+ matcher_init();
#ifdef USE_ENCHANT
gtkaspell_checkers_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(),
+ "gtk-theme-name",
+ prefs_common.gtk_theme,
+ "XProperty");
+#endif
+
+
sock_set_io_timeout(prefs_common.io_timeout_secs);
prefs_actions_read_config();
prefs_display_header_read_config();
/* prefs_filtering_read_config(); */
-#ifndef USE_NEW_ADDRBOOK
+#ifndef USE_ALT_ADDRBOOK
addressbook_read_file();
#else
g_clear_error(&error);
}
#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();
mainwin = main_window_create();
+ if (!check_file_integrity())
+ exit(1);
+
#ifdef HAVE_NETWORKMANAGER_SUPPORT
networkmanager_state_change_cb(nm_proxy,NULL,mainwin);
#endif
-#ifdef MAEMO
- AppData *appdata;
- appdata = g_new0(AppData, 1);
- appdata->program = hildon_program;
- appdata->window = HILDON_WINDOW(mainwin->window);
- appdata->osso_context = osso_context;
- result = osso_rpc_set_cb_f(appdata->osso_context,
- OSSO_SERVICE,
- OSSO_OBJECT,
- OSSO_IFACE,
- dbus_req_handler, appdata);
- if (result != OSSO_OK) {
- return OSSO_ERROR;
- }
-
-#ifndef CHINOOK
- /* Add handler for Exit D-BUS messages */
- result = osso_application_set_exit_cb(appdata->osso_context,
- exit_event_handler,
- (gpointer) appdata);
- if (result != OSSO_OK) {
- return OSSO_ERROR;
- }
-#endif
- osso_hw_set_event_cb( appdata->osso_context,
- NULL, hw_event_handler, (gpointer) appdata );
-#endif
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();
- /* register the callback of unix domain socket input */
- lock_socket_tag = claws_input_add(lock_socket,
- G_IO_IN | G_IO_HUP | G_IO_ERR | G_IO_PRI,
- lock_socket_input_cb,
- mainwin, TRUE);
-
+ 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());
+ str_write_to_file("foo", get_crashfile_name(), FALSE);
inc_autocheck_timer_init(mainwin);
claws_register_idle_function(claws_gtk_idle);
+ avatars_init();
prefs_toolbar_init();
num_folder_class = g_list_length(folder_get_list());
prefs_common_write_config();
plugin_load_standard_plugins ();
}
+
/* if not crashed, show window now */
if (!mainwin_shown) {
/* apart if something told not to show */
main_window_popup(mainwin);
}
+ if (cmd.geometry != NULL) {
+ if (!gtk_window_parse_geometry(GTK_WINDOW(mainwin->window), cmd.geometry))
+ g_warning("failed to parse geometry '%s'", cmd.geometry);
+ else {
+ int width, height;
+
+ if (sscanf(cmd.geometry, "%ux%u+", &width, &height) == 2)
+ gtk_window_resize(GTK_WINDOW(mainwin->window), width, height);
+ else
+ g_warning("failed to parse geometry's width/height");
+ }
+ }
+
if (!folder_have_mailbox()) {
prefs_destroy_cache();
main_window_cursor_normal(mainwin);
static_mainwindow = mainwin;
-#ifdef MAEMO
- if (prefs_common.data_root != NULL && *prefs_common.data_root != '\0') {
- GnomeVFSVolume *vol = NULL;
- gchar *uri, *mount_path;
-
- volmon = gnome_vfs_get_volume_monitor();
- vol = gnome_vfs_volume_monitor_get_volume_for_path(volmon, prefs_common.data_root);
-
- uri = gnome_vfs_volume_get_activation_uri (vol);
- mount_path = uri?gnome_vfs_get_local_path_from_uri (uri):NULL;
- g_free(uri);
-
- if (vol == NULL || !gnome_vfs_volume_is_mounted(vol)
- || strcmp(mount_path, prefs_common.data_root)) {
- alertpanel_error(_("Claws Mail can not start without its data volume (%s)."),
- prefs_common.data_root);
- g_free(mount_path);
- gnome_vfs_volume_unref(vol);
- exit_claws(mainwin);
- exit(1);
- }
- g_free(mount_path);
- gnome_vfs_volume_unref(vol);
- g_signal_connect(G_OBJECT(volmon),
- "volume-mounted", G_CALLBACK(main_vol_mount_cb), mainwin);
- g_signal_connect(G_OBJECT(volmon),
- "volume-unmounted", G_CALLBACK(main_vol_unmount_cb), mainwin);
- }
-#endif
-
#ifdef HAVE_STARTUP_NOTIFICATION
startup_notification_complete(FALSE);
#endif
#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) {
main_window_set_menu_sensitive(mainwin);
toolbar_main_set_sensitive(mainwin);
}
+
+ /* register the callback of unix domain socket input */
+ lock_socket_tag = claws_input_add(lock_socket,
+ G_IO_IN | G_IO_HUP | G_IO_ERR | G_IO_PRI,
+ lock_socket_input_cb,
+ mainwin, TRUE);
+
END_TIMING();
gtk_main();
-#ifdef MAEMO
- osso_deinitialize(osso_context);
-#endif
#ifdef HAVE_NETWORKMANAGER_SUPPORT
if(nm_proxy)
g_object_unref(nm_proxy);
{
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);
- 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 =
+ folder_item_get_identifier(item);
}
/* save all state before exiting */
prefs_common_write_config();
account_write_config_all();
-#ifndef USE_NEW_ADDRBOOK
+ passwd_store_write_config();
+#ifndef USE_ALT_ADDRBOOK
addressbook_export_to_file();
#endif
filename = g_strconcat(get_rc_dir(), G_DIR_SEPARATOR_S, MENU_RC, NULL);
plugin_unload_all("GTK2");
+ matcher_done();
prefs_toolbar_done();
+ avatars_done();
-#ifndef USE_NEW_ADDRBOOK
+#ifndef USE_ALT_ADDRBOOK
addressbook_destroy();
#endif
prefs_themes_done();
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_c(headers, '&');
g_string_append(headers, tmp);
g_string_append_c(headers, '=');
-#if GLIB_CHECK_VERSION(2,16,0)
g_string_append_uri_escaped(headers, v, NULL, TRUE);
-#else
- G_STRING_APPEND_ENCODED_URI(headers, v);
-#endif
}
g_free(tmp);
}
g_string_append(body, to);
g_free(to);
g_string_append(body, "?body=");
- while (fgets(fb, sizeof(fb), fp)) {
-#if GLIB_CHECK_VERSION(2,16,0)
+ while (claws_fgets(fb, sizeof(fb), fp)) {
g_string_append_uri_escaped(body, fb, NULL, TRUE);
-#else
- G_STRING_APPEND_ENCODED_URI(body, fb);
-#endif
}
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(int argc, char *argv[])
cmd.receive_all = TRUE;
} else if (!strncmp(argv[i], "--receive", 9)) {
cmd.receive = TRUE;
+ } else if (!strncmp(argv[i], "--cancel-receiving", 18)) {
+ cmd.cancel_receiving = TRUE;
+ } else if (!strncmp(argv[i], "--cancel-sending", 16)) {
+ cmd.cancel_sending = TRUE;
} else if (!strncmp(argv[i], "--compose-from-file", 19)) {
const gchar *p = (i+1 < argc)?argv[i+1]:NULL;
cmd.subscribe = TRUE;
cmd.subscribe_uri = p;
}
- } else if (!strncmp(argv[i], "--attach", 8)) {
+ } else if (!strncmp(argv[i], "--attach", 8) || !strncmp(argv[i], "--insert", 8)) {
const gchar *p = (i+1 < argc)?argv[i+1]:NULL;
gchar *file = NULL;
+ gboolean insert = !strncmp(argv[i], "--insert", 8);
while (p && *p != '\0' && *p != '-') {
if ((file = g_filename_from_uri(p, NULL, NULL)) != 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);
i++;
p = (i+1 < argc)?argv[i+1]:NULL;
cmd.send = TRUE;
} else if (!strncmp(argv[i], "--version-full", 14) ||
!strncmp(argv[i], "-V", 2)) {
- g_print("Claws Mail version " VERSION "\n");
+ g_print("Claws Mail version " VERSION_GIT_FULL "\n");
main_dump_features_list(FALSE);
exit(0);
} else if (!strncmp(argv[i], "--version", 9) ||
cmd.online_mode = ONLINE_MODE_ONLINE;
} else if (!strncmp(argv[i], "--offline", 9)) {
cmd.online_mode = ONLINE_MODE_OFFLINE;
+ } else if (!strncmp(argv[i], "--toggle-debug", 14)) {
+ cmd.debug = TRUE;
} else if (!strncmp(argv[i], "--statistics", 12)) {
cmd.statistics = TRUE;
} else if (!strncmp(argv[i], "--reset-statistics", 18)) {
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"));
+ g_print("%s\n", _(" --cancel-sending cancel sending of messages"));
g_print("%s\n", _(" --search folder type request [recursive]\n"
" searches mail\n"
" folder ex.: \"#mh/Mailbox/inbox\" or \"Mail\"\n"
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", _(" --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", _(" --config-dir output configuration directory"));
g_print("%s\n", _(" --alternate-config-dir [dir]\n"
" use specified configuration directory"));
+ g_print("%s\n", _(" --geometry -geometry WxH+X+Y\n"
+ " set geometry for main window"));
g_free(base);
exit(1);
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)) {
: _("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;
static gboolean draft_all_messages(void)
{
- GList *compose_list = NULL;
+ const GList *compose_list = NULL;
compose_clear_exit_drafts();
compose_list = compose_get_compose_list();
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;
return sc_starting;
}
+#ifdef G_OS_UNIX
/*
* CLAWS: want this public so crash dialog can delete the
* lock file too
gchar *claws_get_socket_name(void)
{
static gchar *filename = NULL;
- const gchar *socket_dir = NULL;
-
- if (rc_dir_is_alt())
- socket_dir = get_rc_dir();
- else
- socket_dir = g_get_tmp_dir();
+ gchar *socket_dir = NULL;
+ gchar md5sum[33];
+
if (filename == NULL) {
- filename = g_strdup_printf("%s%cclaws-mail-%d",
- socket_dir, G_DIR_SEPARATOR,
+ GStatBuf st;
+ gint stat_ok;
+
+ socket_dir = g_strdup_printf("%s%cclaws-mail-%d",
+ g_get_tmp_dir(), G_DIR_SEPARATOR,
#if HAVE_GETUID
getuid());
#else
- 0);
-#endif
+ 0);
+#endif
+ stat_ok = g_stat(socket_dir, &st);
+ if (stat_ok < 0 && errno != ENOENT) {
+ g_print("Error stat'ing socket_dir %s: %s\n",
+ socket_dir, g_strerror(errno));
+ } else if (stat_ok == 0 && S_ISSOCK(st.st_mode)) {
+ /* old versions used a sock in $TMPDIR/claws-mail-$UID */
+ debug_print("Using legacy socket %s\n", socket_dir);
+ filename = g_strdup(socket_dir);
+ return filename;
+ }
+
+ if (!is_dir_exist(socket_dir) && make_dir(socket_dir) < 0) {
+ g_print("Error creating socket_dir %s: %s\n",
+ socket_dir, g_strerror(errno));
+ }
+
+ md5_hex_digest(md5sum, get_rc_dir());
+
+ filename = g_strdup_printf("%s%c%s", socket_dir, G_DIR_SEPARATOR,
+ md5sum);
+ g_free(socket_dir);
+ debug_print("Using control socket %s\n", filename);
}
return filename;
}
+#endif
static gchar *get_crashfile_name(void)
{
gchar *path;
path = claws_get_socket_name();
+ /* Try to connect to the control socket */
uxsock = fd_connect_unix(path);
if (x_display == NULL)
x_display = g_strdup(g_getenv("DISPLAY"));
if (uxsock < 0) {
+ gint ret;
+#if HAVE_FLOCK
+ gchar *socket_lock;
+ gint lock_fd;
+ /* If connect failed, no other process is running.
+ * Unlink the potentially existing socket, then
+ * open it. This has to be done locking a temporary
+ * file to avoid the race condition where another
+ * process could have created the socket just in
+ * between.
+ */
+ socket_lock = g_strconcat(path, ".lock",
+ NULL);
+ lock_fd = g_open(socket_lock, O_RDWR|O_CREAT, 0);
+ if (lock_fd < 0) {
+ debug_print("Couldn't open %s: %s (%d)\n", socket_lock,
+ g_strerror(errno), errno);
+ g_free(socket_lock);
+ return -1;
+ }
+ if (flock(lock_fd, LOCK_EX) < 0) {
+ debug_print("Couldn't lock %s: %s (%d)\n", socket_lock,
+ g_strerror(errno), errno);
+ close(lock_fd);
+ g_free(socket_lock);
+ return -1;
+ }
+#endif
+
claws_unlink(path);
- return fd_open_unix(path);
+ debug_print("Opening socket %s\n", path);
+ ret = fd_open_unix(path);
+#if HAVE_FLOCK
+ flock(lock_fd, LOCK_UN);
+ close(lock_fd);
+ claws_unlink(socket_lock);
+ g_free(socket_lock);
+#endif
+ return ret;
}
#else
HANDLE hmutex;
fd_write_all(uxsock, "receive_all\n", 12);
} else if (cmd.receive) {
fd_write_all(uxsock, "receive\n", 8);
+ } else if (cmd.cancel_receiving) {
+ fd_write_all(uxsock, "cancel_receiving\n", 17);
+ } else if (cmd.cancel_sending) {
+ fd_write_all(uxsock, "cancel_sending\n", 15);
} else if (cmd.compose && cmd.attach_files) {
gchar *str, *compose_str;
for (curr = cmd.attach_files; curr != NULL ; curr = curr->next) {
str = (gchar *) ((AttachInfo *)curr->data)->file;
+ if (((AttachInfo *)curr->data)->insert)
+ fd_write_all(uxsock, "insert ", strlen("insert "));
+ else
+ fd_write_all(uxsock, "attach ", strlen("attach "));
fd_write_all(uxsock, str, strlen(str));
fd_write_all(uxsock, "\n", 1);
}
fd_write(uxsock, "online\n", 6);
} else if (cmd.online_mode == ONLINE_MODE_OFFLINE) {
fd_write(uxsock, "offline\n", 7);
+ } else if (cmd.debug) {
+ fd_write(uxsock, "debug\n", 7);
} else if (cmd.status || cmd.status_full) {
gchar buf[BUFFSIZE];
gint i;
}
fd_write_all(uxsock, ".\n", 2);
for (;;) {
- fd_gets(uxsock, buf, sizeof(buf));
+ fd_gets(uxsock, buf, sizeof(buf) - 1);
+ buf[sizeof(buf) - 1] = '\0';
if (!strncmp(buf, ".\n", 2)) break;
- fputs(buf, stdout);
+ claws_fputs(buf, stdout);
}
} else if (cmd.exit) {
fd_write_all(uxsock, "exit\n", 5);
gchar buf[BUFSIZ];
fd_write(uxsock, "statistics\n", 11);
for (;;) {
- fd_gets(uxsock, buf, sizeof(buf));
+ fd_gets(uxsock, buf, sizeof(buf) - 1);
+ buf[sizeof(buf) - 1] = '\0';
if (!strncmp(buf, ".\n", 2)) break;
- fputs(buf, stdout);
+ claws_fputs(buf, stdout);
}
} else if (cmd.reset_statistics) {
fd_write(uxsock, "reset_statistics\n", 17);
fd_write_all(uxsock, str, strlen(str));
g_free(str);
for (;;) {
- fd_gets(uxsock, buf, sizeof(buf));
+ fd_gets(uxsock, buf, sizeof(buf) - 1);
+ buf[sizeof(buf) - 1] = '\0';
if (!strncmp(buf, ".\n", 2)) break;
- fputs(buf, stdout);
+ claws_fputs(buf, stdout);
}
} else {
#ifndef G_OS_WIN32
gchar buf[BUFSIZ];
fd_write_all(uxsock, "get_display\n", 12);
memset(buf, 0, sizeof(buf));
- fd_gets(uxsock, buf, sizeof(buf));
+ fd_gets(uxsock, buf, sizeof(buf) - 1);
+ buf[sizeof(buf) - 1] = '\0';
if (strcmp2(buf, x_display)) {
g_print("Claws Mail is already running on display %s.\n",
buf);
static gint lock_socket_remove(void)
{
#ifdef G_OS_UNIX
- gchar *filename;
+ gchar *filename, *dirname;
#endif
if (lock_socket < 0) {
return -1;
#ifdef G_OS_UNIX
filename = claws_get_socket_name();
+ dirname = g_path_get_dirname(filename);
claws_unlink(filename);
+ g_rmdir(dirname);
+ g_free(dirname);
#endif
return 0;
GPtrArray *folders = NULL;
for (;;) {
- fd_gets(sock, buf, sizeof(buf));
+ fd_gets(sock, buf, sizeof(buf) - 1);
+ buf[sizeof(buf) - 1] = '\0';
if (!strncmp(buf, ".\n", 2)) {
break;
}
if (item) {
g_ptr_array_add(folders, item);
} else {
- g_warning("no such folder: %s\n", buf);
+ g_warning("no such folder: %s", buf);
}
}
MainWindow *mainwin = (MainWindow *)data;
gint sock;
gchar buf[BUFFSIZE];
- /* re-use the same quicksearch (& avoid matcher_list mem.leaks) */
- static QuickSearch *quicksearch = NULL;
sock = fd_accept(source);
- fd_gets(sock, buf, sizeof(buf));
+ if (sock < 0)
+ return;
+
+ fd_gets(sock, buf, sizeof(buf) - 1);
+ buf[sizeof(buf) - 1] = '\0';
if (!strncmp(buf, "popup", 5)) {
main_window_popup(mainwin);
prefs_common.newmail_notify_manu);
} else if (!strncmp(buf, "receive", 7)) {
inc_mail(mainwin, prefs_common.newmail_notify_manu);
+ } else if (!strncmp(buf, "cancel_receiving", 16)) {
+ inc_cancel_all();
+ imap_cancel_all();
+ } else if (!strncmp(buf, "cancel_sending", 14)) {
+ send_cancel();
} else if (!strncmp(buf, "compose_attach", 14)) {
GList *files = NULL, *curr;
AttachInfo *ainfo;
gchar *mailto;
mailto = g_strdup(buf + strlen("compose_attach") + 1);
- while (fd_gets(sock, buf, sizeof(buf)) > 0) {
+ while (fd_gets(sock, buf, sizeof(buf) - 1) > 0) {
+ buf[sizeof(buf) - 1] = '\0';
strretchomp(buf);
if (!strcmp2(buf, "."))
break;
-
+
ainfo = g_new0(AttachInfo, 1);
- ainfo->file = g_strdup(buf);
+ ainfo->file = g_strdup(strstr(buf, " ") + 1);
+ ainfo->insert = !strncmp(buf, "insert ", 7);
files = g_list_append(files, ainfo);
}
open_compose_new(mailto, files);
main_window_toggle_work_offline(mainwin, FALSE, FALSE);
} else if (!strncmp(buf, "offline", 7)) {
main_window_toggle_work_offline(mainwin, TRUE, FALSE);
+ } else if (!strncmp(buf, "debug", 5)) {
+ debug_set_mode(debug_get_mode() ? FALSE : TRUE);
} else if (!strncmp(buf, "status-full", 11) ||
!strncmp(buf, "status", 6)) {
gchar *status;
} else if (!strncmp(buf, "search ", 7)) {
FolderItem* folderItem = NULL;
GSList *messages = NULL;
- gchar *folder_name, *request;
- QuickSearchType searchType = QUICK_SEARCH_EXTENDED;
+ gchar *folder_name = NULL;
+ gchar *request = NULL;
+ AdvancedSearch *search;
gboolean recursive;
-
- if (quicksearch==NULL)
- quicksearch = quicksearch_new_nogui();
+ AdvancedSearchType searchType = ADVANCED_SEARCH_EXTENDED;
+ search = advsearch_new();
+
folder_name = g_strdup(buf+7);
strretchomp(folder_name);
- if (fd_gets(sock, buf, sizeof(buf)) <= 0) {
- g_free(folder_name);
- folder_name=NULL;
- }
- searchType = quicksearch_type(buf);
- if (fd_gets(sock, buf, sizeof(buf)) <= 0) {
- g_free(folder_name);
- folder_name=NULL;
+ if (fd_gets(sock, buf, sizeof(buf) - 1) <= 0)
+ goto search_exit;
+ buf[sizeof(buf) - 1] = '\0';
+
+ switch (toupper(buf[0])) {
+ case 'S': searchType = ADVANCED_SEARCH_SUBJECT; break;
+ case 'F': searchType = ADVANCED_SEARCH_FROM; break;
+ case 'T': searchType = ADVANCED_SEARCH_TO; break;
+ case 'M': searchType = ADVANCED_SEARCH_MIXED; break;
+ case 'G': searchType = ADVANCED_SEARCH_TAG; break;
+ case 'E': searchType = ADVANCED_SEARCH_EXTENDED; break;
}
+
+ if (fd_gets(sock, buf, sizeof(buf) - 1) <= 0)
+ goto search_exit;
+
+ buf[sizeof(buf) - 1] = '\0';
request = g_strdup(buf);
strretchomp(request);
recursive = TRUE;
- if (fd_gets(sock, buf, sizeof(buf)) > 0)
- if (buf[0]=='0')
- recursive = FALSE;
+ if (fd_gets(sock, buf, sizeof(buf) - 1) > 0)
+ recursive = buf[0] != '0';
- debug_print("search: %s %i %s %i\n",folder_name,searchType,request,recursive);
+ buf[sizeof(buf) - 1] = '\0';
- if (folder_name)
- folderItem = folder_find_item_from_identifier(folder_name);
- if (folder_name && folderItem == NULL) {
+ debug_print("search: %s %i %s %i\n", folder_name, searchType, request, recursive);
+
+ folderItem = folder_find_item_from_identifier(folder_name);
+
+ if (folderItem == NULL) {
debug_print("Unknown folder item : '%s', searching folder\n",folder_name);
Folder* folder = folder_find_from_path(folder_name);
if (folder != NULL)
} else {
debug_print("%s %s\n",folderItem->name, folderItem->path);
}
+
if (folderItem != NULL) {
- quicksearch_set(quicksearch, searchType, request);
- quicksearch_set_recursive(quicksearch, recursive);
- search_msgs_in_folders(&messages, quicksearch, folderItem);
+ advsearch_set(search, searchType, request);
+ advsearch_search_msgs_in_folders(search, &messages, folderItem, recursive);
} else {
g_print("Folder '%s' not found.\n'", folder_name);
}
GSList *cur;
- for (cur=messages; cur != NULL; cur = cur->next) {
+ 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", 2);
- if (messages != NULL)
- procmsg_msg_list_free(messages);
+search_exit:
g_free(folder_name);
g_free(request);
+ advsearch_free(search);
+ if (messages != NULL)
+ procmsg_msg_list_free(messages);
} else if (!strncmp(buf, "exit", 4)) {
if (prefs_common.clean_on_exit && !prefs_common.ask_on_clean) {
procmsg_empty_all_trash();
mem_notify_fd = g_open("/dev/mem_notify", O_RDONLY|O_NONBLOCK, 0);
if (mem_notify_fd == -1) {
debug_print("/dev/mem_notify not available (%s)\n",
- strerror(errno));
+ g_strerror(errno));
return;
}
}
#endif /* linux && SIGIO */
-#ifdef MAEMO
-osso_context_t *get_osso_context(void)
-{
- return static_osso_context;
-}
-#endif
-
-
#ifdef HAVE_NETWORKMANAGER_SUPPORT
static void networkmanager_state_change_cb(DBusGProxy *proxy, gchar *dev,
gpointer data)
return;
if (mainWin) {
- GError *error;
+ GError *error = NULL;
gboolean online;
- error = NULL;
online = networkmanager_is_online(&error);
if(!error) {
if(online && went_offline_nm) {
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