Remove test_strftime() that was mistakenly included in previous commits.

[claws.git] / src / main.c

diff --git a/src/main.c b/src/main.c
index c7d3eac98428809c13eaf1c6b59ac581dbe87f2b..26c7e18c1e5ad6fb93b80e3eabb10fb95f0d79b2 100644 (file)
--- a/src/main.c
+++ b/src/main.c
@@ -126,6 +126,7 @@
 #include "menu.h"
 #include "quicksearch.h"
 #include "advsearch.h"
+#include "avatars.h"
 
 #ifdef HAVE_LIBETPAN
 #include "imap-thread.h"
@@ -642,6 +643,8 @@ static void sc_session_manager_connect(MainWindow *mainwin)
                        vals[0].length = strlen(g_get_user_name()?g_get_user_name():"");
                        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);
                }
        }
 }
@@ -954,7 +957,7 @@ static void reset_statistics(void)
        session_stats.forwarded = 0;
        session_stats.time_started = time(NULL);
 }
-               
+
 int main(int argc, char *argv[])
 {
 #ifdef HAVE_DBUS_GLIB
@@ -1403,6 +1406,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());
@@ -1655,6 +1659,7 @@ static void exit_claws(MainWindow *mainwin)
 
        matcher_done();
        prefs_toolbar_done();
+       avatars_done();
 
 #ifndef USE_NEW_ADDRBOOK
        addressbook_destroy();
@@ -2129,11 +2134,13 @@ gboolean claws_is_starting(void)
 gchar *claws_get_socket_name(void)
 {
        static gchar *filename = NULL;
-       const gchar *socket_dir = NULL;
+       gchar *socket_dir = NULL;
        gchar md5sum[33];
 
        if (filename == NULL) {
                struct stat st;
+               gint stat_ok;
+
                socket_dir = g_strdup_printf("%s%cclaws-mail-%d",
                                           g_get_tmp_dir(), G_DIR_SEPARATOR,
 #if HAVE_GETUID
@@ -2141,10 +2148,11 @@ gchar *claws_get_socket_name(void)
 #else
                                           0);
 #endif
-               if (stat(socket_dir, &st) < 0 && errno != ENOENT) {
+               stat_ok = stat(socket_dir, &st);
+               if (stat_ok < 0 && errno != ENOENT) {
                        g_print("Error stat'ing socket_dir %s: %s\n",
                                socket_dir, strerror(errno));
-               } else if (S_ISSOCK(st.st_mode)) {
+               } 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);
                        filename = g_strdup(socket_dir);
@@ -2160,6 +2168,7 @@ gchar *claws_get_socket_name(void)
 
                filename = g_strdup_printf("%s%c%s", socket_dir, G_DIR_SEPARATOR,
                                           md5sum);
+               g_free(socket_dir);
                debug_print("Using control socket %s\n", filename);
        }