more sanitizing of translatable strings

[claws.git] / src / main.c

diff --git a/src/main.c b/src/main.c
index 9ce01bac42c1de43eea67c80906f0d6add38e185..9368487f8945af91fb574cc801d80f841565a134 100644 (file)
--- a/src/main.c
+++ b/src/main.c
@@ -629,7 +629,7 @@ static void sc_session_manager_connect(MainWindow *mainwin)
                                256, error_string_ret);
 
                if (error_string_ret[0] || mainwin->smc_conn == NULL)
-                       g_warning ("While connecting to session manager:\n%s.",
+                       g_warning ("While connecting to session manager: %s.",
                                error_string_ret);
                else {
                        SmPropValue *vals;
@@ -934,14 +934,14 @@ static void install_dbus_status_handler(void)
                        "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"));
+               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"));
+               g_warning("Failed to register folder update hook");
                uninstall_dbus_status_handler();
                return;
        }
@@ -1133,13 +1133,16 @@ 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, _("Sylpheed-Claws 2.6.0 (or older)"));
+                       r = migrate_old_config(OLD_GTK2_RC_DIR, 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, _("Sylpheed-Claws 1.9.15 (or older)"));
+                       r = migrate_old_config(OLDER_GTK2_RC_DIR, 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, _("Sylpheed-Claws 1.0.5 (or older)"));
+                       r = migrate_old_config(OLD_GTK1_RC_DIR, 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");
@@ -2140,7 +2143,7 @@ gchar *claws_get_socket_name(void)
        gchar md5sum[33];
 
        if (filename == NULL) {
-               struct stat st;
+               GStatBuf st;
                gint stat_ok;
 
                socket_dir = g_strdup_printf("%s%cclaws-mail-%d",
@@ -2150,7 +2153,7 @@ gchar *claws_get_socket_name(void)
 #else
                                           0);
 #endif
-               stat_ok = stat(socket_dir, &st);
+               stat_ok = g_stat(socket_dir, &st);
                if (stat_ok < 0 && errno != ENOENT) {
                        g_print("Error stat'ing socket_dir %s: %s\n",
                                socket_dir, g_strerror(errno));
@@ -2444,7 +2447,7 @@ static GPtrArray *get_folder_item_list(gint sock)
                if (item) {
                        g_ptr_array_add(folders, item);
                } else {
-                       g_warning("no such folder: %s\n", buf);
+                       g_warning("no such folder: %s", buf);
                }
        }