#ifdef HAVE_VALGRIND
#include <valgrind.h>
#endif
+#ifdef HAVE_SVG
+#include <librsvg/rsvg.h>
+#endif
#include "claws.h"
#include "main.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;
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;
}
}
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);
}
}
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);
"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
/* 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();
folderview_freeze(mainwin->folderview);
folder_item_update_freeze();
- passwd_store_read_config();
+ 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,
if (never_ran) {
prefs_common_write_config();
plugin_load_standard_plugins ();
- } else {
- if (prefs_update_config_version() < 0) {
- exit_claws(mainwin);
-#ifdef G_OS_WIN32
- win32_close_log();
-#endif
- exit(0);
- }
}
/* if not crashed, show window now */
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) ||
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"));
: _("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;
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);
}
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);
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