Fix a memory leak in libSM use.

[claws.git] / src / main.c

diff --git a/src/main.c b/src/main.c
index 5c15a62f20bb49e0baf866454a0313611f873e38..a35b94addbd042438bc4763df2074dd712e164a5 100644 (file)
--- a/src/main.c
+++ b/src/main.c
@@ -65,6 +65,9 @@
 #ifdef HAVE_VALGRIND
 #include <valgrind.h>
 #endif
+#ifdef HAVE_SVG
+#include <librsvg/rsvg.h>
+#endif
 
 #include "claws.h"
 #include "main.h"
@@ -158,7 +161,9 @@ static DBusGProxy *awn_proxy = NULL;
 #endif
 
 gchar *prog_version;
+#ifdef HAVE_LIBSM
 gchar *argv0;
+#endif
 
 #ifdef HAVE_STARTUP_NOTIFICATION
 static SnLauncheeContext *sn_context = NULL;
@@ -424,7 +429,8 @@ backup_mode:
                
                /* if g_rename failed, we'll try to copy */
                if (r != 0) {
-                       FILE_OP_ERROR(new_cfg_dir, "g_rename failed, trying copy\n");
+                       FILE_OP_ERROR(new_cfg_dir, "g_rename");
+                       debug_print("rename failed, trying copy\n");
                        goto backup_mode;
                }
        }
@@ -646,6 +652,7 @@ static void sc_session_manager_connect(MainWindow *mainwin)
                        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[0].value);
                        g_free(vals);
                }
        }
@@ -848,6 +855,12 @@ static void main_dump_features_list(gboolean show_debug_only)
        else
                g_print(" NetworkManager\n");
 #endif
+#if HAVE_SVG
+       if (show_debug_only)
+               debug_print(" librSVG " LIBRSVG_VERSION "\n");
+       else
+               g_print(" librSVG " LIBRSVG_VERSION "\n");
+#endif
 }
 
 #ifdef HAVE_DBUS_GLIB
@@ -996,7 +1009,9 @@ int main(int argc, char *argv[])
        }
 
        prog_version = PROG_VERSION;
+#ifdef HAVE_LIBSM
        argv0 = g_strdup(argv[0]);
+#endif
 
        parse_cmd_opt(argc, argv);
 
@@ -1066,6 +1081,10 @@ int main(int argc, char *argv[])
                        "gtk-auto-mnemonics",
                        TRUE,
                        "XProperty");
+       gtk_settings_set_long_property(gtk_settings_get_default(),
+                       "gtk-button-images",
+                       TRUE,
+                       "XProperty");
 #endif
 
 #ifdef HAVE_NETWORKMANAGER_SUPPORT
@@ -1126,7 +1145,7 @@ int main(int argc, char *argv[])
 #endif
        
        /* no config dir exists. See if we can migrate an old config. */
-       if (!is_dir_exist(RC_DIR)) {
+       if (!is_dir_exist(get_rc_dir())) {
                prefs_destroy_cache();
                gboolean r = FALSE;
                
@@ -1135,30 +1154,30 @@ int main(int argc, char *argv[])
                 * and migration succeeded, and FALSE otherwise.
                 */
                if (is_dir_exist(OLD_GTK2_RC_DIR)) {
-                       r = migrate_old_config(OLD_GTK2_RC_DIR, RC_DIR,
+                       r = migrate_old_config(OLD_GTK2_RC_DIR, get_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,
+                       r = migrate_old_config(OLDER_GTK2_RC_DIR, get_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,
+                       r = migrate_old_config(OLD_GTK1_RC_DIR, get_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");
+                       r = migrate_old_config(SYLPHEED_RC_DIR, get_rc_dir(), "Sylpheed");
                        asked_for_migration = TRUE;
                }
                
                /* If migration failed or the user didn't want to do it,
                 * we create a new one (and we'll hit wizard later). 
                 */
-               if (r == FALSE && !is_dir_exist(RC_DIR)) {
+               if (r == FALSE && !is_dir_exist(get_rc_dir())) {
 #ifdef G_OS_UNIX
-                       if (copy_dir(SYSCONFDIR "/skel/.claws-mail", RC_DIR) < 0) {
+                       if (copy_dir(SYSCONFDIR "/skel/.claws-mail", get_rc_dir()) < 0) {
 #endif
-                               if (!is_dir_exist(RC_DIR) && make_dir(RC_DIR) < 0) {
+                               if (!is_dir_exist(get_rc_dir()) && make_dir(get_rc_dir()) < 0) {
 #ifdef G_OS_WIN32
                                        win32_close_log();
 #endif
@@ -1870,7 +1889,7 @@ static void parse_cmd_opt(int argc, char *argv[])
                        cmd.send = TRUE;
                } else if (!strncmp(argv[i], "--version-full", 14) ||
                           !strncmp(argv[i], "-V", 2)) {
-                       g_print("Claws Mail version " VERSION "\n");
+                       g_print("Claws Mail version " VERSION_GIT_FULL "\n");
                        main_dump_features_list(FALSE);
                        exit(0);
                } else if (!strncmp(argv[i], "--version", 9) ||