@@ -64,49 +64,32 @@ static void conf_changed(bool dirty)
64
64
65
65
/* Utility Functions */
66
66
67
-
68
- static void text_insert_help (struct menu * menu )
67
+ static void text_insert_msg (const char * title , const char * msg )
69
68
{
70
69
GtkTextBuffer * buffer ;
71
70
GtkTextIter start , end ;
72
- const char * prompt = menu_get_prompt (menu );
73
- struct gstr help = str_new ();
74
-
75
- menu_get_ext_help (menu , & help );
76
71
77
72
buffer = gtk_text_view_get_buffer (GTK_TEXT_VIEW (text_w ));
78
73
gtk_text_buffer_get_bounds (buffer , & start , & end );
79
74
gtk_text_buffer_delete (buffer , & start , & end );
80
75
gtk_text_view_set_left_margin (GTK_TEXT_VIEW (text_w ), 15 );
81
76
82
77
gtk_text_buffer_get_end_iter (buffer , & end );
83
- gtk_text_buffer_insert_with_tags (buffer , & end , prompt , -1 , tag1 ,
78
+ gtk_text_buffer_insert_with_tags (buffer , & end , title , -1 , tag1 ,
84
79
NULL );
85
80
gtk_text_buffer_insert_at_cursor (buffer , "\n\n" , 2 );
86
81
gtk_text_buffer_get_end_iter (buffer , & end );
87
- gtk_text_buffer_insert_with_tags (buffer , & end , str_get ( & help ) , -1 , tag2 ,
82
+ gtk_text_buffer_insert_with_tags (buffer , & end , msg , -1 , tag2 ,
88
83
NULL );
89
- str_free (& help );
90
84
}
91
85
92
-
93
- static void text_insert_msg (const char * title , const char * msg )
86
+ static void text_insert_help (struct menu * menu )
94
87
{
95
- GtkTextBuffer * buffer ;
96
- GtkTextIter start , end ;
97
-
98
- buffer = gtk_text_view_get_buffer (GTK_TEXT_VIEW (text_w ));
99
- gtk_text_buffer_get_bounds (buffer , & start , & end );
100
- gtk_text_buffer_delete (buffer , & start , & end );
101
- gtk_text_view_set_left_margin (GTK_TEXT_VIEW (text_w ), 15 );
88
+ struct gstr help = str_new ();
102
89
103
- gtk_text_buffer_get_end_iter (buffer , & end );
104
- gtk_text_buffer_insert_with_tags (buffer , & end , title , -1 , tag1 ,
105
- NULL );
106
- gtk_text_buffer_insert_at_cursor (buffer , "\n\n" , 2 );
107
- gtk_text_buffer_get_end_iter (buffer , & end );
108
- gtk_text_buffer_insert_with_tags (buffer , & end , msg , -1 , tag2 ,
109
- NULL );
90
+ menu_get_ext_help (menu , & help );
91
+ text_insert_msg (menu_get_prompt (menu ), str_get (& help ));
92
+ str_free (& help );
110
93
}
111
94
112
95
static void _select_menu (GtkTreeView * view , GtkTreeModel * model ,
0 commit comments