summary refs log tree commit diff stats
path: root/src/fe-gtk
diff options
context:
space:
mode:
authorTingPing <tingping@tingping.se>2013-01-09 19:53:26 -0800
committerTingPing <tingping@tingping.se>2013-01-09 19:53:26 -0800
commitba2927e3c5e797160be7dee8d90b78d035b76c93 (patch)
tree13d1891e6507aa6d28fef5a407821aa141e554e0 /src/fe-gtk
parented786843de94359a0f3dd9ccea1d3796c3a33d12 (diff)
parent672dbf75d6d3d47135be49568ebcce917d6c188c (diff)
Merge pull request #368 from RichardHitt/pull360
Make source clean with cppcheck, except for mpc and sasl, closes #360
Diffstat (limited to 'src/fe-gtk')
-rw-r--r--src/fe-gtk/fkeys.c1
-rw-r--r--src/fe-gtk/maingui.c3
2 files changed, 3 insertions, 1 deletions
diff --git a/src/fe-gtk/fkeys.c b/src/fe-gtk/fkeys.c
index 99d244ea..3a937e1a 100644
--- a/src/fe-gtk/fkeys.c
+++ b/src/fe-gtk/fkeys.c
@@ -1153,6 +1153,7 @@ key_load_kbs (char *filename)
 						 get_xdir ());
 	fe_message (ibuf, FE_MSG_ERROR);
 	free (ibuf);
+	free (kb);
 	return 5;
 }
 
diff --git a/src/fe-gtk/maingui.c b/src/fe-gtk/maingui.c
index fee8f320..2dfb7b8d 100644
--- a/src/fe-gtk/maingui.c
+++ b/src/fe-gtk/maingui.c
@@ -1646,7 +1646,8 @@ mg_create_tabmenu (session *sess, GdkEventButton *event, chan *ch)
 								mg_destroy_tab_cb, ch);
 	if (sess && tabmenu_list)
 		menu_create (menu, tabmenu_list, sess->channel, FALSE);
-	menu_add_plugin_items (menu, "\x4$TAB", sess->channel);
+	if (sess)
+		menu_add_plugin_items (menu, "\x4$TAB", sess->channel);
 
 	if (event->window)
 		gtk_menu_set_screen (GTK_MENU (menu), gdk_drawable_get_screen (event->window));