Index: app/tools/gimprectangleoptions.c
===================================================================
RCS file: /cvs/gnome/gimp/app/tools/gimprectangleoptions.c,v
retrieving revision 1.17
diff -u -p -r1.17 gimprectangleoptions.c
--- app/tools/gimprectangleoptions.c	13 Aug 2006 15:59:18 -0000	1.17
+++ app/tools/gimprectangleoptions.c	23 Aug 2006 19:29:08 -0000
@@ -117,13 +117,6 @@ void        gimp_rectangle_options_set_c
                                                           gboolean              expanded);
 gboolean    gimp_rectangle_options_get_controls_expanded (GimpRectangleOptions *options);
 
-void        gimp_rectangle_options_set_entry           (GimpRectangleOptions *options,
-                                                        GtkWidget            *entry);
-GtkWidget * gimp_rectangle_options_get_entry           (GimpRectangleOptions *options);
-
-static void rectangle_dimensions_changed               (GtkWidget            *widget,
-                                                        GimpRectangleOptions *options);
-
 
 GType
 gimp_rectangle_options_interface_get_type (void)
@@ -181,7 +174,7 @@ gimp_rectangle_options_iface_base_init (
                                                                 NULL, NULL,
                                                                 0.0, GIMP_MAX_IMAGE_SIZE,
                                                                 0.0,
-                                                                GIMP_CONFIG_PARAM_FLAGS |
+                                                                GIMP_PARAM_READWRITE |
                                                                 GIMP_PARAM_STATIC_STRINGS));
 
       g_object_interface_install_property (iface,
@@ -196,7 +189,7 @@ gimp_rectangle_options_iface_base_init (
                                                                 NULL, NULL,
                                                                 0.0, GIMP_MAX_IMAGE_SIZE,
                                                                 0.0,
-                                                                GIMP_CONFIG_PARAM_FLAGS |
+                                                                GIMP_PARAM_READWRITE |
                                                                 GIMP_PARAM_STATIC_STRINGS));
 
       g_object_interface_install_property (iface,
@@ -211,7 +204,7 @@ gimp_rectangle_options_iface_base_init (
                                                                 NULL, NULL,
                                                                 0.0, GIMP_MAX_IMAGE_SIZE,
                                                                 0.0,
-                                                                GIMP_CONFIG_PARAM_FLAGS |
+                                                                GIMP_PARAM_READWRITE |
                                                                 GIMP_PARAM_STATIC_STRINGS));
 
       g_object_interface_install_property (iface,
@@ -234,7 +227,7 @@ gimp_rectangle_options_iface_base_init (
                                                                 -GIMP_MAX_IMAGE_SIZE,
                                                                 GIMP_MAX_IMAGE_SIZE,
                                                                 0.0,
-                                                                GIMP_CONFIG_PARAM_FLAGS |
+                                                                GIMP_PARAM_READWRITE |
                                                                 GIMP_PARAM_STATIC_STRINGS));
 
       g_object_interface_install_property (iface,
@@ -243,7 +236,7 @@ gimp_rectangle_options_iface_base_init (
                                                                 -GIMP_MAX_IMAGE_SIZE,
                                                                 GIMP_MAX_IMAGE_SIZE,
                                                                 0.0,
-                                                                GIMP_CONFIG_PARAM_FLAGS |
+                                                                GIMP_PARAM_READWRITE |
                                                                 GIMP_PARAM_STATIC_STRINGS));
 
       g_object_interface_install_property (iface,
@@ -251,7 +244,7 @@ gimp_rectangle_options_iface_base_init (
                                                                  NULL, NULL,
                                                                  TRUE, TRUE,
                                                                  GIMP_UNIT_PIXEL,
-                                                                 GIMP_CONFIG_PARAM_FLAGS |
+                                                                 GIMP_PARAM_READWRITE |
                                                                  GIMP_PARAM_STATIC_STRINGS));
 
       g_object_interface_install_property (iface,
@@ -261,12 +254,6 @@ gimp_rectangle_options_iface_base_init (
                                                                  GIMP_CONFIG_PARAM_FLAGS |
                                                                  GIMP_PARAM_STATIC_STRINGS));
 
-      g_object_interface_install_property (iface,
-                                           g_param_spec_object ("dimensions-entry",
-                                                                NULL, NULL,
-                                                                GTK_TYPE_WIDGET,
-                                                                GIMP_PARAM_READWRITE));
-
       initialized = TRUE;
     }
 }
@@ -368,9 +355,6 @@ gimp_rectangle_options_install_propertie
   g_object_class_override_property (klass,
                                     GIMP_RECTANGLE_OPTIONS_PROP_CONTROLS_EXPANDED,
                                     "controls-expanded");
-  g_object_class_override_property (klass,
-                                    GIMP_RECTANGLE_OPTIONS_PROP_DIMENSIONS_ENTRY,
-                                    "dimensions-entry");
 }
 
 void
