changes and bugfixes submitted by Andre Eibel

diff --git a/ChangeLog.claws b/ChangeLog.claws
index e37c6e669907196b93c9172bf221c6541fae2b06..1b6c679fa6c8f79f3725c2eacf93dab4f61aec50 100644 (file)
--- a/ChangeLog.claws
+++ b/ChangeLog.claws
@@ -1,3 +1,8 @@
+2001-06-30 [alfons]
+
+       * lots of files changed; first attempt to merge the changes
+         and bugfixes submitted by Andre Eibel (ae@baltic-online.de).
+
 2001-06-30 [paul]
 
        * po/pt_BR.po

diff --git a/src/addr_compl.c b/src/addr_compl.c
index 2a71384b8c84bba90094acc5ce0dbe19947310e5..f89ac9fb9eb8f9731bb6e931d02c8afa4f129d35 100644 (file)
--- a/src/addr_compl.c
+++ b/src/addr_compl.c
@@ -47,7 +47,7 @@
 #include "main.h"
 
 #define LOG_MESSAGE \
-       debug_mode == 0 ? (debug_mode == debug_mode) : (void)debug_print 
+       debug_mode == 0 ? (debug_mode == debug_mode) : debug_print 
 
 /* How it works:
  *
@@ -438,7 +438,7 @@ gchar *get_prev_complete_address(void)
 
 guint get_completion_count(void)
 {
-       if (is_completion_pending)
+       if (is_completion_pending())
                return g_completion_count;
        else
                return 0;

diff --git a/src/addressbook.c b/src/addressbook.c
index 38c2e5203429da082356930c3c74d4bd8003ab49..6c7785669928030e037391b3420f1aa5411e4e55 100644 (file)
--- a/src/addressbook.c
+++ b/src/addressbook.c
@@ -324,7 +324,7 @@ static void addressbook_create(gboolean show)
        window = gtk_window_new(GTK_WINDOW_TOPLEVEL);
        gtk_window_set_title(GTK_WINDOW(window), _("Address book"));
        gtk_widget_set_usize(window, ADDRESSBOOK_WIDTH, ADDRESSBOOK_HEIGHT);
-       //gtk_container_set_border_width(GTK_CONTAINER(window), BORDER_WIDTH);
+       /* gtk_container_set_border_width(GTK_CONTAINER(window), BORDER_WIDTH); */
        gtk_window_set_policy(GTK_WINDOW(window), TRUE, TRUE, TRUE);
        gtk_widget_realize(window);
 
@@ -839,7 +839,7 @@ static void addressbook_entry_changed(GtkWidget *widget)
        gint len;
        gint row;
 
