/*
- * Sylpheed -- a GTK+ based, lightweight, and fast e-mail client
- * Copyright (C) 1999-2013 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 "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 "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 "quicksearch.h"
#include "advsearch.h"
#include "avatars.h"
+#include "passwordstore.h"
#ifdef HAVE_LIBETPAN
#include "imap-thread.h"
const gchar *subscribe_uri;
const gchar *target;
gboolean debug;
+ const gchar *geometry;
} cmd;
SessionStats session_stats;
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;
"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"));
+ 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"));
+ g_warning("Failed to register folder update hook");
uninstall_dbus_status_handler();
return;
}
* 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, 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, 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, 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");
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();
gtk_cmclist_freeze(GTK_CMCLIST(mainwin->folderview->ctree));
folder_item_update_freeze();
+ passwd_store_read_config();
prefs_account_init();
account_read_config_all();
g_slist_free(plug_list);
}
+ prefs_update_config_version();
+
if (never_ran) {
prefs_common_write_config();
plugin_load_standard_plugins ();
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);
{
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);
+ 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);
prefs_toolbar_done();
avatars_done();
-#ifndef USE_NEW_ADDRBOOK
+#ifndef USE_ALT_ADDRBOOK
addressbook_destroy();
#endif
prefs_themes_done();
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_free(to);
g_string_append(body, "?body=");
while (fgets(fb, sizeof(fb), fp)) {
-#if GLIB_CHECK_VERSION(2,16,0)
g_string_append_uri_escaped(body, fb, NULL, TRUE);
-#else
- G_STRING_APPEND_ENCODED_URI(body, fb);
-#endif
}
if (!isstdin)
fclose(fp);
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)) {
gchar md5sum[33];
if (filename == NULL) {
- struct stat st;
+ GStatBuf st;
gint stat_ok;
socket_dir = g_strdup_printf("%s%cclaws-mail-%d",
#else
0);
#endif
- stat_ok = stat(socket_dir, &st);
+ 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, strerror(errno));
+ 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);
if (!is_dir_exist(socket_dir) && make_dir(socket_dir) < 0) {
g_print("Error creating socket_dir %s: %s\n",
- socket_dir, strerror(errno));
+ socket_dir, g_strerror(errno));
}
md5_hex_digest(md5sum, get_rc_dir());
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,
- strerror(errno), errno);
+ 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,
- strerror(errno), errno);
+ g_strerror(errno), errno);
close(lock_fd);
g_free(socket_lock);
return -1;
if (item) {
g_ptr_array_add(folders, item);
} else {
- g_warning("no such folder: %s\n", buf);
+ g_warning("no such folder: %s", buf);
}
}
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;
}
return;
if (mainWin) {
- GError *error;
+ GError *error = NULL;
gboolean online;
- error = NULL;
online = networkmanager_is_online(&error);
if(!error) {
if(online && went_offline_nm) {
projects / claws.git / blobdiff