Remove line breaks from g_warning()

diff --git a/src/maildir.c b/src/maildir.c
index 37b51a752a77d39db93a23a01db325d2b4ab8312..84e25ac805b94a9b564f53e995b71ca37a09aae0 100644 (file)
--- a/src/maildir.c
+++ b/src/maildir.c
@@ -144,8 +144,8 @@ FolderClass *maildir_get_class()
 static Folder *maildir_folder_new(const gchar * name,
                                  const gchar * path)
 {
-        MaildirFolder *folder;                   
-        
+        MaildirFolder *folder;
+
         folder = g_new0(MaildirFolder, 1);
         FOLDER(folder)->klass = &maildir_class;
         folder_local_folder_init(FOLDER(folder), name, path);
@@ -165,21 +165,21 @@ static gint open_database(MaildirFolderItem *item)
        gchar *path, *database;
 
        g_return_val_if_fail(item->db == NULL, -1);
-       
+
        path = maildir_item_get_path(FOLDER_ITEM(item)->folder, FOLDER_ITEM(item));
        Xstrcat_a(database, path, G_DIR_SEPARATOR_S DB_FILENAME, return -1);
        g_free(path);
 
        item->db = uiddb_open(database);
        g_return_val_if_fail(item->db != NULL, -1);
-       
+
        return 0;
 }
 
 static void close_database(MaildirFolderItem *item)
 {
         g_return_if_fail(item->db != NULL);
-       
+
        uiddb_close(item->db);
        item->db = NULL;
 }
@@ -191,7 +191,7 @@ static FolderItem *maildir_item_new(Folder *folder)
         item = g_new0(MaildirFolderItem, 1);
         item->lastuid = 0;
        item->db = NULL;
-        
+
         return (FolderItem *) item;
 
 }
@@ -201,7 +201,7 @@ static void maildir_item_destroy(Folder *folder, FolderItem *_item)
         MaildirFolderItem *item = (MaildirFolderItem *)_item;
 
         g_return_if_fail(item != NULL);
-       
+
         g_free(item);
 }
 
@@ -331,7 +331,7 @@ static gint maildir_scan_tree(Folder *folder)
        GNode *rootnode, *inboxnode;
         glob_t globbuf;
        gchar *rootpath, *globpat;
