New hooklist for rendering avatars and some utils

[claws.git] / src / main.c

diff --git a/src/main.c b/src/main.c
index 451eac97b3e9b59b4e805453b60f36845aa5628d..70f8da4b5bf460824314abfacf4b9bb36a9832e6 100644 (file)
--- a/src/main.c
+++ b/src/main.c
@@ -49,6 +49,7 @@
 #include <sys/file.h>
 #endif
 
+#include "file_checker.h"
 #include "wizard.h"
 #ifdef HAVE_STARTUP_NOTIFICATION
 # define SN_API_NOT_YET_FROZEN
@@ -125,6 +126,7 @@
 #include "menu.h"
 #include "quicksearch.h"
 #include "advsearch.h"
+#include "avatars.h"
 
 #ifdef HAVE_LIBETPAN
 #include "imap-thread.h"
@@ -790,21 +792,21 @@ static void main_dump_features_list(gboolean show_debug_only)
 #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)
@@ -814,15 +816,15 @@ static void main_dump_features_list(gboolean 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)
@@ -832,9 +834,9 @@ static void main_dump_features_list(gboolean 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)
@@ -1277,6 +1279,9 @@ int main(int argc, char *argv[])
 
        mainwin = main_window_create();
 
+       if (!check_file_integrity())
+               exit(1);
+
 #ifdef HAVE_NETWORKMANAGER_SUPPORT
        networkmanager_state_change_cb(nm_proxy,NULL,mainwin);
 #endif
@@ -1399,6 +1404,7 @@ int main(int argc, char *argv[])
 
        claws_register_idle_function(claws_gtk_idle);
 
+       avatars_init();
        prefs_toolbar_init();
 
        num_folder_class = g_list_length(folder_get_list());
@@ -1651,6 +1657,7 @@ static void exit_claws(MainWindow *mainwin)
 
        matcher_done();
        prefs_toolbar_done();
+       avatars_done();
 
 #ifndef USE_NEW_ADDRBOOK
        addressbook_destroy();
@@ -2190,10 +2197,10 @@ static gint prohibit_duplicate_launch(void)
                x_display = g_strdup(g_getenv("DISPLAY"));
 
        if (uxsock < 0) {
+               gint ret;
 #if HAVE_FLOCK
                gchar *socket_lock;
                gint lock_fd;
-               gint ret;
                /* If connect failed, no other process is running.
                 * Unlink the potentially existing socket, then
                 * open it. This has to be done locking a temporary