check for accelerator table to be != NULL.

Mon Apr 13 05:03:11 1998  Tim Janik  <timj@gtk.org>

        * gtk/gtkwindow.c (gtk_window_add_accelerator_table): check for
                accelerator table to be != NULL.
                        (gtk_window_remove_accelerator_table): likewise.

diff --git a/ChangeLog b/ChangeLog
index e7e5559aa59c5d475e66125450f05f7f2b036202..1721a3a8f29b9754bcb7af1378fb6064c77dd408 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+Mon Apr 13 05:03:11 1998  Tim Janik  <timj@gtk.org>
+
+       * gtk/gtkwindow.c (gtk_window_add_accelerator_table): check for
+       accelerator table to be != NULL.
+       (gtk_window_remove_accelerator_table): likewise.
+
 Sun Apr 12 19:35:09 PDT 1998 Shawn T. Amundson <amundson@gtk.org>
 
        * INSTALL: typo, gtk-1.0.0 should be gtk+-1.0.0

diff --git a/ChangeLog.pre-2-0 b/ChangeLog.pre-2-0
index e7e5559aa59c5d475e66125450f05f7f2b036202..1721a3a8f29b9754bcb7af1378fb6064c77dd408 100644 (file)
--- a/ChangeLog.pre-2-0
+++ b/ChangeLog.pre-2-0
@@ -1,3 +1,9 @@
+Mon Apr 13 05:03:11 1998  Tim Janik  <timj@gtk.org>
+
+       * gtk/gtkwindow.c (gtk_window_add_accelerator_table): check for
+       accelerator table to be != NULL.
+       (gtk_window_remove_accelerator_table): likewise.
+
 Sun Apr 12 19:35:09 PDT 1998 Shawn T. Amundson <amundson@gtk.org>
 
        * INSTALL: typo, gtk-1.0.0 should be gtk+-1.0.0

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index e7e5559aa59c5d475e66125450f05f7f2b036202..1721a3a8f29b9754bcb7af1378fb6064c77dd408 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,9 @@
+Mon Apr 13 05:03:11 1998  Tim Janik  <timj@gtk.org>
+
+       * gtk/gtkwindow.c (gtk_window_add_accelerator_table): check for
+       accelerator table to be != NULL.
+       (gtk_window_remove_accelerator_table): likewise.
+
 Sun Apr 12 19:35:09 PDT 1998 Shawn T. Amundson <amundson@gtk.org>
 
        * INSTALL: typo, gtk-1.0.0 should be gtk+-1.0.0

diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2
index e7e5559aa59c5d475e66125450f05f7f2b036202..1721a3a8f29b9754bcb7af1378fb6064c77dd408 100644 (file)
--- a/ChangeLog.pre-2-2
+++ b/ChangeLog.pre-2-2
@@ -1,3 +1,9 @@
+Mon Apr 13 05:03:11 1998  Tim Janik  <timj@gtk.org>
+
+       * gtk/gtkwindow.c (gtk_window_add_accelerator_table): check for
+       accelerator table to be != NULL.
+       (gtk_window_remove_accelerator_table): likewise.
+
 Sun Apr 12 19:35:09 PDT 1998 Shawn T. Amundson <amundson@gtk.org>
 
        * INSTALL: typo, gtk-1.0.0 should be gtk+-1.0.0

diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4
index e7e5559aa59c5d475e66125450f05f7f2b036202..1721a3a8f29b9754bcb7af1378fb6064c77dd408 100644 (file)
--- a/ChangeLog.pre-2-4
+++ b/ChangeLog.pre-2-4
@@ -1,3 +1,9 @@
+Mon Apr 13 05:03:11 1998  Tim Janik  <timj@gtk.org>
+
+       * gtk/gtkwindow.c (gtk_window_add_accelerator_table): check for
+       accelerator table to be != NULL.
+       (gtk_window_remove_accelerator_table): likewise.
+
 Sun Apr 12 19:35:09 PDT 1998 Shawn T. Amundson <amundson@gtk.org>
 
        * INSTALL: typo, gtk-1.0.0 should be gtk+-1.0.0

diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index e7e5559aa59c5d475e66125450f05f7f2b036202..1721a3a8f29b9754bcb7af1378fb6064c77dd408 100644 (file)
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,3 +1,9 @@
+Mon Apr 13 05:03:11 1998  Tim Janik  <timj@gtk.org>
+
+       * gtk/gtkwindow.c (gtk_window_add_accelerator_table): check for
+       accelerator table to be != NULL.
+       (gtk_window_remove_accelerator_table): likewise.
+
 Sun Apr 12 19:35:09 PDT 1998 Shawn T. Amundson <amundson@gtk.org>
 
        * INSTALL: typo, gtk-1.0.0 should be gtk+-1.0.0

diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index e7e5559aa59c5d475e66125450f05f7f2b036202..1721a3a8f29b9754bcb7af1378fb6064c77dd408 100644 (file)
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,9 @@
+Mon Apr 13 05:03:11 1998  Tim Janik  <timj@gtk.org>
+
+       * gtk/gtkwindow.c (gtk_window_add_accelerator_table): check for
+       accelerator table to be != NULL.
+       (gtk_window_remove_accelerator_table): likewise.
+
 Sun Apr 12 19:35:09 PDT 1998 Shawn T. Amundson <amundson@gtk.org>
 
        * INSTALL: typo, gtk-1.0.0 should be gtk+-1.0.0

diff --git a/gtk/gtkwindow.c b/gtk/gtkwindow.c
index 68f5c625cf15a3228c88cdcc2e250c45244c230a..b0a7c6e052de7d02b3893acb03866611920c5b7f 100644 (file)
--- a/gtk/gtkwindow.c
+++ b/gtk/gtkwindow.c
@@ -350,13 +350,15 @@ gtk_window_set_focus (GtkWindow *window,
 
 void
 gtk_window_set_default (GtkWindow *window,
-                       GtkWidget *defaultw)
+                       GtkWidget *default_widget)
 {
   g_return_if_fail (window != NULL);
   g_return_if_fail (GTK_IS_WINDOW (window));
-  g_return_if_fail ((defaultw == NULL) || GTK_WIDGET_CAN_DEFAULT (defaultw));
 
-  if (window->default_widget != defaultw)
+  if (default_widget)
+    g_return_if_fail (GTK_WIDGET_CAN_DEFAULT (default_widget));
+
+  if (window->default_widget != default_widget)
     {
       if (window->default_widget)
        {
@@ -364,7 +366,7 @@ gtk_window_set_default (GtkWindow *window,
          gtk_widget_draw_default (window->default_widget);
        }
 
-      window->default_widget = defaultw;
+      window->default_widget = default_widget;
 
       if (window->default_widget)
        {
@@ -396,6 +398,7 @@ gtk_window_add_accelerator_table (GtkWindow           *window,
 {
   g_return_if_fail (window != NULL);
   g_return_if_fail (GTK_IS_WINDOW (window));
+  g_return_if_fail (table != NULL);
 
   gtk_accelerator_table_ref (table);
   window->accelerator_tables = g_list_prepend (window->accelerator_tables,
@@ -410,6 +413,7 @@ gtk_window_remove_accelerator_table (GtkWindow           *window,
 
   g_return_if_fail (window != NULL);
   g_return_if_fail (GTK_IS_WINDOW (window));
+  g_return_if_fail (table != NULL);
 
   for (list = window->accelerator_tables; list; list = list->next)
     {