summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog7
-rw-r--r--ChangeLog.pre-2-107
-rw-r--r--ChangeLog.pre-2-47
-rw-r--r--ChangeLog.pre-2-67
-rw-r--r--ChangeLog.pre-2-87
-rw-r--r--gtk/gtkfilechooserdefault.c2
-rw-r--r--gtk/gtkfilesel.c2
7 files changed, 37 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index ded80d4fc2..8d43a5eef4 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,12 @@
2004-03-11 Federico Mena Quintero <federico@ximian.com>
+ * gtk/gtkfilechooserdefault.c (error_message_with_parent): Use a
+ single OK button, not a Close button, as per the HIG.
+
+ * gtk/gtkfilesel.c (gtk_file_selection_fileop_error): Likewise.
+
+2004-03-11 Federico Mena Quintero <federico@ximian.com>
+
* gtk/gtkfilechooserdefault.c (shortcuts_drag_motion_cb): Oops,
initialize "action" before jumping. Fixes #136900.
diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index ded80d4fc2..8d43a5eef4 100644
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,5 +1,12 @@
2004-03-11 Federico Mena Quintero <federico@ximian.com>
+ * gtk/gtkfilechooserdefault.c (error_message_with_parent): Use a
+ single OK button, not a Close button, as per the HIG.
+
+ * gtk/gtkfilesel.c (gtk_file_selection_fileop_error): Likewise.
+
+2004-03-11 Federico Mena Quintero <federico@ximian.com>
+
* gtk/gtkfilechooserdefault.c (shortcuts_drag_motion_cb): Oops,
initialize "action" before jumping. Fixes #136900.
diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4
index ded80d4fc2..8d43a5eef4 100644
--- a/ChangeLog.pre-2-4
+++ b/ChangeLog.pre-2-4
@@ -1,5 +1,12 @@
2004-03-11 Federico Mena Quintero <federico@ximian.com>
+ * gtk/gtkfilechooserdefault.c (error_message_with_parent): Use a
+ single OK button, not a Close button, as per the HIG.
+
+ * gtk/gtkfilesel.c (gtk_file_selection_fileop_error): Likewise.
+
+2004-03-11 Federico Mena Quintero <federico@ximian.com>
+
* gtk/gtkfilechooserdefault.c (shortcuts_drag_motion_cb): Oops,
initialize "action" before jumping. Fixes #136900.
diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index ded80d4fc2..8d43a5eef4 100644
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,5 +1,12 @@
2004-03-11 Federico Mena Quintero <federico@ximian.com>
+ * gtk/gtkfilechooserdefault.c (error_message_with_parent): Use a
+ single OK button, not a Close button, as per the HIG.
+
+ * gtk/gtkfilesel.c (gtk_file_selection_fileop_error): Likewise.
+
+2004-03-11 Federico Mena Quintero <federico@ximian.com>
+
* gtk/gtkfilechooserdefault.c (shortcuts_drag_motion_cb): Oops,
initialize "action" before jumping. Fixes #136900.
diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index ded80d4fc2..8d43a5eef4 100644
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,5 +1,12 @@
2004-03-11 Federico Mena Quintero <federico@ximian.com>
+ * gtk/gtkfilechooserdefault.c (error_message_with_parent): Use a
+ single OK button, not a Close button, as per the HIG.
+
+ * gtk/gtkfilesel.c (gtk_file_selection_fileop_error): Likewise.
+
+2004-03-11 Federico Mena Quintero <federico@ximian.com>
+
* gtk/gtkfilechooserdefault.c (shortcuts_drag_motion_cb): Oops,
initialize "action" before jumping. Fixes #136900.
diff --git a/gtk/gtkfilechooserdefault.c b/gtk/gtkfilechooserdefault.c
index 72ce62c548..c7d9d7e12a 100644
--- a/gtk/gtkfilechooserdefault.c
+++ b/gtk/gtkfilechooserdefault.c
@@ -633,7 +633,7 @@ error_message_with_parent (GtkWindow *parent,
dialog = gtk_message_dialog_new (parent,
GTK_DIALOG_MODAL | GTK_DIALOG_DESTROY_WITH_PARENT,
GTK_MESSAGE_ERROR,
- GTK_BUTTONS_CLOSE,
+ GTK_BUTTONS_OK,
"%s",
msg);
gtk_dialog_run (GTK_DIALOG (dialog));
diff --git a/gtk/gtkfilesel.c b/gtk/gtkfilesel.c
index 805d937deb..86bdf3fecc 100644
--- a/gtk/gtkfilesel.c
+++ b/gtk/gtkfilesel.c
@@ -1371,7 +1371,7 @@ gtk_file_selection_fileop_error (GtkFileSelection *fs,
dialog = gtk_message_dialog_new (GTK_WINDOW (fs),
GTK_DIALOG_DESTROY_WITH_PARENT,
GTK_MESSAGE_ERROR,
- GTK_BUTTONS_CLOSE,
+ GTK_BUTTONS_OK,
"%s", error_message);
/* yes, we free it */