-       //if (clist->selection && clist->selection->next) return;
+       /* if (clist->selection && clist->selection->next) return; */
 
        str = gtk_entry_get_text(entry);
        if (*str == '\0') {

diff --git a/src/alertpanel.c b/src/alertpanel.c
index 21c69c891aefa17ef96253eedd5e5c6173049801..9fa164771c30a0136c74b1f404e17a68bb0da95e 100644 (file)
--- a/src/alertpanel.c
+++ b/src/alertpanel.c
@@ -206,8 +206,8 @@ static void alertpanel_create(const gchar *title,
                           hbox, TRUE, TRUE, 16);
 
        /* title label */
-       //pixmapwid = create_pixmapwid(dialog, GNUstep_xpm);
-       //gtk_box_pack_start(GTK_BOX(hbox), pixmapwid, FALSE, FALSE, 16);
+       /* pixmapwid = create_pixmapwid(dialog, GNUstep_xpm); */
+       /* gtk_box_pack_start(GTK_BOX(hbox), pixmapwid, FALSE, FALSE, 16); */
        label = gtk_label_new(title);
        gtk_box_pack_start(GTK_BOX(hbox), label, FALSE, FALSE, 16);
        style = gtk_style_copy(gtk_widget_get_style(label));

diff --git a/src/codeconv.c b/src/codeconv.c
index d6f665ef061ff2d10d2441ddebd3907cc3e08a22..530bbc77f3e1047ab3028b9017fc73f658ea6730 100644 (file)
--- a/src/codeconv.c
+++ b/src/codeconv.c
@@ -774,7 +774,7 @@ void conv_encode_header(gchar *dest, gint len, const gchar *src,
        gchar *mimehdr_enctype = "?B?";
        const gchar *mimehdr_charset;
 
-       //g_print("src = %s\n", src);
+       /* g_print("src = %s\n", src); */
        mimehdr_charset = conv_get_outgoing_charset_str();
 
        /* convert to wide-character string */
@@ -784,7 +784,7 @@ void conv_encode_header(gchar *dest, gint len, const gchar *src,
                strlen(mimehdr_charset) + strlen(mimehdr_enctype);
        mimehdr_begin_len = strlen(mimehdr_init) +
                strlen(mimehdr_charset) + strlen(mimehdr_enctype);
-       //line_len = 1;
+       /* line_len = 1; */
        line_len = header_len;
        destp = dest;
        *dest = '\0';
@@ -847,8 +847,8 @@ void conv_encode_header(gchar *dest, gint len, const gchar *src,
                                }
                                /* g_free(raw); */
                                src_codeset = conv_get_current_charset_str();
-                               //printf ("tmp = %s, tlen = %d, mbl\n",
-                               //      tmp, tlen, mbl);
+                               /* printf ("tmp = %s, tlen = %d, mbl\n", 
+                                       tmp, tlen, mbl); */
                                if (jconv_alloc_conv(tmp, tlen + mbl,
                                                     &raw_new, &raw_new_len,
                                                     &src_codeset, 1,
@@ -907,8 +907,10 @@ void conv_encode_header(gchar *dest, gint len, const gchar *src,
 
                                wtmpp++;
                        }
-                       //g_print("tmp = %s, tlen = %d, mb_seqlen = %d\n",
-                       //      tmp, tlen, mb_seqlen);
+                       /*
+                         g_print("tmp = %s, tlen = %d, mb_seqlen = %d\n",
+                               tmp, tlen, mb_seqlen);
+                       */                              
 
                        if (tlen == 0 || raw_len == 0) {
                                g_free(tmp);
@@ -944,7 +946,7 @@ void conv_encode_header(gchar *dest, gint len, const gchar *src,
 
                        g_free(tmp);
                        g_free(raw);
-                       //g_print("line_len = %d\n\n", line_len);
+                       /* g_print("line_len = %d\n\n", line_len); */
                } while (*wtmpp != (wchar_t)0);
 
                while (iswspace(*wsrcp)) {
@@ -963,7 +965,7 @@ void conv_encode_header(gchar *dest, gint len, const gchar *src,
 
        g_free(wsrc);
 
-       //g_print("dest = %s\n", dest);
+       /g_print("dest = %s\n", dest);
 }
 #else /* !HAVE_LIBJCONV */
 
@@ -981,7 +983,7 @@ void conv_encode_header(gchar *dest, gint len, const gchar *src,
        gchar *mimehdr_enctype = "?B?";
        const gchar *mimehdr_charset;
 
-       //g_print("src = %s\n", src);
+       /* g_print("src = %s\n", src); */
        mimehdr_charset = conv_get_outgoing_charset_str();
        if (strcmp(mimehdr_charset, "ISO-2022-JP") != 0) {
                /* currently only supports Japanese */
@@ -996,7 +998,7 @@ void conv_encode_header(gchar *dest, gint len, const gchar *src,
                      strlen(mimehdr_charset) + strlen(mimehdr_enctype);
        mimehdr_begin_len = strlen(mimehdr_init) +
                            strlen(mimehdr_charset) + strlen(mimehdr_enctype);
-       //line_len = 1;
+       /* line_len = 1; */
        line_len = header_len;
        destp = dest;
        *dest = '\0';
@@ -1097,8 +1099,9 @@ void conv_encode_header(gchar *dest, gint len, const gchar *src,
 
                                wtmpp++;
                        }
-                       //g_print("tmp = %s, tlen = %d, mb_seqlen = %d\n",
-                       //      tmp, tlen, mb_seqlen);
+                       /* g_print("tmp = %s, tlen = %d, mb_seqlen = %d\n",
+                               tmp, tlen, mb_seqlen);
+                       */                              
 
                        if (tlen == 0) {
                                g_free(tmp);
@@ -1139,7 +1142,7 @@ void conv_encode_header(gchar *dest, gint len, const gchar *src,
                        }
 
                        g_free(tmp);
-                       //g_print("line_len = %d\n\n", line_len);
+                       /* g_print("line_len = %d\n\n", line_len); */
                } while (*wtmpp != (wchar_t)0);
 
                while (iswspace(*wsrcp)) {
@@ -1158,6 +1161,6 @@ void conv_encode_header(gchar *dest, gint len, const gchar *src,
 
        g_free(wsrc);
 
-       //g_print("dest = %s\n", dest);
+       /* g_print("dest = %s\n", dest); */
 }
 #endif /* HAVE_LIBJCONV */

diff --git a/src/esmtp.c b/src/esmtp.c
index b77b2f9270cbaf003d2145984008384727e2fd26..529bef2f1b182678ea366f0372ffd5a08383b3b2 100644 (file)
--- a/src/esmtp.c
+++ b/src/esmtp.c
@@ -67,7 +67,7 @@ gint esmtp_auth(SockInfo *sock, SMTPAuthType authtype,
        guchar hexdigest[33];
        gchar *challenge, *response, *response64;
        gint challengelen;
-       //const gchar delimiters[]=" ";
+       /* const gchar delimiters[]=" "; */
        gchar *token;
 
        switch (authtype) {

diff --git a/src/folder.c b/src/folder.c
index ab98e1f3f62fff59cf48e266c94ecca052a05e3f..161e67af63b9df162ea4879656c38f004f97e15c 100644 (file)
--- a/src/folder.c
+++ b/src/folder.c
@@ -238,6 +238,7 @@ void folder_destroy(Folder *folder)
                news_folder_destroy(NEWS_FOLDER(folder));
                break;
        default:
+               break;
        }
 
        folder_tree_destroy(folder);
@@ -977,6 +978,7 @@ static void folder_init(Folder *folder, FolderType type, const gchar *name)
 
                break;
        default:
+               break;
        }
 
        switch (type) {
@@ -990,6 +992,7 @@ static void folder_init(Folder *folder, FolderType type, const gchar *name)
                REMOTE_FOLDER(folder)->session = NULL;
                break;
        default:
+               break;
        }
 }
 
@@ -1102,6 +1105,7 @@ static gboolean folder_build_tree(GNode *node, gpointer data)
        case F_QUEUE:  folder->queue  = item; break;
        case F_TRASH:  folder->trash  = item; break;
        default:
+               break;
        }
 
        prefs_folder_item_read_config(item);

diff --git a/src/foldersel.c b/src/foldersel.c
index 8a4045993459f7428e5f4096da0fd7c239fac740..09fda2ac136ab02da3a75392a313337b7d1e1212 100644 (file)
--- a/src/foldersel.c
+++ b/src/foldersel.c
@@ -163,10 +163,12 @@ static void foldersel_create(void)
        gtk_ctree_set_indent(GTK_CTREE(ctree), CTREE_INDENT);
        GTK_WIDGET_UNSET_FLAGS(GTK_CLIST(ctree)->column[0].button,
                               GTK_CAN_FOCUS);
-       //gtk_signal_connect(GTK_OBJECT(ctree), "tree_select_row",
-       //                 GTK_SIGNAL_FUNC(foldersel_selected), NULL);
+       /*                             
+       gtk_signal_connect(GTK_OBJECT(ctree), "tree_select_row",
+                          GTK_SIGNAL_FUNC(foldersel_selected), NULL);
        gtk_signal_connect(GTK_OBJECT(ctree), "select_row",
                           GTK_SIGNAL_FUNC(foldersel_selected), NULL);
+       */
 
        entry = gtk_entry_new();
        gtk_box_pack_start(GTK_BOX(vbox), entry, FALSE, FALSE, 0);

diff --git a/src/folderview.c b/src/folderview.c
index 2bd3c55bffa3ea38de1dc55f7868034830f33b1b..70cc6cae43b96fedb1073a88e58659d06bce6130 100644 (file)
--- a/src/folderview.c
+++ b/src/folderview.c
@@ -833,10 +833,12 @@ static void folderview_update_node(FolderView *folderview, GtkCTreeNode *node)
                                name = " (News)"; break;
                        default:
                                name = "";
+                               break;
                        }
                        name = g_strconcat(item->name, name, NULL);
                } else
                        name = g_strdup(item->name);
+               break;                  
        }
 
        if (!GTK_CTREE_ROW(node)->expanded &&
@@ -1299,6 +1301,7 @@ static void folderview_key_pressed(GtkWidget *widget, GdkEventKey *event,
                BREAK_ON_MODIFIER_KEY();
                summary_pass_key_press_event(folderview->summaryview, event);
        default:
+               break;
        }
 }
 
@@ -1396,6 +1399,7 @@ static void folderview_col_resized(GtkCList *clist, gint column, gint width,
                prefs_common.folder_col_total = width;
                break;
        default:
+               break;
        }
 }
 
@@ -2048,6 +2052,7 @@ static gboolean folderview_drag_motion_cb(GtkWidget      *widget,
                                    acceptable = TRUE;
                                break;
                        default:
+                               break;
                        }
                }
        }

diff --git a/src/gtkstext.c b/src/gtkstext.c
index e4ca82ff111faaa3f761314c0733189548b6e194..0129105ce22c586532a33778bfb64dfe83487082 100644 (file)
--- a/src/gtkstext.c
+++ b/src/gtkstext.c
@@ -2249,7 +2249,7 @@ gtk_stext_key_press (GtkWidget   *widget,
                break;
        case GDK_Down:      
                move_cursor_to_display_row_down(text);
-//             move_cursor_ver (text, +1); 
+/*             move_cursor_ver (text, +1);  */
                break;
        case GDK_Left:
          if (event->state & GDK_CONTROL_MASK)

diff --git a/src/headerwindow.c b/src/headerwindow.c
index 009d71f2bb04e0e63dc9d01e489b6aba852fa6e2..a854caae70a0405b1d6e3107e92a26666c7efbf4 100644 (file)
--- a/src/headerwindow.c
+++ b/src/headerwindow.c
@@ -88,8 +88,10 @@ HeaderWindow *header_window_create(void)
 
 void header_window_init(HeaderWindow *headerwin)
 {
-       //if (!normalfont)
-       //      normalfont = gdk_fontset_load(NORMAL_FONT);
+       /*
+       if (!normalfont)
+               normalfont = gdk_fontset_load(NORMAL_FONT);
+       */      
        if (!boldfont)
                boldfont = gdk_fontset_load(BOLD_FONT);
 }

diff --git a/src/inc.c b/src/inc.c
index 00a1809035e96be732a3289154349db58817a387..1e0b9c966014c787cbf8685e9dbe4d631d61c745 100644 (file)
--- a/src/inc.c
+++ b/src/inc.c
@@ -574,7 +574,9 @@ static IncState inc_pop3_session_do(IncSession *session)
        recv_set_ui_func(NULL, NULL);
 
 #if USE_THREADS
-       //pthread_join(sockinfo->connect_thr, NULL);
+/*
+       pthread_join(sockinfo->connect_thr, NULL);
+*/     
 #endif
        automaton_destroy(atm);
 
@@ -669,7 +671,7 @@ static gint connection_check_cb(Automaton *atm)
        IncProgressDialog *inc_dialog = state->session->data;
        SockInfo *sockinfo = state->sockinfo;
 
-       //g_print("connection check\n");
+       /* g_print("connection check\n"); */
 
        if (sockinfo->state == CONN_LOOKUPFAILED ||
            sockinfo->state == CONN_FAILED) {
@@ -778,6 +780,7 @@ void inc_progress_update(Pop3State *state, Pop3Phase phase)
                progress_dialog_set_label(dialog, _("Quitting"));
                break;
        default:
+               break;
        }
 }
 
@@ -852,6 +855,7 @@ static void inc_put_error(IncState istate)
                alertpanel_error(_("No disk space left."));
                break;
        default:
+               break;
        }
 }
 
@@ -865,7 +869,7 @@ static void inc_cancel(GtkWidget *widget, gpointer data)
        if (sockinfo->state == CONN_READY ||
            sockinfo->state == CONN_LOOKUPSUCCESS) {
                pthread_cancel(sockinfo->connect_thr);
-               //pthread_kill(sockinfo->connect_thr, SIGINT);
+               /* pthread_kill(sockinfo->connect_thr, SIGINT); */
                g_print("connection was cancelled.\n");
        }
 #endif

diff --git a/src/logwindow.c b/src/logwindow.c
index a4bccdc378a535c4b57849c82b6bc453e30ba9e4..3226267d1f6531eefb06faa652b85074a10e7478 100644 (file)
--- a/src/logwindow.c
+++ b/src/logwindow.c
@@ -128,7 +128,7 @@ void log_window_append(const gchar *str, LogType type)
 
        text = GTK_TEXT(logwindow->text);
 
-       //gtk_text_freeze(text);
+       /*gtk_text_freeze(text);*/
 
        switch (type) {
        case LOG_WARN:
@@ -148,7 +148,7 @@ void log_window_append(const gchar *str, LogType type)
        if (head) gtk_text_insert(text, NULL, color, NULL, head, -1);
        gtk_text_insert(text, NULL, color, NULL, str, -1);
 
-       //gtk_text_thaw(text);
+       /*gtk_text_thaw(text);*/
 }
 
 static void key_pressed(GtkWidget *widget, GdkEventKey *event,

diff --git a/src/mainwindow.c b/src/mainwindow.c
index f97d281f116e619d7037fc2385197f9dbc813283..6ce2ca04c06028800470f391ae7cb42d80dfc89b 100644 (file)
--- a/src/mainwindow.c
+++ b/src/mainwindow.c
@@ -1268,6 +1268,7 @@ void main_window_popup(MainWindow *mainwin)
                gdk_window_raise(widget->window);
                break;
        default:
+               break;
        }
 }
 

