2005-06-24 [paul] 1.9.11cvs95
authorPaul Mangan <paul@claws-mail.org>
Fri, 24 Jun 2005 03:58:42 +0000 (03:58 +0000)
committerPaul Mangan <paul@claws-mail.org>
Fri, 24 Jun 2005 03:58:42 +0000 (03:58 +0000)
* 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

ChangeLog-gtk2.claws
PATCHSETS
configure.ac
src/gtk/description_window.c
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

index 4da5d26c86e2050bc13a9f26bc66bf6765c222e1..3f65811508371cc5248e5aa2019295b1800ceea6 100644 (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
index a531f79e3c259e6140514c9c855e00a3019d79cf..1b5445e3eaec5906d14e28ad78a60e382a1ea544 100644 (file)
--- a/PATCHSETS
+++ b/PATCHSETS
 ( 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
index 915cb3e9209e597d49f892b1c49d9e8ae0d1035f..6c6d8e8de52daf985805029dcdfa9812c8cc34bc 100644 (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=
 
index 37389b424a35500067cc3fbaef224f593ecee4b3..ac97ae6ff1c1d48cfb2d45f0d074a3d527aeb100 100644 (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);
index 3bafd5d707d70706c73d1621612e7a8bfb6f01b8..7e838140972c6b8e05a23b2debddd3dae6437b11 100644 (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",
index e1a228094f2523dc031ddf27344d06eb6e130359..3067daed813329c8879d7431115edacdd5c49806 100644 (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",
index 7dbcef2b6c549301fa7e024df1ba7aeb3ab329a9..382cbec9fa1180a08dcae482a382db242db30b93 100644 (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",
index 39542ba82dd6b511945007f19eeff6b04c68924f..80b8413ff3b29869ab5a2b02de75321af9e41da9 100644 (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",
index 241b6ba0c4c418636f134d7e3e134aadc1de1b1d..1e783be0f4609636d357ba54af66ccaec8ac0913 100644 (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",
index 2aee389ab58f4df45c30a342d3991b20750b7bff..5304e4c4da3559d2e31a3bc818204a0da3949373 100644 (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",
index 8decc8ab1b1e3de55a306e0fb2b47e09619b3534..d2269e90dd12b855fc16866a544cb5e26edb5741 100644 (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),