@@ -976,7 +960,6 @@ gimp_rectangle_options_gui (GimpToolOpti
   entry = gimp_size_entry_new (2, GIMP_UNIT_PIXEL, "%a",
                                TRUE, TRUE, FALSE, 4,
                                GIMP_SIZE_ENTRY_UPDATE_SIZE);
-  g_object_set (tool_options, "dimensions-entry", entry, NULL);
 
   gtk_table_set_row_spacings (GTK_TABLE (entry), 3);
   gtk_table_set_col_spacings (GTK_TABLE (entry), 3);
@@ -1002,10 +985,6 @@ gimp_rectangle_options_gui (GimpToolOpti
 
   gtk_box_pack_start (GTK_BOX (vbox2), entry, FALSE, FALSE, 0);
 
-  g_signal_connect (entry, "value-changed",
-                    G_CALLBACK (rectangle_dimensions_changed),
-                    tool_options);
-
   gtk_widget_show (entry);
 
   gimp_size_entry_set_refval (GIMP_SIZE_ENTRY (entry), 0, 0);
@@ -1016,9 +995,3 @@ gimp_rectangle_options_gui (GimpToolOpti
   return vbox;
 }
 
-static void
-rectangle_dimensions_changed (GtkWidget            *widget,
-                              GimpRectangleOptions *options)
-{
-  g_object_notify (G_OBJECT (options), "dimensions-entry");
-}
Index: app/tools/gimprectangleoptions.h
===================================================================
RCS file: /cvs/gnome/gimp/app/tools/gimprectangleoptions.h,v
retrieving revision 1.10
diff -u -p -r1.10 gimprectangleoptions.h
--- app/tools/gimprectangleoptions.h	10 Jun 2006 18:24:57 -0000	1.10
+++ app/tools/gimprectangleoptions.h	23 Aug 2006 19:29:08 -0000
@@ -75,5 +75,9 @@ void      gimp_rectangle_options_get_pro
                                                      GParamSpec   *pspec);
 void        gimp_rectangle_options_set_highlight    (GimpRectangleOptions *options,
                                                      gboolean              highlight);
+void        gimp_rectangle_options_set_entry           (GimpRectangleOptions *options,
+                                                        GtkWidget            *entry);
+GtkWidget * gimp_rectangle_options_get_entry           (GimpRectangleOptions *options);
+
 
 #endif  /* __GIMP_RECTANGLE_OPTIONS_H__ */
Index: app/tools/gimprectangletool.c
===================================================================
RCS file: /cvs/gnome/gimp/app/tools/gimprectangletool.c,v
retrieving revision 1.77
diff -u -p -r1.77 gimprectangletool.c
--- app/tools/gimprectangletool.c	22 Aug 2006 16:16:36 -0000	1.77
+++ app/tools/gimprectangletool.c	23 Aug 2006 19:29:08 -0000
@@ -660,9 +660,6 @@ gimp_rectangle_tool_constructor (GObject
   g_signal_connect_object (options, "notify::guide",
                            G_CALLBACK (gimp_rectangle_tool_notify_guide),
                            rectangle, 0);
-  g_signal_connect_object (options, "notify::dimensions-entry",
-                           G_CALLBACK (gimp_rectangle_tool_notify_dimensions),
-                           rectangle, 0);
 }
 
 void
@@ -696,13 +693,13 @@ gimp_rectangle_tool_initialize (GimpTool
                                 GimpDisplay *display)
 {
   GimpRectangleToolPrivate *private = GIMP_RECTANGLE_TOOL_GET_PRIVATE (tool);
-  GObject                  *options = G_OBJECT (tool->tool_info->tool_options);
+  GimpRectangleOptions     *options = GIMP_RECTANGLE_OPTIONS (tool->tool_info->tool_options);
   GimpSizeEntry            *entry;
 
   g_object_get (options,
-                "dimensions-entry", &entry,
                 "guide",            &private->guide,
                 NULL);
+  entry = GIMP_SIZE_ENTRY (gimp_rectangle_options_get_entry (options));
 
   if (display != tool->display)
     {
@@ -2101,8 +2098,8 @@ gimp_rectangle_tool_update_options (Gimp
                 "new-fixed-height", &fixed_height,
                 "fixed-aspect",     &fixed_aspect,
                 "aspect-square",    &aspect_square,
-                "dimensions-entry", &entry,
                 NULL);
+  entry = GIMP_SIZE_ENTRY (gimp_rectangle_options_get_entry (options));
 
   width  = x2 - x1;
   height = y2 - y1;
@@ -2377,7 +2374,7 @@ gimp_rectangle_tool_notify_dimensions (G
 
   private = GIMP_RECTANGLE_TOOL_GET_PRIVATE (rectangle);
 
-  g_object_get (options, "dimensions-entry", &entry, NULL);
+  entry = GIMP_SIZE_ENTRY (gimp_rectangle_options_get_entry (options));
 
   if (! GIMP_TOOL (rectangle)->display)
     return;