diff --git a/src/messageview.c b/src/messageview.c
index f0db201abf6b6b201de23f98fd8ecc37f873375d..5d6d03d3f19e372668fbd9fb06d173d80468ab68 100644 (file)
--- a/src/messageview.c
+++ b/src/messageview.c
@@ -146,7 +146,7 @@ void messageview_init(MessageView *messageview)
        textview_init(messageview->textview);
        imageview_init(messageview->imageview);
        mimeview_init(messageview->mimeview);
-       //messageview_set_font(messageview);
+       /*messageview_set_font(messageview);*/
 }
 
 static void notification_convert_header(gchar *dest, gint len, gchar *src,

diff --git a/src/mimeview.c b/src/mimeview.c
index edb9781c127acac798dd1634d4f229c8aa68986a..c807a93dd60027f5ae0c4c2258006e4c39fa792f 100644 (file)
--- a/src/mimeview.c
+++ b/src/mimeview.c
@@ -72,7 +72,7 @@ static void mimeview_show_message_part                (MimeView       *mimeview,
 static void mimeview_show_image_part           (MimeView       *mimeview,
                                                 MimeInfo       *partinfo);
 static void mimeview_change_view_type          (MimeView       *mimeview,
-                                                ContentType     type);
+                                                MimeViewType    type);
 static void mimeview_clear                     (MimeView       *mimeview);
 
 static void mimeview_selected          (GtkCTree       *ctree,
@@ -637,6 +637,7 @@ static void mimeview_key_pressed(GtkWidget *widget, GdkEventKey *event,
                mimeview_launch(mimeview);
                return;
        default:
+               break;
        }
 
        if (!mimeview->messageview->mainwin) return;

diff --git a/src/pop.c b/src/pop.c
index 50614833a6d38655fc942330aa495fc18931a794..79493bf7734feaa564b0979a098f4892b495f822 100644 (file)
--- a/src/pop.c
+++ b/src/pop.c
@@ -366,7 +366,7 @@ gint pop3_delete_send(SockInfo *sock, gpointer data)
 {
        Pop3State *state = (Pop3State *)data;
 
-       //inc_progress_update(state, POP3_DELETE_SEND);
+       /*inc_progress_update(state, POP3_DELETE_SEND);*/
 
        pop3_gen_send(sock, "DELE %d", state->cur_msg);
 

diff --git a/src/prefs.c b/src/prefs.c
index 21da865afd33c07d1e561bc7a3c65c18e331a840..4705806387465b09bb0cf1c5465029840cb2795e 100644 (file)
--- a/src/prefs.c
+++ b/src/prefs.c
@@ -130,6 +130,7 @@ void prefs_config_parse_one_line(PrefParam *param, const gchar *buf)
                                (gushort)atoi(value);
                        break;
                default:
+                       break;
                }
        }
 }
