Revision 3212 src/prefs_common_dialog.c

View differences:

prefs_common_dialog.c
1 1
/*
2 2
 * Sylpheed -- a GTK+ based, lightweight, and fast e-mail client
3
 * Copyright (C) 1999-2012 Hiroyuki Yamamoto
3
 * Copyright (C) 1999-2013 Hiroyuki Yamamoto
4 4
 *
5 5
 * This program is free software; you can redistribute it and/or modify
6 6
 * it under the terms of the GNU General Public License as published by
......
68 68

  
69 69
	GtkWidget *checkbtn_chkonstartup;
70 70
	GtkWidget *checkbtn_scan_after_inc;
71

  
72
	GtkWidget *checkbtn_newmsg_notify_window;
71 73
#ifdef G_OS_WIN32
72 74
	GtkWidget *checkbtn_newmsg_sound;
73 75
	GtkWidget *entry_newmsg_sound;
......
323 325
	{"newmsg_notify_sound", &receive.entry_newmsg_sound,
324 326
	 prefs_set_data_from_entry, prefs_set_entry},
325 327
#endif
328
	{"enable_newmsg_notify_window", &receive.checkbtn_newmsg_notify_window,
329
	 prefs_set_data_from_toggle, prefs_set_toggle},
326 330

  
327 331
#ifndef G_OS_WIN32
328 332
	{"inc_local", &receive.checkbtn_local,
......
830 834
	GtkWidget *vbox1;
831 835
	GtkWidget *vbox2;
832 836
	GtkWidget *vbox3;
837
	GtkWidget *vbox4;
833 838
	GtkWidget *hbox;
834 839

  
835 840
	GtkWidget *hbox_autochk;
......
842 847
	GtkWidget *checkbtn_scan_after_inc;
843 848

  
844 849
	GtkWidget *frame_notify;
850
	GtkWidget *checkbtn_newmsg_notify_window;
845 851
	GtkWidget *checkbtn_newmsg_notify;
846 852
	GtkWidget *label_newmsg_notify;
847 853
	GtkWidget *entry_newmsg_notify;
......
911 917
	gtk_container_add (GTK_CONTAINER (frame_notify), vbox3);
912 918
	gtk_container_set_border_width (GTK_CONTAINER (vbox3), 8);
913 919

  
920
	vbox4 = gtk_vbox_new (FALSE, 0);
921
	gtk_widget_show (vbox4);
922
	gtk_box_pack_start (GTK_BOX (vbox3), vbox4, FALSE, FALSE, 0);
923

  
924
	PACK_CHECK_BUTTON
925
		(vbox4, checkbtn_newmsg_notify_window,
926
		 _("Show notification window when new messages arrive"));
927

  
914 928
#ifdef G_OS_WIN32
915 929
	PACK_CHECK_BUTTON
916
		(vbox3, checkbtn_newmsg_sound,
930
		(vbox4, checkbtn_newmsg_sound,
917 931
		 _("Play sound when new messages arrive"));
918 932

  
919 933
	hbox = gtk_hbox_new (FALSE, 8);
......
936 950
			 entry_newmsg_sound);
937 951

  
938 952
	SET_TOGGLE_SENSITIVITY (checkbtn_newmsg_sound, hbox);
939
#endif
940 953

  
941 954
	PACK_CHECK_BUTTON
942 955
		(vbox3, checkbtn_newmsg_notify,
943 956
		 _("Execute command when new messages arrive"));
957
#else
958
	PACK_CHECK_BUTTON
959
		(vbox4, checkbtn_newmsg_notify,
960
		 _("Execute command when new messages arrive"));
961
#endif
944 962

  
945 963
	hbox = gtk_hbox_new (FALSE, 8);
946 964
	gtk_widget_show (hbox);
......
998 1016
	receive.checkbtn_chkonstartup   = checkbtn_chkonstartup;
999 1017
	receive.checkbtn_scan_after_inc = checkbtn_scan_after_inc;
1000 1018

  
1019
	receive.checkbtn_newmsg_notify_window = checkbtn_newmsg_notify_window;
1001 1020
#ifdef G_OS_WIN32
1002 1021
	receive.checkbtn_newmsg_sound   = checkbtn_newmsg_sound;
1003 1022
	receive.entry_newmsg_sound      = entry_newmsg_sound;

Also available in: Unified diff