#include <glib.h>
#include <glib/gi18n.h>
-#include <gtk/gtkmain.h>
-#include <gtk/gtkrc.h>
+#include <gtk/gtk.h>
#include <stdio.h>
#include <stdlib.h>
#ifdef HAVE_LIBSM
#include <X11/SM/SMlib.h>
#endif
-#ifdef USE_GNUTLS
-#include <pthread.h>
-#include <gcrypt.h>
-GCRY_THREAD_OPTION_PTHREAD_IMPL;
-#endif
#include "wizard.h"
#ifdef HAVE_STARTUP_NOTIFICATION
#include "matcher.h"
#include "tags.h"
#include "hooks.h"
+#include "menu.h"
#ifdef HAVE_LIBETPAN
#include "imap-thread.h"
#ifdef HAVE_VALGRIND
#include "valgrind.h"
#endif
-#if (defined(USE_OPENSSL) || defined (USE_GNUTLS))
+#ifdef USE_GNUTLS
# include "ssl.h"
#endif
#include <hildon-widgets/hildon-banner.h>
#include <hildon-widgets/hildon-program.h>
#endif
-#include <gtk/gtkmain.h>
#include <libosso.h>
#include <libgnomevfs/gnome-vfs-volume.h>
#include <libgnomevfs/gnome-vfs-volume-monitor.h>
* if we have been launched from a menu.
* We have to display a window, so let it be very little */
hack = gtk_window_new(GTK_WINDOW_POPUP);
- gtk_widget_set_uposition(hack, 0, 0);
+ gtk_window_move(GTK_WINDOW(hack), 0, 0);
gtk_widget_set_size_request(hack, 1, 1);
gtk_widget_show(hack);
}
gint r = 0;
GtkWidget *window = NULL;
GtkWidget *keep_backup_chk;
- GtkTooltips *tips = gtk_tooltips_new();
+ CLAWS_TIP_DECL();
gboolean backup = TRUE;
keep_backup_chk = gtk_check_button_new_with_label (_("Keep old configuration"));
gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(keep_backup_chk), TRUE);
- gtk_tooltips_set_tip(GTK_TOOLTIPS(tips), keep_backup_chk,
+ CLAWS_SET_TIP(keep_backup_chk,
_("Keeping a backup will allow you to go back to an "
"older version, but may take a while if you have "
"cached IMAP or News data, and will take some extra "
- "room on your disk."),
- NULL);
+ "room on your disk."));
g_signal_connect(G_OBJECT(keep_backup_chk), "toggled",
G_CALLBACK(chk_update_val), &backup);
static void win32_open_log(void)
{
- if (is_file_exist("claws-win32.log")) {
- if (rename_force("claws-win32.log", "claws-win32.log.bak") < 0)
- FILE_OP_ERROR("claws-win32.log", "rename");
+ gchar *logfile = g_strconcat(get_rc_dir(), G_DIR_SEPARATOR_S, "claws-win32.log", NULL);
+ gchar *oldlogfile = g_strconcat(get_rc_dir(), G_DIR_SEPARATOR_S, "claws-win32.log.bak", NULL);
+
+ if (is_file_exist(logfile)) {
+ if (rename_force(logfile, oldlogfile) < 0)
+ FILE_OP_ERROR(logfile, "rename");
}
- win32_debug_fp = fopen("claws-win32.log", "w");
+ win32_debug_fp = g_fopen(logfile, "w");
+ g_free(logfile);
+ g_free(oldlogfile);
if (win32_debug_fp)
{
g_set_print_handler(win32_print_stdout);
return;
if (show_debug_only)
- debug_print("GTK+ %d.%d.%d / GLib %d.%d.%d\n",
+ debug_print("runtime GTK+ %d.%d.%d / GLib %d.%d.%d\n",
gtk_major_version, gtk_minor_version, gtk_micro_version,
glib_major_version, glib_minor_version, glib_micro_version);
else
- g_print("GTK+ %d.%d.%d / GLib %d.%d.%d\n",
+ g_print("runtime GTK+ %d.%d.%d / GLib %d.%d.%d\n",
gtk_major_version, gtk_minor_version, gtk_micro_version,
glib_major_version, glib_minor_version, glib_micro_version);
+ if (show_debug_only)
+ debug_print("buildtime GTK+ %d.%d.%d / GLib %d.%d.%d\n",
+ GTK_MAJOR_VERSION, GTK_MINOR_VERSION, GTK_MICRO_VERSION,
+ GLIB_MAJOR_VERSION, GLIB_MINOR_VERSION, GLIB_MICRO_VERSION);
+ else
+ g_print("buildtime GTK+ %d.%d.%d / GLib %d.%d.%d\n",
+ GTK_MAJOR_VERSION, GTK_MINOR_VERSION, GTK_MICRO_VERSION,
+ GLIB_MAJOR_VERSION, GLIB_MINOR_VERSION, GLIB_MICRO_VERSION);
+
if (show_debug_only)
debug_print("Compiled-in features:\n");
else
else
g_print(" compface\n");
#endif
-#if USE_ASPELL
+#if USE_ENCHANT
if (show_debug_only)
debug_print(" aspell\n");
else
else
g_print(" NetworkManager\n");
#endif
-#if USE_OPENSSL
- if (show_debug_only)
- debug_print(" openssl\n");
- else
- g_print(" openssl\n");
-#endif
}
#ifdef HAVE_DBUS_GLIB
"claws-mail", G_TYPE_INVALID, G_TYPE_INVALID);
}
if (error) {
- debug_print(error->message);
+ debug_print("%s\n", error->message);
g_error_free(error);
}
}
gint num_folder_class = 0;
gboolean asked_for_migration = FALSE;
gboolean start_done = TRUE;
-
+ GtkUIManager *gui_manager = NULL;
+ GSList *plug_list = NULL;
+ gboolean never_ran = FALSE;
START_TIMING("startup");
sc_starting = TRUE;
sock_init();
/* check and create unix domain socket for remote operation */
-#ifdef G_OS_UNIX
lock_socket = prohibit_duplicate_launch();
if (lock_socket < 0) {
#ifdef HAVE_STARTUP_NOTIFICATION
if (cmd.exit)
return 0;
-#endif
if (!g_thread_supported())
g_thread_init(NULL);
gtk_set_locale();
gtk_init(&argc, &argv);
+#ifdef G_OS_WIN32
+ gtk_settings_set_string_property(gtk_settings_get_default(),
+ "gtk-theme-name",
+ "MS-Windows",
+ "XProperty");
+#endif
+
#ifdef HAVE_NETWORKMANAGER_SUPPORT
went_offline_nm = FALSE;
nm_proxy = NULL;
hildon_program = HILDON_PROGRAM(hildon_program_get_instance());
static_osso_context = osso_context;
#endif
- gdk_rgb_init();
gtk_widget_set_default_colormap(gdk_rgb_get_colormap());
- gtk_widget_set_default_visual(gdk_rgb_get_visual());
+
+ gui_manager = gtkut_create_ui_manager();
+
+ /* Create container for all the menus we will be adding */
+ MENUITEM_ADDUI("/", "Menus", NULL, GTK_UI_MANAGER_MENUBAR);
if (!g_thread_supported()) {
g_error(_("g_thread is not supported by glib.\n"));
prefs_receive_init();
prefs_send_init();
tags_read_tags();
-#ifdef USE_ASPELL
+#ifdef USE_ENCHANT
gtkaspell_checkers_init();
prefs_spelling_init();
#endif
manage_window_focus_in(mainwin->window, NULL, NULL);
folderview = mainwin->folderview;
- gtk_clist_freeze(GTK_CLIST(mainwin->folderview->ctree));
+ gtk_cmclist_freeze(GTK_CMCLIST(mainwin->folderview->ctree));
folder_item_update_freeze();
/* register the callback of unix domain socket input */
-#ifdef G_OS_UNIX
- lock_socket_tag = gdk_input_add(lock_socket,
+ lock_socket_tag = claws_input_add(lock_socket,
GDK_INPUT_READ | GDK_INPUT_EXCEPTION,
lock_socket_input_cb,
- mainwin);
-#endif
+ mainwin, TRUE);
prefs_account_init();
}
main_window_reflect_prefs_all_now();
folder_write_list();
+ never_ran = TRUE;
}
if (!account_get_list()) {
#endif
exit(1);
}
+ never_ran = TRUE;
}
if (claws_crashed())
main_window_popup(mainwin);
-#ifdef USE_GNUTLS
- gcry_control (GCRYCTL_SET_THREAD_CBS, &gcry_threads_pthread);
-#endif
-
#ifdef HAVE_LIBETPAN
imap_main_init(prefs_common.skip_ssl_cert_check);
imap_main_set_timeout(prefs_common.io_timeout_secs);
prefs_matcher_read_config();
}
- if (plugin_get_unloaded_list() != NULL) {
+ if ((plug_list = plugin_get_unloaded_list()) != NULL) {
+ GSList *cur;
+ gchar *list = NULL;
+ gint num_plugins = 0;
+ for (cur = plug_list; cur; cur = cur->next) {
+ Plugin *plugin = (Plugin *)cur->data;
+ gchar *tmp = g_strdup_printf("%s\n%s",
+ list? list:"",
+ plugin_get_name(plugin));
+ g_free(list);
+ list = tmp;
+ num_plugins++;
+ }
main_window_cursor_normal(mainwin);
- alertpanel_warning(_("Some plugin(s) failed to load. "
+ alertpanel_warning(ngettext(
+ "The following plugin failed to load. "
"Check the Plugins configuration "
- "for more information."));
+ "for more information:\n%s",
+ "The following plugins failed to load. "
+ "Check the Plugins configuration "
+ "for more information:\n%s",
+ num_plugins),
+ list);
main_window_cursor_wait(mainwin);
+ g_free(list);
+ g_slist_free(plug_list);
}
- plugin_load_standard_plugins ();
-
+ if (never_ran) {
+ prefs_common_write_config();
+ plugin_load_standard_plugins ();
+ }
/* if not crashed, show window now */
if (!claws_crashed()) {
/* apart if something told not to show */
#endif
folder_item_update_thaw();
- gtk_clist_thaw(GTK_CLIST(mainwin->folderview->ctree));
+ gtk_cmclist_thaw(GTK_CMCLIST(mainwin->folderview->ctree));
main_window_cursor_normal(mainwin);
if (!cmd.target && prefs_common.goto_last_folder_on_startup &&
if(mainwin->folderview->opened) {
FolderItem *item;
- item = gtk_ctree_node_get_row_data(GTK_CTREE(mainwin->folderview->ctree), mainwin->folderview->opened);
+ 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);
}
prefs_logging_done();
prefs_send_done();
tags_write_tags();
-#ifdef USE_ASPELL
+#ifdef USE_ENCHANT
prefs_spelling_done();
gtkaspell_checkers_quit();
#endif
} else if (!strncmp(argv[i], "--receive", 9)) {
cmd.receive = TRUE;
} else if (!strncmp(argv[i], "--compose", 9)) {
- const gchar *p = argv[i + 1];
+ const gchar *p = (i+1 < argc)?argv[i+1]:NULL;
cmd.compose = TRUE;
cmd.compose_mailto = NULL;
i++;
}
} else if (!strncmp(argv[i], "--subscribe", 11)) {
- const gchar *p = argv[i + 1];
+ const gchar *p = (i+1 < argc)?argv[i+1]:NULL;
if (p && *p != '\0' && *p != '-') {
cmd.subscribe = TRUE;
cmd.subscribe_uri = p;
}
} else if (!strncmp(argv[i], "--attach", 8)) {
- const gchar *p = argv[i + 1];
+ const gchar *p = (i+1 < argc)?argv[i+1]:NULL;
gchar *file = NULL;
while (p && *p != '\0' && *p != '-') {
}
g_ptr_array_add(cmd.attach_files, file);
i++;
- p = argv[i + 1];
+ p = (i+1 < argc)?argv[i+1]:NULL;
}
} else if (!strncmp(argv[i], "--send", 6)) {
cmd.send = TRUE;
g_print("Claws Mail version " VERSION "\n");
exit(0);
} else if (!strncmp(argv[i], "--status-full", 13)) {
- const gchar *p = argv[i + 1];
+ const gchar *p = (i+1 < argc)?argv[i+1]:NULL;
cmd.status_full = TRUE;
while (p && *p != '\0' && *p != '-') {
g_ptr_array_add(cmd.status_full_folders,
g_strdup(p));
i++;
- p = argv[i + 1];
+ p = (i+1 < argc)?argv[i+1]:NULL;
}
} else if (!strncmp(argv[i], "--status", 8)) {
- const gchar *p = argv[i + 1];
+ const gchar *p = (i+1 < argc)?argv[i+1]:NULL;
cmd.status = TRUE;
while (p && *p != '\0' && *p != '-') {
g_ptr_array_add(cmd.status_folders,
g_strdup(p));
i++;
- p = argv[i + 1];
+ p = (i+1 < argc)?argv[i+1]:NULL;
}
} else if (!strncmp(argv[i], "--online", 8)) {
cmd.online_mode = ONLINE_MODE_ONLINE;
exit(1);
} else if (!strncmp(argv[i], "--crash", 7)) {
cmd.crash = TRUE;
- cmd.crash_params = g_strdup(argv[i + 1]);
+ cmd.crash_params = g_strdup((i+1 < argc)?argv[i+1]:NULL);
i++;
} else if (!strncmp(argv[i], "--config-dir", sizeof "--config-dir" - 1)) {
g_print(RC_DIR "\n");
static gint prohibit_duplicate_launch(void)
{
gint uxsock;
+#ifdef G_OS_UNIX
gchar *path;
path = claws_get_socket_name();
claws_unlink(path);
return fd_open_unix(path);
}
-
+#else
+ HANDLE hmutex;
+
+ hmutex = CreateMutexA(NULL, FALSE, "ClawsMail");
+ if (!hmutex) {
+ debug_print("cannot create Mutex\n");
+ return -1;
+ }
+ if (GetLastError() != ERROR_ALREADY_EXISTS) {
+ uxsock = fd_open_inet(50216);
+ if (uxsock < 0)
+ return 0;
+ return uxsock;
+ }
+
+ uxsock = fd_connect_inet(50216);
+ if (uxsock < 0)
+ return -1;
+#endif
/* remote command mode */
debug_print("another Claws Mail instance is already running.\n");
fd_write_all(uxsock, str, strlen(str));
g_free(str);
} else {
+#ifndef G_OS_WIN32
gchar buf[BUFSIZ];
fd_write_all(uxsock, "get_display\n", 12);
memset(buf, 0, sizeof(buf));
uxsock = fd_connect_unix(path);
fd_write_all(uxsock, "popup\n", 6);
}
+#else
+ fd_write_all(uxsock, "popup\n", 6);
+#endif
}
fd_close(uxsock);
{
#ifdef G_OS_UNIX
gchar *filename;
-
+#endif
if (lock_socket < 0) {
return -1;
}
if (lock_socket_tag > 0) {
- gdk_input_remove(lock_socket_tag);
+ g_source_remove(lock_socket_tag);
}
fd_close(lock_socket);
+
+#ifdef G_OS_UNIX
filename = claws_get_socket_name();
claws_unlink(filename);
#endif
projects / claws.git / blobdiff