@@ -416,6 +417,7 @@ void prefs_set_default(PrefParam *param)
                                *((gushort *)param[i].data) = 0;
                        break;
                default:
+                       break;
                }
        }
 }
@@ -434,6 +436,7 @@ void prefs_free(PrefParam *param)
                        g_free(*((gchar **)param[i].data));
                        break;
                default:
+                       break;
                }
        }
 }
@@ -577,6 +580,7 @@ void prefs_set_dialog_to_default(PrefParam *param)
                        tmpparam.data = &enum_data;
                        break;
                case P_OTHER:
+                       break;
                }
                tmpparam.widget_set_func(&tmpparam);
                g_free(str_data);

diff --git a/src/prefs_account.c b/src/prefs_account.c
index 4fcd6099e025002611048c3a3c7481776739fa00..4a15509ce1ae72c2d4c4549078874285a7b580f6 100644 (file)
--- a/src/prefs_account.c
+++ b/src/prefs_account.c
@@ -1409,6 +1409,7 @@ static void prefs_account_protocol_set_optmenu(PrefParam *pparam)
                break;
                */
        default:
+               break;
        }
 
        menu = gtk_option_menu_get_menu(optmenu);

diff --git a/src/prefs_common.c b/src/prefs_common.c
index 3ff31a1e048e3a66950517f87bbf2bb4a71f2cee..3bd246953e4a01bb8f5b26ba0879636c5eb68826 100644 (file)
--- a/src/prefs_common.c
+++ b/src/prefs_common.c
@@ -2197,7 +2197,7 @@ static void prefs_quote_colors_dialog_create(void)
        GtkWidget *uri_label;
        GtkWidget *hbbox;
        GtkWidget *ok_btn;
