Use folderview_grab_focus() outside of folderview.c.

[claws.git] / src / summaryview.c

diff --git a/src/summaryview.c b/src/summaryview.c
index 7abda5789e12d4fed6d2771234c642ec5a5fb887..b9e75ca38f39ecb4a7778f9a3d8e3982d4b4cceb 100644 (file)
--- a/src/summaryview.c
+++ b/src/summaryview.c
@@ -4979,7 +4979,7 @@ gboolean summary_execute(SummaryView *summaryview)
        if (!GTK_CMCLIST(summaryview->ctree)->row_list) {
                menu_set_insensitive_all
                        (GTK_MENU_SHELL(summaryview->popupmenu));
        if (!GTK_CMCLIST(summaryview->ctree)->row_list) {
                menu_set_insensitive_all
                        (GTK_MENU_SHELL(summaryview->popupmenu));

-               gtk_widget_grab_focus(summaryview->folderview->ctree);
+               folderview_grab_focus(summaryview->folderview);

        } else {
                menu_set_sensitive_all(GTK_MENU_SHELL(summaryview->popupmenu), TRUE);
                gtk_widget_grab_focus(summaryview->ctree);
        } else {
                menu_set_sensitive_all(GTK_MENU_SHELL(summaryview->popupmenu), TRUE);
                gtk_widget_grab_focus(summaryview->ctree);


@@ -5080,7 +5080,7 @@ gboolean summary_expunge(SummaryView *summaryview)
        if (!GTK_CMCLIST(summaryview->ctree)->row_list) {
                menu_set_insensitive_all
                        (GTK_MENU_SHELL(summaryview->popupmenu));
        if (!GTK_CMCLIST(summaryview->ctree)->row_list) {
                menu_set_insensitive_all
                        (GTK_MENU_SHELL(summaryview->popupmenu));

-               gtk_widget_grab_focus(summaryview->folderview->ctree);
+               folderview_grab_focus(summaryview->folderview);

        } else {
                menu_set_sensitive_all(GTK_MENU_SHELL(summaryview->popupmenu), TRUE);
                gtk_widget_grab_focus(summaryview->ctree);
        } else {
                menu_set_sensitive_all(GTK_MENU_SHELL(summaryview->popupmenu), TRUE);
                gtk_widget_grab_focus(summaryview->ctree);


@@ -6604,7 +6604,7 @@ static gint summary_folder_eventbox_pressed(GtkWidget *eventbox, GdkEventButton
                                            SummaryView *summaryview)
 {
        if (event) {
                                            SummaryView *summaryview)
 {
        if (event) {

-               gtk_widget_grab_focus(summaryview->folderview->ctree);
+               folderview_grab_focus(summaryview->folderview);

                mainwindow_exit_folder(summaryview->mainwin);
        }
        return TRUE;
                mainwindow_exit_folder(summaryview->mainwin);
        }
        return TRUE;


@@ -6750,7 +6750,7 @@ static gboolean summary_key_pressed(GtkWidget *widget, GdkEventKey *event,
                        break;
                /* FALLTHROUGH */       
        case GDK_KEY_Escape:
                        break;
                /* FALLTHROUGH */       
        case GDK_KEY_Escape:

-               gtk_widget_grab_focus(summaryview->folderview->ctree);
+               folderview_grab_focus(summaryview->folderview);

                mainwindow_exit_folder(summaryview->mainwin);
                return TRUE;
        case GDK_KEY_Home: case GDK_KEY_KP_Home:
                mainwindow_exit_folder(summaryview->mainwin);
                return TRUE;
        case GDK_KEY_Home: case GDK_KEY_KP_Home: