2008-10-09 [colin] 3.6.0cvs19
[claws.git] / src / main.c
index 245d30812a304a9d2e717463132ca21d51b926f9..0f7e6525d9b10a9bcba97f62fbf468104fb6b6e9 100644 (file)
@@ -25,8 +25,7 @@
 
 #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>
 #include <sys/types.h>
 #ifdef G_OS_UNIX
 #  include <signal.h>
+#  include <errno.h>
+#  include <fcntl.h>
 #endif
 #ifdef HAVE_LIBSM
 #include <X11/SM/SMlib.h>
-#include <fcntl.h>
+#endif
+#ifdef USE_GNUTLS
+#include <pthread.h>
+#include <gcrypt.h>
+GCRY_THREAD_OPTION_PTHREAD_IMPL;
 #endif
 
 #include "wizard.h"
 # include <gdk/gdkx.h>
 #endif
 
-#ifdef HAVE_NETWORKMANAGER_SUPPORT
+#ifdef HAVE_DBUS_GLIB
 #include <dbus/dbus-glib.h>
+#endif
+#ifdef HAVE_NETWORKMANAGER_SUPPORT
 #include <NetworkManager.h>
 #endif
 
 #include "news_gtk.h"
 #include "matcher.h"
 #include "tags.h"
+#include "hooks.h"
+#include "menu.h"
+
 #ifdef HAVE_LIBETPAN
 #include "imap-thread.h"
 #include "nntp-thread.h"
 #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>
@@ -155,6 +164,10 @@ static GnomeVFSVolumeMonitor *volmon;
 static gboolean went_offline_nm;
 #endif
 
+#ifdef HAVE_DBUS_GLIB
+static DBusGProxy *awn_proxy = NULL;
+#endif
+
 gchar *prog_version;
 gchar *argv0;
 
@@ -213,6 +226,9 @@ static void send_queue                      (void);
 static void initial_processing         (FolderItem *item, gpointer data);
 static void quit_signal_handler         (int sig);
 static void install_basic_sighandlers   (void);
+#if (defined linux && defined SIGIO)
+static void install_memory_sighandler   (void);
+#endif
 static void exit_claws                 (MainWindow *mainwin);
 
 #ifdef HAVE_NETWORKMANAGER_SUPPORT
@@ -305,7 +321,7 @@ static void startup_notification_complete(gboolean with_window)
                 * 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);
        }
@@ -403,17 +419,16 @@ static gboolean migrate_old_config(const gchar *old_cfg_dir, const gchar *new_cf
        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);
@@ -787,7 +802,7 @@ static void win32_open_log(void)
                if (rename_force("claws-win32.log", "claws-win32.log.bak") < 0)
                        FILE_OP_ERROR("claws-win32.log", "rename");
        }
-       win32_debug_fp = fopen("claws-win32.log", "w");
+       win32_debug_fp = g_fopen("claws-win32.log", "w");
        if (win32_debug_fp)
        {
                g_set_print_handler(win32_print_stdout);
@@ -821,13 +836,22 @@ static void main_dump_features_list(gboolean show_debug_only)
                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
@@ -838,7 +862,7 @@ static void main_dump_features_list(gboolean show_debug_only)
        else
                g_print(" compface\n");
 #endif
-#if USE_ASPELL
+#if USE_ENCHANT
        if (show_debug_only)
                debug_print(" aspell\n");
        else
@@ -880,12 +904,6 @@ static void main_dump_features_list(gboolean show_debug_only)
        else
                g_print(" libetpan %d.%d\n", LIBETPAN_VERSION_MAJOR, LIBETPAN_VERSION_MINOR);
 #endif
-#if USE_GNOMEPRINT
-       if (show_debug_only)
-               debug_print(" gnomeprint\n");
-       else
-               g_print(" gnomeprint\n");
-#endif
 #if HAVE_LIBSM
        if (show_debug_only)
                debug_print(" libsm\n");
@@ -906,16 +924,118 @@ static void main_dump_features_list(gboolean show_debug_only)
 #endif
 }
 