-       //GtkWidget *cancel_btn;
+       /*GtkWidget *cancel_btn;*/
        GtkWidget *recycle_colors_btn;
        GtkWidget *frame_colors;
 

diff --git a/src/procheader.c b/src/procheader.c
index b4f26d547adaf953a66380f4a7783e68a2f2c873..e40fc1108a01fa7259f45423708954a22489f79c 100644 (file)
--- a/src/procheader.c
+++ b/src/procheader.c
@@ -639,6 +639,7 @@ MsgInfo *procheader_file_parse(FILE * fp, MsgFlags flags,
                        msginfo->fromspace = g_strdup(hp);
                        break;
                default:
+                       break;
                }
        }
        msginfo->inreplyto = reference;

diff --git a/src/procmime.c b/src/procmime.c
index d4036bfb8b5bf749d2195197a118de5885ba5012..3ae9567a61f894bbc53d10cca55064eee9572552 100644 (file)
--- a/src/procmime.c
+++ b/src/procmime.c
@@ -268,7 +268,7 @@ void procmime_scan_multipart_message(MimeInfo *mimeinfo, FILE *fp)
 
                if (eom) break;
        }
-       //g_message ("** at " __PRETTY_FUNCTION__ ":%d:", __LINE__);
+       /*g_message ("** at " __PRETTY_FUNCTION__ ":%d:", __LINE__);*/
 }
 
 void procmime_scan_encoding(MimeInfo *mimeinfo, const gchar *encoding)

