@@ -64,49 +64,32 @@ static void conf_changed(bool dirty)
6464
6565/* Utility Functions */
6666
67-
68- static void text_insert_help (struct menu * menu )
67+ static void text_insert_msg (const char * title , const char * msg )
6968{
7069 GtkTextBuffer * buffer ;
7170 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 );
7671
7772 buffer = gtk_text_view_get_buffer (GTK_TEXT_VIEW (text_w ));
7873 gtk_text_buffer_get_bounds (buffer , & start , & end );
7974 gtk_text_buffer_delete (buffer , & start , & end );
8075 gtk_text_view_set_left_margin (GTK_TEXT_VIEW (text_w ), 15 );
8176
8277 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 ,
8479 NULL );
8580 gtk_text_buffer_insert_at_cursor (buffer , "\n\n" , 2 );
8681 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 ,
8883 NULL );
89- str_free (& help );
9084}
9185
92-
93- static void text_insert_msg (const char * title , const char * msg )
86+ static void text_insert_help (struct menu * menu )
9487{
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 ();
10289
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 );
11093}
11194
11295static void _select_menu (GtkTreeView * view , GtkTreeModel * model ,
0 commit comments