+#ifdef HAVE_DBUS_GLIB
+static guint dbus_item_hook_id = -1;
+static guint dbus_folder_hook_id = -1;
+
+static void uninstall_dbus_status_handler(void)
+{
+       if(awn_proxy)
+               g_object_unref(awn_proxy);
+       awn_proxy = NULL;
+       if (dbus_item_hook_id != -1)
+               hooks_unregister_hook(FOLDER_ITEM_UPDATE_HOOKLIST, dbus_item_hook_id);
+       if (dbus_folder_hook_id != -1)
+               hooks_unregister_hook(FOLDER_UPDATE_HOOKLIST, dbus_folder_hook_id);
+}
+
+static void dbus_update(FolderItem *removed_item)
+{
+       guint new, unread, unreadmarked, marked, total;
+       guint replied, forwarded, locked, ignored, watched;
+       gchar *buf;
+       GError *error = NULL;
+
+       folder_count_total_msgs(&new, &unread, &unreadmarked, &marked, &total,
+                               &replied, &forwarded, &locked, &ignored,
+                               &watched);
+       if (removed_item) {
+               total -= removed_item->total_msgs;
+               new -= removed_item->new_msgs;
+               unread -= removed_item->unread_msgs;
+       }
+
+       if (new > 0) {
+               buf = g_strdup_printf("%d", new);
+               dbus_g_proxy_call(awn_proxy, "SetInfoByName", &error,
+                       G_TYPE_STRING, "claws-mail",
+                       G_TYPE_STRING, buf,
+                       G_TYPE_INVALID, G_TYPE_INVALID);
+               g_free(buf);
+               
+       } else {
+               dbus_g_proxy_call(awn_proxy, "UnsetInfoByName", &error, G_TYPE_STRING,
+                       "claws-mail", G_TYPE_INVALID, G_TYPE_INVALID);
+       }
+       if (error) {
+               debug_print("%s\n", error->message);
+               g_error_free(error);
+       }
+}
+
+static gboolean dbus_status_update_folder_hook(gpointer source, gpointer data)
+{
+       FolderUpdateData *hookdata;
+       hookdata = source;
+       if (hookdata->update_flags & FOLDER_REMOVE_FOLDERITEM)
+               dbus_update(hookdata->item);
+       else
+               dbus_update(NULL);
+
+       return FALSE;
+}
+
+static gboolean dbus_status_update_item_hook(gpointer source, gpointer data)
+{
+       dbus_update(NULL);
+
+       return FALSE;
+}
+
+static void install_dbus_status_handler(void)
+{
+       GError *tmp_error = NULL;
+       DBusGConnection *connection = dbus_g_bus_get(DBUS_BUS_SESSION, &tmp_error);
+       
+       if(!connection) {
+               /* If calling code doesn't do error checking, at least print some debug */
+               debug_print("Failed to open connection to session bus: %s\n",
+                                tmp_error->message);
+               g_error_free(tmp_error);
+               return;
+       }
+       awn_proxy = dbus_g_proxy_new_for_name(connection,
+                       "com.google.code.Awn",
+                       "/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"));
+               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"));
+               uninstall_dbus_status_handler();
+               return;
+       }
+}
+#endif
+
 int main(int argc, char *argv[])
 {
 #ifdef MAEMO
        osso_context_t *osso_context;
        osso_return_t result;
 #endif
-#ifdef HAVE_NETWORKMANAGER_SUPPORT
+#ifdef HAVE_DBUS_GLIB
        DBusGConnection *connection;
-  GError *error;
-  DBusGProxy *proxy;
+       GError *error;
+#endif
+#ifdef HAVE_NETWORKMANAGER_SUPPORT
+       DBusGProxy *nm_proxy;
 #endif
        gchar *userrc;
        MainWindow *mainwin;
@@ -925,9 +1045,12 @@ int main(int argc, char *argv[])
        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;
 
 #ifdef G_OS_WIN32
@@ -962,6 +1085,9 @@ int main(int argc, char *argv[])
        crash_install_handlers();
 #endif
        install_basic_sighandlers();
+#if (defined linux && defined SIGIO)
+       install_memory_sighandler();
+#endif
        sock_init();
 
        /* check and create unix domain socket for remote operation */
@@ -990,25 +1116,39 @@ int main(int argc, char *argv[])
        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;
+#endif
+#ifdef HAVE_DBUS_GLIB
        error = NULL;
-       proxy = NULL;
-  connection = dbus_g_bus_get(DBUS_BUS_SYSTEM, &error);
+       connection = dbus_g_bus_get(DBUS_BUS_SYSTEM, &error);
 
-  if(!connection) {
+       if(!connection) {
                debug_print("Failed to open connection to system bus: %s\n", error->message);
                g_error_free(error);
        }
        else {
-               proxy = dbus_g_proxy_new_for_name(connection,
-                                                                                                                                                       "org.freedesktop.NetworkManager",
-                                                                                                                                                       "/org/freedesktop/NetworkManager",
-                                                                                                                                                       "org.freedesktop.NetworkManager");
-               dbus_g_proxy_add_signal(proxy,"StateChange", G_TYPE_UINT, G_TYPE_INVALID);
-               dbus_g_proxy_connect_signal(proxy, "StateChange",
-                                                                                                                               G_CALLBACK(networkmanager_state_change_cb),
-                                                                                                                               NULL,NULL);
+#ifdef HAVE_NETWORKMANAGER_SUPPORT
+               nm_proxy = dbus_g_proxy_new_for_name(connection,
+                       "org.freedesktop.NetworkManager",
+                       "/org/freedesktop/NetworkManager",
+                       "org.freedesktop.NetworkManager");
+               if (nm_proxy) {
+                       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
+               install_dbus_status_handler();
        }
 #endif
 
@@ -1021,9 +1161,12 @@ int main(int argc, char *argv[])
        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"));
@@ -1055,15 +1198,6 @@ int main(int argc, char *argv[])
                exit(1);
        }
 #endif 
-       /* parse gtkrc files */
-       userrc = g_strconcat(get_home_dir(), G_DIR_SEPARATOR_S, ".gtkrc-2.0",
-                            NULL);
-       gtk_rc_parse(userrc);
-       g_free(userrc);
-       userrc = g_strconcat(get_home_dir(), G_DIR_SEPARATOR_S, ".gtk",
-                            G_DIR_SEPARATOR_S, "gtkrc-2.0", NULL);
-       gtk_rc_parse(userrc);
-       g_free(userrc);
 
 #ifdef G_OS_WIN32
        CHDIR_EXEC_CODE_RETURN_VAL_IF_FAIL(get_home_dir(), 1, win32_close_log(););
@@ -1182,7 +1316,7 @@ int main(int argc, char *argv[])
        prefs_receive_init();
        prefs_send_init();
        tags_read_tags();
-#ifdef USE_ASPELL
+#ifdef USE_ENCHANT
        gtkaspell_checkers_init();
        prefs_spelling_init();
 #endif
@@ -1206,7 +1340,7 @@ int main(int argc, char *argv[])
        mainwin = main_window_create();
 
 #ifdef HAVE_NETWORKMANAGER_SUPPORT
-               networkmanager_state_change_cb(proxy,NULL,mainwin);
+       networkmanager_state_change_cb(nm_proxy,NULL,mainwin);
 #endif
 
 #ifdef MAEMO
@@ -1239,12 +1373,12 @@ int main(int argc, char *argv[])
        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);
@@ -1277,6 +1411,7 @@ int main(int argc, char *argv[])
                }
                main_window_reflect_prefs_all_now();
                folder_write_list();