diff --git a/src/session.c b/src/session.c
index 170529a67893b50c19bc9813735afb1c0d302b74..316e45650360e39982add2d757f39b7c5e561fe9 100644 (file)
--- a/src/session.c
+++ b/src/session.c
@@ -35,6 +35,7 @@ void session_destroy(Session *session)
                news_session_destroy(NNTP_SESSION(session));
                break;
        default:
+               break;
        }
 
        g_free(session->server);

diff --git a/src/sigstatus.c b/src/sigstatus.c
index 4770a3902f9918567a03446c077d6475e9b46f2c..b2b48715eac1e2b15f2a6ff3431c31061b1fdc27 100644 (file)
--- a/src/sigstatus.c
+++ b/src/sigstatus.c
@@ -234,6 +234,7 @@ const char *gpgmegtk_sig_status_to_string(GpgmeSigStat status)
                 result = _("Error verifying the signature");
                 break;
        default:
+               break;
         }
 
         return result;

diff --git a/src/summary_search.c b/src/summary_search.c
index d17c597026deb5037a81b66ade0b7befce505475..b5f46b47b41cfea1872834e9aa442930609c9dc7 100644 (file)
--- a/src/summary_search.c
+++ b/src/summary_search.c
@@ -98,7 +98,7 @@ static void summary_search_create(SummaryView *summaryview)
        window = gtk_window_new (GTK_WINDOW_DIALOG);
        gtk_window_set_title (GTK_WINDOW (window), _("Search"));
        gtk_widget_set_usize (window, 450, -1);
