filechooser: Also convert get_uris() to returning native paths

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

diff --git a/gtk/gtkmenutoolbutton.c b/gtk/gtkmenutoolbutton.c
index aa4eaa2f95b15f2d028bfde721ba618286702b6a..c133f88a7b5bc10e63dfa8fe5a754719516b3b5a 100644 (file)
--- a/gtk/gtkmenutoolbutton.c
+++ b/gtk/gtkmenutoolbutton.c
@@ -221,7 +221,7 @@ gtk_menu_tool_button_get_property (GObject    *object,
   switch (prop_id)
     {
     case PROP_MENU:
-      g_object_get_property (G_OBJECT (button->priv->arrow_button), "menu", value);
+      g_value_set_object (value, gtk_menu_button_get_popup (GTK_MENU_BUTTON (button->priv->arrow_button)));
       break;
 
     default:
@@ -308,8 +308,8 @@ gtk_menu_tool_button_init (GtkMenuToolButton *button)
   gtk_widget_show_all (box);
 
   gtk_container_add (GTK_CONTAINER (button), box);
-  gtk_menu_button_set_parent (GTK_MENU_BUTTON (arrow_button),
-                              GTK_WIDGET (button));
+  gtk_menu_button_set_align_widget (GTK_MENU_BUTTON (arrow_button),
+                                    GTK_WIDGET (button));
 
   button->priv->button = real_button;
   button->priv->arrow_button = arrow_button;
@@ -419,10 +419,10 @@ gtk_menu_tool_button_set_menu (GtkMenuToolButton *button,
 
   priv = button->priv;
 
-  _gtk_menu_button_set_menu_with_func (GTK_MENU_BUTTON (priv->arrow_button),
-                                       menu,
-                                       _show_menu_emit,
-                                       button);
+  _gtk_menu_button_set_popup_with_func (GTK_MENU_BUTTON (priv->arrow_button),
+                                        menu,
+                                        _show_menu_emit,
+                                        button);
 
   g_object_notify (G_OBJECT (button), "menu");
 }
@@ -441,13 +441,15 @@ gtk_menu_tool_button_set_menu (GtkMenuToolButton *button,
 GtkWidget *
 gtk_menu_tool_button_get_menu (GtkMenuToolButton *button)
 {
-  GtkWidget *ret;
+  GtkMenu *ret;
 
   g_return_val_if_fail (GTK_IS_MENU_TOOL_BUTTON (button), NULL);
 
-  g_object_get (button->priv->arrow_button, "menu", &ret, NULL);
+  ret = gtk_menu_button_get_popup (GTK_MENU_BUTTON (button->priv->arrow_button));
+  if (!ret)
+    return NULL;
 
-  return ret;
+  return GTK_WIDGET (ret);
 }
 
 /**