+               never_ran = TRUE;
        }
 
        if (!account_get_list()) {
@@ -1296,6 +1431,7 @@ int main(int argc, char *argv[])
 #endif
                        exit(1);
                }
+               never_ran = TRUE;
        }
 
        
@@ -1307,6 +1443,10 @@ int main(int argc, char *argv[])
        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);
@@ -1369,16 +1509,38 @@ int main(int argc, char *argv[])
                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:\n%s",
+                                    "The following plugins failed to load. "
                                     "Check the Plugins configuration "
-                                    "for more information."));
+                                    "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 */
@@ -1449,7 +1611,7 @@ int main(int argc, char *argv[])
 #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 &&
@@ -1467,9 +1629,8 @@ int main(int argc, char *argv[])
        } else if (cmd.receive && !cmd.target) {
                start_done = FALSE;
                g_timeout_add(1000, defer_check, NULL);
-       } else {
-               gtk_widget_grab_focus(folderview->ctree);
-       }
+       } 
+       gtk_widget_grab_focus(folderview->ctree);
 
        if (cmd.compose) {
                open_compose_new(cmd.compose_mailto, cmd.attach_files);
@@ -1509,8 +1670,11 @@ int main(int argc, char *argv[])
        osso_deinitialize(osso_context);
 #endif
 #ifdef HAVE_NETWORKMANAGER_SUPPORT
-       if(proxy)
-               g_object_unref(proxy);
+       if(nm_proxy)
+               g_object_unref(nm_proxy);
+#endif
+#ifdef HAVE_DBUS_GLIB
+       uninstall_dbus_status_handler();
        if(connection)
                dbus_g_connection_unref(connection);
 #endif
@@ -1545,10 +1709,6 @@ static void exit_claws(MainWindow *mainwin)
        debug_print("shutting down\n");
        inc_autocheck_timer_remove();
 
-       if (prefs_common.clean_on_exit && !emergency_exit) {
-               main_window_empty_trash(mainwin, prefs_common.ask_on_clean);
-       }
-
 #ifdef HAVE_NETWORKMANAGER_SUPPORT
        if (prefs_common.work_offline && went_offline_nm)
                prefs_common.work_offline = FALSE;
@@ -1558,7 +1718,7 @@ static void exit_claws(MainWindow *mainwin)
        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);
        }
