diff --git a/ChangeLog b/ChangeLog
index a60e2b88be..af5cc8a629 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,9 @@
 2006-08-06  Matthias Clasen  <mclasen@redhat.com>
 
+	* gtk/gtkstyle.c (option_menu_get_props): Only get the
+	indicator-size and indicator-spacing style properties
+	for GtkOptionMenu.  (#349859, Benjamin Otte)
+
 	* gtk/gtktreeview.c (gtk_tree_view_set_grid_lines) 
 	(gtk_tree_view_set_enable_tree_lines): Be more careful
 	when creating gcs, also emit change notification.
diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index a60e2b88be..af5cc8a629 100644
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,5 +1,9 @@
 2006-08-06  Matthias Clasen  <mclasen@redhat.com>
 
+	* gtk/gtkstyle.c (option_menu_get_props): Only get the
+	indicator-size and indicator-spacing style properties
+	for GtkOptionMenu.  (#349859, Benjamin Otte)
+
 	* gtk/gtktreeview.c (gtk_tree_view_set_grid_lines) 
 	(gtk_tree_view_set_enable_tree_lines): Be more careful
 	when creating gcs, also emit change notification.
diff --git a/gtk/gtkstyle.c b/gtk/gtkstyle.c
index ff7c99f3f8..1d10533a06 100644
--- a/gtk/gtkstyle.c
+++ b/gtk/gtkstyle.c
@@ -30,6 +30,9 @@
 #include <string.h>
 #include "gtkgc.h"
 #include "gtkmarshalers.h"
+#undef GTK_DISABLE_DEPRECATED
+#include "gtkoptionmenu.h"
+#define GTK_DISABLE_DEPRECATED
 #include "gtkrc.h"
 #include "gtkspinbutton.h"
 #include "gtkstyle.h"
@@ -3221,7 +3224,7 @@ option_menu_get_props (GtkWidget      *widget,
   GtkRequisition *tmp_size = NULL;
   GtkBorder *tmp_spacing = NULL;
   
-  if (widget)
+  if (GTK_IS_OPTION_MENU (widget))
     gtk_widget_style_get (widget, 
 			  "indicator-size", &tmp_size,
 			  "indicator-spacing", &tmp_spacing,