2005-06-24 [paul] 1.9.11cvs95

* src/prefs_actions.c
	* src/prefs_customheader.c
	* src/prefs_display_header.c
	* src/prefs_filtering_action.c
	* src/prefs_matcher.c
	* src/prefs_template.c
	* src/prefs_toolbar.c
		replace GTK_STOCK_REMOVE with GTK_STOCK_DELETE
	* src/gtk/description_window.c
		replace GTK_STOCK_OK with GTK_STOCK_CLOSE
This commit is contained in:
Paul Mangan 2005-06-24 03:58:42 +00:00
parent e234f8bf00
commit 2c34ef255b
11 changed files with 27 additions and 13 deletions

View file

@ -1,3 +1,16 @@
2005-06-24 [paul] 1.9.11cvs95
* src/prefs_actions.c
* src/prefs_customheader.c
* src/prefs_display_header.c
* src/prefs_filtering_action.c
* src/prefs_matcher.c
* src/prefs_template.c
* src/prefs_toolbar.c
replace GTK_STOCK_REMOVE with GTK_STOCK_DELETE
* src/gtk/description_window.c
replace GTK_STOCK_OK with GTK_STOCK_CLOSE
2005-06-23 [colin] 1.9.11cvs94
* src/summaryview.c

View file

@ -583,3 +583,4 @@
( cvs diff -u -r 1.179.2.38 -r 1.179.2.39 src/imap.c; cvs diff -u -r 1.395.2.84 -r 1.395.2.85 src/summaryview.c; ) > 1.9.11cvs92.patchset
( cvs diff -u -r 1.395.2.85 -r 1.395.2.86 src/summaryview.c; ) > 1.9.11cvs93.patchset
( cvs diff -u -r 1.395.2.86 -r 1.395.2.87 src/summaryview.c; ) > 1.9.11cvs94.patchset
( cvs diff -u -r 1.60.2.16 -r 1.60.2.17 src/prefs_actions.c; cvs diff -u -r 1.16.2.10 -r 1.16.2.11 src/prefs_customheader.c; cvs diff -u -r 1.16.2.9 -r 1.16.2.10 src/prefs_display_header.c; cvs diff -u -r 1.1.4.15 -r 1.1.4.16 src/prefs_filtering_action.c; cvs diff -u -r 1.43.2.19 -r 1.43.2.20 src/prefs_matcher.c; cvs diff -u -r 1.12.2.11 -r 1.12.2.12 src/prefs_template.c; cvs diff -u -r 1.30.2.14 -r 1.30.2.15 src/prefs_toolbar.c; cvs diff -u -r 1.5.2.9 -r 1.5.2.10 src/gtk/description_window.c; ) > 1.9.11cvs95.patchset

View file

@ -11,7 +11,7 @@ MINOR_VERSION=9
MICRO_VERSION=11
INTERFACE_AGE=0
BINARY_AGE=0
EXTRA_VERSION=94
EXTRA_VERSION=95
EXTRA_RELEASE=
EXTRA_GTK2_VERSION=

View file

