filechooserbutton: When the combo box changes, set the *file*, not the current folder

[~andy/gtk] / gtk / gtkaccessible.c

diff --git a/gtk/gtkaccessible.c b/gtk/gtkaccessible.c
index afca739154fab0d4746022ca6a78ead4ffc20fd8..27d88ca00ea35b178118fdd8dd0cf5eefba11e27 100644 (file)
--- a/gtk/gtkaccessible.c
+++ b/gtk/gtkaccessible.c
@@ -12,9 +12,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * License along with this library. If not, see <http://www.gnu.org/licenses/>.
  */
 
 #include "config.h"
@@ -130,13 +128,13 @@ gtk_accessible_real_widget_unset (GtkAccessible *accessible)
 }
 
 static void
-gtk_accessible_finalize (GObject *object)
+gtk_accessible_dispose (GObject *object)
 {
   GtkAccessible *accessible = GTK_ACCESSIBLE (object);
   
   gtk_accessible_set_widget (accessible, NULL);
 
-  G_OBJECT_CLASS (gtk_accessible_parent_class)->finalize (object);
+  G_OBJECT_CLASS (gtk_accessible_parent_class)->dispose (object);
 }
 
 static void
@@ -152,7 +150,7 @@ gtk_accessible_class_init (GtkAccessibleClass *klass)
   atkobject_class->ref_state_set = gtk_accessible_ref_state_set;
   gobject_class->get_property = gtk_accessible_get_property;
   gobject_class->set_property = gtk_accessible_set_property;
-  gobject_class->finalize = gtk_accessible_finalize;
+  gobject_class->dispose = gtk_accessible_dispose;
 
   g_object_class_install_property (gobject_class,
                                   PROP_WIDGET,
@@ -198,7 +196,7 @@ gtk_accessible_set_widget (GtkAccessible *accessible,
 
   priv->widget = widget;
 
-  if (widget);
+  if (widget)
     klass->widget_set (accessible);
 
   g_object_notify (G_OBJECT (accessible), "widget");
@@ -231,6 +229,8 @@ gtk_accessible_get_widget (GtkAccessible *accessible)
  *
  * This function specifies the callback function to be called
  * when the widget corresponding to a GtkAccessible is destroyed.
+ *
+ * Deprecated: 3.4: Use gtk_accessible_set_widget() and its vfuncs.
  */
 void
 gtk_accessible_connect_widget_destroyed (GtkAccessible *accessible)