@@ -1591,7 +1751,7 @@ static void exit_claws(MainWindow *mainwin)
 #endif
        /* delete crashfile */
        if (!cmd.crash)
-               g_unlink(get_crashfile_name());
+               claws_unlink(get_crashfile_name());
 
        lock_socket_remove();
 
@@ -1625,7 +1785,7 @@ static void exit_claws(MainWindow *mainwin)
        prefs_logging_done();
        prefs_send_done();
        tags_write_tags();
-#ifdef USE_ASPELL       
+#ifdef USE_ENCHANT       
        prefs_spelling_done();
        gtkaspell_checkers_quit();
 #endif
@@ -1775,7 +1935,7 @@ static void parse_cmd_opt(int argc, char *argv[])
                        cmd.target = argv[i+1];
                } else if (i == 1 && argc == 2) {
                        /* only one parameter. Do something intelligent about it */
-                       if (strstr(argv[i], "@") && !strstr(argv[i], "://")) {
+                       if ((strstr(argv[i], "@")||!strncmp(argv[i], "mailto:", 7)) && !strstr(argv[i], "://")) {
                                const gchar *p = argv[i];
 
                                cmd.compose = TRUE;
@@ -1789,6 +1949,9 @@ static void parse_cmd_opt(int argc, char *argv[])
                                }
                        } else if (!strncmp(argv[i], "file://", 7)) {
                                cmd.target = argv[i];
+                       } else if (!strncmp(argv[i], "?attach=file://", strlen("?attach=file://"))) {
+                               cmd.compose = TRUE;
+                               cmd.compose_mailto = argv[i];
                        } else if (strstr(argv[i], "://")) {
                                const gchar *p = argv[i];
                                if (p && *p != '\0' && *p != '-') {
@@ -1885,6 +2048,10 @@ void app_will_exit(GtkWidget *widget, gpointer data)
 {
        MainWindow *mainwin = data;
        
+       if (gtk_main_level() == 0) {
+               debug_print("not even started\n");
+               return;
+       }
        if (sc_exiting == TRUE) {
                debug_print("exit pending\n");
                return;
@@ -1982,7 +2149,7 @@ static gint prohibit_duplicate_launch(void)
                x_display = g_strdup(g_getenv("DISPLAY"));
 
        if (uxsock < 0) {
-               g_unlink(path);
+               claws_unlink(path);
                return fd_open_unix(path);
        }
 
@@ -2095,11 +2262,11 @@ static gint lock_socket_remove(void)
        }
 
        if (lock_socket_tag > 0) {
-               gdk_input_remove(lock_socket_tag);
+               g_source_remove(lock_socket_tag);
        }
        fd_close(lock_socket);
        filename = claws_get_socket_name();
-       g_unlink(filename);
+       claws_unlink(filename);
 #endif
 
        return 0;
@@ -2287,6 +2454,57 @@ static void install_basic_sighandlers()
 #endif /* !G_OS_WIN32 */
 }
 
+#if (defined linux && defined SIGIO)
+static int mem_notify_fd = 0;
+
+static gboolean clean_caches(gpointer unused)
+{
+       if (static_mainwindow && static_mainwindow->lock_count > 0)
+               return TRUE;
+       debug_print("/dev/mem_notify: callback: Freeing some memory now!\n");
+       folder_clean_cache_memory_force();
+       return FALSE;
+}
+
+static void memory_signal_handler(int sig)
+{
+       debug_print("/dev/mem_notify: Kernel says we should free up some memory!\n");
+       g_timeout_add(10, clean_caches, NULL); 
+}
+
+static void install_memory_sighandler()
+{
+       sigset_t    mask;
+       struct sigaction act;
+       int flags;
+
+       mem_notify_fd = open("/dev/mem_notify", O_RDONLY|O_NONBLOCK);
+       if (mem_notify_fd == -1) {
+               debug_print("/dev/mem_notify not available (%s)\n", 
+                       strerror(errno));
+               return;
+       }
+       
+       fcntl(mem_notify_fd, F_SETOWN, getpid());
+       flags = fcntl(mem_notify_fd, F_GETFL);
+       fcntl(mem_notify_fd, flags|FASYNC);
+
+       sigemptyset(&mask);
+
+       sigaddset(&mask, SIGIO);
+
+       act.sa_handler = memory_signal_handler;
+       act.sa_mask    = mask;
+       act.sa_flags   = 0;
+
+       sigaction(SIGIO, &act, 0);
+
+       sigprocmask(SIG_UNBLOCK, &mask, 0);
+
+       debug_print("/dev/mem_notify: installed handler\n");
+}
+#endif /* linux && SIGIO */
+
 #ifdef MAEMO
 osso_context_t *get_osso_context(void)
 {
@@ -2297,17 +2515,20 @@ osso_context_t *get_osso_context(void)
 
 #ifdef HAVE_NETWORKMANAGER_SUPPORT
 static void networkmanager_state_change_cb(DBusGProxy *proxy, gchar *dev,
-                                                                                                                                                                        gpointer data)
+                                        gpointer data)
 {
        MainWindow *mainWin;
 
        mainWin = NULL;
-       if(static_mainwindow)
+       if (static_mainwindow)
                mainWin = static_mainwindow;
-       else if(data)
+       else if (data)
                mainWin = (MainWindow*)data;
        
-       if(mainWin) {
+       if (!prefs_common.use_networkmanager)
+               return;
+
+       if (mainWin) {
                GError *error;
                gboolean online;
 
@@ -2318,11 +2539,13 @@ static void networkmanager_state_change_cb(DBusGProxy *proxy, gchar *dev,
                                went_offline_nm = FALSE;
                                main_window_toggle_work_offline(mainWin, FALSE, FALSE);
                                debug_print("NetworkManager: Went online\n");
+                               log_message(LOG_PROTOCOL, _("NetworkManager: network is online.\n"));
                        }
                        else if(!online) {
                                went_offline_nm = TRUE;
                                main_window_toggle_work_offline(mainWin, TRUE, FALSE);
                                debug_print("NetworkManager: Went offline\n");
+                               log_message(LOG_PROTOCOL, _("NetworkManager: network is offline.\n"));
                        }
                }
                else {
@@ -2340,16 +2563,19 @@ static void networkmanager_state_change_cb(DBusGProxy *proxy, gchar *dev,
 gboolean networkmanager_is_online(GError **error)
 {
        DBusGConnection *connection;
-  DBusGProxy *proxy;
-       GError *tmp_error;
+       DBusGProxy *proxy;
+       GError *tmp_error = NULL;
        gboolean retVal;
        guint32 state;
 
+       if (!prefs_common.use_networkmanager)
+               return TRUE;
+
        tmp_error = NULL;
        proxy = NULL;
-  connection = dbus_g_bus_get(DBUS_BUS_SYSTEM, &tmp_error);
+       connection = dbus_g_bus_get(DBUS_BUS_SYSTEM, &tmp_error);
 
-  if(!connection) {
+       if(!connection) {
                /* If calling code doesn't do error checking, at least print some debug */
                if((error == NULL) || (*error == NULL))
                        debug_print("Failed to open connection to system bus: %s\n",
@@ -2359,12 +2585,12 @@ gboolean networkmanager_is_online(GError **error)
        }
 
        proxy = dbus_g_proxy_new_for_name(connection,
-                                                                                                                                               "org.freedesktop.NetworkManager",
-                                                                                                                                               "/org/freedesktop/NetworkManager",
-                                                                                                                                               "org.freedesktop.NetworkManager");
+                       "org.freedesktop.NetworkManager",
+                       "/org/freedesktop/NetworkManager",
+                       "org.freedesktop.NetworkManager");
 
-       retVal = dbus_g_proxy_call(proxy,"state",&tmp_error,G_TYPE_INVALID,
-                                                                                                                G_TYPE_UINT,&state,G_TYPE_INVALID);
+       retVal = dbus_g_proxy_call(proxy,"state",&tmp_error, G_TYPE_INVALID,
+                       G_TYPE_UINT, &state, G_TYPE_INVALID);
 
        if(proxy)
                g_object_unref(proxy);
@@ -2380,6 +2606,6 @@ gboolean networkmanager_is_online(GError **error)
                return TRUE;
        }
 
-       return (state == NM_STATE_CONNECTED);
+       return (state == NM_STATE_CONNECTED || state == NM_STATE_UNKNOWN);
 }
 #endif