-        
+
         g_return_val_if_fail(folder != NULL, -1);
 
        if (!folder->node) {
@@ -384,10 +384,10 @@ static gchar *get_filename_for_msgdata(MessageData *msgdata)
        gchar *filename;
 
        if (msgdata->info[0])
-               filename = g_strconcat(msgdata->dir, G_DIR_SEPARATOR_S, 
+               filename = g_strconcat(msgdata->dir, G_DIR_SEPARATOR_S,
                                       msgdata->uniq, ":", msgdata->info, NULL);
        else
-               filename = g_strconcat(msgdata->dir, G_DIR_SEPARATOR_S, 
+               filename = g_strconcat(msgdata->dir, G_DIR_SEPARATOR_S,
                                       msgdata->uniq, NULL);
 
        return filename;
@@ -494,7 +494,7 @@ static MessageData *get_msgdata_for_uid(MaildirFolderItem *item, guint32 uid)
        msgname = get_filename_for_msgdata(msgdata);
        filename = g_strconcat(path, G_DIR_SEPARATOR_S, msgname, NULL);
        g_free(msgname);
-       
+
        if (is_file_exist(filename)) {
                g_free(path);
                return msgdata;
@@ -515,7 +515,7 @@ static MessageData *get_msgdata_for_uid(MaildirFolderItem *item, guint32 uid)
                g_free(filename);
 
                g_free(path);
-       
+
                filename = NULL;
                if (globbuf.gl_pathc > 0)
                        filename = g_strdup(globbuf.gl_pathv[0]);
@@ -527,7 +527,7 @@ static MessageData *get_msgdata_for_uid(MaildirFolderItem *item, guint32 uid)
        /* if found: update database and return new entry */
        if (filename != NULL) {
                debug_print("found %s\n", filename);
-               
+
                msgdata = get_msgdata_for_filename(filename);
                msgdata->uid = uid;
 
@@ -546,7 +546,7 @@ static gchar *get_filepath_for_msgdata(MaildirFolderItem *item, MessageData *msg
        filename = g_strconcat(path, G_DIR_SEPARATOR_S, msgname, NULL);
        g_free(msgname);
        g_free(path);
-       
+
        return filename;
 }
 
@@ -571,7 +571,7 @@ static gint maildir_uid_compare(gconstpointer a, gconstpointer b)
 {
        guint gint_a = GPOINTER_TO_INT(a);
        guint gint_b = GPOINTER_TO_INT(b);
-       
+
        return (gint_a - gint_b);
 }
 
@@ -601,7 +601,7 @@ static gint maildir_get_num_list(Folder *folder, FolderItem *item,
        g_free(path);
 
        tail = g_slist_last(*list);
-       
+
        for (i = 0; i < globbuf.gl_pathc; i++) {
                guint32 uid;
 
@@ -698,11 +698,11 @@ static gchar *maildir_fetch_msg(Folder * folder, FolderItem * item,
                                gint num)
 {
        gchar *filename;
-       
+
         g_return_val_if_fail(open_database(MAILDIR_FOLDERITEM(item)) == 0, NULL);
        filename = get_filepath_for_uid((MaildirFolderItem *) item, num);
        close_database(MAILDIR_FOLDERITEM(item));
-       
+
        return filename;
 }
 
@@ -780,7 +780,7 @@ static gint add_file_to_maildir(MaildirFolderItem *item, const gchar *file, MsgF
        uiddb_insert_entry(item->db, msgdata);
 
        uid = msgdata->uid;
-       
+
  exit:
        uiddb_free_msgdata(msgdata);
        g_free(tmpname);
@@ -822,7 +822,7 @@ static gint maildir_copy_msg(Folder *folder, FolderItem *dest, MsgInfo *msginfo)
                        g_free(srcfile);
                        g_free(tmpfile);
                        return -1;
-               }               
+               }
                g_free(srcfile);
                srcfile = tmpfile;
                delsrc = TRUE;
@@ -848,19 +848,19 @@ static gint maildir_remove_msg(Folder *folder, FolderItem *_item, gint num)
        g_return_val_if_fail(num > 0, -1);
 
         g_return_val_if_fail(open_database(MAILDIR_FOLDERITEM(item)) == 0, -1);
-       
+
        filename = get_filepath_for_uid(item, num);
        if (filename == NULL) {
                ret = -1;
                goto close;
        }
 
-       ret = unlink(filename); 
+       ret = unlink(filename);
        if (ret == 0)
                uiddb_delete_entry(item->db, num);
 
        g_free(filename);
-       
+
  close:
        close_database(MAILDIR_FOLDERITEM(item));
        return ret;
@@ -878,7 +878,7 @@ static void maildir_change_flags(Folder *folder, FolderItem *_item, MsgInfo *msg
        msgdata = get_msgdata_for_uid(item, msginfo->msgnum);
        if (msgdata == NULL)
                goto fail;
-       
+
        oldname = get_filepath_for_msgdata(item, msgdata);
 
        newinfo = get_infostr(newflags);
@@ -913,9 +913,9 @@ static void maildir_change_flags(Folder *folder, FolderItem *_item, MsgInfo *msg
 
        g_free(oldname);
        uiddb_free_msgdata(msgdata);
-       
+
        close_database(MAILDIR_FOLDERITEM(item));
-       
+
        if (renamefile) {
                MainWindow *mainwin = mainwindow_get_mainwindow();
                SummaryView *summaryview = mainwin->summaryview;
@@ -926,13 +926,13 @@ static void maildir_change_flags(Folder *folder, FolderItem *_item, MsgInfo *msg
                if (displayed_msgnum == msginfo->msgnum
                && summaryview->folder_item == msginfo->folder)
                        messageview_show(
-                               summaryview->messageview, 
+                               summaryview->messageview,
                                msginfo,
                                summaryview->messageview->all_headers);
        }
-       
+
        return;
-       
+
  fail:
        close_database(MAILDIR_FOLDERITEM(item));
 }
@@ -978,7 +978,7 @@ static gboolean setup_new_folder(const gchar * path, gboolean subfolder)
                rmdir(curpath);
                rmdir(path);
        }
-           
+
        g_free(tmppath);
        g_free(newpath);
        g_free(curpath);
@@ -1055,8 +1055,7 @@ static gint maildir_create_tree(Folder *folder)
        debug_print("creating new maildir tree: %s\n", real_rootpath);
        if (!is_dir_exist(real_rootpath)) {
                if (is_file_exist(real_rootpath)) {
-                       g_warning("File `%s' already exists.\n"
-                                   "Can't create folder.", real_rootpath);
+                       g_warning("can't create folder: file '%s' already exists", real_rootpath);
                        return -1;
                }
                if (make_dir_hier(real_rootpath) < 0)
@@ -1153,7 +1152,7 @@ static gboolean remove_folder_func(GNode *node, gpointer data)
        path = folder_item_get_path(item);
        debug_print("removing directory %s\n", path);
        if (remove_dir_recursive(path) < 0) {
-               g_warning("can't remove directory `%s'\n", path);
+               g_warning("can't remove directory '%s'", path);
                g_free(path);
                *(gint*)data = -1;
                return TRUE;
@@ -1323,7 +1322,7 @@ static gint maildir_get_flags (Folder *folder,  FolderItem *item,
                if (get_flags_for_msgdata(msgdata, &flags) < 0)
                        break;
 
-               flags = flags | (msginfo->flags.perm_flags & 
+               flags = flags | (msginfo->flags.perm_flags &
                        ~(MSG_MARKED | MSG_FORWARDED | MSG_REPLIED | MSG_UNREAD | ((flags & MSG_UNREAD) == 0 ? MSG_NEW : 0)));
                g_hash_table_insert(msgflags, msginfo, GINT_TO_POINTER(flags));
 
@@ -1372,7 +1371,7 @@ static gchar *filename_from_utf8(const gchar *path)
        gchar *real_path = g_filename_from_utf8(path, -1, NULL, NULL, NULL);
 
        if (!real_path) {
-               g_warning("filename_from_utf8: failed to convert character set\n");
+               g_warning("filename_from_utf8: failed to convert character set");
                real_path = g_strdup(path);
        }
 
@@ -1383,7 +1382,7 @@ static gchar *filename_to_utf8(const gchar *path)
 {
        gchar *utf8path = g_filename_to_utf8(path, -1, NULL, NULL, NULL);
        if (!utf8path) {
-               g_warning("filename_to_utf8: failed to convert character set\n");
+               g_warning("filename_to_utf8: failed to convert character set");
                utf8path = g_strdup(path);
        }