fix #warnings in src/

removed wrong ones, fixed some, some remain

diff --git a/ChangeLog-gtk2.claws b/ChangeLog-gtk2.claws
index 4b08b6e7f6b5f81fa943d22368e4a35a64db7415..f13c84a9b3e3bd47ded300fc684b945d01da28a0 100644 (file)
--- a/ChangeLog-gtk2.claws
+++ b/ChangeLog-gtk2.claws
@@ -1,3 +1,39 @@
+2004-07-03 [colin]     0.9.11cvs17.6
+
+       Removed FIXME_GTK2 warnings
+       * src/codeconv.c
+               useless #warnings (rewrite needed)
+       * src/compose.c
+               useless #warnings (rewrite needed)
+               useless #warnings (gtk2 is like that)
+               useless #warnings (previously fixed)
+       * src/main.c
+               useless #warnings (previously fixed)
+       * src/message_search.c
+               useless #warnings (gtk2 is like that)
+               Made apparent that search is case-sensitive
+       * src/mimeview.c
+               useless #warnings (rewrite needed)
+               useless #warnings (gtk2 is like that)
+               reimplemented real warnings
+       * src/prefs_common.c
+               Removed block cursor option (not it gtk2)
+       * src/prefs_gtk.c
+               useless #warnings (rewrite needed)
+       * src/procheader.c
+               useless #warnings (rewrite needed)
+       * src/sourcewindow.c
+               useless #warnings (incorrect placing)
+       * src/summary_search.c
+               useless #warnings (gtk2 is like that)
+               Made apparent that search is case-sensitive
+       * src/action.c
+               useless #warnings (gtk2 is like that)
+       * src/textview.c
+               useless #warnings (rewrite needed)
+       * src/toolbar.c
+               useless #warnings (rewrite needed)
+
 2004-07-03 [colin]     0.9.11cvs17.5
 
        * src/textview.c

diff --git a/configure.ac b/configure.ac
index bedf52d2b64a8509a1ed3018a4997bc51bc56187..b9ab2c565703e3f390e8158a52869ad4179edf3a 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -11,7 +11,7 @@ MINOR_VERSION=9
 MICRO_VERSION=11
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=17.5
+EXTRA_VERSION=17.6
 EXTRA_RELEASE=
 
 if test \( $EXTRA_VERSION -eq 0 \) -o \( "x$EXTRA_RELEASE" != "x" \); then

diff --git a/src/action.c b/src/action.c
index 4b49648cdd944b38411d653081015011f6eb50b2..29667393bc9f19ba4a380df59d9cf47af7ba1c1b 100644 (file)
--- a/src/action.c
+++ b/src/action.c
@@ -1219,13 +1219,10 @@ static void create_io_dialog(Children *children)
        children->abort_btn    = abort_button;
        children->close_btn    = close_button;
 
-#warning FIXME_GTK2 convert to Pango / FontDesc?
-#if 0
        output_font = gtkut_font_load_from_fontset(prefs_common.textfont);
        gtk_object_set_data_full(GTK_OBJECT(dialog), "s_txtfont",
                                 output_font, 
                                 (GtkDestroyNotify)gdk_font_unref); 
-#endif
        gtk_widget_show(dialog);
 }
 

diff --git a/src/codeconv.c b/src/codeconv.c
index fc0702c65e3146cd2a61fc4896afc54612a8f5e3..36fbef862fd4b454d85746becef4610c6b5e059f 100644 (file)
--- a/src/codeconv.c
+++ b/src/codeconv.c
@@ -732,32 +732,26 @@ void conv_euctodisp(gchar *outbuf, gint outlen, const gchar *inbuf)
        conv_unreadable_eucjp(outbuf);
 }
 
-#warning FIXME_GTK2
-#if 0
-void conv_anytodisp(gchar *outbuf, gint outlen, const gchar *inbuf)
-{
-       conv_anytoeuc(outbuf, outlen, inbuf);
-       conv_unreadable_eucjp(outbuf);
-}
-#else
 void conv_anytodisp(gchar *outbuf, gint outlen, const gchar *inbuf)
 {
        conv_anytoutf8(outbuf, outlen, inbuf);
 }
