2011-11-11 [pawel] 3.7.10cvs83
[claws.git] / src / summaryview.c
index 0f98e62384103d6f3a1ebee7203ff40d2b3c5ffe..3a9ef503b74fc1009bd51d83859400348501ce01 100644 (file)
@@ -1,6 +1,6 @@
 /*
  * Sylpheed -- a GTK+ based, lightweight, and fast e-mail client
- * Copyright (C) 1999-2009 Hiroyuki Yamamoto and the Claws Mail team
+ * Copyright (C) 1999-2011 Hiroyuki Yamamoto and the Claws Mail team
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -512,7 +512,6 @@ SummaryView *summary_create(MainWindow *mainwin)
        GtkWidget *toggle_arrow;
        GtkWidget *toggle_search;
        QuickSearch *quicksearch;
-       CLAWS_TIP_DECL();
 
        debug_print("Creating summary view...\n");
        summaryview = g_new0(SummaryView, 1);
@@ -539,6 +538,7 @@ SummaryView *summary_create(MainWindow *mainwin)
        toggle_search = gtk_toggle_button_new();
        gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(toggle_search),
                                     prefs_common.show_searchbar);
+       gtkut_widget_set_can_focus(toggle_search, FALSE);
        gtk_widget_show(toggle_search);
 
        CLAWS_SET_TIP(toggle_search, _("Toggle quick search bar"));
@@ -790,8 +790,10 @@ void summary_relayout(SummaryView *summaryview)
        g_object_ref(summaryview->hbox_l);
        g_object_ref(summaryview->statlabel_msgs);
        
-       gtkut_container_remove(GTK_CONTAINER(summaryview->hbox_l->parent), summaryview->hbox_l);
-       gtkut_container_remove(GTK_CONTAINER(summaryview->statlabel_msgs->parent), summaryview->statlabel_msgs);
+       gtkut_container_remove(GTK_CONTAINER(
+               gtk_widget_get_parent(summaryview->hbox_l)), summaryview->hbox_l);
+       gtkut_container_remove(GTK_CONTAINER(
+               gtk_widget_get_parent(summaryview->statlabel_msgs)), summaryview->statlabel_msgs);
 
        switch (prefs_common.layout_mode) {
        case NORMAL_LAYOUT:
@@ -875,7 +877,7 @@ static void summary_set_fonts(SummaryView *summaryview)
        if (prefs_common.derive_from_normal_font || !SMALL_FONT) {
                font_desc = pango_font_description_new();
                size = pango_font_description_get_size
-                       (summaryview->ctree->style->font_desc);
+                       (gtk_widget_get_style(summaryview->ctree)->font_desc);
                pango_font_description_set_size(font_desc, size * PANGO_SCALE_SMALL);
        } else {
                font_desc = pango_font_description_from_string(SMALL_FONT);
@@ -1642,7 +1644,7 @@ void summary_set_menu_sensitive(SummaryView *summaryview)
 
                {"Menus/SummaryViewPopup/Move"                  , M_TARGET_EXIST|M_ALLOW_DELETE|M_NOT_NEWS},
                {"Menus/SummaryViewPopup/Copy"                  , M_TARGET_EXIST|M_EXEC},
-               {"Menus/SummaryViewPopup/Trash"         , M_TARGET_EXIST|M_ALLOW_DELETE|M_NOT_NEWS},
+               {"Menus/SummaryViewPopup/Trash"         , M_TARGET_EXIST|M_ALLOW_DELETE|M_NOT_NEWS|M_NOT_TRASH},
 #ifndef GENERIC_UMPC
                {"Menus/SummaryViewPopup/Delete"                        , M_TARGET_EXIST|M_ALLOW_DELETE},
 #endif
@@ -2056,6 +2058,30 @@ void summary_select_by_msgnum(SummaryView *summaryview, guint msgnum)
        summary_select_node(summaryview, node, FALSE, TRUE);
 }
 
+void summary_select_by_msg_list(SummaryView    *summaryview, GSList *msginfos)
+{
+       GtkCMCTree *ctree;
+       GSList *msgnum_list, *walk;
+       gboolean froze = FALSE;
+
+       ctree = GTK_CMCTREE(summaryview->ctree);
+
+       msgnum_list = NULL;
+       for(walk = msginfos; walk; walk = walk->next) {
+               MsgInfo *msginfo;
+               msginfo = walk->data;
+               msgnum_list = g_slist_prepend(msgnum_list, GUINT_TO_POINTER(msginfo->msgnum));
+       }
+       START_LONG_OPERATION(summaryview, FALSE);
+       for(walk = msgnum_list; walk; walk = walk->next) {
+               GtkCMCTreeNode *node;
+               node = summary_find_msg_by_msgnum(summaryview, GPOINTER_TO_UINT(walk->data));
+               gtk_cmctree_select(ctree, node);
+       }
+       END_LONG_OPERATION(summaryview);
+       g_slist_free(msgnum_list);
+}
+
 typedef struct _PostponedSelectData
 {
        GtkCMCTree *ctree;
@@ -2423,9 +2449,7 @@ static void summary_status_show(SummaryView *summaryview)
        goffset sel_size = 0, n_size = 0;
        MsgInfo *msginfo;
        gchar *name;
-#if GTK_CHECK_VERSION(2, 12, 0)
        gchar *tooltip;
-#endif
        
        if (!summaryview->folder_item) {
                gtk_label_set_text(GTK_LABEL(summaryview->statlabel_folder), "");
@@ -2517,10 +2541,7 @@ static void summary_status_show(SummaryView *summaryview)
 
        if (n_selected) {
                sel = g_strdup_printf(" (%s)", to_human_readable((goffset)sel_size));
-               if (n_selected == 1)
-                       itstr = g_strdup(_(" item selected"));
-               else
-                       itstr = g_strdup(_(" items selected"));
+               itstr = g_strdup_printf(ngettext(" item selected"," items selected", n_selected));
        } else {
                sel = g_strdup("");
                itstr = g_strdup("");
@@ -2545,7 +2566,6 @@ static void summary_status_show(SummaryView *summaryview)
 
                gtk_label_set_text(GTK_LABEL(summaryview->statlabel_msgs), str);
                g_free(str);
-#if GTK_CHECK_VERSION(2, 12, 0)
                tooltip = g_strdup_printf(_("<b>Message summary</b>\n"
                                            "<b>New:</b> %d\n"
                                            "<b>Unread:</b> %d\n"
@@ -2565,7 +2585,6 @@ static void summary_status_show(SummaryView *summaryview)
                gtk_widget_set_tooltip_markup(GTK_WIDGET(summaryview->statlabel_msgs),
                                            tooltip); 
                g_free(tooltip);
-#endif
        } else {
                gchar *ssize, *tsize;
                if (n_selected) {
@@ -2704,7 +2723,7 @@ static void summary_set_column_titles(SummaryView *summaryview)
 void summary_reflect_tags_changes(SummaryView *summaryview)
 {
        GtkMenuShell *menu;
-       GList *cur;
+       GList *children, *cur;
        GtkCMCTreeNode *node;
        GtkCMCTree *ctree = GTK_CMCTREE(summaryview->ctree);
        gboolean froze = FALSE;
@@ -2715,9 +2734,11 @@ void summary_reflect_tags_changes(SummaryView *summaryview)
        cm_return_if_fail(menu != NULL);
 
        /* clear items. get item pointers. */