@ -51,7 +51,7 @@ static void description_create(DescriptionWindow * dwindow)
GtkWidget *vbox;
GtkWidget *table;
GtkWidget *hbbox;
GtkWidget *ok_btn;
GtkWidget *close_btn;
GtkWidget *scrolledwin;
int i;
int sz;
@ -117,7 +117,7 @@ static void description_create(DescriptionWindow * dwindow)
line++;
}
gtkut_stock_button_set_create(&hbbox, &ok_btn, GTK_STOCK_OK,
gtkut_stock_button_set_create(&hbbox, &close_btn, GTK_STOCK_CLOSE,
NULL, NULL, NULL, NULL);
gtk_widget_show(hbbox);
@ -133,8 +133,8 @@ static void description_create(DescriptionWindow * dwindow)
gtk_table_attach_defaults(GTK_TABLE(table), hbbox,
1, 2, i, i+1);
*/
gtk_widget_grab_default(ok_btn);
g_signal_connect(G_OBJECT(ok_btn), "clicked",
gtk_widget_grab_default(close_btn);
g_signal_connect(G_OBJECT(close_btn), "clicked",
G_CALLBACK(gtk_main_quit), NULL);
g_signal_connect(G_OBJECT(dwindow->window), "key_press_event",
G_CALLBACK(description_window_key_pressed), NULL);

View file

@ -251,7 +251,7 @@ static void prefs_actions_create(MainWindow *mainwin)
G_CALLBACK(prefs_actions_substitute_cb),
NULL);
del_btn = gtk_button_new_from_stock(GTK_STOCK_REMOVE);
del_btn = gtk_button_new_from_stock(GTK_STOCK_DELETE);
gtk_widget_show(del_btn);
gtk_box_pack_start(GTK_BOX(btn_hbox), del_btn, FALSE, TRUE, 0);
g_signal_connect(G_OBJECT(del_btn), "clicked",

View file

@ -251,7 +251,7 @@ static void prefs_custom_header_create(void)
G_CALLBACK (prefs_custom_header_add_cb),
NULL);
del_btn = gtk_button_new_from_stock (GTK_STOCK_REMOVE);
del_btn = gtk_button_new_from_stock (GTK_STOCK_DELETE);
gtk_widget_show (del_btn);
gtk_box_pack_start (GTK_BOX (btn_hbox), del_btn, FALSE, TRUE, 0);
g_signal_connect (G_OBJECT (del_btn), "clicked",

View file

@ -310,7 +310,7 @@ static void prefs_display_header_create(void)
g_signal_connect (G_OBJECT (reg_btn), "clicked",
G_CALLBACK (prefs_display_header_register_cb),
GINT_TO_POINTER(FALSE));
del_btn = gtk_button_new_from_stock (GTK_STOCK_REMOVE);
del_btn = gtk_button_new_from_stock (GTK_STOCK_DELETE);
gtk_widget_show (del_btn);
gtk_box_pack_start (GTK_BOX (btn_vbox), del_btn, FALSE, TRUE, 0);
g_signal_connect (G_OBJECT (del_btn), "clicked",
@ -361,7 +361,7 @@ static void prefs_display_header_create(void)
G_CALLBACK
(prefs_display_header_register_cb),
GINT_TO_POINTER(TRUE));
del_btn = gtk_button_new_from_stock (GTK_STOCK_REMOVE);
del_btn = gtk_button_new_from_stock (GTK_STOCK_DELETE);
gtk_widget_show (del_btn);
gtk_box_pack_start (GTK_BOX (btn_vbox), del_btn, FALSE, TRUE, 0);
g_signal_connect (G_OBJECT (del_btn), "clicked",

View file

@ -474,7 +474,7 @@ static void prefs_filtering_action_create(void)
G_CALLBACK(prefs_filtering_action_substitute_cb),
NULL);
del_btn = gtk_button_new_from_stock(GTK_STOCK_REMOVE);
del_btn = gtk_button_new_from_stock(GTK_STOCK_DELETE);
gtk_widget_show(del_btn);
gtk_box_pack_start(GTK_BOX(btn_hbox), del_btn, FALSE, TRUE, 0);
g_signal_connect(G_OBJECT(del_btn), "clicked",

View file

@ -587,7 +587,7 @@ static void prefs_matcher_create(void)
G_CALLBACK(prefs_matcher_substitute_cb),
NULL);
del_btn = gtk_button_new_from_stock(GTK_STOCK_REMOVE);
del_btn = gtk_button_new_from_stock(GTK_STOCK_DELETE);
gtk_widget_show(del_btn);
gtk_box_pack_start(GTK_BOX(btn_hbox), del_btn, FALSE, TRUE, 0);
g_signal_connect(G_OBJECT(del_btn), "clicked",

View file

@ -243,7 +243,7 @@ static void prefs_template_window_create(void)
G_CALLBACK(prefs_template_substitute_cb),
NULL);
del_btn = gtk_button_new_from_stock(GTK_STOCK_REMOVE);
del_btn = gtk_button_new_from_stock(GTK_STOCK_DELETE);
gtk_widget_show(del_btn);
gtk_box_pack_start(GTK_BOX(hbox3), del_btn, FALSE, TRUE, 0);
g_signal_connect(G_OBJECT(del_btn), "clicked",

View file

@ -791,7 +791,7 @@ static void prefs_toolbar_create(ToolbarPage *prefs_toolbar)
G_CALLBACK(prefs_toolbar_substitute),
prefs_toolbar);
del_btn = gtk_button_new_from_stock(GTK_STOCK_REMOVE);
del_btn = gtk_button_new_from_stock(GTK_STOCK_DELETE);
gtk_box_pack_start(GTK_BOX(btn_hbox), del_btn, FALSE, TRUE, 0);
g_signal_connect(G_OBJECT(del_btn), "clicked",
G_CALLBACK(prefs_toolbar_delete),