Allow accel_path == NULL. (#84241, James Henstridge.)

Mon Sep 23 18:45:46 2002  Owen Taylor  <otaylor@redhat.com>
        * gtk/gtkmenuitem.c (gtk_menu_item_set_accel_path):
        Allow accel_path == NULL. (#84241, James Henstridge.)

diff --git a/ChangeLog b/ChangeLog
index bd1b3f2295bf49d4323d0d64ea955d7e5d8fff94..8a7c329831a8753cd434734017c6aaba00d47ef5 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Mon Sep 23 18:45:46 2002  Owen Taylor  <otaylor@redhat.com>
+
+       * gtk/gtkmenuitem.c (gtk_menu_item_set_accel_path): 
+       Allow accel_path == NULL. (#84241, James Henstridge.)
+
 Mon Sep 23 18:01:52 2002  Owen Taylor  <otaylor@redhat.com>
 
        * gtk/gtknotebook.[ch]: Add gtk_notebook_get_n_pages

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index bd1b3f2295bf49d4323d0d64ea955d7e5d8fff94..8a7c329831a8753cd434734017c6aaba00d47ef5 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,8 @@
+Mon Sep 23 18:45:46 2002  Owen Taylor  <otaylor@redhat.com>
+
+       * gtk/gtkmenuitem.c (gtk_menu_item_set_accel_path): 
+       Allow accel_path == NULL. (#84241, James Henstridge.)
+
 Mon Sep 23 18:01:52 2002  Owen Taylor  <otaylor@redhat.com>
 
        * gtk/gtknotebook.[ch]: Add gtk_notebook_get_n_pages

diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2
index bd1b3f2295bf49d4323d0d64ea955d7e5d8fff94..8a7c329831a8753cd434734017c6aaba00d47ef5 100644 (file)
--- a/ChangeLog.pre-2-2
+++ b/ChangeLog.pre-2-2
@@ -1,3 +1,8 @@
+Mon Sep 23 18:45:46 2002  Owen Taylor  <otaylor@redhat.com>
+
+       * gtk/gtkmenuitem.c (gtk_menu_item_set_accel_path): 
+       Allow accel_path == NULL. (#84241, James Henstridge.)
+
 Mon Sep 23 18:01:52 2002  Owen Taylor  <otaylor@redhat.com>
 
        * gtk/gtknotebook.[ch]: Add gtk_notebook_get_n_pages

diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4
index bd1b3f2295bf49d4323d0d64ea955d7e5d8fff94..8a7c329831a8753cd434734017c6aaba00d47ef5 100644 (file)
--- a/ChangeLog.pre-2-4
+++ b/ChangeLog.pre-2-4
@@ -1,3 +1,8 @@
+Mon Sep 23 18:45:46 2002  Owen Taylor  <otaylor@redhat.com>
+
+       * gtk/gtkmenuitem.c (gtk_menu_item_set_accel_path): 
+       Allow accel_path == NULL. (#84241, James Henstridge.)
+
 Mon Sep 23 18:01:52 2002  Owen Taylor  <otaylor@redhat.com>
 
        * gtk/gtknotebook.[ch]: Add gtk_notebook_get_n_pages

diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index bd1b3f2295bf49d4323d0d64ea955d7e5d8fff94..8a7c329831a8753cd434734017c6aaba00d47ef5 100644 (file)
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,3 +1,8 @@
+Mon Sep 23 18:45:46 2002  Owen Taylor  <otaylor@redhat.com>
+
+       * gtk/gtkmenuitem.c (gtk_menu_item_set_accel_path): 
+       Allow accel_path == NULL. (#84241, James Henstridge.)
+
 Mon Sep 23 18:01:52 2002  Owen Taylor  <otaylor@redhat.com>
 
        * gtk/gtknotebook.[ch]: Add gtk_notebook_get_n_pages

diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index bd1b3f2295bf49d4323d0d64ea955d7e5d8fff94..8a7c329831a8753cd434734017c6aaba00d47ef5 100644 (file)
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,8 @@
+Mon Sep 23 18:45:46 2002  Owen Taylor  <otaylor@redhat.com>
+
+       * gtk/gtkmenuitem.c (gtk_menu_item_set_accel_path): 
+       Allow accel_path == NULL. (#84241, James Henstridge.)
+
 Mon Sep 23 18:01:52 2002  Owen Taylor  <otaylor@redhat.com>
 
        * gtk/gtknotebook.[ch]: Add gtk_notebook_get_n_pages

diff --git a/gtk/gtkmenuitem.c b/gtk/gtkmenuitem.c
index dc95279ba268bc3d55d5b111211724042f63e549..908ba4790f512ed5cbc8fdb4323edf2dff4f2fcd 100644 (file)
--- a/gtk/gtkmenuitem.c
+++ b/gtk/gtkmenuitem.c
@@ -1129,7 +1129,8 @@ _gtk_menu_item_refresh_accel_path (GtkMenuItem   *menu_item,
 /**
  * gtk_menu_item_set_accel_path
  * @menu_item:  a valid #GtkMenuItem
- * @accel_path: accelerator path, corresponding to this menu item's functionality
+ * @accel_path: accelerator path, corresponding to this menu item's
+ *              functionality, or %NULL to unset the current path.
  *
  * Set the accelerator path on @menu_item, through which runtime changes of the
  * menu item's accelerator caused by the user can be identified and saved to
@@ -1150,7 +1151,8 @@ gtk_menu_item_set_accel_path (GtkMenuItem *menu_item,
   GtkWidget *widget;
 
   g_return_if_fail (GTK_IS_MENU_ITEM (menu_item));
-  g_return_if_fail (accel_path && accel_path[0] == '<' && strchr (accel_path, '/'));
+  g_return_if_fail (accel_path == NULL ||
+                   (accel_path[0] == '<' && strchr (accel_path, '/')));
 
   widget = GTK_WIDGET (menu_item);