-       //gtk_window_set_position(GTK_WINDOW(window), GTK_WIN_POS_CENTER);
+       /*gtk_window_set_position(GTK_WINDOW(window), GTK_WIN_POS_CENTER);*/
        gtk_window_set_policy(GTK_WINDOW(window), FALSE, TRUE, TRUE);
        gtk_container_set_border_width (GTK_CONTAINER (window), 8);
        gtk_signal_connect(GTK_OBJECT(window), "delete_event",

diff --git a/src/summaryview.c b/src/summaryview.c
index 501246ea8b19a7a651abfbba913a1e33498dba7c..62d714cca3a6fcf24825f69a107d7706f508c456 100644 (file)
--- a/src/summaryview.c
+++ b/src/summaryview.c
@@ -586,7 +586,7 @@ GtkCTreeNode * summary_find_next_important_score(SummaryView *summaryview,
        GtkCTreeNode *best_node = NULL;
 
        if (current_node)
-               //node = current_node;
+               /*node = current_node;*/
                node = GTK_CTREE_NODE_NEXT(current_node);
        else
                node = GTK_CTREE_NODE(GTK_CLIST(ctree)->row_list);
@@ -617,7 +617,7 @@ GtkCTreeNode * summary_find_prev_important_score(SummaryView *summaryview,
        GtkCTreeNode *best_node = NULL;
 
        if (current_node)
-               //node = current_node;
+               /*node = current_node;*/
                node = GTK_CTREE_NODE_PREV(current_node);
        else
                node = GTK_CTREE_NODE(GTK_CLIST(ctree)->row_list);
@@ -1101,7 +1101,7 @@ static GtkCTreeNode *summary_find_next_unread_msg(SummaryView *summaryview,
 
        if (current_node)
                node = current_node;
-               //node = GTK_CTREE_NODE_NEXT(current_node);
+               /*node = GTK_CTREE_NODE_NEXT(current_node);*/
        else
                node = GTK_CTREE_NODE(GTK_CLIST(ctree)->row_list);
 
@@ -1180,7 +1180,7 @@ static GtkCTreeNode *summary_find_prev_unread_msg(SummaryView *summaryview,
 
        if (current_node)
                node = current_node;
-               //node = GTK_CTREE_NODE_PREV(current_node);
+               /*node = GTK_CTREE_NODE_PREV(current_node);*/
        else
                node = GTK_CTREE_NODE(GTK_CLIST(ctree)->row_list_end);
 
@@ -1484,7 +1484,7 @@ void summary_sort(SummaryView *summaryview, SummarySortType type)
        gtk_ctree_sort_node(ctree, NULL);
 
        gtk_ctree_node_moveto(ctree, summaryview->selected, -1, 0.5, 0);
-       //gtkut_ctree_set_focus_row(ctree, summaryview->selected);
+       /*gtkut_ctree_set_focus_row(ctree, summaryview->selected);*/
 
        prefs_folder_item_set_config(summaryview->folder_item,
                                     summaryview->sort_type,
@@ -3063,6 +3063,7 @@ static void summary_key_pressed(GtkWidget *widget, GdkEventKey *event,
                gtk_widget_grab_focus(summaryview->folderview->ctree);
                return;
        default:
+               break;
        }
 
        if (!summaryview->selected) {
@@ -3169,6 +3170,7 @@ static void summary_key_pressed(GtkWidget *widget, GdkEventKey *event,
                summary_save_as(summaryview);
                break;
        default:
+               break;
        }
 }
 
@@ -3225,6 +3227,7 @@ static void summary_selected(GtkCTree *ctree, GtkCTreeNode *row,
                }
                break;
        default:
+               break;
        }
 
        if (summaryview->display_msg)
@@ -3265,6 +3268,7 @@ static void summary_col_resized(GtkCList *clist, gint column, gint width,
                prefs_common.summary_col_subject = width;
                break;
        default:
+               break;
        }
 }
 

diff --git a/src/utils.c b/src/utils.c
index 972113e8bb7c182417f87165149a0d94a0ca1220..b9c66d144712d636dad245eeaffda14ac28de1cd 100644 (file)
--- a/src/utils.c
+++ b/src/utils.c
@@ -499,11 +499,12 @@ gint subject_compare(const gchar *s1, const gchar *s2)
        if (!*str1 || !*str2) return -1;
 
        retval = strcmp(str1, str2);
-       //if (retval == 0)
-       //      g_print("\ns1 = %s\ns2 = %s\n"
-       //              "str1 = %s\nstr2 = %s\nmatched.\n",
-       //              s1, s2, str1, str2);
-
+       /*
+       if (retval == 0)
+               g_print("\ns1 = %s\ns2 = %s\n"
+                       "str1 = %s\nstr2 = %s\nmatched.\n",
+                       s1, s2, str1, str2);
+       */
        return retval;
 }
 
@@ -1429,7 +1430,7 @@ gint remove_dir_recursive(const gchar *dir)
        struct dirent *d;
        gchar *prev_dir;
 
-       //g_print("dir = %s\n", dir);
+       /*g_print("dir = %s\n", dir);*/
 
        if (stat(dir, &s) < 0) {
                FILE_OP_ERROR(dir, "stat");
@@ -1447,7 +1448,7 @@ gint remove_dir_recursive(const gchar *dir)
        }
 
        prev_dir = g_get_current_dir();
-       //g_print("prev_dir = %s\n", prev_dir);
+       /*g_print("prev_dir = %s\n", prev_dir);*/
 
        if (!path_cmp(prev_dir, dir)) {
                g_free(prev_dir);
@@ -1482,7 +1483,7 @@ gint remove_dir_recursive(const gchar *dir)
                        continue;
                }
 
-               //g_print("removing %s\n", d->d_name);
+               /*g_print("removing %s\n", d->d_name);*/
 
                if (S_ISDIR(s.st_mode)) {
                        if (remove_dir_recursive(d->d_name) < 0) {