-       for (cur = menu->children; cur != NULL && cur->data != NULL; cur = cur->next) {
+       children = gtk_container_get_children(GTK_CONTAINER(menu));
+       for (cur = children; cur != NULL && cur->data != NULL; cur = cur->next) {
                gtk_menu_item_set_submenu(GTK_MENU_ITEM(cur->data), NULL);
        }
+       g_list_free(children);
        summary_tags_menu_create(summaryview, TRUE);
 
        START_LONG_OPERATION(summaryview, TRUE);
@@ -2910,7 +2931,7 @@ static gboolean summary_insert_gnode_func(GtkCMCTree *ctree, guint depth, GNode
 
        summary_set_header(summaryview, text, msginfo);
 
-       gtk_sctree_set_node_info(ctree, cnode, text[col_pos[S_COL_SUBJECT]], 2,
+       gtk_cmctree_set_node_info(ctree, cnode, text[col_pos[S_COL_SUBJECT]], 2,
                                NULL, NULL, FALSE, summaryview->threaded && !summaryview->thread_collapsed);
 #define SET_TEXT(col) {                                                \
        gtk_cmctree_node_set_text(ctree, cnode, col_pos[col],   \
@@ -3111,13 +3132,9 @@ static inline void summary_set_header(SummaryView *summaryview, gchar *text[],
        gchar *from_text = NULL, *to_text = NULL, *tags_text = NULL;
        gboolean should_swap = FALSE;
        gboolean vert = (prefs_common.layout_mode == VERTICAL_LAYOUT);
-#if GTK_CHECK_VERSION(2,12,0)
        static const gchar *color_dim_rgb = NULL;
        if (!color_dim_rgb)
                color_dim_rgb = gdk_color_to_string(&summaryview->color_dim);
-#else
-       static const gchar *color_dim_rgb = "#888888";
-#endif
        text[col_pos[S_COL_FROM]]   = "";
        text[col_pos[S_COL_TO]]     = "";
        text[col_pos[S_COL_SUBJECT]]= "";
@@ -3186,9 +3203,16 @@ static inline void summary_set_header(SummaryView *summaryview, gchar *text[],
        }
 
        if (!prefs_common.use_addr_book) {
-               from_text = msginfo->fromname ? 
-                               msginfo->fromname :
-                               _("(No From)");
+               if (prefs_common.summary_from_show == SHOW_NAME)
+                       from_text = msginfo->fromname;
+               else if (prefs_common.summary_from_show == SHOW_BOTH)
+                       from_text = msginfo->from;
+               else {
+                       from_text = msginfo->from;
+                       extract_address(from_text);
+               }
+               if (!from_text)
+                       _("(No From)");         
        } else {
                gchar *tmp = summary_complete_address(msginfo->from);
                if (tmp) {
@@ -3196,9 +3220,16 @@ static inline void summary_set_header(SummaryView *summaryview, gchar *text[],
                        g_free(tmp);
                        from_text = buf;
                } else {
-                       from_text = (msginfo->fromname) ?
-                                       msginfo->fromname: 
-                                       _("(No From)");
+                       if (prefs_common.summary_from_show == SHOW_NAME)
+                               from_text = msginfo->fromname;
+                       else if (prefs_common.summary_from_show == SHOW_BOTH)
+                               from_text = msginfo->from;
+                       else {
+                               from_text = msginfo->from;
+                               extract_address(from_text);
+                       }
+                       if (!from_text)
+                               _("(No From)");         
                }
        }
        
@@ -3395,7 +3426,8 @@ static void summary_display_msg_full(SummaryView *summaryview,
        gint val;
        START_TIMING("");
        if (!new_window) {
-               if (summaryview->displayed == row)
+               if (summaryview->displayed == row &&
+                   messageview_is_visible(summaryview->messageview))
                        return;
                else if (summaryview->messageview)
                        summaryview->messageview->filtered = FALSE;
@@ -3434,7 +3466,7 @@ static void summary_display_msg_full(SummaryView *summaryview,
                        summaryview->last_displayed = summaryview->displayed;
                        summaryview->displayed = row;
                        val = messageview_show(msgview, msginfo, all_headers);
-                       if (GTK_CMCLIST(msgview->mimeview->ctree)->row_list == NULL)
+                       if (mimeview_tree_is_empty(msgview->mimeview))
                                gtk_widget_grab_focus(summaryview->ctree);
                        gtkut_ctree_node_move_if_on_the_edge(ctree, row,
                                GTK_CMCLIST(summaryview->ctree)->focus_row);
@@ -3442,12 +3474,13 @@ static void summary_display_msg_full(SummaryView *summaryview,
                        msgview = summaryview->messageview;
                        summaryview->last_displayed = summaryview->displayed;
                        summaryview->displayed = row;
-                       if (!messageview_is_visible(msgview)) {
+                       if (!messageview_is_visible(msgview) &&
+                           gtk_window_is_active(GTK_WINDOW(summaryview->mainwin->window))) {
                                main_window_toggle_message_view(summaryview->mainwin);
                                GTK_EVENTS_FLUSH();
                        }
                        val = messageview_show(msgview, msginfo, all_headers);
-                       if (GTK_CMCLIST(msgview->mimeview->ctree)->row_list == NULL)
+                       if (mimeview_tree_is_empty(msgview->mimeview))
                                gtk_widget_grab_focus(summaryview->ctree);
                        gtkut_ctree_node_move_if_on_the_edge(ctree, row,
                                GTK_CMCLIST(summaryview->ctree)->focus_row);
@@ -3604,6 +3637,8 @@ void summary_toggle_view(SummaryView *summaryview)
 {
        if (prefs_common.layout_mode == SMALL_LAYOUT)
                return;
+       if (summary_is_locked(summaryview))
+               return;
        if (!messageview_is_visible(summaryview->messageview) &&
            summaryview->selected && summary_is_list(summaryview))
                summary_display_msg(summaryview,
@@ -5741,7 +5776,7 @@ static void summary_colorlabel_menu_item_activate_item_cb(GtkMenuItem *menu_item
        GtkMenuShell *menu;
        GtkCheckMenuItem **items;
        gint n;
-       GList *cur, *sel;
+       GList *children, *cur, *sel;
 
        summaryview = (SummaryView *)data;
        cm_return_if_fail(summaryview != NULL);
@@ -5761,7 +5796,8 @@ static void summary_colorlabel_menu_item_activate_item_cb(GtkMenuItem *menu_item
                          GINT_TO_POINTER(1));
 
        /* clear items. get item pointers. */
-       for (n = 0, cur = menu->children; cur != NULL && cur->data != NULL; cur = cur->next) {
+       children = gtk_container_get_children(GTK_CONTAINER(menu));
+       for (n = 0, cur = children; cur != NULL && cur->data != NULL; cur = cur->next) {
                if (GTK_IS_CHECK_MENU_ITEM(cur->data)) {
                        gtk_check_menu_item_set_active
                                (GTK_CHECK_MENU_ITEM(cur->data), FALSE);
@@ -5770,6 +5806,8 @@ static void summary_colorlabel_menu_item_activate_item_cb(GtkMenuItem *menu_item
                }
        }
 
+       g_list_free(children);
+
        if (n == (N_COLOR_LABELS + 1)) {
                /* iterate all messages and set the state of the appropriate
                 * items */
@@ -5782,7 +5820,7 @@ static void summary_colorlabel_menu_item_activate_item_cb(GtkMenuItem *menu_item
                                 GTK_CMCTREE_NODE(sel->data));
                        if (msginfo) {
                                clabel = MSG_GET_COLORLABEL_VALUE(msginfo->flags);
-                               if (!items[clabel]->active)
+                               if (!gtk_check_menu_item_get_active(items[clabel]))
                                        gtk_check_menu_item_set_active
                                                (items[clabel], TRUE);
                        }
@@ -5865,7 +5903,7 @@ static void summary_tags_menu_item_activate_item_cb(GtkMenuItem *menu_item,
                                                          gpointer data)
 {
        GtkMenuShell *menu;
-       GList *cur;
+       GList *children, *cur;
        GList *sel;
        GHashTable *menu_table = g_hash_table_new_full(
                                        g_direct_hash,
@@ -5891,7 +5929,8 @@ static void summary_tags_menu_item_activate_item_cb(GtkMenuItem *menu_item,
                          GINT_TO_POINTER(1));
 
        /* clear items. get item pointers. */
-       for (cur = menu->children; cur != NULL && cur->data != NULL; cur = cur->next) {
+       children = gtk_container_get_children(GTK_CONTAINER(menu));
+       for (cur = children; cur != NULL && cur->data != NULL; cur = cur->next) {
                if (GTK_IS_CHECK_MENU_ITEM(cur->data)) {
                        gint id = GPOINTER_TO_INT(g_object_get_data(G_OBJECT(cur->data),
                                "tag_id"));
@@ -5903,6 +5942,8 @@ static void summary_tags_menu_item_activate_item_cb(GtkMenuItem *menu_item,
                }
        }
 
+       g_list_free(children);
+
        /* iterate all messages and set the state of the appropriate
         * items */
        sel_len = 0;
@@ -5924,7 +5965,7 @@ static void summary_tags_menu_item_activate_item_cb(GtkMenuItem *menu_item,
                                gint num_checked = GPOINTER_TO_INT(g_hash_table_lookup(menu_allsel_table, tags->data));
                                id = GPOINTER_TO_INT(tags->data);
                                item = g_hash_table_lookup(menu_table, GINT_TO_POINTER(tags->data));
-                               if (item && !item->active) {
+                               if (item && !gtk_check_menu_item_get_active(item)) {
                                        gtk_check_menu_item_set_active
                                                (item, TRUE);
                                }
@@ -5934,7 +5975,8 @@ static void summary_tags_menu_item_activate_item_cb(GtkMenuItem *menu_item,
                }
        }
 
-       for (cur = menu->children; cur != NULL && cur->data != NULL; cur = cur->next) {
+       children = gtk_container_get_children(GTK_CONTAINER(menu));
+       for (cur = children; cur != NULL && cur->data != NULL; cur = cur->next) {
                if (GTK_IS_CHECK_MENU_ITEM(cur->data)) {
                        gint id = GPOINTER_TO_INT(g_object_get_data(G_OBJECT(cur->data),
                                "tag_id"));
@@ -5945,6 +5987,7 @@ static void summary_tags_menu_item_activate_item_cb(GtkMenuItem *menu_item,
                                gtk_check_menu_item_set_inconsistent(GTK_CHECK_MENU_ITEM(cur->data), FALSE);
                }
        }
+       g_list_free(children);
        g_hash_table_destroy(menu_table);
        g_hash_table_destroy(menu_allsel_table);
        /* reset "dont_toggle" state */
@@ -6074,7 +6117,7 @@ static gboolean summary_popup_menu(GtkWidget *widget, gpointer data)
        return TRUE;
 }
 
-#if GTK_CHECK_VERSION(2,12,0) && !GENERIC_UMPC
+#if !GENERIC_UMPC
 static gchar *summaryview_get_tooltip_text(SummaryView *summaryview, MsgInfo *info, gint column)
 {
        MsgFlags flags;
@@ -6279,15 +6322,9 @@ static GtkWidget *summary_ctree_create(SummaryView *summaryview)
        gtk_cmclist_set_column_width(GTK_CMCLIST(ctree), col_pos[S_COL_TAGS],
                                   prefs_common.summary_col_size[S_COL_TAGS]);
 
-       if (prefs_common.enable_dotted_lines) {
-               gtk_cmctree_set_line_style(GTK_CMCTREE(ctree), GTK_CMCTREE_LINES_DOTTED);
-               gtk_cmctree_set_expander_style(GTK_CMCTREE(ctree),
-                                    GTK_CMCTREE_EXPANDER_SQUARE);
-       } else {
-               gtk_cmctree_set_line_style(GTK_CMCTREE(ctree), GTK_CMCTREE_LINES_NONE);
-               gtk_cmctree_set_expander_style(GTK_CMCTREE(ctree),
-                                    GTK_CMCTREE_EXPANDER_TRIANGLE);
-       }
+       gtk_cmctree_set_line_style(GTK_CMCTREE(ctree), GTK_CMCTREE_LINES_NONE);
+       gtk_cmctree_set_expander_style(GTK_CMCTREE(ctree),
+                            GTK_CMCTREE_EXPANDER_TRIANGLE);
 
        gtk_sctree_set_stripes(GTK_SCTREE(ctree), prefs_common.use_stripes_in_summaries);
 
@@ -6295,8 +6332,8 @@ static GtkWidget *summary_ctree_create(SummaryView *summaryview)
        g_object_set_data(G_OBJECT(ctree), "summaryview", (gpointer)summaryview); 
 
        for (pos = 0; pos < N_SUMMARY_COLS; pos++) {
-               GTK_WIDGET_UNSET_FLAGS(GTK_CMCLIST(ctree)->column[pos].button,
-                                      GTK_CAN_FOCUS);
+               gtkut_widget_set_can_focus(GTK_CMCLIST(ctree)->column[pos].button,
+                                      FALSE);
                if (((pos == summaryview->col_pos[S_COL_FROM] && !FOLDER_SHOWS_TO_HDR(summaryview->folder_item)) ||
                     (pos == summaryview->col_pos[S_COL_TO] && FOLDER_SHOWS_TO_HDR(summaryview->folder_item)) ||
                     pos == summaryview->col_pos[S_COL_DATE]) && vert &&
@@ -6388,7 +6425,7 @@ static GtkWidget *summary_ctree_create(SummaryView *summaryview)
                         G_CALLBACK(summary_drag_motion_cb),
                         summaryview);
 
-#if GTK_CHECK_VERSION(2,12,0) && !GENERIC_UMPC
+#if !GENERIC_UMPC
        g_object_set (G_OBJECT(ctree), "has-tooltip", TRUE, NULL);
        g_signal_connect(G_OBJECT(ctree), "query-tooltip", 
                         G_CALLBACK(tooltip_cb),
@@ -6474,11 +6511,8 @@ static gboolean summary_button_pressed(GtkWidget *ctree, GdkEventButton *event,
        if (!event) return FALSE;
 
        if (event->button == 3) {
-               summaryview->display_msg = messageview_is_visible(summaryview->messageview);
                /* right clicked */
                summary_set_menu_sensitive(summaryview);
-               cm_menu_set_sensitive_full(summaryview->mainwin->ui_manager, "Menus/SummaryViewPopup/Trash", 
-                       !folder_has_parent_of_type(summaryview->folder_item, F_TRASH) && summaryview->selected);
                gtk_menu_popup(GTK_MENU(summaryview->popupmenu), NULL, NULL,
                               NULL, NULL, event->button, event->time);
        } else if (event->button == 2) {
@@ -6536,7 +6570,7 @@ static gboolean summary_key_pressed(GtkWidget *widget, GdkEventKey *event,
        if (summaryview->selected) {
                gboolean handled = FALSE;
                switch (event->keyval) {
-               case GDK_space:         /* Page down or go to the next */
+               case GDK_KEY_space:             /* Page down or go to the next */
                        handled = TRUE;
                        if (event->state & GDK_CONTROL_MASK) {
                                handled = FALSE;
@@ -6559,12 +6593,12 @@ static gboolean summary_key_pressed(GtkWidget *widget, GdkEventKey *event,
                                }                               
                        }
                        break;
-               case GDK_BackSpace:     /* Page up */
+               case GDK_KEY_BackSpace: /* Page up */
                        handled = TRUE;
                        mimeview_scroll_page(messageview->mimeview, TRUE);
                        break;
-               case GDK_Return:        /* Scroll up/down one line */
-               case GDK_KP_Enter:
+               case GDK_KEY_Return:    /* Scroll up/down one line */
+               case GDK_KEY_KP_Enter:
                        handled = TRUE;
                        if (summaryview->displayed != summaryview->selected) {
 #ifndef GENERIC_UMPC
@@ -6586,21 +6620,21 @@ static gboolean summary_key_pressed(GtkWidget *widget, GdkEventKey *event,
                return TRUE;
 
        switch (event->keyval) {
-       case GDK_Left:          /* Move focus */
+       case GDK_KEY_Left:              /* Move focus */
                adj = gtk_scrolled_window_get_hadjustment
                        (GTK_SCROLLED_WINDOW(summaryview->scrolledwin));
-               if (adj->lower != adj->value)
+               if (gtk_adjustment_get_lower(adj) != gtk_adjustment_get_value(adj))
                        break;
                /* FALLTHROUGH */       
-       case GDK_Escape:
+       case GDK_KEY_Escape:
                gtk_widget_grab_focus(summaryview->folderview->ctree);
                mainwindow_exit_folder(summaryview->mainwin);
                return TRUE;
-       case GDK_Home:
-       case GDK_End:
+       case GDK_KEY_Home:
+       case GDK_KEY_End:
                if ((node = summaryview->selected) != NULL) {
                        GtkCMCTreeNode *next = NULL;
-                       next = (event->keyval == GDK_Home)
+                       next = (event->keyval == GDK_KEY_Home)
                                        ? gtk_cmctree_node_nth(ctree, 0)
                                        : gtk_cmctree_node_nth(ctree, 
                                                g_list_length(GTK_CMCLIST(ctree)->row_list)-1);
@@ -6628,16 +6662,17 @@ static gboolean summary_key_pressed(GtkWidget *widget, GdkEventKey *event,
        }
 
        switch (event->keyval) {
-       case GDK_Delete:
+       case GDK_KEY_Delete:
                BREAK_ON_MODIFIER_KEY();
                summary_delete_trash(summaryview);
                break;
-       case GDK_y:
-       case GDK_t:
-       case GDK_l:
-       case GDK_o:
-       case GDK_c:
-       case GDK_a:
+       case GDK_KEY_y:
+       case GDK_KEY_t:
+       case GDK_KEY_l:
+       case GDK_KEY_o:
+       case GDK_KEY_c:
+       case GDK_KEY_a:
+       case GDK_KEY_z:
                if ((event->state & (GDK_MOD1_MASK|GDK_CONTROL_MASK)) == 0) {
                        g_signal_stop_emission_by_name(G_OBJECT(widget), 
                                        "key_press_event");
@@ -6991,7 +7026,7 @@ static void summary_start_drag(GtkWidget *widget, gint button, GdkEvent *event,
                                 GDK_ACTION_MOVE|GDK_ACTION_COPY|GDK_ACTION_DEFAULT, button, event);
        gtk_drag_set_icon_default(context);
        if (prefs_common.layout_mode == SMALL_LAYOUT) {
-               GtkWidget *paned = GTK_WIDGET_PTR(summaryview)->parent;
+               GtkWidget *paned = gtk_widget_get_parent(GTK_WIDGET_PTR(summaryview));
                if (paned && GTK_IS_PANED(paned)) {
                        mainwindow_reset_paned(GTK_PANED(paned));
                }
@@ -7068,14 +7103,14 @@ static void summary_drag_data_get(GtkWidget        *widget,
 
                if (mail_list != NULL) {
                        gtk_selection_data_set(selection_data,
-                                              selection_data->target, 8,
+                                              gtk_selection_data_get_target(selection_data), 8,
                                               mail_list, strlen(mail_list));
                        g_free(mail_list);
                } 
        } else if (info == TARGET_DUMMY) {
                if (GTK_CMCLIST(summaryview->ctree)->selection)
                        gtk_selection_data_set(selection_data,
-                                              selection_data->target, 8,
+                                              gtk_selection_data_get_target(selection_data), 8,
                                               "Dummy-Summaryview", 
                                               strlen("Dummy-Summaryview")+1);
        } else if (info == TARGET_MAIL_CM_PATH_LIST) {
@@ -7107,7 +7142,7 @@ static void summary_drag_data_get(GtkWidget        *widget,
 
                if (path_list != NULL) {
                        gtk_selection_data_set(selection_data,
-                                              selection_data->target, 8,
+                                              gtk_selection_data_get_target(selection_data), 8,
                                               path_list, strlen(path_list));
                        g_free(path_list);
                }
@@ -7157,7 +7192,8 @@ static void summary_drag_data_received(GtkWidget        *widget,
                        gtk_drag_finish(drag_context, FALSE, FALSE, time);                      
                        return;
                } else {
-                       folderview_finish_dnd(data->data, drag_context, time, item);
+                       folderview_finish_dnd(gtk_selection_data_get_data(data),
+                               drag_context, time, item);
                }
        }
 }
@@ -7690,20 +7726,22 @@ void summary_reflect_prefs_pixmap_theme(SummaryView *summaryview)
 void summary_reflect_prefs_custom_colors(SummaryView *summaryview)
 {
        GtkMenuShell *menu;
-       GList *cur;
+       GList *children, *cur;
 
        /* re-create colorlabel submenu */
        menu = GTK_MENU_SHELL(summaryview->colorlabel_menu);
        cm_return_if_fail(menu != NULL);
 
        /* clear items. get item pointers. */
-       for (cur = menu->children; cur != NULL && cur->data != NULL; cur = cur->next) {
+       children = gtk_container_get_children(GTK_CONTAINER(menu));
+       for (cur = children; cur != NULL && cur->data != NULL; cur = cur->next) {
                g_signal_handlers_disconnect_matched
                         (gtk_ui_manager_get_accel_group(summaryview->mainwin->ui_manager), 
                         G_SIGNAL_MATCH_DATA|G_SIGNAL_MATCH_FUNC,
                         0, 0, NULL, mainwin_accel_changed_cb, cur->data);
                gtk_menu_item_set_submenu(GTK_MENU_ITEM(cur->data), NULL);
        }
+       g_list_free(children);
        summary_colorlabel_menu_create(summaryview, TRUE);
 }