-#endif
 
+#warning FIXME_GTK2
 void conv_ustodisp(gchar *outbuf, gint outlen, const gchar *inbuf)
 {
        strncpy2(outbuf, inbuf, outlen);
        conv_unreadable_8bit(outbuf);
 }
 
+#warning FIXME_GTK2
 void conv_latintodisp(gchar *outbuf, gint outlen, const gchar *inbuf)
 {
        strncpy2(outbuf, inbuf, outlen);
        conv_unreadable_latin(outbuf);
 }
 
+#warning FIXME_GTK2
 void conv_localetodisp(gchar *outbuf, gint outlen, const gchar *inbuf)
 {
        strncpy2(outbuf, inbuf, outlen);
@@ -774,7 +768,6 @@ CodeConverter *conv_code_converter_new(const gchar *charset)
        CodeConverter *conv;
 
        conv = g_new0(CodeConverter, 1);
-#warning FIXME_GTK2
        conv->code_conv_func = conv_get_code_conv_func(charset, CS_UTF_8);
        conv->charset_str = g_strdup(charset);
        conv->charset = conv_get_charset_from_str(charset);
@@ -797,7 +790,6 @@ gint conv_convert(CodeConverter *conv, gchar *outbuf, gint outlen,
        else {
                gchar *str;
 
-#warning FIXME_GTK2
                str = conv_iconv_strdup(inbuf, conv->charset_str, CS_UTF_8);
                if (!str)
                        return -1;

diff --git a/src/compose.c b/src/compose.c
index 210bb8e377f0e76c02897c5f1aa904d1e581a3b9..f7b5302f30988c0ba488ec684324523545e12ebf 100644 (file)
--- a/src/compose.c
+++ b/src/compose.c
@@ -48,8 +48,7 @@
 #include <gtk/gtklabel.h>
 #include <gtk/gtkscrolledwindow.h>
 #include <gtk/gtktreeview.h>
-#warning FIXME_GTK2
-/* #include <gtk/gtkthemes.h> */
+
 #include <gtk/gtkdnd.h>
 #include <stdio.h>
 #include <stdlib.h>
@@ -2125,8 +2124,6 @@ static ComposeInsertResult compose_insert_file(Compose *compose, const gchar *fi
        gtk_text_buffer_get_iter_at_mark(buffer, &iter, mark);
 
        while (fgets(buf, sizeof(buf), fp) != NULL) {
-#warning FIXME_GTK2
-#if 1 /* FIXME_GTK2 */
                const gchar *cur_encoding = conv_get_current_charset_str();
                gchar *str = conv_codeset_strdup(buf, cur_encoding, CS_UTF_8);
 
@@ -2143,7 +2140,6 @@ static ComposeInsertResult compose_insert_file(Compose *compose, const gchar *fi
                gtk_text_buffer_insert(buffer, &iter, str, -1);
 
                g_free (str);
-#endif /* FIXME_GTK2 */
        }
 
        fclose(fp);
@@ -2398,7 +2394,6 @@ static void compose_attach_parts(Compose *compose, MsgInfo *msginfo)
 
 #define SPACE_CHARS    " \t"
 
-#warning FIXME_GTK2
 static void compose_wrap_line(Compose *compose)
 {
        GtkTextView *text = GTK_TEXT_VIEW(compose->text);
@@ -2772,8 +2767,6 @@ static void compose_wrap_line_all_full(Compose *compose, gboolean autowrap)
 
                /* fix line length for tabs */
                if (ch_len == 1 && *cbuf == '\t') {
-#warning FIXME_GTK2
-                       /* guint tab_width = text->default_tab_width; */
                        guint tab_width = 8;
                        guint tab_offset = line_len % tab_width;
 
@@ -3663,16 +3656,7 @@ static gint compose_write_to_file(Compose *compose, const gchar *file,
                        encoding = ENC_BASE64;
 #endif
 
-#warning FIXME_GTK2
-#if 0 /* FIXME_GTK2 */
-               src_codeset = conv_get_current_charset_str();
-               /* if current encoding is US-ASCII, set it the same as
-                  outgoing one to prevent code conversion failure */
-               if (!strcasecmp(src_codeset, CS_US_ASCII))
-                       src_codeset = out_codeset;
-#else /* FIXME_GTK2 */
                src_codeset = CS_UTF_8;
-#endif /* FIXME_GTK2 */
 
                debug_print("src encoding = %s, out encoding = %s, transfer encoding = %s\n",
                            src_codeset, out_codeset, procmime_get_encoding_str(encoding));
@@ -3858,14 +3842,11 @@ static gint compose_write_body_to_file(Compose *compose, const gchar *file)
        gtk_text_buffer_get_end_iter(buffer, &end);
        tmp = gtk_text_buffer_get_text(buffer, &start, &end, FALSE);
 
-#warning FIXME_GTK2
-#if 1 /* FIXME_GTK2 */
        src_codeset = CS_UTF_8;
        dest_codeset = conv_get_current_charset_str();
        chars = conv_codeset_strdup(tmp, src_codeset, dest_codeset);
        g_free(tmp);
        if (!chars) return -1;
-#endif /* FIXME_GTK2 */
 
        /* write body */
        len = strlen(chars);
@@ -4281,12 +4262,7 @@ static gint compose_write_headers_from_headerlist(Compose *compose,
 
                if (!g_strcasecmp(trans_hdr, headerentryname)) {
                        const gchar *entstr = gtk_entry_get_text(GTK_ENTRY(headerentry->entry));
-#warning FIXME_GTK2
-#if 1
                        gchar *tmpstr = conv_codeset_strdup(entstr, CS_UTF_8, conv_get_current_charset_str());
-#else
-                       gchar *tmpstr = strdup(entstr);
-#endif
                        Xstrdup_a(str, tmpstr, return -1);
                        g_strstrip(str);
                        if (str[0] != '\0') {
@@ -4635,12 +4611,7 @@ static void compose_convert_header(gchar *dest, gint len, gchar *src,
 
        if (len < 1) return;
 
-#warning FIXME_GTK2
-#if 1
        tmpstr = conv_codeset_strdup(src, CS_UTF_8, conv_get_current_charset_str());
-#else
-       tmpstr = strdup(src);
-#endif
 
        subst_char(tmpstr, '\n', ' ');
        subst_char(tmpstr, '\r', ' ');
@@ -5197,36 +5168,13 @@ static Compose *compose_create(PrefsAccount *account, ComposeMode mode)
        gtk_text_view_set_editable(GTK_TEXT_VIEW(text), TRUE);
        clipboard = gtk_clipboard_get(GDK_SELECTION_PRIMARY);
        gtk_text_buffer_add_selection_clipboard(buffer, clipboard);
-#warning FIXME_GTK2
-       /* GTK_STEXT(text)->default_tab_width = 8; */
-
-#warning FIXME_GTK2
-#if 0
-       if (prefs_common.block_cursor) {
-               GTK_STEXT(text)->cursor_type = GTK_STEXT_CURSOR_BLOCK;
-       }
-#endif
        
-#warning FIXME_GTK2
-#if 0
-       if (prefs_common.smart_wrapping) {      
-               gtk_stext_set_word_wrap(GTK_STEXT(text), TRUE);
-               gtk_stext_set_wrap_rmargin(GTK_STEXT(text), prefs_common.linewrap_len);
-       }               
-#else
        if (prefs_common.smart_wrapping) {      
                gtk_text_view_set_wrap_mode(GTK_TEXT_VIEW(text), GTK_WRAP_WORD);
        }               
-#endif
 
        gtk_container_add(GTK_CONTAINER(scrolledwin), text);
 
-#warning FIXME_GTK2
-#if 0 /* FIXME_GTK2 */
-       g_signal_connect(G_OBJECT(text), "activate",
-                        G_CALLBACK(text_activated), compose);
-#endif /* FIXME_GTK2 */
-
        g_signal_connect_after(G_OBJECT(text), "size_allocate",
                               G_CALLBACK(compose_edit_size_alloc),
                               ruler);
@@ -5255,19 +5203,7 @@ static Compose *compose_create(PrefsAccount *account, ComposeMode mode)
 
        style = gtk_widget_get_style(text);
 
-       /* workaround for the slow down of GtkSText when using Pixmap theme */
-#warning FIXME_GTK2
-#if 0 /* FIXME_GTK2 */
-       if (style->engine) {
-               GtkThemeEngine *engine;
-
-               engine = style->engine;
-               style->engine = NULL;
-               new_style = gtk_style_copy(style);
-               style->engine = engine;
-       } else
-#endif /* FIXME_GTK2 */
-               new_style = gtk_style_copy(style);
+       new_style = gtk_style_copy(style);
 
        if (prefs_common.textfont) {
                PangoFontDescription *font_desc;

diff --git a/src/main.c b/src/main.c
index b67fa62a379f8a3cc16255f8433390a2182a5218..3cdb0ed56358728721ec1f3e77cd6fc31f03ca72 100644 (file)
--- a/src/main.c
+++ b/src/main.c
@@ -411,10 +411,6 @@ static void exit_sylpheed(MainWindow *mainwin)
        addressbook_export_to_file();
 
        filename = g_strconcat(get_rc_dir(), G_DIR_SEPARATOR_S, MENU_RC, NULL);
-#warning FIXME_GTK2 gtk_item_factory_dump_rc() not existing
-#if 0
-       gtk_item_factory_dump_rc(filename, NULL, TRUE);
-#endif
        gtk_accel_map_save(filename);
        g_free(filename);
 

diff --git a/src/message_search.c b/src/message_search.c
index e41488c886f9fe7dd781180b027a3a2f3ff5944e..b434fb10dc9355a4586fcac850934712546d141c 100644 (file)
--- a/src/message_search.c
+++ b/src/message_search.c
@@ -118,12 +118,12 @@ static void message_search_create(MessageView *messageview)
        gtk_box_pack_start (GTK_BOX (vbox1), checkbtn_hbox, TRUE, TRUE, 0);
        gtk_container_set_border_width (GTK_CONTAINER (checkbtn_hbox), 8);
 
-#warning FIXME_GTK2
-       case_checkbtn = gtk_check_button_new_with_label (_("Case sensitive (Broken)"));
+       case_checkbtn = gtk_check_button_new_with_label (_("Case sensitive"));
        gtk_widget_show (case_checkbtn);
        gtk_box_pack_start (GTK_BOX (checkbtn_hbox), case_checkbtn,
                            FALSE, FALSE, 0);
        gtk_widget_set_sensitive(case_checkbtn, FALSE);
+       gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(case_checkbtn), TRUE);
 
        backward_checkbtn =
                gtk_check_button_new_with_label (_("Backward search"));

diff --git a/src/mimeview.c b/src/mimeview.c
index c665fb7303e5a9d3f77a1045e9f05ef7175ac402..130b2a57c8ad2db0a53541e1e1ee54fb28747306 100644 (file)
--- a/src/mimeview.c
+++ b/src/mimeview.c
@@ -846,17 +846,9 @@ void mimeview_pass_key_press_event(MimeView *mimeview, GdkEventKey *event)
 #define BREAK_ON_MODIFIER_KEY() \
        if ((event->state & (GDK_MOD1_MASK|GDK_CONTROL_MASK)) != 0) break
 
-#warning FIXME_GTK2
-#if 0
 #define KEY_PRESS_EVENT_STOP() \
-       if (gtk_signal_n_emissions_by_name \
-               (GTK_OBJECT(ctree), "key_press_event") > 0) { \
-               gtk_signal_emit_stop_by_name(GTK_OBJECT(ctree), \
-                                            "key_press_event"); \
-       }
-#else
-#define KEY_PRESS_EVENT_STOP()
-#endif
+        g_signal_stop_emission_by_name(G_OBJECT(ctree), \
+                                       "key_press_event");
 
 static gint mimeview_key_pressed(GtkWidget *widget, GdkEventKey *event,
                                 MimeView *mimeview)
@@ -1360,16 +1352,11 @@ static void icon_selected (MimeView *mimeview, gint num, MimeInfo *partinfo)
                gtk_ctree_select(GTK_CTREE(mimeview->ctree), node);
 }              
 
-#warning FIXME_GTK2
-#if 0
 #undef  KEY_PRESS_EVENT_STOP
 #define KEY_PRESS_EVENT_STOP() \
-       if (gtk_signal_n_emissions_by_name \
-               (GTK_OBJECT(button), "key_press_event") > 0) { \
-               gtk_signal_emit_stop_by_name(GTK_OBJECT(button), \
-                                            "key_press_event"); \
-       }
-#endif
+        g_signal_stop_emission_by_name(G_OBJECT(button), \
+                                       "key_press_event");
+
 static gint icon_key_pressed(GtkWidget *button, GdkEventKey *event,
                             MimeView *mimeview)
 {
@@ -1686,14 +1673,7 @@ static void icon_scroll_size_allocate_cb(GtkWidget *widget,
        mainbox_size = &mimeview->icon_mainbox->allocation;
        vbox_size = &mimeview->icon_vbox->allocation;
        layout_size = &mimeview->icon_scroll->allocation;
-       
-#warning FIXME_GTK2 /* this code cause hang up. */
-#if 0
-       /* centralise the vbox */
-       gtk_layout_move(GTK_LAYOUT(mimeview->icon_scroll), mimeview->icon_vbox, 
-                       (mainbox_size->width - vbox_size->width)/2, 0);
-#endif
-       
+               
        gtk_layout_set_size(GTK_LAYOUT(mimeview->icon_scroll), 
                            GTK_LAYOUT(mimeview->icon_scroll)->width, 
                            MAX(vbox_size->height, layout_size->height));

diff --git a/src/prefs_common.c b/src/prefs_common.c
index 6fc08a1983df2186002c4c4e687a5628d890aac0..c9adf53b5260d25d92956ed4b0ef9aa50a17e571 100644 (file)
--- a/src/prefs_common.c
+++ b/src/prefs_common.c
@@ -112,7 +112,6 @@ static struct Compose {
        GtkWidget *checkbtn_forward_as_attachment;
        GtkWidget *checkbtn_redirect_keep_from;
        GtkWidget *checkbtn_smart_wrapping;
-       GtkWidget *checkbtn_block_cursor;
        GtkWidget *checkbtn_reply_with_quote;
        
        GtkWidget *checkbtn_autosave;
@@ -315,9 +314,6 @@ static PrefParam param[] = {
        {"undo_level", "50", &prefs_common.undolevels, P_INT,
         &compose.spinbtn_undolevel,
         prefs_set_data_from_spinbtn, prefs_set_spinbtn},
-       {"block_cursor", "FALSE", &prefs_common.block_cursor,
-        P_BOOL, &compose.checkbtn_block_cursor,
-        prefs_set_data_from_toggle, prefs_set_toggle},
 
        {"linewrap_length", "72", &prefs_common.linewrap_len, P_INT,
         &compose.spinbtn_linewrap,
@@ -1418,7 +1414,6 @@ static void prefs_compose_create(void)
        GtkWidget *checkbtn_forward_as_attachment;
        GtkWidget *checkbtn_redirect_keep_from;
        GtkWidget *checkbtn_smart_wrapping;
-       GtkWidget *checkbtn_block_cursor;
        GtkWidget *frame_msgwrap;
 
        GtkWidget *hbox_autosave;
@@ -1463,9 +1458,6 @@ static void prefs_compose_create(void)
        PACK_CHECK_BUTTON (hbox5, checkbtn_forward_as_attachment,
                           _("Forward as attachment"));
 
-       PACK_CHECK_BUTTON (hbox5, checkbtn_block_cursor,
-                         _("Block cursor"));
-
        PACK_CHECK_BUTTON (vbox2, checkbtn_redirect_keep_from,
                           _("Keep the original 'From' header when redirecting"));
 
@@ -1576,7 +1568,7 @@ static void prefs_compose_create(void)
        compose.checkbtn_smart_wrapping = 
                checkbtn_smart_wrapping;
        compose.checkbtn_block_cursor   =
-               checkbtn_block_cursor;
+               FALSE; /* gtk2 */
        compose.checkbtn_default_reply_list = checkbtn_default_reply_list;
 }
 

diff --git a/src/prefs_gtk.c b/src/prefs_gtk.c
index 8dc35f1732a4bdb2ccb04fb7b23543395abb8db2..c0f64f584d7bd4b447e6dd6521e37e72952b41eb 100644 (file)
--- a/src/prefs_gtk.c
+++ b/src/prefs_gtk.c
@@ -118,7 +118,6 @@ void prefs_config_parse_one_line(PrefParam *param, const gchar *buf)
                switch (param[i].type) {
                case P_STRING:
                {
-#warning FIXME_GTK2
                        gchar *tmp;
 
                        tmp = *value ?
@@ -127,7 +126,7 @@ void prefs_config_parse_one_line(PrefParam *param, const gchar *buf)
                                                    CS_UTF_8)
                                : g_strdup("");
                        if (!tmp) {
-                               g_warning("faild to convert character set.");
+                               g_warning("failed to convert character set.");
                                tmp = g_strdup(value);
                        }
                        g_free(*((gchar **)param[i].data));
@@ -271,7 +270,6 @@ gint prefs_write_param(PrefParam *param, FILE *fp)
                switch (param[i].type) {
                case P_STRING:
                {
-#warning FIXME_GTK2
                        gchar *tmp = NULL;
 
                        if (*((gchar **)param[i].data)) {
@@ -356,7 +354,6 @@ void prefs_set_default(PrefParam *param)
                if (!param[i].data) continue;
 
                switch (param[i].type) {
-#warning FIXME_GTK2
                case P_STRING:
                case P_PASSWORD:
                        g_free(*((gchar **)param[i].data));
@@ -559,7 +556,6 @@ void prefs_set_dialog_to_default(PrefParam *param)
                switch (tmpparam.type) {
                case P_STRING:
                case P_PASSWORD:
-#warning FIXME_GTK2
                        if (tmpparam.defval) {
                                if (!strncasecmp(tmpparam.defval, "ENV_", 4)) {
                                        str_data = g_strdup(g_getenv(param[i].defval + 4));

diff --git a/src/procheader.c b/src/procheader.c
index 89cd19c8be176bd386ad82445c25a7dfd54bfab8..99c7e40223a1c303738063e8e89fff2cc37a4be1 100644 (file)
--- a/src/procheader.c
+++ b/src/procheader.c
@@ -902,6 +902,8 @@ void procheader_date_get_localtime(gchar *dest, gint len, const time_t timer)
 {
        struct tm *lt;
        gchar *default_format = "%y/%m/%d(%a) %H:%M";
+       gchar *str;
+       const gchar *src_codeset, *dest_codeset;
 
        lt = localtime(&timer);
 
@@ -910,22 +912,14 @@ void procheader_date_get_localtime(gchar *dest, gint len, const time_t timer)
        else
                strftime(dest, len, default_format, lt);
 
-#warning FIXME_GTK2
-#if 1
-       {
-               gchar *str;
-               const gchar *src_codeset, *dest_codeset;
-
-               src_codeset = conv_get_current_charset_str();
-               dest_codeset = CS_UTF_8;
-               str = conv_codeset_strdup(dest, src_codeset, dest_codeset);
-               if (str) {
-                       g_snprintf(dest, len, "%s", str);
-                       strncpy2(dest, str, len);
-                       g_free(str);
-               }
+       src_codeset = conv_get_current_charset_str();
+       dest_codeset = CS_UTF_8;
+       str = conv_codeset_strdup(dest, src_codeset, dest_codeset);
+       if (str) {
+               g_snprintf(dest, len, "%s", str);
+               strncpy2(dest, str, len);
+               g_free(str);
        }
-#endif
 }
 
 /* Added by Mel Hadasht on 27 Aug 2001 */

diff --git a/src/sourcewindow.c b/src/sourcewindow.c
index cdf6b2b7e0631c0c786f349ad93c0cac6b66cde2..1b056e6e80848d9b3f5e77a9bc4def7185fbb1bc 100644 (file)
--- a/src/sourcewindow.c
+++ b/src/sourcewindow.c
@@ -151,7 +151,7 @@ void source_window_append(SourceWindow *sourcewin, const gchar *str)
 
        len = strlen(str) + 1;
        Xalloca(out, len, return);
-#warning FIXME_GTK2
+       
        conv_localetodisp(out, len, str);
 
        gtk_text_buffer_get_iter_at_offset(buffer, &iter, -1);

diff --git a/src/summary_search.c b/src/summary_search.c
index abbc1f017693229bdd6fd4169af3f56920c35237..4f4741b9840c1317fc46a1e68b90ff6643664860 100644 (file)
--- a/src/summary_search.c
+++ b/src/summary_search.c
@@ -181,6 +181,8 @@ static void summary_search_create(SummaryView *summaryview)
        gtk_container_set_border_width (GTK_CONTAINER (checkbtn_hbox), 8);
 
        case_checkbtn = gtk_check_button_new_with_label (_("Case sensitive"));
+       gtk_widget_set_sensitive(case_checkbtn, FALSE);
+       gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(case_checkbtn), TRUE);
        gtk_widget_show (case_checkbtn);
        gtk_box_pack_start (GTK_BOX (checkbtn_hbox), case_checkbtn,
                            FALSE, FALSE, 0);
@@ -236,7 +238,6 @@ static void summary_search_create(SummaryView *summaryview)
    } \
 }
 
-#warning FIXME_GTK2
 static void summary_search_execute(GtkButton *button, gpointer data)
 {
        SummaryView *summaryview = data;

diff --git a/src/textview.c b/src/textview.c
index dd2f4dba709558a1db508747fd9f1496ab0cb4da..a177f3cf2eeda4b60b17edd51f367f09ff7d0ef9 100644 (file)
--- a/src/textview.c
+++ b/src/textview.c
@@ -276,10 +276,7 @@ static void textview_create_tags(GtkTextView *text, TextView *textview)
 
 void textview_init(TextView *textview)
 {
-#warning FIXME_GTK2
-#if 0
        gtkut_widget_disable_theme_engine(textview->text);
-#endif
        textview_update_message_colors();
        textview_set_all_headers(textview, FALSE);
        textview_set_font(textview, NULL);
@@ -1433,15 +1430,9 @@ static void textview_show_header(TextView *textview, GPtrArray *headers)
                        (buffer, &iter, header->name, -1,
                         "header_title", "header", NULL);
                if (header->name[strlen(header->name) - 1] != ' ')
-#warning FIXME_GTK2
-#if 0
-                       gtk_stext_insert(text, textview->boldfont,
-                                       NULL, NULL, " ", 1);
-#else
-                       gtk_text_buffer_insert_with_tags_by_name
+               gtk_text_buffer_insert_with_tags_by_name
                                (buffer, &iter, " ", 1,
                                 "header_title", "header", NULL);
-#endif
 
                if (procheader_headername_equal(header->name, "Subject") ||
                    procheader_headername_equal(header->name, "From")    ||
@@ -1481,29 +1472,6 @@ gboolean textview_search_string(TextView *textview, const gchar *str,
                                gboolean case_sens)
 {
 #warning FIXME_GTK2 /* currently, these search functions ignores case_sens */
-#if 0
-       GtkSText *text = GTK_STEXT(textview->text);
-       gint pos;
-       gint len;
-
-       g_return_val_if_fail(str != NULL, FALSE);
-
-       len = get_mbs_len(str);
-       g_return_val_if_fail(len >= 0, FALSE);
-
-       pos = textview->cur_pos;
-       if (pos < textview->body_pos)
-               pos = textview->body_pos;
-
-       if ((pos = gtkut_stext_find(text, pos, str, case_sens)) != -1) {
-               gtk_editable_set_position(GTK_EDITABLE(text), pos + len);
-               gtk_editable_select_region(GTK_EDITABLE(text), pos, pos + len);
-               textview_set_position(textview, pos + len);
-               return TRUE;
-       }
-
-       return FALSE;
-#else
        GtkTextView *text = GTK_TEXT_VIEW(textview->text);
        GtkTextBuffer *buffer = gtk_text_view_get_buffer(text);
        GtkTextMark *mark;
@@ -1536,51 +1504,12 @@ gboolean textview_search_string(TextView *textview, const gchar *str,
        }
 
        return found;
-#endif
 }
 
 gboolean textview_search_string_backward(TextView *textview, const gchar *str,
                                         gboolean case_sens)
 {
 #warning FIXME_GTK2
-#if 0
-       GtkSText *text = GTK_STEXT(textview->text);
-       gint pos;
-       wchar_t *wcs;
-       gint len;
-       gint text_len;
-       gboolean found = FALSE;
-
-       g_return_val_if_fail(str != NULL, FALSE);
-
-       wcs = strdup_mbstowcs(str);
-       g_return_val_if_fail(wcs != NULL, FALSE);
-       len = wcslen(wcs);
-       pos = textview->cur_pos;
-       text_len = gtk_stext_get_length(text);
-       if (text_len - textview->body_pos < len) {
-               g_free(wcs);
-               return FALSE;
-       }
-       if (pos <= textview->body_pos || text_len - pos < len)
-               pos = text_len - len;
-
-       for (; pos >= textview->body_pos; pos--) {
-               if (gtk_stext_match_string(text, pos, wcs, len, case_sens)
-                   == TRUE) {
-                       gtk_editable_set_position(GTK_EDITABLE(text), pos);
-                       gtk_editable_select_region(GTK_EDITABLE(text),
-                                                  pos, pos + len);
-                       textview_set_position(textview, pos - 1);
-                       found = TRUE;
-                       break;
-               }
-               if (pos == textview->body_pos) break;
-       }
-
-       g_free(wcs);
-       return found;
-#else
        GtkTextView *text = GTK_TEXT_VIEW(textview->text);
        GtkTextBuffer *buffer = gtk_text_view_get_buffer(text);
        GtkTextMark *mark;
@@ -1613,7 +1542,6 @@ gboolean textview_search_string_backward(TextView *textview, const gchar *str,
        }
 
        return found;
-#endif
 }
 
 void textview_scroll_one_line(TextView *textview, gboolean up)
@@ -1704,9 +1632,6 @@ static void textview_smooth_scroll_do(TextView *textview,
                up = TRUE;
        }
 
-#warning FIXME_GTK2
-       /* gdk_key_repeat_disable(); */
-
        for (i = step; i <= change_value; i += step) {
                vadj->value = old_value + (up ? -i : i);
                g_signal_emit_by_name(G_OBJECT(vadj),
@@ -1715,9 +1640,6 @@ static void textview_smooth_scroll_do(TextView *textview,
 
        vadj->value = last_value;
        g_signal_emit_by_name(G_OBJECT(vadj), "value_changed", 0);
-
-#warning FIXME_GTK2
-       /* gdk_key_repeat_restore(); */
 }
 
 static void textview_smooth_scroll_one_line(TextView *textview, gboolean up)
@@ -1796,19 +1718,9 @@ static gboolean textview_smooth_scroll_page(TextView *textview, gboolean up)
        return TRUE;
 }
 
-#warning FIXME_GTK2
-#if 0
-#define KEY_PRESS_EVENT_STOP() \
-       if (gtk_signal_n_emissions_by_name \
-               (G_OBJECT(widget), "key_press_event") > 0) { \
-               g_signal_stop_emission_by_name(G_OBJECT(widget), \
-                                              "key_press_event"); \
-       }
-#else
 #define KEY_PRESS_EVENT_STOP() \
        g_signal_stop_emission_by_name(G_OBJECT(widget), \
                                       "key_press_event");
-#endif
 
 static gint textview_key_pressed(GtkWidget *widget, GdkEventKey *event,
                                 TextView *textview)

diff --git a/src/toolbar.c b/src/toolbar.c
index 8f7c7168b8cd8afa5aa60514078c7baca8fff60b..a264ae386f21329e98e9f3c3456162ed8486086a 100644 (file)
--- a/src/toolbar.c
+++ b/src/toolbar.c
@@ -536,7 +536,6 @@ void toolbar_save_config_file(ToolbarType source)
                for (cur = toolbar_config[source].item_list; cur != NULL; cur = cur->next) {
                        ToolbarItem *toolbar_item = (ToolbarItem*) cur->data;
                        
-#warning FIXME_GTK2
                        if (toolbar_item->index != A_SEPARATOR) {
                                fprintf(fp, "\t<%s %s=\"%s\" %s=\"",
                                        TOOLBAR_TAG_ITEM,