aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNot Zed <NotZed@Ximian.com>2004-01-07 08:29:28 +0800
committerMichael Zucci <zucchi@src.gnome.org>2004-01-07 08:29:28 +0800
commit56ff62828145ba047aa6b3e058dd1d3a933c7cad (patch)
tree2ccd0cb825e444e0517feebd4012bf98d582e7b4
parente65211432856044e6b27b4a2aa2906e5baef30e6 (diff)
downloadgsoc2013-evolution-56ff62828145ba047aa6b3e058dd1d3a933c7cad.tar.gz
gsoc2013-evolution-56ff62828145ba047aa6b3e058dd1d3a933c7cad.tar.zst
gsoc2013-evolution-56ff62828145ba047aa6b3e058dd1d3a933c7cad.zip
** See bug #47751.
2003-08-20 Not Zed <NotZed@Ximian.com> ** See bug #47751. * rule-editor.c (add_editor_response, edit_editor_response) (rule_edit, rule_add, rule_editor_construct, editor_response): * rule-context.c (new_rule_response, rule_context_add_rule_gui): * filter-datespec.c (button_clicked): RESPONSE_REJECT/ACCEPT -> RESPONSE_CANCEL/OK svn path=/trunk/; revision=24082
-rw-r--r--filter/ChangeLog10
-rw-r--r--filter/filter-datespec.c6
-rw-r--r--filter/rule-context.c8
-rw-r--r--filter/rule-editor.c29
4 files changed, 28 insertions, 25 deletions
diff --git a/filter/ChangeLog b/filter/ChangeLog
index 4e46b6d71b..b1c03da4ea 100644
--- a/filter/ChangeLog
+++ b/filter/ChangeLog
@@ -1,3 +1,13 @@
+2003-08-20 Not Zed <NotZed@Ximian.com>
+
+ ** See bug #47751.
+
+ * rule-editor.c (add_editor_response, edit_editor_response)
+ (rule_edit, rule_add, rule_editor_construct, editor_response):
+ * rule-context.c (new_rule_response, rule_context_add_rule_gui):
+ * filter-datespec.c (button_clicked): RESPONSE_REJECT/ACCEPT ->
+ RESPONSE_CANCEL/OK
+
2003-12-23 JP Rosevear <jpr@ximian.com>
* vfolder-rule.c (source_add): call peek instead of get as the
diff --git a/filter/filter-datespec.c b/filter/filter-datespec.c
index bbb6df77d5..9b15c1dbdb 100644
--- a/filter/filter-datespec.c
+++ b/filter/filter-datespec.c
@@ -405,8 +405,8 @@ button_clicked (GtkButton *button, FilterDatespec *fds)
dialog = (GtkDialog *) gtk_dialog_new ();
gtk_window_set_title ((GtkWindow *) dialog, _("Select a time to compare against"));
gtk_dialog_add_buttons (dialog,
- GTK_STOCK_CANCEL, GTK_RESPONSE_REJECT,
- GTK_STOCK_OK, GTK_RESPONSE_ACCEPT,
+ GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
+ GTK_STOCK_OK, GTK_RESPONSE_OK,
NULL);
p->notebook_type = glade_xml_get_widget (gui, "notebook_type");
@@ -424,7 +424,7 @@ button_clicked (GtkButton *button, FilterDatespec *fds)
gtk_box_pack_start ((GtkBox *) dialog->vbox, toplevel, TRUE, TRUE, 3);
- if (gtk_dialog_run (dialog) == GTK_RESPONSE_ACCEPT) {
+ if (gtk_dialog_run (dialog) == GTK_RESPONSE_OK) {
get_values (fds);
set_button (fds);
}
diff --git a/filter/rule-context.c b/filter/rule-context.c
index 5559e15197..0d421fe420 100644
--- a/filter/rule-context.c
+++ b/filter/rule-context.c
@@ -669,7 +669,7 @@ rule_context_add_rule(RuleContext *rc, FilterRule *new)
static void
new_rule_response(GtkWidget *dialog, int button, RuleContext *context)
{
- if (button == GTK_RESPONSE_ACCEPT) {
+ if (button == GTK_RESPONSE_OK) {
FilterRule *rule = g_object_get_data((GObject *) dialog, "rule");
char *user = g_object_get_data((GObject *) dialog, "path");
@@ -716,9 +716,9 @@ rule_context_add_rule_gui(RuleContext *rc, FilterRule *rule, const char *title,
dialog =(GtkDialog *) gtk_dialog_new();
gtk_dialog_add_buttons(dialog,
- GTK_STOCK_CANCEL, GTK_RESPONSE_REJECT,
- GTK_STOCK_OK, GTK_RESPONSE_ACCEPT,
- NULL);
+ GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
+ GTK_STOCK_OK, GTK_RESPONSE_OK,
+ NULL);
gtk_window_set_title((GtkWindow *) dialog, title);
gtk_window_set_default_size((GtkWindow *) dialog, 600, 400);
diff --git a/filter/rule-editor.c b/filter/rule-editor.c
index 24a2cc2279..861605878d 100644
--- a/filter/rule-editor.c
+++ b/filter/rule-editor.c
@@ -229,7 +229,7 @@ add_editor_response (GtkWidget *dialog, int button, RuleEditor *re)
GtkTreePath *path;
GtkTreeIter iter;
- if (button == GTK_RESPONSE_ACCEPT) {
+ if (button == GTK_RESPONSE_OK) {
if (!filter_rule_validate (re->edit)) {
/* no need to popup a dialog because the validate code does that. */
return;
@@ -284,8 +284,8 @@ rule_add (GtkWidget *widget, RuleEditor *re)
re->dialog = gtk_dialog_new ();
gtk_dialog_add_buttons ((GtkDialog *) re->dialog,
- GTK_STOCK_CANCEL, GTK_RESPONSE_REJECT,
- GTK_STOCK_OK, GTK_RESPONSE_ACCEPT,
+ GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
+ GTK_STOCK_OK, GTK_RESPONSE_OK,
NULL);
gtk_window_set_title ((GtkWindow *) re->dialog, _("Add Rule"));
@@ -312,7 +312,7 @@ edit_editor_response (GtkWidget *dialog, int button, RuleEditor *re)
GtkTreeIter iter;
int pos;
- if (button == GTK_RESPONSE_ACCEPT) {
+ if (button == GTK_RESPONSE_OK) {
if (!filter_rule_validate (re->edit)) {
/* no need to popup a dialog because the validate code does that. */
return;
@@ -366,8 +366,8 @@ rule_edit (GtkWidget *widget, RuleEditor *re)
re->dialog = gtk_dialog_new ();
gtk_dialog_add_buttons ((GtkDialog *) re->dialog,
- GTK_STOCK_CANCEL, GTK_RESPONSE_REJECT,
- GTK_STOCK_OK, GTK_RESPONSE_ACCEPT,
+ GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
+ GTK_STOCK_OK, GTK_RESPONSE_OK,
NULL);
gtk_window_set_title ((GtkWindow *) re->dialog, _("Edit Rule"));
@@ -649,7 +649,7 @@ rule_editor_play_undo (RuleEditor *re)
static void
editor_response (GtkWidget *dialog, int button, RuleEditor *re)
{
- if (button == GTK_RESPONSE_REJECT) {
+ if (button == GTK_RESPONSE_CANCEL) {
if (enable_undo)
rule_editor_play_undo (re);
else {
@@ -737,15 +737,8 @@ rule_editor_construct (RuleEditor *re, RuleContext *context, GladeXML *gui, cons
g_signal_connect (re, "response", G_CALLBACK (editor_response), re);
rule_editor_set_source (re, source);
- if (enable_undo) {
- gtk_dialog_add_buttons ((GtkDialog *) re,
- GTK_STOCK_CANCEL, GTK_RESPONSE_REJECT,
- GTK_STOCK_OK, GTK_RESPONSE_ACCEPT,
- NULL);
- } else {
- gtk_dialog_add_buttons ((GtkDialog *) re,
- GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
- GTK_STOCK_OK, GTK_RESPONSE_ACCEPT,
- NULL);
- }
+ gtk_dialog_add_buttons ((GtkDialog *) re,
+ GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
+ GTK_STOCK_OK, GTK_RESPONSE_OK,
+ NULL);
}